PYTHON-5392 Better test assertions for comparisons (#2350)

Co-authored-by: Noah Stapp <[email protected]>

Author: sleepyStick

test/asynchronous/test_bulk.py

@@ -994,7 +994,7 @@ async def test_write_concern_failure_ordered(self):
 
         # When talking to legacy servers there will be a
         # write concern error for each operation.
-        self.assertTrue(len(details["writeConcernErrors"]) > 0)
+        self.assertGreater(len(details["writeConcernErrors"]), 0)
 
         failed = details["writeConcernErrors"][0]
         self.assertEqual(64, failed["code"])
@@ -1035,7 +1035,7 @@ async def test_write_concern_failure_ordered(self):
             details,
         )
 
-        self.assertTrue(len(details["writeConcernErrors"]) > 1)
+        self.assertGreater(len(details["writeConcernErrors"]), 1)
         failed = details["writeErrors"][0]
         self.assertIn("duplicate", failed["errmsg"])
 
@@ -1073,7 +1073,7 @@ async def test_write_concern_failure_unordered(self):
         self.assertEqual(0, len(details["writeErrors"]))
         # When talking to legacy servers there will be a
         # write concern error for each operation.
-        self.assertTrue(len(details["writeConcernErrors"]) > 1)
+        self.assertGreater(len(details["writeConcernErrors"]), 1)
 
         await self.coll.delete_many({})
         await self.coll.create_index("a", unique=True)
@@ -1100,7 +1100,7 @@ async def test_write_concern_failure_unordered(self):
         self.assertEqual(1, len(details["writeErrors"]))
         # When talking to legacy servers there will be a
         # write concern error for each operation.
-        self.assertTrue(len(details["writeConcernErrors"]) > 1)
+        self.assertGreater(len(details["writeConcernErrors"]), 1)
 
         failed = details["writeErrors"][0]
         self.assertEqual(2, failed["index"])

test/asynchronous/test_client.py

@@ -1005,7 +1005,7 @@ async def test_list_databases(self):
         cursor = await self.client.list_databases()
         self.assertIsInstance(cursor, AsyncCommandCursor)
         helper_docs = await cursor.to_list()
-        self.assertTrue(len(helper_docs) > 0)
+        self.assertGreater(len(helper_docs), 0)
         self.assertEqual(len(helper_docs), len(cmd_docs))
         # PYTHON-3529 Some fields may change between calls, just compare names.
         for helper_doc, cmd_doc in zip(helper_docs, cmd_docs):

test/asynchronous/test_collection.py

@@ -500,7 +500,7 @@ async def test_index_text(self):
         # Sort by 'score' field.
         cursor.sort([("score", {"$meta": "textScore"})])
         results = await cursor.to_list()
-        self.assertTrue(results[0]["score"] >= results[1]["score"])
+        self.assertGreaterEqual(results[0]["score"], results[1]["score"])
 
         await db.test.drop_indexes()
 

test/asynchronous/test_database.py

@@ -239,7 +239,7 @@ async def test_check_exists(self):
         listener.reset()
         await db.drop_collection("unique")
         await db.create_collection("unique", check_exists=False)
-        self.assertTrue(len(listener.started_events) > 0)
+        self.assertGreater(len(listener.started_events), 0)
         self.assertNotIn("listCollections", listener.started_command_names())
 
     async def test_list_collections(self):

test/asynchronous/test_pooling.py

@@ -331,8 +331,9 @@ async def test_wait_queue_timeout(self):
                     pass
 
         duration = time.time() - start
-        self.assertTrue(
-            abs(wait_queue_timeout - duration) < 1,
+        self.assertLess(
+            abs(wait_queue_timeout - duration),
+            1,
             f"Waited {duration:.2f} seconds for a socket, expected {wait_queue_timeout:f}",
         )
 
@@ -547,7 +548,7 @@ async def f():
 
         await async_joinall(tasks)
         self.assertEqual(ntasks, self.n_passed)
-        self.assertTrue(len(cx_pool.conns) > 1)
+        self.assertGreater(len(cx_pool.conns), 1)
         self.assertEqual(0, cx_pool.requests)
 
     async def test_max_pool_size_none(self):
@@ -578,7 +579,7 @@ async def f():
 
         await async_joinall(tasks)
         self.assertEqual(ntasks, self.n_passed)
-        self.assertTrue(len(cx_pool.conns) > 1)
+        self.assertGreater(len(cx_pool.conns), 1)
         self.assertEqual(cx_pool.max_pool_size, float("inf"))
 
     async def test_max_pool_size_zero(self):

test/test_bson.py

@@ -1045,6 +1045,8 @@ def test_exception_wrapping(self):
 
     def test_minkey_maxkey_comparison(self):
         # MinKey's <, <=, >, >=, !=, and ==.
+        # These tests should be kept as assertTrue as opposed to using unittest's built-in comparison assertions because
+        # MinKey and MaxKey define their own __ge__, __le__, and other comparison attributes, and we want to explicitly test that.
         self.assertTrue(MinKey() < None)
         self.assertTrue(MinKey() < 1)
         self.assertTrue(MinKey() <= 1)

test/test_bulk.py

@@ -992,7 +992,7 @@ def test_write_concern_failure_ordered(self):
 
         # When talking to legacy servers there will be a
         # write concern error for each operation.
-        self.assertTrue(len(details["writeConcernErrors"]) > 0)
+        self.assertGreater(len(details["writeConcernErrors"]), 0)
 
         failed = details["writeConcernErrors"][0]
         self.assertEqual(64, failed["code"])
@@ -1033,7 +1033,7 @@ def test_write_concern_failure_ordered(self):
             details,
         )
 
