Test entire request (#310)

Author: jderusse

tests/Unit/Input/AddLayerVersionPermissionRequestTest.php

@@ -10,14 +10,9 @@
  */
 class AddLayerVersionPermissionRequestTest extends TestCase
 {
-    /**
-     * @var AddLayerVersionPermissionRequest
-     */
-    private $input;
-
-    public function setUp(): void
+    public function testRequest(): void
     {
-        $this->input = new AddLayerVersionPermissionRequest([
+        $input = new AddLayerVersionPermissionRequest([
             'LayerName' => 'nodejs',
             'VersionNumber' => 2,
             'StatementId' => 'fooBar',
@@ -26,31 +21,19 @@ public function setUp(): void
             'OrganizationId' => '*',
             'RevisionId' => '123456',
         ]);
-        parent::setUp();
-    }
 
-    public function testRequestBody(): void
-    {
-        $expected = '{
-           "Action": "lambda:GetLayerVersion",
-           "StatementId": "fooBar",
-           "Principal": "123456789",
-           "OrganizationId": "*"
-        }';
+        $expected = '
+            POST /2018-10-31/layers/nodejs/versions/2/policy?RevisionId=123456 HTTP/1.0
+            Content-Type: application/json
 
-        self::assertJsonStringEqualsJsonString($expected, $this->input->request()->getBody()->stringify());
-    }
+            {
+               "Action": "lambda:GetLayerVersion",
+               "StatementId": "fooBar",
+               "Principal": "123456789",
+               "OrganizationId": "*"
+            }
+        ';
 
-    public function testRequestUri(): void
-    {
-        $expected = '/2018-10-31/layers/nodejs/versions/2/policy';
-
-        self::assertSame($expected, $this->input->request()->getUri());
-    }
-
-    public function testRequestQuery(): void
-    {
-        $expected = ['RevisionId' => '123456'];
-        self::assertSame($expected, $this->input->request()->getQuery());
+        self::assertRequestEqualsHttpRequest($expected, $input->request());
     }
 }

tests/Unit/Input/InvocationRequestTest.php

@@ -11,37 +11,30 @@
  */
 class InvocationRequestTest extends TestCase
 {
-    /**
-     * @var InvocationRequest
-     */
-    private $input;
-
-    public function setUp(): void
+    public function testRequest(): void
     {
-        $this->input = new InvocationRequest([
+        $input = new InvocationRequest([
             'FunctionName' => 'MyFunction',
             'InvocationType' => 'Event',
             'LogType' => 'Tail',
             'ClientContext' => 'MyApp',
             'Payload' => '{"name": "jderusse"}',
             'Qualifier' => '1',
         ]);
-        parent::setUp();
-    }
 
-    public function testRequestBody(): void
-    {
-        $expected = '{
-            "name": "jderusse"
-        }';
+        $expected = '
+            POST /2015-03-31/functions/MyFunction/invocations?Qualifier=1 HTTP/1.0
+            Content-Type: application/json
+            x-amz-invocation-type: Event
+            x-amz-log-type: Tail
+            x-amz-client-context: MyApp
 
-        self::assertJsonStringEqualsJsonString($expected, $this->input->request()->getBody()->stringify());
-    }
 
-    public function testRequestUri(): void
-    {
-        $expected = '/2015-03-31/functions/MyFunction/invocations';
+            {
+                "name": "jderusse"
+            }
+        ';
 
-        self::assertSame($expected, $this->input->request()->getUri());
+        self::assertRequestEqualsHttpRequest($expected, $input->request());
     }
 }

tests/Unit/Input/ListLayerVersionsRequestTest.php

@@ -11,19 +11,19 @@
  */
 class ListLayerVersionsRequestTest extends TestCase
 {
-    /**
-     * @var ListLayerVersionsRequest
-     */
-    private $input;
-
-    public function setUp(): void
+    public function testRequest(): void
     {
-        $this->input = new ListLayerVersionsRequest([
+        $input = new ListLayerVersionsRequest([
             'CompatibleRuntime' => 'nodejs12.x',
             'LayerName' => 'demo',
         ]);
 
-        parent::setUp();
+        $expected = '
+            GET /2018-10-31/layers/demo/versions?CompatibleRuntime=nodejs12.x HTTP/1.0
+            Content-Type: application/json
+        ';
+
+        self::assertRequestEqualsHttpRequest($expected, $input->request());
     }
 
     public function testInvalidEnum(): void
@@ -36,11 +36,4 @@ public function testInvalidEnum(): void
         $this->expectExceptionMessage('Invalid parameter "CompatibleRuntime" when validating the "AsyncAws\Lambda\Input\ListLayerVersionsRequest". The value "boom" is not a valid "Runtime".');
         $input->validate();
     }
-
-    public function testRequestUrl(): void
-    {
-        $expected = '/2018-10-31/layers/demo/versions';
-
-        self::assertSame($expected, $this->input->request()->getUri());
-    }
 }

tests/Unit/Input/PublishLayerVersionRequestTest.php

@@ -11,14 +11,9 @@
  */
 class PublishLayerVersionRequestTest extends TestCase
 {
-    /**
-     * @var PublishLayerVersionRequest
-     */
-    private $input;
-
-    public function setUp(): void
+    public function testRequest(): void
     {
-        $this->input = new PublishLayerVersionRequest([
+        $input = new PublishLayerVersionRequest([
             'LayerName' => 'demo',
             'Description' => 'small description',
             'Content' => new LayerVersionContentInput([
@@ -31,32 +26,24 @@ public function setUp(): void
             'LicenseInfo' => 'MIT',
         ]);
 
-        parent::setUp();
-    }
-
-    public function testRequestBody(): void
-    {
         // see https://docs.aws.amazon.com/lambda/latest/dg/API_PublishLayerVersion.html
-        $expected = '{
-            "Description": "small description",
-            "Content": {
-                "S3Bucket": "myBucket",
-                "S3Key": "path/to/file",
-                "S3ObjectVersion": "123",
-                "ZipFile": "YmluYXJ5IGNvbnRlbnQ="
-            },
-            "CompatibleRuntimes": ["nodejs10.x", "nodejs12.x"],
-            "LicenseInfo": "MIT"
-        }';
-
-        self::assertJsonStringEqualsJsonString($expected, $this->input->request()->getBody()->stringify());
-    }
-
-    public function testRequestUrl(): void
-    {
-        // see https://docs.aws.amazon.com/lambda/latest/dg/API_ListLayerVersions.html
-        $expected = '/2018-10-31/layers/demo/versions';
-
-        self::assertSame($expected, $this->input->request()->getUri());
+        $expected = '
+            POST /2018-10-31/layers/demo/versions HTTP/1.0
+            Content-Type: application/json
+
+            {
+                "Description": "small description",
+                "Content": {
+                    "S3Bucket": "myBucket",
+                    "S3Key": "path/to/file",
+                    "S3ObjectVersion": "123",
+                    "ZipFile": "YmluYXJ5IGNvbnRlbnQ="
+                },
+                "CompatibleRuntimes": ["nodejs10.x", "nodejs12.x"],
+                "LicenseInfo": "MIT"
+            }
+        ';
+
+        self::assertRequestEqualsHttpRequest($expected, $input->request());
     }
 }