PHPUnit 6.0 refactoring

lastzero · Feb 4, 2017 · d20e7c4 · d20e7c4
1 parent 34875ec
commit d20e7c4
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 10 deletions.
diff --git a/composer.json b/composer.json
@@ -28,7 +28,7 @@
         "kriswallsmith/buzz": "~0.10",
         "basho/riak": "~2.0",
         "swiftmailer/swiftmailer": "5.*",
-        "phpunit/phpunit": "<6.0.0"
+        "phpunit/phpunit": ">=6.0"
     },
     "autoload": {
         "psr-0": { "TestTools\\": "src/" }

diff --git a/src/TestTools/TestCase/UnitTestCase.php b/src/TestTools/TestCase/UnitTestCase.php
@@ -2,6 +2,7 @@
 
 namespace TestTools\TestCase;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
@@ -42,7 +43,7 @@
  * @package TestTools
  * @license MIT
  */
-abstract class UnitTestCase extends \PHPUnit_Framework_TestCase
+abstract class UnitTestCase extends TestCase
 {
     use FixturePathTrait;
 

diff --git a/src/TestTools/Tests/Doctrine/DBAL/ConnectionTest.php b/src/TestTools/Tests/Doctrine/DBAL/ConnectionTest.php
@@ -151,12 +151,14 @@ public function testCommit()
     {
         $this->db->beginTransaction();
         $this->db->commit();
+        $this->assertTrue(true);
     }
 
     public function testRollBack()
     {
         $this->db->beginTransaction();
         $this->db->rollBack();
+        $this->assertTrue(true);
     }
 
     public function testGetDatabasePlatform()

diff --git a/src/TestTools/Tests/Fixture/FileFixtureTest.php b/src/TestTools/Tests/Fixture/FileFixtureTest.php
@@ -41,16 +41,18 @@ public function testNormalizePath () {
         $this->assertEquals(__DIR__ . DIRECTORY_SEPARATOR, FileFixture::normalizePath(__DIR__));
         $this->assertEquals(__DIR__ . DIRECTORY_SEPARATOR, FileFixture::normalizePath(__DIR__ . DIRECTORY_SEPARATOR));
     }
-
+
+    /**
+     * @expectedException \TestTools\Fixture\Exception\FixtureInvalidDirectoryException
+     */
     public function testNormalizePathException () {
-        $this->setExpectedException('TestTools\Fixture\Exception\FixtureInvalidDirectoryException');
-
         FileFixture::normalizePath('/a/b/c');
     }
-
-    public function testConstructor () {
-        $this->setExpectedException('TestTools\Fixture\Exception\FixtureEmptyFilenameException');
 
+    /**
+     * @expectedException \TestTools\Fixture\Exception\FixtureEmptyFilenameException
+     */
+    public function testConstructor () {
         new FileFixture('');
     }
 

diff --git a/src/TestTools/Tests/Profiler/ProfilerTest.php b/src/TestTools/Tests/Profiler/ProfilerTest.php
@@ -3,7 +3,7 @@
 namespace TestTools\Tests\Profiler;
 
 use TestTools\Profiler\Profiler;
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @author Michael Mayer <michael@lastzero.net>

diff --git a/src/TestTools/Tests/Util/FixedDateTimeTest.php b/src/TestTools/Tests/Util/FixedDateTimeTest.php
@@ -2,8 +2,8 @@
 
 namespace TestTools\Tests\Util;
 
+use PHPUnit\Framework\TestCase;
 use TestTools\Util\FixedDateTime;
-use PHPUnit_Framework_TestCase as TestCase;
 
 /**
  * @author Michael Mayer <michael@lastzero.net>