Merge pull request #96 from daniellienert/issue/IN-8

[TASK] Enable elasticsearch for functional tests in travis

Author: skurfuerst

.travis.yml

@@ -3,14 +3,23 @@ matrix:
   include:
     - php: 5.6
     - php: 5.5
-# use modern infrastructure based on containers  
 sudo: false
 before_install:
+  - cd ..
+  - wget --no-check-certificate https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-1.7.0.zip && unzip elasticsearch-1.7.0.zip
+  - mv elasticsearch-1.7.0 elasticsearch
+  - cd elasticsearch
+  - bin/elasticsearch -d
   - cd ..
   - git clone https://github.com/neos/neos-base-distribution.git
   - cd neos-base-distribution
   - composer require flowpack/elasticsearch-contentrepositoryadaptor dev-master
 install:
   - composer install
+  - cd ..
+  - rm -rf neos-base-distribution/Packages/Application/Flowpack.ElasticSearch.ContentRepositoryAdaptor
+  - mv Flowpack.ElasticSearch.ContentRepositoryAdaptor neos-base-distribution/Packages/Application/Flowpack.ElasticSearch.ContentRepositoryAdaptor
+  - cd neos-base-distribution
 script:
   - bin/phpunit -c Build/BuildEssentials/PhpUnit/UnitTests.xml Packages/Application/Flowpack.ElasticSearch.ContentRepositoryAdaptor/Tests/Unit
+  - FLOW_CONTEXT=Testing/WithoutLanguageFallback bin/phpunit -c Build/BuildEssentials/PhpUnit/FunctionalTests.xml Packages/Application/Flowpack.ElasticSearch.ContentRepositoryAdaptor/Tests/Functional

Configuration/Testing/WithoutLanguageFallback/Settings.yaml

@@ -0,0 +1,21 @@
+TYPO3:
+  TYPO3CR:
+    contentDimensions:
+      'language':
+        default: 'en_US'
+        defaultPreset: 'en_US'
+        presets:
+          'all': ~
+          'en_US':
+            label: 'English (US)'
+            values: ['en_US']
+            uriSegment: 'en'
+          'en_UK': ~
+          'de':
+            label: 'German'
+            values: ['de']
+            uriSegment: 'de'
+          'fr': ~
+          'nl': ~
+          'dk': ~
+          'lv': ~

Tests/Functional/Eel/ElasticSearchQueryTest.php

@@ -11,13 +11,18 @@
  * The TYPO3 project - inspiring people to share!                                                   *
  *                                                                                                  */
 
-use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Eel\ElasticSearchQuery;
+use TYPO3\TYPO3CR\Domain\Repository\WorkspaceRepository;
 
 /**
  * Testcase for ElasticSearchQuery
  */
 class ElasticSearchQueryTest extends \TYPO3\Flow\Tests\FunctionalTestCase
 {
+    /**
+     * @var WorkspaceRepository
+     */
+    protected $workspaceRepository;
+
     /**
      * @var \Flowpack\ElasticSearch\ContentRepositoryAdaptor\Command\NodeIndexCommandController
      */
@@ -56,19 +61,28 @@ class ElasticSearchQueryTest extends \TYPO3\Flow\Tests\FunctionalTestCase
     public function setUp()
     {
         parent::setUp();
+        $this->workspaceRepository = $this->objectManager->get('TYPO3\TYPO3CR\Domain\Repository\WorkspaceRepository');
+        $liveWorkspace = new \TYPO3\TYPO3CR\Domain\Model\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->context = $this->contextFactory->create(array('workspaceName' => 'live', 'dimensions' => array('language' => array('de'))));
+
         $this->nodeDataRepository = $this->objectManager->get('TYPO3\TYPO3CR\Domain\Repository\NodeDataRepository');
         $this->queryBuilder = $this->objectManager->get('Flowpack\ElasticSearch\ContentRepositoryAdaptor\Eel\ElasticSearchQueryBuilder');
 
         $this->queryBuilder->log();
-        $this->createNodesForNodeSearchTest();
+
+        // we need to make sure that the index will be prefixed with an unique name. so we add a sleet as it is not
+        // possible right now to set the index name
+        sleep(4);
 
         $this->nodeIndexCommandController = $this->objectManager->get('Flowpack\ElasticSearch\ContentRepositoryAdaptor\Command\NodeIndexCommandController');
         $this->nodeIndexCommandController->buildCommand();
-    }
 
+        $this->createNodesForNodeSearchTest();
+    }
 
     public function tearDown()
     {
@@ -109,7 +123,23 @@ public function filterLimitQuery()
         $this->assertCount(1, $result->toArray(), 'Asserting the executed query returns a valid number of items.');
     }
 
+    /**
+     * @test
+     */
+    public function aggregationsCanAdded()
+    {
+        $aggregationTitle = "titleagg";
+        $result = $this->queryBuilder->query($this->context->getRootNode())->fieldBasedAggregation($aggregationTitle, "title")->execute()->getAggregations();
+
+        $this->assertArrayHasKey($aggregationTitle, $result);
 
+        // assume three results because there are three nodes created with an title set
+        $this->assertCount(3, $result[$aggregationTitle]);
+    }
+
+    /**
+     * Creates some sample nodes to run tests against
+     */
     protected function createNodesForNodeSearchTest()
     {
         $rootNode = $this->context->getRootNode();
@@ -124,5 +154,6 @@ protected function createNodesForNodeSearchTest()
         $newNode2->setProperty('title', 'egg');
 
         $this->persistenceManager->persistAll();
+        $this->nodeIndexCommandController->buildCommand();
     }
 }