Refactor tests to framework components

MGatner · MGatner · commit 6ae885846f0a · 2020-05-09T01:48:36.000Z
diff --git a/.gitignore b/.gitignore
@@ -2,5 +2,6 @@ vendor/
 build/
 phpunit*.xml
 phpunit
+*.cache
 composer.lock
 .DS_Store
diff --git a/composer.json b/composer.json
@@ -26,11 +26,12 @@
 		}
 	],
 	"minimum-stability": "dev",
+	"prefer-stable": true,
 	"require": {
-		"php" : "^7.0"
+		"php" : ">=7.2"
 	},
 	"require-dev": {
-		"phpunit/phpunit" : "^7.0",
+		"phpunit/phpunit": "8.5.*",
 		"mockery/mockery": "^1.0",
 		"codeigniter4/codeigniter4": "dev-develop"
 	},
@@ -41,7 +42,7 @@
 	},
 	"autoload-dev": {
 		"psr-4": {
-			"CIModuleTests\\Support\\": "tests/_support"
+			"Tests\\Support\\": "tests/_support"
 		}
 	},
 	"scripts": {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="tests/_support/bootstrap.php"
-		 backupGlobals="false"
-		 colors="true"
-		 convertErrorsToExceptions="true"
-		 convertNoticesToExceptions="true"
-		 convertWarningsToExceptions="true"
-		 stopOnError="false"
-		 stopOnFailure="false"
-		 stopOnIncomplete="false"
-		 stopOnSkipped="false">
+<phpunit bootstrap="vendor/codeigniter4/codeigniter4/system/Test/bootstrap.php"
+		backupGlobals="false"
+		colors="true"
+		convertErrorsToExceptions="true"
+		convertNoticesToExceptions="true"
+		convertWarningsToExceptions="true"
+		stopOnError="false"
+		stopOnFailure="false"
+		stopOnIncomplete="false"
+		stopOnSkipped="false">
 	<testsuites>
-		<testsuite name="all">
+		<testsuite name="app">
 			<directory>./tests</directory>
 		</testsuite>
 	</testsuites>
@@ -26,7 +26,7 @@
 			</exclude>
 		</whitelist>
 	</filter>
-	
+
 	<logging>
 		<log type="coverage-html" target="build/logs/html"/>
 		<log type="coverage-clover" target="build/logs/clover.xml"/>
@@ -38,8 +38,21 @@
 	</logging>
 
 	<php>
-		<env name="app.baseURL" value="http://example.com"/>
-		<env name="CI_ENVIRONMENT" value="testing"/>
+		<server name="app.baseURL" value="http://example.com"/>
+
+		<!-- Directory containing phpunit.xml -->
+		<const name="HOMEPATH" value="./"/>
+
+		<!-- Directory containing the Paths config file -->
+		<const name="CONFIGPATH" value="./vendor/codeigniter4/codeigniter4/app/Config/"/>
+
+		<!-- Directory containing the front controller (index.php) -->
+		<const name="PUBLICPATH" value="./vendor/codeigniter4/codeigniter4/public/"/>
+
+		<!-- https://getcomposer.org/xdebug -->
+		<env name="COMPOSER_DISABLE_XDEBUG_WARN" value="1"/>
+
+		<!-- Database configuration -->
 <!--	<env name="database.tests.hostname" value="localhost"/>  -->
 <!--	<env name="database.tests.database" value="tests"/>	     -->
 <!--	<env name="database.tests.username" value="tests_user"/> -->
diff --git a/tests/_support/Database/Migrations/2019-09-02-092335_create_test_tables.php b/tests/_support/Database/Migrations/2019-09-02-092335_create_test_tables.php
@@ -1,4 +1,4 @@
-<?php namespace CIModuleTests\Support\Database\Migrations;
+<?php namespace Tests\Support\Database\Migrations;
 
 use CodeIgniter\Database\Migration;
 
@@ -175,6 +175,7 @@ public function down()
 		$this->forge->dropTable('machines_servicers');
 
 		$this->forge->dropTable('lawyers');
+		$this->forge->dropTable('lawsuits');
 		
 		$this->db->enableForeignKeyChecks();
 	}
