Updated tests

Author: JoshyPHP

composer.json

@@ -10,7 +10,7 @@
 		"php":      ">=5.5.1"
 	},
 	"require-dev": {
-		"phpunit/phpunit": "<5.8"
+		"phpunit/phpunit": "*"
 	},
 	"autoload": {
 		"psr-4": {

tests/BuilderTest.php

@@ -2,13 +2,13 @@
 
 namespace s9e\RegexpBuilder\Tests;
 
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 use s9e\RegexpBuilder\Builder;
 
 /**
 * @covers s9e\RegexpBuilder\Builder
 */
-class BuilderTest extends PHPUnit_Framework_TestCase
+class BuilderTest extends TestCase
 {
 	/**
 	* @dataProvider getBuilderTests

tests/EscaperTest.php

@@ -2,13 +2,13 @@
 
 namespace s9e\RegexpBuilder\Tests;
 
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 use s9e\RegexpBuilder\Escaper;
 
 /**
 * @covers s9e\RegexpBuilder\Escaper
 */
-class EscaperTest extends PHPUnit_Framework_TestCase
+class EscaperTest extends TestCase
 {
 	/**
 	* @dataProvider getEscapeCharacterClassTests

tests/Input/AbstractTest.php

@@ -3,9 +3,9 @@
 namespace s9e\RegexpBuilder\Tests\Input;
 
 use Exception;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
-abstract class AbstractTest extends PHPUnit_Framework_TestCase
+abstract class AbstractTest extends TestCase
 {
 	/**
 	* @dataProvider getInputTests
@@ -17,7 +17,7 @@ public function test($original, $expected, $inputOptions = [])
 
 		if ($expected instanceof Exception)
 		{
-			$this->setExpectedException(get_class($expected), $expected->getMessage());
+			$this->expectException(get_class($expected), $expected->getMessage());
 		}
 
 		$this->assertSame($expected, $input->split($original));

tests/MetaCharactersTest.php

@@ -2,14 +2,14 @@
 
 namespace s9e\RegexpBuilder\Tests;
 
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 use s9e\RegexpBuilder\Input\Utf8;
 use s9e\RegexpBuilder\MetaCharacters;
 
 /**
 * @covers s9e\RegexpBuilder\MetaCharacters
 */
-class MetaCharactersTest extends PHPUnit_Framework_TestCase
+class MetaCharactersTest extends TestCase
 {
 	protected function getMeta(array $map = [])
 	{
@@ -24,21 +24,19 @@ protected function getMeta(array $map = [])
 
 	/**
 	* @testdox Using multiple chars as meta-character throws an exception
-	* @expectedException InvalidArgumentException
-	* @expectedExceptionMessage Meta-characters must be represented by exactly one character
 	*/
 	public function testMultipleCharsException()
 	{
+		$this->expectException('InvalidArgumentException', 'Meta-characters must be represented by exactly one character');
 		$this->getMeta(['xx' => 'x']);
 	}
 
 	/**
 	* @testdox Invalid expressions throw an exception
-	* @expectedException InvalidArgumentException
-	* @expectedExceptionMessage Invalid expression '+++'
 	*/
 	public function testInvalidExceptionException()
 	{
+		$this->expectException('InvalidArgumentException', "Invalid expression '+++'");
 		$this->getMeta(['x' => '+++']);
 	}
 
@@ -56,11 +54,10 @@ public function testGetExpression()
 
 	/**
 	* @testdox getExpression() throws an exception on unknown meta values
-	* @expectedException InvalidArgumentException
-	* @expectedExceptionMessage Invalid meta value -1
 	*/
 	public function testGetExpressionException()
 	{
+		$this->expectException('InvalidArgumentException', "Invalid meta value -1");
 		$this->getMeta([])->getExpression(-1);
 	}
 

tests/Output/AbstractTest.php

@@ -3,9 +3,9 @@
 namespace s9e\RegexpBuilder\Tests\Output;
 
 use Exception;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
-abstract class AbstractTest extends PHPUnit_Framework_TestCase
+abstract class AbstractTest extends TestCase
 {
 	/**
 	* @dataProvider getOutputTests
@@ -17,7 +17,7 @@ public function test($original, $expected, $options = [])
 
 		if ($expected instanceof Exception)
 		{
-			$this->setExpectedException(get_class($expected), $expected->getMessage());
+			$this->expectException(get_class($expected), $expected->getMessage());
 		}
 
 		$this->assertSame($expected, $output->output($original));

tests/Passes/AbstractTest.php

@@ -2,9 +2,9 @@
 
 namespace s9e\RegexpBuilder\Tests\Passes;
 
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
-abstract class AbstractTest extends PHPUnit_Framework_TestCase
+abstract class AbstractTest extends TestCase
 {
 	/**
 	* @dataProvider getPassTests

tests/Passes/RecurseTest.php

@@ -2,14 +2,14 @@
 
 namespace s9e\RegexpBuilder\Tests\Passes;
 
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 use s9e\RegexpBuilder\Passes\Recurse;
 
 /**
 * @covers s9e\RegexpBuilder\Passes\AbstractPass
 * @covers s9e\RegexpBuilder\Passes\Recurse
 */
-class RecurseTest extends PHPUnit_Framework_TestCase
+class RecurseTest extends TestCase
 {
 	public function test()
 	{

tests/RunnerTest.php

@@ -2,13 +2,13 @@
 
 namespace s9e\RegexpBuilder\Tests;
 
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 use s9e\RegexpBuilder\Runner;
 
 /**
 * @covers s9e\RegexpBuilder\Runner
 */
-class RunnerTest extends PHPUnit_Framework_TestCase
+class RunnerTest extends TestCase
 {
 	public function testRun()
 	{

tests/SerializerTest.php

@@ -2,7 +2,7 @@
 
 namespace s9e\RegexpBuilder\Tests;
 
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 use s9e\RegexpBuilder\Escaper;
 use s9e\RegexpBuilder\Input\Bytes as Input;
 use s9e\RegexpBuilder\MetaCharacters;
@@ -12,7 +12,7 @@
 /**
 * @covers s9e\RegexpBuilder\Serializer
 */
-class SerializerTest extends PHPUnit_Framework_TestCase
+class SerializerTest extends TestCase
 {
 	/**
 	* @dataProvider getSerializerTests