[TASK] Adjust tests to currently pass without language dimensions with fallbacks

Author: daniellienert

Classes/Flowpack/ElasticSearch/ContentRepositoryAdaptor/Eel/ElasticSearchQueryBuilder.php

@@ -512,7 +512,9 @@ public function log($message = NULL) {
 	 * @return integer
 	 */
 	public function getTotalItems() {
-		return $this->result['total'];
+		if (array_key_exists('total', $this->result)) {
+            return (int) $this->result['total'];
+        }
 	}
 
 	/**
@@ -545,7 +547,7 @@ public function getFullElasticSearchHitForNode(NodeInterface $node) {
 	/**
 	 * Execute the query and return the list of nodes as result.
 	 *
-	 * This method is rather internal; just to be called from the ElasticSearchQueryResult. For the public API, please use execute()
+     * This method is rather internal; just to be called from the ElasticSearchQueryResult. For the public API, please use execute()
 	 *
 	 * @return array<\TYPO3\TYPO3CR\Domain\Model\NodeInterface>
 	 */
@@ -554,7 +556,7 @@ public function fetch() {
 		$response = $this->elasticSearchClient->getIndex()->request('GET', '/_search', array(), json_encode($this->request));
 		$timeAfterwards = microtime(TRUE);
 
-		$this->result =& $response->getTreatedContent();
+        $this->result = $response->getTreatedContent();
 
 		$this->result['nodes'] = array();
 		if (array_key_exists('hits', $this->result) && is_array($this->result['hits']) && count($this->result['hits']) > 0) {

Tests/Functional/Eel/ElasticSearchQueryTest.php

@@ -103,11 +103,12 @@ public function filterNodeByProperty()
     public function filterLimitQuery()
     {
         $resultCount = $this->queryBuilder->query($this->context->getRootNode())->limit(1)->count();
-        $this->assertEquals(6, $resultCount, 'Asserting the count query returns the total count.');
+        $this->assertEquals(3, $resultCount, 'Asserting the count query returns the total count.');
 
         $result = $this->queryBuilder->query($this->context->getRootNode())->limit(1)->execute();
-        $this->assertCount(1, $result, 'Asserting the executed query returns a valid number of items.');
+
         $this->assertEquals(1, $result->getAccessibleCount(), 'Asserting that getAccessibleCount returns the correct number');
+        $this->assertCount(1, $result->toArray(), 'Asserting the executed query returns a valid number of items.');
     }