@@ -1045,46 +1045,46 @@ def test_exception_wrapping(self):
10451045
10461046 def test_minkey_maxkey_comparison (self ):
10471047 # MinKey's <, <=, >, >=, !=, and ==.
1048- self .assertLess (MinKey (), None )
1049- self .assertLess (MinKey (), 1 )
1050- self .assertLessEqual (MinKey (), 1 )
1051- self .assertLessEqual (MinKey (), MinKey ())
1052- self .assertLessEqual (MinKey (), None )
1053- self .assertLessEqual (MinKey (), 1 )
1054- self .assertLess (MinKey (), 1 )
1055- self .assertGreaterEqual (MinKey (), MinKey ())
1056- self .assertNotEqual (MinKey (), 1 )
1057- self .assertNotEqual (MinKey (), 1 )
1058- self .assertEqual (MinKey (), MinKey ())
1048+ self .assertTrue (MinKey () < None )
1049+ self .assertTrue (MinKey () < 1 )
1050+ self .assertTrue (MinKey () <= 1 )
1051+ self .assertTrue (MinKey () <= MinKey ())
1052+ self .assertFalse (MinKey () > None )
1053+ self .assertFalse (MinKey () > 1 )
1054+ self .assertFalse (MinKey () >= 1 )
1055+ self .assertTrue (MinKey () >= MinKey ())
1056+ self .assertTrue (MinKey () != 1 )
1057+ self .assertFalse (MinKey () == 1 )
1058+ self .assertTrue (MinKey () == MinKey ())
10591059
10601060 # MinKey compared to MaxKey.
1061- self .assertLess (MinKey (), MaxKey ())
1062- self .assertLessEqual (MinKey (), MaxKey ())
1063- self .assertLessEqual (MinKey (), MaxKey ())
1064- self .assertLess (MinKey (), MaxKey ())
1065- self .assertNotEqual (MinKey (), MaxKey ())
1066- self .assertNotEqual (MinKey (), MaxKey ())
1061+ self .assertTrue (MinKey () < MaxKey ())
1062+ self .assertTrue (MinKey () <= MaxKey ())
1063+ self .assertFalse (MinKey () > MaxKey ())
1064+ self .assertFalse (MinKey () >= MaxKey ())
1065+ self .assertTrue (MinKey () != MaxKey ())
1066+ self .assertFalse (MinKey () == MaxKey ())
10671067
10681068 # MaxKey's <, <=, >, >=, !=, and ==.
1069- self .assertGreaterEqual (MaxKey (), None )
1070- self .assertGreaterEqual (MaxKey (), 1 )
1071- self .assertGreater (MaxKey (), 1 )
1072- self .assertLessEqual (MaxKey (), MaxKey ())
1073- self .assertGreater (MaxKey (), None )
1074- self .assertGreater (MaxKey (), 1 )
1075- self .assertGreaterEqual (MaxKey (), 1 )
1076- self .assertGreaterEqual (MaxKey (), MaxKey ())
1077- self .assertNotEqual (MaxKey (), 1 )
1078- self .assertNotEqual (MaxKey (), 1 )
1079- self .assertEqual (MaxKey (), MaxKey ())
1069+ self .assertFalse (MaxKey () < None )
1070+ self .assertFalse (MaxKey () < 1 )
1071+ self .assertFalse (MaxKey () <= 1 )
1072+ self .assertTrue (MaxKey () <= MaxKey ())
1073+ self .assertTrue (MaxKey () > None )
1074+ self .assertTrue (MaxKey () > 1 )
1075+ self .assertTrue (MaxKey () >= 1 )
1076+ self .assertTrue (MaxKey () >= MaxKey ())
1077+ self .assertTrue (MaxKey () != 1 )
1078+ self .assertFalse (MaxKey () == 1 )
1079+ self .assertTrue (MaxKey () == MaxKey ())
10801080
10811081 # MaxKey compared to MinKey.
1082- self .assertGreaterEqual (MaxKey (), MinKey ())
1083- self .assertGreater (MaxKey (), MinKey ())
1084- self .assertGreater (MaxKey (), MinKey ())
1085- self .assertGreaterEqual (MaxKey (), MinKey ())
1086- self .assertNotEqual (MaxKey (), MinKey ())
1087- self .assertNotEqual (MaxKey (), MinKey ())
1082+ self .assertFalse (MaxKey () < MinKey ())
1083+ self .assertFalse (MaxKey () <= MinKey ())
1084+ self .assertTrue (MaxKey () > MinKey ())
1085+ self .assertTrue (MaxKey () >= MinKey ())
1086+ self .assertTrue (MaxKey () != MinKey ())
1087+ self .assertFalse (MaxKey () == MinKey ())
10881088
10891089 def test_minkey_maxkey_hash (self ):
10901090 self .assertEqual (hash (MaxKey ()), hash (MaxKey ()))
@@ -1094,25 +1094,25 @@ def test_minkey_maxkey_hash(self):
10941094 def test_timestamp_comparison (self ):
10951095 # Timestamp is initialized with time, inc. Time is the more
10961096 # significant comparand.
1097- self .assertLess (Timestamp (1 , 0 ), Timestamp (2 , 17 ))
1098- self .assertGreater (Timestamp (2 , 0 ), Timestamp (1 , 0 ))
1099- self .assertLessEqual (Timestamp (1 , 7 ), Timestamp (2 , 0 ))
1100- self .assertGreaterEqual (Timestamp (2 , 0 ), Timestamp (1 , 1 ))
1101- self .assertLessEqual (Timestamp (2 , 0 ), Timestamp (2 , 0 ))
1102- self .assertGreaterEqual (Timestamp (2 , 0 ), Timestamp (2 , 0 ))
1103- self .assertLessEqual (Timestamp (1 , 0 ), Timestamp (2 , 0 ))
1097+ self .assertTrue (Timestamp (1 , 0 ) < Timestamp (2 , 17 ))
1098+ self .assertTrue (Timestamp (2 , 0 ) > Timestamp (1 , 0 ))
1099+ self .assertTrue (Timestamp (1 , 7 ) <= Timestamp (2 , 0 ))
1100+ self .assertTrue (Timestamp (2 , 0 ) >= Timestamp (1 , 1 ))
1101+ self .assertTrue (Timestamp (2 , 0 ) <= Timestamp (2 , 0 ))
1102+ self .assertTrue (Timestamp (2 , 0 ) >= Timestamp (2 , 0 ))
1103+ self .assertFalse (Timestamp (1 , 0 ) > Timestamp (2 , 0 ))
11041104
11051105 # Comparison by inc.
1106- self .assertLess (Timestamp (1 , 0 ), Timestamp (1 , 1 ))
1107- self .assertGreater (Timestamp (1 , 1 ), Timestamp (1 , 0 ))
1108- self .assertLessEqual (Timestamp (1 , 0 ), Timestamp (1 , 0 ))
1109- self .assertLessEqual (Timestamp (1 , 0 ), Timestamp (1 , 1 ))
1110- self .assertLess (Timestamp (1 , 0 ), Timestamp (1 , 1 ))
1111- self .assertGreaterEqual (Timestamp (1 , 0 ), Timestamp (1 , 0 ))
1112- self .assertGreaterEqual (Timestamp (1 , 1 ), Timestamp (1 , 0 ))
1113- self .assertGreater (Timestamp (1 , 1 ), Timestamp (1 , 0 ))
1114- self .assertLessEqual (Timestamp (1 , 0 ), Timestamp (1 , 0 ))
1115- self .assertLessEqual (Timestamp (1 , 0 ), Timestamp (1 , 0 ))
1106+ self .assertTrue (Timestamp (1 , 0 ) < Timestamp (1 , 1 ))
1107+ self .assertTrue (Timestamp (1 , 1 ) > Timestamp (1 , 0 ))
1108+ self .assertTrue (Timestamp (1 , 0 ) <= Timestamp (1 , 0 ))
1109+ self .assertTrue (Timestamp (1 , 0 ) <= Timestamp (1 , 1 ))
1110+ self .assertFalse (Timestamp (1 , 0 ) >= Timestamp (1 , 1 ))
1111+ self .assertTrue (Timestamp (1 , 0 ) >= Timestamp (1 , 0 ))
1112+ self .assertTrue (Timestamp (1 , 1 ) >= Timestamp (1 , 0 ))
1113+ self .assertFalse (Timestamp (1 , 1 ) <= Timestamp (1 , 0 ))
1114+ self .assertTrue (Timestamp (1 , 0 ) <= Timestamp (1 , 0 ))
1115+ self .assertFalse (Timestamp (1 , 0 ) > Timestamp (1 , 0 ))
11161116
11171117 def test_timestamp_highorder_bits (self ):
11181118 doc = {"a" : Timestamp (0xFFFFFFFF , 0xFFFFFFFF )}
0 commit comments