[Zope-Checkins] CVS: Zope3/lib/python/Interface/Common/tests - BaseTestMapping.py:1.1.2.2

[Jim Fulton]

Update of /cvs-repository/Zope3/lib/python/Interface/Common/tests
In directory cvs.zope.org:/tmp/cvs-serv30941/Common/tests

Modified Files:
      Tag: Zope3-publisher-refactor-branch
	BaseTestMapping.py 
Log Message:
Refactored to make it easier to reuse the mapping tests.


=== Zope3/lib/python/Interface/Common/tests/BaseTestMapping.py 1.1.2.1 => 1.1.2.2 ===
 from operator import __getitem__
 
+def testIReadMapping(self, inst, state, absent):
+
+    for key in state:
+        self.assertEqual(inst[key], state[key])
+        self.assertEqual(inst.get(key, None), state[key])
+
+    for key in absent:
+        self.assertEqual(inst.get(key, None), None)
+        self.assertEqual(inst.get(key), None)
+        self.assertEqual(inst.get(key, self), self)
+        self.assertRaises(KeyError, __getitem__, inst, key)        
+
+
+def test_keys(self, inst, state):
+    """Return the keys of the mapping object
+    """
+    inst_keys = list(inst.keys()); inst_keys.sort()
+    state_keys = list(state.keys()) ; state_keys.sort()
+    self.assertEqual(inst_keys, state_keys)
+
+def test_values(self, inst, state):
+    """Return the values of the mapping object
+    """
+    inst_values = list(inst.values()); inst_values.sort()
+    state_values = list(state.values()) ; state_values.sort()
+    self.assertEqual(inst_values, state_values)
+
+def test_items(self, inst, state):
+    """Return the items of the mapping object
+    """
+    inst_items = list(inst.items()); inst_items.sort()
+    state_items = list(state.items()) ; state_items.sort()
+    self.assertEqual(inst_items, state_items)
+
+def test___len__(self, inst, state):
+    """Return the number of items
+    """
+    self.assertEqual(len(inst), len(state))
+
+def testIEnumerableMapping(self, inst, state):
+    test_keys(self, inst, state)
+    test_items(self, inst, state)
+    test_values(self, inst, state)
+    test___len__(self, inst, state)
+
 class BaseTestIReadMapping:
 
     def testIReadMapping(self):
@@ -27,15 +72,7 @@
         state = self._IReadMapping__stateDict()
         absent = self._IReadMapping__absentKeys()
 
-        for key in state:
-            self.assertEqual(inst[key], state[key])
-            self.assertEqual(inst.get(key, None), state[key])
-
-        for key in absent:
-            self.assertEqual(inst.get(key, None), None)
-            self.assertEqual(inst.get(key), None)
-            self.assertEqual(inst.get(key, self), self)
-            self.assertRaises(KeyError, __getitem__, inst, key)        
+        testIReadMapping(self, inst, state, absent)
 
 
 class BaseTestIEnumerableMapping(BaseTestIReadMapping):
@@ -47,34 +84,28 @@
         """
         inst = self._IEnumerableMapping__sample()
         state = self._IEnumerableMapping__stateDict()
-        inst_keys = list(inst.keys()); inst_keys.sort()
-        state_keys = list(state.keys()) ; state_keys.sort()
-        self.assertEqual(inst_keys, state_keys)
+        test_keys(self, inst, state)
 
     def test_values(self):
         """Return the values of the mapping object
         """
         inst = self._IEnumerableMapping__sample()
         state = self._IEnumerableMapping__stateDict()
-        inst_values = list(inst.values()); inst_values.sort()
-        state_values = list(state.values()) ; state_values.sort()
-        self.assertEqual(inst_values, state_values)
+        test_values(self, inst, state)
 
     def test_items(self):
         """Return the items of the mapping object
         """
         inst = self._IEnumerableMapping__sample()
         state = self._IEnumerableMapping__stateDict()
-        inst_items = list(inst.items()); inst_items.sort()
-        state_items = list(state.items()) ; state_items.sort()
-        self.assertEqual(inst_items, state_items)
+        test_items(self, inst, state)
 
     def test___len__(self):
         """Return the number of items
         """
         inst = self._IEnumerableMapping__sample()
         state = self._IEnumerableMapping__stateDict()
-        self.assertEqual(len(inst), len(state))
+        test___len__(self, inst, state)
 
     def _IReadMapping__stateDict(self):
         return self._IEnumerableMapping__stateDict()