2 files changed, 74 insertions, 2 deletions
diff --git a/tests/phpunit/includes/jobqueue/JobQueueTest.php b/tests/phpunit/includes/jobqueue/JobQueueTest.php
index 69e40068..ea1a4f63 100644
--- a/tests/phpunit/includes/jobqueue/JobQueueTest.php
+++ b/tests/phpunit/includes/jobqueue/JobQueueTest.php
@@ -247,8 +247,13 @@ class JobQueueTest extends MediaWikiTestCase {
 			$this->assertNull( $queue->push( $this->newJob( 0, $root1 ) ), "Push worked ($desc)" );
 		}
 		$queue->deduplicateRootJob( $this->newJob( 0, $root1 ) );
-		sleep( 1 ); // roo job timestamp will increase
-		$root2 = Job::newRootJobParams( "nulljobspam:$id" ); // task ID/timestamp
+
+		$root2 = $root1;
+		# Add a second to UNIX epoch and format back to TS_MW
+		$root2_ts = strtotime( $root2['rootJobTimestamp'] );
+		$root2_ts++;
+		$root2['rootJobTimestamp'] = wfTimestamp( TS_MW, $root2_ts );
+
 		$this->assertNotEquals( $root1['rootJobTimestamp'], $root2['rootJobTimestamp'],
 			"Root job signatures have different timestamps." );
 		for ( $i = 0; $i < 5; ++$i ) {
diff --git a/tests/phpunit/includes/jobqueue/JobTest.php b/tests/phpunit/includes/jobqueue/JobTest.php
new file mode 100644
index 00000000..93069d2e
--- /dev/null
+++ b/tests/phpunit/includes/jobqueue/JobTest.php
@@ -0,0 +1,67 @@
+<?php
+
+/**
+ * @author Adam Shorland
+ */
+class JobTest extends MediaWikiTestCase {
+
+	/**
+	 * @dataProvider provideTestToString
+	 *
+	 * @param Job $job
+	 * @param string $expected
+	 *
+	 * @covers Job::toString
+	 */
+	public function testToString( $job, $expected ) {
+		$this->assertEquals( $expected, $job->toString() );
+	}
+
+	public function provideTestToString() {
+		$mockToStringObj = $this->getMock( 'stdClass', array( '__toString' ) );
+		$mockToStringObj->expects( $this->any() )
+			->method( '__toString' )
+			->will( $this->returnValue( '{STRING_OBJ_VAL}' ) );
+
+		return array(
+			array(
+				$this->getMockJob( false ),
+				'someCommand '
+			),
+			array(
+				$this->getMockJob( array( 'key' => 'val' ) ),
+				'someCommand  key=val'
+			),
+			array(
+				$this->getMockJob( array( 'key' => array( 'inkey' => 'inval' ) ) ),
+				'someCommand  key={"inkey":"inval"}'
+			),
+			array(
+				$this->getMockJob( array( 'val1' ) ),
+				'someCommand  0=val1'
+			),
+			array(
+				$this->getMockJob( array( 'val1', 'val2' ) ),
+				'someCommand  0=val1 1=val2'
+			),
+			array(
+				$this->getMockJob( array( new stdClass() ) ),
+				'someCommand  0=object(stdClass)'
+			),
+			array(
+				$this->getMockJob( array( $mockToStringObj ) ),
+				'someCommand  0={STRING_OBJ_VAL}'
+			),
+		);
+	}
+
+	public function getMockJob( $params ) {
+		$mock = $this->getMockForAbstractClass(
+			'Job',
+			array( 'someCommand', new Title(), $params ),
+			'SomeJob'
+		);
+		return $mock;
+	}
+
+}