Skip to content

Commit f7cefa1

Browse files
sleepySticksleepyStick
committed
assertFalse(... in ...) -> assertNotIn
1 parent 0424723 commit f7cefa1

11 files changed

+83
-77
lines changed

‎test/asynchronous/test_client.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -752,7 +752,7 @@ async def test_min_pool_size(self):
752752
lambda: len(server._pool.conns) == 10,
753753
"a closed socket gets replaced from the pool",
754754
)
755-
self.assertFalse(conn in server._pool.conns)
755+
self.assertNotIn(conn, server._pool.conns)
756756

757757
async def test_max_idle_time_checkout(self):
758758
# Use high frequency to test _get_socket_no_auth.
@@ -769,7 +769,7 @@ async def test_max_idle_time_checkout(self):
769769
async with server._pool.checkout() as new_con:
770770
self.assertNotEqual(conn, new_con)
771771
self.assertEqual(1, len(server._pool.conns))
772-
self.assertFalse(conn in server._pool.conns)
772+
self.assertNotIn(conn, server._pool.conns)
773773
self.assertIn(new_con, server._pool.conns)
774774

775775
# Test that connections are reused if maxIdleTimeMS is not set.

‎test/asynchronous/test_collection.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ async def lambda_test_2():
212212

213213
async def test_drop_nonexistent_collection(self):
214214
await self.db.drop_collection("test")
215-
self.assertFalse("test" in await self.db.list_collection_names())
215+
self.assertNotIn("test", await self.db.list_collection_names())
216216

217217
# No exception
218218
await self.db.drop_collection("test")
@@ -549,7 +549,7 @@ async def test_index_background(self):
549549
await db.test.create_index([("keya", ASCENDING)])
550550
await db.test.create_index([("keyb", ASCENDING)], background=False)
551551
await db.test.create_index([("keyc", ASCENDING)], background=True)
552-
self.assertFalse("background" in (await db.test.index_information())["keya_1"])
552+
self.assertNotIn("background", (await db.test.index_information())["keya_1"])
553553
self.assertFalse((await db.test.index_information())["keyb_1"]["background"])
554554
self.assertTrue((await db.test.index_information())["keyc_1"]["background"])
555555

@@ -702,7 +702,7 @@ async def test_field_selection(self):
702702

703703
doc = await anext(db.test.find({}, {"_id": False}))
704704
l = list(doc)
705-
self.assertFalse("_id" in l)
705+
self.assertNotIn("_id", l)
706706

707707
async def test_options(self):
708708
db = self.db
@@ -1141,13 +1141,13 @@ async def test_find_w_fields(self):
11411141
doc = await anext(db.test.find({}, ["x", "mike"]))
11421142
self.assertIn("mike", doc)
11431143
doc = await anext(db.test.find({}, ["x", "mike"]))
1144-
self.assertFalse("extra thing" in doc)
1144+
self.assertNotIn("extra thing", doc)
11451145
doc = await anext(db.test.find({}, ["mike"]))
1146-
self.assertFalse("x" in doc)
1146+
self.assertNotIn("x", doc)
11471147
doc = await anext(db.test.find({}, ["mike"]))
11481148
self.assertIn("mike", doc)
11491149
doc = await anext(db.test.find({}, ["mike"]))
1150-
self.assertFalse("extra thing" in doc)
1150+
self.assertNotIn("extra thing", doc)
11511151

11521152
@no_type_check
11531153
async def test_fields_specifier_as_dict(self):

‎test/asynchronous/test_cursor.py

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -240,16 +240,16 @@ async def test_max_await_time_ms(self):
240240
# Tailable_await defaults.
241241
await coll.find(cursor_type=CursorType.TAILABLE_AWAIT).to_list()
242242
# find
243-
self.assertFalse("maxTimeMS" in listener.started_events[0].command)
243+
self.assertNotIn("maxTimeMS", listener.started_events[0].command)
244244
# getMore
245-
self.assertFalse("maxTimeMS" in listener.started_events[1].command)
245+
self.assertNotIn("maxTimeMS", listener.started_events[1].command)
246246
listener.reset()
247247

