Improved object property tests

test/helpers/standard_interface_tests.py

@@ -16,6 +16,17 @@ def check_repr(test, obj):
         % (type(obj).__name__,))
 
 
+def check_json(test, obj):
+    val = obj.to_json()
+    test.assertEqual(val.get('id'), obj.id)
+    test.assertEqual(val.get('name'), obj.name)
+
+
+def check_obj_properties(test, obj):
+    test.assertEqual(obj, obj, "Object should be equal to itself")
+    test.assertFalse(obj != obj, "Object inequality should be false")
+
+
 def check_list(test, service, obj):
     list_objs = service.list()
     test.assertIsInstance(list_objs, ResultList)
@@ -94,6 +105,8 @@ def check_delete(test, service, obj, perform_delete=False):
 
 def check_standard_behaviour(test, service, obj):
     check_repr(test, obj)
+    check_json(test, obj)
+    check_obj_properties(test, obj)
     objs_list = check_list(test, service, obj)
     objs_iter = check_iter(test, service, obj)
     objs_find = check_find(test, service, obj)

test/test_security_service.py

@@ -37,16 +37,6 @@ class CloudSecurityServiceTestCase(ProviderTestBase):
             self.assertIsNotNone(
                 kp.material,
                 "KeyPair material is empty but it should not be.")
-            self.assertTrue(
-                kp == kp,
-                "The same key pair should be equal to self.")
-            json_repr = json.dumps(
-                {"material": kp.material, "id": name, "name": name},
-                sort_keys=True)
-            self.assertEqual(
-                kp.to_json(), json_repr,
-                "JSON key pair representation {0} does not match expected {1}"
-                .format(kp.to_json(), json_repr))
 
     def cleanup_sg(self, sg, net):
         with helpers.cleanup_action(