X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2Fjobqueue%2FJobQueueTest.php;h=33194901314ebde87b32a0c413be024582cd6c1b;hb=aea1b27db02bdf9b60789d55db320792b7cbe2dd;hp=820f8c588b11fe4ad426dad90998246722ee3829;hpb=defd78e9ca470b791c9ad3f7fdbc102178f1b4a5;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/includes/jobqueue/JobQueueTest.php b/tests/phpunit/includes/jobqueue/JobQueueTest.php
index 820f8c588b..3319490131 100644
--- a/tests/phpunit/includes/jobqueue/JobQueueTest.php
+++ b/tests/phpunit/includes/jobqueue/JobQueueTest.php
@@ -46,7 +46,10 @@ class JobQueueTest extends MediaWikiTestCase {
 				if ( !( $this->$q instanceof JobQueueDB ) ) {
 					$this->$q->setTestingPrefix( 'unittests-' . wfRandomString( 32 ) );
 				}
-			} catch ( MWException $e ) {}; // unsupported? (@TODO: what if it was another error?)
+			} catch ( MWException $e ) {
+				// unsupported?
+				// @todo What if it was another error?
+			};
 		}
 	}
 
@@ -59,12 +62,7 @@ class JobQueueTest extends MediaWikiTestCase {
 			) as $q
 		) {
 			if ( $this->$q ) {
-				do {
-					$job = $this->$q->pop();
-					if ( $job ) {
-						$this->$q->ack( $job );
-					}
-				} while ( $job );
+				$this->$q->delete();
 			}
 			$this->$q = null;
 		}
@@ -72,21 +70,33 @@ class JobQueueTest extends MediaWikiTestCase {
 
 	/**
 	 * @dataProvider provider_queueLists
+	 * @covers JobQueue::getWiki
 	 */
-	function testProperties( $queue, $recycles, $desc ) {
+	public function testGetWiki( $queue, $recycles, $desc ) {
 		$queue = $this->$queue;
 		if ( !$queue ) {
 			$this->markTestSkipped( $desc );
 		}
-
 		$this->assertEquals( wfWikiID(), $queue->getWiki(), "Proper wiki ID ($desc)" );
+	}
+
+	/**
+	 * @dataProvider provider_queueLists
+	 * @covers JobQueue::getType
+	 */
+	public function testGetType( $queue, $recycles, $desc ) {
+		$queue = $this->$queue;
+		if ( !$queue ) {
+			$this->markTestSkipped( $desc );
+		}
 		$this->assertEquals( 'null', $queue->getType(), "Proper job type ($desc)" );
 	}
 
 	/**
 	 * @dataProvider provider_queueLists
+	 * @covers JobQueue
 	 */
-	function testBasicOperations( $queue, $recycles, $desc ) {
+	public function testBasicOperations( $queue, $recycles, $desc ) {
 		$queue = $this->$queue;
 		if ( !$queue ) {
 			$this->markTestSkipped( $desc );
@@ -109,7 +119,6 @@ class JobQueueTest extends MediaWikiTestCase {
 		$jobs = iterator_to_array( $queue->getAllQueuedJobs() );
 		$this->assertEquals( 2, count( $jobs ), "Queue iterator size is correct ($desc)" );
 
-
 		$job1 = $queue->pop();
 		$this->assertFalse( $queue->isEmpty(), "Queue is not empty ($desc)" );
 
@@ -147,12 +156,22 @@ class JobQueueTest extends MediaWikiTestCase {
 
 		$queue->flushCaches();
 		$this->assertEquals( 0, $queue->getAcquiredCount(), "Active job count ($desc)" );
+
+		$this->assertTrue( $queue->batchPush( array( $this->newJob(), $this->newJob() ) ),
+			"Push worked ($desc)" );
+		$this->assertFalse( $queue->isEmpty(), "Queue is not empty ($desc)" );
+
+		$queue->delete();
+		$queue->flushCaches();
+		$this->assertTrue( $queue->isEmpty(), "Queue is empty ($desc)" );
+		$this->assertEquals( 0, $queue->getSize(), "Queue is empty ($desc)" );
 	}
 
 	/**
 	 * @dataProvider provider_queueLists
+	 * @covers JobQueue
 	 */
-	function testBasicDeduplication( $queue, $recycles, $desc ) {
+	public function testBasicDeduplication( $queue, $recycles, $desc ) {
 		$queue = $this->$queue;
 		if ( !$queue ) {
 			$this->markTestSkipped( $desc );
@@ -208,8 +227,9 @@ class JobQueueTest extends MediaWikiTestCase {
 
 	/**
 	 * @dataProvider provider_queueLists
+	 * @covers JobQueue
 	 */
-	function testRootDeduplication( $queue, $recycles, $desc ) {
+	public function testRootDeduplication( $queue, $recycles, $desc ) {
 		$queue = $this->$queue;
 		if ( !$queue ) {
 			$this->markTestSkipped( $desc );
@@ -261,8 +281,9 @@ class JobQueueTest extends MediaWikiTestCase {
 
 	/**
 	 * @dataProvider provider_fifoQueueLists
+	 * @covers JobQueue
 	 */
-	function testJobOrder( $queue, $recycles, $desc ) {
+	public function testJobOrder( $queue, $recycles, $desc ) {
 		$queue = $this->$queue;
 		if ( !$queue ) {
 			$this->markTestSkipped( $desc );