Skip to content

Commit 1ca89f6

Browse files
GromNaNGromNaN
committed
Revert "Fix tests by comparing ReadPreference objects"
This reverts commit d3d1811.
1 parent d3d1811 commit 1ca89f6

File tree

3 files changed

+25
-13
lines changed

3 files changed

+25
-13
lines changed

‎tests/ClientTest.php

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public function testSelectCollectionInheritsOptions(): void
8080
{
8181
$uriOptions = [
8282
'readConcernLevel' => ReadConcern::LOCAL,
83-
'readPreference' => ReadPreference::SECONDARY_PREFERRED,
83+
'readPreference' => 'secondaryPreferred',
8484
'w' => WriteConcern::MAJORITY,
8585
];
8686

@@ -94,7 +94,8 @@ public function testSelectCollectionInheritsOptions(): void
9494

9595
$this->assertInstanceOf(ReadConcern::class, $debug['readConcern']);
9696
$this->assertSame(ReadConcern::LOCAL, $debug['readConcern']->getLevel());
97-
$this->assertEquals(new ReadPreference(ReadPreference::SECONDARY_PREFERRED), $debug['readPreference']);
97+
$this->assertInstanceOf(ReadPreference::class, $debug['readPreference']);
98+
$this->assertSame(ReadPreference::SECONDARY_PREFERRED, $debug['readPreference']->getMode());
9899
$this->assertIsArray($debug['typeMap']);
99100
$this->assertSame(['root' => 'array'], $debug['typeMap']);
100101
$this->assertInstanceOf(WriteConcern::class, $debug['writeConcern']);
@@ -116,7 +117,8 @@ public function testSelectCollectionPassesOptions(): void
116117

117118
$this->assertInstanceOf(ReadConcern::class, $debug['readConcern']);
118119
$this->assertSame(ReadConcern::LOCAL, $debug['readConcern']->getLevel());
119-
$this->assertEquals(new ReadPreference(ReadPreference::SECONDARY_PREFERRED), $debug['readPreference']);
120+
$this->assertInstanceOf(ReadPreference::class, $debug['readPreference']);
121+
$this->assertSame(ReadPreference::SECONDARY_PREFERRED, $debug['readPreference']->getMode());
120122
$this->assertIsArray($debug['typeMap']);
121123
$this->assertSame(['root' => 'array'], $debug['typeMap']);
122124
$this->assertInstanceOf(WriteConcern::class, $debug['writeConcern']);
@@ -154,7 +156,8 @@ public function testSelectDatabaseInheritsOptions(): void
154156

155157
$this->assertInstanceOf(ReadConcern::class, $debug['readConcern']);
156158
$this->assertSame(ReadConcern::LOCAL, $debug['readConcern']->getLevel());
157-
$this->assertEquals(new ReadPreference(ReadPreference::SECONDARY_PREFERRED), $debug['readPreference']);
159+
$this->assertInstanceOf(ReadPreference::class, $debug['readPreference']);
160+
$this->assertSame(ReadPreference::SECONDARY_PREFERRED, $debug['readPreference']->getMode());
158161
$this->assertIsArray($debug['typeMap']);
159162
$this->assertSame(['root' => 'array'], $debug['typeMap']);
160163
$this->assertInstanceOf(WriteConcern::class, $debug['writeConcern']);
@@ -176,7 +179,8 @@ public function testSelectDatabasePassesOptions(): void
176179

177180
$this->assertInstanceOf(ReadConcern::class, $debug['readConcern']);
178181
$this->assertSame(ReadConcern::LOCAL, $debug['readConcern']->getLevel());
179-
$this->assertEquals(new ReadPreference(ReadPreference::SECONDARY_PREFERRED), $debug['readPreference']);
182+
$this->assertInstanceOf(ReadPreference::class, $debug['readPreference']);
183+
$this->assertSame(ReadPreference::SECONDARY_PREFERRED, $debug['readPreference']->getMode());
180184
$this->assertIsArray($debug['typeMap']);
181185
$this->assertSame(['root' => 'array'], $debug['typeMap']);
182186
$this->assertInstanceOf(WriteConcern::class, $debug['writeConcern']);

‎tests/Collection/CollectionFunctionalTest.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,8 @@ public function testWithOptionsInheritsOptions(): void
385385
$this->assertSame($this->getCollectionName(), $debug['collectionName']);
386386
$this->assertInstanceOf(ReadConcern::class, $debug['readConcern']);
387387
$this->assertSame(ReadConcern::LOCAL, $debug['readConcern']->getLevel());
388-
$this->assertEquals(new ReadPreference(ReadPreference::SECONDARY_PREFERRED), $debug['readPreference']);
388+
$this->assertInstanceOf(ReadPreference::class, $debug['readPreference']);
389+
$this->assertSame(ReadPreference::SECONDARY_PREFERRED, $debug['readPreference']->getMode());
389390
$this->assertIsArray($debug['typeMap']);
390391
$this->assertSame(['root' => 'array'], $debug['typeMap']);
391392
$this->assertInstanceOf(WriteConcern::class, $debug['writeConcern']);
@@ -406,7 +407,8 @@ public function testWithOptionsPassesOptions(): void
406407

407408
$this->assertInstanceOf(ReadConcern::class, $debug['readConcern']);
408409
$this->assertSame(ReadConcern::LOCAL, $debug['readConcern']->getLevel());
409-
$this->assertEquals(new ReadPreference(ReadPreference::SECONDARY_PREFERRED), $debug['readPreference']);
410+
$this->assertInstanceOf(ReadPreference::class, $debug['readPreference']);
411+
$this->assertSame(ReadPreference::SECONDARY_PREFERRED, $debug['readPreference']->getMode());
410412
$this->assertIsArray($debug['typeMap']);
411413
$this->assertSame(['root' => 'array'], $debug['typeMap']);
412414
$this->assertInstanceOf(WriteConcern::class, $debug['writeConcern']);

‎tests/Database/DatabaseFunctionalTest.php

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,8 @@ public function testSelectCollectionInheritsOptions(): void
300300
$this->assertSame($this->getCollectionName(), $debug['collectionName']);
301301
$this->assertInstanceOf(ReadConcern::class, $debug['readConcern']);
302302
$this->assertSame(ReadConcern::LOCAL, $debug['readConcern']->getLevel());
303-
$this->assertEquals(new ReadPreference(ReadPreference::SECONDARY_PREFERRED), $debug['readPreference']);
303+
$this->assertInstanceOf(ReadPreference::class, $debug['readPreference']);
304+
$this->assertSame(ReadPreference::SECONDARY_PREFERRED, $debug['readPreference']->getMode());
304305
$this->assertIsArray($debug['typeMap']);
305306
$this->assertSame(['root' => 'array'], $debug['typeMap']);
306307
$this->assertInstanceOf(WriteConcern::class, $debug['writeConcern']);
@@ -321,7 +322,8 @@ public function testSelectCollectionPassesOptions(): void
321322

322323
$this->assertInstanceOf(ReadConcern::class, $debug['readConcern']);
323324
$this->assertSame(ReadConcern::LOCAL, $debug['readConcern']->getLevel());
324-
$this->assertEquals(new ReadPreference(ReadPreference::SECONDARY_PREFERRED), $debug['readPreference']);
325+
$this->assertInstanceOf(ReadPreference::class, $debug['readPreference']);
326+
$this->assertSame(ReadPreference::SECONDARY_PREFERRED, $debug['readPreference']->getMode());
325327
$this->assertIsArray($debug['typeMap']);
326328
$this->assertSame(['root' => 'array'], $debug['typeMap']);
327329
$this->assertInstanceOf(WriteConcern::class, $debug['writeConcern']);
@@ -346,7 +348,8 @@ public function testSelectGridFSBucketInheritsOptions(): void
346348
$this->assertSame(261120, $debug['chunkSizeBytes']);
347349
$this->assertInstanceOf(ReadConcern::class, $debug['readConcern']);
348350
$this->assertSame(ReadConcern::LOCAL, $debug['readConcern']->getLevel());
349-
$this->assertEquals(new ReadPreference(ReadPreference::SECONDARY_PREFERRED), $debug['readPreference']);
351+
$this->assertInstanceOf(ReadPreference::class, $debug['readPreference']);
352+
$this->assertSame(ReadPreference::SECONDARY_PREFERRED, $debug['readPreference']->getMode());
350353
$this->assertInstanceOf(WriteConcern::class, $debug['writeConcern']);
351354
$this->assertSame(WriteConcern::MAJORITY, $debug['writeConcern']->getW());
352355
}
@@ -370,7 +373,8 @@ public function testSelectGridFSBucketPassesOptions(): void
370373
$this->assertSame(8192, $debug['chunkSizeBytes']);
371374
$this->assertInstanceOf(ReadConcern::class, $debug['readConcern']);
372375
$this->assertSame(ReadConcern::LOCAL, $debug['readConcern']->getLevel());
373-
$this->assertEquals(new ReadPreference(ReadPreference::SECONDARY_PREFERRED), $debug['readPreference']);
376+
$this->assertInstanceOf(ReadPreference::class, $debug['readPreference']);
377+
$this->assertSame(ReadPreference::SECONDARY_PREFERRED, $debug['readPreference']->getMode());
374378
$this->assertInstanceOf(WriteConcern::class, $debug['writeConcern']);
375379
$this->assertSame(WriteConcern::MAJORITY, $debug['writeConcern']->getW());
376380
}
@@ -392,7 +396,8 @@ public function testWithOptionsInheritsOptions(): void
392396
$this->assertSame($this->getDatabaseName(), $debug['databaseName']);
393397
$this->assertInstanceOf(ReadConcern::class, $debug['readConcern']);
394398
$this->assertSame(ReadConcern::LOCAL, $debug['readConcern']->getLevel());
395-
$this->assertEquals(new ReadPreference(ReadPreference::SECONDARY_PREFERRED), $debug['readPreference']);
399+
$this->assertInstanceOf(ReadPreference::class, $debug['readPreference']);
400+
$this->assertSame(ReadPreference::SECONDARY_PREFERRED, $debug['readPreference']->getMode());
396401
$this->assertIsArray($debug['typeMap']);
397402
$this->assertSame(['root' => 'array'], $debug['typeMap']);
398403
$this->assertInstanceOf(WriteConcern::class, $debug['writeConcern']);
@@ -413,7 +418,8 @@ public function testWithOptionsPassesOptions(): void
413418

414419
$this->assertInstanceOf(ReadConcern::class, $debug['readConcern']);
415420
$this->assertSame(ReadConcern::LOCAL, $debug['readConcern']->getLevel());
416-
$this->assertEquals(new ReadPreference(ReadPreference::SECONDARY_PREFERRED), $debug['readPreference']);
421+
$this->assertInstanceOf(ReadPreference::class, $debug['readPreference']);
422+
$this->assertSame(ReadPreference::SECONDARY_PREFERRED, $debug['readPreference']->getMode());
417423
$this->assertIsArray($debug['typeMap']);
418424
$this->assertSame(['root' => 'array'], $debug['typeMap']);
419425
$this->assertInstanceOf(WriteConcern::class, $debug['writeConcern']);

0 commit comments

Comments
 (0)