Merge pull request #129 from kdambekalns/cleanup-tests

TASK: Clean up and adjust unit tests to PhpUnit 5.4

Author: kdambekalns

Tests/Functional/Eel/ElasticSearchQueryTest.php

@@ -14,6 +14,7 @@
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Command\NodeIndexCommandController;
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Eel\ElasticSearchQueryBuilder;
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Eel\ElasticSearchQueryResult;
+use TYPO3\Flow\Persistence\QueryResultInterface;
 use TYPO3\TYPO3CR\Domain\Model\NodeInterface;
 use TYPO3\TYPO3CR\Domain\Model\Workspace;
 use TYPO3\TYPO3CR\Domain\Repository\NodeDataRepository;
@@ -67,19 +68,20 @@ class ElasticSearchQueryTest extends \TYPO3\Flow\Tests\FunctionalTestCase
      */
     protected $nodeDataRepository;
 
-
+    /**
+     * @var boolean
+     */
     protected static $indexInitialized = false;
 
-
     public function setUp()
     {
         parent::setUp();
-        $this->workspaceRepository = $this->objectManager->get('TYPO3\TYPO3CR\Domain\Repository\WorkspaceRepository');
+        $this->workspaceRepository = $this->objectManager->get(WorkspaceRepository::class);
         $liveWorkspace = new Workspace('live');
         $this->workspaceRepository->add($liveWorkspace);
 
-        $this->nodeTypeManager = $this->objectManager->get('TYPO3\TYPO3CR\Domain\Service\NodeTypeManager');
-        $this->contextFactory = $this->objectManager->get('TYPO3\TYPO3CR\Domain\Service\ContextFactoryInterface');
+        $this->nodeTypeManager = $this->objectManager->get(NodeTypeManager::class);
+        $this->contextFactory = $this->objectManager->get(ContextFactoryInterface::class);
         $this->context = $this->contextFactory->create([
             'workspaceName' => 'live',
             'dimensions' => ['language' => ['en_US']],
@@ -90,9 +92,9 @@ public function setUp()
         $this->siteNode = $rootNode->createNode('welcome', $this->nodeTypeManager->getNodeType('TYPO3.Neos.NodeTypes:Page'));
         $this->siteNode->setProperty('title', 'welcome');
 
-        $this->nodeDataRepository = $this->objectManager->get('TYPO3\TYPO3CR\Domain\Repository\NodeDataRepository');
+        $this->nodeDataRepository = $this->objectManager->get(NodeDataRepository::class);
 
-        $this->nodeIndexCommandController = $this->objectManager->get('Flowpack\ElasticSearch\ContentRepositoryAdaptor\Command\NodeIndexCommandController');
+        $this->nodeIndexCommandController = $this->objectManager->get(NodeIndexCommandController::class);
 
         $this->createNodesForNodeSearchTest();
     }
@@ -104,12 +106,13 @@ public function tearDown()
     }
 
     /**
-     * @return \Flowpack\ElasticSearch\ContentRepositoryAdaptor\Eel\ElasticSearchQueryBuilder
+     * @return ElasticSearchQueryBuilder
      */
     protected function getQueryBuilder()
     {
         /** @var ElasticSearchQueryBuilder $query */
-        $query = $this->objectManager->get('Flowpack\ElasticSearch\ContentRepositoryAdaptor\Eel\ElasticSearchQueryBuilder');
+        $query = $this->objectManager->get(ElasticSearchQueryBuilder::class);
+
         return $query->query($this->siteNode);
     }
 
@@ -221,9 +224,9 @@ public function nodesWillBeSortedDesc()
             ->sortDesc('title')
             ->execute();
 
-        /** @var \TYPO3\Flow\Persistence\QueryResultInterface $result $node */
+        /** @var QueryResultInterface $result $node */
 
-        $this->assertInstanceOf(\TYPO3\Flow\Persistence\QueryResultInterface::class, $result);
+        $this->assertInstanceOf(QueryResultInterface::class, $result);
         $this->assertCount(3, $result, 'The result should have 3 items');
         $this->assertEquals(3, $result->count(), 'Count should be 3');
 

Tests/Unit/Eel/ElasticSearchQueryBuilderResultTest.php

@@ -11,6 +11,7 @@
  * The TYPO3 project - inspiring people to share!                                                   *
  *                                                                                                  */
 
+use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Eel\ElasticSearchQuery;
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Eel\ElasticSearchQueryBuilder;
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Eel\ElasticSearchQueryResult;
 
@@ -25,14 +26,14 @@ class ElasticSearchQueryBuilderResultTest extends \TYPO3\Flow\Tests\UnitTestCase
      */
     public function ifNoAggregationsAreSetInTheQueyBuilderResultAnEmptyArrayWillBeReturnedIfYouFetchTheAggregations()
     {
-        $resultArrayWithoutAggregations = array(
-            "nodes" => array("some", "nodes")
-        );
+        $resultArrayWithoutAggregations = [
+            "nodes" => ["some", "nodes"]
+        ];
 
-        $queryBuilder = $this->getMock(ElasticSearchQueryBuilder::class, array("fetch"));
+        $queryBuilder = $this->getMockBuilder(ElasticSearchQueryBuilder::class)->setMethods(["fetch"])->getMock();
         $queryBuilder->method("fetch")->will($this->returnValue($resultArrayWithoutAggregations));
 
-        $esQuery = new \Flowpack\ElasticSearch\ContentRepositoryAdaptor\Eel\ElasticSearchQuery($queryBuilder);
+        $esQuery = new ElasticSearchQuery($queryBuilder);
 
         $queryResult = new ElasticSearchQueryResult($esQuery);