TASK: Fix test configuration

Author: daniellienert

Classes/Command/NodeIndexCommandController.php

@@ -268,10 +268,12 @@ public function buildCommand(int $limit = null, bool $update = false, string $wo
 
         $runAndLog($createIndicesAndApplyMapping, 'Creating indices and apply mapping');
 
-        $timeStart = microtime(true);
-        $this->output(str_pad('Indexing nodes ... ', 20));
-        $buildIndex([]);
-        $this->outputLine('<success>Done</success> (took %s seconds)', [number_format(microtime(true) - $timeStart, 2)]);
+//        $timeStart = microtime(true);
+//        $this->output(str_pad('Indexing nodes ... ', 20));
+//        $buildIndex([]);
+//        $this->outputLine('<success>Done</success> (took %s seconds)', [number_format(microtime(true) - $timeStart, 2)]);
+
+        $runAndLog($buildIndex, 'Indexing nodes');
 
         $runAndLog($refresh, 'Refresh indicies');
         $runAndLog($updateAliases, 'Update aliases');

Tests/Functional/Eel/ElasticSearchMultiDimensionQueryTest.php

@@ -111,7 +111,7 @@ public function countDefaultDimensionNodesTest(): void
             ->execute();
 
         static::assertCount(3, $resultDefault->toArray());
-        static::assertNodeNames(['root', 'document1-default', 'document-untranslated'], $resultDefault);
+        static::assertNodeNames(['root', 'document1', 'document-untranslated'], $resultDefault);
     }
 
     /**
@@ -126,8 +126,9 @@ public function countDeDimensionNodesTest(): void
             ->sortDesc('title')
             ->execute();
 
-        // expecting: root, document1-default, document2, document3, document4, untranslated (fallback from en_us) = 6
-        static::assertCount(6, $resultDe->toArray(), 'Found nodes: ' . implode(',', $this->extractNodeNames($resultDe)));
+        // expecting: root, document1, document2, document3, document4, untranslated (fallback from en_us) = 6
+        static::assertCount(6, $resultDe->toArray(), 'Found nodes: ' . implode(',', self::extractNodeNames($resultDe)));
+        static::assertNodeNames(['root', 'document1', 'document2-de', 'document3-de', 'document4-de', 'document-untranslated'], $resultDe);
     }
 
     /**
@@ -144,6 +145,7 @@ public function countDkDimensionNodesTest(): void
 
         // expecting: root, document1, document2, document4 (fallback from de), untranslated (fallback from en_us) = 6
         static::assertCount(5, $resultDk->toArray());
+        static::assertNodeNames(['root', 'document1', 'document2-dk', 'document4-de', 'document-untranslated'], $resultDk);
     }
 
 

Tests/Functional/Traits/ContentRepositoryMultiDimensionNodeCreationTrait.php

@@ -83,12 +83,12 @@ protected function createNodesForNodeSearchTest(): void
         ]);
         $deLanguageDimensionContext = $this->contextFactory->create([
             'workspaceName' => 'live',
-            'dimensions' => ['language' => ['de']],
+            'dimensions' => ['language' => ['de', 'en_US']],
             'targetDimensions' => ['language' => 'de']
         ]);
         $dkLanguageDimensionContext = $this->contextFactory->create([
             'workspaceName' => 'live',
-            'dimensions' => ['language' => ['dk']],
+            'dimensions' => ['language' => ['dk', 'en_US']],
             'targetDimensions' => ['language' => 'dk']
         ]);
 
@@ -101,7 +101,7 @@ protected function createNodesForNodeSearchTest(): void
         $this->siteNodeDk->setProperty('title', 'root-dk');
 
         // add a document node that is translated in two languages
-        $newDocumentNode1 = $this->siteNodeDefault->createNode('document1-default', $this->nodeTypeManager->getNodeType('Flowpack.ElasticSearch.ContentRepositoryAdaptor:Document'));
+        $newDocumentNode1 = $this->siteNodeDefault->createNode('document1', $this->nodeTypeManager->getNodeType('Flowpack.ElasticSearch.ContentRepositoryAdaptor:Document'));
         $newDocumentNode1->setProperty('title', 'document1-default');
 
         $translatedDocumentNode1De = $deLanguageDimensionContext->adoptNode($newDocumentNode1, true);