Upgrade tests to use new, namespaced PHPUnit TestCase class

composer.json

@@ -34,7 +34,7 @@
         "gecko-packages/gecko-php-unit": "^2.0",
         "johnkary/phpunit-speedtrap": "^1.0.1",
         "justinrainbow/json-schema": "^5.0",
-        "phpunit/phpunit": "^4.5 || ^5.0",
+        "phpunit/phpunit": "^4.8.35 || ^5.4",
         "satooshi/php-coveralls": "^1.0",
         "symfony/phpunit-bridge": "^3.2.2"
     },

src/Test/AbstractFixerTestCase.php

@@ -21,12 +21,13 @@ use PhpCsFixer\RuleSet;
 use PhpCsFixer\Tokenizer\Token;
 use PhpCsFixer\Tokenizer\Tokens;
 use PhpCsFixer\Utils;
+use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 
 /**
  * @author Dariusz Rumiński <dariusz.ruminski@gmail.com>
  */
-abstract class AbstractFixerTestCase extends \PHPUnit_Framework_TestCase
+abstract class AbstractFixerTestCase extends TestCase
 {
     /**
      * @var LinterInterface

src/Test/AbstractIntegrationTestCase.php

@@ -25,6 +25,7 @@ use PhpCsFixer\Linter\LinterInterface;
 use PhpCsFixer\Runner\Runner;
 use PhpCsFixer\Tokenizer\Tokens;
 use PhpCsFixer\WhitespacesFixerConfig;
+use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Symfony\Component\Filesystem\Exception\IOException;
 use Symfony\Component\Filesystem\Filesystem;
@@ -59,7 +60,7 @@ use Symfony\Component\Finder\Finder;
  *
  * @author SpacePossum
  */
-abstract class AbstractIntegrationTestCase extends \PHPUnit_Framework_TestCase
+abstract class AbstractIntegrationTestCase extends TestCase
 {
     /**
      * @var LinterInterface

src/Test/AbstractTransformerTestCase.php

@@ -14,13 +14,14 @@ namespace PhpCsFixer\Test;
 
 use PhpCsFixer\Tokenizer\CT;
 use PhpCsFixer\Tokenizer\Tokens;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @author Dariusz Rumiński <dariusz.ruminski@gmail.com>
  *
  * @internal
  */
-abstract class AbstractTransformerTestCase extends \PHPUnit_Framework_TestCase
+abstract class AbstractTransformerTestCase extends TestCase
 {
     protected function doTest($source, array $expectedTokens = array(), array $observedKinds = array())
     {

tests/AbstractFunctionReferenceFixerTest.php

@@ -14,6 +14,7 @@ namespace PhpCsFixer\Tests;
 
 use PhpCsFixer\Test\AccessibleObject;
 use PhpCsFixer\Tokenizer\Tokens;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @author Dariusz Rumiński <dariusz.ruminski@gmail.com>
@@ -22,7 +23,7 @@ use PhpCsFixer\Tokenizer\Tokens;
  *
  * @covers \PhpCsFixer\AbstractFunctionReferenceFixer
  */
-final class AbstractFunctionReferenceFixerTest extends \PHPUnit_Framework_TestCase
+final class AbstractFunctionReferenceFixerTest extends TestCase
 {
     /**
      * @param string $code

tests/AutoReview/FixerFactoryTest.php

@@ -14,6 +14,7 @@ namespace PhpCsFixer\Tests\AutoReview;
 
 use PhpCsFixer\Fixer\FixerInterface;
 use PhpCsFixer\FixerFactory;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @author Dariusz Rumiński <dariusz.ruminski@gmail.com>
@@ -23,7 +24,7 @@ use PhpCsFixer\FixerFactory;
  * @coversNothing
  * @group auto-review
  */
-final class FixerFactoryTest extends \PHPUnit_Framework_TestCase
+final class FixerFactoryTest extends TestCase
 {
     public function testFixersPriorityEdgeFixers()
     {

tests/AutoReview/FixerTest.php

@@ -20,6 +20,7 @@ use PhpCsFixer\FixerDefinition\VersionSpecificCodeSampleInterface;
 use PhpCsFixer\FixerFactory;
 use PhpCsFixer\StdinFileInfo;
 use PhpCsFixer\Tokenizer\Tokens;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @author Dariusz Rumiński <dariusz.ruminski@gmail.com>
@@ -29,7 +30,7 @@ use PhpCsFixer\Tokenizer\Tokens;
  * @coversNothing
  * @group auto-review
  */
-final class FixerTest extends \PHPUnit_Framework_TestCase
+final class FixerTest extends TestCase
 {
     /**
      * @param FixerInterface $fixer
@@ -171,7 +172,7 @@ final class FixerTest extends \PHPUnit_Framework_TestCase
      */
     private static function assertStringIsNotEmpty($actual, $message = '')
     {
-        self::assertThat($actual, new \PHPUnit_Framework_Constraint_IsType('string'), $message);
+        self::assertInternalType('string', $actual, $message);
         self::assertNotEmpty($actual, $message);
     }
 }

tests/AutoReview/ProjectCodeTest.php

@@ -13,6 +13,7 @@
 namespace PhpCsFixer\Tests\AutoReview;
 
 use PhpCsFixer\DocBlock\DocBlock;
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Finder\Finder;
 use Symfony\Component\Finder\SplFileInfo;
 
@@ -24,7 +25,7 @@ use Symfony\Component\Finder\SplFileInfo;
  * @coversNothing
  * @group auto-review
  */
-final class ProjectCodeTest extends \PHPUnit_Framework_TestCase
+final class ProjectCodeTest extends TestCase
 {
     /**
      * This structure contains older classes that are not yet covered by tests.
@@ -82,7 +83,7 @@ final class ProjectCodeTest extends \PHPUnit_Framework_TestCase
         }
 
         $this->assertTrue(class_exists($testClassName), sprintf('Expected test class "%s" for "%s" not found.', $testClassName, $className));
-        $this->assertTrue(is_subclass_of($testClassName, '\PHPUnit_Framework_TestCase'), sprintf('Expected test class "%s" to be a subclass of "\PHPUnit_Framework_TestCase".', $testClassName));
+        $this->assertTrue(is_subclass_of($testClassName, '\PHPUnit\Framework\TestCase'), sprintf('Expected test class "%s" to be a subclass of "\PHPUnit\Framework\TestCase".', $testClassName));
     }
 
     /**

tests/AutoReview/TransformerTest.php

@@ -14,6 +14,7 @@ namespace PhpCsFixer\tests\AutoReview;
 
 use PhpCsFixer\Tokenizer\TransformerInterface;
 use PhpCsFixer\Tokenizer\Transformers;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @author SpacePossum
@@ -23,7 +24,7 @@ use PhpCsFixer\Tokenizer\Transformers;
  * @coversNothing
  * @group auto-review
  */
-final class TransformerTest extends \PHPUnit_Framework_TestCase
+final class TransformerTest extends TestCase
 {
     /**
      * @param TransformerInterface $transformer

tests/Cache/CacheTest.php

@@ -16,6 +16,7 @@ use PhpCsFixer\Cache\Cache;
 use PhpCsFixer\Cache\Signature;
 use PhpCsFixer\Cache\SignatureInterface;
 use PhpCsFixer\ToolInfo;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @author Andreas Möller <am@localheinz.com>
@@ -24,7 +25,7 @@ use PhpCsFixer\ToolInfo;
  *
  * @covers \PhpCsFixer\Cache\Cache
  */
-final class CacheTest extends \PHPUnit_Framework_TestCase
+final class CacheTest extends TestCase
 {
     public function testIsFinal()
     {