-        self.assertTrue(len(details["writeConcernErrors"]) > 1)
+        self.assertGreater(len(details["writeConcernErrors"]), 1)
         failed = details["writeErrors"][0]
         self.assertIn("duplicate", failed["errmsg"])
 
@@ -1069,7 +1069,7 @@ def test_write_concern_failure_unordered(self):
         self.assertEqual(0, len(details["writeErrors"]))
         # When talking to legacy servers there will be a
         # write concern error for each operation.
-        self.assertTrue(len(details["writeConcernErrors"]) > 1)
+        self.assertGreater(len(details["writeConcernErrors"]), 1)
 
         self.coll.delete_many({})
         self.coll.create_index("a", unique=True)
@@ -1096,7 +1096,7 @@ def test_write_concern_failure_unordered(self):
         self.assertEqual(1, len(details["writeErrors"]))
         # When talking to legacy servers there will be a
         # write concern error for each operation.
-        self.assertTrue(len(details["writeConcernErrors"]) > 1)
+        self.assertGreater(len(details["writeConcernErrors"]), 1)
 
         failed = details["writeErrors"][0]
         self.assertEqual(2, failed["index"])

test/test_client.py

@@ -978,7 +978,7 @@ def test_list_databases(self):
         cursor = self.client.list_databases()
         self.assertIsInstance(cursor, CommandCursor)
         helper_docs = cursor.to_list()
-        self.assertTrue(len(helper_docs) > 0)
+        self.assertGreater(len(helper_docs), 0)
         self.assertEqual(len(helper_docs), len(cmd_docs))
         # PYTHON-3529 Some fields may change between calls, just compare names.
         for helper_doc, cmd_doc in zip(helper_docs, cmd_docs):

test/test_collection.py

@@ -490,7 +490,7 @@ def test_index_text(self):
         # Sort by 'score' field.
         cursor.sort([("score", {"$meta": "textScore"})])
         results = cursor.to_list()
-        self.assertTrue(results[0]["score"] >= results[1]["score"])
+        self.assertGreaterEqual(results[0]["score"], results[1]["score"])
 
         db.test.drop_indexes()
 

test/test_database.py

@@ -238,7 +238,7 @@ def test_check_exists(self):
         listener.reset()
         db.drop_collection("unique")
         db.create_collection("unique", check_exists=False)
-        self.assertTrue(len(listener.started_events) > 0)
+        self.assertGreater(len(listener.started_events), 0)
         self.assertNotIn("listCollections", listener.started_command_names())
 
     def test_list_collections(self):

test/test_objectid.py

@@ -92,7 +92,7 @@ def test_generation_time(self):
 
         self.assertEqual(utc, d2.tzinfo)
         d2 = d2.replace(tzinfo=None)
-        self.assertTrue(d2 - d1 < datetime.timedelta(seconds=2))
+        self.assertLess(d2 - d1, datetime.timedelta(seconds=2))
 
     def test_from_datetime(self):
         d = datetime.datetime.now(tz=datetime.timezone.utc).replace(tzinfo=None)

test/test_pooling.py

@@ -331,8 +331,9 @@ def test_wait_queue_timeout(self):
                     pass
 
         duration = time.time() - start
-        self.assertTrue(
-            abs(wait_queue_timeout - duration) < 1,
+        self.assertLess(
+            abs(wait_queue_timeout - duration),
+            1,
             f"Waited {duration:.2f} seconds for a socket, expected {wait_queue_timeout:f}",
         )
 
@@ -545,7 +546,7 @@ def f():
 
         joinall(tasks)
         self.assertEqual(ntasks, self.n_passed)
-        self.assertTrue(len(cx_pool.conns) > 1)
+        self.assertGreater(len(cx_pool.conns), 1)
         self.assertEqual(0, cx_pool.requests)
 
     def test_max_pool_size_none(self):
@@ -576,7 +577,7 @@ def f():
 
         joinall(tasks)
         self.assertEqual(ntasks, self.n_passed)
-        self.assertTrue(len(cx_pool.conns) > 1)
+        self.assertGreater(len(cx_pool.conns), 1)
         self.assertEqual(cx_pool.max_pool_size, float("inf"))
 
     def test_max_pool_size_zero(self):