EZP-23967: integration tests: update setup factories

bchoquet-heliopsis · Feb 5, 2015 · 03b50de · 03b50de
1 parent cbf822c
commit 03b50de
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 15 deletions.
diff --git a/eZ/Publish/API/Repository/Tests/SetupFactory/LegacyElasticsearch.php b/eZ/Publish/API/Repository/Tests/SetupFactory/LegacyElasticsearch.php
@@ -91,7 +91,9 @@ protected function indexAll()
         // @todo: Is there a nicer way to get access to all content objects? We
         // require this to run a full index here.
         /** @var \eZ\Publish\SPI\Persistence\Handler $persistenceHandler */
-        $persistenceHandler = $this->getServiceContainer()->get( 'ezpublish.spi.persistence.legacy_elasticsearch' );
+        $persistenceHandler = $this->getServiceContainer()->get( 'ezpublish.spi.persistence.legacy' );
+        /** @var \eZ\Publish\SPI\Search\Handler $searchHandler */
+        $searchHandler = $this->getServiceContainer()->get( 'ezpublish.spi.search.legacy_elasticsearch' );
         /** @var \eZ\Publish\Core\Persistence\Database\DatabaseHandler $databaseHandler */
         $databaseHandler = $this->getServiceContainer()->get( 'ezpublish.api.storage_engine.legacy.dbhandler' );
 
@@ -117,15 +119,15 @@ protected function indexAll()
             );
         }
 
-        /** @var \eZ\Publish\Core\Persistence\Elasticsearch\Content\Search\Handler $searchHandler */
-        $searchHandler = $persistenceHandler->searchHandler();
-        $searchHandler->setCommit( false );
-        $searchHandler->purgeIndex();
-        $searchHandler->setCommit( true );
-        $searchHandler->bulkIndexContent( $contentObjects );
+        /** @var \eZ\Publish\Core\Persistence\Elasticsearch\Content\Search\Handler $contentSearchHandler */
+        $contentSearchHandler = $searchHandler->contentSearchHandler();
+        $contentSearchHandler->setCommit( false );
+        $contentSearchHandler->purgeIndex();
+        $contentSearchHandler->setCommit( true );
+        $contentSearchHandler->bulkIndexContent( $contentObjects );
 
         /** @var \eZ\Publish\Core\Persistence\Elasticsearch\Content\Search\Location\Handler $locationSearchHandler */
-        $locationSearchHandler = $persistenceHandler->locationSearchHandler();
+        $locationSearchHandler = $searchHandler->locationSearchHandler();
         $locationSearchHandler->setCommit( false );
         $locationSearchHandler->purgeIndex();
         $locationSearchHandler->setCommit( true );

diff --git a/eZ/Publish/API/Repository/Tests/SetupFactory/LegacySolr.php b/eZ/Publish/API/Repository/Tests/SetupFactory/LegacySolr.php
@@ -89,7 +89,9 @@ protected function indexAll()
         // @todo: Is there a nicer way to get access to all content objects? We
         // require this to run a full index here.
         /** @var \eZ\Publish\SPI\Persistence\Handler $persistenceHandler */
-        $persistenceHandler = $this->getServiceContainer()->get( 'ezpublish.spi.persistence.legacy_solr' );
+        $persistenceHandler = $this->getServiceContainer()->get( 'ezpublish.spi.persistence.legacy' );
+        /** @var \eZ\Publish\SPI\Search\Handler $searchHandler */
+        $searchHandler = $this->getServiceContainer()->get( 'ezpublish.spi.search.legacy_solr' );
         /** @var \eZ\Publish\Core\Persistence\Database\DatabaseHandler $databaseHandler */
         $databaseHandler = $this->getServiceContainer()->get( 'ezpublish.api.storage_engine.legacy.dbhandler' );
 
@@ -110,11 +112,11 @@ protected function indexAll()
             );
         }
 
-        /** @var \eZ\Publish\Core\Persistence\Solr\Content\Search\Handler $searchHandler */
-        $searchHandler = $persistenceHandler->searchHandler();
-        $searchHandler->setCommit( false );
-        $searchHandler->purgeIndex();
-        $searchHandler->setCommit( true );
-        $searchHandler->bulkIndexContent( $contentObjects );
+        /** @var \eZ\Publish\Core\Persistence\Solr\Content\Search\Handler $contentSearchHandler */
+        $contentSearchHandler = $searchHandler->contentSearchHandler();
+        $contentSearchHandler->setCommit( false );
+        $contentSearchHandler->purgeIndex();
+        $contentSearchHandler->setCommit( true );
+        $contentSearchHandler->bulkIndexContent( $contentObjects );
     }
 }