add a missing test for normal reverse sort, and remove some verbose t…

…est assertion failure messages
zopefoundation · Apr 7, 2012 · 281a3a0 · 281a3a0
1 parent aa7a55f
commit 281a3a0
Showing 1 changed file with 13 additions and 8 deletions.
diff --git a/src/Products/ZCatalog/tests/test_catalog.py b/src/Products/ZCatalog/tests/test_catalog.py
@@ -537,8 +537,7 @@ def test_sort_on_good_index(self):
         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,27 +561,33 @@ def test_sort_on(self):
         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)
 
     def test_sort_on_missing(self):
         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)