Moved integration tests from ClientTest to ClientIntegrationTest

Author: ezimuel

tests/Elasticsearch/Tests/ClientIntegrationTest.php

@@ -20,6 +20,7 @@
 
 use Elasticsearch\Client;
 use Elasticsearch\ClientBuilder;
+use Elasticsearch\Common\Exceptions\BadRequest400Exception;
 use Elasticsearch\Common\Exceptions\ElasticsearchException;
 use Elasticsearch\Common\Exceptions\Missing404Exception;
 use Elasticsearch\Tests\ClientBuilder\ArrayLogger;
@@ -96,6 +97,62 @@ public function testLogRequestFailHasWarning()
         }
     }
 
+    public function testIndexCannotBeEmptyStringForDelete()
+    {
+        $client = $this->getClient();
+
+        $this->expectException(Missing404Exception::class);
+
+        $client->delete(
+            [
+            'index' => '',
+            'id' => 'test'
+            ]
+        );
+    }
+
+    public function testIdCannotBeEmptyStringForDelete()
+    {
+        $client = $this->getClient();
+
+        $this->expectException(BadRequest400Exception::class);
+
+        $client->delete(
+            [
+            'index' => 'test',
+            'id' => ''
+            ]
+        );
+    }
+
+    public function testIndexCannotBeArrayOfEmptyStringsForDelete()
+    {
+        $client = $this->getClient();
+
+        $this->expectException(Missing404Exception::class);
+
+        $client->delete(
+            [
+            'index' => ['', '', ''],
+            'id' => 'test'
+            ]
+        );
+    }
+
+    public function testIndexCannotBeArrayOfNullsForDelete()
+    {
+        $client = $this->getClient();
+
+        $this->expectException(Missing404Exception::class);
+
+        $client->delete(
+            [
+            'index' => [null, null, null],
+            'id' => 'test'
+            ]
+        );
+    }
+
     private function getLevelOutput(string $level, array $output): string
     {
         foreach ($output as $out) {

tests/Elasticsearch/Tests/ClientTest.php

@@ -106,21 +106,6 @@ public function testIndexCannotBeNullForDelete()
         );
     }
 
-    public function testTypeCanBeNullForDelete()
-    {
-        $client = ClientBuilder::create()->build();
-
-        $this->expectException(Elasticsearch\Common\Exceptions\Missing404Exception::class);
-
-        $client->delete(
-            [
-            'index' => 'test',
-            'type' => null,
-            'id' => 'test'
-            ]
-        );
-    }
-
     public function testIdCannotBeNullForDelete()
     {
         $client = ClientBuilder::create()->build();
@@ -131,87 +116,11 @@ public function testIdCannotBeNullForDelete()
         $client->delete(
             [
             'index' => 'test',
-            'type' => 'test',
             'id' => null
             ]
         );
     }
 
-    public function testIndexCannotBeEmptyStringForDelete()
-    {
-        $client = ClientBuilder::create()->build();
-
-        $this->expectException(Elasticsearch\Common\Exceptions\Missing404Exception::class);
-
-        $client->delete(
-            [
-            'index' => '',
-            'type' => 'test',
-            'id' => 'test'
-            ]
-        );
-    }
-
-    public function testTypeCannotBeEmptyStringForDelete()
-    {
-        $client = ClientBuilder::create()->build();
-
-        $this->expectException(Elasticsearch\Common\Exceptions\BadRequest400Exception::class);
-
-        $client->delete(
-            [
-            'index' => 'test',
-            'type' => '',
-            'id' => 'test'
-            ]
-        );
-    }
-
-    public function testIdCannotBeEmptyStringForDelete()
-    {
-        $client = ClientBuilder::create()->build();
-
-        $this->expectException(Elasticsearch\Common\Exceptions\BadRequest400Exception::class);
-
-        $client->delete(
-            [
-            'index' => 'test',
-            'type' => 'test',
-            'id' => ''
-            ]
-        );
-    }
-
-    public function testIndexCannotBeArrayOfEmptyStringsForDelete()
-    {
-        $client = ClientBuilder::create()->build();
-
-        $this->expectException(Elasticsearch\Common\Exceptions\Missing404Exception::class);
-
-        $client->delete(
-            [
-            'index' => ['', '', ''],
-            'type' => 'test',
-            'id' => 'test'
-            ]
-        );
-    }
-
-    public function testIndexCannotBeArrayOfNullsForDelete()
-    {
-        $client = ClientBuilder::create()->build();
-
-        $this->expectException(Elasticsearch\Common\Exceptions\Missing404Exception::class);
-
-        $client->delete(
-            [
-            'index' => [null, null, null],
-            'type' => 'test',
-            'id' => 'test'
-            ]
-        );
-    }
-
     public function testMaxRetriesException()
     {
         $client = Elasticsearch\ClientBuilder::create()