Fixing abstract elastic search test exception throwing. (#713)

* Fixing abstract elastic search test exception throwing. * fixed index import command test * implemented creating an index in cache clear test * removed non-existing search type in export service * removed unnecessary test
ongr-io · Nov 18, 2016 · ca1dba0 · ca1dba0
1 parent c8d5454
commit ca1dba0
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 139 deletions.
diff --git a/Service/ExportService.php b/Service/ExportService.php
@@ -41,7 +41,6 @@ public function exportIndex(
         $maxLinesInFile = 300000
     ) {
         $params = [
-            'search_type' => 'scroll',
             'scroll' => '10m',
             'size' => $chunkSize,
             'source' => true,

diff --git a/Test/AbstractElasticsearchTestCase.php b/Test/AbstractElasticsearchTestCase.php
@@ -40,7 +40,7 @@ public function runTest()
             return parent::runTest();
         }
 
-        foreach (range(1, $this->getNumberOfRetries()) as $try) {
+        for ($try = 1; $try <= $this->getNumberOfRetries(); $try++) {
             try {
                 return parent::runTest();
             } catch (\Exception $e) {
@@ -51,9 +51,13 @@ public function runTest()
                 if ($try !== $this->getNumberOfRetries()) {
                     $this->tearDown();
                     $this->setUp();
+                } else {
+                    throw $e;
                 }
             }
         }
+
+        return false;
     }
 
     /**

diff --git a/Tests/Functional/Command/CacheClearCommandTest.php b/Tests/Functional/Command/CacheClearCommandTest.php
@@ -18,6 +18,14 @@
 
 class CacheClearCommandTest extends AbstractElasticsearchTestCase
 {
+    /**
+     * {@inheritdoc}
+     */
+    protected function getDataArray()
+    {
+        return ['default' => []];
+    }
+
     /**
      * Tests if command is being executed.
      */

diff --git a/Tests/Functional/Command/IndexImportCommandTest.php b/Tests/Functional/Command/IndexImportCommandTest.php
@@ -61,6 +61,7 @@ public function testIndexImport($bulkSize, $realSize, $filename)
     {
         $app = new Application();
         $app->add($this->getImportCommand());
+        $manager = $this->getManager();
 
         $command = $app->find('ongr:es:index:import');
         $commandTester = new CommandTester($command);
@@ -72,8 +73,6 @@ public function testIndexImport($bulkSize, $realSize, $filename)
             ]
         );
 
-        $manager = $this->getManager();
-        $manager->dropIndex();
         $repo = $manager->getRepository('AcmeBarBundle:Product');
         $search = $repo
             ->createSearch()
@@ -83,7 +82,7 @@ public function testIndexImport($bulkSize, $realSize, $filename)
 
         $ids = [];
         foreach ($results as $doc) {
-            $ids[] = substr($doc->id, 3);
+            $ids[] = substr($doc->getId(), 3);
         }
         sort($ids);
         $data = range(1, $realSize);
@@ -103,6 +102,7 @@ public function testIndexImportWithGzipOption($bulkSize, $realSize, $filename)
     {
         $app = new Application();
         $app->add($this->getImportCommand());
+        $manager = $this->getManager();
 
         $command = $app->find('ongr:es:index:import');
         $commandTester = new CommandTester($command);
@@ -115,8 +115,6 @@ public function testIndexImportWithGzipOption($bulkSize, $realSize, $filename)
             ]
         );
 
-        $manager = $this->getManager();
-        $manager->dropIndex();
         $repo = $manager->getRepository('AcmeBarBundle:Product');
         $search = $repo
             ->createSearch()
@@ -126,7 +124,7 @@ public function testIndexImportWithGzipOption($bulkSize, $realSize, $filename)
 
         $ids = [];
         foreach ($results as $doc) {
-            $ids[] = substr($doc->id, 3);
+            $ids[] = substr($doc->getId(), 3);
         }
         sort($ids);
         $data = range(1, $realSize);

diff --git a/Tests/Functional/Result/DocumentScanIteratorTest.php b/Tests/Functional/Result/DocumentScanIteratorTest.php