Fix up tests.

dereuromark · Dec 31, 2018 · 3418d09 · 3418d09
1 parent b5b51ee
commit 3418d09
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 11 deletions.
diff --git a/tests/TestCase/Dto/DtoTest.php b/tests/TestCase/Dto/DtoTest.php
@@ -79,13 +79,12 @@ public function testIgnoreMissing() {
 			'color' => 'blue',
 			'distanceTravelled' => 66,
 		];
-		$dto = new CarDto($array, CarDto::TYPE_DEFAULT, true);
+		$dto = new CarDto($array, true, CarDto::TYPE_DEFAULT);
 		$this->assertInstanceOf(CarDto::class, $dto);
 
 		$this->expectException(InvalidArgumentException::class);
 
-		$dto = new CarDto($array);
-		$this->assertInstanceOf(CarDto::class, $dto);
+		new CarDto($array);
 	}
 
 	/**

diff --git a/tests/TestCase/Engine/NeonEngineTest.php b/tests/TestCase/Engine/NeonEngineTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace CakeDto\Test\TestCase\Dto;
+namespace CakeDto\Test\TestCase\Engine;
 
 use CakeDto\Engine\NeonEngine;
 use Cake\TestSuite\TestCase;

diff --git a/tests/TestCase/Engine/XmlEngineTest.php b/tests/TestCase/Engine/XmlEngineTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace CakeDto\Test\TestCase\Dto;
+namespace CakeDto\Test\TestCase\Engine;
 
 use CakeDto\Engine\XmlEngine;
 use Cake\TestSuite\TestCase;

diff --git a/tests/TestCase/Engine/XmlValidatorTest.php b/tests/TestCase/Engine/XmlValidatorTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace CakeDto\Test\TestCase\Dto;
+namespace CakeDto\Test\TestCase\Engine;
 
 use CakeDto\Engine\XmlValidator;
 use Cake\TestSuite\TestCase;

diff --git a/tests/TestCase/Engine/YamlEngineTest.php b/tests/TestCase/Engine/YamlEngineTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace CakeDto\Test\TestCase\Dto;
+namespace CakeDto\Test\TestCase\Engine;
 
 use CakeDto\Engine\YamlEngine;
 use Cake\TestSuite\TestCase;

diff --git a/tests/TestCase/Generator/GeneratorTest.php b/tests/TestCase/Generator/GeneratorTest.php
@@ -69,7 +69,7 @@ public function setUp() {
 	public function tearDown() {
 		parent::tearDown();
 
-		unset($this->builder);
+		unset($this->generator);
 
 		Configure::write('CakeDto.scalarTypeHints', false);
 	}

diff --git a/tests/TestCase/Shell/DtoShellTest.php b/tests/TestCase/Shell/DtoShellTest.php
@@ -11,7 +11,7 @@
 class DtoShellTest extends TestCase {
 
 	/**
-	 * @var \CakeDto\Shell\DtoShell
+	 * @var \CakeDto\Shell\DtoShell|\PHPUnit\Framework\MockObject\MockObject
 	 */
 	protected $shell;
 

diff --git a/tests/TestCase/View/RendererTest.php b/tests/TestCase/View/RendererTest.php
@@ -35,7 +35,7 @@ public function setUp() {
 	public function tearDown() {
 		parent::tearDown();
 
-		unset($this->builder);
+		unset($this->renderer);
 
 		Configure::delete('CakeDto.strictTypes');
 	}

diff --git a/tests/test_app/src/Model/Entity/Article.php b/tests/test_app/src/Model/Entity/Article.php
@@ -10,7 +10,7 @@
  * @property \TestApp\Model\Entity\Author $author
  * @property int $author_id
  * @property \TestApp\Model\Entity\Tag[] $tags
- * @property \DateTime $created
+ * @property \DateTimeInterface $created
  */
 class Article extends Entity {
 }