undo changes in this one file

Author: sleepyStick

test/test_bson.py

@@ -1045,46 +1045,46 @@ def test_exception_wrapping(self):
 
     def test_minkey_maxkey_comparison(self):
         # MinKey's <, <=, >, >=, !=, and ==.
-        self.assertLess(MinKey(), None)
-        self.assertLess(MinKey(), 1)
-        self.assertLessEqual(MinKey(), 1)
-        self.assertLessEqual(MinKey(), MinKey())
-        self.assertLessEqual(MinKey(), None)
-        self.assertLessEqual(MinKey(), 1)
-        self.assertLess(MinKey(), 1)
-        self.assertGreaterEqual(MinKey(), MinKey())
-        self.assertNotEqual(MinKey(), 1)
-        self.assertNotEqual(MinKey(), 1)
-        self.assertEqual(MinKey(), MinKey())
+        self.assertTrue(MinKey() < None)
+        self.assertTrue(MinKey() < 1)
+        self.assertTrue(MinKey() <= 1)
+        self.assertTrue(MinKey() <= MinKey())
+        self.assertFalse(MinKey() > None)
+        self.assertFalse(MinKey() > 1)
+        self.assertFalse(MinKey() >= 1)
+        self.assertTrue(MinKey() >= MinKey())
+        self.assertTrue(MinKey() != 1)
+        self.assertFalse(MinKey() == 1)
+        self.assertTrue(MinKey() == MinKey())
 
         # MinKey compared to MaxKey.
-        self.assertLess(MinKey(), MaxKey())
-        self.assertLessEqual(MinKey(), MaxKey())
-        self.assertLessEqual(MinKey(), MaxKey())
-        self.assertLess(MinKey(), MaxKey())
-        self.assertNotEqual(MinKey(), MaxKey())
-        self.assertNotEqual(MinKey(), MaxKey())
+        self.assertTrue(MinKey() < MaxKey())
+        self.assertTrue(MinKey() <= MaxKey())
+        self.assertFalse(MinKey() > MaxKey())
+        self.assertFalse(MinKey() >= MaxKey())
+        self.assertTrue(MinKey() != MaxKey())
+        self.assertFalse(MinKey() == MaxKey())
 
         # MaxKey's <, <=, >, >=, !=, and ==.
-        self.assertGreaterEqual(MaxKey(), None)
-        self.assertGreaterEqual(MaxKey(), 1)
-        self.assertGreater(MaxKey(), 1)
-        self.assertLessEqual(MaxKey(), MaxKey())
-        self.assertGreater(MaxKey(), None)
-        self.assertGreater(MaxKey(), 1)
-        self.assertGreaterEqual(MaxKey(), 1)
-        self.assertGreaterEqual(MaxKey(), MaxKey())
-        self.assertNotEqual(MaxKey(), 1)
-        self.assertNotEqual(MaxKey(), 1)
-        self.assertEqual(MaxKey(), MaxKey())
+        self.assertFalse(MaxKey() < None)
+        self.assertFalse(MaxKey() < 1)
+        self.assertFalse(MaxKey() <= 1)
+        self.assertTrue(MaxKey() <= MaxKey())
+        self.assertTrue(MaxKey() > None)
+        self.assertTrue(MaxKey() > 1)
+        self.assertTrue(MaxKey() >= 1)
+        self.assertTrue(MaxKey() >= MaxKey())
+        self.assertTrue(MaxKey() != 1)
+        self.assertFalse(MaxKey() == 1)
+        self.assertTrue(MaxKey() == MaxKey())
 
         # MaxKey compared to MinKey.
