Addshore has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/274002

Change subject: Add CategoryMembershipChangeJobTest
......................................................................

Add CategoryMembershipChangeJobTest

Change-Id: Ia04bb85260be7d2aaaf171a2c886633b66ee6e77
---
M includes/jobqueue/jobs/CategoryMembershipChangeJob.php
A tests/phpunit/includes/jobqueue/jobs/CategoryMembershipChangeJobTest.php
2 files changed, 79 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/02/274002/1

diff --git a/includes/jobqueue/jobs/CategoryMembershipChangeJob.php 
b/includes/jobqueue/jobs/CategoryMembershipChangeJob.php
index 57e69b4..7184c36 100644
--- a/includes/jobqueue/jobs/CategoryMembershipChangeJob.php
+++ b/includes/jobqueue/jobs/CategoryMembershipChangeJob.php
@@ -62,6 +62,7 @@
                if ( !wfGetLB()->safeWaitForMasterPos( $dbr ) ) {
                        $this->setLastError( "Timed out while waiting for slave 
to catch up" );
                        return false;
+
                }
                // Clear any stale REPEATABLE-READ snapshot
                $dbr->commit( __METHOD__, 'flush' );
diff --git 
a/tests/phpunit/includes/jobqueue/jobs/CategoryMembershipChangeJobTest.php 
b/tests/phpunit/includes/jobqueue/jobs/CategoryMembershipChangeJobTest.php
new file mode 100644
index 0000000..2418317
--- /dev/null
+++ b/tests/phpunit/includes/jobqueue/jobs/CategoryMembershipChangeJobTest.php
@@ -0,0 +1,78 @@
+<?php
+
+/**
+ * @covers CategoryMembershipChangeJob
+ *
+ * @group JobQueue
+ * @group Database
+ *
+ * @licence GNU GPL v2+
+ * @author Addshore
+ */
+class CategoryMembershipChangeJobTest extends MediaWikiTestCase {
+
+       const TITLE_STRING = 'UTCatChangeJobPage';
+
+       /**
+        * @var Title
+        */
+       private $title;
+
+       public function addDBData() {
+               parent::addDBData();
+               $insertResult = $this->insertPage( self::TITLE_STRING, 'UT 
Content' );
+               $this->title = $insertResult['title'];
+       }
+
+       private function runJobs() {
+               JobQueueGroup::destroySingletons();
+               $jobs = new RunJobs;
+               $jobs->loadParamsAndArgs( null, [ 'quiet' => true ], null );
+               $jobs->execute();
+       }
+
+       /**
+        * @param string $text new page text
+        *
+        * @return int|null
+        */
+       private function editPageText( $text ) {
+               $page = WikiPage::factory( $this->title );
+               $editResult = $page->doEditContent( 
ContentHandler::makeContent( $text, $this->title ), __METHOD__ );
+               /** @var Revision $revision */
+               $revision = $editResult->value['revision'];
+               $this->runJobs();
+
+               return $revision->getId();
+       }
+
+       /**
+        * @param int $revId
+        *
+        * @return RecentChange|null
+        */
+       private function getCategorizeRecentChangeForRevId( $revId ) {
+               return RecentChange::newFromConds(
+                       [
+                               'rc_type' => RC_CATEGORIZE,
+                               'rc_this_oldid' => $revId,
+                       ],
+                       __METHOD__
+               );
+       }
+
+       public function testRun_normalCategoryAddedAndRemoved() {
+               $addedRevId = $this->editPageText( '[[Category:Normal]]' );
+               $removedRevId = $this->editPageText( 'Blank' );
+
+               $this->assertEquals(
+                       '[[:' . self::TITLE_STRING . ']] added to category',
+                       $this->getCategorizeRecentChangeForRevId( $addedRevId 
)->getAttribute( 'rc_comment' )
+               );
+               $this->assertEquals(
+                       '[[:' . self::TITLE_STRING . ']] removed from category',
+                       $this->getCategorizeRecentChangeForRevId( $removedRevId 
)->getAttribute( 'rc_comment' )
+               );
+       }
+
+}

-- 
To view, visit https://gerrit.wikimedia.org/r/274002
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia04bb85260be7d2aaaf171a2c886633b66ee6e77
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Addshore <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to