Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 0 additions & 11 deletions tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,6 @@
import pytest


def pytest_addoption(parser):
parser.addoption(
"--repeat", type=int, default=1, help="repeat the operation multiple times"
)


@pytest.fixture(scope="session")
def repeat(request):
return request.config.getoption("repeat")


@pytest.fixture
def reset_sys_path():
original = copy.deepcopy(sys.path)
Expand Down
58 changes: 28 additions & 30 deletions tests/test_inputs.py
Original file line number Diff line number Diff line change
Expand Up @@ -174,22 +174,21 @@ def test_message_equality(test_data: TestData) -> None:


@pytest.mark.parametrize("test_data", test_cases.messages_with_json, indirect=True)
def test_message_json(repeat, test_data: TestData) -> None:
def test_message_json(test_data: TestData) -> None:
plugin_module, _, json_data = test_data

for _ in range(repeat):
for sample in json_data:
if sample.belongs_to(test_input_config.non_symmetrical_json):
continue
for sample in json_data:
if sample.belongs_to(test_input_config.non_symmetrical_json):
continue

message: betterproto.Message = plugin_module.Test()
message: betterproto.Message = plugin_module.Test()

message.from_json(sample.json)
message_json = message.to_json(0)
message.from_json(sample.json)
message_json = message.to_json(0)

assert dict_replace_nans(json.loads(message_json)) == dict_replace_nans(
json.loads(sample.json)
)
assert dict_replace_nans(json.loads(message_json)) == dict_replace_nans(
json.loads(sample.json)
)


@pytest.mark.parametrize("test_data", test_cases.services, indirect=True)
Expand All @@ -198,28 +197,27 @@ def test_service_can_be_instantiated(test_data: TestData) -> None:


@pytest.mark.parametrize("test_data", test_cases.messages_with_json, indirect=True)
def test_binary_compatibility(repeat, test_data: TestData) -> None:
def test_binary_compatibility(test_data: TestData) -> None:
plugin_module, reference_module, json_data = test_data

for sample in json_data:
reference_instance = Parse(sample.json, reference_module().Test())
reference_binary_output = reference_instance.SerializeToString()

for _ in range(repeat):
plugin_instance_from_json: betterproto.Message = (
plugin_module.Test().from_json(sample.json)
)
plugin_instance_from_binary = plugin_module.Test.FromString(
reference_binary_output
)

# Generally this can't be relied on, but here we are aiming to match the
# existing Python implementation and aren't doing anything tricky.
# https://developers.google.com/protocol-buffers/docs/encoding#implications
assert bytes(plugin_instance_from_json) == reference_binary_output
assert bytes(plugin_instance_from_binary) == reference_binary_output

assert plugin_instance_from_json == plugin_instance_from_binary
assert dict_replace_nans(
plugin_instance_from_json.to_dict()
) == dict_replace_nans(plugin_instance_from_binary.to_dict())
plugin_instance_from_json: betterproto.Message = plugin_module.Test().from_json(
sample.json
)
plugin_instance_from_binary = plugin_module.Test.FromString(
reference_binary_output
)

# Generally this can't be relied on, but here we are aiming to match the
# existing Python implementation and aren't doing anything tricky.
# https://developers.google.com/protocol-buffers/docs/encoding#implications
assert bytes(plugin_instance_from_json) == reference_binary_output
assert bytes(plugin_instance_from_binary) == reference_binary_output

assert plugin_instance_from_json == plugin_instance_from_binary
assert dict_replace_nans(
plugin_instance_from_json.to_dict()
) == dict_replace_nans(plugin_instance_from_binary.to_dict())
Loading