use Schema\TestCase for DB setup in tests

PhilippGrashoff · Sep 8, 2023 · 03e3925 · 03e3925
1 parent 236871e
commit 03e3925
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 42 deletions.
diff --git a/composer.json b/composer.json
@@ -5,7 +5,6 @@
   "prefer-stable": true,
   "require": {
     "php": "8.*",
-    "philippgrashoff/atkextendedtestcase": "4.*",
     "atk4/data": "4.*",
     "ext-json": "*"
   },

diff --git a/tests/BaseCronJobTest.php b/tests/BaseCronJobTest.php
@@ -4,7 +4,7 @@
 
 namespace PhilippR\Atk4\Cron\Tests;
 
-use atkextendedtestcase\TestCase;
+use Atk4\Core\Phpunit\TestCase;
 use PhilippR\Atk4\Cron\BaseCronJob;
 use PhilippR\Atk4\Cron\Tests\Testclasses\SomeCronJob;
 use PhilippR\Atk4\Cron\Tests\Testclasses\SomeCronJobWithExceptionInExecute;

diff --git a/tests/CronJobLoaderTest.php b/tests/CronJobLoaderTest.php
@@ -5,7 +5,7 @@
 namespace PhilippR\Atk4\Cron\Tests;
 
 
-use atkextendedtestcase\TestCase;
+use Atk4\Core\Phpunit\TestCase;
 use PhilippR\Atk4\Cron\CronJobLoader;
 
 class CronJobLoaderTest extends TestCase

diff --git a/tests/ExecutionLogTest.php b/tests/ExecutionLogTest.php
@@ -4,7 +4,8 @@
 
 namespace PhilippR\Atk4\Cron\Tests;
 
-use atkextendedtestcase\TestCase;
+use Atk4\Data\Persistence\Sql;
+use Atk4\Data\Schema\TestCase;
 use PhilippR\Atk4\Cron\ExecutionLog;
 use PhilippR\Atk4\Cron\Executor;
 use PhilippR\Atk4\Cron\Scheduler;
