Mglaser has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/392022 )
Change subject: fixed php unit tests
......................................................................
fixed php unit tests
Change-Id: I14c40f8cd258f269922e9fcd5b9f8803587e1dc1
---
M tests/phpunit/BSApiPageTemplatesTasksTest.php
M tests/phpunit/BSPageTemplateListTest.php
2 files changed, 27 insertions(+), 5 deletions(-)
Approvals:
Mglaser: Verified; Looks good to me, approved
diff --git a/tests/phpunit/BSApiPageTemplatesTasksTest.php
b/tests/phpunit/BSApiPageTemplatesTasksTest.php
index 7e0e650..df2d46b 100644
--- a/tests/phpunit/BSApiPageTemplatesTasksTest.php
+++ b/tests/phpunit/BSApiPageTemplatesTasksTest.php
@@ -2,12 +2,26 @@
/**
* @group medium
+ * @group Database
* @group API
* @group BlueSpice
- * @group BlueSpiceExtensions
* @group BlueSpicePageTemplates
*/
class BSApiPageTemplatesTasksTest extends BSApiTasksTestBase {
+
+ protected $tablesUsed = [ 'bs_pagetemplate' ];
+
+ protected function skipAssertTotal() {
+ return true;
+ }
+
+ public function addDBData() { //addDBDataOnce fails with usage of
@dataProvider...
+ $oPageTemplateFixtures = new BSPageTemplateFixtures();
+ foreach( $oPageTemplateFixtures->makeDataSets() as $dataSet ) {
+ $this->db->insert( 'bs_pagetemplate', $dataSet );
+ }
+ return;
+ }
protected function getModuleName( ) {
return 'bs-pagetemplates-tasks';
@@ -66,7 +80,7 @@
$aIDsToDelete = array(
1 => 'Test_01',
- 9 => 'Faux 1 title'
+ 8 => 'Test_08'
);
foreach( $aIDsToDelete as $iID => $sTitle ) {
@@ -88,7 +102,7 @@
}
protected function isDeleted( $iID ) {
- $db = wfGetDB( DB_REPLICA );
+ $db = $this->db;
$res = $db->select( 'bs_pagetemplate', array( 'pt_id' ), array(
'pt_id = ' . $iID ), wfGetCaller() );
if( $res->numRows() === 0 ) {
return true;
diff --git a/tests/phpunit/BSPageTemplateListTest.php
b/tests/phpunit/BSPageTemplateListTest.php
index 7b49b89..800f701 100644
--- a/tests/phpunit/BSPageTemplateListTest.php
+++ b/tests/phpunit/BSPageTemplateListTest.php
@@ -2,8 +2,8 @@
/**
* @group medium
+ * @group Database
* @group BlueSpice
- * @group BlueSpiceExtensions
* @group BlueSpicePageTemplates
*
* @covers BSPageTemplateList
@@ -12,8 +12,16 @@
protected $tablesUsed = [ 'bs_pagetemplate' ];
+ protected function skipAssertTotal() {
+ return true;
+ }
+
public function addDBData() { //addDBDataOnce fails with usage of
@dataProvider...
- new BSPageTemplateFixtures();
+ $oPageTemplateFixtures = new BSPageTemplateFixtures();
+ foreach( $oPageTemplateFixtures->makeDataSets() as $dataSet ) {
+ $this->db->insert( 'bs_pagetemplate', $dataSet );
+ }
+ return;
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/392022
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I14c40f8cd258f269922e9fcd5b9f8803587e1dc1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpicePageTemplates
Gerrit-Branch: master
Gerrit-Owner: Dvogel hallowelt <[email protected]>
Gerrit-Reviewer: Ljonka <[email protected]>
Gerrit-Reviewer: Mglaser <[email protected]>
Gerrit-Reviewer: Pwirth <[email protected]>
Gerrit-Reviewer: Robert Vogel <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
