diff options
author | Thiemo Kreuz <thiemo.kreuz@wikimedia.de> | 2019-09-17 16:31:49 +0200 |
---|---|---|
committer | Thiemo Kreuz (WMDE) <thiemo.kreuz@wikimedia.de> | 2019-09-19 15:35:23 +0000 |
commit | 32a429e8c455688b9613660b91db51dcf4eb8c19 (patch) | |
tree | 9ebc7a71e4d4aed4166a802d4f60f98beaab4f11 /tests/phpunit/includes/jobqueue/JobQueueTest.php | |
parent | 78fc6fe8659f1b7d67e7ca2e40640415a9d58ddc (diff) | |
download | mediawikicore-32a429e8c455688b9613660b91db51dcf4eb8c19.tar.gz mediawikicore-32a429e8c455688b9613660b91db51dcf4eb8c19.zip |
tests: Prefer assertSame() when comparing the integer 0
assertSame() is guaranteed to not do any type conversion. This can be
critical when acciden tially comparing, for example, 0 to 0.0.
Change-Id: Iffcc9bda69573623ba14af655dcd697d0fcce525
Diffstat (limited to 'tests/phpunit/includes/jobqueue/JobQueueTest.php')
-rw-r--r-- | tests/phpunit/includes/jobqueue/JobQueueTest.php | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/tests/phpunit/includes/jobqueue/JobQueueTest.php b/tests/phpunit/includes/jobqueue/JobQueueTest.php index 8f8dde55595e..1db708540fa5 100644 --- a/tests/phpunit/includes/jobqueue/JobQueueTest.php +++ b/tests/phpunit/includes/jobqueue/JobQueueTest.php @@ -108,8 +108,8 @@ class JobQueueTest extends MediaWikiTestCase { $this->assertTrue( $queue->isEmpty(), "Queue is empty ($desc)" ); $queue->flushCaches(); - $this->assertEquals( 0, $queue->getSize(), "Queue is empty ($desc)" ); - $this->assertEquals( 0, $queue->getAcquiredCount(), "Queue is empty ($desc)" ); + $this->assertSame( 0, $queue->getSize(), "Queue is empty ($desc)" ); + $this->assertSame( 0, $queue->getAcquiredCount(), "Queue is empty ($desc)" ); $this->assertNull( $queue->push( $this->newJob() ), "Push worked ($desc)" ); $this->assertNull( $queue->batchPush( [ $this->newJob() ] ), "Push worked ($desc)" ); @@ -118,7 +118,7 @@ class JobQueueTest extends MediaWikiTestCase { $queue->flushCaches(); $this->assertEquals( 2, $queue->getSize(), "Queue size is correct ($desc)" ); - $this->assertEquals( 0, $queue->getAcquiredCount(), "No jobs active ($desc)" ); + $this->assertSame( 0, $queue->getAcquiredCount(), "No jobs active ($desc)" ); $jobs = iterator_to_array( $queue->getAllQueuedJobs() ); $this->assertEquals( 2, count( $jobs ), "Queue iterator size is correct ($desc)" ); @@ -135,7 +135,7 @@ class JobQueueTest extends MediaWikiTestCase { $job2 = $queue->pop(); $this->assertTrue( $queue->isEmpty(), "Queue is empty ($desc)" ); - $this->assertEquals( 0, $queue->getSize(), "Queue is empty ($desc)" ); + $this->assertSame( 0, $queue->getSize(), "Queue is empty ($desc)" ); $queue->flushCaches(); if ( $recycles ) { @@ -152,7 +152,7 @@ class JobQueueTest extends MediaWikiTestCase { $queue->ack( $job2 ); $queue->flushCaches(); - $this->assertEquals( 0, $queue->getAcquiredCount(), "Active job count ($desc)" ); + $this->assertSame( 0, $queue->getAcquiredCount(), "Active job count ($desc)" ); $this->assertNull( $queue->batchPush( [ $this->newJob(), $this->newJob() ] ), "Push worked ($desc)" ); @@ -161,7 +161,7 @@ class JobQueueTest extends MediaWikiTestCase { $queue->delete(); $queue->flushCaches(); $this->assertTrue( $queue->isEmpty(), "Queue is empty ($desc)" ); - $this->assertEquals( 0, $queue->getSize(), "Queue is empty ($desc)" ); + $this->assertSame( 0, $queue->getSize(), "Queue is empty ($desc)" ); } /** @@ -177,8 +177,8 @@ class JobQueueTest extends MediaWikiTestCase { $this->assertTrue( $queue->isEmpty(), "Queue is empty ($desc)" ); $queue->flushCaches(); - $this->assertEquals( 0, $queue->getSize(), "Queue is empty ($desc)" ); - $this->assertEquals( 0, $queue->getAcquiredCount(), "Queue is empty ($desc)" ); + $this->assertSame( 0, $queue->getSize(), "Queue is empty ($desc)" ); + $this->assertSame( 0, $queue->getAcquiredCount(), "Queue is empty ($desc)" ); $this->assertNull( $queue->batchPush( @@ -190,7 +190,7 @@ class JobQueueTest extends MediaWikiTestCase { $queue->flushCaches(); $this->assertEquals( 1, $queue->getSize(), "Queue size is correct ($desc)" ); - $this->assertEquals( 0, $queue->getAcquiredCount(), "No jobs active ($desc)" ); + $this->assertSame( 0, $queue->getAcquiredCount(), "No jobs active ($desc)" ); $this->assertNull( $queue->batchPush( @@ -203,13 +203,13 @@ class JobQueueTest extends MediaWikiTestCase { $queue->flushCaches(); $this->assertEquals( 1, $queue->getSize(), "Queue size is correct ($desc)" ); - $this->assertEquals( 0, $queue->getAcquiredCount(), "No jobs active ($desc)" ); + $this->assertSame( 0, $queue->getAcquiredCount(), "No jobs active ($desc)" ); $job1 = $queue->pop(); $this->assertTrue( $queue->isEmpty(), "Queue is empty ($desc)" ); $queue->flushCaches(); - $this->assertEquals( 0, $queue->getSize(), "Queue is empty ($desc)" ); + $this->assertSame( 0, $queue->getSize(), "Queue is empty ($desc)" ); if ( $recycles ) { $this->assertEquals( 1, $queue->getAcquiredCount(), "Active job count ($desc)" ); } @@ -217,7 +217,7 @@ class JobQueueTest extends MediaWikiTestCase { $queue->ack( $job1 ); $queue->flushCaches(); - $this->assertEquals( 0, $queue->getAcquiredCount(), "Active job count ($desc)" ); + $this->assertSame( 0, $queue->getAcquiredCount(), "Active job count ($desc)" ); } /** @@ -256,8 +256,8 @@ class JobQueueTest extends MediaWikiTestCase { $this->assertTrue( $queue->isEmpty(), "Queue is empty ($desc)" ); $queue->flushCaches(); - $this->assertEquals( 0, $queue->getSize(), "Queue is empty ($desc)" ); - $this->assertEquals( 0, $queue->getAcquiredCount(), "Queue is empty ($desc)" ); + $this->assertSame( 0, $queue->getSize(), "Queue is empty ($desc)" ); + $this->assertSame( 0, $queue->getAcquiredCount(), "Queue is empty ($desc)" ); $root1 = Job::newRootJobParams( "nulljobspam:testId" ); // task ID/timestamp for ( $i = 0; $i < 5; ++$i ) { @@ -282,7 +282,7 @@ class JobQueueTest extends MediaWikiTestCase { $queue->flushCaches(); $this->assertEquals( 10, $queue->getSize(), "Queue size is correct ($desc)" ); - $this->assertEquals( 0, $queue->getAcquiredCount(), "No jobs active ($desc)" ); + $this->assertSame( 0, $queue->getAcquiredCount(), "No jobs active ($desc)" ); $dupcount = 0; $jobs = []; @@ -314,8 +314,8 @@ class JobQueueTest extends MediaWikiTestCase { $this->assertTrue( $queue->isEmpty(), "Queue is empty ($desc)" ); $queue->flushCaches(); - $this->assertEquals( 0, $queue->getSize(), "Queue is empty ($desc)" ); - $this->assertEquals( 0, $queue->getAcquiredCount(), "Queue is empty ($desc)" ); + $this->assertSame( 0, $queue->getSize(), "Queue is empty ($desc)" ); + $this->assertSame( 0, $queue->getAcquiredCount(), "Queue is empty ($desc)" ); for ( $i = 0; $i < 10; ++$i ) { $this->assertNull( $queue->push( $this->newJob( $i ) ), "Push worked ($desc)" ); @@ -332,8 +332,8 @@ class JobQueueTest extends MediaWikiTestCase { $this->assertFalse( $queue->pop(), "Queue is not empty ($desc)" ); $queue->flushCaches(); - $this->assertEquals( 0, $queue->getSize(), "Queue is empty ($desc)" ); - $this->assertEquals( 0, $queue->getAcquiredCount(), "No jobs active ($desc)" ); + $this->assertSame( 0, $queue->getSize(), "Queue is empty ($desc)" ); + $this->assertSame( 0, $queue->getAcquiredCount(), "No jobs active ($desc)" ); } /** |