Merge pull request #1209 from ingwinlu/feature_comparable_spec_classes

Implement comparable spec classes

pika/amqp_object.py

@@ -21,6 +21,12 @@ def __repr__(self):
             return "<%s>" % self.NAME
         return "<%s(%s)>" % (self.NAME, sorted(items))
 
+    def __eq__(self, other):
+        if other is not None:
+            return self.__dict__ == other.__dict__
+        else:
+            return False
+
 
 class Class(AMQPObject):
     """Is extended by AMQP classes"""
@@ -40,8 +46,8 @@ def _set_content(self, properties, body):
         :param bytes body: The message body
 
         """
-        self._properties = properties # pylint: disable=W0201
-        self._body = body # pylint: disable=W0201
+        self._properties = properties  # pylint: disable=W0201
+        self._body = body  # pylint: disable=W0201
 
     def get_properties(self):
         """Return the properties if they are set.

tests/unit/amqp_object_tests.py

@@ -17,11 +17,27 @@ def test_repr_items(self):
         setattr(obj, 'baz', 'qux')
         self.assertEqual(repr(obj), "<AMQPObject(['baz=qux', 'foo=bar'])>")
 
+    def test_equality(self):
+        a = amqp_object.AMQPObject()
+        b = amqp_object.AMQPObject()
+        self.assertEqual(a, b)
+
+        setattr(a, "a_property", "test")
+        self.assertNotEqual(a, b)
+
+        setattr(b, "a_property", "test")
+        self.assertEqual(a, b)
+
 
 class ClassTests(unittest.TestCase):
     def test_base_name(self):
         self.assertEqual(amqp_object.Class().NAME, 'Unextended Class')
 
+    def test_equality(self):
+        a = amqp_object.Class()
+        b = amqp_object.Class()
+        self.assertEqual(a, b)
+
 
 class MethodTests(unittest.TestCase):
     def test_base_name(self):

tests/unit/spec_tests.py

@@ -0,0 +1,26 @@
+# -*- coding: utf8 -*-
+"""
+Tests for pika.spec
+
+"""
+import unittest
+
+from pika import spec
+
+
+class BasicPropertiesTests(unittest.TestCase):
+    def test_equality(self):
+        a = spec.BasicProperties(content_type='text/plain')
+        self.assertEqual(a, a)
+        self.assertNotEqual(a, None)
+
+        b = spec.BasicProperties()
+        self.assertNotEqual(a, b)
+        b.content_type = 'text/plain'
+        self.assertEqual(a, b)
+
+        a.correlation_id = 'abc123'
+        self.assertNotEqual(a, b)
+
+        b.correlation_id = 'abc123'
+        self.assertEqual(a, b)

utils/codegen.py

@@ -1,6 +1,12 @@
 """
 codegen.py generates pika/spec.py
 
+The required spec json file can be found at
+https://github.com/rabbitmq/rabbitmq-codegen
+.
+
+After cloning it run the following to generate a spec.py file:
+python2 ./codegen.py ../../rabbitmq-codegen
 """
 from __future__ import nested_scopes