Skip to content

Commit b1bacdd

Browse files
committed
Refactor test assertions to remove whitespace in JSON strings for consistency
1 parent de27d31 commit b1bacdd

File tree

4 files changed

+42
-10
lines changed

4 files changed

+42
-10
lines changed

src/tests/test_business_host.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ def test_dispatch_serializer_valid(self, business_host):
5252
rsp = dispatch_serializer(message)
5353

5454
assert rsp.classname == 'registerFilesIop.message.SimpleMessage'
55-
assert rsp.GetObjectJson() == '{"integer": 1, "string": "test"}'
55+
assert rsp.GetObjectJson() == '{"integer":1,"string":"test"}'
5656

5757
def test_dispatch_serializer_none(self, business_host):
5858
assert dispatch_serializer(None) is None
@@ -62,27 +62,27 @@ def test_dispatch_serializer_none(self, business_host):
6262
(SimpleMessageNotDataclass(), TypeError),
6363
("test", TypeError)
6464
])
65-
def test_dispatch_serializer_invalid(self, business_host, invalid_message, expected_error):
65+
def test_dispatch_serializer_invalid(self, invalid_message, expected_error):
6666
with pytest.raises(expected_error):
6767
dispatch_serializer(invalid_message)
6868

6969
class TestMessageDeserialization:
70-
def test_serialize_deserialize_simple(self, business_host):
70+
def test_serialize_deserialize_simple(self):
7171
original = SimpleMessage(integer=1, string='test')
7272
serialized = serialize_message(original)
7373
deserialized = deserialize_message(serialized)
7474

7575
assert deserialized.integer == original.integer
7676
assert deserialized.string == original.string
7777

78-
def test_serialize_deserialize_japanese(self, business_host):
78+
def test_serialize_deserialize_japanese(self):
7979
original = SimpleMessage(integer=1, string='あいうえお')
8080
serialized = serialize_message(original)
8181
deserialized = deserialize_message(serialized)
8282

8383
assert deserialized.string == 'あいうえお'
8484

85-
def test_serialize_deserialize_large_string(self, business_host):
85+
def test_serialize_deserialize_large_string(self):
8686
huge_string = 'test' * 1000000
8787
original = SimpleMessage(integer=1, string=huge_string)
8888
serialized = serialize_message(original)
@@ -91,7 +91,7 @@ def test_serialize_deserialize_large_string(self, business_host):
9191
assert deserialized.string == huge_string
9292

9393
class TestPickledMessages:
94-
def test_pickled_message_roundtrip(self, business_host):
94+
def test_pickled_message_roundtrip(self):
9595
original = PickledMessage(integer=1, string='test')
9696
serialized = serialize_pickle_message(original)
9797
deserialized = deserialize_pickle_message(serialized)

src/tests/test_dispatch.py

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,23 @@ def test_simple_message_serialization():
6464
assert result.text == msg.text
6565
assert result.number == msg.number
6666

67+
def test_simple_message_serialization_with_extra():
68+
msg = MessageTest(text="test", number=42)
69+
msg.extra_field = "extra"
70+
71+
# Test serialization
72+
serial = serialize_message(msg)
73+
assert type(serial).__module__.startswith('iris')
74+
assert serial._IsA("IOP.Message")
75+
assert serial.classname == f"{MessageTest.__module__}.{MessageTest.__name__}"
76+
77+
# Test deserialization
78+
result = deserialize_message(serial)
79+
assert isinstance(result, MessageTest)
80+
assert result.text == msg.text
81+
assert result.number == msg.number
82+
assert result.extra_field == msg.extra_field
83+
6784
def test_message_serialization():
6885
msg = MessageTest(text="test", number=42)
6986

@@ -79,6 +96,21 @@ def test_message_serialization():
7996
assert result.text == msg.text
8097
assert result.number == msg.number
8198

99+
def test_message_serialization_wrong_type():
100+
msg = MessageTest(text="test", number={"key": "value"})
101+
102+
# Test serialization
103+
serial = serialize_message(msg)
104+
assert type(serial).__module__.startswith('iris')
105+
assert serial._IsA("IOP.Message")
106+
assert serial.classname == f"{MessageTest.__module__}.{MessageTest.__name__}"
107+
108+
# Test deserialization
109+
result = deserialize_message(serial)
110+
assert isinstance(result, MessageTest)
111+
assert result.text == msg.text
112+
assert result.number == msg.number
113+
82114
def test_pickle_message_serialization():
83115
msg = SimpleModel(text="test", number=42)
84116

src/tests/test_private_session.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ def test_dispatch_on_private_session_stopped(self, process):
5454
result = process._dispatch_on_private_session_stopped(host_object, 'test_source', 'self_generated', test_request)
5555

5656
mock_handler.assert_called_once()
57-
assert result.json == '{"value": "test"}'
57+
assert result.json == '{"value":"test"}'
5858

5959
def test_dispatch_on_private_session_started(self, process):
6060
host_object = MagicMock()
@@ -64,7 +64,7 @@ def test_dispatch_on_private_session_started(self, process):
6464
result = process._dispatch_on_private_session_started(host_object, 'test_source', test_request)
6565

6666
mock_handler.assert_called_once()
67-
assert result.json == '{"value": "test"}'
67+
assert result.json == '{"value":"test"}'
6868

6969
def test_dispatch_on_document(self, process):
7070
host_object = MagicMock()
@@ -74,4 +74,4 @@ def test_dispatch_on_document(self, process):
7474
result = process._dispatch_on_document(host_object, 'test_source', test_request)
7575

7676
mock_handler.assert_called_once()
77-
assert result.json == '{"value": "test"}'
77+
assert result.json == '{"value":"test"}'

src/tests/test_serialization.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ def test_json_serialization():
3737
# Create test data
3838
test_items = [{'col1': 1, 'col2': 'a'}, {'col1': 2, 'col2': 'b'}] # Simple list of dicts instead of DataFrame
3939
test_uuid = uuid.uuid4()
40-
test_bytes = b'hello world'
40+
test_bytes = b'hello world\x04'
4141

4242
msg = FullMessge(
4343
text="test",

0 commit comments

Comments
 (0)