diff --git a/tests/_support/Database/Seeds/TestSeeder.php b/tests/_support/Database/Seeds/TestSeeder.php
@@ -1,4 +1,4 @@
-<?php namespace CIModuleTests\Support\Database\Seeds;
+<?php namespace Tests\Support\Database\Seeds;
 
 class TestSeeder extends \CodeIgniter\Database\Seeder
 {
diff --git a/tests/_support/DatabaseTestCase.php b/tests/_support/DatabaseTestCase.php
@@ -1,4 +1,4 @@
-<?php namespace CIModuleTests\Support;
+<?php namespace Tests\Support;
 
 use CodeIgniter\Config\Services;
 
@@ -16,21 +16,21 @@ class DatabaseTestCase extends \CodeIgniter\Test\CIDatabaseTestCase
 	 *
 	 * @var string
 	 */
-	protected $seed = 'CIModuleTests\Support\Database\Seeds\TestSeeder';
+	protected $seed = 'Tests\Support\Database\Seeds\TestSeeder';
 
 	/**
 	 * The path to where we can find the test Seeds directory.
 	 *
 	 * @var string
 	 */
-	protected $basePath = MODULESUPPORTPATH . 'Database/';
+	protected $basePath = SUPPORTPATH . 'Database/';
 
 	/**
 	 * The namespace to help us find the migration classes.
 	 *
 	 * @var string
 	 */
-	protected $namespace = 'CIModuleTests\Support';
+	protected $namespace = 'Tests\Support';
 
 	/**
 	 * Preconfigured config instance.
@@ -56,10 +56,11 @@ public function setUp(): void
 	{
 		parent::setUp();
 		
-		$config                   = new \Tatter\Schemas\Config\Schemas();
-		$config->silent           = false;
-		$config->ignoredTables    = ['migrations'];
-		$config->schemasDirectory = MODULESUPPORTPATH . 'Schemas/Good';
+		$config                    = new \Tatter\Schemas\Config\Schemas();
+		$config->silent            = false;
+		$config->ignoredTables     = ['migrations'];
+		$config->ignoredNamespaces = [];
+		$config->schemasDirectory  = SUPPORTPATH . 'Schemas/Good';
 		$config->automate = [
 			'draft'   => false,
 			'archive' => false,
diff --git a/tests/_support/Models/FactoryModel.php b/tests/_support/Models/FactoryModel.php
@@ -1,4 +1,4 @@
-<?php namespace CIModuleTests\Support\Models;
+<?php namespace Tests\Support\Models;
 
 use CodeIgniter\Model;
 
diff --git a/tests/_support/Models/MachineModel.php b/tests/_support/Models/MachineModel.php
@@ -1,4 +1,4 @@
-<?php namespace CIModuleTests\Support\Models;
+<?php namespace Tests\Support\Models;
 
 use CodeIgniter\Model;
 
diff --git a/tests/_support/Models/ServicerModel.php b/tests/_support/Models/ServicerModel.php
@@ -1,4 +1,4 @@
-<?php namespace CIModuleTests\Support\Models;
+<?php namespace Tests\Support\Models;
 
 use CodeIgniter\Model;
 
diff --git a/tests/_support/Models/WorkerModel.php b/tests/_support/Models/WorkerModel.php
@@ -1,4 +1,4 @@
-<?php namespace CIModuleTests\Support\Models;
+<?php namespace Tests\Support\Models;
 
 use CodeIgniter\Model;
 
diff --git a/tests/_support/UnitTestCase.php b/tests/_support/UnitTestCase.php
@@ -1,4 +1,4 @@
-<?php namespace CIModuleTests\Support;
+<?php namespace Tests\Support;
 
 use Tatter\Schemas\Structures\Schema;
 use Tatter\Schemas\Structures\Relation;
@@ -23,10 +23,11 @@ public function setUp(): void
 	{
 		parent::setUp();
 		
-		$config                   = new \Tatter\Schemas\Config\Schemas();
-		$config->silent           = false;
-		$config->ignoredTables    = ['migrations'];
-		$config->schemasDirectory = MODULESUPPORTPATH . 'Schemas/Good';
+		$config                    = new \Tatter\Schemas\Config\Schemas();
+		$config->silent            = false;
+		$config->ignoredTables     = ['migrations'];
+		$config->ignoredNamespaces = [];
+		$config->schemasDirectory  = SUPPORTPATH . 'Schemas/Good';
 		$config->automate = [
 			'draft'   => false,
 			'archive' => false,
diff --git a/tests/_support/bootstrap.php b/tests/_support/bootstrap.php
diff --git a/tests/archive/CacheArchiverTest.php b/tests/archive/CacheArchiverTest.php
@@ -4,7 +4,7 @@
 use Tatter\Schemas\Structures\Mergeable;
 use Tatter\Schemas\Structures\Schema;
 
-class CacheArchiverTest extends CIModuleTests\Support\UnitTestCase
+class CacheArchiverTest extends Tests\Support\UnitTestCase
 {
 	public function setUp(): void
 	{
diff --git a/tests/draft/BaseDrafterTest.php b/tests/draft/BaseDrafterTest.php
@@ -5,7 +5,7 @@
 use Tatter\Schemas\Structures\Field;
 use Tatter\Schemas\Structures\Table;
 
-class BaseDrafterTest extends CIModuleTests\Support\UnitTestCase
+class BaseDrafterTest extends Tests\Support\UnitTestCase
 {
 	public function setUp(): void
 	{
diff --git a/tests/draft/DatabaseDrafterTest.php b/tests/draft/DatabaseDrafterTest.php
@@ -2,7 +2,7 @@
 
 use Tatter\Schemas\Drafter\Handlers\DatabaseHandler;
 
-class DatabaseDrafterTest extends CIModuleTests\Support\DatabaseTestCase
+class DatabaseDrafterTest extends Tests\Support\DatabaseTestCase
 {
 	public function setUp(): void
 	{
diff --git a/tests/draft/DirectoryDrafterTest.php b/tests/draft/DirectoryDrafterTest.php
@@ -2,12 +2,12 @@
 
 use Tatter\Schemas\Drafter\Handlers\DirectoryHandler;
 
-class DirectoryDrafterTest extends CIModuleTests\Support\UnitTestCase
+class DirectoryDrafterTest extends Tests\Support\UnitTestCase
 {
 	public function testEmptyDirectoryReturnsNull()
 	{
 		$config = $this->config;
-		$config->schemasDirectory = MODULESUPPORTPATH . 'Schemas/NoFiles';
+		$config->schemasDirectory = SUPPORTPATH . 'Schemas/NoFiles';
 		$handler = new DirectoryHandler($config);
 		
 		$this->assertNull($handler->draft());
@@ -16,7 +16,7 @@ public function testEmptyDirectoryReturnsNull()
 	public function testNoHandlersReturnsNull()
 	{
 		$config = $this->config;
-		$config->schemasDirectory = MODULESUPPORTPATH . 'Schemas/NoHandler';
+		$config->schemasDirectory = SUPPORTPATH . 'Schemas/NoHandler';
 		$handler = new DirectoryHandler($config);
 		
 		$this->assertNull($handler->draft());
@@ -25,7 +25,7 @@ public function testNoHandlersReturnsNull()
 	public function testSuccessReturnsSchemaNoErrors()
 	{
 		$config = $this->config;
-		$config->schemasDirectory = MODULESUPPORTPATH . 'Schemas/Good';
+		$config->schemasDirectory = SUPPORTPATH . 'Schemas/Good';
 		$handler = new DirectoryHandler($config);
 		
 		$schema = $handler->draft();
diff --git a/tests/draft/ModelDrafterTest.php b/tests/draft/ModelDrafterTest.php
@@ -2,7 +2,7 @@
 
 use Tatter\Schemas\Drafter\Handlers\ModelHandler;
 
-class ModelDrafterTest extends CIModuleTests\Support\UnitTestCase
+class ModelDrafterTest extends Tests\Support\UnitTestCase
 {
 	public function setUp(): void
 	{
@@ -23,7 +23,7 @@ public function testGetModels()
 		$models = $method($this->handler);		
 
 		$this->assertCount(4, $models);
-		$this->assertContains('CIModuleTests\Support\Models\FactoryModel', $models);
+		$this->assertContains('Tests\Support\Models\FactoryModel', $models);
 	}
 
 	public function testGetModelsRespectsGroup()
@@ -41,7 +41,7 @@ public function testDraftsSchemaFromModels()
 		$schema = $this->handler->draft();
 
 		$this->assertEquals('servicers', $schema->tables->servicers->name);
-		$this->assertEquals('CIModuleTests\Support\Models\WorkerModel', $schema->tables->workers->model);
+		$this->assertEquals('Tests\Support\Models\WorkerModel', $schema->tables->workers->model);
 		$this->assertCount(6, $schema->tables->machines->fields);
 		$this->assertTrue($schema->tables->factories->fields->id->primary_key);
 	}
diff --git a/tests/draft/PhpDrafterTest.php b/tests/draft/PhpDrafterTest.php
@@ -2,11 +2,11 @@
 
 use Tatter\Schemas\Drafter\Handlers\PhpHandler;
 
-class PhpDrafterTest extends CIModuleTests\Support\UnitTestCase
+class PhpDrafterTest extends Tests\Support\UnitTestCase
 {
 	public function testSuccessReturnsSchemaFromFile()
 	{
-		$path    = MODULESUPPORTPATH . 'Schemas/Good/Products.php';
+		$path    = SUPPORTPATH . 'Schemas/Good/Products.php';
 		$handler = new PhpHandler($this->config, $path);
 		$schema  = $handler->draft();
 		
@@ -16,15 +16,15 @@ public function testSuccessReturnsSchemaFromFile()
 	
 	public function testEmptyFileReturnsNull()
 	{
-		$path = MODULESUPPORTPATH . 'Schemas/Empty/NothingToSee.php';
+		$path = SUPPORTPATH . 'Schemas/Empty/NothingToSee.php';
 		$handler = new PhpHandler($this->config, $path);
 		
 		$this->assertNull($handler->draft());
 	}
 	
 	public function testMissingVariableReturnsNull()
 	{
-		$path = MODULESUPPORTPATH . 'Schemas/Invalid/NoSchemaVariable.php';
+		$path = SUPPORTPATH . 'Schemas/Invalid/NoSchemaVariable.php';
 		$handler = new PhpHandler($this->config, $path);
 		
 		$this->assertNull($handler->draft());
diff --git a/tests/read/CacheReaderTest.php b/tests/read/CacheReaderTest.php
@@ -4,7 +4,7 @@
 use Tatter\Schemas\Structures\Mergeable;
 use Tatter\Schemas\Structures\Schema;
 
-class CacheReaderTest extends CIModuleTests\Support\UnitTestCase
+class CacheReaderTest extends Tests\Support\UnitTestCase
 {
 	public function setUp(): void
 	{
diff --git a/tests/service/BaseHandlerTest.php b/tests/service/BaseHandlerTest.php
@@ -2,7 +2,7 @@
 
 use Tatter\Schemas\BaseHandler;
 
-class BaseHandlerTest extends CIModuleTests\Support\UnitTestCase
+class BaseHandlerTest extends Tests\Support\UnitTestCase
 {
 	public function setUp(): void
 	{
diff --git a/tests/service/LiveTest.php b/tests/service/LiveTest.php
diff --git a/tests/service/SchemasTest.php b/tests/service/SchemasTest.php

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<?php namespace CIModuleTests\Support\Database\Migrations;`
	`1`	`+<?php namespace Tests\Support\Database\Migrations;`
`2`	`2`
`3`	`3`	`use CodeIgniter\Database\Migration;`
`4`	`4`
`@@ -175,6 +175,7 @@ public function down()`
`175`	`175`	`$this->forge->dropTable('machines_servicers');`
`176`	`176`
`177`	`177`	`$this->forge->dropTable('lawyers');`
	`178`	`+ $this->forge->dropTable('lawsuits');`
`178`	`179`
`179`	`180`	`$this->db->enableForeignKeyChecks();`
`180`	`181`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<?php namespace CIModuleTests\Support\Models;`
	`1`	`+<?php namespace Tests\Support\Models;`
`2`	`2`
`3`	`3`	`use CodeIgniter\Model;`
`4`	`4`