248248
# Tailable_await with max_await_time_ms set.
249249
await coll.find(cursor_type=CursorType.TAILABLE_AWAIT).max_await_time_ms(99).to_list()
250250
# find
251251
self.assertEqual("find", listener.started_events[0].command_name)
252-
self.assertFalse("maxTimeMS" in listener.started_events[0].command)
252+
self.assertNotIn("maxTimeMS", listener.started_events[0].command)
253253
# getMore
254254
self.assertEqual("getMore", listener.started_events[1].command_name)
255255
self.assertIn("maxTimeMS", listener.started_events[1].command)
@@ -267,7 +267,7 @@ async def test_max_await_time_ms(self):
267267
self.assertEqual(99, listener.started_events[0].command["maxTimeMS"])
268268
# getMore
269269
self.assertEqual("getMore", listener.started_events[1].command_name)
270-
self.assertFalse("maxTimeMS" in listener.started_events[1].command)
270+
self.assertNotIn("maxTimeMS", listener.started_events[1].command)
271271
listener.reset()
272272

273273
# Tailable_await with both max_time_ms and max_await_time_ms
@@ -291,10 +291,10 @@ async def test_max_await_time_ms(self):
291291
await coll.find(batch_size=1).max_await_time_ms(99).to_list()
292292
# find
293293
self.assertEqual("find", listener.started_events[0].command_name)
294-
self.assertFalse("maxTimeMS" in listener.started_events[0].command)
294+
self.assertNotIn("maxTimeMS", listener.started_events[0].command)
295295
# getMore
296296
self.assertEqual("getMore", listener.started_events[1].command_name)
297-
self.assertFalse("maxTimeMS" in listener.started_events[1].command)
297+
self.assertNotIn("maxTimeMS", listener.started_events[1].command)
298298
listener.reset()
299299

300300
# Non tailable_await with max_time_ms
@@ -305,7 +305,7 @@ async def test_max_await_time_ms(self):
305305
self.assertEqual(99, listener.started_events[0].command["maxTimeMS"])
306306
# getMore
307307
self.assertEqual("getMore", listener.started_events[1].command_name)
308-
self.assertFalse("maxTimeMS" in listener.started_events[1].command)
308+
self.assertNotIn("maxTimeMS", listener.started_events[1].command)
309309

310310
# Non tailable_await with both max_time_ms and max_await_time_ms
311311
await coll.find(batch_size=1).max_time_ms(99).max_await_time_ms(88).to_list()
@@ -315,7 +315,7 @@ async def test_max_await_time_ms(self):
315315
self.assertEqual(99, listener.started_events[0].command["maxTimeMS"])
316316
# getMore
317317
self.assertEqual("getMore", listener.started_events[1].command_name)
318-
self.assertFalse("maxTimeMS" in listener.started_events[1].command)
318+
self.assertNotIn("maxTimeMS", listener.started_events[1].command)
319319

320320
@async_client_context.require_test_commands
321321
@async_client_context.require_no_mongos
@@ -933,16 +933,19 @@ async def test_clone(self):
933933
# Shallow copies can so can mutate
934934
cursor2 = copy.copy(cursor)
935935
cursor2._projection["cursor2"] = False
936-
self.assertIn(cursor._projection and "cursor2", cursor._projection)
936+
self.assertIsNotNone(cursor._projection)
937+
self.assertIn("cursor2", cursor._projection)
937938

938939
# Deepcopies and shouldn't mutate
939940
cursor3 = copy.deepcopy(cursor)
940941
cursor3._projection["cursor3"] = False
941-
self.assertFalse(cursor._projection and "cursor3" in cursor._projection)
942+
self.assertIsNotNone(cursor._projection)
943+
self.assertNotIn("cursor3", cursor._projection)
942944

943945
cursor4 = cursor.clone()
944946
cursor4._projection["cursor4"] = False
945-
self.assertFalse(cursor._projection and "cursor4" in cursor._projection)
947+
self.assertIsNotNone(cursor._projection)
948+
self.assertNotIn("cursor4", cursor._projection)
946949

947950
# Test memo when deepcopying queries
948951
query = {"hello": "world"}

‎test/asynchronous/test_database.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ async def test_list_collections(self):
295295

