From: Russ Nelson <nelson@users.mediawiki.org>
Date: Sun, 16 Oct 2011 22:18:18 +0000 (+0000)
Subject: StoreBatchTest counts now correct, and using assertEquals
X-Git-Tag: 1.31.0-rc.0~27060
X-Git-Url: http://git.cyclocoop.org/%24action?a=commitdiff_plain;h=95971a53517460b15e725dc5b0d8cab14cfd5193;p=lhc%2Fweb%2Fwiklou.git

StoreBatchTest counts now correct, and using assertEquals
---

diff --git a/tests/phpunit/includes/filerepo/StoreBatchTest.php b/tests/phpunit/includes/filerepo/StoreBatchTest.php
index 4924a4f4b0..60eba77310 100644
--- a/tests/phpunit/includes/filerepo/StoreBatchTest.php
+++ b/tests/phpunit/includes/filerepo/StoreBatchTest.php
@@ -54,8 +54,8 @@ class StoreBatchTest extends MediaWikiTestCase {
 	private function storecohort($fn, $infn, $otherfn, $fromrepo) {
 		$f = $this->storeit( $fn, $infn, 0 );
 		$this->assertTrue( $f->isOK(), 'failed to store a new file' );
-		$this->assertTrue( $f->failCount == 0, "counts wrong {$f->successCount} {$f->failCount}" );
-		$this->assertTrue( $f->successCount == 1 , "counts wrong {$f->successCount} {$f->failCount}" );
+		$this->assertEquals( $f->failCount, 0, "counts wrong {$f->successCount} {$f->failCount}" );
+		$this->assertEquals( $f->successCount, 1 , "counts wrong {$f->successCount} {$f->failCount}" );
 		if ( $fromrepo ) {
 			$f = $this->storeit( "Other-$fn", $infn, FileRepo::OVERWRITE);
 			$infn = $f->value;
@@ -63,18 +63,18 @@ class StoreBatchTest extends MediaWikiTestCase {
 		// This should work because we're allowed to overwrite
 		$f = $this->storeit( $fn, $infn, FileRepo::OVERWRITE );
 		$this->assertTrue( $f->isOK(), 'We should be allowed to overwrite' );
-		$this->assertTrue( $f->failCount == 0, "counts wrong {$f->successCount} {$f->failCount}" );
-		$this->assertTrue( $f->successCount == 1 , "counts wrong {$f->successCount} {$f->failCount}" );
+		$this->assertEquals( $f->failCount, 0, "counts wrong {$f->successCount} {$f->failCount}" );
+		$this->assertEquals( $f->successCount, 1 , "counts wrong {$f->successCount} {$f->failCount}" );
 		// This should fail because we're overwriting.
 		$f = $this->storeit( $fn, $infn, 0 );
 		$this->assertFalse( $f->isOK(), 'We should not be allowed to overwrite' );
-		#$this->assertTrue( $f->failCount == 0, "counts wrong {$f->successCount} {$f->failCount}" );
-		#$this->assertTrue( $f->successCount == 0 , "counts wrong {$f->successCount} {$f->failCount}" );
+		$this->assertEquals( $f->failCount, 1, "counts wrong {$f->successCount} {$f->failCount}" );
+		$this->assertEquals( $f->successCount, 0 , "counts wrong {$f->successCount} {$f->failCount}" );
 		// This should succeed because we're overwriting the same content.
 		$f = $this->storeit( $fn, $infn, FileRepo::OVERWRITE_SAME );
 		$this->assertTrue( $f->isOK(), 'We should be able to overwrite the same content' );
-		$this->assertTrue( $f->failCount == 0, "counts wrong {$f->successCount} {$f->failCount}" );
-		$this->assertTrue( $f->successCount == 1 , "counts wrong {$f->successCount} {$f->failCount}" );
+		$this->assertEquals( $f->failCount, 0, "counts wrong {$f->successCount} {$f->failCount}" );
+		$this->assertEquals( $f->successCount, 1 , "counts wrong {$f->successCount} {$f->failCount}" );
 		// This should fail because we're overwriting different content.
 		if ( $fromrepo ) {
 			$f = $this->storeit( "Other-$fn", $otherfn, FileRepo::OVERWRITE);
@@ -82,8 +82,8 @@ class StoreBatchTest extends MediaWikiTestCase {
 		}
 		$f = $this->storeit( $fn, $otherfn, FileRepo::OVERWRITE_SAME );
 		$this->assertFalse( $f->isOK(), 'We should not be allowed to overwrite different content' );
-		#$this->assertTrue( $f->failCount == 0, "counts wrong {$f->successCount} {$f->failCount}" );
-		#$this->assertTrue( $f->successCount == 0 , "counts wrong {$f->successCount} {$f->failCount}" );
+		$this->assertEquals( $f->failCount, 1, "counts wrong {$f->successCount} {$f->failCount}" );
+		$this->assertEquals( $f->successCount, 0 , "counts wrong {$f->successCount} {$f->failCount}" );
 	}
 
 	public function teststore() {