reorder tests to check consumed properties and actions after testing local properties and actions

Author: VigneshVSV

tests/test_11_thing_description.py

@@ -217,6 +217,18 @@ def test_4_boolean_schema(self):
     #     pass 
 
 
+    # def test_6_thing_model_generation(self):
+    #     pass
+        # basic test only to make sure nothing is fundamentally wrong
+        # thing = self.thing_cls(id="test_servers_init", log_level=logging.WARN)
+        # self.assertIsInstance(thing.get_thing_description(), dict)
+        # self.assertIsInstance(thing.get_our_temp_thing_description(), dict)
+     
+        # start_thing_forked(self.thing_cls, id='test-gui-resource-generation', log_level=logging.WARN)
+        # thing_client = ObjectProxy('test-gui-resource-generation')
+        # self.assertIsInstance(thing_client.get_our_temp_thing_description(), dict)
+        # thing_client.exit()
+
 
 if __name__ == '__main__':
     unittest.main(testRunner=TestRunner())

tests/test_1_message.py

@@ -4,7 +4,7 @@
 from hololinked.core.zmq.message import (EXIT, OPERATION, HANDSHAKE, 
                             PreserializedData,  SerializableData, RequestHeader, RequestMessage) # client to server
 from hololinked.core.zmq.message import (TIMEOUT, INVALID_MESSAGE, ERROR, REPLY, ERROR,
-                                            ResponseMessage, ResponseHeader) # server to client
+                            ResponseMessage, ResponseHeader) # server to client
 from hololinked.serializers.serializers import Serializers
 
 try:

tests/test_3_serializers.py

@@ -97,34 +97,34 @@ def test_2_protocol_registration(self):
 
     def test_3_registration_for_objects(self):
         """i.e. test if a new serializer can be registered for a specific property, action or event"""
-        Serializers.register_content_type_for_object(TestThing.test_property, 'application/octet-stream')
-        Serializers.register_content_type_for_object(TestThing.test_echo, 'x-msgpack')
+        Serializers.register_content_type_for_object(TestThing.base_property, 'application/octet-stream')
+        Serializers.register_content_type_for_object(TestThing.action_echo, 'x-msgpack')
         Serializers.register_content_type_for_object(TestThing.test_event, 'application/yaml')
 
-        self.assertEqual(Serializers.for_object(None, 'TestThing', 'test_echo'), Serializers.msgpack)
-        self.assertEqual(Serializers.for_object(None, 'TestThing', 'test_property'), Serializers.pickle)
+        self.assertEqual(Serializers.for_object(None, 'TestThing', 'action_echo'), Serializers.msgpack)
+        self.assertEqual(Serializers.for_object(None, 'TestThing', 'base_property'), Serializers.pickle)
         self.assertEqual(Serializers.for_object(None, 'TestThing', 'test_event'), Serializers.yaml)
         self.assertEqual(Serializers.for_object(None, 'TestThing', 'test_unknown_property'), Serializers.default)
 
 
     def test_4_registration_for_objects_by_name(self):
 
-        Serializers.register_content_type_for_object_per_thing_instance('test_thing', 'test_property', 
+        Serializers.register_content_type_for_object_per_thing_instance('test_thing', 'base_property', 
                                                             'application/yaml')
-        self.assertIsInstance(Serializers.for_object('test_thing', None, 'test_property'), 
+        self.assertIsInstance(Serializers.for_object('test_thing', None, 'base_property'), 
                                     self.YAMLSerializer)
 
 
     def test_5_registration_dict(self):
         """test the dictionary where all serializers are stored"""
         # depends on test 3
         self.assertIn('test_thing', Serializers.object_content_type_map)
-        self.assertIn('test_property', Serializers.object_content_type_map['test_thing'])
-        self.assertEqual(Serializers.object_content_type_map['test_thing']['test_property'], 
+        self.assertIn('base_property', Serializers.object_content_type_map['test_thing'])
+        self.assertEqual(Serializers.object_content_type_map['test_thing']['base_property'], 
                                                             'application/yaml')
 
-        self.assertIn('test_echo', Serializers.object_content_type_map['TestThing'])
-        self.assertEqual(Serializers.object_content_type_map['TestThing']['test_echo'],
+        self.assertIn('action_echo', Serializers.object_content_type_map['TestThing'])
+        self.assertEqual(Serializers.object_content_type_map['TestThing']['action_echo'],
                                                             'x-msgpack')
         self.assertIn('test_event', Serializers.object_content_type_map['TestThing'])
         self.assertEqual(Serializers.object_content_type_map['TestThing']['test_event'],
@@ -133,11 +133,11 @@ def test_5_registration_dict(self):
 
     def test_6_retrieval(self):
         # added in previous tests
-        self.assertIsInstance(Serializers.for_object('test_thing', None, 'test_property'), self.YAMLSerializer)
+        self.assertIsInstance(Serializers.for_object('test_thing', None, 'base_property'), self.YAMLSerializer)
         # unknown object should retrieve the default serializer
         self.assertEqual(Serializers.for_object('test_thing', None, 'test_unknown_property'), Serializers.default)  
         # unknown thing should retrieve the default serializer
-        self.assertEqual(Serializers.for_object('test_unknown_thing', None, 'test_property'), Serializers.default)
+        self.assertEqual(Serializers.for_object('test_unknown_thing', None, 'base_property'), Serializers.default)
 
 
     def test_7_set_default(self):

tests/test_4_thing_init.py

@@ -33,7 +33,7 @@
 
 
 
-class TestThing(TestCase):
+class TestThingInit(TestCase):
     """Test Thing class which is the bread and butter of this package."""
 
     @classmethod
@@ -143,21 +143,8 @@ def test_5_servers_init(self):
         thing.event_publisher.exit()
 
 
-    def test_6_thing_model_generation(self):
-        pass
-        # basic test only to make sure nothing is fundamentally wrong
-        # thing = self.thing_cls(id="test_servers_init", log_level=logging.WARN)
-        # self.assertIsInstance(thing.get_thing_description(), dict)
-        # self.assertIsInstance(thing.get_our_temp_thing_description(), dict)
-     
-        # start_thing_forked(self.thing_cls, id='test-gui-resource-generation', log_level=logging.WARN)
-        # thing_client = ObjectProxy('test-gui-resource-generation')
-        # self.assertIsInstance(thing_client.get_our_temp_thing_description(), dict)
-        # thing_client.exit()
-
-
-
-class TestOceanOpticsSpectrometer(TestThing):
+    
+class TestOceanOpticsSpectrometer(TestThingInit):
     """test Thing subclass example"""
 
     @classmethod
@@ -648,7 +635,7 @@ def test_6_db_properties(self):
 
 def load_tests(loader, tests, pattern):
     suite = unittest.TestSuite()
-    suite.addTest(unittest.TestLoader().loadTestsFromTestCase(TestThing))
+    suite.addTest(unittest.TestLoader().loadTestsFromTestCase(TestThingInit))
     suite.addTest(unittest.TestLoader().loadTestsFromTestCase(TestOceanOpticsSpectrometer))
     suite.addTest(unittest.TestLoader().loadTestsFromTestCase(TestMetaclass))
     suite.addTest(unittest.TestLoader().loadTestsFromTestCase(TestActionRegistry))