Merge pull request #176 from gabriel-caruso/phpunit

dbu · web-flow · commit 4a920bf0f551 · 2017-11-07T09:28:04.000+01:00
Use PSR-1 for PHPUnit TestCase
diff --git a/tests/PHPCR/Tests/Util/CND/Reader/BufferReaderTest.php b/tests/PHPCR/Tests/Util/CND/Reader/BufferReaderTest.php
@@ -3,9 +3,9 @@
 namespace PHPCR\Tests\Util\CND\Reader;
 
 use PHPCR\Util\CND\Reader\BufferReader;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
-class BufferReaderTest extends PHPUnit_Framework_TestCase
+class BufferReaderTest extends TestCase
 {
     public function test__construct()
     {
diff --git a/tests/PHPCR/Tests/Util/CND/Reader/FileReaderTest.php b/tests/PHPCR/Tests/Util/CND/Reader/FileReaderTest.php
@@ -4,9 +4,9 @@
 
 use InvalidArgumentException;
 use PHPCR\Util\CND\Reader\FileReader;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
-class FileReaderTest extends PHPUnit_Framework_TestCase
+class FileReaderTest extends TestCase
 {
     /**
      * @var string
diff --git a/tests/PHPCR/Tests/Util/CND/Scanner/GenericScannerTest.php b/tests/PHPCR/Tests/Util/CND/Scanner/GenericScannerTest.php
@@ -9,11 +9,11 @@
 use PHPCR\Util\CND\Scanner\TokenQueue;
 use PHPCR\Util\CND\Scanner\TokenFilter;
 use PHPCR\Util\CND\Scanner\Context\DefaultScannerContext;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 use Test;
 use TestClass;
 
-class GenericScannerTest extends PHPUnit_Framework_TestCase
+class GenericScannerTest extends TestCase
 {
     protected $expectedTokens = [
 
diff --git a/tests/PHPCR/Tests/Util/CND/Scanner/TokenQueueTest.php b/tests/PHPCR/Tests/Util/CND/Scanner/TokenQueueTest.php
@@ -4,9 +4,9 @@
 
 use PHPCR\Util\CND\Scanner\Token;
 use PHPCR\Util\CND\Scanner\TokenQueue;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
-class TokenQueueTest extends PHPUnit_Framework_TestCase
+class TokenQueueTest extends TestCase
 {
     /**
      * @var Token
diff --git a/tests/PHPCR/Tests/Util/CND/Scanner/TokenTest.php b/tests/PHPCR/Tests/Util/CND/Scanner/TokenTest.php
@@ -3,9 +3,9 @@
 namespace PHPCR\Tests\Util\CND\Scanner;
 
 use PHPCR\Util\CND\Scanner\Token;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
-class TokenTest extends PHPUnit_Framework_TestCase
+class TokenTest extends TestCase
 {
     /**
      * @var Token
diff --git a/tests/PHPCR/Tests/Util/Console/Command/BaseCommandTest.php b/tests/PHPCR/Tests/Util/Console/Command/BaseCommandTest.php
@@ -9,7 +9,7 @@
 use PHPCR\Tests\Stubs\MockNode;
 use PHPCR\Tests\Stubs\MockRow;
 use PHPUnit_Framework_MockObject_MockObject;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Tester\CommandTester;
 use Symfony\Component\Console\Helper\HelperSet;
@@ -22,7 +22,7 @@
 require_once __DIR__.'/../../../Stubs/MockNodeTypeManager.php';
 require_once __DIR__.'/../../../Stubs/MockRow.php';
 
-abstract class BaseCommandTest extends PHPUnit_Framework_TestCase
+abstract class BaseCommandTest extends TestCase
 {
     /**
      * @var SessionInterface|PHPUnit_Framework_MockObject_MockObject
diff --git a/tests/PHPCR/Tests/Util/Console/Helper/PhpcrConsoleDumperHelperTest.php b/tests/PHPCR/Tests/Util/Console/Helper/PhpcrConsoleDumperHelperTest.php
@@ -4,8 +4,9 @@
 use PHPCR\Util\Console\Helper\TreeDumper\ConsoleDumperPropertyVisitor;
 use PHPCR\Util\TreeWalker;
 use Symfony\Component\Console\Output\OutputInterface;
+use PHPUnit\Framework\TestCase;
 
-class PhpcrConsoleDumperHelperTest extends PHPUnit_Framework_TestCase
+class PhpcrConsoleDumperHelperTest extends TestCase
 {
     private $outputMock;
     /**
diff --git a/tests/PHPCR/Tests/Util/NodeHelperTest.php b/tests/PHPCR/Tests/Util/NodeHelperTest.php
@@ -5,11 +5,11 @@
 use PHPCR\Tests\Stubs\MockNode;
 use PHPCR\Util\NodeHelper;
 use PHPUnit_Framework_MockObject_MockObject;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
 require_once __DIR__.'/../Stubs/MockNode.php';
 
-class NodeHelperTest extends PHPUnit_Framework_TestCase
+class NodeHelperTest extends TestCase
 {
     /**
      * @var array
diff --git a/tests/PHPCR/Tests/Util/PathHelperTest.php b/tests/PHPCR/Tests/Util/PathHelperTest.php
@@ -6,8 +6,9 @@
 use PHPCR\RepositoryException;
 use PHPCR\Util\PathHelper;
 use stdClass;
+use PHPUnit\Framework\TestCase;
 
-class PathHelperTest extends \PHPUnit_Framework_TestCase
+class PathHelperTest extends TestCase
 {
     // assertValidPath tests
 
diff --git a/tests/PHPCR/Tests/Util/QOM/BaseSqlGeneratorTest.php b/tests/PHPCR/Tests/Util/QOM/BaseSqlGeneratorTest.php
@@ -2,9 +2,9 @@
 
 namespace PHPCR\Tests\Util\QOM;
 
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
-abstract class BaseSqlGeneratorTest extends PHPUnit_Framework_TestCase
+abstract class BaseSqlGeneratorTest extends TestCase
 {
     public function testNot()
     {
diff --git a/tests/PHPCR/Tests/Util/QOM/QueryBuilderTest.php b/tests/PHPCR/Tests/Util/QOM/QueryBuilderTest.php
@@ -12,10 +12,10 @@
 use PHPCR\Query\QOM\SourceInterface;
 use PHPCR\Util\QOM\QueryBuilder;
 use PHPUnit_Framework_MockObject_MockObject;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 use RuntimeException;
 
-class QueryBuilderTest extends PHPUnit_Framework_TestCase
+class QueryBuilderTest extends TestCase
 {
     /**
      * @var PHPUnit_Framework_MockObject_MockObject|QueryObjectModelFactoryInterface
diff --git a/tests/PHPCR/Tests/Util/QOM/Sql1GeneratorTest.php b/tests/PHPCR/Tests/Util/QOM/Sql1GeneratorTest.php
@@ -5,9 +5,9 @@
 use DateTime;
 use PHPCR\Util\QOM\Sql1Generator;
 use PHPCR\Util\ValueConverter;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
-class Sql1GeneratorTest extends PHPUnit_Framework_TestCase
+class Sql1GeneratorTest extends TestCase
 {
     /**
      * @var Sql1Generator
diff --git a/tests/PHPCR/Tests/Util/QOM/Sql2ToQomQueryConverterTest.php b/tests/PHPCR/Tests/Util/QOM/Sql2ToQomQueryConverterTest.php
@@ -6,9 +6,9 @@
 use PHPCR\Query\QOM\QueryObjectModelFactoryInterface;
 use PHPCR\Util\QOM\Sql2ToQomQueryConverter;
 use PHPCR\Util\ValueConverter;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
-class Sql2ToQomQueryConverterTest extends PHPUnit_Framework_TestCase
+class Sql2ToQomQueryConverterTest extends TestCase
 {
     /**
      * @var QueryObjectModelFactoryInterface
diff --git a/tests/PHPCR/Tests/Util/TraversingItemVisitorTest.php b/tests/PHPCR/Tests/Util/TraversingItemVisitorTest.php
@@ -2,9 +2,9 @@
 
 namespace PHPCR\Tests\Util;
 
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
-class TraversingItemVisitorTest extends PHPUnit_Framework_TestCase
+class TraversingItemVisitorTest extends TestCase
 {
     public function testVisitor()
     {
diff --git a/tests/PHPCR/Tests/Util/UUIDHelperTest.php b/tests/PHPCR/Tests/Util/UUIDHelperTest.php
@@ -3,9 +3,9 @@
 namespace PHPCR\Tests\Util;
 
 use PHPCR\Util\UUIDHelper;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
-class UUIDHelperTest extends PHPUnit_Framework_TestCase
+class UUIDHelperTest extends TestCase
 {
     public function testGenerateUUID()
     {
diff --git a/tests/PHPCR/Tests/Util/ValueConverterTest.php b/tests/PHPCR/Tests/Util/ValueConverterTest.php
@@ -7,14 +7,14 @@
 use PHPCR\Tests\Stubs\MockNode;
 use PHPCR\Util\ValueConverter;
 use PHPCR\ValueFormatException;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
 require_once __DIR__.'/../Stubs/MockNode.php';
 
 /**
  * A test for the PHPCR\PropertyType class
  */
-class ValueConverterTest extends PHPUnit_Framework_TestCase
+class ValueConverterTest extends TestCase
 {
     /**
      * @var ValueConverter

Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,9 @@`
`3`	`3`	`namespace PHPCR\Tests\Util\CND\Reader;`
`4`	`4`
`5`	`5`	`use PHPCR\Util\CND\Reader\BufferReader;`
`6`		`-use PHPUnit_Framework_TestCase;`
	`6`	`+use PHPUnit\Framework\TestCase;`
`7`	`7`
`8`		`-class BufferReaderTest extends PHPUnit_Framework_TestCase`
	`8`	`+class BufferReaderTest extends TestCase`
`9`	`9`	`{`
`10`	`10`	`public function test__construct()`
`11`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,9 @@`
`6`	`6`	`use PHPCR\RepositoryException;`
`7`	`7`	`use PHPCR\Util\PathHelper;`
`8`	`8`	`use stdClass;`
	`9`	`+use PHPUnit\Framework\TestCase;`
`9`	`10`
`10`		`-class PathHelperTest extends \PHPUnit_Framework_TestCase`
	`11`	`+class PathHelperTest extends TestCase`
`11`	`12`	`{`
`12`	`13`	`// assertValidPath tests`
`13`	`14`
Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,9 @@`
`2`	`2`
`3`	`3`	`namespace PHPCR\Tests\Util\QOM;`
`4`	`4`
`5`		`-use PHPUnit_Framework_TestCase;`
	`5`	`+use PHPUnit\Framework\TestCase;`
`6`	`6`
`7`		`-abstract class BaseSqlGeneratorTest extends PHPUnit_Framework_TestCase`
	`7`	`+abstract class BaseSqlGeneratorTest extends TestCase`
`8`	`8`	`{`
`9`	`9`	`public function testNot()`
`10`	`10`	`{`