Skip to content

Commit d3d1811

Browse files
GromNaNGromNaN
committed
Fix tests by comparing ReadPreference objects
1 parent 0e1901c commit d3d1811

File tree

3 files changed

+13
-25
lines changed

3 files changed

+13
-25
lines changed

‎tests/ClientTest.php

Lines changed: 5 additions & 9 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' => 'secondaryPreferred',
83+
'readPreference' => ReadPreference::SECONDARY_PREFERRED,
8484
'w' => WriteConcern::MAJORITY,
8585
];
8686

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

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

118117
$this->assertInstanceOf(ReadConcern::class, $debug['readConcern']);
119118
$this->assertSame(ReadConcern::LOCAL, $debug['readConcern']->getLevel());
120-
$this->assertInstanceOf(ReadPreference::class, $debug['readPreference']);
121-
$this->assertSame(ReadPreference::SECONDARY_PREFERRED, $debug['readPreference']->getMode());
119+
$this->assertEquals(new ReadPreference(ReadPreference::SECONDARY_PREFERRED), $debug['readPreference']);
122120
$this->assertIsArray($debug['typeMap']);
123121
$this->assertSame(['root' => 'array'], $debug['typeMap']);
124122
$this->assertInstanceOf(WriteConcern::class, $debug['writeConcern']);
@@ -156,8 +154,7 @@ public function testSelectDatabaseInheritsOptions(): void
156154

157155
$this->assertInstanceOf(ReadConcern::class, $debug['readConcern']);
158156
$this->assertSame(ReadConcern::LOCAL, $debug['readConcern']->getLevel());
159-
$this->assertInstanceOf(ReadPreference::class, $debug['readPreference']);
160-
$this->assertSame(ReadPreference::SECONDARY_PREFERRED, $debug['readPreference']->getMode());
157+
$this->assertEquals(new ReadPreference(ReadPreference::SECONDARY_PREFERRED), $debug['readPreference']);
161158
$this->assertIsArray($debug['typeMap']);
162159
$this->assertSame(['root' => 'array'], $debug['typeMap']);
163160
$this->assertInstanceOf(WriteConcern::class, $debug['writeConcern']);
@@ -179,8 +176,7 @@ public function testSelectDatabasePassesOptions(): void
179176

180177
$this->assertInstanceOf(ReadConcern::class, $debug['readConcern']);
181178
$this->assertSame(ReadConcern::LOCAL, $debug['readConcern']->getLevel());
182-
$this->assertInstanceOf(ReadPreference::class, $debug['readPreference']);
183-
$this->assertSame(ReadPreference::SECONDARY_PREFERRED, $debug['readPreference']->getMode());
179+
$this->assertEquals(new ReadPreference(ReadPreference::SECONDARY_PREFERRED), $debug['readPreference']);
184180
$this->assertIsArray($debug['typeMap']);
185181
$this->assertSame(['root' => 'array'], $debug['typeMap']);
186182
$this->assertInstanceOf(WriteConcern::class, $debug['writeConcern']);

‎tests/Collection/CollectionFunctionalTest.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -385,8 +385,7 @@ 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->assertInstanceOf(ReadPreference::class, $debug['readPreference']);
389-
$this->assertSame(ReadPreference::SECONDARY_PREFERRED, $debug['readPreference']->getMode());
388+
$this->assertEquals(new ReadPreference(ReadPreference::SECONDARY_PREFERRED), $debug['readPreference']);
390389
$this->assertIsArray($debug['typeMap']);
391390
$this->assertSame(['root' => 'array'], $debug['typeMap']);
392391
$this->assertInstanceOf(WriteConcern::class, $debug['writeConcern']);
@@ -407,8 +406,7 @@ public function testWithOptionsPassesOptions(): void
407406

408407
$this->assertInstanceOf(ReadConcern::class, $debug['readConcern']);
409408
$this->assertSame(ReadConcern::LOCAL, $debug['readConcern']->getLevel());
410-
$this->assertInstanceOf(ReadPreference::class, $debug['readPreference']);
411-
$this->assertSame(ReadPreference::SECONDARY_PREFERRED, $debug['readPreference']->getMode());
409+
$this->assertEquals(new ReadPreference(ReadPreference::SECONDARY_PREFERRED), $debug['readPreference']);
412410
$this->assertIsArray($debug['typeMap']);
413411
$this->assertSame(['root' => 'array'], $debug['typeMap']);
414412
$this->assertInstanceOf(WriteConcern::class, $debug['writeConcern']);

