BcSearchIndex FixtureManager を FixtureFactory に変更する baserproject#2883

HungDV2022 · Nov 29, 2023 · 30b56f3 · 30b56f3
1 parent a0aa05c
commit 30b56f3
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 235 deletions.
diff --git a/plugins/bc-search-index/tests/Fixture/SearchIndexesFixture.php b/plugins/bc-search-index/tests/Fixture/SearchIndexesFixture.php
diff --git a/plugins/bc-search-index/tests/TestCase/Model/Behavior/BcSearchIndexManagerBehaviorTest.php b/plugins/bc-search-index/tests/TestCase/Model/Behavior/BcSearchIndexManagerBehaviorTest.php
@@ -13,7 +13,9 @@
 use BaserCore\TestSuite\BcTestCase;
 use BaserCore\Model\Table\PagesTable;
 use BcSearchIndex\Model\Behavior\BcSearchIndexManagerBehavior;
+use BcSearchIndex\Test\Scenario\Service\SearchIndexesServiceScenario;
 use Cake\Event\Event;
+use CakephpFixtureFactories\Scenario\ScenarioAwareTrait;
 
 /**
  * Class BcSearchIndexManagerBehavioreTest
@@ -22,14 +24,10 @@
 class BcSearchIndexManagerBehaviorTest extends BcTestCase
 {
 
-    public $fixtures = [
-        'plugin.BaserCore.Pages',
-        'plugin.BaserCore.Contents',
-        'plugin.BaserCore.Sites',
-        'plugin.BaserCore.ContentFolders',
-        'plugin.BcSearchIndex.SearchIndexes',
-        'plugin.BaserCore.SiteConfigs',
-    ];
+    /**
+     * Trait
+     */
+    use ScenarioAwareTrait;
 
     /**
      * @var PagesTable|BcSearchIndexManagerBehavior
@@ -88,13 +86,14 @@ public function testInitialize(): void
      */
     public function testSaveSearchIndex()
     {
+        $this->loadFixtureScenario(SearchIndexesServiceScenario::class);
         $page = $this->table->find()->contain(['Contents' => ['Sites']])->first();
         // 新規の場合
         $pageSearchIndex = $this->table->createSearchIndex($page);
         unset($pageSearchIndex['model_id']); // model_idがない場合は新規追加
         $this->assertTrue($this->table->saveSearchIndex($pageSearchIndex));
         // SearchIndexesが新規で追加されているかを確認
-        $this->assertCount(11, $this->BcSearchIndexManager->SearchIndexes->find()->all());
+        $this->assertCount(2, $this->BcSearchIndexManager->SearchIndexes->find()->all());
         // 更新の場合
         $pageSearchIndex = $this->table->createSearchIndex($page);
         $this->assertTrue($this->table->saveSearchIndex($pageSearchIndex));
@@ -109,8 +108,9 @@ public function testSaveSearchIndex()
      */
     public function testDeleteSearchIndex()
     {
-        $this->assertTrue($this->table->deleteSearchIndex(5));
-        $this->assertTrue($this->BcSearchIndexManager->SearchIndexes->findByModelId(5)->isEmpty());
+        $this->loadFixtureScenario(SearchIndexesServiceScenario::class);
+        $this->assertTrue($this->table->deleteSearchIndex(1));
+        $this->assertTrue($this->BcSearchIndexManager->SearchIndexes->findByModelId(1)->isEmpty());
     }
 
     /**
@@ -119,6 +119,7 @@ public function testDeleteSearchIndex()
      */
     public function testAfterDelete()
     {
+        $this->loadFixtureScenario(SearchIndexesServiceScenario::class);
         $event = new Event("afterSave");
         $page = $this->table->find()->contain(['Contents' => ['Sites']])->first();
         $this->BcSearchIndexManager->afterDelete($event, $page, new \ArrayObject());
@@ -157,6 +158,7 @@ public function test_setExcluded_unsetExcluded_isExcluded()
      */
     public function testAfterSave($exclude_search, $exist)
     {
+        $this->loadFixtureScenario(SearchIndexesServiceScenario::class);
         $event = new Event("afterSave");
         $page = $this->table->find()->contain(['Contents' => ['Sites']])->first();
         if ($exclude_search) {

diff --git a/plugins/bc-search-index/tests/TestCase/Model/Table/SearchIndexesTableTest.php b/plugins/bc-search-index/tests/TestCase/Model/Table/SearchIndexesTableTest.php
@@ -13,6 +13,8 @@
 
 use BcSearchIndex\Model\Table\SearchIndexesTable;
 use BaserCore\TestSuite\BcTestCase;
+use BcSearchIndex\Test\Scenario\Service\SearchIndexesServiceScenario;
+use CakephpFixtureFactories\Scenario\ScenarioAwareTrait;
 
 /**
  * Class SearchIndexesTableTest
@@ -22,19 +24,14 @@ class SearchIndexesTableTest extends BcTestCase
 {
 
     /**
-     * @var SearchIndexesTable
+     * Trait
      */
-    public $SearchIndexes;
+    use ScenarioAwareTrait;
 
     /**
-     * Fixtures
-     *
-     * @var array
+     * @var SearchIndexesTable
      */
-    protected $fixtures = [
-        'plugin.BaserCore.Contents',
-        'plugin.BcSearchIndex.SearchIndexes',
-    ];
+    public $SearchIndexes;
 
     /**
      * Set Up
@@ -75,6 +72,7 @@ public function testInitialize()
 	 */
 	public function testAllowPublish($publish_begin, $publish_end, $status, $expected)
 	{
+        $this->loadFixtureScenario(SearchIndexesServiceScenario::class);
 		$data['publish_begin'] = $publish_begin;
 		$data['publish_end'] = $publish_end;
 		$data['status'] = $status;