296296
# Checking only capped collections are present
297297
self.assertIn("test", colls)
298-
self.assertFalse("test.mike" in colls)
298+
self.assertNotIn("test.mike", colls)
299299

300300
# No collection containing a '$'.
301301
for coll in colls:
@@ -341,22 +341,22 @@ async def test_drop_collection(self):
341341
await db.test.insert_one({"dummy": "object"})
342342
self.assertIn("test", await db.list_collection_names())
343343
await db.drop_collection("test")
344-
self.assertFalse("test" in await db.list_collection_names())
344+
self.assertNotIn("test", await db.list_collection_names())
345345

346346
await db.test.insert_one({"dummy": "object"})
347347
self.assertIn("test", await db.list_collection_names())
348348
await db.drop_collection("test")
349-
self.assertFalse("test" in await db.list_collection_names())
349+
self.assertNotIn("test", await db.list_collection_names())
350350

351351
await db.test.insert_one({"dummy": "object"})
352352
self.assertIn("test", await db.list_collection_names())
353353
await db.drop_collection(db.test)
354-
self.assertFalse("test" in await db.list_collection_names())
354+
self.assertNotIn("test", await db.list_collection_names())
355355

356356
await db.test.insert_one({"dummy": "object"})
357357
self.assertIn("test", await db.list_collection_names())
358358
await db.test.drop()
359-
self.assertFalse("test" in await db.list_collection_names())
359+
self.assertNotIn("test", await db.list_collection_names())
360360
await db.test.drop()
361361

362362
await db.drop_collection(db.test.doesnotexist)

‎test/asynchronous/test_examples.py

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -482,19 +482,19 @@ async def test_projection(self):
482482
self.assertIn("_id", doc)
483483
self.assertIn("item", doc)
484484
self.assertIn("status", doc)
485-
self.assertFalse("size" in doc)
486-
self.assertFalse("instock" in doc)
485+
self.assertNotIn("size", doc)
486+
self.assertNotIn("instock", doc)
487487

488488
# Start Example 45
489489
cursor = db.inventory.find({"status": "A"}, {"item": 1, "status": 1, "_id": 0})
490490
# End Example 45
491491

492492
async for doc in cursor:
493-
self.assertFalse("_id" in doc)
493+
self.assertNotIn("_id", doc)
494494
self.assertIn("item", doc)
495495
self.assertIn("status", doc)
496-
self.assertFalse("size" in doc)
497-
self.assertFalse("instock" in doc)
496+
self.assertNotIn("size", doc)
497+
self.assertNotIn("instock", doc)
498498

499499
# Start Example 46
500500
cursor = db.inventory.find({"status": "A"}, {"status": 0, "instock": 0})
@@ -503,9 +503,9 @@ async def test_projection(self):
503503
async for doc in cursor:
504504
self.assertIn("_id", doc)
505505
self.assertIn("item", doc)
506-
self.assertFalse("status" in doc)
506+
self.assertNotIn("status", doc)
507507
self.assertIn("size", doc)
508-
self.assertFalse("instock" in doc)
508+
self.assertNotIn("instock", doc)
509509

510510
# Start Example 47
511511
cursor = db.inventory.find({"status": "A"}, {"item": 1, "status": 1, "size.uom": 1})
@@ -516,11 +516,11 @@ async def test_projection(self):
516516
self.assertIn("item", doc)
517517
self.assertIn("status", doc)
518518
self.assertIn("size", doc)
519-
self.assertFalse("instock" in doc)
519+
self.assertNotIn("instock", doc)
520520
size = doc["size"]
521521
self.assertIn("uom", size)
522-
self.assertFalse("h" in size)
523-
self.assertFalse("w" in size)
522+
self.assertNotIn("h", size)
523+
self.assertNotIn("w", size)
524524

525525
# Start Example 48
526526
cursor = db.inventory.find({"status": "A"}, {"size.uom": 0})
@@ -533,7 +533,7 @@ async def test_projection(self):
533533
self.assertIn("size", doc)
534534
self.assertIn("instock", doc)
535535
size = doc["size"]
536-
self.assertFalse("uom" in size)
536+
self.assertNotIn("uom", size)
537537
self.assertIn("h", size)
538538
self.assertIn("w", size)
539539