‎tests/Database/DatabaseFunctionalTest.php

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -300,8 +300,7 @@ 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->assertInstanceOf(ReadPreference::class, $debug['readPreference']);
304-
$this->assertSame(ReadPreference::SECONDARY_PREFERRED, $debug['readPreference']->getMode());
303+
$this->assertEquals(new ReadPreference(ReadPreference::SECONDARY_PREFERRED), $debug['readPreference']);
305304
$this->assertIsArray($debug['typeMap']);
306305
$this->assertSame(['root' => 'array'], $debug['typeMap']);
307306
$this->assertInstanceOf(WriteConcern::class, $debug['writeConcern']);
@@ -322,8 +321,7 @@ public function testSelectCollectionPassesOptions(): void
322321

323322
$this->assertInstanceOf(ReadConcern::class, $debug['readConcern']);
324323
$this->assertSame(ReadConcern::LOCAL, $debug['readConcern']->getLevel());
325-
$this->assertInstanceOf(ReadPreference::class, $debug['readPreference']);
326-
$this->assertSame(ReadPreference::SECONDARY_PREFERRED, $debug['readPreference']->getMode());
324+
$this->assertEquals(new ReadPreference(ReadPreference::SECONDARY_PREFERRED), $debug['readPreference']);
327325
$this->assertIsArray($debug['typeMap']);
328326
$this->assertSame(['root' => 'array'], $debug['typeMap']);
329327
$this->assertInstanceOf(WriteConcern::class, $debug['writeConcern']);
@@ -348,8 +346,7 @@ public function testSelectGridFSBucketInheritsOptions(): void
348346
$this->assertSame(261120, $debug['chunkSizeBytes']);
349347
$this->assertInstanceOf(ReadConcern::class, $debug['readConcern']);
350348
$this->assertSame(ReadConcern::LOCAL, $debug['readConcern']->getLevel());
351-
$this->assertInstanceOf(ReadPreference::class, $debug['readPreference']);
352-
$this->assertSame(ReadPreference::SECONDARY_PREFERRED, $debug['readPreference']->getMode());
349+
$this->assertEquals(new ReadPreference(ReadPreference::SECONDARY_PREFERRED), $debug['readPreference']);
353350
$this->assertInstanceOf(WriteConcern::class, $debug['writeConcern']);
354351
$this->assertSame(WriteConcern::MAJORITY, $debug['writeConcern']->getW());
355352
}
@@ -373,8 +370,7 @@ public function testSelectGridFSBucketPassesOptions(): void
373370
$this->assertSame(8192, $debug['chunkSizeBytes']);
374371
$this->assertInstanceOf(ReadConcern::class, $debug['readConcern']);
375372
$this->assertSame(ReadConcern::LOCAL, $debug['readConcern']->getLevel());
376-
$this->assertInstanceOf(ReadPreference::class, $debug['readPreference']);
377-
$this->assertSame(ReadPreference::SECONDARY_PREFERRED, $debug['readPreference']->getMode());
373+
$this->assertEquals(new ReadPreference(ReadPreference::SECONDARY_PREFERRED), $debug['readPreference']);
378374
$this->assertInstanceOf(WriteConcern::class, $debug['writeConcern']);
379375
$this->assertSame(WriteConcern::MAJORITY, $debug['writeConcern']->getW());
380376
}
@@ -396,8 +392,7 @@ public function testWithOptionsInheritsOptions(): void
396392
$this->assertSame($this->getDatabaseName(), $debug['databaseName']);
397393
$this->assertInstanceOf(ReadConcern::class, $debug['readConcern']);
398394
$this->assertSame(ReadConcern::LOCAL, $debug['readConcern']->getLevel());
399-
$this->assertInstanceOf(ReadPreference::class, $debug['readPreference']);
400-
$this->assertSame(ReadPreference::SECONDARY_PREFERRED, $debug['readPreference']->getMode());
395+
$this->assertEquals(new ReadPreference(ReadPreference::SECONDARY_PREFERRED), $debug['readPreference']);
401396
$this->assertIsArray($debug['typeMap']);
402397
$this->assertSame(['root' => 'array'], $debug['typeMap']);
403398
$this->assertInstanceOf(WriteConcern::class, $debug['writeConcern']);
@@ -418,8 +413,7 @@ public function testWithOptionsPassesOptions(): void
418413

419414
$this->assertInstanceOf(ReadConcern::class, $debug['readConcern']);
420415
$this->assertSame(ReadConcern::LOCAL, $debug['readConcern']->getLevel());
421-
$this->assertInstanceOf(ReadPreference::class, $debug['readPreference']);
422-
$this->assertSame(ReadPreference::SECONDARY_PREFERRED, $debug['readPreference']->getMode());
416+
$this->assertEquals(new ReadPreference(ReadPreference::SECONDARY_PREFERRED), $debug['readPreference']);
423417
$this->assertIsArray($debug['typeMap']);
424418
$this->assertSame(['root' => 'array'], $debug['typeMap']);
425419
$this->assertInstanceOf(WriteConcern::class, $debug['writeConcern']);

0 commit comments

Comments
 (0)