Update protocol tests

build_tools/aws-sdk-code-generator/lib/aws-sdk-code-generator/views/client_api_module.rb

@@ -34,6 +34,8 @@ class ClientApiModule < View
         'union' => false, # should remain false
         'document' => true,
         'jsonvalue' => true,
+        'error' => true, # parsing customized error
+        'locationName' => true, # to recognize xmlName defined on shape
         # event stream modeling
         'event' => false,
         'eventstream' => false,
@@ -43,7 +45,6 @@ class ClientApiModule < View
         'synthetic' => false,
         'box' => false,
         'fault' => false,
-        'error' => false,
         'exception_event' => false, # internal, exceptions cannot be events
         'deprecated' => false,
         'deprecatedMessage' => false,
@@ -52,7 +53,6 @@ class ClientApiModule < View
         'members' => false,
         'member' => false,
         'key' => false,
-        'locationName' => false,
         'value' => false,
         'required' => false,
         'enum' => false,
@@ -499,7 +499,14 @@ def operation_ref(ref)
           metadata.each_pair do |key, value|
             next if key == 'resultWrapper'
             if key == 'locationName'
-              options[:location_name] = value.inspect
+              options[:location_name] =
+                # use the xmlName on shape if defined
+                if (@service.protocol == 'rest-xml') &&
+                   (shape_location_name = @service.api['shapes'][shape_name]['locationName'])
+                  shape_location_name.inspect
+                else
+                  value.inspect
+                end
             else
               options[:metadata] ||= {}
               options[:metadata][key] = value.inspect

build_tools/aws-sdk-code-generator/spec/aws-sdk-code-generator/underscore_spec.rb

@@ -4,47 +4,48 @@
 
 module AwsSdkCodeGenerator
   module Underscore
+
     describe 'underscore' do
 
       it 'downcases titleized words' do
-        expect(underscore('Foo')).to eq('foo')
+        expect(Underscore.underscore('Foo')).to eq('foo')
       end
 
       it 'breaks compound titleized words with underscores' do
-        expect(underscore('FooBarYuck')).to eq('foo_bar_yuck')
+        expect(Underscore.underscore('FooBarYuck')).to eq('foo_bar_yuck')
       end
 
       it 'treats acronyms as a single word' do
-        expect(underscore('AWS')).to eq('aws')
+        expect(Underscore.underscore('AWS')).to eq('aws')
       end
 
       it 'preserves leading acronyms' do
-        expect(underscore('AWSAccount')).to eq('aws_account')
+        expect(Underscore.underscore('AWSAccount')).to eq('aws_account')
       end
 
       it 'preserves trailing acronyms' do
-        expect(underscore('SimpleDB')).to eq('simple_db')
+        expect(Underscore.underscore('SimpleDB')).to eq('simple_db')
       end
 
       it 'preserves nested acronyms' do
-        expect(underscore('MySUPERWord')).to eq('my_super_word')
-        expect(underscore('AWSAccountID')).to eq('aws_account_id')
+        expect(Underscore.underscore('MySUPERWord')).to eq('my_super_word')
+        expect(Underscore.underscore('AWSAccountID')).to eq('aws_account_id')
       end
 
       it 'treats trailing numbers as a part of acronyms' do
-        expect(underscore('MD5OfBody')).to eq('md5_of_body')
-        expect(underscore('S3Bucket')).to eq('s3_bucket')
-        expect(underscore('EC2Instance')).to eq('ec2_instance')
+        expect(Underscore.underscore('MD5OfBody')).to eq('md5_of_body')
+        expect(Underscore.underscore('S3Bucket')).to eq('s3_bucket')
+        expect(Underscore.underscore('EC2Instance')).to eq('ec2_instance')
       end
 
       it 'does not include leading numbers as part of a word' do
-        expect(underscore('SentLast24Hours')).to eq('sent_last_24_hours')
-        expect(underscore('24MIN')).to eq('24_min')
+        expect(Underscore.underscore('SentLast24Hours')).to eq('sent_last_24_hours')
+        expect(Underscore.underscore('24MIN')).to eq('24_min')
       end
 
       it 'accepts words that start with a lower case letter' do
