@@ -120,17 +120,6 @@ public function elasticSearchQueryBuilderStartsClean()
120120 $ this ->assertEquals ($ cleanRequestArray , $ query2 ->getRequest ()->toArray ());
121121 }
122122
123- /**
124- * @return QueryBuilderInterface
125- */
126- protected function getQueryBuilder ()
127- {
128- /** @var ElasticSearchQueryBuilder $query */
129- $ query = $ this ->objectManager ->get (ElasticSearchQueryBuilder::class);
130-
131- return $ query ->query ($ this ->siteNode );
132- }
133-
134123 /**
135124 * @test
136125 */
@@ -326,23 +315,26 @@ protected function getLogMessagePrefix($method)
326315 */
327316 protected function createNodesForNodeSearchTest ()
328317 {
329- $ newNode1 = $ this ->siteNode ->createNode ('test-node-1 ' , $ this ->nodeTypeManager ->getNodeType ('TYPO3.Neos.NodeTypes:Page ' ));
330- $ newNode1 ->setProperty ('title ' , 'chicken ' );
331- $ newNode1 ->setProperty ('title_analyzed ' , 'chicken ' );
318+ $ newDocumentNode1 = $ this ->siteNode ->createNode ('test-node-1 ' , $ this ->nodeTypeManager ->getNodeType ('TYPO3.Neos.NodeTypes:Page ' ));
319+ $ newDocumentNode1 ->setProperty ('title ' , 'chicken ' );
320+ $ newDocumentNode1 ->setProperty ('title_analyzed ' , 'chicken ' );
321+
322+ $ newContentNode = $ newDocumentNode1 ->getNode ('main ' )->createNode ('document-1-text-1 ' , $ this ->nodeTypeManager ->getNodeType ('TYPO3.Neos.NodeTypes:Text ' ));
323+ $ newContentNode ->setProperty ('text ' , 'A Scout smiles and whistles under all circumstances. ' );
332324
333- $ newNode2 = $ this ->siteNode ->createNode ('test-node-2 ' , $ this ->nodeTypeManager ->getNodeType ('TYPO3.Neos.NodeTypes:Page ' ));
334- $ newNode2 ->setProperty ('title ' , 'chicken ' );
335- $ newNode2 ->setProperty ('title_analyzed ' , 'chicken ' );
325+ $ newDocumentNode2 = $ this ->siteNode ->createNode ('test-node-2 ' , $ this ->nodeTypeManager ->getNodeType ('TYPO3.Neos.NodeTypes:Page ' ));
326+ $ newDocumentNode2 ->setProperty ('title ' , 'chicken ' );
327+ $ newDocumentNode2 ->setProperty ('title_analyzed ' , 'chicken ' );
336328
337- $ newNode3 = $ this ->siteNode ->createNode ('test-node-3 ' , $ this ->nodeTypeManager ->getNodeType ('TYPO3.Neos.NodeTypes:Page ' ));
338- $ newNode3 ->setProperty ('title ' , 'egg ' );
339- $ newNode3 ->setProperty ('title_analyzed ' , 'egg ' );
329+ $ newDocumentNode3 = $ this ->siteNode ->createNode ('test-node-3 ' , $ this ->nodeTypeManager ->getNodeType ('TYPO3.Neos.NodeTypes:Page ' ));
330+ $ newDocumentNode3 ->setProperty ('title ' , 'egg ' );
331+ $ newDocumentNode3 ->setProperty ('title_analyzed ' , 'egg ' );
340332
341333 $ dimensionContext = $ this ->contextFactory ->create ([
342334 'workspaceName ' => 'live ' ,
343335 'dimensions ' => ['language ' => ['de ' ]]
344336 ]);
345- $ translatedNode3 = $ dimensionContext ->adoptNode ($ newNode3 , true );
337+ $ translatedNode3 = $ dimensionContext ->adoptNode ($ newDocumentNode3 , true );
346338 $ translatedNode3 ->setProperty ('title ' , 'De ' );
347339
348340 $ this ->persistenceManager ->persistAll ();
@@ -356,4 +348,15 @@ protected function createNodesForNodeSearchTest()
356348 $ this ->nodeIndexCommandController ->buildCommand (null , false , null , 'functionaltest ' );
357349 self ::$ indexInitialized = true ;
358350 }
351+
352+ /**
353+ * @return QueryBuilderInterface
354+ */
355+ protected function getQueryBuilder ()
356+ {
357+ /** @var ElasticSearchQueryBuilder $query */
358+ $ query = $ this ->objectManager ->get (ElasticSearchQueryBuilder::class);
359+
360+ return $ query ->query ($ this ->siteNode );
361+ }
359362}
0 commit comments