@@ -545,10 +545,10 @@ async def test_projection(self):
545545
self.assertIn("_id", doc)
546546
self.assertIn("item", doc)
547547
self.assertIn("status", doc)
548-
self.assertFalse("size" in doc)
548+
self.assertNotIn("size", doc)
549549
self.assertIn("instock", doc)
550550
for subdoc in doc["instock"]:
551-
self.assertFalse("warehouse" in subdoc)
551+
self.assertNotIn("warehouse", subdoc)
552552
self.assertIn("qty", subdoc)
553553

554554
# Start Example 50
@@ -561,7 +561,7 @@ async def test_projection(self):
561561
self.assertIn("_id", doc)
562562
self.assertIn("item", doc)
563563
self.assertIn("status", doc)
564-
self.assertFalse("size" in doc)
564+
self.assertNotIn("size", doc)
565565
self.assertIn("instock", doc)
566566
self.assertEqual(len(doc["instock"]), 1)
567567

‎test/test_client.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -731,7 +731,7 @@ def test_min_pool_size(self):
731731
lambda: len(server._pool.conns) == 10,
732732
"a closed socket gets replaced from the pool",
733733
)
734-
self.assertFalse(conn in server._pool.conns)
734+
self.assertNotIn(conn, server._pool.conns)
735735

736736
def test_max_idle_time_checkout(self):
737737
# Use high frequency to test _get_socket_no_auth.
@@ -746,7 +746,7 @@ def test_max_idle_time_checkout(self):
746746
with server._pool.checkout() as new_con:
747747
self.assertNotEqual(conn, new_con)
748748
self.assertEqual(1, len(server._pool.conns))
749-
self.assertFalse(conn in server._pool.conns)
749+
self.assertNotIn(conn, server._pool.conns)
750750
self.assertIn(new_con, server._pool.conns)
751751

752752
# Test that connections are reused if maxIdleTimeMS is not set.

‎test/test_collection.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ def lambda_test_2():
212212

213213
def test_drop_nonexistent_collection(self):
214214
self.db.drop_collection("test")
215-
self.assertFalse("test" in self.db.list_collection_names())
215+
self.assertNotIn("test", self.db.list_collection_names())
216216

217217
# No exception
218218
self.db.drop_collection("test")
@@ -539,7 +539,7 @@ def test_index_background(self):
539539
db.test.create_index([("keya", ASCENDING)])
540540
db.test.create_index([("keyb", ASCENDING)], background=False)
541541
db.test.create_index([("keyc", ASCENDING)], background=True)
542-
self.assertFalse("background" in (db.test.index_information())["keya_1"])
542+
self.assertNotIn("background", (db.test.index_information())["keya_1"])
543543
self.assertFalse((db.test.index_information())["keyb_1"]["background"])
544544
self.assertTrue((db.test.index_information())["keyc_1"]["background"])
545545

@@ -690,7 +690,7 @@ def test_field_selection(self):
690690

691691
doc = next(db.test.find({}, {"_id": False}))
692692
l = list(doc)
693-
self.assertFalse("_id" in l)
693+
self.assertNotIn("_id", l)
694694

695695
def test_options(self):
696696
db = self.db
@@ -1127,13 +1127,13 @@ def test_find_w_fields(self):
11271127
doc = next(db.test.find({}, ["x", "mike"]))
11281128
self.assertIn("mike", doc)
11291129
doc = next(db.test.find({}, ["x", "mike"]))
1130-
self.assertFalse("extra thing" in doc)
1130+
self.assertNotIn("extra thing", doc)
11311131
doc = next(db.test.find({}, ["mike"]))
1132-
self.assertFalse("x" in doc)
1132+
self.assertNotIn("x", doc)
11331133
doc = next(db.test.find({}, ["mike"]))
11341134
self.assertIn("mike", doc)
11351135
doc = next(db.test.find({}, ["mike"]))
1136-
self.assertFalse("extra thing" in doc)
1136+
self.assertNotIn("extra thing", doc)
11371137

11381138
@no_type_check
11391139
def test_fields_specifier_as_dict(self):

0 commit comments

Comments
 (0)