Skip to content

Exercise enclosure-like values without skipped tests #580

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
claell wants to merge 1 commit into
base: main
Choose a base branch
from
+19 −18
Draft

Exercise enclosure-like values without skipped tests #580

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 19 additions & 18 deletions tests/middleware_tests/test_enclosing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,6 @@
from tests.resources import ENCLOSINGS


def _skip_pseudo_enclosing_value(value: str):
starts_and_ends_in_brackets = value.startswith("{") and value.endswith("}")
starts_and_ends_in_quotes = value.startswith('"') and value.endswith('"')
if starts_and_ends_in_quotes or starts_and_ends_in_brackets:
pytest.skip("No enclosing to remove")


@pytest.mark.parametrize("enclosing", ENCLOSINGS + [pytest.param("{0}", id="no_enclosing")])
@pytest.mark.parametrize("value", EDGE_CASE_VALUES)
@pytest.mark.parametrize("inplace", [True, False], ids=["inplace", "not_inplace"])
Expand All @@ -32,9 +25,6 @@ def test_removal_of_enclosing_on_string(enclosing, value, inplace):
Also covers the internals for other block types (i.e., Entry),
which thus can be tested more light-weight."""

if enclosing == "{0}":
_skip_pseudo_enclosing_value(value)

# Create test string
key = "someKey"
raw = "<--- does not matter for this unit test -->"
Expand All @@ -51,8 +41,20 @@ def test_removal_of_enclosing_on_string(enclosing, value, inplace):
assert len(transformed_library.strings) == 1
# Assert correct removal of enclosing
transformed = transformed_library.strings[0]
assert transformed.value == value
expected_enclosing = enclosing.format("")[0] if enclosing != "{0}" else "no-enclosing"
input_value = enclosing.format(value)
if input_value.startswith("{") and input_value.endswith("}"):
expected_value = input_value[1:-1]
expected_enclosing = "{"
elif input_value.startswith('"') and input_value.endswith('"'):
expected_value = input_value[1:-1]
expected_enclosing = '"'
else:
expected_value = input_value
expected_enclosing = "no-enclosing"

# Values that already look enclosed are necessarily interpreted as enclosed,
# even when the test did not add another wrapper around them.
assert transformed.value == expected_value
assert transformed.parser_metadata["removed_enclosing"] == expected_enclosing
# Assert remaining fields are unchanged
assert transformed.start_line == start_line
Expand Down Expand Up @@ -162,9 +164,6 @@ def test_addition_of_enclosing_on_entry(
transformed = transformed_library.entries[0]
changed_value = transformed["year"]

# Figure out which enclosing was added
used_enclosing = _figure_out_added_enclosing(changed_value, value)

# Assert correct enclosing was added
if reuse_previous_enclosing and metadata_enclosing is not None:
expected_enclosing = metadata_enclosing
Expand All @@ -174,9 +173,11 @@ def test_addition_of_enclosing_on_entry(
expected_enclosing = default_enclosing

if expected_enclosing == "no-enclosing":
_skip_pseudo_enclosing_value(value)

assert used_enclosing == expected_enclosing
# Inspect the exact output because a value may itself begin and end with
# enclosure-like characters even though the middleware added nothing.
assert changed_value == str(value)
else:
assert _figure_out_added_enclosing(changed_value, value) == expected_enclosing

# Assert remaining fields are unchanged
assert_nonfield_entry_attributes_unchanged(input_entry, transformed)
Expand Down
Loading