-        expect(underscore('s3Key')).to eq('s3_key')
-        expect(underscore('s3Bucket')).to eq('s3_bucket')
+        expect(Underscore.underscore('s3Key')).to eq('s3_key')
+        expect(Underscore.underscore('s3Bucket')).to eq('s3_bucket')
       end
 
       describe 'irregular inflections' do
@@ -85,7 +86,7 @@ module Underscore
           'VolumeiSCSIAttributes' => 'volume_iscsi_attributes'
         }.each do |camel_case, underscored|
           it "inflects #{camel_case} to #{underscored}" do
-            expect(underscore(camel_case)).to eq(underscored)
+            expect(Underscore.underscore(camel_case)).to eq(underscored)
           end
         end
 

build_tools/aws-sdk-code-generator/spec/fixtures/interfaces/streaming/api.json

@@ -91,7 +91,8 @@
       "type": "string"
     },
     "Body": {
-      "type": "blob"
+      "type": "blob",
+      "streaming": true
     },
     "Stream": {
       "type": "blob",

build_tools/aws-sdk-code-generator/spec/protocol-tests-ignore-list.json

@@ -0,0 +1,35 @@
+{
+  "ec2" :
+    {
+      "input" : [],
+      "output" : []
+    },
+  "json" : {
+    "input" : [],
+    "output" : []
+  },
+  "json_1_0" : {
+    "input" : [],
+    "output" : []
+  },
+  "query" : {
+    "input" : [],
+    "output" : []
+  },
+  "rest-json" : {
+    "input" : [],
+    "output" : [
+      {"RestJsonDeserializesDenseSetMapAndSkipsNull": "Seeking clarification from Smithy"}
+    ]
+  },
+  "rest-xml" : {
+    "input" : [],
+    "output" : [
+      {"SimpleScalarPropertiesComplexEscapes": "OxEngine does not handle all escape cases but other engines supports it"}
+    ]
+  },
+  "api-gateway" : {
+    "input" : [],
+    "output" : []
+  }
+}

build_tools/aws-sdk-code-generator/spec/protocols/input/api-gateway.json → build_tools/aws-sdk-code-generator/spec/protocol-tests/input/api-gateway.json

@@ -1,20 +1,22 @@
 [
   {
-    "description": "No parameters set marshalls as empty body",
+    "description": "Test cases for EmptyOperation operation",
     "metadata": {
        "protocol": "api-gateway",
        "apiVersion": "2016-12-14T20:41:37Z"
     },
     "shapes": {},
     "cases": [
       {
+        "id": "ApiGatewayMarshalEmptyBody",
         "given": {
           "http": {
             "method": "GET",
             "requestUri": "/test/noauth/scalars"
           },
           "name": "OperationName"
         },
+        "description": "No parameters set marshals as empty body",
         "serialized": {
           "body": "",
           "uri": "/test/noauth/scalars",
@@ -24,7 +26,7 @@
     ]
   },
   {
-    "description": "Scalar members in payload member",
+    "description": "Test cases for Scalar Payload Members",
     "metadata": {
        "protocol": "api-gateway",
        "apiVersion": "2016-12-14T20:41:37Z"
@@ -68,6 +70,7 @@
     },
     "cases": [
       {
+        "id": "ApiGatewayMarshalsScalarPayloadMembers",
         "given": {
           "http": {
             "method": "GET",
@@ -78,6 +81,7 @@
           },
           "name": "OperationName"
         },
+        "description": "Scalar members in payload member",
         "params": {
           "StringMember": "foo",
           "IntegerMember": 42,
@@ -94,7 +98,7 @@
     ]
   },
   {
-    "description": "Nested structure in payload member",
+    "description": "Test cases for Struct Payload Member",
     "metadata": {
        "protocol": "api-gateway",
        "apiVersion": "2016-12-14T20:41:37Z"
@@ -131,6 +135,7 @@
     },
     "cases": [
       {
+        "id": "ApiGatewayNestedStructPayloadMember",
         "given": {
           "http": {
             "method": "GET",
@@ -141,6 +146,7 @@
           },
           "name": "OperationName"
         },
+        "description": "Nested structure in payload member",
         "params": {
           "PayloadMember": {
             "NestedStructure": {
@@ -157,7 +163,7 @@
     ]
   },
   {
-    "description": "Recursive structure with no recursion used",
+    "description": "Test cases for Recursive structure with no recursion member",
     "metadata": {
        "protocol": "api-gateway",
        "apiVersion": "2016-12-14T20:41:37Z"
@@ -185,6 +191,7 @@
     },
     "cases": [
       {
+        "id": "ApiGatewayRecursiveStructWithNoRecursionMember",
         "given": {
           "http": {
             "method": "PUT",
@@ -195,6 +202,7 @@
           },
           "name": "OperationName"
         },
+        "description": "Recursive structure with no recursion used",
         "params": {
           "RecursiveStructure": {
             "NoRecursiveMember": "foo"
@@ -209,7 +217,7 @@
     ]
   },
   {
-    "description": "Recursive structure with multiple levels of recursion",
+    "description": "Test cases for Recursive structure with recursion member",
     "metadata": {
        "protocol": "api-gateway",
        "apiVersion": "2016-12-14T20:41:37Z"
@@ -253,6 +261,7 @@
     },
     "cases": [
       {
+        "id": "ApiGatewayRecrusiveStructwithRecursionMember",
         "given": {
           "http": {
             "method": "PUT",
@@ -263,6 +272,7 @@
           },
           "name": "OperationName"
         },
+        "description": "Recursive structure with multiple levels of recursion\"",
         "params": {
           "RecursiveStructure": {
             "RecursiveMember": {
@@ -281,7 +291,7 @@
     ]
   },
   {
-    "description": "Modeled string header with location name, Query Strings",
+    "description": "Test cases for String Header with location name",
     "metadata": {
        "protocol": "api-gateway",
        "apiVersion": "2016-12-14T20:41:37Z"
@@ -313,6 +323,7 @@
     },
     "cases": [
       {
+        "id": "ApiGatewayStringHeaderQueryString",
         "given": {
           "http": {
             "method": "POST",
@@ -323,6 +334,7 @@
           },
           "name": "OperationName"
         },
+        "description": "Modeled string header with location name, Query Strings",
         "params": {
           "QueryStrMemberA": "querya",
           "QueryStrMemberB": "queryb",
@@ -339,7 +351,7 @@
     ]
   },
   {
-    "description": "Operation with single path parameter replaces placeholder",
+    "description": "Test cases for Operation with single path parameter",
     "metadata": {
        "protocol": "api-gateway",
        "apiVersion": "2016-12-14T20:41:37Z"
@@ -360,6 +372,7 @@
     },
     "cases": [
       {
+        "id": "ApiGatewaySinglePathParameter",
         "given": {
           "http": {
             "method": "GET",
@@ -370,6 +383,7 @@
           },
           "name": "OperationName"
         },
+        "description": "Operation with single path parameter replaces placeholder",
         "params": {
           "PathMember": "foo"
         },
@@ -382,7 +396,7 @@
     ]
   },
   {
-    "description": "Operation with multiple path parameters replaces correct placeholders",
+    "description": "Test cases for Operation with multiple path parameters",
     "metadata": {
        "protocol": "api-gateway",
        "apiVersion": "2016-12-14T20:41:37Z"
@@ -409,6 +423,7 @@
     },
     "cases": [
       {
+        "id": "ApiGatewayMultiplePathParameters",
         "given": {
           "http": {
             "method": "GET",
@@ -419,6 +434,7 @@
           },
           "name": "OperationName"
         },
+        "description": "Operation with multiple path parameters replaces correct placeholders",
         "params": {
           "PathMember": "foo",
           "MultiLocation": "bar"