tests: migrate to phpunit 8

Author: TorstenDittmann

test/Resque/Tests/JobHandlerTest.php

@@ -40,11 +40,10 @@ public function testJobCanBeQueued()
 		$this->assertTrue((bool)Resque::enqueue('jobs', 'Test_Job'));
 	}
 
-	/**
-	 * @expectedException \Resque\Exceptions\RedisException
-	 */
 	public function testRedisErrorThrowsExceptionOnJobCreation()
 	{
+		$this->expectException('\Resque\Exceptions\RedisException');
+
 		$mockCredis = $this->getMockBuilder('Credis_Client')
 			->setMethods(['connect', '__call'])
 			->getMock();
@@ -69,11 +68,10 @@ public function testQeueuedJobCanBeReserved()
 		$this->assertEquals('Test_Job', $job->payload['class']);
 	}
 
-	/**
-	 * @expectedException InvalidArgumentException
-	 */
 	public function testObjectArgumentsCannotBePassedToJob()
 	{
+		$this->expectException('InvalidArgumentException');
+
 		$args = new stdClass();
 		$args->test = 'somevalue';
 		Resque::enqueue('jobs', 'Test_Job', $args);
@@ -146,22 +144,20 @@ public function testFailedJobExceptionsAreCaught()
 		$this->assertEquals(1, Stat::get('failed:'.$this->worker));
 	}
 
-	/**
-	 * @expectedException \Resque\Exceptions\ResqueException
-	 */
 	public function testJobWithoutPerformMethodThrowsException()
 	{
+		$this->expectException('\Resque\Exceptions\ResqueException');
+
 		Resque::enqueue('jobs', 'Test_Job_Without_Perform_Method');
 		$job = $this->worker->reserve();
 		$job->worker = $this->worker;
 		$job->perform();
 	}
 
-	/**
-	 * @expectedException Resque\Exceptions\ResqueException
-	 */
 	public function testInvalidJobThrowsException()
 	{
+		$this->expectException('Resque\Exceptions\ResqueException');
+
 		Resque::enqueue('jobs', 'Invalid_Job');
 		$job = $this->worker->reserve();
 		$job->worker = $this->worker;
@@ -363,7 +359,7 @@ public function testDequeueSeveralItemsWithArgs()
 		$this->assertEquals($removedItems, 2);
 		$this->assertEquals(Resque::size($queue), 1);
 		$item = Resque::pop($queue);
-		$this->assertInternalType('array', $item['args']);
+		$this->assertIsArray($item['args']);
 		$this->assertEquals(10, $item['args'][0]['bar'], 'Wrong items were dequeued from queue!');
 	}
 

test/Resque/Tests/RedisTest.php

@@ -15,11 +15,10 @@
  */
 class RedisTest extends ResqueTestCase
 {
-	/**
-	 * @expectedException \Resque\Exceptions\RedisException
-	 */
 	public function testRedisExceptionsAreSurfaced()
 	{
+		$this->expectException('\Resque\Exceptions\RedisException');
+
 		$mockCredis = $this->getMockBuilder('Credis_Client')
 			->setMethods(['connect', '__call'])
 			->getMock();
@@ -194,10 +193,11 @@ public function testParsingValidDsnString($dsn, $expected)
 
 	/**
 	 * @dataProvider bogusDsnStringProvider
-	 * @expectedException InvalidArgumentException
 	 */
 	public function testParsingBogusDsnStringThrowsException($dsn)
 	{
+		$this->expectException('InvalidArgumentException');
+
 		// The next line should throw an InvalidArgumentException
 		$result = Redis::parseDsn($dsn);
 	}