Replace Serializer test with serializer compliance test

sandrum · Jun 18, 2015 · 0db6dcd · 0db6dcd
1 parent fc69926
commit 0db6dcd
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 41 deletions.
diff --git a/tests/Api/Serializer/QuerySerializerTest.php b/tests/Api/Serializer/QuerySerializerTest.php
@@ -46,45 +46,4 @@ function () {}
         $this->assertEquals('http://foo.com', (string) $request->getUri());
         $this->assertEquals('Action=foo&Version=1&baz=', (string) $request->getBody());
     }
-
-    public function testUsesLocationNameToIdentifyMembersOfFlattenedLists()
-    {
-        $service = new Service(
-            [
-                'metadata'=> [
-                    'protocol'   => 'query',
-                    'apiVersion' => '1'
-                ],
-                'operations' => [
-                    'foo' => [
-                        'http' => ['httpMethod' => 'POST'],
-                        'input' => [
-                            'type' => 'structure',
-                            'members' => [
-                                'bars' => [
-                                    'type' => 'list',
-                                    'member' => [
-                                        'type' => 'string',
-                                        'locationName' => 'bar',
-                                    ],
-                                    'flattened' => true,
-                                ],
-                            ]
-                        ]
-                    ]
-                ]
-            ],
-            function () {}
-        );
-
-        $q = new QuerySerializer($service, 'http://foo.com');
-        $cmd = new Command('foo', ['bars' => ['a', 'list', 'of', 'strings']]);
-        $request = $q($cmd);
-        $this->assertEquals('POST', $request->getMethod());
-        $this->assertEquals('http://foo.com', (string) $request->getUri());
-        $this->assertEquals(
-            'Action=foo&Version=1&bar.1=a&bar.2=list&bar.3=of&bar.4=strings',
-            (string) $request->getBody()
-        );
-    }
 }
diff --git a/tests/Api/test_cases/protocols/input/query.json b/tests/Api/test_cases/protocols/input/query.json
@@ -186,6 +186,59 @@
       }
     ]
   },
+  {
+    "description": "Flattened list with LocationName",
+    "metadata": {
+      "protocol": "query",
+      "apiVersion": "2014-01-01"
+    },
+    "shapes": {
+      "InputShape": {
+        "type": "structure",
+        "members": {
+          "ScalarArg": {
+            "shape": "StringType"
+          },
+          "ListArg": {
+            "shape": "ListType"
+          }
+        }
+      },
+      "ListType": {
+        "type": "list",
+        "member": {
+          "shape": "StringType",
+          "locationName": "ListArgLocation"
+        },
+        "flattened": true
+      },
+      "StringType": {
+        "type": "string"
+      }
+    },
+    "cases": [
+      {
+        "given": {
+          "input": {
+            "shape": "InputShape"
+          },
+          "name": "OperationName"
+        },
+        "params": {
+          "ScalarArg": "foo",
+          "ListArg": [
+            "a",
+            "b",
+            "c"
+          ]
+        },
+        "serialized": {
+          "uri": "/",
+          "body": "Action=OperationName&Version=2014-01-01&ScalarArg=foo&ListArgLocation.1=a&ListArgLocation.2=b&ListArgLocation.3=c"
+        }
+      }
+    ]
+  },
   {
     "description": "Serialize map type",
     "metadata": {