Remove model collision, improve test stability

Author: MGatner

tests/_support/DatabaseTestCase.php

@@ -37,10 +37,13 @@ class DatabaseTestCase extends CIDatabaseTestCase
 	public function setUp(): void
 	{
 		parent::setUp();
-		
+
+		cache()->clean();
+
 		// Configure and inject the Schemas service
 		$config         = new \Tatter\Schemas\Config\Schemas();
 		$config->silent = false;
+		$config->ignoredNamespaces = [];
 
 		$schemas = new \Tatter\Schemas\Schemas($config);
         Services::injectMock('schemas', $schemas);

tests/_support/Models/ArrayModel.php

@@ -17,6 +17,7 @@ public function setUp(): void
 		// Configure and inject the Schemas service
 		$config         = new \Tatter\Schemas\Config\Schemas();
 		$config->silent = false;
+		$config->ignoredNamespaces = [];
 
 		$schemas = new \Tatter\Schemas\Schemas($config);
         Services::injectMock('schemas', $schemas);

tests/_support/UnitTestCase.php

@@ -11,9 +11,9 @@ class MagicTest extends DatabaseTestCase
 	public function setUp(): void
 	{
 		parent::setUp();
-		
-		$this->factories = new ArrayModel();
-		$this->factory   = new Factory($this->factories->find(1));
+
+		$this->row     = $this->db->table('factories')->where('id', 1)->get()->getRowArray();
+		$this->factory = new Factory($this->row);
 
 		$this->machines = new MachineModel();
 		$this->machine  = new Machine((array) $this->machines->with(false)->find(7));
@@ -26,12 +26,10 @@ public function testGetIgnoresUnmatched()
 
 	public function testRequiresProperties()
 	{
-		$row = $this->factories->find(1);
-
 		$this->expectException(RelationsException::class);
 		$this->expectExceptionMessage('Class Tests\Support\Entities\Propertyless must have the table property to use relations');
 
-		$factory = (new Propertyless($row))->_getRelationship('foobar');
+		$factory = (new Propertyless($this->row))->_getRelationship('foobar');
 	}
 
 	public function testGetSuccess()

tests/entity/MagicTest.php

@@ -9,9 +9,9 @@ class ManyMethodsTest extends DatabaseTestCase
 	public function setUp(): void
 	{
 		parent::setUp();
-		
-		$this->factories = new ArrayModel();
-		$this->factory   = new Factory($this->factories->find(1));
+
+		$this->row     = $this->db->table('factories')->where('id', 1)->get()->getRowArray();
+		$this->factory = new Factory($this->row);
 	}
 
 	public function testHasAnySuccess()
@@ -23,8 +23,9 @@ public function testHasAnySuccess()
 
 	public function testHasAnyFail()
 	{
-		$factory = new Factory($this->factories->find(4));
-		$method = $this->getPrivateMethodInvoker($factory, '_has');
+		$row     = $this->db->table('factories')->where('id', 4)->get()->getRowArray();
+		$factory = new Factory($row);
+		$method  = $this->getPrivateMethodInvoker($factory, '_has');
 
 		$this->assertFalse($method('workers'));
 	}

tests/entity/ManyMethodsTest.php

@@ -11,9 +11,9 @@ class RelationsTest extends DatabaseTestCase
 	public function setUp(): void
 	{
 		parent::setUp();
-		
-		$this->factories = new ArrayModel();
-		$this->factory   = new Factory($this->factories->find(1));
+
+		$this->row     = $this->db->table('factories')->where('id', 1)->get()->getRowArray();
+		$this->factory = new Factory($this->row);
 	}
 
 	public function testUnknownTableFails()
@@ -80,7 +80,7 @@ public function testArrayHasMany()
 		$servicers = new ServicerModel();
 		$object    = $servicers->with(false)->find(2);
 		$servicer  = new Servicer((array) $object);
-		
+	
 		$lawyers = $servicer->relations('lawyers');
 
 		$this->assertCount(3, $lawyers);