diff --git a/tests/test_data_frame_factory.py b/tests/test_data_frame_factory.py index 6cb4a974..5f505662 100755 --- a/tests/test_data_frame_factory.py +++ b/tests/test_data_frame_factory.py @@ -49,7 +49,7 @@ class TestDataFrameFactory(unittest.TestCase): offset = 40 payload = b'Hello World!' frame = self.factory.build_arq_burst_frame(FREEDV_MODE.datac3, - session_id, offset, payload) + session_id, offset, payload, 0) frame_data = self.factory.deconstruct(frame) self.assertEqual(frame_data['session_id'], session_id) self.assertEqual(frame_data['offset'], offset) @@ -58,11 +58,11 @@ class TestDataFrameFactory(unittest.TestCase): payload = payload * 1000 self.assertRaises(OverflowError, self.factory.build_arq_burst_frame, - FREEDV_MODE.datac3, session_id, offset, payload) + FREEDV_MODE.datac3, session_id, offset, payload, 0) def testAvailablePayload(self): avail = self.factory.get_available_data_payload_for_mode(FRAME_TYPE.ARQ_BURST_FRAME, FREEDV_MODE.datac3) - self.assertEqual(avail, 120) # 128 bytes datac3 frame payload - BURST frame overhead + self.assertEqual(avail, 119) # 128 bytes datac3 frame payload - BURST frame overhead if __name__ == '__main__': unittest.main() diff --git a/tests/test_data_type_handler.py b/tests/test_data_type_handler.py index 773c11a9..7fafb58c 100644 --- a/tests/test_data_type_handler.py +++ b/tests/test_data_type_handler.py @@ -22,21 +22,21 @@ class TestDispatcher(unittest.TestCase): # Example usage example_data = b"Hello FreeDATA!" formatted_data, type_byte = self.arq_data_type_handler.prepare(example_data, ARQ_SESSION_TYPES.raw) - dispatched_data = self.arq_data_type_handler.dispatch(type_byte, formatted_data) + dispatched_data = self.arq_data_type_handler.dispatch(type_byte, formatted_data, statistics={}) self.assertEqual(example_data, dispatched_data) def testDataTypeHandlerLZMA(self): # Example usage example_data = b"Hello FreeDATA!" formatted_data, type_byte = self.arq_data_type_handler.prepare(example_data, ARQ_SESSION_TYPES.raw_lzma) - dispatched_data = self.arq_data_type_handler.dispatch(type_byte, formatted_data) + dispatched_data = self.arq_data_type_handler.dispatch(type_byte, formatted_data, statistics={}) self.assertEqual(example_data, dispatched_data) def testDataTypeHandlerGZIP(self): # Example usage example_data = b"Hello FreeDATA!" formatted_data, type_byte = self.arq_data_type_handler.prepare(example_data, ARQ_SESSION_TYPES.raw_gzip) - dispatched_data = self.arq_data_type_handler.dispatch(type_byte, formatted_data) + dispatched_data = self.arq_data_type_handler.dispatch(type_byte, formatted_data, statistics={}) self.assertEqual(example_data, dispatched_data) diff --git a/tests/test_message_database.py b/tests/test_message_database.py index 6a20cae1..086bb85c 100644 --- a/tests/test_message_database.py +++ b/tests/test_message_database.py @@ -37,7 +37,7 @@ class TestDataFrameFactory(unittest.TestCase): payload = message.to_payload() received_message = MessageP2P.from_payload(payload) received_message_dict = MessageP2P.to_dict(received_message) - self.database_manager.add_message(received_message_dict) + self.database_manager.add_message(received_message_dict, statistics={}) result = self.database_manager.get_message_by_id(message.id) self.assertEqual(result["destination"], message.destination) @@ -53,7 +53,7 @@ class TestDataFrameFactory(unittest.TestCase): payload = message.to_payload() received_message = MessageP2P.from_payload(payload) received_message_dict = MessageP2P.to_dict(received_message) - self.database_manager.add_message(received_message_dict) + self.database_manager.add_message(received_message_dict, statistics={}) result = self.database_manager.get_all_messages() message_id = result[0]["id"] @@ -75,7 +75,7 @@ class TestDataFrameFactory(unittest.TestCase): received_message = MessageP2P.from_payload(payload) received_message_dict = MessageP2P.to_dict(received_message) print(received_message_dict) - message_id = self.database_manager.add_message(received_message_dict, direction='receive') + message_id = self.database_manager.add_message(received_message_dict, statistics={}, direction='receive') print(message_id) self.database_manager.update_message(message_id, {'body' : 'hello123'}) @@ -103,7 +103,7 @@ class TestDataFrameFactory(unittest.TestCase): payload = message.to_payload() received_message = MessageP2P.from_payload(payload) received_message_dict = MessageP2P.to_dict(received_message) - message_id = self.database_manager.add_message(received_message_dict) + message_id = self.database_manager.add_message(received_message_dict, statistics={}) result = self.database_manager_attachments.get_attachments_by_message_id(message_id) attachment_names = [attachment['name'] for attachment in result] self.assertIn('test1.gif', attachment_names) @@ -116,7 +116,7 @@ class TestDataFrameFactory(unittest.TestCase): payload = message.to_payload() received_message = MessageP2P.from_payload(payload) received_message_dict = MessageP2P.to_dict(received_message) - message_id = self.database_manager.add_message(received_message_dict) + message_id = self.database_manager.add_message(received_message_dict,statistics={},) self.database_manager.increment_message_attempts(message_id) @@ -129,7 +129,7 @@ class TestDataFrameFactory(unittest.TestCase): payload = message.to_payload() received_message = MessageP2P.from_payload(payload) received_message_dict = MessageP2P.to_dict(received_message) - message_id = self.database_manager.add_message(received_message_dict, is_read=False) + message_id = self.database_manager.add_message(received_message_dict, statistics={},is_read=False) self.database_manager.mark_message_as_read(message_id) result = self.database_manager.get_message_by_id(message_id) diff --git a/tests/test_message_p2p.py b/tests/test_message_p2p.py index 93782235..5ea115af 100755 --- a/tests/test_message_p2p.py +++ b/tests/test_message_p2p.py @@ -60,7 +60,7 @@ class TestDataFrameFactory(unittest.TestCase): payload = message.to_payload() received_message = MessageP2P.from_payload(payload) received_message_dict = MessageP2P.to_dict(received_message) - self.database_manager.add_message(received_message_dict) + self.database_manager.add_message(received_message_dict, statistics={}) self.assertEqual(message.origin, received_message.origin) self.assertEqual(message.destination, received_message.destination)