Fix imports

phalcon · Apr 22, 2020 · 7a10193 · 7a10193
1 parent 2f046fd
commit 7a10193
Show file tree

Hide file tree

Showing 22 changed files with 28 additions and 45 deletions.
diff --git a/src/Codeception/FunctionalTestCase.php b/src/Codeception/FunctionalTestCase.php
@@ -13,7 +13,7 @@
 
 namespace Phalcon\Incubator\Test\Codeception;
 
-use Phalcon\Test\Traits\FunctionalTestCase as FunctionalTestCaseTrait;
+use Phalcon\Incubator\Test\Traits\FunctionalTestCase as FunctionalTestCaseTrait;
 
 class FunctionalTestCase extends ModelTestCase
 {

diff --git a/src/Codeception/ModelTestCase.php b/src/Codeception/ModelTestCase.php
@@ -13,7 +13,7 @@
 
 namespace Phalcon\Incubator\Test\Codeception;
 
-use Phalcon\Test\Traits\ModelTestCase as ModelTestCaseTrait;
+use Phalcon\Incubator\Test\Traits\ModelTestCase as ModelTestCaseTrait;
 
 class ModelTestCase extends UnitTestCase
 {

diff --git a/src/Codeception/UnitTestCase.php b/src/Codeception/UnitTestCase.php
@@ -14,7 +14,7 @@
 namespace Phalcon\Incubator\Test\Codeception;
 
 use Codeception\Test\Unit;
-use Phalcon\Test\Traits\UnitTestCase as UnitTestCaseTrait;
+use Phalcon\Incubator\Test\Traits\UnitTestCase as UnitTestCaseTrait;
 
 class UnitTestCase extends Unit
 {

diff --git a/src/FunctionalTestCase.php b/src/FunctionalTestCase.php
@@ -13,7 +13,7 @@
 
 namespace Phalcon\Incubator\Test;
 
-use Phalcon\Test\PHPUnit\FunctionalTestCase as FunctionalTest;
+use Phalcon\Incubator\Test\PHPUnit\FunctionalTestCase as FunctionalTest;
 
 /**
  * Class serves as a placeholder for backwards compatibility

diff --git a/src/ModelTestCase.php b/src/ModelTestCase.php
@@ -13,7 +13,7 @@
 
 namespace Phalcon\Incubator\Test;
 
-use Phalcon\Test\PHPUnit\ModelTestCase as ModelTest;
+use Phalcon\Incubator\Test\PHPUnit\ModelTestCase as ModelTest;
 
 /**
  * Class serves as a placeholder for backwards compatibility

diff --git a/src/PHPUnit/FunctionalTestCase.php b/src/PHPUnit/FunctionalTestCase.php
@@ -13,7 +13,7 @@
 
 namespace Phalcon\Incubator\Test\PHPUnit;
 
-use Phalcon\Test\Traits\FunctionalTestCase as FunctionalTestCaseTrait;
+use Phalcon\Incubator\Test\Traits\FunctionalTestCase as FunctionalTestCaseTrait;
 
 abstract class FunctionalTestCase extends ModelTestCase
 {

diff --git a/src/PHPUnit/ModelTestCase.php b/src/PHPUnit/ModelTestCase.php
@@ -13,7 +13,7 @@
 
 namespace Phalcon\Incubator\Test\PHPUnit;
 
-use Phalcon\Test\Traits\ModelTestCase as ModelTestCaseTrait;
+use Phalcon\Incubator\Test\Traits\ModelTestCase as ModelTestCaseTrait;
 
 abstract class ModelTestCase extends UnitTestCase
 {

diff --git a/src/PHPUnit/UnitTestCase.php b/src/PHPUnit/UnitTestCase.php
@@ -14,7 +14,7 @@
 namespace Phalcon\Incubator\Test\PHPUnit;
 
 use Phalcon\Di\InjectionAwareInterface;
-use Phalcon\Test\Traits\UnitTestCase as UnitTestCaseTrait;
+use Phalcon\Incubator\Test\Traits\UnitTestCase as UnitTestCaseTrait;
 use PHPUnit\Framework\TestCase as TestCase;
 
 abstract class UnitTestCase extends TestCase implements InjectionAwareInterface

diff --git a/src/Traits/ResultSet.php b/src/Traits/ResultSet.php
@@ -90,14 +90,6 @@ function () use ($sharedData) {
                 }
             );
 
-// Disable current do to final restriction
-//        $mockResultSet->method('current')
-//            ->willReturnCallback(
-//                function () use ($sharedData) {
-//                    return $sharedData->data[$sharedData->pos];
-//                }
-//            );
-
         $mockResultSet->method('key')
             ->willReturnCallback(
                 function () use ($sharedData) {

diff --git a/src/UnitTestCase.php b/src/UnitTestCase.php
@@ -13,7 +13,7 @@
 
 namespace Phalcon\Incubator\Test;
 
-use Phalcon\Test\PHPUnit\UnitTestCase as UnitTest;
+use Phalcon\Incubator\Test\PHPUnit\UnitTestCase as UnitTest;
 
 /**
  * Class serves as a placeholder for backwards compatibility

diff --git a/tests/unit/Codeception/FunctionalTestCaseTest.php b/tests/unit/Codeception/FunctionalTestCaseTest.php
@@ -6,7 +6,7 @@
 use Codeception\Test\Metadata;
 use Codeception\Test\Unit;
 use Phalcon\Mvc\Dispatcher as PhDispatcher;
-use Phalcon\Test\Codeception\FunctionalTestCase;
+use Phalcon\Incubator\Test\Codeception\FunctionalTestCase;
 
 /**
  * \Phalcon\Test\Test\Codeception\FunctionalTestCaseTest. Tests Integration With Trait.

diff --git a/tests/unit/Codeception/ModelTestCaseTest.php b/tests/unit/Codeception/ModelTestCaseTest.php
@@ -6,7 +6,7 @@
 use Codeception\Test\Metadata;
 use Codeception\Test\Unit;
 use Phalcon\Mvc\Model\Manager as PhModelManager;
-use Phalcon\Test\Codeception\ModelTestCase;
+use Phalcon\Incubator\Test\Codeception\ModelTestCase;
 
 /**
  * \Phalcon\Test\Test\Codeception\ModelTestCaseTest. Tests Integration With Trait.

diff --git a/tests/unit/Codeception/UnitTestCaseTest.php b/tests/unit/Codeception/UnitTestCaseTest.php
@@ -6,7 +6,7 @@
 use Codeception\Test\Metadata;
 use Codeception\Test\Unit;
 use Phalcon\Di\DiInterface;
-use Phalcon\Test\Codeception\UnitTestCase;
+use Phalcon\Incubator\Test\Codeception\UnitTestCase;
 
 /**
  * \Phalcon\Test\Test\Codeception\UnitTestCaseTest. Tests Integration With Trait.

diff --git a/tests/unit/FunctionalTestCaseTest.php b/tests/unit/FunctionalTestCaseTest.php
@@ -3,8 +3,8 @@
 namespace Phalcon\Incubator\Test\Tests\Unit;
 
 use Codeception\Test\Unit;
-use Phalcon\Test\FunctionalTestCase;
-use Phalcon\Test\PHPUnit\FunctionalTestCase as PHPUnitTestCase;
+use Phalcon\Incubator\Test\FunctionalTestCase;
+use Phalcon\Incubator\Test\PHPUnit\FunctionalTestCase as PHPUnitTestCase;
 
 /**
  * \Phalcon\Test\Test\FunctionalTestCaseTest. Test That Old Placement Still Works Correctly.

diff --git a/tests/unit/ModelTestCaseTest.php b/tests/unit/ModelTestCaseTest.php
@@ -3,8 +3,8 @@
 namespace Phalcon\Incubator\Test\Tests\Unit;
 
 use Codeception\Test\Unit;
-use Phalcon\Test\ModelTestCase;
-use Phalcon\Test\PHPUnit\ModelTestCase as PHPUnitTestCase;
+use Phalcon\Incubator\Test\ModelTestCase;
+use Phalcon\Incubator\Test\PHPUnit\ModelTestCase as PHPUnitTestCase;
 
 /**
  * \Phalcon\Test\Test\ModelTestCaseTest. Test That Old Placement Still Works Correctly.

diff --git a/tests/unit/PHPUnit/FunctionalTestCaseTest.php b/tests/unit/PHPUnit/FunctionalTestCaseTest.php
@@ -4,7 +4,7 @@
 
 use Codeception\Test\Unit;
 use Phalcon\Mvc\Dispatcher as PhDispatcher;
-use Phalcon\Test\PHPUnit\FunctionalTestCase;
+use Phalcon\Incubator\Test\PHPUnit\FunctionalTestCase;
 
 /**
  * \Phalcon\Test\Test\PHPUnit\FunctionalTestCaseTest. Tests Integration With Trait.

diff --git a/tests/unit/PHPUnit/ModelTestCaseTest.php b/tests/unit/PHPUnit/ModelTestCaseTest.php
@@ -4,7 +4,7 @@
 
 use Codeception\Test\Unit;
 use Phalcon\Mvc\Model\Manager as PhModelManager;
-use Phalcon\Test\PHPUnit\ModelTestCase;
+use Phalcon\Incubator\Test\PHPUnit\ModelTestCase;
 
 /**
  * \Phalcon\Test\Test\PHPUnit\ModelTestCaseTest. Tests Integration With Trait.

diff --git a/tests/unit/PHPUnit/UnitTestCaseTest.php b/tests/unit/PHPUnit/UnitTestCaseTest.php
@@ -4,7 +4,7 @@
 
 use Codeception\Test\Unit;
 use Phalcon\Di\DiInterface;
-use Phalcon\Test\PHPUnit\UnitTestCase;
+use Phalcon\Incubator\Test\PHPUnit\UnitTestCase;
 
 /**
  * \Phalcon\Test\Test\PHPUnit\UnitTestCaseTest. Tests Integration With Trait.

diff --git a/tests/unit/Traits/ModelTestCaseTest.php b/tests/unit/Traits/ModelTestCaseTest.php
@@ -22,8 +22,8 @@
 use Phalcon\Config;
 use Phalcon\Db\Adapter\Pdo\Mysql;
 use Phalcon\Di\FactoryDefault;
-use Phalcon\Test\Codeception\ModelTestCase as ModelTest;
-use Phalcon\Test\Traits\ModelTestCase;
+use Phalcon\Incubator\Test\Codeception\ModelTestCase as ModelTest;
+use Phalcon\Incubator\Test\Traits\ModelTestCase;
 
 class ModelTestCaseTest extends ModelTest
 {

diff --git a/tests/unit/Traits/ResultSetTest.php b/tests/unit/Traits/ResultSetTest.php
@@ -4,8 +4,8 @@
 
 use Phalcon\Mvc\Model;
 use Phalcon\Mvc\Model\Resultset\Simple;
-use Phalcon\Test\Codeception\UnitTestCase as Test;
-use Phalcon\Test\Traits\ResultSet;
+use Phalcon\Incubator\Test\Codeception\UnitTestCase as Test;
+use Phalcon\Incubator\Test\Traits\ResultSet;
 
 /**
  * \Phalcon\Test\Test\Traits\ResultSetTest
@@ -28,7 +28,7 @@ class ResultSetTest extends Test
 {
     use ResultSet;
 
-    /** @var \Phalcon\Test\Traits\ResultSet  */
+    /** @var ResultSet */
     protected $testSubject = null;
 
     public function setUp(): void
@@ -68,15 +68,6 @@ public function testCanMockResultSet()
             $mockResultSet->count()
         );
 
-        //Testing Rewind/Valid/Current/Key/Next
-        //Disable current due to final restriction
-//        foreach ($mockResultSet as $currentKey => $testModel) {
-//            $this->assertSame(
-//                $mockData[$currentKey],
-//                $testModel
-//            );
-//        }
-
         //Testing getFirst
         $this->assertSame(
             $mockModel,

diff --git a/tests/unit/Traits/UnitTestCaseTest.php b/tests/unit/Traits/UnitTestCaseTest.php
@@ -20,8 +20,8 @@
 namespace Phalcon\Incubator\Test\Tests\Unit\Traits;
 
 use Phalcon\Config;
-use Phalcon\Test\Codeception\UnitTestCase as Unit;
-use Phalcon\Test\Traits\UnitTestCase;
+use Phalcon\Incubator\Test\Codeception\UnitTestCase as Unit;
+use Phalcon\Incubator\Test\Traits\UnitTestCase;
 use PHPUnit_Framework_MockObject_MockObject;
 
 class UnitTestCaseTest extends Unit

diff --git a/tests/unit/UnitTestCaseTest.php b/tests/unit/UnitTestCaseTest.php
@@ -3,8 +3,8 @@
 namespace Phalcon\Incubator\Test\Tests\Unit;
 
 use Codeception\Test\Unit;
-use Phalcon\Test\PHPUnit\UnitTestCase as PHPUnitTestCase;
-use Phalcon\Test\UnitTestCase;
+use Phalcon\Incubator\Test\PHPUnit\UnitTestCase as PHPUnitTestCase;
+use Phalcon\Incubator\Test\UnitTestCase;
 
 /**
  * \Phalcon\Test\Test\UnitTestCaseTest. Test That Old Placement Still Works Correctly.