[Checkins] SVN: Products.ZCatalog/trunk/src/Products/ZCatalog/tests/test_catalog.py add a missing test for normal reverse sort, and remove some verbose test assertion failure messages

Hano Schlichting cvs-admin at zope.org
Sat Apr 7 14:42:26 UTC 2012


Log message for revision 125081:
  add a missing test for normal reverse sort, and remove some verbose test assertion failure messages
  

Changed:
  U   Products.ZCatalog/trunk/src/Products/ZCatalog/tests/test_catalog.py

-=-
Modified: Products.ZCatalog/trunk/src/Products/ZCatalog/tests/test_catalog.py
===================================================================
--- Products.ZCatalog/trunk/src/Products/ZCatalog/tests/test_catalog.py	2012-04-07 14:35:05 UTC (rev 125080)
+++ Products.ZCatalog/trunk/src/Products/ZCatalog/tests/test_catalog.py	2012-04-07 14:42:22 UTC (rev 125081)
@@ -537,8 +537,7 @@
         catalog = self._make_one()
         upper = self.upper
         a = catalog(att1='att1', sort_on='num')
-        self.assertEqual(len(a), upper,
-                         'length should be %s, its %s' % (upper, len(a)))
+        self.assertEqual(len(a), upper)
         for x in range(self.upper):
             self.assertEqual(a[x].num, x)
 
@@ -562,8 +561,7 @@
         catalog = self._make_one()
         upper = self.upper
         a = catalog(sort_on='num', att2='att2')
-        self.assertEqual(len(a), upper,
-                         'length should be %s, its %s' % (upper, len(a)))
+        self.assertEqual(len(a), upper)
         for x in range(self.upper):
             self.assertEqual(a[x].num, x)
 
@@ -571,18 +569,25 @@
         catalog = self._make_one()
         upper = self.upper
         a = catalog(att2='att2')
-        self.assertEqual(len(a), upper,
-                         'length should be %s, its %s' % (upper, len(a)))
+        self.assertEqual(len(a), upper)
 
     def test_sort_on_two(self):
         catalog = self._make_one()
         upper = self.upper
         a = catalog(sort_on=('att1', 'num'), att1='att1')
-        self.assertEqual(len(a), upper,
-                         'length should be %s, its %s' % (upper, len(a)))
+        self.assertEqual(len(a), upper)
         for x in range(self.upper):
             self.assertEqual(a[x].num, x)
 
+    def test_sort_on_two_reverse(self):
+        catalog = self._make_one()
+        upper = self.upper
+        a = catalog(sort_on=('att1', 'num'), att1='att1',
+            sort_order='reverse')
+        self.assertEqual(len(a), upper)
+        for x in range(upper - 1):
+            self.assertTrue(a[x].num > a[x + 1].num)
+
     def test_sort_on_two_small_limit(self):
         catalog = self._make_one()
         a = catalog(sort_on=('att1', 'num'), att1='att1', sort_limit=10)



More information about the checkins mailing list