@@ -14,14 +15,16 @@
 class ExecutionLogTest extends TestCase
 {
 
-    protected array $sqlitePersistenceModels = [
-        Scheduler::class,
-        ExecutionLog::class
-    ];
-
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->db = new Sql('sqlite::memory:');
+        $this->createMigrator(new Scheduler($this->db))->create();
+        $this->createMigrator(new ExecutionLog($this->db))->create();
+    }
     public function testDurationIsLogged()
     {
-        $persistence = $this->getSqliteTestPersistence();
+        $persistence = $this->db;
         $testTime = new \DateTime('2020-05-05');
         $testTime->setTime(3, 3);
 
@@ -50,7 +53,7 @@ public function testDurationIsLogged()
 
     public function testExecutionSuccessIsLogged(): void
     {
-        $persistence = $this->getSqliteTestPersistence();
+        $persistence = $this->db;
         $testTime = new \DateTime('2020-09-07');
         $testTime->setTime(3, 3);
 
@@ -88,7 +91,7 @@ public function testExecutionSuccessIsLogged(): void
 
     public function testLoggingOptionNoLogging(): void
     {
-        $persistence = $this->getSqliteTestPersistence();
+        $persistence = $this->db;
         $testTime = new \DateTime('2020-09-07');
         $testTime->setTime(3, 3);
 
@@ -113,7 +116,7 @@ public function testLoggingOptionNoLogging(): void
 
     public function testLoggingOptionOnlyIfLogOutput(): void
     {
-        $persistence = $this->getSqliteTestPersistence();
+        $persistence = $this->db;
         $testTime = new \DateTime('2020-09-07');
         $testTime->setTime(3, 3);
 
@@ -155,7 +158,7 @@ public function testLoggingOptionOnlyIfLogOutput(): void
 
     public function testLoggingOptionAlwaysLog(): void
     {
-        $persistence = $this->getSqliteTestPersistence();
+        $persistence = $this->db;
         $testTime = new \DateTime('2020-09-07');
         $testTime->setTime(3, 3);
 
@@ -198,7 +201,7 @@ public function testLoggingOptionAlwaysLog(): void
 
     public function testLastExecutedSaved(): void
     {
-        $persistence = $this->getSqliteTestPersistence();
+        $persistence = $this->db;
         $dateTime = new \DateTime();
         //this one should be executed
         $entity = ExecutorTest::getScheduler(

diff --git a/tests/ExecutorTest.php b/tests/ExecutorTest.php
@@ -5,7 +5,8 @@
 namespace PhilippR\Atk4\Cron\Tests;
 
 use Atk4\Data\Persistence;
-use atkextendedtestcase\TestCase;
+use Atk4\Data\Persistence\Sql;
+use Atk4\Data\Schema\TestCase;
 use PhilippR\Atk4\Cron\Executor;
 use PhilippR\Atk4\Cron\Scheduler;
 use PhilippR\Atk4\Cron\Tests\Testclasses\SomeCronJob;
@@ -14,16 +15,18 @@
 
 class ExecutorTest extends TestCase
 {
-
-    protected array $sqlitePersistenceModels = [
-        Scheduler::class,
-        ExecutionLog::class
-    ];
-
-
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->db = new Sql('sqlite::memory:');
+        $this->createMigrator(new Scheduler($this->db))->create();
+        $this->createMigrator(new ExecutionLog($this->db))->create();
+    }
+
     public function testRunYearly(): void
     {
-        $persistence = $this->getSqliteTestPersistence();
+        $persistence = $this->db;
         $testTime = new \DateTime('2020-11-05');
         $testTime->setTime(3, 11);
         //this one should be executed
@@ -78,7 +81,7 @@ public function testRunYearly(): void
 
     public function testSkipYearlyIfNoDateYearlySet(): void
     {
-        $persistence = $this->getSqliteTestPersistence();
+        $persistence = $this->db;
         $testTime = new \DateTime('2020-05-05');
         $testTime->setTime(3, 3);
         //this one should be executed
@@ -99,7 +102,7 @@ public function testSkipYearlyIfNoDateYearlySet(): void
 
     public function testRunMonthly(): void
     {
-        $persistence = $this->getSqliteTestPersistence();
+        $persistence = $this->db;
         $testTime = new \DateTime('2020-08-05');
         $testTime->setTime(3, 14);
         //this one should be executed
@@ -163,7 +166,7 @@ public function testRunMonthly(): void
 
     public function testSkipMonthlyIfNoTimeSet(): void
     {
-        $persistence = $this->getSqliteTestPersistence();
+        $persistence = $this->db;
         $testTime = new \DateTime('2020-05-05');
         $testTime->setTime(3, 3);
         //this one should be executed
@@ -184,7 +187,7 @@ public function testSkipMonthlyIfNoTimeSet(): void
 
     public function testRunWeekly(): void
     {
-        $persistence = $this->getSqliteTestPersistence();
+        $persistence = $this->db;
         $testTime = new \DateTime('2020-06-03');
         $testTime->setTime(4, 34);
         //this one should be executed
@@ -248,7 +251,7 @@ public function testRunWeekly(): void
 
     public function testRunDaily(): void
     {
-        $persistence = $this->getSqliteTestPersistence();
+        $persistence = $this->db;
         $testTime = new \DateTime();
         $testTime->setTime(15, 3);
 
@@ -290,7 +293,7 @@ public function testRunDaily(): void
 
     public function testRunHourly(): void
     {
-        $persistence = $this->getSqliteTestPersistence();
+        $persistence = $this->db;
         $testTime = new \DateTime();
         $testTime->setTime(14, 35);
         //this one should be executed
@@ -330,7 +333,7 @@ public function testRunHourly(): void
 
     public function testRunMinutely(): void
     {
-        $persistence = $this->getSqliteTestPersistence();
+        $persistence = $this->db;
         $testTime = new \DateTime();
         $testTime->setTime(3, 16);
         //this one should be executed
@@ -370,7 +373,7 @@ public function testRunMinutely(): void
 
     public function testRunMinutelyOffset(): void
     {
-        $persistence = $this->getSqliteTestPersistence();
+        $persistence = $this->db;
         $testTime = new \DateTime();
         $testTime->setTime(3, 18);
 
@@ -423,7 +426,7 @@ public function testRunMinutelyOffset(): void
 
     public function testNonActiveCronInRun(): void
     {
-        $persistence = $this->getSqliteTestPersistence();
+        $persistence = $this->db;
         $testTime = new \DateTime('2020-05-05');
         $testTime->setTime(3, 3);
         //this one should be executed
@@ -455,7 +458,7 @@ public function testNonActiveCronInRun(): void
 
     public function testExceptionInExecuteDoesNotStopExecutionOfOthers(): void
     {
-        $persistence = $this->getSqliteTestPersistence();
+        $persistence = $this->db;
         $testTime = new \DateTime('2020-05-05');
         $testTime->setTime(3, 3);
 

diff --git a/tests/SchedulerTest.php b/tests/SchedulerTest.php
@@ -4,22 +4,26 @@
 
 namespace PhilippR\Atk4\Cron\Tests;
 
-use atkextendedtestcase\TestCase;
+use Atk4\Data\Persistence\Sql;
+use Atk4\Data\Schema\TestCase;
 use PhilippR\Atk4\Cron\ExecutionLog;
 use PhilippR\Atk4\Cron\Scheduler;
 use PhilippR\Atk4\Cron\Tests\Testclasses\SomeCronJob;
 
 class SchedulerTest extends TestCase
 {
 
-    protected array $sqlitePersistenceModels = [
-        Scheduler::class,
-        ExecutionLog::class
-    ];
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->db = new Sql('sqlite::memory:');
+        $this->createMigrator(new Scheduler($this->db))->create();
+        $this->createMigrator(new ExecutionLog($this->db))->create();
+    }
 
     public function testNameAndDescriptionLoadedFromBaseCronJob()
     {
-        $scheduler = (new Scheduler($this->getSqliteTestPersistence()))->createEntity();
+        $scheduler = (new Scheduler($this->db))->createEntity();
         $scheduler->set('cronjob_class', SomeCronJob::class);
         $scheduler->save();
         self::assertSame(
@@ -34,7 +38,7 @@ public function testNameAndDescriptionLoadedFromBaseCronJob()
 
     public function testNameAndDescriptionNotChangedIfAlreadySet()
     {
-        $scheduler = (new Scheduler($this->getSqliteTestPersistence()))->createEntity();
+        $scheduler = (new Scheduler($this->db))->createEntity();
         $scheduler->set('cronjob_class', SomeCronJob::class);
         $scheduler->set('name', 'someName');
         $scheduler->set('description', 'someDescription');
@@ -51,7 +55,7 @@ public function testNameAndDescriptionNotChangedIfAlreadySet()
 
     public function testNameAndDescriptionNotLoadedIfNoCronJobModelSet()
     {
-        $scheduler = (new Scheduler($this->getSqliteTestPersistence()))->createEntity();
+        $scheduler = (new Scheduler($this->db))->createEntity();
         $scheduler->save();
         self::assertNull($scheduler->get('name'));
         self::assertNull($scheduler->get('description'));