diff --git a/tests/advertizerIntegrationTest.py b/tests/advertizerIntegrationTest.py index b19ea99..ddb2457 100644 --- a/tests/advertizerIntegrationTest.py +++ b/tests/advertizerIntegrationTest.py @@ -108,17 +108,17 @@ def test_sends_hello_when_schedules_advertisement_once(self): # Given context = Context() sender = RadioSender(context) - _advertizer = DefaultAdvertizer(sender) + advertizer = DefaultAdvertizer(sender) timer = ReusableTimer() messages = [] - with ScheduledAdvertizer(_advertizer, timer) as advertizer, DishReceiver(context) as test_receiver: + with ScheduledAdvertizer(advertizer, timer) as scheduled_advertizer, DishReceiver(context) as test_receiver: test_receiver.start(GROUP.hello()) test_receiver.register(lambda message: messages.append(message)) - advertizer.start(GROUP) + scheduled_advertizer.start(GROUP) # When - advertizer.schedule(self.SERVICE_INFO, interval=0.01, one_shot=True) + scheduled_advertizer.schedule(self.SERVICE_INFO, interval=0.01, one_shot=True) wait_for_assertion(0.1, lambda: self.assertEqual(1, len(messages))) @@ -129,17 +129,17 @@ def test_sends_hello_when_schedules_advertisement_periodically(self): # Given context = Context() sender = RadioSender(context) - _advertizer = DefaultAdvertizer(sender) + advertizer = DefaultAdvertizer(sender) timer = ReusableTimer() messages = [] - with ScheduledAdvertizer(_advertizer, timer) as advertizer, DishReceiver(context) as test_receiver: + with ScheduledAdvertizer(advertizer, timer) as scheduled_advertizer, DishReceiver(context) as test_receiver: test_receiver.start(GROUP.hello()) test_receiver.register(lambda message: messages.append(message)) - advertizer.start(GROUP) + scheduled_advertizer.start(GROUP) # When - advertizer.schedule(self.SERVICE_INFO, interval=0.01) + scheduled_advertizer.schedule(self.SERVICE_INFO, interval=0.01) # Then wait_for_assertion(0.1, lambda: self.assertEqual(5, len(messages))) diff --git a/tests/discovererIntegrationTest.py b/tests/discovererIntegrationTest.py index a067dd3..cb518f6 100644 --- a/tests/discovererIntegrationTest.py +++ b/tests/discovererIntegrationTest.py @@ -95,17 +95,17 @@ def test_sends_query_when_schedules_discovery_once(self): context = Context() sender = RadioSender(context) receiver = DishReceiver(context) - _discoverer = DefaultDiscoverer(sender, receiver) + discoverer = DefaultDiscoverer(sender, receiver) timer = ReusableTimer() messages = [] - with ScheduledDiscoverer(_discoverer, timer) as discoverer, DishReceiver(context) as test_receiver: + with ScheduledDiscoverer(discoverer, timer) as scheduled_discoverer, DishReceiver(context) as test_receiver: test_receiver.start(GROUP.query()) test_receiver.register(lambda message: messages.append(message)) - discoverer.start(GROUP) + scheduled_discoverer.start(GROUP) # When - discoverer.schedule(SERVICE_QUERY, interval=0.01, one_shot=True) + scheduled_discoverer.schedule(SERVICE_QUERY, interval=0.01, one_shot=True) wait_for_assertion(0.1, lambda: self.assertEqual(1, len(messages))) @@ -117,17 +117,17 @@ def test_sends_query_when_schedules_discovery_periodically(self): context = Context() sender = RadioSender(context) receiver = DishReceiver(context) - _discoverer = DefaultDiscoverer(sender, receiver) + discoverer = DefaultDiscoverer(sender, receiver) timer = ReusableTimer() messages = [] - with ScheduledDiscoverer(_discoverer, timer) as discoverer, DishReceiver(context) as test_receiver: + with ScheduledDiscoverer(discoverer, timer) as scheduled_discoverer, DishReceiver(context) as test_receiver: test_receiver.start(GROUP.query()) test_receiver.register(lambda message: messages.append(message)) - discoverer.start(GROUP) + scheduled_discoverer.start(GROUP) # When - discoverer.schedule(SERVICE_QUERY, interval=0.01) + scheduled_discoverer.schedule(SERVICE_QUERY, interval=0.01) # Then wait_for_assertion(0.1, lambda: self.assertEqual(5, len(messages))) diff --git a/tests/dishReceiverTest.py b/tests/dishReceiverTest.py index 2f3e233..339d191 100644 --- a/tests/dishReceiverTest.py +++ b/tests/dishReceiverTest.py @@ -23,34 +23,34 @@ def setUp(self): def test_raises_error_when_restarted(self): # Given - group_access = GROUP.hello() + group = GROUP.hello() context = MagicMock(spec=Context) with DishReceiver(context) as receiver: - receiver.start(group_access) + receiver.start(group) # When, Then with self.assertRaises(RuntimeError): - receiver.start(group_access) + receiver.start(group) def test_raises_error_when_fails_to_bind_socket(self): # Given - group_access = GROUP.hello() + group = GROUP.hello() context = MagicMock(spec=Context) context.socket.return_value.bind.side_effect = ZMQError(1, "Bind failed") receiver = DishReceiver(context) # When, Then with self.assertRaises(ZMQError): - receiver.start(group_access) + receiver.start(group) def test_closes_socket_on_exit(self): # Given - group_access = GROUP.hello() + group = GROUP.hello() context = MagicMock(spec=Context) with DishReceiver(context) as receiver: - receiver.start(group_access) + receiver.start(group) # When @@ -59,10 +59,10 @@ def test_closes_socket_on_exit(self): def test_closes_socket_when_stopped(self): # Given - group_access = GROUP.hello() + group = GROUP.hello() context = MagicMock(spec=Context) receiver = DishReceiver(context) - receiver.start(group_access) + receiver.start(group) # When receiver.stop() @@ -72,12 +72,12 @@ def test_closes_socket_when_stopped(self): def test_raises_error_when_fails_to_close_socket_on_stop(self): # Given - group_access = GROUP.hello() + group = GROUP.hello() context = MagicMock(spec=Context) context.socket.return_value.close.side_effect = [ZMQError(1, "Close failed"), None] with DishReceiver(context) as receiver: - receiver.start(group_access) + receiver.start(group) # When, Then with self.assertRaises(ZMQError): @@ -110,7 +110,7 @@ def test_deregisters_handler(self): def test_calls_registered_handler_on_message(self): # Given - group_access = GROUP.hello() + group = GROUP.hello() context = MagicMock(spec=Context) context.socket.return_value.recv_json.return_value = SERVICE_INFO.__dict__ handler = MagicMock(spec=OnMessage) @@ -123,14 +123,14 @@ def test_calls_registered_handler_on_message(self): receiver.register(handler) # When - receiver.start(group_access) + receiver.start(group) # Then wait_for_assertion(0.1, lambda: handler.assert_called_once_with(SERVICE_INFO.__dict__)) def test_handles_message_receive_error_gracefully(self): # Given - group_access = GROUP.hello() + group = GROUP.hello() context = MagicMock(spec=Context) context.socket.return_value.recv_json.side_effect = ZMQError(1, "Receive failed") handler = MagicMock(spec=OnMessage) @@ -143,14 +143,14 @@ def test_handles_message_receive_error_gracefully(self): receiver.register(handler) # When - receiver.start(group_access) + receiver.start(group) # Then handler.assert_not_called() def test_handles_handler_execution_error_gracefully(self): # Given - group_access = GROUP.hello() + group = GROUP.hello() context = MagicMock(spec=Context) context.socket.return_value.recv_json.return_value = SERVICE_INFO.__dict__ handler = MagicMock(spec=OnMessage) @@ -164,7 +164,7 @@ def test_handles_handler_execution_error_gracefully(self): receiver.register(handler) # When - receiver.start(group_access) + receiver.start(group) # Then wait_for_assertion(0.1, lambda: handler.assert_called_once_with(SERVICE_INFO.__dict__)) diff --git a/tests/radioSenderTest.py b/tests/radioSenderTest.py index bd36d80..681992e 100644 --- a/tests/radioSenderTest.py +++ b/tests/radioSenderTest.py @@ -23,33 +23,33 @@ def setUp(self): def test_raises_error_when_restarted(self): # Given - group_access = GROUP.hello() + group = GROUP.hello() context = MagicMock(spec=Context) sender = RadioSender(context) - sender.start(group_access) + sender.start(group) # When, Then with self.assertRaises(RuntimeError): - sender.start(group_access) + sender.start(group) def test_raises_error_when_fails_to_connect_socket(self): # Given - group_access = GROUP.hello() + group = GROUP.hello() context = MagicMock(spec=Context) context.socket.return_value.connect.side_effect = ZMQError(1, "Connect failed") sender = RadioSender(context) # When, Then with self.assertRaises(ZMQError): - sender.start(group_access) + sender.start(group) def test_closes_socket_on_exit(self): # Given - group_access = GROUP.hello() + group = GROUP.hello() context = MagicMock(spec=Context) with RadioSender(context) as sender: - sender.start(group_access) + sender.start(group) # When @@ -58,10 +58,10 @@ def test_closes_socket_on_exit(self): def test_closes_socket_when_stopped(self): # Given - group_access = GROUP.hello() + group = GROUP.hello() context = MagicMock(spec=Context) sender = RadioSender(context) - sender.start(group_access) + sender.start(group) # When sender.stop() @@ -71,11 +71,11 @@ def test_closes_socket_when_stopped(self): def test_raises_error_when_fails_to_close_socket_on_stop(self): # Given - group_access = GROUP.hello() + group = GROUP.hello() context = MagicMock(spec=Context) context.socket.return_value.close.side_effect = ZMQError(1, "Close failed") sender = RadioSender(context) - sender.start(group_access) + sender.start(group) # When, Then with self.assertRaises(ZMQError): @@ -83,10 +83,10 @@ def test_raises_error_when_fails_to_close_socket_on_stop(self): def test_sends_message_when_convertible_to_dict(self): # Given - group_access = GROUP.hello() + group = GROUP.hello() context = MagicMock(spec=Context) sender = RadioSender(context) - sender.start(group_access) + sender.start(group) # When sender.send(SERVICE_INFO) @@ -96,10 +96,10 @@ def test_sends_message_when_convertible_to_dict(self): def test_sends_message_when_type_is_dict(self): # Given - group_access = GROUP.hello() + group = GROUP.hello() context = MagicMock(spec=Context) sender = RadioSender(context) - sender.start(group_access) + sender.start(group) # When sender.send(SERVICE_INFO.__dict__) @@ -109,10 +109,10 @@ def test_sends_message_when_type_is_dict(self): def test_does_not_send_message_when_not_serializable(self): # Given - group_access = GROUP.hello() + group = GROUP.hello() context = MagicMock(spec=Context) sender = RadioSender(context) - sender.start(group_access) + sender.start(group) # When sender.send("not serializable message") @@ -133,10 +133,10 @@ def test_does_not_send_message_when_not_started(self): def test_handles_send_message_error_gracefully(self): # Given - group_access = GROUP.hello() + group = GROUP.hello() context = MagicMock(spec=Context) sender = RadioSender(context) - sender.start(group_access) + sender.start(group) context.socket.return_value.send_json.side_effect = ZMQError(1, "Send failed") # When diff --git a/tests/receiverIntegrationTest.py b/tests/receiverIntegrationTest.py index d70ca68..665905a 100644 --- a/tests/receiverIntegrationTest.py +++ b/tests/receiverIntegrationTest.py @@ -3,9 +3,9 @@ from context_logger import setup_logging from test_utility import wait_for_assertion -from zmq import Context +from zmq import Context, RADIO -from hello import ServiceInfo, Group, DishReceiver, RadioSender +from hello import ServiceInfo, Group, DishReceiver GROUP = Group('test-group', 'udp://239.0.0.1:5555') SERVICE_INFO = ServiceInfo('test-service', 'test-role', {'test': 'http://localhost:8080'}) @@ -20,31 +20,19 @@ def setUpClass(cls): def setUp(self): print() - def test_raises_error_when_restarted(self): - # Given - group_access = GROUP.hello() - context = Context() - - with DishReceiver(context) as receiver: - receiver.start(group_access) - - # When, Then - with self.assertRaises(RuntimeError): - receiver.start(group_access) - def test_receives_message(self): # Given - group_access = GROUP.hello() context = Context() messages = [] - with DishReceiver(context) as receiver, RadioSender(context) as test_sender: + with DishReceiver(context) as receiver, context.socket(RADIO) as radio: + group = GROUP.hello() + radio.connect(group.url) receiver.register(lambda message: messages.append(message)) - receiver.start(group_access) - test_sender.start(group_access) + receiver.start(group) # When - test_sender.send(SERVICE_INFO) + radio.send_json(SERVICE_INFO.__dict__, group=group.name) wait_for_assertion(0.1, lambda: self.assertEqual(1, len(messages))) diff --git a/tests/scheduledAdvertizerTest.py b/tests/scheduledAdvertizerTest.py index 7e0b7e6..4872dea 100644 --- a/tests/scheduledAdvertizerTest.py +++ b/tests/scheduledAdvertizerTest.py @@ -22,94 +22,94 @@ def setUp(self): def test_stops_timer_and_advertizer_on_exit(self): # Given - _advertizer = MagicMock(spec=Advertizer) + advertizer = MagicMock(spec=Advertizer) timer = MagicMock(spec=IReusableTimer) - with ScheduledAdvertizer(_advertizer, timer) as advertizer: - advertizer.start(GROUP) + with ScheduledAdvertizer(advertizer, timer) as scheduled_advertizer: + scheduled_advertizer.start(GROUP) # When # Then timer.cancel.assert_called_once() - _advertizer.stop.assert_called_once() + advertizer.stop.assert_called_once() def test_stops_timer_and_advertizer_when_stopped(self): # Given - _advertizer = MagicMock(spec=Advertizer) + advertizer = MagicMock(spec=Advertizer) timer = MagicMock(spec=IReusableTimer) - advertizer = ScheduledAdvertizer(_advertizer, timer) - advertizer.start(GROUP) + scheduled_advertizer = ScheduledAdvertizer(advertizer, timer) + scheduled_advertizer.start(GROUP) # When - advertizer.stop() + scheduled_advertizer.stop() # Then timer.cancel.assert_called_once() - _advertizer.stop.assert_called_once() + advertizer.stop.assert_called_once() def test_starts_advertizer_when_started(self): # Given - _advertizer = MagicMock(spec=Advertizer) + advertizer = MagicMock(spec=Advertizer) timer = MagicMock(spec=IReusableTimer) - advertizer = ScheduledAdvertizer(_advertizer, timer) + scheduled_advertizer = ScheduledAdvertizer(advertizer, timer) # When - advertizer.start(GROUP, SERVICE_INFO) + scheduled_advertizer.start(GROUP, SERVICE_INFO) # Then - _advertizer.start.assert_called_once_with(GROUP, SERVICE_INFO) + advertizer.start.assert_called_once_with(GROUP, SERVICE_INFO) def test_sends_service_info(self): # Given - _advertizer = MagicMock(spec=Advertizer) + advertizer = MagicMock(spec=Advertizer) timer = MagicMock(spec=IReusableTimer) - advertizer = ScheduledAdvertizer(_advertizer, timer) + scheduled_advertizer = ScheduledAdvertizer(advertizer, timer) # When - advertizer.advertise(SERVICE_INFO) + scheduled_advertizer.advertise(SERVICE_INFO) # Then - _advertizer.advertise.assert_called_once_with(SERVICE_INFO) + advertizer.advertise.assert_called_once_with(SERVICE_INFO) def test_schedules_advertise_once(self): # Given - _advertizer = MagicMock(spec=Advertizer) + advertizer = MagicMock(spec=Advertizer) timer = MagicMock(spec=IReusableTimer) - advertizer = ScheduledAdvertizer(_advertizer, timer) - advertizer.start(GROUP) + scheduled_advertizer = ScheduledAdvertizer(advertizer, timer) + scheduled_advertizer.start(GROUP) # When - advertizer.schedule(SERVICE_INFO, 60, True) + scheduled_advertizer.schedule(SERVICE_INFO, 60, True) # Then - timer.start.assert_called_once_with(60, advertizer._execute, [SERVICE_INFO]) + timer.start.assert_called_once_with(60, scheduled_advertizer._execute, [SERVICE_INFO]) def test_schedules_periodic_advertise(self): # Given - _advertizer = MagicMock(spec=Advertizer) + advertizer = MagicMock(spec=Advertizer) timer = MagicMock(spec=IReusableTimer) - advertizer = ScheduledAdvertizer(_advertizer, timer) - advertizer.start(GROUP) + scheduled_advertizer = ScheduledAdvertizer(advertizer, timer) + scheduled_advertizer.start(GROUP) # When - advertizer.schedule(SERVICE_INFO, 60, False) + scheduled_advertizer.schedule(SERVICE_INFO, 60, False) # Then - timer.start.assert_called_once_with(60, advertizer._execute_and_restart, [SERVICE_INFO]) + timer.start.assert_called_once_with(60, scheduled_advertizer._execute_and_restart, [SERVICE_INFO]) def test_execute_and_restart_calls_advertise_and_restarts_timer(self): # Given - _advertizer = MagicMock(spec=Advertizer) + advertizer = MagicMock(spec=Advertizer) timer = MagicMock(spec=IReusableTimer) - advertizer = ScheduledAdvertizer(_advertizer, timer) - advertizer.start(GROUP) + scheduled_advertizer = ScheduledAdvertizer(advertizer, timer) + scheduled_advertizer.start(GROUP) # When - advertizer._execute_and_restart(SERVICE_INFO) + scheduled_advertizer._execute_and_restart(SERVICE_INFO) # Then - _advertizer.advertise.assert_called_once_with(SERVICE_INFO) + advertizer.advertise.assert_called_once_with(SERVICE_INFO) timer.restart.assert_called_once() diff --git a/tests/scheduledDiscovererTest.py b/tests/scheduledDiscovererTest.py index 3b0522e..43df237 100644 --- a/tests/scheduledDiscovererTest.py +++ b/tests/scheduledDiscovererTest.py @@ -22,136 +22,136 @@ def setUp(self): def test_stops_timer_and_discoverer_on_exit(self): # Given - _discoverer = MagicMock(spec=Discoverer) + discoverer = MagicMock(spec=Discoverer) timer = MagicMock(spec=IReusableTimer) - with ScheduledDiscoverer(_discoverer, timer) as discoverer: - discoverer.start(GROUP) + with ScheduledDiscoverer(discoverer, timer) as scheduled_discoverer: + scheduled_discoverer.start(GROUP) # When # Then timer.cancel.assert_called_once() - _discoverer.stop.assert_called_once() + discoverer.stop.assert_called_once() def test_stops_timer_and_discoverer_when_stopped(self): # Given - _discoverer = MagicMock(spec=Discoverer) + discoverer = MagicMock(spec=Discoverer) timer = MagicMock(spec=IReusableTimer) - discoverer = ScheduledDiscoverer(_discoverer, timer) - discoverer.start(GROUP) + scheduled_discoverer = ScheduledDiscoverer(discoverer, timer) + scheduled_discoverer.start(GROUP) # When - discoverer.stop() + scheduled_discoverer.stop() # Then timer.cancel.assert_called_once() - _discoverer.stop.assert_called_once() + discoverer.stop.assert_called_once() def test_starts_discoverer_when_started(self): # Given - _discoverer = MagicMock(spec=Discoverer) + discoverer = MagicMock(spec=Discoverer) timer = MagicMock(spec=IReusableTimer) - discoverer = ScheduledDiscoverer(_discoverer, timer) + scheduled_discoverer = ScheduledDiscoverer(discoverer, timer) # When - discoverer.start(GROUP, SERVICE_QUERY) + scheduled_discoverer.start(GROUP, SERVICE_QUERY) # Then - _discoverer.start.assert_called_once_with(GROUP, SERVICE_QUERY) + discoverer.start.assert_called_once_with(GROUP, SERVICE_QUERY) def test_registers_event_handler(self): # Given - _discoverer = MagicMock(spec=Discoverer) + discoverer = MagicMock(spec=Discoverer) timer = MagicMock(spec=IReusableTimer) - discoverer = ScheduledDiscoverer(_discoverer, timer) + scheduled_discoverer = ScheduledDiscoverer(discoverer, timer) handler = MagicMock(spec=OnDiscoveryEvent) # When - discoverer.register(handler) + scheduled_discoverer.register(handler) # Then - _discoverer.register.assert_called_once_with(handler) + discoverer.register.assert_called_once_with(handler) def test_deregisters_event_handler(self): # Given - _discoverer = MagicMock(spec=Discoverer) + discoverer = MagicMock(spec=Discoverer) timer = MagicMock(spec=IReusableTimer) - discoverer = ScheduledDiscoverer(_discoverer, timer) + scheduled_discoverer = ScheduledDiscoverer(discoverer, timer) handler = MagicMock(spec=OnDiscoveryEvent) - discoverer.register(handler) + scheduled_discoverer.register(handler) # When - discoverer.deregister(handler) + scheduled_discoverer.deregister(handler) # Then - _discoverer.deregister.assert_called_once_with(handler) + discoverer.deregister.assert_called_once_with(handler) def test_returns_event_handlers(self): # Given - _discoverer = MagicMock(spec=Discoverer) + discoverer = MagicMock(spec=Discoverer) timer = MagicMock(spec=IReusableTimer) - discoverer = ScheduledDiscoverer(_discoverer, timer) - discoverer.start(GROUP, SERVICE_QUERY) + scheduled_discoverer = ScheduledDiscoverer(discoverer, timer) + scheduled_discoverer.start(GROUP, SERVICE_QUERY) handler = MagicMock(spec=OnDiscoveryEvent) - discoverer.register(handler) + scheduled_discoverer.register(handler) # When - result = discoverer.get_handlers() + result = scheduled_discoverer.get_handlers() # Then - self.assertEqual(_discoverer.get_handlers(), result) + self.assertEqual(discoverer.get_handlers(), result) def test_sends_service_query(self): # Given - _discoverer = MagicMock(spec=Discoverer) + discoverer = MagicMock(spec=Discoverer) timer = MagicMock(spec=IReusableTimer) - discoverer = ScheduledDiscoverer(_discoverer, timer) + scheduled_discoverer = ScheduledDiscoverer(discoverer, timer) # When - discoverer.discover(SERVICE_QUERY) + scheduled_discoverer.discover(SERVICE_QUERY) # Then - _discoverer.discover.assert_called_once_with(SERVICE_QUERY) + discoverer.discover.assert_called_once_with(SERVICE_QUERY) def test_schedules_discover_once(self): # Given - _discoverer = MagicMock(spec=Discoverer) + discoverer = MagicMock(spec=Discoverer) timer = MagicMock(spec=IReusableTimer) - discoverer = ScheduledDiscoverer(_discoverer, timer) - discoverer.start(GROUP) + scheduled_discoverer = ScheduledDiscoverer(discoverer, timer) + scheduled_discoverer.start(GROUP) # When - discoverer.schedule(SERVICE_QUERY, 60, True) + scheduled_discoverer.schedule(SERVICE_QUERY, 60, True) # Then - timer.start.assert_called_once_with(60, discoverer._execute, [SERVICE_QUERY]) + timer.start.assert_called_once_with(60, scheduled_discoverer._execute, [SERVICE_QUERY]) def test_schedules_periodic_discover(self): # Given - _discoverer = MagicMock(spec=Discoverer) + discoverer = MagicMock(spec=Discoverer) timer = MagicMock(spec=IReusableTimer) - discoverer = ScheduledDiscoverer(_discoverer, timer) - discoverer.start(GROUP) + scheduled_discoverer = ScheduledDiscoverer(discoverer, timer) + scheduled_discoverer.start(GROUP) # When - discoverer.schedule(SERVICE_QUERY, 60, False) + scheduled_discoverer.schedule(SERVICE_QUERY, 60, False) # Then - timer.start.assert_called_once_with(60, discoverer._execute_and_restart, [SERVICE_QUERY]) + timer.start.assert_called_once_with(60, scheduled_discoverer._execute_and_restart, [SERVICE_QUERY]) def test_execute_and_restart_calls_discover_and_restarts_timer(self): # Given - _discoverer = MagicMock(spec=Discoverer) + discoverer = MagicMock(spec=Discoverer) timer = MagicMock(spec=IReusableTimer) - discoverer = ScheduledDiscoverer(_discoverer, timer) - discoverer.start(GROUP) + scheduled_discoverer = ScheduledDiscoverer(discoverer, timer) + scheduled_discoverer.start(GROUP) # When - discoverer._execute_and_restart(SERVICE_QUERY) + scheduled_discoverer._execute_and_restart(SERVICE_QUERY) # Then - _discoverer.discover.assert_called_once_with(SERVICE_QUERY) + discoverer.discover.assert_called_once_with(SERVICE_QUERY) timer.restart.assert_called_once() diff --git a/tests/senderIntegrationTest.py b/tests/senderIntegrationTest.py index 4a2a531..5c43f47 100644 --- a/tests/senderIntegrationTest.py +++ b/tests/senderIntegrationTest.py @@ -1,11 +1,12 @@ import unittest +from threading import Thread from unittest import TestCase from context_logger import setup_logging from test_utility import wait_for_assertion -from zmq import Context +from zmq import Context, DISH -from hello import ServiceInfo, Group, DishReceiver +from hello import ServiceInfo, Group from hello.sender import RadioSender GROUP = Group('test-group', 'udp://239.0.0.1:5555') @@ -23,14 +24,15 @@ def setUp(self): def test_sends_message(self): # Given - group_access = GROUP.hello() context = Context() messages = [] - with RadioSender(context) as sender, DishReceiver(context) as test_receiver: - test_receiver.register(lambda message: messages.append(message)) - test_receiver.start(group_access) - sender.start(group_access) + with RadioSender(context) as sender, context.socket(DISH) as dish: + group = GROUP.hello() + dish.bind(group.url) + dish.join(group.name) + sender.start(group) + Thread(target=lambda: messages.append(dish.recv_json())).start() # When sender.send(SERVICE_INFO)