Update tests

theseer · Jun 17, 2017 · 0e63c61 · 0e63c61
1 parent 483655a
commit 0e63c61
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 18 deletions.
diff --git a/tests/Integration/docblock/factoryTest.php b/tests/Integration/docblock/factoryTest.php
@@ -39,13 +39,14 @@
 namespace TheSeer\phpDox\Tests\Integration\DocBlock {
 
     use TheSeer\phpDox\DocBlock\Factory;
+    use TheSeer\phpDox\FactoryInterface;
 
     /**
      * Class FactoryTest
      *
      * @covers TheSeer\phpDox\DocBlock\Factory
      */
-    class FactoryTest extends \PHPUnit_Framework_TestCase {
+    class FactoryTest extends \PHPUnit\Framework\TestCase {
 
         /**
          * @covers TheSeer\phpDox\DocBlock\Factory::getElementInstanceFor
@@ -104,7 +105,7 @@ public function testGetInstanceByMap($expected, $name, $elementMap) {
          */
         public function testGetInstanceByMapHandlingAFactory() {
 
-            $factoryMock = $this->getMock('TheSeer\\phpDox\\FactoryInterface');
+            $factoryMock = $this->createMock(FactoryInterface::class);
             $factoryMock
                 ->expects($this->once())
                 ->method('getInstanceFor')

diff --git a/tests/Integration/docblock/parserTest.php b/tests/Integration/docblock/parserTest.php
@@ -46,7 +46,7 @@
      * @ uses TheSeer\phpDox\DocBlock\Factory
      * @ covers TheSeer\phpDox\DocBlock\Parser
      */
-    class ParserTest extends \PHPUnit_Framework_TestCase {
+    class ParserTest extends \PHPUnit\Framework\TestCase {
 
         /**
          * @ covers TheSeer\phpDox\DocBlock\Parser::__construct

diff --git a/tests/Integration/factoryTest.php b/tests/Integration/factoryTest.php
@@ -37,6 +37,7 @@
  */
 namespace TheSeer\phpDox\Tests\Integration {
 
+    use TheSeer\phpDox\CollectorConfig;
     use TheSeer\phpDox\Factory;
     use TheSeer\phpDox\FileInfo;
     use TheSeer\phpDox\Version;
@@ -47,7 +48,7 @@
      * @covers TheSeer\phpDox\Factory
      * @uses TheSeer\phpDox\version
      */
-    class FactoryTest extends \PHPUnit_Framework_TestCase {
+    class FactoryTest extends \PHPUnit\Framework\TestCase {
 
         /**
          * @var Factory
@@ -83,7 +84,7 @@ public function testGetApplication() {
          * @uses TheSeer\phpDox\DocBlock\Parser
          */
         public function testGetCollector() {
-            $config = $this->getMockBuilder('TheSeer\\phpDox\\CollectorConfig')
+            $config = $this->getMockBuilder(CollectorConfig::class)
                     ->disableOriginalConstructor()
                     ->getMock();
 

diff --git a/tests/Unit/DirectoryCleanerTest.php b/tests/Unit/DirectoryCleanerTest.php
@@ -36,7 +36,7 @@
  */
 namespace TheSeer\phpDox {
 
-    class DirectoryCleanerTest extends \PHPUnit_Framework_TestCase {
+    class DirectoryCleanerTest extends \PHPUnit\Framework\TestCase {
 
         /**
          * @var DirectoryCleaner

diff --git a/tests/Unit/config/GlobalConfigTest.php b/tests/Unit/config/GlobalConfigTest.php
@@ -46,7 +46,7 @@
      * @uses TheSeer\phpDox\FileInfo
      * @uses TheSeer\phpDox\Version
      */
-    class GlobalConfigTest extends \PHPUnit_Framework_TestCase {
+    class GlobalConfigTest extends \PHPUnit\Framework\TestCase {
 
         private $baseDir;
 

diff --git a/tests/Unit/docblock/docblockTest.php b/tests/Unit/docblock/docblockTest.php
@@ -44,7 +44,7 @@
      * @covers TheSeer\phpDox\DocBlock\DocBlock
      * @uses TheSeer\phpDox\DocBlock\GenericElement
      */
-    class DocBlockTest extends \PHPUnit_Framework_TestCase {
+    class DocBlockTest extends \PHPUnit\Framework\TestCase {
 
         /**
          * @var DocBlock

diff --git a/tests/Unit/docblock/factoryTest.php b/tests/Unit/docblock/factoryTest.php
@@ -40,13 +40,14 @@
 
     use TheSeer\fDOM\fDOMDocument;
     use TheSeer\phpDox\DocBlock\Factory;
+    use TheSeer\phpDox\FactoryInterface;
 
     /**
      * Class FactoryTest
      *
      * @covers TheSeer\phpDox\DocBlock\Factory
      */
-    class FactoryTest extends \PHPUnit_Framework_TestCase {
+    class FactoryTest extends \PHPUnit\Framework\TestCase {
 
         private $factory;
 
@@ -58,7 +59,7 @@ protected function setUp() {
          * @covers TheSeer\phpDox\DocBlock\Factory::addParserFactory
          */
         public function testAddParserFactory() {
-            $mock = $this->getMock('TheSeer\\phpdox\\FactoryInterface');
+            $mock = $this->createMock(FactoryInterface::class);
             $this->factory->addParserFactory('Tux', $mock);
             $this->assertAttributeContains($mock, 'parserMap', $this->factory);
         }
@@ -68,7 +69,7 @@ public function testAddParserFactory() {
          * @covers TheSeer\phpDox\DocBlock\Factory::addParserFactory
          */
         public function testAddParserFactoryExpectingFactoryException() {
-            $mock = $this->getMock('TheSeer\\phpdox\\FactoryInterface');
+            $mock = $this->createMock(FactoryInterface::class);
             $this->factory->addParserFactory(array(), $mock);
         }
 

diff --git a/tests/Unit/docblock/invalidelementTest.php b/tests/Unit/docblock/invalidelementTest.php
@@ -48,14 +48,14 @@
      * @uses TheSeer\phpDox\DocBlock\InvalidElement
      * @uses TheSeer\phpDox\DocBlock\GenericElement
      */
-    class InvalidElementTest extends \PHPUnit_Framework_TestCase {
+    class InvalidElementTest extends \PHPUnit\Framework\TestCase {
 
         /**
          * @covers TheSeer\phpDox\DocBlock\InvalidElement::asDom
          */
         public function testElementCanBeSerializedToDom() {
             $dom = new fDOMDocument();
-            $element = new InvalidElement($this->getMock('TheSeer\phpDox\DocBlock\Factory'), 'test');
+            $element = new InvalidElement($this->createMock(\TheSeer\phpDox\DocBlock\Factory::class), 'test');
 
             $this->assertEquals(
                 '<invalid xmlns="http://xml.phpdox.net/src" annotation="test"/>',

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright (c) 2010-2015 Arne Blankerts <[email protected]>
+ * Copyright (c) 2010-2017 Arne Blankerts <[email protected]>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
@@ -37,6 +37,4 @@
  */
 
 require __DIR__ . '/../src/autoload.php';
-$vendor = __DIR__ . '/../vendor';
-require __DIR__ . '/../src/vendor.php';
-
+require __DIR__ . '/../vendor/autoload.php';
diff --git a/tests/data/coverage/PHPUnitEnricherTest.php b/tests/data/coverage/PHPUnitEnricherTest.php
@@ -2,7 +2,7 @@
 use TheSeer\phpDox\Generator\Enricher;
 use TheSeer\phpDox\Generator\Enricher\PHPUnitConfig;
 
-class PHPUnitEnricherTest extends \PHPUnit_Framework_TestCase {
+class PHPUnitEnricherTest extends \PHPUnit\Framework\TestCase {
 
 
     public function testCoverageInformationIsImportedProperly() {