Improved tests with body as string

Author: ezimuel

tests/Integration/BasicTest.php

@@ -24,8 +24,6 @@
  */
 class BasicTest extends TestCase
 {
-    protected static array $ids;
-
     public function setUp(): void
     {
         $this->client = Utility::getClient();
@@ -73,7 +71,33 @@ public function testIndexDocuments(string $date, string $open, string $high, str
         $this->assertEquals(201, $response->getStatusCode());
         $this->assertEquals('created', $response['result']);
         $this->assertEquals('stocks', $response['_index']);
-        self::$ids[] = $response['_id']; 
+        return $response['_id']; 
+    }
+
+    public function testIndexDocumentWithBodyAsString()
+    {
+        $response = $this->client->index([
+            'index' => 'stocks',
+            'refresh' => true,
+            'body' => '{"date":"2020-09-26","open":47.32,"high":47.32,"low":47.32,"close":47.32,"volume":968728,"name":"XXX"}' 
+        ]);
+        $this->assertEquals(201, $response->getStatusCode());
+        $this->assertEquals('created', $response['result']);
+        $this->assertEquals('stocks', $response['_index']);
+
+        return $response['_id']; 
+    }
+
+    /**
+     * @depends testIndexDocumentWithBodyAsString
+     */
+    public function testDeleteADocument(string $id)
+    {
+        $response = $this->client->delete([
+            'index' => 'stocks',
+            'id' => $id
+        ]);
+        $this->assertEquals(200, $response->getStatusCode());
     }
 
     /**

tests/Traits/EndpointTraitTest.php

@@ -71,14 +71,16 @@ public function getRequestParts(): array
             [ 'GET', 'http://localhost:9200', ['Foo' => 'bar', 'Content-Type' => 'application/json'], []],
             [ 'GET', 'http://localhost', ['Foo' => 'bar', 'Content-Type' => 'application/json'], []],
             [ 'POST', 'http://localhost:9200', ['Content-Type' => 'application/json'], ['foo' => 'bar']],
-            [ 'POST', 'http://localhost:9200', ['Content-Type' => 'application/x-ndjson'], [[ 'foo' => 'bar'], ['bar' => 'baz']]]
+            [ 'POST', 'http://localhost:9200', ['Content-Type' => 'application/x-ndjson'], [[ 'foo' => 'bar'], ['bar' => 'baz']]],
+            // test body as string
+            [ 'POST', 'http://localhost', ['Content-Type' => 'application/x-ndjson'], '{"foo":"bar"}']
         ];
     }
 
     /**
      * @dataProvider getRequestParts
      */
-    public function testCreateRequest(string $method, string $url, array $headers, array $body)
+    public function testCreateRequest(string $method, string $url, array $headers, $body)
     {
         $request = $this->createRequest($method, $url, $headers, $body);
         $this->assertEquals($method, $request->getMethod());
@@ -91,7 +93,11 @@ public function testCreateRequest(string $method, string $url, array $headers, a
             $this->assertEquals($value, implode(',', $header));
         }
         if (!empty($body)) {
-            $this->assertEquals($this->bodySerialize($body, $headers['Content-Type']), (string) $request->getBody());
+            if (is_array($body)) {
+                $this->assertEquals($this->bodySerialize($body, $headers['Content-Type']), (string) $request->getBody());
+            } else {
+                $this->assertEquals($body, (string) $request->getBody());
+            }
         }
     }