-        self.assertGreaterEqual(MaxKey(), MinKey())
-        self.assertGreater(MaxKey(), MinKey())
-        self.assertGreater(MaxKey(), MinKey())
-        self.assertGreaterEqual(MaxKey(), MinKey())
-        self.assertNotEqual(MaxKey(), MinKey())
-        self.assertNotEqual(MaxKey(), MinKey())
+        self.assertFalse(MaxKey() < MinKey())
+        self.assertFalse(MaxKey() <= MinKey())
+        self.assertTrue(MaxKey() > MinKey())
+        self.assertTrue(MaxKey() >= MinKey())
+        self.assertTrue(MaxKey() != MinKey())
+        self.assertFalse(MaxKey() == MinKey())
 
     def test_minkey_maxkey_hash(self):
         self.assertEqual(hash(MaxKey()), hash(MaxKey()))
@@ -1094,25 +1094,25 @@ def test_minkey_maxkey_hash(self):
     def test_timestamp_comparison(self):
         # Timestamp is initialized with time, inc. Time is the more
         # significant comparand.
-        self.assertLess(Timestamp(1, 0), Timestamp(2, 17))
-        self.assertGreater(Timestamp(2, 0), Timestamp(1, 0))
-        self.assertLessEqual(Timestamp(1, 7), Timestamp(2, 0))
-        self.assertGreaterEqual(Timestamp(2, 0), Timestamp(1, 1))
-        self.assertLessEqual(Timestamp(2, 0), Timestamp(2, 0))
-        self.assertGreaterEqual(Timestamp(2, 0), Timestamp(2, 0))
-        self.assertLessEqual(Timestamp(1, 0), Timestamp(2, 0))
+        self.assertTrue(Timestamp(1, 0) < Timestamp(2, 17))
+        self.assertTrue(Timestamp(2, 0) > Timestamp(1, 0))
+        self.assertTrue(Timestamp(1, 7) <= Timestamp(2, 0))
+        self.assertTrue(Timestamp(2, 0) >= Timestamp(1, 1))
+        self.assertTrue(Timestamp(2, 0) <= Timestamp(2, 0))
+        self.assertTrue(Timestamp(2, 0) >= Timestamp(2, 0))
+        self.assertFalse(Timestamp(1, 0) > Timestamp(2, 0))
 
         # Comparison by inc.
-        self.assertLess(Timestamp(1, 0), Timestamp(1, 1))
-        self.assertGreater(Timestamp(1, 1), Timestamp(1, 0))
-        self.assertLessEqual(Timestamp(1, 0), Timestamp(1, 0))
-        self.assertLessEqual(Timestamp(1, 0), Timestamp(1, 1))
-        self.assertLess(Timestamp(1, 0), Timestamp(1, 1))
-        self.assertGreaterEqual(Timestamp(1, 0), Timestamp(1, 0))
-        self.assertGreaterEqual(Timestamp(1, 1), Timestamp(1, 0))
-        self.assertGreater(Timestamp(1, 1), Timestamp(1, 0))
-        self.assertLessEqual(Timestamp(1, 0), Timestamp(1, 0))
-        self.assertLessEqual(Timestamp(1, 0), Timestamp(1, 0))
+        self.assertTrue(Timestamp(1, 0) < Timestamp(1, 1))
+        self.assertTrue(Timestamp(1, 1) > Timestamp(1, 0))
+        self.assertTrue(Timestamp(1, 0) <= Timestamp(1, 0))
+        self.assertTrue(Timestamp(1, 0) <= Timestamp(1, 1))
+        self.assertFalse(Timestamp(1, 0) >= Timestamp(1, 1))
+        self.assertTrue(Timestamp(1, 0) >= Timestamp(1, 0))
+        self.assertTrue(Timestamp(1, 1) >= Timestamp(1, 0))
+        self.assertFalse(Timestamp(1, 1) <= Timestamp(1, 0))
+        self.assertTrue(Timestamp(1, 0) <= Timestamp(1, 0))
+        self.assertFalse(Timestamp(1, 0) > Timestamp(1, 0))
 
     def test_timestamp_highorder_bits(self):
         doc = {"a": Timestamp(0xFFFFFFFF, 0xFFFFFFFF)}