Changeset 12428

Timestamp:

8 Jan 2015, 14:48:29 (10 years ago)

Author:

Henrik Bettermann

Message:

Add Uli's modifications r12425 - r12427 also in waeup.ikoba.

Location:

main/waeup.ikoba/trunk/src/waeup/ikoba/products

Files:

• productoptions.py (modified) (2 diffs)
• tests/test_productoptions.py (modified) (1 diff)

main/waeup.ikoba/trunk/src/waeup/ikoba/products/productoptions.py

@@ -32 +32 @@
     IkobaObjectWidget, IkobaObjectDisplayWidget
     )
+
+#: A unique default value.
+DEFAULT_VALUE = object()
 
 
@@ -78 +81 @@
 
     def __eq__(self, obj):
-        default = object()
-        result = []
+        """Two ProductOption objects are equal if their `title`, `fee` and
+           `grade` are equal.
+        """
         for name in ('title', 'fee', 'currency',):
-            result.append(
-                getattr(self, name) == getattr(obj, name, default))
-        return False not in result
+            if getattr(self, name) != getattr(obj, name, DEFAULT_VALUE):
+                return False
+        return True
+
+    def __ne__(self, other):
+        """Two ProductOptions are not equal, if their equality test fails.
+
+        a != b <-> not(a == b). Python doc tell, that __ne__ should
+        also be provided, whenever __eq__ is implemented.
+        """
+        return not self.__eq__(other)
+
 
     def to_string(self):

main/waeup.ikoba/trunk/src/waeup/ikoba/products/tests/test_productoptions.py

@@ -86 +86 @@
         return
 
+    def test_eq(self):
+        # we can compare equality of ProductOption objects
+        item1 = ProductOption(self.valid_title, self.valid_fee, self.valid_currency)
+        item2 = ProductOption(self.valid_title, self.valid_fee, self.valid_currency)
+        item3 = ProductOption()
+        item4 = ProductOption()
+        assert item1 is not item2
+        assert item1 == item1
+        assert item1 == item2
+        assert item3 is not item4
+        assert item3 == item4
+        assert item1.__eq__(item2) is True
+        assert item1.__eq__(item3) is False
+
+    def test_ne(self):
+        # we can also tell, which ResultEntries are _not_ equal
+        item1 = ProductOption(self.valid_title, self.valid_fee, self.valid_currency)
+        item2 = ProductOption()
+        assert item1 != item2
+        assert item1.__ne__(item2) is True
+        assert item1.__ne__(item1) is False
+
+
+
 class ProductOptionFieldTests(unittest.TestCase):