AndyRussG has uploaded a new change for review.
https://gerrit.wikimedia.org/r/192057
Change subject: Tests: one bugfix and minor improvements 'n' cleanup
......................................................................
Tests: one bugfix and minor improvements 'n' cleanup
Change-Id: I1e865c03c94609876c0119b4fbd361de37552d86
---
M tests/ApiCentralNoticeBannerChoiceDataTest.php
M tests/BannerChoiceDataProviderTest.php
M tests/CNBannerChoicesResourceLoaderModuleTest.php
M tests/CentralNoticeTestFixtures.php
M
tests/qunit/ext.centralNotice.bannerController.lib/bannerController.lib.tests.js
5 files changed, 16 insertions(+), 15 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralNotice
refs/changes/57/192057/1
diff --git a/tests/ApiCentralNoticeBannerChoiceDataTest.php
b/tests/ApiCentralNoticeBannerChoiceDataTest.php
index 4ed70bb..2a5040d 100644
--- a/tests/ApiCentralNoticeBannerChoiceDataTest.php
+++ b/tests/ApiCentralNoticeBannerChoiceDataTest.php
@@ -27,16 +27,16 @@
$this->cnFixtures->setupTestCaseFromFixtureData( $testCase );
- foreach ( $testCase['contexts_and_outputs'] as
$context_and_output ) {
+ foreach ( $testCase['contexts_and_outputs'] as $cAndOName =>
$contextAndOutput ) {
$ret = $this->doApiRequest( array(
'action' => 'centralnoticebannerchoicedata',
- 'project' =>
$context_and_output['context']['project'],
- 'language' =>
$context_and_output['context']['language']
+ 'project' =>
$contextAndOutput['context']['project'],
+ 'language' =>
$contextAndOutput['context']['language']
) );
$this->cnFixtures->assertChoicesEqual(
- $this, $context_and_output['choices'],
$ret[0]['choices'] );
+ $this, $contextAndOutput['choices'],
$ret[0]['choices'], $cAndOName );
}
}
}
diff --git a/tests/BannerChoiceDataProviderTest.php
b/tests/BannerChoiceDataProviderTest.php
index fad9fc3..a3f765c 100644
--- a/tests/BannerChoiceDataProviderTest.php
+++ b/tests/BannerChoiceDataProviderTest.php
@@ -27,17 +27,17 @@
$this->cnFixtures->setupTestCaseFromFixtureData( $testCase );
- foreach ( $testCase['contexts_and_outputs'] as
$context_and_output ) {
+ foreach ( $testCase['contexts_and_outputs'] as $cANdOName =>
$contextAndOutput ) {
$allocationsProvider = new BannerChoiceDataProvider(
- $context_and_output['context']['project'],
- $context_and_output['context']['language']
+ $contextAndOutput['context']['project'],
+ $contextAndOutput['context']['language']
);
$choices = $allocationsProvider->getChoices();
$this->cnFixtures->assertChoicesEqual(
- $this, $context_and_output['choices'], $choices
);
+ $this, $contextAndOutput['choices'], $choices,
$cANdOName );
}
}
}
diff --git a/tests/CNBannerChoicesResourceLoaderModuleTest.php
b/tests/CNBannerChoicesResourceLoaderModuleTest.php
index 8440f2e..4406a78 100644
--- a/tests/CNBannerChoicesResourceLoaderModuleTest.php
+++ b/tests/CNBannerChoicesResourceLoaderModuleTest.php
@@ -55,17 +55,17 @@
$this->cnFixtures->setupTestCaseFromFixtureData( $testCase );
- foreach ( $testCase['contexts_and_outputs'] as
$context_and_output ) {
+ foreach ( $testCase['contexts_and_outputs'] as $cAndOName =>
$contextAndOutput ) {
$this->setMwGlobals( array(
'wgCentralNoticeChooseBannerOnClient'
=> true,
- 'wgNoticeProject' =>
$context_and_output['context']['project']
+ 'wgNoticeProject' =>
$contextAndOutput['context']['project']
) );
$fauxRequest = new FauxRequest( array(
'modules' =>
'ext.centralNotice.bannerChoiceData',
'skin' => 'fallback',
- 'uselang' =>
$context_and_output['context']['language']
+ 'lang' =>
$contextAndOutput['context']['language']
) );
$rlContext = new ResourceLoaderContext( new
ResourceLoader(), $fauxRequest );
@@ -73,7 +73,7 @@
$choices = $this->getProvider()->getChoicesForTesting(
$rlContext );
$this->cnFixtures->assertChoicesEqual(
- $this, $context_and_output['choices'], $choices
);
+ $this, $contextAndOutput['choices'], $choices,
$cAndOName );
}
}
}
diff --git a/tests/CentralNoticeTestFixtures.php
b/tests/CentralNoticeTestFixtures.php
index 97310b9..c4fab9e 100644
--- a/tests/CentralNoticeTestFixtures.php
+++ b/tests/CentralNoticeTestFixtures.php
@@ -356,14 +356,15 @@
* @param array $expected Expected choices data structure
* @param array $actual Actual choices data structure
*/
- function assertChoicesEqual( MediaWikiTestCase $testClass, $expected,
$actual ) {
+ function assertChoicesEqual( MediaWikiTestCase $testClass, $expected,
$actual,
+ $message='' ) {
// The order of the numerically indexed arrays in this data
structure
// shouldn't matter, so sort all of those by value.
ComparisonUtil::deepMultisort( $expected );
ComparisonUtil::deepMultisort( $actual );
- $testClass->assertEquals( $expected, $actual );
+ $testClass->assertEquals( $expected, $actual, $message );
}
/**
diff --git
a/tests/qunit/ext.centralNotice.bannerController.lib/bannerController.lib.tests.js
b/tests/qunit/ext.centralNotice.bannerController.lib/bannerController.lib.tests.js
index 6655540..a575a25 100644
---
a/tests/qunit/ext.centralNotice.bannerController.lib/bannerController.lib.tests.js
+++
b/tests/qunit/ext.centralNotice.bannerController.lib/bannerController.lib.tests.js
@@ -82,7 +82,7 @@
// Test that the banner has any allocation at
all. This assertion
// makes finding errors friendlier.
assert.ok( expectedAllocations.hasOwnProperty(
allocatedBanner.name ),
- 'Banner ' + allocatedBanner.name + '
expected');
+ 'Allocated banner ' +
allocatedBanner.name + ' was expected');
// Test allocation ammount only up to 3 decimal
points because
// of innacuracies in real number arithmetic.
--
To view, visit https://gerrit.wikimedia.org/r/192057
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1e865c03c94609876c0119b4fbd361de37552d86
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralNotice
Gerrit-Branch: master
Gerrit-Owner: AndyRussG <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
