updates to tests for 7.4 compatibility

zcwilt · zcwilt · commit 72d24f89e70b · 2020-08-24T13:03:15.000+01:00
diff --git a/tests/DatabaseTestCase.php b/tests/DatabaseTestCase.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Tests;
+
+abstract class DatabaseTestCase extends TestCase
+{
+    public function setUp() : void
+    {
+        parent::setUp();
+        $this->createTables();
+        $this->seedTables();
+    }
+}
diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -13,7 +13,7 @@
 
 abstract class TestCase extends Orchestra
 {
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
         $this->setUpDatabase($this->app);
diff --git a/tests/Unit/BuildQueryTest.php b/tests/Unit/BuildQueryTest.php
@@ -6,17 +6,10 @@
 use Zcwilt\Api\ApiQueryParser;
 use Zcwilt\Api\ParserFactory;
 use Illuminate\Support\Facades\Request;
-use Tests\TestCase;
+use Tests\DatabaseTestCase;
 
-class BuildQueryTest extends TestCase
+class BuildQueryTest extends DatabaseTestCase
 {
-    public function setUp()
-    {
-        parent::setUp();
-        $this->createTables();
-        $this->seedTables();
-    }
-
     public function testBasic()
     {
         $testResult = ZcWiltUser::all();
diff --git a/tests/Unit/ControllersDeleteTest.php b/tests/Unit/ControllersDeleteTest.php
@@ -6,19 +6,12 @@
 use Tests\Fixtures\Controllers\Api\ZcwiltDummyController;
 use Zcwilt\Api\ModelMakerFactory;
 use Illuminate\Support\Facades\Request;
-use Tests\TestCase;
+use Tests\DatabaseTestCase;
 use Tests\Fixtures\Models\ZcwiltUser;
 use Zcwilt\Api\Exceptions\ApiException;
 
-class ControllersDeleteTest extends TestCase
+class ControllersDeleteTest extends DatabaseTestCase
 {
-    public function setUp()
-    {
-        parent::setUp();
-        $this->createTables();
-        $this->seedTables();
-    }
-
     public function testControllerSimpleDelete()
     {
         $controller = new ZcwiltUserController(new ModelMakerFactory());
diff --git a/tests/Unit/ControllersModelNamespaceTest.php b/tests/Unit/ControllersModelNamespaceTest.php
@@ -7,18 +7,11 @@
 use Tests\Fixtures\Controllers\Api\ZcwiltDummy2Controller;
 use Zcwilt\Api\ModelMakerFactory;
 use Illuminate\Support\Facades\Request;
-use Tests\TestCase;
+use Tests\DatabaseTestCase;
 use Zcwilt\Api\Exceptions\InvalidModelException;
 
-class ControllersModelNamespaceTest extends TestCase
+class ControllersModelNamespaceTest extends DatabaseTestCase
 {
-    public function setUp()
-    {
-        parent::setUp();
-        $this->createTables();
-        $this->seedTables();
-    }
-
     public function testControllerAppNamespace()
     {
         $request = Request::create('/index', 'GET', [
diff --git a/tests/Unit/ControllersParseTest.php b/tests/Unit/ControllersParseTest.php
@@ -5,17 +5,10 @@
 use Tests\Fixtures\Controllers\Api\ZcwiltUserController;
 use Zcwilt\Api\ModelMakerFactory;
 use Illuminate\Support\Facades\Request;
-use Tests\TestCase;
+use Tests\DatabaseTestCase;
 
-class ControllersParseTest extends TestCase
+class ControllersParseTest extends DatabaseTestCase
 {
-    public function setUp()
-    {
-        parent::setUp();
-        $this->createTables();
-        $this->seedTables();
-    }
-
     public function testControllerIndexBadParser()
     {
         $request = Request::create('/index', 'GET', [
diff --git a/tests/Unit/ControllersShowTest.php b/tests/Unit/ControllersShowTest.php
@@ -4,17 +4,10 @@
 
 use Tests\Fixtures\Controllers\Api\ZcwiltUserController;
 use Zcwilt\Api\ModelMakerFactory;
-use Tests\TestCase;
+use Tests\DatabaseTestCase;
 
-class ControllersShowTest extends TestCase
+class ControllersShowTest extends DatabaseTestCase
 {
-    public function setUp()
-    {
-        parent::setUp();
-        $this->createTables();
-        $this->seedTables();
-    }
-
     public function testControllerShow()
     {
         $controller = new ZcwiltUserController(new ModelMakerFactory());
diff --git a/tests/Unit/ControllersStoreTest.php b/tests/Unit/ControllersStoreTest.php
@@ -5,17 +5,10 @@
 use Tests\Fixtures\Controllers\Api\ZcwiltUserController;
 use Zcwilt\Api\ModelMakerFactory;
 use Illuminate\Support\Facades\Request;
-use Tests\TestCase;
+use Tests\DatabaseTestCase;
 
-class ControllersStoreTest extends TestCase
+class ControllersStoreTest extends DatabaseTestCase
 {
-    public function setUp()
-    {
-        parent::setUp();
-        $this->createTables();
-        $this->seedTables();
-    }
-
     public function testControllerStoreFails()
     {
         $controller = new ZcwiltUserController(new ModelMakerFactory());
diff --git a/tests/Unit/ControllersUpdateTest.php b/tests/Unit/ControllersUpdateTest.php
@@ -5,18 +5,10 @@
 use Tests\Fixtures\Controllers\Api\ZcwiltUserController;
 use Zcwilt\Api\ModelMakerFactory;
 use Illuminate\Support\Facades\Request;
-use Tests\TestCase;
+use Tests\DatabaseTestCase;
 
-class ControllersUpdateTest extends TestCase
+class ControllersUpdateTest extends DatabaseTestCase
 {
-    public function setUp()
-    {
-        parent::setUp();
-        $this->createTables();
-        $this->seedTables();
-    }
-
-
     public function testControllerUpdate()
     {
         $controller = new ZcwiltUserController(new ModelMakerFactory());
diff --git a/tests/Unit/PaginationTest.php b/tests/Unit/PaginationTest.php
@@ -5,17 +5,10 @@
 use Tests\Fixtures\Controllers\Api\ZcwiltUserController;
 use Zcwilt\Api\ModelMakerFactory;
 use Illuminate\Support\Facades\Request;
-use Tests\TestCase;
+use Tests\DatabaseTestCase;
 
-class PaginationTest extends TestCase
+class PaginationTest extends DatabaseTestCase
 {
-    public function setUp()
-    {
-        parent::setUp();
-        $this->createTables();
-        $this->seedTables();
-    }
-
     public function testPerPageQuery()
     {
         $request = Request::create('/index', 'GET', [
diff --git a/tests/Unit/ParserColumnsParseTest.php b/tests/Unit/ParserColumnsParseTest.php
@@ -4,17 +4,11 @@
 
 use Zcwilt\Api\Exceptions\ParserParameterCountException;
 use Zcwilt\Api\ParserFactory;
-use Tests\TestCase;
+use Tests\DatabaseTestCase;
 use Illuminate\Support\Facades\Request;
 
-class ParserColumnsParseTest extends TestCase
+class ParserColumnsParseTest extends DatabaseTestCase
 {
-    public function setUp()
-    {
-        parent::setUp();
-        $this->createTables();
-        $this->seedTables();
-    }
     public function testColumnsParserParseTestNoParams()
     {
         $parserFactory = new ParserFactory();
diff --git a/tests/Unit/ParserComplexParserTest.php b/tests/Unit/ParserComplexParserTest.php
@@ -2,19 +2,12 @@
 
 namespace Tests\Unit;
 
-use Tests\TestCase;
+use Tests\DatabaseTestCase;
 use Illuminate\Support\Facades\Request;
 use Tests\Fixtures\Models\ZcwiltUser;
 
-class ParserComplexParserTest extends TestCase
+class ParserComplexParserTest extends DatabaseTestCase
 {
-    public function setUp()
-    {
-        parent::setUp();
-        $this->createTables();
-        $this->seedTables();
-    }
-
     public function testComplexWithDummyData()
     {
         $testResult = ZcWiltUser::orWhere('id', '=', 1)->orWhere('id', '=', 2)->get()->toArray();
diff --git a/tests/Unit/ParserIncludeParseTest.php b/tests/Unit/ParserIncludeParseTest.php
@@ -6,21 +6,14 @@
 use Zcwilt\Api\Exceptions\ParserParameterCountException;
 use Illuminate\Database\Eloquent\RelationNotFoundException;
 use Zcwilt\Api\ParserFactory;
-use Tests\TestCase;
+use Tests\DatabaseTestCase;
 use Illuminate\Support\Facades\Request;
 use Tests\Fixtures\Controllers\Api\ZcwiltUserController;
 use Zcwilt\Api\ModelMakerFactory;
 use Tests\Fixtures\Models\ZcwiltUser;
 
-class ParserIncludeParseTest extends TestCase
+class ParserIncludeParseTest extends DatabaseTestCase
 {
-    public function setUp()
-    {
-        parent::setUp();
-        $this->createTables();
-        $this->seedTables();
-    }
-
     public function testIncludesParserParseTestNoParams()
     {
         $parserFactory = new ParserFactory();
diff --git a/tests/Unit/ParserJoinParseTest.php b/tests/Unit/ParserJoinParseTest.php
@@ -5,18 +5,12 @@
 use Zcwilt\Api\Exceptions\ParserInvalidParameterException;
 use Zcwilt\Api\Exceptions\ParserParameterCountException;
 use Zcwilt\Api\ParserFactory;
-use Tests\TestCase;
+use Tests\DatabaseTestCase;
 use Illuminate\Support\Facades\Request;
 use Tests\Fixtures\Models\ZcwiltUser;
 
-class ParserJoinParseTest extends TestCase
+class ParserJoinParseTest extends DatabaseTestCase
 {
-    public function setUp()
-    {
-        parent::setUp();
-        $this->createTables();
-        $this->seedTables();
-    }
     public function testJoinParserParseTestNoParams()
     {
         $parserFactory = new ParserFactory();
diff --git a/tests/Unit/ParserOrWhereParseTest.php b/tests/Unit/ParserOrWhereParseTest.php
@@ -2,19 +2,12 @@
 
 namespace Tests\Unit;
 
-use Tests\TestCase;
+use Tests\DatabaseTestCase;
 use Illuminate\Support\Facades\Request;
 use Tests\Fixtures\Models\ZcwiltUser;
 
-class ParserOrWhereParseTest extends TestCase
+class ParserOrWhereParseTest extends DatabaseTestCase
 {
-    public function setUp()
-    {
-        parent::setUp();
-        $this->createTables();
-        $this->seedTables();
-    }
-
     public function testOrWhereParserWithDummyData()
     {
         $testResult = ZcWiltUser::orWhere('id', '=', 2)->get()->toArray();
diff --git a/tests/Unit/ParserSortParseTest.php b/tests/Unit/ParserSortParseTest.php
@@ -4,19 +4,12 @@
 
 use Zcwilt\Api\Exceptions\ParserParameterCountException;
 use Zcwilt\Api\ParserFactory;
-use Tests\TestCase;
+use Tests\DatabaseTestCase;
 use Illuminate\Support\Facades\Request;
 use Tests\Fixtures\Models\ZcwiltUser;
 
-class ParserSortParseTest extends TestCase
+class ParserSortParseTest extends DatabaseTestCase
 {
-    public function setUp()
-    {
-        parent::setUp();
-        $this->createTables();
-        $this->seedTables();
-    }
-
     public function testSortParserParseTestNoParams()
     {
         $parserFactory = new ParserFactory();
diff --git a/tests/Unit/ParserWhereBetweenParseTest.php b/tests/Unit/ParserWhereBetweenParseTest.php
@@ -4,18 +4,12 @@
 
 use Zcwilt\Api\Exceptions\ParserParameterCountException;
 use Zcwilt\Api\ParserFactory;
-use Tests\TestCase;
+use Tests\DatabaseTestCase;
 use Illuminate\Support\Facades\Request;
 use Tests\Fixtures\Models\ZcwiltUser;
 
-class ParserWhereBetweenParseTest extends TestCase
+class ParserWhereBetweenParseTest extends DatabaseTestCase
 {
-    public function setUp()
-    {
-        parent::setUp();
-        $this->createTables();
-        $this->seedTables();
-    }
     public function testWhereBetweenParserParseTestNoParams()
     {
         $parserFactory = new ParserFactory();
diff --git a/tests/Unit/ParserWhereInParseTest.php b/tests/Unit/ParserWhereInParseTest.php
@@ -4,18 +4,12 @@
 
 use Zcwilt\Api\Exceptions\ParserParameterCountException;
 use Zcwilt\Api\ParserFactory;
-use Tests\TestCase;
+use Tests\DatabaseTestCase;
 use Illuminate\Support\Facades\Request;
 use Tests\Fixtures\Models\ZcwiltUser;
 
-class ParserWhereInParseTest extends TestCase
+class ParserWhereInParseTest extends DatabaseTestCase
 {
-    public function setUp()
-    {
-        parent::setUp();
-        $this->createTables();
-        $this->seedTables();
-    }
     public function testWhereInParserParseTestNoParams()
     {
         $parserFactory = new ParserFactory();
diff --git a/tests/Unit/ParserWhereParseTest.php b/tests/Unit/ParserWhereParseTest.php
@@ -5,18 +5,12 @@
 use Zcwilt\Api\Exceptions\ParserParameterCountException;
 use Zcwilt\Api\Exceptions\ParserInvalidParameterException;
 use Zcwilt\Api\ParserFactory;
-use Tests\TestCase;
+use Tests\DatabaseTestCase;
 use Illuminate\Support\Facades\Request;
 use Tests\Fixtures\Models\ZcwiltUser;
 
-class ParserWhereParseTest extends TestCase
+class ParserWhereParseTest extends DatabaseTestCase
 {
-    public function setUp()
-    {
-        parent::setUp();
-        $this->createTables();
-        $this->seedTables();
-    }
     public function testWhereParserParseTestNoParams()
     {
         $parserFactory = new ParserFactory();

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`
`14`	`14`	`abstract class TestCase extends Orchestra`
`15`	`15`	`{`
`16`		`- public function setUp()`
	`16`	`+ public function setUp() : void`
`17`	`17`	`{`
`18`	`18`	`parent::setUp();`
`19`	`19`	`$this->setUpDatabase($this->app);`