BcCore/Service FixtureManager を FixtureFactory に変更する baserproject#2883

HungDV2022 · Dec 6, 2023 · 95a2adf · 95a2adf
1 parent 6847be7
commit 95a2adf
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 36 deletions.
diff --git a/plugins/baser-core/tests/TestCase/Service/SiteConfigsServiceTest.php b/plugins/baser-core/tests/TestCase/Service/SiteConfigsServiceTest.php
@@ -13,7 +13,9 @@
 
 use BaserCore\Service\SiteConfigsService;
 use BaserCore\Service\SiteConfigsServiceInterface;
+use BaserCore\Test\Scenario\SiteConfigsScenario;
 use BaserCore\Utility\BcContainerTrait;
+use CakephpFixtureFactories\Scenario\ScenarioAwareTrait;
 
 /**
  * SiteConfigsServiceTest
@@ -27,13 +29,9 @@ class SiteConfigsServiceTest extends \BaserCore\TestSuite\BcTestCase
     use BcContainerTrait;
 
     /**
-     * Fixtures
-     *
-     * @var array
+     * ScenarioAwareTrait
      */
-    protected $fixtures = [
-        'plugin.BaserCore.SiteConfigs',
-    ];
+    use ScenarioAwareTrait;
 
     /**
      * @var SiteConfigsService|null
@@ -174,6 +172,7 @@ public function testResetValue(): void
      */
     public function test_getVersionAndClearCache()
     {
+        $this->loadFixtureScenario(SiteConfigsScenario::class);
         $this->assertEquals('3.0.6.1', $this->SiteConfigs->getVersion());
         $this->SiteConfigs->clearCache();
         $this->SiteConfigs->setValue('version', '5.0.0');

diff --git a/plugins/baser-core/tests/TestCase/Service/SitesServiceTest.php b/plugins/baser-core/tests/TestCase/Service/SitesServiceTest.php
@@ -12,7 +12,13 @@
 namespace BaserCore\Test\TestCase\Service;
 
 use BaserCore\Service\SitesService;
+use BaserCore\Test\Scenario\ContentFoldersScenario;
+use BaserCore\Test\Scenario\ContentsScenario;
+use BaserCore\Test\Scenario\SiteConfigsScenario;
+use BaserCore\Test\Scenario\SitesScenario;
+use BaserCore\Test\Scenario\UserScenario;
 use BaserCore\Utility\BcContainerTrait;
+use CakephpFixtureFactories\Scenario\ScenarioAwareTrait;
 
 class SitesServiceTest extends \BaserCore\TestSuite\BcTestCase
 {
@@ -23,17 +29,9 @@ class SitesServiceTest extends \BaserCore\TestSuite\BcTestCase
     use BcContainerTrait;
 
     /**
-     * Fixtures
-     *
-     * @var array
+     * ScenarioAwareTrait
      */
-    protected $fixtures = [
-        'plugin.BaserCore.Sites',
-        'plugin.BaserCore.Contents',
-        'plugin.BaserCore.ContentFolders',
-        'plugin.BaserCore.Users',
-        'plugin.BaserCore.SiteConfigs'
-    ];
+    use ScenarioAwareTrait;
 
     /**
      * @var SitesService|null
@@ -56,6 +54,11 @@ public static function setUpBeforeClass(): void
     public function setUp(): void
     {
         parent::setUp();
+        $this->loadFixtureScenario(UserScenario::class);
+        $this->loadFixtureScenario(ContentsScenario::class);
+        $this->loadFixtureScenario(ContentFoldersScenario::class);
+        $this->loadFixtureScenario(SiteConfigsScenario::class);
+        $this->loadFixtureScenario(SitesScenario::class);
         $this->Sites = new SitesService();
     }
 

diff --git a/plugins/baser-core/tests/TestCase/Service/UserGroupsServiceTest.php b/plugins/baser-core/tests/TestCase/Service/UserGroupsServiceTest.php
@@ -12,7 +12,9 @@
 namespace BaserCore\Test\TestCase\Service;
 
 use BaserCore\Service\UserGroupsService;
+use BaserCore\Test\Scenario\UserGroupsScenario;
 use BaserCore\TestSuite\BcTestCase;
+use CakephpFixtureFactories\Scenario\ScenarioAwareTrait;
 
 /**
  * Class UserGroupsServiceTest
@@ -22,17 +24,9 @@ class UserGroupsServiceTest extends BcTestCase
 {
 
     /**
-     * Fixtures
-     *
-     * @var array
+     * ScenarioAwareTrait
      */
-    protected $fixtures = [
-        'plugin.BaserCore.Users',
-        'plugin.BaserCore.UsersUserGroups',
-        'plugin.BaserCore.UserGroups',
-        'plugin.BaserCore.LoginStores',
-        'plugin.BaserCore.Permissions',
-    ];
+    use ScenarioAwareTrait;
 
     /**
      * @var UserGroupsService|null
@@ -47,6 +41,7 @@ class UserGroupsServiceTest extends BcTestCase
     public function setUp(): void
     {
         parent::setUp();
+        $this->loadFixtureScenario(UserGroupsScenario::class);
         $this->UserGroups = new UserGroupsService();
     }
 

diff --git a/plugins/baser-core/tests/TestCase/Service/UsersServiceTest.php b/plugins/baser-core/tests/TestCase/Service/UsersServiceTest.php
@@ -13,6 +13,9 @@
 
 use BaserCore\Test\Factory\UserFactory;
 use BaserCore\Test\Scenario\SuspendedUsersScenario;
+use BaserCore\Test\Scenario\UserGroupsScenario;
+use BaserCore\Test\Scenario\UserScenario;
+use BaserCore\Test\Scenario\UsersUserGroupsScenario;
 use Cake\Http\Response;
 use Cake\Routing\Router;
 use BaserCore\Service\UsersService;
@@ -33,17 +36,9 @@ class UsersServiceTest extends BcTestCase
     use ScenarioAwareTrait;
 
     /**
-     * Fixtures
-     *
-     * @var array
+     * ScenarioAwareTrait
      */
-    protected $fixtures = [
-        'plugin.BaserCore.Users',
-        'plugin.BaserCore.UsersUserGroups',
-        'plugin.BaserCore.UserGroups',
-        'plugin.BaserCore.LoginStores',
-        'plugin.BaserCore.Sites',
-    ];
+    use ScenarioAwareTrait;
 
     /**
      * @var UsersService|null
@@ -58,6 +53,9 @@ class UsersServiceTest extends BcTestCase
     public function setUp(): void
     {
         parent::setUp();
+        $this->loadFixtureScenario(UserScenario::class);
+        $this->loadFixtureScenario(UserGroupsScenario::class);
+        $this->loadFixtureScenario(UsersUserGroupsScenario::class);
         $this->Users = new UsersService();
     }