jenkins-bot has submitted this change and it was merged.
Change subject: test: Fix incorrect argument order for assertions
......................................................................
test: Fix incorrect argument order for assertions
PHPUnit assertions take "( $expected, $actual, $message )".
This was causing the diff on test failures to be the wrong way around.
Also remove commented out assertion for "Mismatch". This has been commented
out since the very first commit of this code in MediaWiki (r53723; a087167f7)
Change-Id: I481d03d109a1ca421d95cfa9b4f28009ea204fee
---
M test/CdbTest.php
1 file changed, 5 insertions(+), 6 deletions(-)
Approvals:
Gilles: Looks good to me, approved
jenkins-bot: Verified
diff --git a/test/CdbTest.php b/test/CdbTest.php
index 287e3ec..dac9a10 100644
--- a/test/CdbTest.php
+++ b/test/CdbTest.php
@@ -86,9 +86,8 @@
$v1 = $v1 === false ? '(not found)' : $v1;
$v2 = $v2 === false ? '(not found)' : $v2;
- # cdbAssert( 'Mismatch', $key, $v1, $v2 );
- $this->cdbAssert( "PHP error", $key, $v1, $value );
- $this->cdbAssert( "DBA error", $key, $v2, $value );
+ $this->cdbAssert( 'PHP error', $key, $value, $v1 );
+ $this->cdbAssert( 'DBA error', $key, $value, $v2 );
}
$r1->close();
@@ -117,10 +116,10 @@
}
}
- private function cdbAssert( $msg, $key, $v1, $v2 ) {
+ private function cdbAssert( $msg, $key, $expected, $actual ) {
$this->assertSame(
- $v2,
- $v1,
+ $expected,
+ $actual,
$msg . ', k=' . bin2hex( $key )
);
}
--
To view, visit https://gerrit.wikimedia.org/r/236719
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I481d03d109a1ca421d95cfa9b4f28009ea204fee
Gerrit-PatchSet: 1
Gerrit-Project: cdb
Gerrit-Branch: master
Gerrit-Owner: Krinkle <krinklem...@gmail.com>
Gerrit-Reviewer: Gilles <gdu...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
