diff --git a/generated/protocol-tests/tests/input/ec2/tests/EmptyInputAndEmptyOutputTest.cpp b/generated/protocol-tests/tests/input/ec2/tests/EmptyInputAndEmptyOutputTest.cpp index feb073879bd..5667f918f3a 100644 --- a/generated/protocol-tests/tests/input/ec2/tests/EmptyInputAndEmptyOutputTest.cpp +++ b/generated/protocol-tests/tests/input/ec2/tests/EmptyInputAndEmptyOutputTest.cpp @@ -19,12 +19,11 @@ AWS_PROTOCOL_TEST(EmptyInputAndEmptyOutput, Ec2QueryEmptyInputAndEmptyOutput) { EmptyInputAndEmptyOutputRequest request; auto outcome = client.EmptyInputAndEmptyOutput(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "QWN0aW9uPUVtcHR5SW5wdXRBbmRFbXB0eU91dHB1dCZWZXJzaW9uPTIwMjAtMDEtMDg="; expectedRq.uri = "/"; expectedRq.headers = {{"Content-Type", R"(application/x-www-form-urlencoded)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/ec2/tests/EndpointOperationTest.cpp b/generated/protocol-tests/tests/input/ec2/tests/EndpointOperationTest.cpp index 8a3a71c8317..85851817496 100644 --- a/generated/protocol-tests/tests/input/ec2/tests/EndpointOperationTest.cpp +++ b/generated/protocol-tests/tests/input/ec2/tests/EndpointOperationTest.cpp @@ -19,8 +19,6 @@ AWS_PROTOCOL_TEST(EndpointOperation, Ec2QueryEndpointTrait) { EndpointOperationRequest request; auto outcome = client.EndpointOperation(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "QWN0aW9uPUVuZHBvaW50T3BlcmF0aW9uJlZlcnNpb249MjAyMC0wMS0wOA=="; @@ -28,4 +26,5 @@ AWS_PROTOCOL_TEST(EndpointOperation, Ec2QueryEndpointTrait) { expectedRq.host = "foo.example.com"; expectedRq.headers = {{"Content-Type", R"(application/x-www-form-urlencoded)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/ec2/tests/EndpointWithHostLabelOperationTest.cpp b/generated/protocol-tests/tests/input/ec2/tests/EndpointWithHostLabelOperationTest.cpp index e05e537f025..4f1998e7594 100644 --- a/generated/protocol-tests/tests/input/ec2/tests/EndpointWithHostLabelOperationTest.cpp +++ b/generated/protocol-tests/tests/input/ec2/tests/EndpointWithHostLabelOperationTest.cpp @@ -20,8 +20,6 @@ AWS_PROTOCOL_TEST(EndpointWithHostLabelOperation, Ec2QueryEndpointTraitWithHostL request.SetLabel(R"(bar)"); auto outcome = client.EndpointWithHostLabelOperation(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "QWN0aW9uPUVuZHBvaW50V2l0aEhvc3RMYWJlbE9wZXJhdGlvbiZWZXJzaW9uPTIwMjAtMDEtMDgmTGFiZWw9YmFy"; @@ -29,4 +27,5 @@ AWS_PROTOCOL_TEST(EndpointWithHostLabelOperation, Ec2QueryEndpointTraitWithHostL expectedRq.host = "foo.bar.example.com"; expectedRq.headers = {{"Content-Type", R"(application/x-www-form-urlencoded)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/ec2/tests/HostWithPathOperationTest.cpp b/generated/protocol-tests/tests/input/ec2/tests/HostWithPathOperationTest.cpp index 90298eed5b6..168f616de67 100644 --- a/generated/protocol-tests/tests/input/ec2/tests/HostWithPathOperationTest.cpp +++ b/generated/protocol-tests/tests/input/ec2/tests/HostWithPathOperationTest.cpp @@ -19,12 +19,11 @@ AWS_PROTOCOL_TEST(HostWithPathOperation, Ec2QueryHostWithPath) { HostWithPathOperationRequest request; auto outcome = client.HostWithPathOperation(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "QWN0aW9uPUhvc3RXaXRoUGF0aE9wZXJhdGlvbiZWZXJzaW9uPTIwMjAtMDEtMDg="; expectedRq.uri = "/custom/"; expectedRq.host = "example.com/custom"; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/ec2/tests/NestedStructuresTest.cpp b/generated/protocol-tests/tests/input/ec2/tests/NestedStructuresTest.cpp index e1ac2a102f5..4f8faa6f638 100644 --- a/generated/protocol-tests/tests/input/ec2/tests/NestedStructuresTest.cpp +++ b/generated/protocol-tests/tests/input/ec2/tests/NestedStructuresTest.cpp @@ -30,8 +30,6 @@ AWS_PROTOCOL_TEST(NestedStructures, Ec2NestedStructures) { } auto outcome = client.NestedStructures(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "QWN0aW9uPU5lc3RlZFN0cnVjdHVyZXMmVmVyc2lvbj0yMDIwLTAxLTA4Jk5lc3RlZC5TdHJpbmdBcmc9Zm9vJk5lc3RlZC5PdGhlckFyZz10cnVlJk5lc3RlZC5SZWN1cnNpdmVBcmcuU3RyaW5nQXJnPWJheg=="; @@ -39,4 +37,5 @@ AWS_PROTOCOL_TEST(NestedStructures, Ec2NestedStructures) { expectedRq.headers = {{"Content-Type", R"(application/x-www-form-urlencoded)"}}; expectedRq.requireHeaders = {"Content-Length"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/ec2/tests/NoInputAndOutputTest.cpp b/generated/protocol-tests/tests/input/ec2/tests/NoInputAndOutputTest.cpp index 2f7df1f85de..2c1e702f380 100644 --- a/generated/protocol-tests/tests/input/ec2/tests/NoInputAndOutputTest.cpp +++ b/generated/protocol-tests/tests/input/ec2/tests/NoInputAndOutputTest.cpp @@ -19,12 +19,11 @@ AWS_PROTOCOL_TEST(NoInputAndOutput, Ec2QueryNoInputAndOutput) { NoInputAndOutputRequest request; auto outcome = client.NoInputAndOutput(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "QWN0aW9uPU5vSW5wdXRBbmRPdXRwdXQmVmVyc2lvbj0yMDIwLTAxLTA4"; expectedRq.uri = "/"; expectedRq.headers = {{"Content-Type", R"(application/x-www-form-urlencoded)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/ec2/tests/PutWithContentEncodingTest.cpp b/generated/protocol-tests/tests/input/ec2/tests/PutWithContentEncodingTest.cpp index 2904f92df20..a787750b73d 100644 --- a/generated/protocol-tests/tests/input/ec2/tests/PutWithContentEncodingTest.cpp +++ b/generated/protocol-tests/tests/input/ec2/tests/PutWithContentEncodingTest.cpp @@ -148,13 +148,12 @@ EcffzjixWU9FpAyGp2rVl4ETRgqljOGw4UgK31r0ZIEGnH0xGz1FtbW1OcQM008JVujRqulCucEMmntr )"); auto outcome = client.PutWithContentEncoding(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.uri = "/"; expectedRq.headers = {{"Content-Encoding", R"(gzip)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(PutWithContentEncoding, SDKAppendsGzipAndIgnoresHttpProvidedEncoding_ec2Query) { @@ -295,11 +294,10 @@ EcffzjixWU9FpAyGp2rVl4ETRgqljOGw4UgK31r0ZIEGnH0xGz1FtbW1OcQM008JVujRqulCucEMmntr )"); auto outcome = client.PutWithContentEncoding(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.uri = "/"; expectedRq.headers = {{"Content-Encoding", R"(gzip)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/ec2/tests/QueryIdempotencyTokenAutoFillTest.cpp b/generated/protocol-tests/tests/input/ec2/tests/QueryIdempotencyTokenAutoFillTest.cpp index 89220fe51f3..b489352e20c 100644 --- a/generated/protocol-tests/tests/input/ec2/tests/QueryIdempotencyTokenAutoFillTest.cpp +++ b/generated/protocol-tests/tests/input/ec2/tests/QueryIdempotencyTokenAutoFillTest.cpp @@ -19,8 +19,6 @@ AWS_PROTOCOL_TEST(QueryIdempotencyTokenAutoFill, Ec2ProtocolIdempotencyTokenAuto QueryIdempotencyTokenAutoFillRequest request; auto outcome = client.QueryIdempotencyTokenAutoFill(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "QWN0aW9uPVF1ZXJ5SWRlbXBvdGVuY3lUb2tlbkF1dG9GaWxsJlZlcnNpb249MjAyMC0wMS0wOCZUb2tlbj0wMDAwMDAwMC0wMDAwLTQwMDAtODAwMC0wMDAwMDAwMDAwMDA="; @@ -28,6 +26,7 @@ AWS_PROTOCOL_TEST(QueryIdempotencyTokenAutoFill, Ec2ProtocolIdempotencyTokenAuto expectedRq.headers = {{"Content-Type", R"(application/x-www-form-urlencoded)"}}; expectedRq.requireHeaders = {"Content-Length"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(QueryIdempotencyTokenAutoFill, Ec2ProtocolIdempotencyTokenAutoFillIsSet) { @@ -39,8 +38,6 @@ AWS_PROTOCOL_TEST(QueryIdempotencyTokenAutoFill, Ec2ProtocolIdempotencyTokenAuto request.SetToken(R"(00000000-0000-4000-8000-000000000123)"); auto outcome = client.QueryIdempotencyTokenAutoFill(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "QWN0aW9uPVF1ZXJ5SWRlbXBvdGVuY3lUb2tlbkF1dG9GaWxsJlZlcnNpb249MjAyMC0wMS0wOCZUb2tlbj0wMDAwMDAwMC0wMDAwLTQwMDAtODAwMC0wMDAwMDAwMDAxMjM="; @@ -48,4 +45,5 @@ AWS_PROTOCOL_TEST(QueryIdempotencyTokenAutoFill, Ec2ProtocolIdempotencyTokenAuto expectedRq.headers = {{"Content-Type", R"(application/x-www-form-urlencoded)"}}; expectedRq.requireHeaders = {"Content-Length"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/ec2/tests/QueryListsTest.cpp b/generated/protocol-tests/tests/input/ec2/tests/QueryListsTest.cpp index 32d7808b794..79792afc86e 100644 --- a/generated/protocol-tests/tests/input/ec2/tests/QueryListsTest.cpp +++ b/generated/protocol-tests/tests/input/ec2/tests/QueryListsTest.cpp @@ -30,14 +30,13 @@ AWS_PROTOCOL_TEST(QueryLists, Ec2Lists) { } auto outcome = client.QueryLists(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "QWN0aW9uPVF1ZXJ5TGlzdHMmVmVyc2lvbj0yMDIwLTAxLTA4Jkxpc3RBcmcuMT1mb28mTGlzdEFyZy4yPWJhciZMaXN0QXJnLjM9YmF6JkNvbXBsZXhMaXN0QXJnLjEuSGk9aGVsbG8mQ29tcGxleExpc3RBcmcuMi5IaT1ob2xh"; expectedRq.uri = "/"; expectedRq.headers = {{"Content-Type", R"(application/x-www-form-urlencoded)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(QueryLists, Ec2EmptyQueryLists) { @@ -49,14 +48,13 @@ AWS_PROTOCOL_TEST(QueryLists, Ec2EmptyQueryLists) { request.SetListArg({}); auto outcome = client.QueryLists(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "QWN0aW9uPVF1ZXJ5TGlzdHMmVmVyc2lvbj0yMDIwLTAxLTA4"; expectedRq.uri = "/"; expectedRq.headers = {{"Content-Type", R"(application/x-www-form-urlencoded)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(QueryLists, Ec2ListArgWithXmlNameMember) { @@ -68,14 +66,13 @@ AWS_PROTOCOL_TEST(QueryLists, Ec2ListArgWithXmlNameMember) { request.SetListArgWithXmlNameMember({R"(A)", R"(B)"}); auto outcome = client.QueryLists(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "QWN0aW9uPVF1ZXJ5TGlzdHMmVmVyc2lvbj0yMDIwLTAxLTA4Jkxpc3RBcmdXaXRoWG1sTmFtZU1lbWJlci4xPUEmTGlzdEFyZ1dpdGhYbWxOYW1lTWVtYmVyLjI9Qg=="; expectedRq.uri = "/"; expectedRq.headers = {{"Content-Type", R"(application/x-www-form-urlencoded)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(QueryLists, Ec2ListMemberWithXmlName) { @@ -87,14 +84,13 @@ AWS_PROTOCOL_TEST(QueryLists, Ec2ListMemberWithXmlName) { request.SetListArgWithXmlName({R"(A)", R"(B)"}); auto outcome = client.QueryLists(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "QWN0aW9uPVF1ZXJ5TGlzdHMmVmVyc2lvbj0yMDIwLTAxLTA4JkhpLjE9QSZIaS4yPUI="; expectedRq.uri = "/"; expectedRq.headers = {{"Content-Type", R"(application/x-www-form-urlencoded)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(QueryLists, Ec2ListNestedStructWithList) { @@ -110,12 +106,11 @@ AWS_PROTOCOL_TEST(QueryLists, Ec2ListNestedStructWithList) { } auto outcome = client.QueryLists(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "QWN0aW9uPVF1ZXJ5TGlzdHMmVmVyc2lvbj0yMDIwLTAxLTA4Jk5lc3RlZFdpdGhMaXN0Lkxpc3RBcmcuMT1BJk5lc3RlZFdpdGhMaXN0Lkxpc3RBcmcuMj1C"; expectedRq.uri = "/"; expectedRq.headers = {{"Content-Type", R"(application/x-www-form-urlencoded)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/ec2/tests/QueryTimestampsTest.cpp b/generated/protocol-tests/tests/input/ec2/tests/QueryTimestampsTest.cpp index a7e9f174e59..e85f1cce1c6 100644 --- a/generated/protocol-tests/tests/input/ec2/tests/QueryTimestampsTest.cpp +++ b/generated/protocol-tests/tests/input/ec2/tests/QueryTimestampsTest.cpp @@ -22,8 +22,6 @@ AWS_PROTOCOL_TEST(QueryTimestamps, Ec2TimestampsInput) { request.SetEpochTarget(Aws::Utils::DateTime(1422172800L)); auto outcome = client.QueryTimestamps(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "QWN0aW9uPVF1ZXJ5VGltZXN0YW1wcyZWZXJzaW9uPTIwMjAtMDEtMDgmTm9ybWFsRm9ybWF0PTIwMTUtMDEtMjVUMDglM0EwMCUzQTAwWiZFcG9jaE1lbWJlcj0xNDIyMTcyODAwJkVwb2NoVGFyZ2V0PTE0MjIxNzI4MDA="; @@ -31,4 +29,5 @@ AWS_PROTOCOL_TEST(QueryTimestamps, Ec2TimestampsInput) { expectedRq.headers = {{"Content-Type", R"(application/x-www-form-urlencoded)"}}; expectedRq.requireHeaders = {"Content-Length"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/ec2/tests/SimpleInputParamsTest.cpp b/generated/protocol-tests/tests/input/ec2/tests/SimpleInputParamsTest.cpp index 8ccad863993..421e3c84a48 100644 --- a/generated/protocol-tests/tests/input/ec2/tests/SimpleInputParamsTest.cpp +++ b/generated/protocol-tests/tests/input/ec2/tests/SimpleInputParamsTest.cpp @@ -21,8 +21,6 @@ AWS_PROTOCOL_TEST(SimpleInputParams, Ec2SimpleInputParamsStrings) { request.SetBar(R"(val2)"); auto outcome = client.SimpleInputParams(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "QWN0aW9uPVNpbXBsZUlucHV0UGFyYW1zJlZlcnNpb249MjAyMC0wMS0wOCZGb289dmFsMSZCYXI9dmFsMg=="; @@ -30,6 +28,7 @@ AWS_PROTOCOL_TEST(SimpleInputParams, Ec2SimpleInputParamsStrings) { expectedRq.headers = {{"Content-Type", R"(application/x-www-form-urlencoded)"}}; expectedRq.requireHeaders = {"Content-Length"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(SimpleInputParams, Ec2SimpleInputParamsStringAndBooleanTrue) { @@ -42,8 +41,6 @@ AWS_PROTOCOL_TEST(SimpleInputParams, Ec2SimpleInputParamsStringAndBooleanTrue) { request.SetBaz(true); auto outcome = client.SimpleInputParams(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "QWN0aW9uPVNpbXBsZUlucHV0UGFyYW1zJlZlcnNpb249MjAyMC0wMS0wOCZGb289dmFsMSZCYXo9dHJ1ZQ=="; @@ -51,6 +48,7 @@ AWS_PROTOCOL_TEST(SimpleInputParams, Ec2SimpleInputParamsStringAndBooleanTrue) { expectedRq.headers = {{"Content-Type", R"(application/x-www-form-urlencoded)"}}; expectedRq.requireHeaders = {"Content-Length"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(SimpleInputParams, Ec2SimpleInputParamsStringsAndBooleanFalse) { @@ -62,8 +60,6 @@ AWS_PROTOCOL_TEST(SimpleInputParams, Ec2SimpleInputParamsStringsAndBooleanFalse) request.SetBaz(false); auto outcome = client.SimpleInputParams(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "QWN0aW9uPVNpbXBsZUlucHV0UGFyYW1zJlZlcnNpb249MjAyMC0wMS0wOCZCYXo9ZmFsc2U="; @@ -71,6 +67,7 @@ AWS_PROTOCOL_TEST(SimpleInputParams, Ec2SimpleInputParamsStringsAndBooleanFalse) expectedRq.headers = {{"Content-Type", R"(application/x-www-form-urlencoded)"}}; expectedRq.requireHeaders = {"Content-Length"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(SimpleInputParams, Ec2SimpleInputParamsInteger) { @@ -82,8 +79,6 @@ AWS_PROTOCOL_TEST(SimpleInputParams, Ec2SimpleInputParamsInteger) { request.SetBam(10); auto outcome = client.SimpleInputParams(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "QWN0aW9uPVNpbXBsZUlucHV0UGFyYW1zJlZlcnNpb249MjAyMC0wMS0wOCZCYW09MTA="; @@ -91,6 +86,7 @@ AWS_PROTOCOL_TEST(SimpleInputParams, Ec2SimpleInputParamsInteger) { expectedRq.headers = {{"Content-Type", R"(application/x-www-form-urlencoded)"}}; expectedRq.requireHeaders = {"Content-Length"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(SimpleInputParams, Ec2SimpleInputParamsFloat) { @@ -102,8 +98,6 @@ AWS_PROTOCOL_TEST(SimpleInputParams, Ec2SimpleInputParamsFloat) { request.SetBoo(10.8); auto outcome = client.SimpleInputParams(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "QWN0aW9uPVNpbXBsZUlucHV0UGFyYW1zJlZlcnNpb249MjAyMC0wMS0wOCZCb289MTAuOA=="; @@ -111,6 +105,7 @@ AWS_PROTOCOL_TEST(SimpleInputParams, Ec2SimpleInputParamsFloat) { expectedRq.headers = {{"Content-Type", R"(application/x-www-form-urlencoded)"}}; expectedRq.requireHeaders = {"Content-Length"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(SimpleInputParams, Ec2SimpleInputParamsBlob) { @@ -122,8 +117,6 @@ AWS_PROTOCOL_TEST(SimpleInputParams, Ec2SimpleInputParamsBlob) { request.SetQux(Aws::String(R"(value)")); auto outcome = client.SimpleInputParams(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "QWN0aW9uPVNpbXBsZUlucHV0UGFyYW1zJlZlcnNpb249MjAyMC0wMS0wOCZRdXg9ZG1Gc2RXVSUzRA=="; @@ -131,6 +124,7 @@ AWS_PROTOCOL_TEST(SimpleInputParams, Ec2SimpleInputParamsBlob) { expectedRq.headers = {{"Content-Type", R"(application/x-www-form-urlencoded)"}}; expectedRq.requireHeaders = {"Content-Length"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(SimpleInputParams, Ec2Enums) { @@ -142,8 +136,6 @@ AWS_PROTOCOL_TEST(SimpleInputParams, Ec2Enums) { request.SetFooEnum(FooEnumMapper::GetFooEnumForName(R"e(Foo)e")); auto outcome = client.SimpleInputParams(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "QWN0aW9uPVNpbXBsZUlucHV0UGFyYW1zJlZlcnNpb249MjAyMC0wMS0wOCZGb29FbnVtPUZvbw=="; @@ -151,6 +143,7 @@ AWS_PROTOCOL_TEST(SimpleInputParams, Ec2Enums) { expectedRq.headers = {{"Content-Type", R"(application/x-www-form-urlencoded)"}}; expectedRq.requireHeaders = {"Content-Length"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(SimpleInputParams, Ec2Query) { @@ -162,8 +155,6 @@ AWS_PROTOCOL_TEST(SimpleInputParams, Ec2Query) { request.SetHasQueryName(R"(Hi)"); auto outcome = client.SimpleInputParams(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "QWN0aW9uPVNpbXBsZUlucHV0UGFyYW1zJlZlcnNpb249MjAyMC0wMS0wOCZIYXNRdWVyeU5hbWU9SGk="; @@ -171,6 +162,7 @@ AWS_PROTOCOL_TEST(SimpleInputParams, Ec2Query) { expectedRq.headers = {{"Content-Type", R"(application/x-www-form-urlencoded)"}}; expectedRq.requireHeaders = {"Content-Length"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(SimpleInputParams, Ec2QueryIsPreferred) { @@ -182,8 +174,6 @@ AWS_PROTOCOL_TEST(SimpleInputParams, Ec2QueryIsPreferred) { request.SetHasQueryAndXmlName(R"(Hi)"); auto outcome = client.SimpleInputParams(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "QWN0aW9uPVNpbXBsZUlucHV0UGFyYW1zJlZlcnNpb249MjAyMC0wMS0wOCZIYXNRdWVyeUFuZFhtbE5hbWU9SGk="; @@ -191,6 +181,7 @@ AWS_PROTOCOL_TEST(SimpleInputParams, Ec2QueryIsPreferred) { expectedRq.headers = {{"Content-Type", R"(application/x-www-form-urlencoded)"}}; expectedRq.requireHeaders = {"Content-Length"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(SimpleInputParams, Ec2XmlNameIsUppercased) { @@ -202,8 +193,6 @@ AWS_PROTOCOL_TEST(SimpleInputParams, Ec2XmlNameIsUppercased) { request.SetUsesXmlName(R"(Hi)"); auto outcome = client.SimpleInputParams(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "QWN0aW9uPVNpbXBsZUlucHV0UGFyYW1zJlZlcnNpb249MjAyMC0wMS0wOCZVc2VzWG1sTmFtZT1IaQ=="; @@ -211,6 +200,7 @@ AWS_PROTOCOL_TEST(SimpleInputParams, Ec2XmlNameIsUppercased) { expectedRq.headers = {{"Content-Type", R"(application/x-www-form-urlencoded)"}}; expectedRq.requireHeaders = {"Content-Length"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(SimpleInputParams, Ec2QuerySupportsNaNFloatInputs) { @@ -223,8 +213,6 @@ AWS_PROTOCOL_TEST(SimpleInputParams, Ec2QuerySupportsNaNFloatInputs) { request.SetBoo(std::numeric_limits::quiet_NaN()); auto outcome = client.SimpleInputParams(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "QWN0aW9uPVNpbXBsZUlucHV0UGFyYW1zJlZlcnNpb249MjAyMC0wMS0wOCZGbG9hdFZhbHVlPU5hTiZCb289TmFO"; @@ -232,6 +220,7 @@ AWS_PROTOCOL_TEST(SimpleInputParams, Ec2QuerySupportsNaNFloatInputs) { expectedRq.headers = {{"Content-Type", R"(application/x-www-form-urlencoded)"}}; expectedRq.requireHeaders = {"Content-Length"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(SimpleInputParams, Ec2QuerySupportsInfinityFloatInputs) { @@ -244,8 +233,6 @@ AWS_PROTOCOL_TEST(SimpleInputParams, Ec2QuerySupportsInfinityFloatInputs) { request.SetBoo(std::numeric_limits::infinity()); auto outcome = client.SimpleInputParams(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "QWN0aW9uPVNpbXBsZUlucHV0UGFyYW1zJlZlcnNpb249MjAyMC0wMS0wOCZGbG9hdFZhbHVlPUluZmluaXR5JkJvbz1JbmZpbml0eQ=="; @@ -253,6 +240,7 @@ AWS_PROTOCOL_TEST(SimpleInputParams, Ec2QuerySupportsInfinityFloatInputs) { expectedRq.headers = {{"Content-Type", R"(application/x-www-form-urlencoded)"}}; expectedRq.requireHeaders = {"Content-Length"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(SimpleInputParams, Ec2QuerySupportsNegativeInfinityFloatInputs) { @@ -265,8 +253,6 @@ AWS_PROTOCOL_TEST(SimpleInputParams, Ec2QuerySupportsNegativeInfinityFloatInputs request.SetBoo(-std::numeric_limits::infinity()); auto outcome = client.SimpleInputParams(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "QWN0aW9uPVNpbXBsZUlucHV0UGFyYW1zJlZlcnNpb249MjAyMC0wMS0wOCZGbG9hdFZhbHVlPS1JbmZpbml0eSZCb289LUluZmluaXR5"; @@ -274,4 +260,5 @@ AWS_PROTOCOL_TEST(SimpleInputParams, Ec2QuerySupportsNegativeInfinityFloatInputs expectedRq.headers = {{"Content-Type", R"(application/x-www-form-urlencoded)"}}; expectedRq.requireHeaders = {"Content-Length"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/json/tests/EmptyOperationTest.cpp b/generated/protocol-tests/tests/input/json/tests/EmptyOperationTest.cpp index 14a123db369..981c5ff7c4f 100644 --- a/generated/protocol-tests/tests/input/json/tests/EmptyOperationTest.cpp +++ b/generated/protocol-tests/tests/input/json/tests/EmptyOperationTest.cpp @@ -19,13 +19,12 @@ AWS_PROTOCOL_TEST(EmptyOperation, sends_requests_to_slash) { EmptyOperationRequest request; auto outcome = client.EmptyOperation(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.uri = "/"; expectedRq.headers = {{"Content-Type", R"(application/x-amz-json-1.1)"}, {"X-Amz-Target", R"(JsonProtocol.EmptyOperation)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(EmptyOperation, includes_x_amz_target_and_content_type) { @@ -36,13 +35,12 @@ AWS_PROTOCOL_TEST(EmptyOperation, includes_x_amz_target_and_content_type) { EmptyOperationRequest request; auto outcome = client.EmptyOperation(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.uri = "/"; expectedRq.headers = {{"Content-Type", R"(application/x-amz-json-1.1)"}, {"X-Amz-Target", R"(JsonProtocol.EmptyOperation)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(EmptyOperation, json_1_1_client_sends_empty_payload_for_no_input_shape) { @@ -53,12 +51,11 @@ AWS_PROTOCOL_TEST(EmptyOperation, json_1_1_client_sends_empty_payload_for_no_inp EmptyOperationRequest request; auto outcome = client.EmptyOperation(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "e30="; expectedRq.uri = "/"; expectedRq.headers = {{"Content-Type", R"(application/x-amz-json-1.1)"}, {"X-Amz-Target", R"(JsonProtocol.EmptyOperation)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/json/tests/EndpointOperationTest.cpp b/generated/protocol-tests/tests/input/json/tests/EndpointOperationTest.cpp index 6817eb930bf..dc2fc06ac11 100644 --- a/generated/protocol-tests/tests/input/json/tests/EndpointOperationTest.cpp +++ b/generated/protocol-tests/tests/input/json/tests/EndpointOperationTest.cpp @@ -19,8 +19,6 @@ AWS_PROTOCOL_TEST(EndpointOperation, AwsJson11EndpointTrait) { EndpointOperationRequest request; auto outcome = client.EndpointOperation(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "e30="; @@ -28,4 +26,5 @@ AWS_PROTOCOL_TEST(EndpointOperation, AwsJson11EndpointTrait) { expectedRq.host = "foo.example.com"; expectedRq.headers = {{"Content-Type", R"(application/x-amz-json-1.1)"}, {"X-Amz-Target", R"(JsonProtocol.EndpointOperation)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/json/tests/EndpointWithHostLabelOperationTest.cpp b/generated/protocol-tests/tests/input/json/tests/EndpointWithHostLabelOperationTest.cpp index d695bb96914..295469497af 100644 --- a/generated/protocol-tests/tests/input/json/tests/EndpointWithHostLabelOperationTest.cpp +++ b/generated/protocol-tests/tests/input/json/tests/EndpointWithHostLabelOperationTest.cpp @@ -20,8 +20,6 @@ AWS_PROTOCOL_TEST(EndpointWithHostLabelOperation, AwsJson11EndpointTraitWithHost request.SetLabel(R"(bar)"); auto outcome = client.EndpointWithHostLabelOperation(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "eyJsYWJlbCI6ICJiYXIifQ=="; @@ -29,4 +27,5 @@ AWS_PROTOCOL_TEST(EndpointWithHostLabelOperation, AwsJson11EndpointTraitWithHost expectedRq.host = "foo.bar.example.com"; expectedRq.headers = {{"Content-Type", R"(application/x-amz-json-1.1)"}, {"X-Amz-Target", R"(JsonProtocol.EndpointWithHostLabelOperation)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/json/tests/HostWithPathOperationTest.cpp b/generated/protocol-tests/tests/input/json/tests/HostWithPathOperationTest.cpp index b16538815cd..a9ca6c70532 100644 --- a/generated/protocol-tests/tests/input/json/tests/HostWithPathOperationTest.cpp +++ b/generated/protocol-tests/tests/input/json/tests/HostWithPathOperationTest.cpp @@ -19,8 +19,6 @@ AWS_PROTOCOL_TEST(HostWithPathOperation, AwsJson11HostWithPath) { HostWithPathOperationRequest request; auto outcome = client.HostWithPathOperation(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "e30="; @@ -28,4 +26,5 @@ AWS_PROTOCOL_TEST(HostWithPathOperation, AwsJson11HostWithPath) { expectedRq.host = "example.com/custom"; expectedRq.headers = {{"Content-Type", R"(application/x-amz-json-1.1)"}, {"X-Amz-Target", R"(JsonProtocol.HostWithPathOperation)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/json/tests/JsonEnumsTest.cpp b/generated/protocol-tests/tests/input/json/tests/JsonEnumsTest.cpp index b68774755e0..faa7380f397 100644 --- a/generated/protocol-tests/tests/input/json/tests/JsonEnumsTest.cpp +++ b/generated/protocol-tests/tests/input/json/tests/JsonEnumsTest.cpp @@ -25,12 +25,11 @@ AWS_PROTOCOL_TEST(JsonEnums, AwsJson11Enums) { request.SetFooEnumMap({{"hi", FooEnumMapper::GetFooEnumForName(R"e(Foo)e")}, {"zero", FooEnumMapper::GetFooEnumForName(R"e(0)e")}}); auto outcome = client.JsonEnums(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "ewogICAgImZvb0VudW0xIjogIkZvbyIsCiAgICAiZm9vRW51bTIiOiAiMCIsCiAgICAiZm9vRW51bTMiOiAiMSIsCiAgICAiZm9vRW51bUxpc3QiOiBbCiAgICAgICAgIkZvbyIsCiAgICAgICAgIjAiCiAgICBdLAogICAgImZvb0VudW1TZXQiOiBbCiAgICAgICAgIkZvbyIsCiAgICAgICAgIjAiCiAgICBdLAogICAgImZvb0VudW1NYXAiOiB7CiAgICAgICAgImhpIjogIkZvbyIsCiAgICAgICAgInplcm8iOiAiMCIKICAgIH0KfQ=="; expectedRq.uri = "/"; expectedRq.headers = {{"Content-Type", R"(application/x-amz-json-1.1)"}, {"X-Amz-Target", R"(JsonProtocol.JsonEnums)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/json/tests/JsonIntEnumsTest.cpp b/generated/protocol-tests/tests/input/json/tests/JsonIntEnumsTest.cpp index 5bd6297c04a..5f7539264e6 100644 --- a/generated/protocol-tests/tests/input/json/tests/JsonIntEnumsTest.cpp +++ b/generated/protocol-tests/tests/input/json/tests/JsonIntEnumsTest.cpp @@ -25,12 +25,11 @@ AWS_PROTOCOL_TEST(JsonIntEnums, AwsJson11IntEnums) { request.SetIntEnumMap({{"a", 1}, {"b", 2}}); auto outcome = client.JsonIntEnums(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "ewogICAgImludEVudW0xIjogMSwKICAgICJpbnRFbnVtMiI6IDIsCiAgICAiaW50RW51bTMiOiAzLAogICAgImludEVudW1MaXN0IjogWwogICAgICAgIDEsCiAgICAgICAgMgogICAgXSwKICAgICJpbnRFbnVtU2V0IjogWwogICAgICAgIDEsCiAgICAgICAgMgogICAgXSwKICAgICJpbnRFbnVtTWFwIjogewogICAgICAgICJhIjogMSwKICAgICAgICAiYiI6IDIKICAgIH0KfQ=="; expectedRq.uri = "/"; expectedRq.headers = {{"Content-Type", R"(application/x-amz-json-1.1)"}, {"X-Amz-Target", R"(JsonProtocol.JsonIntEnums)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/json/tests/JsonUnionsTest.cpp b/generated/protocol-tests/tests/input/json/tests/JsonUnionsTest.cpp index 6782a8c0bf7..f460c53a621 100644 --- a/generated/protocol-tests/tests/input/json/tests/JsonUnionsTest.cpp +++ b/generated/protocol-tests/tests/input/json/tests/JsonUnionsTest.cpp @@ -24,14 +24,13 @@ AWS_PROTOCOL_TEST(JsonUnions, AwsJson11SerializeStringUnionValue) { } auto outcome = client.JsonUnions(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "ewogICAgImNvbnRlbnRzIjogewogICAgICAgICJzdHJpbmdWYWx1ZSI6ICJmb28iCiAgICB9Cn0="; expectedRq.uri = "/"; expectedRq.headers = {{"Content-Type", R"(application/x-amz-json-1.1)"}, {"X-Amz-Target", R"(JsonProtocol.JsonUnions)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(JsonUnions, AwsJson11SerializeBooleanUnionValue) { @@ -47,14 +46,13 @@ AWS_PROTOCOL_TEST(JsonUnions, AwsJson11SerializeBooleanUnionValue) { } auto outcome = client.JsonUnions(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "ewogICAgImNvbnRlbnRzIjogewogICAgICAgICJib29sZWFuVmFsdWUiOiB0cnVlCiAgICB9Cn0="; expectedRq.uri = "/"; expectedRq.headers = {{"Content-Type", R"(application/x-amz-json-1.1)"}, {"X-Amz-Target", R"(JsonProtocol.JsonUnions)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(JsonUnions, AwsJson11SerializeNumberUnionValue) { @@ -70,14 +68,13 @@ AWS_PROTOCOL_TEST(JsonUnions, AwsJson11SerializeNumberUnionValue) { } auto outcome = client.JsonUnions(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "ewogICAgImNvbnRlbnRzIjogewogICAgICAgICJudW1iZXJWYWx1ZSI6IDEKICAgIH0KfQ=="; expectedRq.uri = "/"; expectedRq.headers = {{"Content-Type", R"(application/x-amz-json-1.1)"}, {"X-Amz-Target", R"(JsonProtocol.JsonUnions)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(JsonUnions, AwsJson11SerializeBlobUnionValue) { @@ -93,14 +90,13 @@ AWS_PROTOCOL_TEST(JsonUnions, AwsJson11SerializeBlobUnionValue) { } auto outcome = client.JsonUnions(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "ewogICAgImNvbnRlbnRzIjogewogICAgICAgICJibG9iVmFsdWUiOiAiWm05diIKICAgIH0KfQ=="; expectedRq.uri = "/"; expectedRq.headers = {{"Content-Type", R"(application/x-amz-json-1.1)"}, {"X-Amz-Target", R"(JsonProtocol.JsonUnions)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(JsonUnions, AwsJson11SerializeTimestampUnionValue) { @@ -116,14 +112,13 @@ AWS_PROTOCOL_TEST(JsonUnions, AwsJson11SerializeTimestampUnionValue) { } auto outcome = client.JsonUnions(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "ewogICAgImNvbnRlbnRzIjogewogICAgICAgICJ0aW1lc3RhbXBWYWx1ZSI6IDEzOTg3OTYyMzgKICAgIH0KfQ=="; expectedRq.uri = "/"; expectedRq.headers = {{"Content-Type", R"(application/x-amz-json-1.1)"}, {"X-Amz-Target", R"(JsonProtocol.JsonUnions)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(JsonUnions, AwsJson11SerializeEnumUnionValue) { @@ -139,14 +134,13 @@ AWS_PROTOCOL_TEST(JsonUnions, AwsJson11SerializeEnumUnionValue) { } auto outcome = client.JsonUnions(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "ewogICAgImNvbnRlbnRzIjogewogICAgICAgICJlbnVtVmFsdWUiOiAiRm9vIgogICAgfQp9"; expectedRq.uri = "/"; expectedRq.headers = {{"Content-Type", R"(application/x-amz-json-1.1)"}, {"X-Amz-Target", R"(JsonProtocol.JsonUnions)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(JsonUnions, AwsJson11SerializeListUnionValue) { @@ -162,14 +156,13 @@ AWS_PROTOCOL_TEST(JsonUnions, AwsJson11SerializeListUnionValue) { } auto outcome = client.JsonUnions(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "ewogICAgImNvbnRlbnRzIjogewogICAgICAgICJsaXN0VmFsdWUiOiBbImZvbyIsICJiYXIiXQogICAgfQp9"; expectedRq.uri = "/"; expectedRq.headers = {{"Content-Type", R"(application/x-amz-json-1.1)"}, {"X-Amz-Target", R"(JsonProtocol.JsonUnions)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(JsonUnions, AwsJson11SerializeMapUnionValue) { @@ -185,14 +178,13 @@ AWS_PROTOCOL_TEST(JsonUnions, AwsJson11SerializeMapUnionValue) { } auto outcome = client.JsonUnions(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "ewogICAgImNvbnRlbnRzIjogewogICAgICAgICJtYXBWYWx1ZSI6IHsKICAgICAgICAgICAgImZvbyI6ICJiYXIiLAogICAgICAgICAgICAic3BhbSI6ICJlZ2dzIgogICAgICAgIH0KICAgIH0KfQ=="; expectedRq.uri = "/"; expectedRq.headers = {{"Content-Type", R"(application/x-amz-json-1.1)"}, {"X-Amz-Target", R"(JsonProtocol.JsonUnions)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(JsonUnions, AwsJson11SerializeStructureUnionValue) { @@ -212,12 +204,11 @@ AWS_PROTOCOL_TEST(JsonUnions, AwsJson11SerializeStructureUnionValue) { } auto outcome = client.JsonUnions(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "ewogICAgImNvbnRlbnRzIjogewogICAgICAgICJzdHJ1Y3R1cmVWYWx1ZSI6IHsKICAgICAgICAgICAgImhpIjogImhlbGxvIgogICAgICAgIH0KICAgIH0KfQ=="; expectedRq.uri = "/"; expectedRq.headers = {{"Content-Type", R"(application/x-amz-json-1.1)"}, {"X-Amz-Target", R"(JsonProtocol.JsonUnions)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/json/tests/KitchenSinkOperationTest.cpp b/generated/protocol-tests/tests/input/json/tests/KitchenSinkOperationTest.cpp index 9b08465998a..97ff95b97ad 100644 --- a/generated/protocol-tests/tests/input/json/tests/KitchenSinkOperationTest.cpp +++ b/generated/protocol-tests/tests/input/json/tests/KitchenSinkOperationTest.cpp @@ -20,8 +20,6 @@ AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_string_shapes) { request.SetString(R"(abc xyz)"); auto outcome = client.KitchenSinkOperation(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "eyJTdHJpbmciOiJhYmMgeHl6In0="; @@ -29,6 +27,7 @@ AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_string_shapes) { expectedRq.headers = {{"Content-Type", R"(application/x-amz-json-1.1)"}, {"X-Amz-Target", R"(JsonProtocol.KitchenSinkOperation)"}}; expectedRq.requireHeaders = {"Content-Length"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_string_shapes_with_jsonvalue_trait) { @@ -40,8 +39,6 @@ AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_string_shapes_with_jsonvalue_ request.SetJsonValue(R"({"string":"value","number":1234.5,"boolTrue":true,"boolFalse":false,"array":[1,2,3,4],"object":{"key":"value"},"null":null})"); auto outcome = client.KitchenSinkOperation(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "eyJKc29uVmFsdWUiOiJ7XCJzdHJpbmdcIjpcInZhbHVlXCIsXCJudW1iZXJcIjoxMjM0LjUsXCJib29sVHJ1ZVwiOnRydWUsXCJib29sRmFsc2VcIjpmYWxzZSxcImFycmF5XCI6WzEsMiwzLDRdLFwib2JqZWN0XCI6e1wia2V5XCI6XCJ2YWx1ZVwifSxcIm51bGxcIjpudWxsfSJ9"; @@ -49,6 +46,7 @@ AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_string_shapes_with_jsonvalue_ expectedRq.headers = {{"Content-Type", R"(application/x-amz-json-1.1)"}, {"X-Amz-Target", R"(JsonProtocol.KitchenSinkOperation)"}}; expectedRq.requireHeaders = {"Content-Length"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_integer_shapes) { @@ -60,8 +58,6 @@ AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_integer_shapes) { request.SetInteger(1234); auto outcome = client.KitchenSinkOperation(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "eyJJbnRlZ2VyIjoxMjM0fQ=="; @@ -69,6 +65,7 @@ AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_integer_shapes) { expectedRq.headers = {{"Content-Type", R"(application/x-amz-json-1.1)"}, {"X-Amz-Target", R"(JsonProtocol.KitchenSinkOperation)"}}; expectedRq.requireHeaders = {"Content-Length"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_long_shapes) { @@ -80,8 +77,6 @@ AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_long_shapes) { request.SetLong(999999999999); auto outcome = client.KitchenSinkOperation(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "eyJMb25nIjo5OTk5OTk5OTk5OTl9"; @@ -89,6 +84,7 @@ AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_long_shapes) { expectedRq.headers = {{"Content-Type", R"(application/x-amz-json-1.1)"}, {"X-Amz-Target", R"(JsonProtocol.KitchenSinkOperation)"}}; expectedRq.requireHeaders = {"Content-Length"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_float_shapes) { @@ -100,8 +96,6 @@ AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_float_shapes) { request.SetFloat(1234.5); auto outcome = client.KitchenSinkOperation(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "eyJGbG9hdCI6MTIzNC41fQ=="; @@ -109,6 +103,7 @@ AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_float_shapes) { expectedRq.headers = {{"Content-Type", R"(application/x-amz-json-1.1)"}, {"X-Amz-Target", R"(JsonProtocol.KitchenSinkOperation)"}}; expectedRq.requireHeaders = {"Content-Length"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_double_shapes) { @@ -120,8 +115,6 @@ AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_double_shapes) { request.SetDouble(1234.5); auto outcome = client.KitchenSinkOperation(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "eyJEb3VibGUiOjEyMzQuNX0="; @@ -129,6 +122,7 @@ AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_double_shapes) { expectedRq.headers = {{"Content-Type", R"(application/x-amz-json-1.1)"}, {"X-Amz-Target", R"(JsonProtocol.KitchenSinkOperation)"}}; expectedRq.requireHeaders = {"Content-Length"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_blob_shapes) { @@ -140,8 +134,6 @@ AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_blob_shapes) { request.SetBlob(Aws::String(R"(binary-value)")); auto outcome = client.KitchenSinkOperation(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "eyJCbG9iIjoiWW1sdVlYSjVMWFpoYkhWbCJ9"; @@ -149,6 +141,7 @@ AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_blob_shapes) { expectedRq.headers = {{"Content-Type", R"(application/x-amz-json-1.1)"}, {"X-Amz-Target", R"(JsonProtocol.KitchenSinkOperation)"}}; expectedRq.requireHeaders = {"Content-Length"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_boolean_shapes_true) { @@ -160,8 +153,6 @@ AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_boolean_shapes_true) { request.SetBoolean(true); auto outcome = client.KitchenSinkOperation(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "eyJCb29sZWFuIjp0cnVlfQ=="; @@ -169,6 +160,7 @@ AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_boolean_shapes_true) { expectedRq.headers = {{"Content-Type", R"(application/x-amz-json-1.1)"}, {"X-Amz-Target", R"(JsonProtocol.KitchenSinkOperation)"}}; expectedRq.requireHeaders = {"Content-Length"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_boolean_shapes_false) { @@ -180,8 +172,6 @@ AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_boolean_shapes_false) { request.SetBoolean(false); auto outcome = client.KitchenSinkOperation(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "eyJCb29sZWFuIjpmYWxzZX0="; @@ -189,6 +179,7 @@ AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_boolean_shapes_false) { expectedRq.headers = {{"Content-Type", R"(application/x-amz-json-1.1)"}, {"X-Amz-Target", R"(JsonProtocol.KitchenSinkOperation)"}}; expectedRq.requireHeaders = {"Content-Length"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_timestamp_shapes) { @@ -200,8 +191,6 @@ AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_timestamp_shapes) { request.SetTimestamp(Aws::Utils::DateTime(946845296L)); auto outcome = client.KitchenSinkOperation(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "eyJUaW1lc3RhbXAiOjk0Njg0NTI5Nn0="; @@ -209,6 +198,7 @@ AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_timestamp_shapes) { expectedRq.headers = {{"Content-Type", R"(application/x-amz-json-1.1)"}, {"X-Amz-Target", R"(JsonProtocol.KitchenSinkOperation)"}}; expectedRq.requireHeaders = {"Content-Length"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_timestamp_shapes_with_iso8601_timestampformat) { @@ -220,8 +210,6 @@ AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_timestamp_shapes_with_iso8601 request.SetIso8601Timestamp(Aws::Utils::DateTime(946845296L)); auto outcome = client.KitchenSinkOperation(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "eyJJc284NjAxVGltZXN0YW1wIjoiMjAwMC0wMS0wMlQyMDozNDo1NloifQ=="; @@ -229,6 +217,7 @@ AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_timestamp_shapes_with_iso8601 expectedRq.headers = {{"Content-Type", R"(application/x-amz-json-1.1)"}, {"X-Amz-Target", R"(JsonProtocol.KitchenSinkOperation)"}}; expectedRq.requireHeaders = {"Content-Length"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_timestamp_shapes_with_httpdate_timestampformat) { @@ -240,8 +229,6 @@ AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_timestamp_shapes_with_httpdat request.SetHttpdateTimestamp(Aws::Utils::DateTime(946845296L)); auto outcome = client.KitchenSinkOperation(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "eyJIdHRwZGF0ZVRpbWVzdGFtcCI6IlN1biwgMDIgSmFuIDIwMDAgMjA6MzQ6NTYgR01UIn0="; @@ -249,6 +236,7 @@ AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_timestamp_shapes_with_httpdat expectedRq.headers = {{"Content-Type", R"(application/x-amz-json-1.1)"}, {"X-Amz-Target", R"(JsonProtocol.KitchenSinkOperation)"}}; expectedRq.requireHeaders = {"Content-Length"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_timestamp_shapes_with_unixtimestamp_timestampformat) { @@ -260,8 +248,6 @@ AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_timestamp_shapes_with_unixtim request.SetUnixTimestamp(Aws::Utils::DateTime(946845296L)); auto outcome = client.KitchenSinkOperation(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "eyJVbml4VGltZXN0YW1wIjo5NDY4NDUyOTZ9"; @@ -269,6 +255,7 @@ AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_timestamp_shapes_with_unixtim expectedRq.headers = {{"Content-Type", R"(application/x-amz-json-1.1)"}, {"X-Amz-Target", R"(JsonProtocol.KitchenSinkOperation)"}}; expectedRq.requireHeaders = {"Content-Length"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_list_shapes) { @@ -280,8 +267,6 @@ AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_list_shapes) { request.SetListOfStrings({R"(abc)", R"(mno)", R"(xyz)"}); auto outcome = client.KitchenSinkOperation(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "eyJMaXN0T2ZTdHJpbmdzIjpbImFiYyIsIm1ubyIsInh5eiJdfQ=="; @@ -289,6 +274,7 @@ AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_list_shapes) { expectedRq.headers = {{"Content-Type", R"(application/x-amz-json-1.1)"}, {"X-Amz-Target", R"(JsonProtocol.KitchenSinkOperation)"}}; expectedRq.requireHeaders = {"Content-Length"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_empty_list_shapes) { @@ -300,8 +286,6 @@ AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_empty_list_shapes) { request.SetListOfStrings({}); auto outcome = client.KitchenSinkOperation(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "eyJMaXN0T2ZTdHJpbmdzIjpbXX0="; @@ -309,6 +293,7 @@ AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_empty_list_shapes) { expectedRq.headers = {{"Content-Type", R"(application/x-amz-json-1.1)"}, {"X-Amz-Target", R"(JsonProtocol.KitchenSinkOperation)"}}; expectedRq.requireHeaders = {"Content-Length"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_list_of_map_shapes) { @@ -334,8 +319,6 @@ AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_list_of_map_shapes) { } auto outcome = client.KitchenSinkOperation(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "eyJMaXN0T2ZNYXBzT2ZTdHJpbmdzIjpbeyJmb28iOiJiYXIifSx7ImFiYyI6Inh5eiJ9LHsicmVkIjoiYmx1ZSJ9XX0="; @@ -343,6 +326,7 @@ AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_list_of_map_shapes) { expectedRq.headers = {{"Content-Type", R"(application/x-amz-json-1.1)"}, {"X-Amz-Target", R"(JsonProtocol.KitchenSinkOperation)"}}; expectedRq.requireHeaders = {"Content-Length"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_list_of_structure_shapes) { @@ -368,8 +352,6 @@ AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_list_of_structure_shapes) { } auto outcome = client.KitchenSinkOperation(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "eyJMaXN0T2ZTdHJ1Y3RzIjpbeyJWYWx1ZSI6ImFiYyJ9LHsiVmFsdWUiOiJtbm8ifSx7IlZhbHVlIjoieHl6In1dfQ=="; @@ -377,6 +359,7 @@ AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_list_of_structure_shapes) { expectedRq.headers = {{"Content-Type", R"(application/x-amz-json-1.1)"}, {"X-Amz-Target", R"(JsonProtocol.KitchenSinkOperation)"}}; expectedRq.requireHeaders = {"Content-Length"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_list_of_recursive_structure_shapes) { @@ -400,8 +383,6 @@ AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_list_of_recursive_structure_s } auto outcome = client.KitchenSinkOperation(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "eyJSZWN1cnNpdmVMaXN0IjpbeyJSZWN1cnNpdmVMaXN0IjpbeyJSZWN1cnNpdmVMaXN0IjpbeyJJbnRlZ2VyIjoxMjN9XX1dfV19"; @@ -409,6 +390,7 @@ AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_list_of_recursive_structure_s expectedRq.headers = {{"Content-Type", R"(application/x-amz-json-1.1)"}, {"X-Amz-Target", R"(JsonProtocol.KitchenSinkOperation)"}}; expectedRq.requireHeaders = {"Content-Length"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_map_shapes) { @@ -420,8 +402,6 @@ AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_map_shapes) { request.SetMapOfStrings({{"abc", R"(xyz)"}, {"mno", R"(hjk)"}}); auto outcome = client.KitchenSinkOperation(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "eyJNYXBPZlN0cmluZ3MiOnsiYWJjIjoieHl6IiwibW5vIjoiaGprIn19"; @@ -429,6 +409,7 @@ AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_map_shapes) { expectedRq.headers = {{"Content-Type", R"(application/x-amz-json-1.1)"}, {"X-Amz-Target", R"(JsonProtocol.KitchenSinkOperation)"}}; expectedRq.requireHeaders = {"Content-Length"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_empty_map_shapes) { @@ -440,8 +421,6 @@ AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_empty_map_shapes) { request.SetMapOfStrings({}); auto outcome = client.KitchenSinkOperation(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "eyJNYXBPZlN0cmluZ3MiOnt9fQ=="; @@ -449,6 +428,7 @@ AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_empty_map_shapes) { expectedRq.headers = {{"Content-Type", R"(application/x-amz-json-1.1)"}, {"X-Amz-Target", R"(JsonProtocol.KitchenSinkOperation)"}}; expectedRq.requireHeaders = {"Content-Length"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_map_of_list_shapes) { @@ -460,8 +440,6 @@ AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_map_of_list_shapes) { request.SetMapOfListsOfStrings({{"abc", {R"(abc)", R"(xyz)"}}, {"mno", {R"(xyz)", R"(abc)"}}}); auto outcome = client.KitchenSinkOperation(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "eyJNYXBPZkxpc3RzT2ZTdHJpbmdzIjp7ImFiYyI6WyJhYmMiLCJ4eXoiXSwibW5vIjpbInh5eiIsImFiYyJdfX0="; @@ -469,6 +447,7 @@ AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_map_of_list_shapes) { expectedRq.headers = {{"Content-Type", R"(application/x-amz-json-1.1)"}, {"X-Amz-Target", R"(JsonProtocol.KitchenSinkOperation)"}}; expectedRq.requireHeaders = {"Content-Length"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_map_of_structure_shapes) { @@ -489,8 +468,6 @@ AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_map_of_structure_shapes) { } auto outcome = client.KitchenSinkOperation(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "eyJNYXBPZlN0cnVjdHMiOnsia2V5MSI6eyJWYWx1ZSI6InZhbHVlLTEifSwia2V5MiI6eyJWYWx1ZSI6InZhbHVlLTIifX19"; @@ -498,6 +475,7 @@ AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_map_of_structure_shapes) { expectedRq.headers = {{"Content-Type", R"(application/x-amz-json-1.1)"}, {"X-Amz-Target", R"(JsonProtocol.KitchenSinkOperation)"}}; expectedRq.requireHeaders = {"Content-Length"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_map_of_recursive_structure_shapes) { @@ -521,8 +499,6 @@ AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_map_of_recursive_structure_sh } auto outcome = client.KitchenSinkOperation(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "eyJSZWN1cnNpdmVNYXAiOnsia2V5MSI6eyJSZWN1cnNpdmVNYXAiOnsia2V5MiI6eyJSZWN1cnNpdmVNYXAiOnsia2V5MyI6eyJCb29sZWFuIjpmYWxzZX19fX19fX0="; @@ -530,6 +506,7 @@ AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_map_of_recursive_structure_sh expectedRq.headers = {{"Content-Type", R"(application/x-amz-json-1.1)"}, {"X-Amz-Target", R"(JsonProtocol.KitchenSinkOperation)"}}; expectedRq.requireHeaders = {"Content-Length"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_structure_shapes) { @@ -545,8 +522,6 @@ AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_structure_shapes) { } auto outcome = client.KitchenSinkOperation(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "eyJTaW1wbGVTdHJ1Y3QiOnsiVmFsdWUiOiJhYmMifX0="; @@ -554,6 +529,7 @@ AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_structure_shapes) { expectedRq.headers = {{"Content-Type", R"(application/x-amz-json-1.1)"}, {"X-Amz-Target", R"(JsonProtocol.KitchenSinkOperation)"}}; expectedRq.requireHeaders = {"Content-Length"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_structure_members_with_locationname_traits) { @@ -569,8 +545,6 @@ AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_structure_members_with_locati } auto outcome = client.KitchenSinkOperation(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "eyJTdHJ1Y3RXaXRoSnNvbk5hbWUiOnsiVmFsdWUiOiJzb21lLXZhbHVlIn19"; @@ -578,6 +552,7 @@ AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_structure_members_with_locati expectedRq.headers = {{"Content-Type", R"(application/x-amz-json-1.1)"}, {"X-Amz-Target", R"(JsonProtocol.KitchenSinkOperation)"}}; expectedRq.requireHeaders = {"Content-Length"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_empty_structure_shapes) { @@ -592,8 +567,6 @@ AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_empty_structure_shapes) { } auto outcome = client.KitchenSinkOperation(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "eyJTaW1wbGVTdHJ1Y3QiOnt9fQ=="; @@ -601,6 +574,7 @@ AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_empty_structure_shapes) { expectedRq.headers = {{"Content-Type", R"(application/x-amz-json-1.1)"}, {"X-Amz-Target", R"(JsonProtocol.KitchenSinkOperation)"}}; expectedRq.requireHeaders = {"Content-Length"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_structure_which_have_no_members) { @@ -615,8 +589,6 @@ AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_structure_which_have_no_membe } auto outcome = client.KitchenSinkOperation(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "eyJFbXB0eVN0cnVjdCI6e319"; @@ -624,6 +596,7 @@ AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_structure_which_have_no_membe expectedRq.headers = {{"Content-Type", R"(application/x-amz-json-1.1)"}, {"X-Amz-Target", R"(JsonProtocol.KitchenSinkOperation)"}}; expectedRq.requireHeaders = {"Content-Length"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_recursive_structure_shapes) { @@ -656,8 +629,6 @@ AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_recursive_structure_shapes) { } auto outcome = client.KitchenSinkOperation(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "eyJTdHJpbmciOiJ0b3AtdmFsdWUiLCJCb29sZWFuIjpmYWxzZSwiUmVjdXJzaXZlU3RydWN0Ijp7IlN0cmluZyI6Im5lc3RlZC12YWx1ZSIsIkJvb2xlYW4iOnRydWUsIlJlY3Vyc2l2ZUxpc3QiOlt7IlN0cmluZyI6InN0cmluZy1vbmx5In0seyJSZWN1cnNpdmVTdHJ1Y3QiOnsiTWFwT2ZTdHJpbmdzIjp7ImNvbG9yIjoicmVkIiwic2l6ZSI6ImxhcmdlIn19fV19fQ=="; @@ -665,4 +636,5 @@ AWS_PROTOCOL_TEST(KitchenSinkOperation, serializes_recursive_structure_shapes) { expectedRq.headers = {{"Content-Type", R"(application/x-amz-json-1.1)"}, {"X-Amz-Target", R"(JsonProtocol.KitchenSinkOperation)"}}; expectedRq.requireHeaders = {"Content-Length"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/json/tests/NullOperationTest.cpp b/generated/protocol-tests/tests/input/json/tests/NullOperationTest.cpp index 58ef02f45a8..17fd32ac67d 100644 --- a/generated/protocol-tests/tests/input/json/tests/NullOperationTest.cpp +++ b/generated/protocol-tests/tests/input/json/tests/NullOperationTest.cpp @@ -20,12 +20,11 @@ AWS_PROTOCOL_TEST(NullOperation, AwsJson11StructuresDontSerializeNullValues) { request.SetString(R"(null)"); auto outcome = client.NullOperation(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "e30="; expectedRq.uri = "/"; expectedRq.headers = {{"Content-Type", R"(application/x-amz-json-1.1)"}, {"X-Amz-Target", R"(JsonProtocol.NullOperation)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/json/tests/OperationWithOptionalInputOutputTest.cpp b/generated/protocol-tests/tests/input/json/tests/OperationWithOptionalInputOutputTest.cpp index f6e82cd809f..2db6f50e21f 100644 --- a/generated/protocol-tests/tests/input/json/tests/OperationWithOptionalInputOutputTest.cpp +++ b/generated/protocol-tests/tests/input/json/tests/OperationWithOptionalInputOutputTest.cpp @@ -19,14 +19,13 @@ AWS_PROTOCOL_TEST(OperationWithOptionalInputOutput, can_call_operation_with_no_i OperationWithOptionalInputOutputRequest request; auto outcome = client.OperationWithOptionalInputOutput(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "e30="; expectedRq.uri = "/"; expectedRq.headers = {{"Content-Type", R"(application/x-amz-json-1.1)"}, {"X-Amz-Target", R"(JsonProtocol.OperationWithOptionalInputOutput)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(OperationWithOptionalInputOutput, can_call_operation_with_optional_input) { @@ -38,12 +37,11 @@ AWS_PROTOCOL_TEST(OperationWithOptionalInputOutput, can_call_operation_with_opti request.SetValue(R"(Hi)"); auto outcome = client.OperationWithOptionalInputOutput(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "eyJWYWx1ZSI6IkhpIn0="; expectedRq.uri = "/"; expectedRq.headers = {{"Content-Type", R"(application/x-amz-json-1.1)"}, {"X-Amz-Target", R"(JsonProtocol.OperationWithOptionalInputOutput)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/json/tests/PutAndGetInlineDocumentsTest.cpp b/generated/protocol-tests/tests/input/json/tests/PutAndGetInlineDocumentsTest.cpp index 81724ee0de9..426842a0d7b 100644 --- a/generated/protocol-tests/tests/input/json/tests/PutAndGetInlineDocumentsTest.cpp +++ b/generated/protocol-tests/tests/input/json/tests/PutAndGetInlineDocumentsTest.cpp @@ -23,8 +23,6 @@ AWS_PROTOCOL_TEST(PutAndGetInlineDocuments, PutAndGetInlineDocumentsInput) { } auto outcome = client.PutAndGetInlineDocuments(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "ewogICAgImlubGluZURvY3VtZW50IjogeyJmb28iOiAiYmFyIn0KfQ=="; @@ -32,4 +30,5 @@ AWS_PROTOCOL_TEST(PutAndGetInlineDocuments, PutAndGetInlineDocumentsInput) { expectedRq.headers = {{"Content-Type", R"(application/x-amz-json-1.1)"}, {"X-Amz-Target", R"(JsonProtocol.PutAndGetInlineDocuments)"}}; expectedRq.requireHeaders = {"Content-Length"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/json/tests/PutWithContentEncodingTest.cpp b/generated/protocol-tests/tests/input/json/tests/PutWithContentEncodingTest.cpp index f7a73f8be5c..9e071b87d30 100644 --- a/generated/protocol-tests/tests/input/json/tests/PutWithContentEncodingTest.cpp +++ b/generated/protocol-tests/tests/input/json/tests/PutWithContentEncodingTest.cpp @@ -148,13 +148,12 @@ EcffzjixWU9FpAyGp2rVl4ETRgqljOGw4UgK31r0ZIEGnH0xGz1FtbW1OcQM008JVujRqulCucEMmntr )"); auto outcome = client.PutWithContentEncoding(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.uri = "/"; expectedRq.headers = {{"Content-Encoding", R"(gzip)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(PutWithContentEncoding, SDKAppendsGzipAndIgnoresHttpProvidedEncoding_awsJson1_1) { @@ -295,11 +294,10 @@ EcffzjixWU9FpAyGp2rVl4ETRgqljOGw4UgK31r0ZIEGnH0xGz1FtbW1OcQM008JVujRqulCucEMmntr )"); auto outcome = client.PutWithContentEncoding(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.uri = "/"; expectedRq.headers = {{"Content-Encoding", R"(gzip)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/json/tests/SimpleScalarPropertiesTest.cpp b/generated/protocol-tests/tests/input/json/tests/SimpleScalarPropertiesTest.cpp index 9f3f4494dd4..9017b5632ac 100644 --- a/generated/protocol-tests/tests/input/json/tests/SimpleScalarPropertiesTest.cpp +++ b/generated/protocol-tests/tests/input/json/tests/SimpleScalarPropertiesTest.cpp @@ -21,14 +21,13 @@ AWS_PROTOCOL_TEST(SimpleScalarProperties, AwsJson11SupportsNaNFloatInputs) { request.SetDoubleValue(std::numeric_limits::quiet_NaN()); auto outcome = client.SimpleScalarProperties(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "ewogICAgImZsb2F0VmFsdWUiOiAiTmFOIiwKICAgICJkb3VibGVWYWx1ZSI6ICJOYU4iCn0="; expectedRq.uri = "/"; expectedRq.headers = {{"Content-Type", R"(application/x-amz-json-1.1)"}, {"X-Amz-Target", R"(JsonProtocol.SimpleScalarProperties)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(SimpleScalarProperties, AwsJson11SupportsInfinityFloatInputs) { @@ -41,14 +40,13 @@ AWS_PROTOCOL_TEST(SimpleScalarProperties, AwsJson11SupportsInfinityFloatInputs) request.SetDoubleValue(std::numeric_limits::infinity()); auto outcome = client.SimpleScalarProperties(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "ewogICAgImZsb2F0VmFsdWUiOiAiSW5maW5pdHkiLAogICAgImRvdWJsZVZhbHVlIjogIkluZmluaXR5Igp9"; expectedRq.uri = "/"; expectedRq.headers = {{"Content-Type", R"(application/x-amz-json-1.1)"}, {"X-Amz-Target", R"(JsonProtocol.SimpleScalarProperties)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(SimpleScalarProperties, AwsJson11SupportsNegativeInfinityFloatInputs) { @@ -61,12 +59,11 @@ AWS_PROTOCOL_TEST(SimpleScalarProperties, AwsJson11SupportsNegativeInfinityFloat request.SetDoubleValue(-std::numeric_limits::infinity()); auto outcome = client.SimpleScalarProperties(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "ewogICAgImZsb2F0VmFsdWUiOiAiLUluZmluaXR5IiwKICAgICJkb3VibGVWYWx1ZSI6ICItSW5maW5pdHkiCn0="; expectedRq.uri = "/"; expectedRq.headers = {{"Content-Type", R"(application/x-amz-json-1.1)"}, {"X-Amz-Target", R"(JsonProtocol.SimpleScalarProperties)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/json_1_0/tests/EmptyInputAndEmptyOutputTest.cpp b/generated/protocol-tests/tests/input/json_1_0/tests/EmptyInputAndEmptyOutputTest.cpp index 222eddf2628..aa98bacb940 100644 --- a/generated/protocol-tests/tests/input/json_1_0/tests/EmptyInputAndEmptyOutputTest.cpp +++ b/generated/protocol-tests/tests/input/json_1_0/tests/EmptyInputAndEmptyOutputTest.cpp @@ -19,12 +19,11 @@ AWS_PROTOCOL_TEST(EmptyInputAndEmptyOutput, AwsJson10EmptyInputAndEmptyOutput) { EmptyInputAndEmptyOutputRequest request; auto outcome = client.EmptyInputAndEmptyOutput(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "e30="; expectedRq.uri = "/"; expectedRq.headers = {{"Content-Type", R"(application/x-amz-json-1.0)"}, {"X-Amz-Target", R"(JsonRpc10.EmptyInputAndEmptyOutput)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/json_1_0/tests/EndpointOperationTest.cpp b/generated/protocol-tests/tests/input/json_1_0/tests/EndpointOperationTest.cpp index 421c3e02f08..484608d23c1 100644 --- a/generated/protocol-tests/tests/input/json_1_0/tests/EndpointOperationTest.cpp +++ b/generated/protocol-tests/tests/input/json_1_0/tests/EndpointOperationTest.cpp @@ -19,12 +19,11 @@ AWS_PROTOCOL_TEST(EndpointOperation, AwsJson10EndpointTrait) { EndpointOperationRequest request; auto outcome = client.EndpointOperation(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "e30="; expectedRq.uri = "/"; expectedRq.host = "foo.example.com"; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/json_1_0/tests/EndpointWithHostLabelOperationTest.cpp b/generated/protocol-tests/tests/input/json_1_0/tests/EndpointWithHostLabelOperationTest.cpp index a4aabb71951..359c39e1937 100644 --- a/generated/protocol-tests/tests/input/json_1_0/tests/EndpointWithHostLabelOperationTest.cpp +++ b/generated/protocol-tests/tests/input/json_1_0/tests/EndpointWithHostLabelOperationTest.cpp @@ -20,12 +20,11 @@ AWS_PROTOCOL_TEST(EndpointWithHostLabelOperation, AwsJson10EndpointTraitWithHost request.SetLabel(R"(bar)"); auto outcome = client.EndpointWithHostLabelOperation(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "eyJsYWJlbCI6ICJiYXIifQ=="; expectedRq.uri = "/"; expectedRq.host = "foo.bar.example.com"; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/json_1_0/tests/HostWithPathOperationTest.cpp b/generated/protocol-tests/tests/input/json_1_0/tests/HostWithPathOperationTest.cpp index 8b89cf70478..b6510ff483d 100644 --- a/generated/protocol-tests/tests/input/json_1_0/tests/HostWithPathOperationTest.cpp +++ b/generated/protocol-tests/tests/input/json_1_0/tests/HostWithPathOperationTest.cpp @@ -19,12 +19,11 @@ AWS_PROTOCOL_TEST(HostWithPathOperation, AwsJson10HostWithPath) { HostWithPathOperationRequest request; auto outcome = client.HostWithPathOperation(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "e30="; expectedRq.uri = "/custom/"; expectedRq.host = "example.com/custom"; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/json_1_0/tests/JsonUnionsTest.cpp b/generated/protocol-tests/tests/input/json_1_0/tests/JsonUnionsTest.cpp index e91093eae07..9401e858cf9 100644 --- a/generated/protocol-tests/tests/input/json_1_0/tests/JsonUnionsTest.cpp +++ b/generated/protocol-tests/tests/input/json_1_0/tests/JsonUnionsTest.cpp @@ -24,14 +24,13 @@ AWS_PROTOCOL_TEST(JsonUnions, AwsJson10SerializeStringUnionValue) { } auto outcome = client.JsonUnions(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "ewogICAgImNvbnRlbnRzIjogewogICAgICAgICJzdHJpbmdWYWx1ZSI6ICJmb28iCiAgICB9Cn0="; expectedRq.uri = "/"; expectedRq.headers = {{"Content-Type", R"(application/x-amz-json-1.0)"}, {"X-Amz-Target", R"(JsonRpc10.JsonUnions)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(JsonUnions, AwsJson10SerializeBooleanUnionValue) { @@ -47,14 +46,13 @@ AWS_PROTOCOL_TEST(JsonUnions, AwsJson10SerializeBooleanUnionValue) { } auto outcome = client.JsonUnions(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "ewogICAgImNvbnRlbnRzIjogewogICAgICAgICJib29sZWFuVmFsdWUiOiB0cnVlCiAgICB9Cn0="; expectedRq.uri = "/"; expectedRq.headers = {{"Content-Type", R"(application/x-amz-json-1.0)"}, {"X-Amz-Target", R"(JsonRpc10.JsonUnions)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(JsonUnions, AwsJson10SerializeNumberUnionValue) { @@ -70,14 +68,13 @@ AWS_PROTOCOL_TEST(JsonUnions, AwsJson10SerializeNumberUnionValue) { } auto outcome = client.JsonUnions(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "ewogICAgImNvbnRlbnRzIjogewogICAgICAgICJudW1iZXJWYWx1ZSI6IDEKICAgIH0KfQ=="; expectedRq.uri = "/"; expectedRq.headers = {{"Content-Type", R"(application/x-amz-json-1.0)"}, {"X-Amz-Target", R"(JsonRpc10.JsonUnions)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(JsonUnions, AwsJson10SerializeBlobUnionValue) { @@ -93,14 +90,13 @@ AWS_PROTOCOL_TEST(JsonUnions, AwsJson10SerializeBlobUnionValue) { } auto outcome = client.JsonUnions(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "ewogICAgImNvbnRlbnRzIjogewogICAgICAgICJibG9iVmFsdWUiOiAiWm05diIKICAgIH0KfQ=="; expectedRq.uri = "/"; expectedRq.headers = {{"Content-Type", R"(application/x-amz-json-1.0)"}, {"X-Amz-Target", R"(JsonRpc10.JsonUnions)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(JsonUnions, AwsJson10SerializeTimestampUnionValue) { @@ -116,14 +112,13 @@ AWS_PROTOCOL_TEST(JsonUnions, AwsJson10SerializeTimestampUnionValue) { } auto outcome = client.JsonUnions(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "ewogICAgImNvbnRlbnRzIjogewogICAgICAgICJ0aW1lc3RhbXBWYWx1ZSI6IDEzOTg3OTYyMzgKICAgIH0KfQ=="; expectedRq.uri = "/"; expectedRq.headers = {{"Content-Type", R"(application/x-amz-json-1.0)"}, {"X-Amz-Target", R"(JsonRpc10.JsonUnions)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(JsonUnions, AwsJson10SerializeEnumUnionValue) { @@ -139,14 +134,13 @@ AWS_PROTOCOL_TEST(JsonUnions, AwsJson10SerializeEnumUnionValue) { } auto outcome = client.JsonUnions(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "ewogICAgImNvbnRlbnRzIjogewogICAgICAgICJlbnVtVmFsdWUiOiAiRm9vIgogICAgfQp9"; expectedRq.uri = "/"; expectedRq.headers = {{"Content-Type", R"(application/x-amz-json-1.0)"}, {"X-Amz-Target", R"(JsonRpc10.JsonUnions)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(JsonUnions, AwsJson10SerializeIntEnumUnionValue) { @@ -162,14 +156,13 @@ AWS_PROTOCOL_TEST(JsonUnions, AwsJson10SerializeIntEnumUnionValue) { } auto outcome = client.JsonUnions(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "ewogICAgImNvbnRlbnRzIjogewogICAgICAgICJpbnRFbnVtVmFsdWUiOiAxCiAgICB9Cn0="; expectedRq.uri = "/"; expectedRq.headers = {{"Content-Type", R"(application/x-amz-json-1.0)"}, {"X-Amz-Target", R"(JsonRpc10.JsonUnions)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(JsonUnions, AwsJson10SerializeListUnionValue) { @@ -185,14 +178,13 @@ AWS_PROTOCOL_TEST(JsonUnions, AwsJson10SerializeListUnionValue) { } auto outcome = client.JsonUnions(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "ewogICAgImNvbnRlbnRzIjogewogICAgICAgICJsaXN0VmFsdWUiOiBbImZvbyIsICJiYXIiXQogICAgfQp9"; expectedRq.uri = "/"; expectedRq.headers = {{"Content-Type", R"(application/x-amz-json-1.0)"}, {"X-Amz-Target", R"(JsonRpc10.JsonUnions)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(JsonUnions, AwsJson10SerializeMapUnionValue) { @@ -208,14 +200,13 @@ AWS_PROTOCOL_TEST(JsonUnions, AwsJson10SerializeMapUnionValue) { } auto outcome = client.JsonUnions(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "ewogICAgImNvbnRlbnRzIjogewogICAgICAgICJtYXBWYWx1ZSI6IHsKICAgICAgICAgICAgImZvbyI6ICJiYXIiLAogICAgICAgICAgICAic3BhbSI6ICJlZ2dzIgogICAgICAgIH0KICAgIH0KfQ=="; expectedRq.uri = "/"; expectedRq.headers = {{"Content-Type", R"(application/x-amz-json-1.0)"}, {"X-Amz-Target", R"(JsonRpc10.JsonUnions)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(JsonUnions, AwsJson10SerializeStructureUnionValue) { @@ -235,12 +226,11 @@ AWS_PROTOCOL_TEST(JsonUnions, AwsJson10SerializeStructureUnionValue) { } auto outcome = client.JsonUnions(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "ewogICAgImNvbnRlbnRzIjogewogICAgICAgICJzdHJ1Y3R1cmVWYWx1ZSI6IHsKICAgICAgICAgICAgImhpIjogImhlbGxvIgogICAgICAgIH0KICAgIH0KfQ=="; expectedRq.uri = "/"; expectedRq.headers = {{"Content-Type", R"(application/x-amz-json-1.0)"}, {"X-Amz-Target", R"(JsonRpc10.JsonUnions)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/json_1_0/tests/NoInputAndNoOutputTest.cpp b/generated/protocol-tests/tests/input/json_1_0/tests/NoInputAndNoOutputTest.cpp index c9f315932c0..c667b6e2a40 100644 --- a/generated/protocol-tests/tests/input/json_1_0/tests/NoInputAndNoOutputTest.cpp +++ b/generated/protocol-tests/tests/input/json_1_0/tests/NoInputAndNoOutputTest.cpp @@ -19,12 +19,11 @@ AWS_PROTOCOL_TEST(NoInputAndNoOutput, AwsJson10MustAlwaysSendEmptyJsonPayload) { NoInputAndNoOutputRequest request; auto outcome = client.NoInputAndNoOutput(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "e30="; expectedRq.uri = "/"; expectedRq.headers = {{"Content-Type", R"(application/x-amz-json-1.0)"}, {"X-Amz-Target", R"(JsonRpc10.NoInputAndNoOutput)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/json_1_0/tests/NoInputAndOutputTest.cpp b/generated/protocol-tests/tests/input/json_1_0/tests/NoInputAndOutputTest.cpp index bc3e84b9a32..17285d79101 100644 --- a/generated/protocol-tests/tests/input/json_1_0/tests/NoInputAndOutputTest.cpp +++ b/generated/protocol-tests/tests/input/json_1_0/tests/NoInputAndOutputTest.cpp @@ -19,12 +19,11 @@ AWS_PROTOCOL_TEST(NoInputAndOutput, AwsJson10NoInputAndOutput) { NoInputAndOutputRequest request; auto outcome = client.NoInputAndOutput(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "e30="; expectedRq.uri = "/"; expectedRq.headers = {{"Content-Type", R"(application/x-amz-json-1.0)"}, {"X-Amz-Target", R"(JsonRpc10.NoInputAndOutput)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/json_1_0/tests/PutWithContentEncodingTest.cpp b/generated/protocol-tests/tests/input/json_1_0/tests/PutWithContentEncodingTest.cpp index 1f669a99b67..bc6ce0a4392 100644 --- a/generated/protocol-tests/tests/input/json_1_0/tests/PutWithContentEncodingTest.cpp +++ b/generated/protocol-tests/tests/input/json_1_0/tests/PutWithContentEncodingTest.cpp @@ -148,13 +148,12 @@ EcffzjixWU9FpAyGp2rVl4ETRgqljOGw4UgK31r0ZIEGnH0xGz1FtbW1OcQM008JVujRqulCucEMmntr )"); auto outcome = client.PutWithContentEncoding(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.uri = "/"; expectedRq.headers = {{"Content-Encoding", R"(gzip)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(PutWithContentEncoding, SDKAppendsGzipAndIgnoresHttpProvidedEncoding_awsJson1_0) { @@ -295,11 +294,10 @@ EcffzjixWU9FpAyGp2rVl4ETRgqljOGw4UgK31r0ZIEGnH0xGz1FtbW1OcQM008JVujRqulCucEMmntr )"); auto outcome = client.PutWithContentEncoding(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.uri = "/"; expectedRq.headers = {{"Content-Encoding", R"(gzip)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/json_1_0/tests/SimpleScalarPropertiesTest.cpp b/generated/protocol-tests/tests/input/json_1_0/tests/SimpleScalarPropertiesTest.cpp index 8b3e58d949e..9b8569f6d37 100644 --- a/generated/protocol-tests/tests/input/json_1_0/tests/SimpleScalarPropertiesTest.cpp +++ b/generated/protocol-tests/tests/input/json_1_0/tests/SimpleScalarPropertiesTest.cpp @@ -21,14 +21,13 @@ AWS_PROTOCOL_TEST(SimpleScalarProperties, AwsJson10SupportsNaNFloatInputs) { request.SetDoubleValue(std::numeric_limits::quiet_NaN()); auto outcome = client.SimpleScalarProperties(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "ewogICAgImZsb2F0VmFsdWUiOiAiTmFOIiwKICAgICJkb3VibGVWYWx1ZSI6ICJOYU4iCn0="; expectedRq.uri = "/"; expectedRq.headers = {{"Content-Type", R"(application/x-amz-json-1.0)"}, {"X-Amz-Target", R"(JsonRpc10.SimpleScalarProperties)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(SimpleScalarProperties, AwsJson10SupportsInfinityFloatInputs) { @@ -41,14 +40,13 @@ AWS_PROTOCOL_TEST(SimpleScalarProperties, AwsJson10SupportsInfinityFloatInputs) request.SetDoubleValue(std::numeric_limits::infinity()); auto outcome = client.SimpleScalarProperties(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "ewogICAgImZsb2F0VmFsdWUiOiAiSW5maW5pdHkiLAogICAgImRvdWJsZVZhbHVlIjogIkluZmluaXR5Igp9"; expectedRq.uri = "/"; expectedRq.headers = {{"Content-Type", R"(application/x-amz-json-1.0)"}, {"X-Amz-Target", R"(JsonRpc10.SimpleScalarProperties)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(SimpleScalarProperties, AwsJson10SupportsNegativeInfinityFloatInputs) { @@ -61,12 +59,11 @@ AWS_PROTOCOL_TEST(SimpleScalarProperties, AwsJson10SupportsNegativeInfinityFloat request.SetDoubleValue(-std::numeric_limits::infinity()); auto outcome = client.SimpleScalarProperties(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "ewogICAgImZsb2F0VmFsdWUiOiAiLUluZmluaXR5IiwKICAgICJkb3VibGVWYWx1ZSI6ICItSW5maW5pdHkiCn0="; expectedRq.uri = "/"; expectedRq.headers = {{"Content-Type", R"(application/x-amz-json-1.0)"}, {"X-Amz-Target", R"(JsonRpc10.SimpleScalarProperties)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/query/tests/EmptyInputAndEmptyOutputTest.cpp b/generated/protocol-tests/tests/input/query/tests/EmptyInputAndEmptyOutputTest.cpp index 9e5f1aa1091..0e2fef03b04 100644 --- a/generated/protocol-tests/tests/input/query/tests/EmptyInputAndEmptyOutputTest.cpp +++ b/generated/protocol-tests/tests/input/query/tests/EmptyInputAndEmptyOutputTest.cpp @@ -19,12 +19,11 @@ AWS_PROTOCOL_TEST(EmptyInputAndEmptyOutput, QueryEmptyInputAndEmptyOutput) { EmptyInputAndEmptyOutputRequest request; auto outcome = client.EmptyInputAndEmptyOutput(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "QWN0aW9uPUVtcHR5SW5wdXRBbmRFbXB0eU91dHB1dCZWZXJzaW9uPTIwMjAtMDEtMDg="; expectedRq.uri = "/"; expectedRq.headers = {{"Content-Type", R"(application/x-www-form-urlencoded)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/query/tests/EndpointOperationTest.cpp b/generated/protocol-tests/tests/input/query/tests/EndpointOperationTest.cpp index 3ed7a7a4b5e..978a6bbc9cd 100644 --- a/generated/protocol-tests/tests/input/query/tests/EndpointOperationTest.cpp +++ b/generated/protocol-tests/tests/input/query/tests/EndpointOperationTest.cpp @@ -19,8 +19,6 @@ AWS_PROTOCOL_TEST(EndpointOperation, AwsQueryEndpointTrait) { EndpointOperationRequest request; auto outcome = client.EndpointOperation(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "QWN0aW9uPUVuZHBvaW50T3BlcmF0aW9uJlZlcnNpb249MjAyMC0wMS0wOA=="; @@ -28,4 +26,5 @@ AWS_PROTOCOL_TEST(EndpointOperation, AwsQueryEndpointTrait) { expectedRq.host = "foo.example.com"; expectedRq.headers = {{"Content-Type", R"(application/x-www-form-urlencoded)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/query/tests/EndpointWithHostLabelOperationTest.cpp b/generated/protocol-tests/tests/input/query/tests/EndpointWithHostLabelOperationTest.cpp index 03458b5aac8..4f03e309a3c 100644 --- a/generated/protocol-tests/tests/input/query/tests/EndpointWithHostLabelOperationTest.cpp +++ b/generated/protocol-tests/tests/input/query/tests/EndpointWithHostLabelOperationTest.cpp @@ -20,8 +20,6 @@ AWS_PROTOCOL_TEST(EndpointWithHostLabelOperation, AwsQueryEndpointTraitWithHostL request.SetLabel(R"(bar)"); auto outcome = client.EndpointWithHostLabelOperation(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "QWN0aW9uPUVuZHBvaW50V2l0aEhvc3RMYWJlbE9wZXJhdGlvbiZWZXJzaW9uPTIwMjAtMDEtMDgmbGFiZWw9YmFy"; @@ -29,4 +27,5 @@ AWS_PROTOCOL_TEST(EndpointWithHostLabelOperation, AwsQueryEndpointTraitWithHostL expectedRq.host = "foo.bar.example.com"; expectedRq.headers = {{"Content-Type", R"(application/x-www-form-urlencoded)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/query/tests/HostWithPathOperationTest.cpp b/generated/protocol-tests/tests/input/query/tests/HostWithPathOperationTest.cpp index 01dd43c2e82..53d5c47579c 100644 --- a/generated/protocol-tests/tests/input/query/tests/HostWithPathOperationTest.cpp +++ b/generated/protocol-tests/tests/input/query/tests/HostWithPathOperationTest.cpp @@ -19,12 +19,11 @@ AWS_PROTOCOL_TEST(HostWithPathOperation, QueryHostWithPath) { HostWithPathOperationRequest request; auto outcome = client.HostWithPathOperation(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "QWN0aW9uPUhvc3RXaXRoUGF0aE9wZXJhdGlvbiZWZXJzaW9uPTIwMjAtMDEtMDg="; expectedRq.uri = "/custom/"; expectedRq.host = "example.com/custom"; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/query/tests/NestedStructuresTest.cpp b/generated/protocol-tests/tests/input/query/tests/NestedStructuresTest.cpp index 3b4f0c326dc..3b8402b96e6 100644 --- a/generated/protocol-tests/tests/input/query/tests/NestedStructuresTest.cpp +++ b/generated/protocol-tests/tests/input/query/tests/NestedStructuresTest.cpp @@ -30,8 +30,6 @@ AWS_PROTOCOL_TEST(NestedStructures, NestedStructures) { } auto outcome = client.NestedStructures(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "QWN0aW9uPU5lc3RlZFN0cnVjdHVyZXMmVmVyc2lvbj0yMDIwLTAxLTA4Jk5lc3RlZC5TdHJpbmdBcmc9Zm9vJk5lc3RlZC5PdGhlckFyZz10cnVlJk5lc3RlZC5SZWN1cnNpdmVBcmcuU3RyaW5nQXJnPWJheg=="; @@ -39,4 +37,5 @@ AWS_PROTOCOL_TEST(NestedStructures, NestedStructures) { expectedRq.headers = {{"Content-Type", R"(application/x-www-form-urlencoded)"}}; expectedRq.requireHeaders = {"Content-Length"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/query/tests/NoInputAndNoOutputTest.cpp b/generated/protocol-tests/tests/input/query/tests/NoInputAndNoOutputTest.cpp index f3bc5807d51..ee0e6145280 100644 --- a/generated/protocol-tests/tests/input/query/tests/NoInputAndNoOutputTest.cpp +++ b/generated/protocol-tests/tests/input/query/tests/NoInputAndNoOutputTest.cpp @@ -19,12 +19,11 @@ AWS_PROTOCOL_TEST(NoInputAndNoOutput, QueryNoInputAndNoOutput) { NoInputAndNoOutputRequest request; auto outcome = client.NoInputAndNoOutput(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "QWN0aW9uPU5vSW5wdXRBbmROb091dHB1dCZWZXJzaW9uPTIwMjAtMDEtMDg="; expectedRq.uri = "/"; expectedRq.headers = {{"Content-Type", R"(application/x-www-form-urlencoded)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/query/tests/NoInputAndOutputTest.cpp b/generated/protocol-tests/tests/input/query/tests/NoInputAndOutputTest.cpp index 9b40ec8b4f7..cb2d92dd8a4 100644 --- a/generated/protocol-tests/tests/input/query/tests/NoInputAndOutputTest.cpp +++ b/generated/protocol-tests/tests/input/query/tests/NoInputAndOutputTest.cpp @@ -19,12 +19,11 @@ AWS_PROTOCOL_TEST(NoInputAndOutput, QueryNoInputAndOutput) { NoInputAndOutputRequest request; auto outcome = client.NoInputAndOutput(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "QWN0aW9uPU5vSW5wdXRBbmRPdXRwdXQmVmVyc2lvbj0yMDIwLTAxLTA4"; expectedRq.uri = "/"; expectedRq.headers = {{"Content-Type", R"(application/x-www-form-urlencoded)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/query/tests/PutWithContentEncodingTest.cpp b/generated/protocol-tests/tests/input/query/tests/PutWithContentEncodingTest.cpp index 32f1e33b2e0..83ad970053c 100644 --- a/generated/protocol-tests/tests/input/query/tests/PutWithContentEncodingTest.cpp +++ b/generated/protocol-tests/tests/input/query/tests/PutWithContentEncodingTest.cpp @@ -148,13 +148,12 @@ EcffzjixWU9FpAyGp2rVl4ETRgqljOGw4UgK31r0ZIEGnH0xGz1FtbW1OcQM008JVujRqulCucEMmntr )"); auto outcome = client.PutWithContentEncoding(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.uri = "/"; expectedRq.headers = {{"Content-Encoding", R"(gzip)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(PutWithContentEncoding, SDKAppendsGzipAndIgnoresHttpProvidedEncoding_awsQuery) { @@ -295,11 +294,10 @@ EcffzjixWU9FpAyGp2rVl4ETRgqljOGw4UgK31r0ZIEGnH0xGz1FtbW1OcQM008JVujRqulCucEMmntr )"); auto outcome = client.PutWithContentEncoding(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.uri = "/"; expectedRq.headers = {{"Content-Encoding", R"(gzip)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/query/tests/QueryIdempotencyTokenAutoFillTest.cpp b/generated/protocol-tests/tests/input/query/tests/QueryIdempotencyTokenAutoFillTest.cpp index 79135f6da3d..eadeac3d9e7 100644 --- a/generated/protocol-tests/tests/input/query/tests/QueryIdempotencyTokenAutoFillTest.cpp +++ b/generated/protocol-tests/tests/input/query/tests/QueryIdempotencyTokenAutoFillTest.cpp @@ -19,8 +19,6 @@ AWS_PROTOCOL_TEST(QueryIdempotencyTokenAutoFill, QueryProtocolIdempotencyTokenAu QueryIdempotencyTokenAutoFillRequest request; auto outcome = client.QueryIdempotencyTokenAutoFill(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "QWN0aW9uPVF1ZXJ5SWRlbXBvdGVuY3lUb2tlbkF1dG9GaWxsJlZlcnNpb249MjAyMC0wMS0wOCZ0b2tlbj0wMDAwMDAwMC0wMDAwLTQwMDAtODAwMC0wMDAwMDAwMDAwMDA="; @@ -28,6 +26,7 @@ AWS_PROTOCOL_TEST(QueryIdempotencyTokenAutoFill, QueryProtocolIdempotencyTokenAu expectedRq.headers = {{"Content-Type", R"(application/x-www-form-urlencoded)"}}; expectedRq.requireHeaders = {"Content-Length"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(QueryIdempotencyTokenAutoFill, QueryProtocolIdempotencyTokenAutoFillIsSet) { @@ -39,8 +38,6 @@ AWS_PROTOCOL_TEST(QueryIdempotencyTokenAutoFill, QueryProtocolIdempotencyTokenAu request.SetToken(R"(00000000-0000-4000-8000-000000000123)"); auto outcome = client.QueryIdempotencyTokenAutoFill(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "QWN0aW9uPVF1ZXJ5SWRlbXBvdGVuY3lUb2tlbkF1dG9GaWxsJlZlcnNpb249MjAyMC0wMS0wOCZ0b2tlbj0wMDAwMDAwMC0wMDAwLTQwMDAtODAwMC0wMDAwMDAwMDAxMjM="; @@ -48,4 +45,5 @@ AWS_PROTOCOL_TEST(QueryIdempotencyTokenAutoFill, QueryProtocolIdempotencyTokenAu expectedRq.headers = {{"Content-Type", R"(application/x-www-form-urlencoded)"}}; expectedRq.requireHeaders = {"Content-Length"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/query/tests/QueryListsTest.cpp b/generated/protocol-tests/tests/input/query/tests/QueryListsTest.cpp index 4a2796f943d..f99137c2866 100644 --- a/generated/protocol-tests/tests/input/query/tests/QueryListsTest.cpp +++ b/generated/protocol-tests/tests/input/query/tests/QueryListsTest.cpp @@ -30,14 +30,13 @@ AWS_PROTOCOL_TEST(QueryLists, QueryLists) { } auto outcome = client.QueryLists(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "QWN0aW9uPVF1ZXJ5TGlzdHMmVmVyc2lvbj0yMDIwLTAxLTA4Jkxpc3RBcmcubWVtYmVyLjE9Zm9vJkxpc3RBcmcubWVtYmVyLjI9YmFyJkxpc3RBcmcubWVtYmVyLjM9YmF6JkNvbXBsZXhMaXN0QXJnLm1lbWJlci4xLmhpPWhlbGxvJkNvbXBsZXhMaXN0QXJnLm1lbWJlci4yLmhpPWhvbGE="; expectedRq.uri = "/"; expectedRq.headers = {{"Content-Type", R"(application/x-www-form-urlencoded)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(QueryLists, EmptyQueryLists) { @@ -49,14 +48,13 @@ AWS_PROTOCOL_TEST(QueryLists, EmptyQueryLists) { request.SetListArg({}); auto outcome = client.QueryLists(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "QWN0aW9uPVF1ZXJ5TGlzdHMmVmVyc2lvbj0yMDIwLTAxLTA4Jkxpc3RBcmc9"; expectedRq.uri = "/"; expectedRq.headers = {{"Content-Type", R"(application/x-www-form-urlencoded)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(QueryLists, FlattenedQueryLists) { @@ -68,14 +66,13 @@ AWS_PROTOCOL_TEST(QueryLists, FlattenedQueryLists) { request.SetFlattenedListArg({R"(A)", R"(B)"}); auto outcome = client.QueryLists(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "QWN0aW9uPVF1ZXJ5TGlzdHMmVmVyc2lvbj0yMDIwLTAxLTA4JkZsYXR0ZW5lZExpc3RBcmcuMT1BJkZsYXR0ZW5lZExpc3RBcmcuMj1C"; expectedRq.uri = "/"; expectedRq.headers = {{"Content-Type", R"(application/x-www-form-urlencoded)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(QueryLists, QueryListArgWithXmlNameMember) { @@ -87,14 +84,13 @@ AWS_PROTOCOL_TEST(QueryLists, QueryListArgWithXmlNameMember) { request.SetListArgWithXmlNameMember({R"(A)", R"(B)"}); auto outcome = client.QueryLists(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "QWN0aW9uPVF1ZXJ5TGlzdHMmVmVyc2lvbj0yMDIwLTAxLTA4Jkxpc3RBcmdXaXRoWG1sTmFtZU1lbWJlci5pdGVtLjE9QSZMaXN0QXJnV2l0aFhtbE5hbWVNZW1iZXIuaXRlbS4yPUI="; expectedRq.uri = "/"; expectedRq.headers = {{"Content-Type", R"(application/x-www-form-urlencoded)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(QueryLists, QueryFlattenedListArgWithXmlName) { @@ -106,14 +102,13 @@ AWS_PROTOCOL_TEST(QueryLists, QueryFlattenedListArgWithXmlName) { request.SetFlattenedListArgWithXmlName({R"(A)", R"(B)"}); auto outcome = client.QueryLists(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "QWN0aW9uPVF1ZXJ5TGlzdHMmVmVyc2lvbj0yMDIwLTAxLTA4JkhpLjE9QSZIaS4yPUI="; expectedRq.uri = "/"; expectedRq.headers = {{"Content-Type", R"(application/x-www-form-urlencoded)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(QueryLists, QueryNestedStructWithList) { @@ -129,12 +124,11 @@ AWS_PROTOCOL_TEST(QueryLists, QueryNestedStructWithList) { } auto outcome = client.QueryLists(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "QWN0aW9uPVF1ZXJ5TGlzdHMmVmVyc2lvbj0yMDIwLTAxLTA4Jk5lc3RlZFdpdGhMaXN0Lkxpc3RBcmcubWVtYmVyLjE9QSZOZXN0ZWRXaXRoTGlzdC5MaXN0QXJnLm1lbWJlci4yPUI="; expectedRq.uri = "/"; expectedRq.headers = {{"Content-Type", R"(application/x-www-form-urlencoded)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/query/tests/QueryMapsTest.cpp b/generated/protocol-tests/tests/input/query/tests/QueryMapsTest.cpp index 631acf02522..3e96e877deb 100644 --- a/generated/protocol-tests/tests/input/query/tests/QueryMapsTest.cpp +++ b/generated/protocol-tests/tests/input/query/tests/QueryMapsTest.cpp @@ -20,14 +20,13 @@ AWS_PROTOCOL_TEST(QueryMaps, QuerySimpleQueryMaps) { request.SetMapArg({{"bar", R"(Bar)"}, {"foo", R"(Foo)"}}); auto outcome = client.QueryMaps(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "QWN0aW9uPVF1ZXJ5TWFwcyZWZXJzaW9uPTIwMjAtMDEtMDgmTWFwQXJnLmVudHJ5LjEua2V5PWJhciZNYXBBcmcuZW50cnkuMS52YWx1ZT1CYXImTWFwQXJnLmVudHJ5LjIua2V5PWZvbyZNYXBBcmcuZW50cnkuMi52YWx1ZT1Gb28="; expectedRq.uri = "/"; expectedRq.headers = {{"Content-Type", R"(application/x-www-form-urlencoded)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(QueryMaps, QuerySimpleQueryMapsWithXmlName) { @@ -39,14 +38,13 @@ AWS_PROTOCOL_TEST(QueryMaps, QuerySimpleQueryMapsWithXmlName) { request.SetRenamedMapArg({{"foo", R"(Foo)"}}); auto outcome = client.QueryMaps(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "QWN0aW9uPVF1ZXJ5TWFwcyZWZXJzaW9uPTIwMjAtMDEtMDgmRm9vLmVudHJ5LjEua2V5PWZvbyZGb28uZW50cnkuMS52YWx1ZT1Gb28="; expectedRq.uri = "/"; expectedRq.headers = {{"Content-Type", R"(application/x-www-form-urlencoded)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(QueryMaps, QueryComplexQueryMaps) { @@ -67,14 +65,13 @@ AWS_PROTOCOL_TEST(QueryMaps, QueryComplexQueryMaps) { } auto outcome = client.QueryMaps(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "QWN0aW9uPVF1ZXJ5TWFwcyZWZXJzaW9uPTIwMjAtMDEtMDgmQ29tcGxleE1hcEFyZy5lbnRyeS4xLmtleT1iYXImQ29tcGxleE1hcEFyZy5lbnRyeS4xLnZhbHVlLmhpPUJhciZDb21wbGV4TWFwQXJnLmVudHJ5LjIua2V5PWZvbyZDb21wbGV4TWFwQXJnLmVudHJ5LjIudmFsdWUuaGk9Rm9v"; expectedRq.uri = "/"; expectedRq.headers = {{"Content-Type", R"(application/x-www-form-urlencoded)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(QueryMaps, QueryEmptyQueryMaps) { @@ -86,14 +83,13 @@ AWS_PROTOCOL_TEST(QueryMaps, QueryEmptyQueryMaps) { request.SetMapArg({}); auto outcome = client.QueryMaps(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "QWN0aW9uPVF1ZXJ5TWFwcyZWZXJzaW9uPTIwMjAtMDEtMDg="; expectedRq.uri = "/"; expectedRq.headers = {{"Content-Type", R"(application/x-www-form-urlencoded)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(QueryMaps, QueryQueryMapWithMemberXmlName) { @@ -105,14 +101,13 @@ AWS_PROTOCOL_TEST(QueryMaps, QueryQueryMapWithMemberXmlName) { request.SetMapWithXmlMemberName({{"bar", R"(Bar)"}, {"foo", R"(Foo)"}}); auto outcome = client.QueryMaps(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "QWN0aW9uPVF1ZXJ5TWFwcyZWZXJzaW9uPTIwMjAtMDEtMDgmTWFwV2l0aFhtbE1lbWJlck5hbWUuZW50cnkuMS5LPWJhciZNYXBXaXRoWG1sTWVtYmVyTmFtZS5lbnRyeS4xLlY9QmFyJk1hcFdpdGhYbWxNZW1iZXJOYW1lLmVudHJ5LjIuSz1mb28mTWFwV2l0aFhtbE1lbWJlck5hbWUuZW50cnkuMi5WPUZvbw=="; expectedRq.uri = "/"; expectedRq.headers = {{"Content-Type", R"(application/x-www-form-urlencoded)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(QueryMaps, QueryFlattenedQueryMaps) { @@ -124,14 +119,13 @@ AWS_PROTOCOL_TEST(QueryMaps, QueryFlattenedQueryMaps) { request.SetFlattenedMap({{"bar", R"(Bar)"}, {"foo", R"(Foo)"}}); auto outcome = client.QueryMaps(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "QWN0aW9uPVF1ZXJ5TWFwcyZWZXJzaW9uPTIwMjAtMDEtMDgmRmxhdHRlbmVkTWFwLjEua2V5PWJhciZGbGF0dGVuZWRNYXAuMS52YWx1ZT1CYXImRmxhdHRlbmVkTWFwLjIua2V5PWZvbyZGbGF0dGVuZWRNYXAuMi52YWx1ZT1Gb28="; expectedRq.uri = "/"; expectedRq.headers = {{"Content-Type", R"(application/x-www-form-urlencoded)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(QueryMaps, QueryFlattenedQueryMapsWithXmlName) { @@ -143,14 +137,13 @@ AWS_PROTOCOL_TEST(QueryMaps, QueryFlattenedQueryMapsWithXmlName) { request.SetFlattenedMapWithXmlName({{"bar", R"(Bar)"}, {"foo", R"(Foo)"}}); auto outcome = client.QueryMaps(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "QWN0aW9uPVF1ZXJ5TWFwcyZWZXJzaW9uPTIwMjAtMDEtMDgmSGkuMS5LPWJhciZIaS4xLlY9QmFyJkhpLjIuSz1mb28mSGkuMi5WPUZvbw=="; expectedRq.uri = "/"; expectedRq.headers = {{"Content-Type", R"(application/x-www-form-urlencoded)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(QueryMaps, QueryQueryMapOfLists) { @@ -162,14 +155,13 @@ AWS_PROTOCOL_TEST(QueryMaps, QueryQueryMapOfLists) { request.SetMapOfLists({{"bar", {R"(C)", R"(D)"}}, {"foo", {R"(A)", R"(B)"}}}); auto outcome = client.QueryMaps(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "QWN0aW9uPVF1ZXJ5TWFwcyZWZXJzaW9uPTIwMjAtMDEtMDgmTWFwT2ZMaXN0cy5lbnRyeS4xLmtleT1iYXImTWFwT2ZMaXN0cy5lbnRyeS4xLnZhbHVlLm1lbWJlci4xPUMmTWFwT2ZMaXN0cy5lbnRyeS4xLnZhbHVlLm1lbWJlci4yPUQmTWFwT2ZMaXN0cy5lbnRyeS4yLmtleT1mb28mTWFwT2ZMaXN0cy5lbnRyeS4yLnZhbHVlLm1lbWJlci4xPUEmTWFwT2ZMaXN0cy5lbnRyeS4yLnZhbHVlLm1lbWJlci4yPUI="; expectedRq.uri = "/"; expectedRq.headers = {{"Content-Type", R"(application/x-www-form-urlencoded)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(QueryMaps, QueryNestedStructWithMap) { @@ -185,12 +177,11 @@ AWS_PROTOCOL_TEST(QueryMaps, QueryNestedStructWithMap) { } auto outcome = client.QueryMaps(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "QWN0aW9uPVF1ZXJ5TWFwcyZWZXJzaW9uPTIwMjAtMDEtMDgmTmVzdGVkU3RydWN0V2l0aE1hcC5NYXBBcmcuZW50cnkuMS5rZXk9YmFyJk5lc3RlZFN0cnVjdFdpdGhNYXAuTWFwQXJnLmVudHJ5LjEudmFsdWU9QmFyJk5lc3RlZFN0cnVjdFdpdGhNYXAuTWFwQXJnLmVudHJ5LjIua2V5PWZvbyZOZXN0ZWRTdHJ1Y3RXaXRoTWFwLk1hcEFyZy5lbnRyeS4yLnZhbHVlPUZvbw=="; expectedRq.uri = "/"; expectedRq.headers = {{"Content-Type", R"(application/x-www-form-urlencoded)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/query/tests/QueryTimestampsTest.cpp b/generated/protocol-tests/tests/input/query/tests/QueryTimestampsTest.cpp index dcd4c4c36a3..c13d4e5c7de 100644 --- a/generated/protocol-tests/tests/input/query/tests/QueryTimestampsTest.cpp +++ b/generated/protocol-tests/tests/input/query/tests/QueryTimestampsTest.cpp @@ -22,8 +22,6 @@ AWS_PROTOCOL_TEST(QueryTimestamps, QueryTimestampsInput) { request.SetEpochTarget(Aws::Utils::DateTime(1422172800L)); auto outcome = client.QueryTimestamps(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "QWN0aW9uPVF1ZXJ5VGltZXN0YW1wcyZWZXJzaW9uPTIwMjAtMDEtMDgmbm9ybWFsRm9ybWF0PTIwMTUtMDEtMjVUMDglM0EwMCUzQTAwWiZlcG9jaE1lbWJlcj0xNDIyMTcyODAwJmVwb2NoVGFyZ2V0PTE0MjIxNzI4MDA="; @@ -31,4 +29,5 @@ AWS_PROTOCOL_TEST(QueryTimestamps, QueryTimestampsInput) { expectedRq.headers = {{"Content-Type", R"(application/x-www-form-urlencoded)"}}; expectedRq.requireHeaders = {"Content-Length"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/query/tests/SimpleInputParamsTest.cpp b/generated/protocol-tests/tests/input/query/tests/SimpleInputParamsTest.cpp index eb3ed736d24..3a791158576 100644 --- a/generated/protocol-tests/tests/input/query/tests/SimpleInputParamsTest.cpp +++ b/generated/protocol-tests/tests/input/query/tests/SimpleInputParamsTest.cpp @@ -21,8 +21,6 @@ AWS_PROTOCOL_TEST(SimpleInputParams, QuerySimpleInputParamsStrings) { request.SetBar(R"(val2)"); auto outcome = client.SimpleInputParams(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "QWN0aW9uPVNpbXBsZUlucHV0UGFyYW1zJlZlcnNpb249MjAyMC0wMS0wOCZGb289dmFsMSZCYXI9dmFsMg=="; @@ -30,6 +28,7 @@ AWS_PROTOCOL_TEST(SimpleInputParams, QuerySimpleInputParamsStrings) { expectedRq.headers = {{"Content-Type", R"(application/x-www-form-urlencoded)"}}; expectedRq.requireHeaders = {"Content-Length"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(SimpleInputParams, QuerySimpleInputParamsStringAndBooleanTrue) { @@ -42,8 +41,6 @@ AWS_PROTOCOL_TEST(SimpleInputParams, QuerySimpleInputParamsStringAndBooleanTrue) request.SetBaz(true); auto outcome = client.SimpleInputParams(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "QWN0aW9uPVNpbXBsZUlucHV0UGFyYW1zJlZlcnNpb249MjAyMC0wMS0wOCZGb289dmFsMSZCYXo9dHJ1ZQ=="; @@ -51,6 +48,7 @@ AWS_PROTOCOL_TEST(SimpleInputParams, QuerySimpleInputParamsStringAndBooleanTrue) expectedRq.headers = {{"Content-Type", R"(application/x-www-form-urlencoded)"}}; expectedRq.requireHeaders = {"Content-Length"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(SimpleInputParams, QuerySimpleInputParamsStringsAndBooleanFalse) { @@ -62,8 +60,6 @@ AWS_PROTOCOL_TEST(SimpleInputParams, QuerySimpleInputParamsStringsAndBooleanFals request.SetBaz(false); auto outcome = client.SimpleInputParams(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "QWN0aW9uPVNpbXBsZUlucHV0UGFyYW1zJlZlcnNpb249MjAyMC0wMS0wOCZCYXo9ZmFsc2U="; @@ -71,6 +67,7 @@ AWS_PROTOCOL_TEST(SimpleInputParams, QuerySimpleInputParamsStringsAndBooleanFals expectedRq.headers = {{"Content-Type", R"(application/x-www-form-urlencoded)"}}; expectedRq.requireHeaders = {"Content-Length"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(SimpleInputParams, QuerySimpleInputParamsInteger) { @@ -82,8 +79,6 @@ AWS_PROTOCOL_TEST(SimpleInputParams, QuerySimpleInputParamsInteger) { request.SetBam(10); auto outcome = client.SimpleInputParams(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "QWN0aW9uPVNpbXBsZUlucHV0UGFyYW1zJlZlcnNpb249MjAyMC0wMS0wOCZCYW09MTA="; @@ -91,6 +86,7 @@ AWS_PROTOCOL_TEST(SimpleInputParams, QuerySimpleInputParamsInteger) { expectedRq.headers = {{"Content-Type", R"(application/x-www-form-urlencoded)"}}; expectedRq.requireHeaders = {"Content-Length"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(SimpleInputParams, QuerySimpleInputParamsFloat) { @@ -102,8 +98,6 @@ AWS_PROTOCOL_TEST(SimpleInputParams, QuerySimpleInputParamsFloat) { request.SetBoo(10.8); auto outcome = client.SimpleInputParams(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "QWN0aW9uPVNpbXBsZUlucHV0UGFyYW1zJlZlcnNpb249MjAyMC0wMS0wOCZCb289MTAuOA=="; @@ -111,6 +105,7 @@ AWS_PROTOCOL_TEST(SimpleInputParams, QuerySimpleInputParamsFloat) { expectedRq.headers = {{"Content-Type", R"(application/x-www-form-urlencoded)"}}; expectedRq.requireHeaders = {"Content-Length"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(SimpleInputParams, QuerySimpleInputParamsBlob) { @@ -122,8 +117,6 @@ AWS_PROTOCOL_TEST(SimpleInputParams, QuerySimpleInputParamsBlob) { request.SetQux(Aws::String(R"(value)")); auto outcome = client.SimpleInputParams(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "QWN0aW9uPVNpbXBsZUlucHV0UGFyYW1zJlZlcnNpb249MjAyMC0wMS0wOCZRdXg9ZG1Gc2RXVSUzRA=="; @@ -131,6 +124,7 @@ AWS_PROTOCOL_TEST(SimpleInputParams, QuerySimpleInputParamsBlob) { expectedRq.headers = {{"Content-Type", R"(application/x-www-form-urlencoded)"}}; expectedRq.requireHeaders = {"Content-Length"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(SimpleInputParams, QueryEnums) { @@ -142,8 +136,6 @@ AWS_PROTOCOL_TEST(SimpleInputParams, QueryEnums) { request.SetFooEnum(FooEnumMapper::GetFooEnumForName(R"e(Foo)e")); auto outcome = client.SimpleInputParams(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "QWN0aW9uPVNpbXBsZUlucHV0UGFyYW1zJlZlcnNpb249MjAyMC0wMS0wOCZGb29FbnVtPUZvbw=="; @@ -151,6 +143,7 @@ AWS_PROTOCOL_TEST(SimpleInputParams, QueryEnums) { expectedRq.headers = {{"Content-Type", R"(application/x-www-form-urlencoded)"}}; expectedRq.requireHeaders = {"Content-Length"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(SimpleInputParams, QueryIntEnums) { @@ -162,8 +155,6 @@ AWS_PROTOCOL_TEST(SimpleInputParams, QueryIntEnums) { request.SetIntegerEnum(1); auto outcome = client.SimpleInputParams(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "QWN0aW9uPVNpbXBsZUlucHV0UGFyYW1zJlZlcnNpb249MjAyMC0wMS0wOCZJbnRlZ2VyRW51bT0x"; @@ -171,6 +162,7 @@ AWS_PROTOCOL_TEST(SimpleInputParams, QueryIntEnums) { expectedRq.headers = {{"Content-Type", R"(application/x-www-form-urlencoded)"}}; expectedRq.requireHeaders = {"Content-Length"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(SimpleInputParams, AwsQuerySupportsNaNFloatInputs) { @@ -183,8 +175,6 @@ AWS_PROTOCOL_TEST(SimpleInputParams, AwsQuerySupportsNaNFloatInputs) { request.SetBoo(std::numeric_limits::quiet_NaN()); auto outcome = client.SimpleInputParams(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "QWN0aW9uPVNpbXBsZUlucHV0UGFyYW1zJlZlcnNpb249MjAyMC0wMS0wOCZGbG9hdFZhbHVlPU5hTiZCb289TmFO"; @@ -192,6 +182,7 @@ AWS_PROTOCOL_TEST(SimpleInputParams, AwsQuerySupportsNaNFloatInputs) { expectedRq.headers = {{"Content-Type", R"(application/x-www-form-urlencoded)"}}; expectedRq.requireHeaders = {"Content-Length"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(SimpleInputParams, AwsQuerySupportsInfinityFloatInputs) { @@ -204,8 +195,6 @@ AWS_PROTOCOL_TEST(SimpleInputParams, AwsQuerySupportsInfinityFloatInputs) { request.SetBoo(std::numeric_limits::infinity()); auto outcome = client.SimpleInputParams(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "QWN0aW9uPVNpbXBsZUlucHV0UGFyYW1zJlZlcnNpb249MjAyMC0wMS0wOCZGbG9hdFZhbHVlPUluZmluaXR5JkJvbz1JbmZpbml0eQ=="; @@ -213,6 +202,7 @@ AWS_PROTOCOL_TEST(SimpleInputParams, AwsQuerySupportsInfinityFloatInputs) { expectedRq.headers = {{"Content-Type", R"(application/x-www-form-urlencoded)"}}; expectedRq.requireHeaders = {"Content-Length"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(SimpleInputParams, AwsQuerySupportsNegativeInfinityFloatInputs) { @@ -225,8 +215,6 @@ AWS_PROTOCOL_TEST(SimpleInputParams, AwsQuerySupportsNegativeInfinityFloatInputs request.SetBoo(-std::numeric_limits::infinity()); auto outcome = client.SimpleInputParams(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "QWN0aW9uPVNpbXBsZUlucHV0UGFyYW1zJlZlcnNpb249MjAyMC0wMS0wOCZGbG9hdFZhbHVlPS1JbmZpbml0eSZCb289LUluZmluaXR5"; @@ -234,4 +222,5 @@ AWS_PROTOCOL_TEST(SimpleInputParams, AwsQuerySupportsNegativeInfinityFloatInputs expectedRq.headers = {{"Content-Type", R"(application/x-www-form-urlencoded)"}}; expectedRq.requireHeaders = {"Content-Length"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-json/tests/AllQueryStringTypesTest.cpp b/generated/protocol-tests/tests/input/rest-json/tests/AllQueryStringTypesTest.cpp index 377f04251c9..faac33e8a0f 100644 --- a/generated/protocol-tests/tests/input/rest-json/tests/AllQueryStringTypesTest.cpp +++ b/generated/protocol-tests/tests/input/rest-json/tests/AllQueryStringTypesTest.cpp @@ -40,12 +40,11 @@ AWS_PROTOCOL_TEST(AllQueryStringTypes, RestJsonAllQueryStringTypes) { request.SetQueryParamsMapOfStringList({{"String", {R"(Hello there)"}}, {"StringList", {R"(a)", R"(b)", R"(c)"}}, {"StringSet", {R"(a)", R"(b)", R"(c)"}}, {"Byte", {R"(1)"}}, {"Short", {R"(2)"}}, {"Integer", {R"(3)"}}, {"IntegerList", {R"(1)", R"(2)", R"(3)"}}, {"IntegerSet", {R"(1)", R"(2)", R"(3)"}}, {"Long", {R"(4)"}}, {"Float", {R"(1.1)"}}, {"Double", {R"(1.1)"}}, {"DoubleList", {R"(1.1)", R"(2.1)", R"(3.1)"}}, {"Boolean", {R"(true)"}}, {"BooleanList", {R"(true)", R"(false)", R"(true)"}}, {"Timestamp", {R"(1970-01-01T00:00:01Z)"}}, {"TimestampList", {R"(1970-01-01T00:00:01Z)", R"(1970-01-01T00:00:02Z)", R"(1970-01-01T00:00:03Z)"}}, {"Enum", {R"(Foo)"}}, {"EnumList", {R"(Foo)", R"(Baz)", R"(Bar)"}}, {"IntegerEnum", {R"(1)"}}, {"IntegerEnumList", {R"(1)", R"(2)", R"(3)"}}}); auto outcome = client.AllQueryStringTypes(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "GET"; expectedRq.uri = "/AllQueryStringTypesInput?String=Hello%20there&StringList=a&StringList=b&StringList=c&StringSet=a&StringSet=b&StringSet=c&Byte=1&Short=2&Integer=3&IntegerList=1&IntegerList=2&IntegerList=3&IntegerSet=1&IntegerSet=2&IntegerSet=3&Long=4&Float=1.1&Double=1.1&DoubleList=1.1&DoubleList=2.1&DoubleList=3.1&Boolean=true&BooleanList=true&BooleanList=false&BooleanList=true&Timestamp=1970-01-01T00%3A00%3A01Z&TimestampList=1970-01-01T00%3A00%3A01Z&TimestampList=1970-01-01T00%3A00%3A02Z&TimestampList=1970-01-01T00%3A00%3A03Z&Enum=Foo&EnumList=Foo&EnumList=Baz&EnumList=Bar&IntegerEnum=1&IntegerEnumList=1&IntegerEnumList=2&IntegerEnumList=3"; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(AllQueryStringTypes, RestJsonQueryStringMap) { @@ -57,12 +56,11 @@ AWS_PROTOCOL_TEST(AllQueryStringTypes, RestJsonQueryStringMap) { request.SetQueryParamsMapOfStringList({{"QueryParamsStringKeyA", {R"(Foo)"}}, {"QueryParamsStringKeyB", {R"(Bar)"}}}); auto outcome = client.AllQueryStringTypes(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "GET"; expectedRq.uri = "/AllQueryStringTypesInput?QueryParamsStringKeyA=Foo&QueryParamsStringKeyB=Bar"; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(AllQueryStringTypes, RestJsonQueryStringEscaping) { @@ -75,12 +73,11 @@ AWS_PROTOCOL_TEST(AllQueryStringTypes, RestJsonQueryStringEscaping) { request.SetQueryParamsMapOfStringList({{"String", {R"( %:/?#[]@!$&'()*+,;=😹)"}}}); auto outcome = client.AllQueryStringTypes(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "GET"; expectedRq.uri = "/AllQueryStringTypesInput?String=%20%25%3A%2F%3F%23%5B%5D%40%21%24%26%27%28%29%2A%2B%2C%3B%3D%F0%9F%98%B9"; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(AllQueryStringTypes, RestJsonSupportsNaNFloatQueryValues) { @@ -94,12 +91,11 @@ AWS_PROTOCOL_TEST(AllQueryStringTypes, RestJsonSupportsNaNFloatQueryValues) { request.SetQueryParamsMapOfStringList({{"Float", {R"(NaN)"}}, {"Double", {R"(NaN)"}}}); auto outcome = client.AllQueryStringTypes(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "GET"; expectedRq.uri = "/AllQueryStringTypesInput?Float=NaN&Double=NaN"; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(AllQueryStringTypes, RestJsonSupportsInfinityFloatQueryValues) { @@ -113,12 +109,11 @@ AWS_PROTOCOL_TEST(AllQueryStringTypes, RestJsonSupportsInfinityFloatQueryValues) request.SetQueryParamsMapOfStringList({{"Float", {R"(Infinity)"}}, {"Double", {R"(Infinity)"}}}); auto outcome = client.AllQueryStringTypes(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "GET"; expectedRq.uri = "/AllQueryStringTypesInput?Float=Infinity&Double=Infinity"; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(AllQueryStringTypes, RestJsonSupportsNegativeInfinityFloatQueryValues) { @@ -132,12 +127,11 @@ AWS_PROTOCOL_TEST(AllQueryStringTypes, RestJsonSupportsNegativeInfinityFloatQuer request.SetQueryParamsMapOfStringList({{"Float", {R"(-Infinity)"}}, {"Double", {R"(-Infinity)"}}}); auto outcome = client.AllQueryStringTypes(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "GET"; expectedRq.uri = "/AllQueryStringTypesInput?Float=-Infinity&Double=-Infinity"; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(AllQueryStringTypes, RestJsonZeroAndFalseQueryValues) { @@ -151,10 +145,9 @@ AWS_PROTOCOL_TEST(AllQueryStringTypes, RestJsonZeroAndFalseQueryValues) { request.SetQueryParamsMapOfStringList({{"Integer", {R"(0)"}}, {"Boolean", {R"(false)"}}}); auto outcome = client.AllQueryStringTypes(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "GET"; expectedRq.uri = "/AllQueryStringTypesInput?Integer=0&Boolean=false"; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-json/tests/ConstantAndVariableQueryStringTest.cpp b/generated/protocol-tests/tests/input/rest-json/tests/ConstantAndVariableQueryStringTest.cpp index 4969447a4f2..d49e7746b4f 100644 --- a/generated/protocol-tests/tests/input/rest-json/tests/ConstantAndVariableQueryStringTest.cpp +++ b/generated/protocol-tests/tests/input/rest-json/tests/ConstantAndVariableQueryStringTest.cpp @@ -20,12 +20,11 @@ AWS_PROTOCOL_TEST(ConstantAndVariableQueryString, RestJsonConstantAndVariableQue request.SetBaz(R"(bam)"); auto outcome = client.ConstantAndVariableQueryString(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "GET"; expectedRq.uri = "/ConstantAndVariableQueryString?foo=bar&baz=bam"; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(ConstantAndVariableQueryString, RestJsonConstantAndVariableQueryStringAllValues) { @@ -38,10 +37,9 @@ AWS_PROTOCOL_TEST(ConstantAndVariableQueryString, RestJsonConstantAndVariableQue request.SetMaybeSet(R"(yes)"); auto outcome = client.ConstantAndVariableQueryString(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "GET"; expectedRq.uri = "/ConstantAndVariableQueryString?foo=bar&baz=bam&maybeSet=yes"; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-json/tests/ConstantQueryStringTest.cpp b/generated/protocol-tests/tests/input/rest-json/tests/ConstantQueryStringTest.cpp index a94c85ff4ad..0e81a0b6234 100644 --- a/generated/protocol-tests/tests/input/rest-json/tests/ConstantQueryStringTest.cpp +++ b/generated/protocol-tests/tests/input/rest-json/tests/ConstantQueryStringTest.cpp @@ -20,10 +20,9 @@ AWS_PROTOCOL_TEST(ConstantQueryString, RestJsonConstantQueryString) { request.SetHello(R"(hi)"); auto outcome = client.ConstantQueryString(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "GET"; expectedRq.uri = "/ConstantQueryString/hi?foo=bar&hello"; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-json/tests/DocumentTypeAsMapValueTest.cpp b/generated/protocol-tests/tests/input/rest-json/tests/DocumentTypeAsMapValueTest.cpp index 34180c24629..0d5782e2ae0 100644 --- a/generated/protocol-tests/tests/input/rest-json/tests/DocumentTypeAsMapValueTest.cpp +++ b/generated/protocol-tests/tests/input/rest-json/tests/DocumentTypeAsMapValueTest.cpp @@ -31,12 +31,11 @@ AWS_PROTOCOL_TEST(DocumentTypeAsMapValue, DocumentTypeAsMapValueInput) { } auto outcome = client.DocumentTypeAsMapValue(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "PUT"; expectedRq.body = "ewogICAgImRvY1ZhbHVlZE1hcCI6IHsKICAgICAgICAiZm9vIjogeyAiZiI6IDEsICJvIjogMiB9LAogICAgICAgICJiYXIiOiBbICJiIiwgImEiLCAiciIgXSwKICAgICAgICAiYmF6IjogIkJBWiIKICAgIH0KfQ=="; expectedRq.uri = "/DocumentTypeAsMapValue"; expectedRq.headers = {{"Content-Type", R"(application/json)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-json/tests/DocumentTypeAsPayloadTest.cpp b/generated/protocol-tests/tests/input/rest-json/tests/DocumentTypeAsPayloadTest.cpp index 1445e390278..bfcc73fc9c0 100644 --- a/generated/protocol-tests/tests/input/rest-json/tests/DocumentTypeAsPayloadTest.cpp +++ b/generated/protocol-tests/tests/input/rest-json/tests/DocumentTypeAsPayloadTest.cpp @@ -23,14 +23,13 @@ AWS_PROTOCOL_TEST(DocumentTypeAsPayload, DocumentTypeAsPayloadInput) { } auto outcome = client.DocumentTypeAsPayload(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "PUT"; expectedRq.body = "ewogICAgImZvbyI6ICJiYXIiCn0="; expectedRq.uri = "/DocumentTypeAsPayload"; expectedRq.headers = {{"Content-Type", R"(application/json)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(DocumentTypeAsPayload, DocumentTypeAsPayloadInputString) { @@ -45,12 +44,11 @@ AWS_PROTOCOL_TEST(DocumentTypeAsPayload, DocumentTypeAsPayloadInputString) { } auto outcome = client.DocumentTypeAsPayload(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "PUT"; expectedRq.body = "ImhlbGxvIg=="; expectedRq.uri = "/DocumentTypeAsPayload"; expectedRq.headers = {{"Content-Type", R"(application/json)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-json/tests/DocumentTypeTest.cpp b/generated/protocol-tests/tests/input/rest-json/tests/DocumentTypeTest.cpp index 8f537ebb0a5..df9aa535100 100644 --- a/generated/protocol-tests/tests/input/rest-json/tests/DocumentTypeTest.cpp +++ b/generated/protocol-tests/tests/input/rest-json/tests/DocumentTypeTest.cpp @@ -24,14 +24,13 @@ AWS_PROTOCOL_TEST(DocumentType, DocumentTypeInputWithObject) { } auto outcome = client.DocumentType(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "PUT"; expectedRq.body = "ewogICAgInN0cmluZ1ZhbHVlIjogInN0cmluZyIsCiAgICAiZG9jdW1lbnRWYWx1ZSI6IHsKICAgICAgICAiZm9vIjogImJhciIKICAgIH0KfQ=="; expectedRq.uri = "/DocumentType"; expectedRq.headers = {{"Content-Type", R"(application/json)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(DocumentType, DocumentInputWithString) { @@ -47,14 +46,13 @@ AWS_PROTOCOL_TEST(DocumentType, DocumentInputWithString) { } auto outcome = client.DocumentType(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "PUT"; expectedRq.body = "ewogICAgInN0cmluZ1ZhbHVlIjogInN0cmluZyIsCiAgICAiZG9jdW1lbnRWYWx1ZSI6ICJoZWxsbyIKfQ=="; expectedRq.uri = "/DocumentType"; expectedRq.headers = {{"Content-Type", R"(application/json)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(DocumentType, DocumentInputWithNumber) { @@ -70,14 +68,13 @@ AWS_PROTOCOL_TEST(DocumentType, DocumentInputWithNumber) { } auto outcome = client.DocumentType(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "PUT"; expectedRq.body = "ewogICAgInN0cmluZ1ZhbHVlIjogInN0cmluZyIsCiAgICAiZG9jdW1lbnRWYWx1ZSI6IDEwCn0="; expectedRq.uri = "/DocumentType"; expectedRq.headers = {{"Content-Type", R"(application/json)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(DocumentType, DocumentInputWithBoolean) { @@ -93,14 +90,13 @@ AWS_PROTOCOL_TEST(DocumentType, DocumentInputWithBoolean) { } auto outcome = client.DocumentType(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "PUT"; expectedRq.body = "ewogICAgInN0cmluZ1ZhbHVlIjogInN0cmluZyIsCiAgICAiZG9jdW1lbnRWYWx1ZSI6IHRydWUKfQ=="; expectedRq.uri = "/DocumentType"; expectedRq.headers = {{"Content-Type", R"(application/json)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(DocumentType, DocumentInputWithList) { @@ -116,12 +112,11 @@ AWS_PROTOCOL_TEST(DocumentType, DocumentInputWithList) { } auto outcome = client.DocumentType(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "PUT"; expectedRq.body = "ewogICAgInN0cmluZ1ZhbHVlIjogInN0cmluZyIsCiAgICAiZG9jdW1lbnRWYWx1ZSI6IFsKICAgICAgICB0cnVlLAogICAgICAgICJoaSIsCiAgICAgICAgWwogICAgICAgICAgICAxLAogICAgICAgICAgICAyCiAgICAgICAgXSwKICAgICAgICB7CiAgICAgICAgICAgICJmb28iOiB7CiAgICAgICAgICAgICAgICAiYmF6IjogWwogICAgICAgICAgICAgICAgICAgIDMsCiAgICAgICAgICAgICAgICAgICAgNAogICAgICAgICAgICAgICAgXQogICAgICAgICAgICB9CiAgICAgICAgfQogICAgXQp9"; expectedRq.uri = "/DocumentType"; expectedRq.headers = {{"Content-Type", R"(application/json)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-json/tests/EmptyInputAndEmptyOutputTest.cpp b/generated/protocol-tests/tests/input/rest-json/tests/EmptyInputAndEmptyOutputTest.cpp index 7a8cdad4d03..8a2d01e84e1 100644 --- a/generated/protocol-tests/tests/input/rest-json/tests/EmptyInputAndEmptyOutputTest.cpp +++ b/generated/protocol-tests/tests/input/rest-json/tests/EmptyInputAndEmptyOutputTest.cpp @@ -19,10 +19,9 @@ AWS_PROTOCOL_TEST(EmptyInputAndEmptyOutput, RestJsonEmptyInputAndEmptyOutput) { EmptyInputAndEmptyOutputRequest request; auto outcome = client.EmptyInputAndEmptyOutput(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.uri = "/EmptyInputAndEmptyOutput"; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-json/tests/EndpointOperationTest.cpp b/generated/protocol-tests/tests/input/rest-json/tests/EndpointOperationTest.cpp index 2ced3e1f219..34a23bf8da5 100644 --- a/generated/protocol-tests/tests/input/rest-json/tests/EndpointOperationTest.cpp +++ b/generated/protocol-tests/tests/input/rest-json/tests/EndpointOperationTest.cpp @@ -19,11 +19,10 @@ AWS_PROTOCOL_TEST(EndpointOperation, RestJsonEndpointTrait) { EndpointOperationRequest request; auto outcome = client.EndpointOperation(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.uri = "/EndpointOperation"; expectedRq.host = "foo.example.com"; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-json/tests/EndpointWithHostLabelOperationTest.cpp b/generated/protocol-tests/tests/input/rest-json/tests/EndpointWithHostLabelOperationTest.cpp index ec85d7682a5..49bb690a25f 100644 --- a/generated/protocol-tests/tests/input/rest-json/tests/EndpointWithHostLabelOperationTest.cpp +++ b/generated/protocol-tests/tests/input/rest-json/tests/EndpointWithHostLabelOperationTest.cpp @@ -20,12 +20,11 @@ AWS_PROTOCOL_TEST(EndpointWithHostLabelOperation, RestJsonEndpointTraitWithHostL request.SetLabel(R"(bar)"); auto outcome = client.EndpointWithHostLabelOperation(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "eyJsYWJlbCI6ICJiYXIifQ=="; expectedRq.uri = "/EndpointWithHostLabelOperation"; expectedRq.host = "foo.bar.example.com"; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-json/tests/HostWithPathOperationTest.cpp b/generated/protocol-tests/tests/input/rest-json/tests/HostWithPathOperationTest.cpp index 0e751d3ba59..b750ccab28a 100644 --- a/generated/protocol-tests/tests/input/rest-json/tests/HostWithPathOperationTest.cpp +++ b/generated/protocol-tests/tests/input/rest-json/tests/HostWithPathOperationTest.cpp @@ -19,11 +19,10 @@ AWS_PROTOCOL_TEST(HostWithPathOperation, RestJsonHostWithPath) { HostWithPathOperationRequest request; auto outcome = client.HostWithPathOperation(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "GET"; expectedRq.uri = "/custom/HostWithPathOperation"; expectedRq.host = "example.com/custom"; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-json/tests/HttpChecksumRequiredTest.cpp b/generated/protocol-tests/tests/input/rest-json/tests/HttpChecksumRequiredTest.cpp index 6588402eb5b..b6bd34c9bf6 100644 --- a/generated/protocol-tests/tests/input/rest-json/tests/HttpChecksumRequiredTest.cpp +++ b/generated/protocol-tests/tests/input/rest-json/tests/HttpChecksumRequiredTest.cpp @@ -20,12 +20,11 @@ AWS_PROTOCOL_TEST(HttpChecksumRequired, RestJsonHttpChecksumRequired) { request.SetFoo(R"(base64 encoded md5 checksum)"); auto outcome = client.HttpChecksumRequired(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "ewogICAgImZvbyI6ImJhc2U2NCBlbmNvZGVkIG1kNSBjaGVja3N1bSIKfQo="; expectedRq.uri = "/HttpChecksumRequired"; expectedRq.headers = {{"Content-MD5", R"(iB0/3YSo7maijL0IGOgA9g==)"}, {"Content-Type", R"(application/json)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-json/tests/HttpEnumPayloadTest.cpp b/generated/protocol-tests/tests/input/rest-json/tests/HttpEnumPayloadTest.cpp index 1e4d503c99b..24ef52f7480 100644 --- a/generated/protocol-tests/tests/input/rest-json/tests/HttpEnumPayloadTest.cpp +++ b/generated/protocol-tests/tests/input/rest-json/tests/HttpEnumPayloadTest.cpp @@ -20,12 +20,11 @@ AWS_PROTOCOL_TEST(HttpEnumPayload, RestJsonEnumPayloadRequest) { request.SetPayload(StringEnumMapper::GetStringEnumForName(R"e(enumvalue)e")); auto outcome = client.HttpEnumPayload(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "ZW51bXZhbHVl"; expectedRq.uri = "/EnumPayload"; expectedRq.headers = {{"Content-Type", R"(text/plain)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-json/tests/HttpPayloadTraitsTest.cpp b/generated/protocol-tests/tests/input/rest-json/tests/HttpPayloadTraitsTest.cpp index 47df49882a1..2ed20caa27d 100644 --- a/generated/protocol-tests/tests/input/rest-json/tests/HttpPayloadTraitsTest.cpp +++ b/generated/protocol-tests/tests/input/rest-json/tests/HttpPayloadTraitsTest.cpp @@ -21,8 +21,6 @@ AWS_PROTOCOL_TEST(HttpPayloadTraits, RestJsonHttpPayloadTraitsWithBlob) { request.SetBody([](){ return Aws::MakeShared("Test", Aws::String(R"(blobby blob blob)"), std::ios_base::in | std::ios_base::binary); }() ); auto outcome = client.HttpPayloadTraits(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "YmxvYmJ5IGJsb2IgYmxvYg=="; @@ -30,6 +28,7 @@ AWS_PROTOCOL_TEST(HttpPayloadTraits, RestJsonHttpPayloadTraitsWithBlob) { expectedRq.headers = {{"Content-Type", R"(application/octet-stream)"}, {"X-Foo", R"(Foo)"}}; expectedRq.requireHeaders = {"Content-Length"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(HttpPayloadTraits, RestJsonHttpPayloadTraitsWithNoBlobBody) { @@ -41,11 +40,10 @@ AWS_PROTOCOL_TEST(HttpPayloadTraits, RestJsonHttpPayloadTraitsWithNoBlobBody) { request.SetFoo(R"(Foo)"); auto outcome = client.HttpPayloadTraits(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.uri = "/HttpPayloadTraits"; expectedRq.headers = {{"X-Foo", R"(Foo)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-json/tests/HttpPayloadWithStructureTest.cpp b/generated/protocol-tests/tests/input/rest-json/tests/HttpPayloadWithStructureTest.cpp index e81401d7261..b6ad079f1c4 100644 --- a/generated/protocol-tests/tests/input/rest-json/tests/HttpPayloadWithStructureTest.cpp +++ b/generated/protocol-tests/tests/input/rest-json/tests/HttpPayloadWithStructureTest.cpp @@ -25,8 +25,6 @@ AWS_PROTOCOL_TEST(HttpPayloadWithStructure, RestJsonHttpPayloadWithStructure) { } auto outcome = client.HttpPayloadWithStructure(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "PUT"; expectedRq.body = "ewogICAgImdyZWV0aW5nIjogImhlbGxvIiwKICAgICJuYW1lIjogIlBocmVkZHkiCn0="; @@ -34,4 +32,5 @@ AWS_PROTOCOL_TEST(HttpPayloadWithStructure, RestJsonHttpPayloadWithStructure) { expectedRq.headers = {{"Content-Type", R"(application/json)"}}; expectedRq.requireHeaders = {"Content-Length"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-json/tests/HttpPayloadWithUnionTest.cpp b/generated/protocol-tests/tests/input/rest-json/tests/HttpPayloadWithUnionTest.cpp index 3477ce20943..5e338eed58c 100644 --- a/generated/protocol-tests/tests/input/rest-json/tests/HttpPayloadWithUnionTest.cpp +++ b/generated/protocol-tests/tests/input/rest-json/tests/HttpPayloadWithUnionTest.cpp @@ -24,8 +24,6 @@ AWS_PROTOCOL_TEST(HttpPayloadWithUnion, RestJsonHttpPayloadWithUnion) { } auto outcome = client.HttpPayloadWithUnion(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "PUT"; expectedRq.body = "ewogICAgImdyZWV0aW5nIjogImhlbGxvIgp9"; @@ -33,6 +31,7 @@ AWS_PROTOCOL_TEST(HttpPayloadWithUnion, RestJsonHttpPayloadWithUnion) { expectedRq.headers = {{"Content-Type", R"(application/json)"}}; expectedRq.requireHeaders = {"Content-Length"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(HttpPayloadWithUnion, RestJsonHttpPayloadWithUnsetUnion) { @@ -43,10 +42,9 @@ AWS_PROTOCOL_TEST(HttpPayloadWithUnion, RestJsonHttpPayloadWithUnsetUnion) { HttpPayloadWithUnionRequest request; auto outcome = client.HttpPayloadWithUnion(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "PUT"; expectedRq.uri = "/HttpPayloadWithUnion"; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-json/tests/HttpPrefixHeadersTest.cpp b/generated/protocol-tests/tests/input/rest-json/tests/HttpPrefixHeadersTest.cpp index 506556a818f..e3cfa5e6a4e 100644 --- a/generated/protocol-tests/tests/input/rest-json/tests/HttpPrefixHeadersTest.cpp +++ b/generated/protocol-tests/tests/input/rest-json/tests/HttpPrefixHeadersTest.cpp @@ -21,13 +21,12 @@ AWS_PROTOCOL_TEST(HttpPrefixHeaders, RestJsonHttpPrefixHeadersArePresent) { request.SetFooMap({{"abc", R"(Abc value)"}, {"def", R"(Def value)"}}); auto outcome = client.HttpPrefixHeaders(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "GET"; expectedRq.uri = "/HttpPrefixHeaders"; expectedRq.headers = {{"x-foo", R"(Foo)"}, {"x-foo-abc", R"(Abc value)"}, {"x-foo-def", R"(Def value)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(HttpPrefixHeaders, RestJsonHttpPrefixHeadersAreNotPresent) { @@ -40,13 +39,12 @@ AWS_PROTOCOL_TEST(HttpPrefixHeaders, RestJsonHttpPrefixHeadersAreNotPresent) { request.SetFooMap({}); auto outcome = client.HttpPrefixHeaders(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "GET"; expectedRq.uri = "/HttpPrefixHeaders"; expectedRq.headers = {{"x-foo", R"(Foo)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(HttpPrefixHeaders, RestJsonHttpPrefixEmptyHeaders) { @@ -58,11 +56,10 @@ AWS_PROTOCOL_TEST(HttpPrefixHeaders, RestJsonHttpPrefixEmptyHeaders) { request.SetFooMap({{"abc", R"()"}}); auto outcome = client.HttpPrefixHeaders(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "GET"; expectedRq.uri = "/HttpPrefixHeaders"; expectedRq.headers = {{"x-foo-abc", R"()"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-json/tests/HttpRequestWithFloatLabelsTest.cpp b/generated/protocol-tests/tests/input/rest-json/tests/HttpRequestWithFloatLabelsTest.cpp index 5237203eba4..418f7239e25 100644 --- a/generated/protocol-tests/tests/input/rest-json/tests/HttpRequestWithFloatLabelsTest.cpp +++ b/generated/protocol-tests/tests/input/rest-json/tests/HttpRequestWithFloatLabelsTest.cpp @@ -21,12 +21,11 @@ AWS_PROTOCOL_TEST(HttpRequestWithFloatLabels, RestJsonSupportsNaNFloatLabels) { request.SetDouble(std::numeric_limits::quiet_NaN()); auto outcome = client.HttpRequestWithFloatLabels(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "GET"; expectedRq.uri = "/FloatHttpLabels/NaN/NaN"; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(HttpRequestWithFloatLabels, RestJsonSupportsInfinityFloatLabels) { @@ -39,12 +38,11 @@ AWS_PROTOCOL_TEST(HttpRequestWithFloatLabels, RestJsonSupportsInfinityFloatLabel request.SetDouble(std::numeric_limits::infinity()); auto outcome = client.HttpRequestWithFloatLabels(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "GET"; expectedRq.uri = "/FloatHttpLabels/Infinity/Infinity"; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(HttpRequestWithFloatLabels, RestJsonSupportsNegativeInfinityFloatLabels) { @@ -57,10 +55,9 @@ AWS_PROTOCOL_TEST(HttpRequestWithFloatLabels, RestJsonSupportsNegativeInfinityFl request.SetDouble(-std::numeric_limits::infinity()); auto outcome = client.HttpRequestWithFloatLabels(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "GET"; expectedRq.uri = "/FloatHttpLabels/-Infinity/-Infinity"; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-json/tests/HttpRequestWithGreedyLabelInPathTest.cpp b/generated/protocol-tests/tests/input/rest-json/tests/HttpRequestWithGreedyLabelInPathTest.cpp index d8a1a336ea3..c8e9292711d 100644 --- a/generated/protocol-tests/tests/input/rest-json/tests/HttpRequestWithGreedyLabelInPathTest.cpp +++ b/generated/protocol-tests/tests/input/rest-json/tests/HttpRequestWithGreedyLabelInPathTest.cpp @@ -21,10 +21,9 @@ AWS_PROTOCOL_TEST(HttpRequestWithGreedyLabelInPath, RestJsonHttpRequestWithGreed request.SetBaz(R"(there/guy)"); auto outcome = client.HttpRequestWithGreedyLabelInPath(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "GET"; expectedRq.uri = "/HttpRequestWithGreedyLabelInPath/foo/hello%2Fescape/baz/there/guy"; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-json/tests/HttpRequestWithLabelsAndTimestampFormatTest.cpp b/generated/protocol-tests/tests/input/rest-json/tests/HttpRequestWithLabelsAndTimestampFormatTest.cpp index 41d2fbb4ad3..d0abe09bbba 100644 --- a/generated/protocol-tests/tests/input/rest-json/tests/HttpRequestWithLabelsAndTimestampFormatTest.cpp +++ b/generated/protocol-tests/tests/input/rest-json/tests/HttpRequestWithLabelsAndTimestampFormatTest.cpp @@ -26,10 +26,9 @@ AWS_PROTOCOL_TEST(HttpRequestWithLabelsAndTimestampFormat, RestJsonHttpRequestWi request.SetTargetDateTime(Aws::Utils::DateTime(1576540098L)); auto outcome = client.HttpRequestWithLabelsAndTimestampFormat(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "GET"; expectedRq.uri = "/HttpRequestWithLabelsAndTimestampFormat/1576540098/Mon%2C%2016%20Dec%202019%2023%3A48%3A18%20GMT/2019-12-16T23%3A48%3A18Z/2019-12-16T23%3A48%3A18Z/1576540098/Mon%2C%2016%20Dec%202019%2023%3A48%3A18%20GMT/2019-12-16T23%3A48%3A18Z"; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-json/tests/HttpRequestWithLabelsTest.cpp b/generated/protocol-tests/tests/input/rest-json/tests/HttpRequestWithLabelsTest.cpp index 44dee05de5a..a95d0bb7505 100644 --- a/generated/protocol-tests/tests/input/rest-json/tests/HttpRequestWithLabelsTest.cpp +++ b/generated/protocol-tests/tests/input/rest-json/tests/HttpRequestWithLabelsTest.cpp @@ -27,12 +27,11 @@ AWS_PROTOCOL_TEST(HttpRequestWithLabels, RestJsonInputWithHeadersAndAllParams) { request.SetTimestamp(Aws::Utils::DateTime(1576540098L)); auto outcome = client.HttpRequestWithLabels(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "GET"; expectedRq.uri = "/HttpRequestWithLabels/string/1/2/3/4.1/5.1/true/2019-12-16T23%3A48%3A18Z"; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(HttpRequestWithLabels, RestJsonHttpRequestLabelEscaping) { @@ -51,10 +50,9 @@ AWS_PROTOCOL_TEST(HttpRequestWithLabels, RestJsonHttpRequestLabelEscaping) { request.SetTimestamp(Aws::Utils::DateTime(1576540098L)); auto outcome = client.HttpRequestWithLabels(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "GET"; expectedRq.uri = "/HttpRequestWithLabels/%20%25%3A%2F%3F%23%5B%5D%40%21%24%26%27%28%29%2A%2B%2C%3B%3D%F0%9F%98%B9/1/2/3/4.1/5.1/true/2019-12-16T23%3A48%3A18Z"; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-json/tests/HttpRequestWithRegexLiteralTest.cpp b/generated/protocol-tests/tests/input/rest-json/tests/HttpRequestWithRegexLiteralTest.cpp index 17afdf80d37..82165ff1578 100644 --- a/generated/protocol-tests/tests/input/rest-json/tests/HttpRequestWithRegexLiteralTest.cpp +++ b/generated/protocol-tests/tests/input/rest-json/tests/HttpRequestWithRegexLiteralTest.cpp @@ -20,10 +20,9 @@ AWS_PROTOCOL_TEST(HttpRequestWithRegexLiteral, RestJsonToleratesRegexCharsInSegm request.SetStr(R"(abc)"); auto outcome = client.HttpRequestWithRegexLiteral(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "GET"; expectedRq.uri = "/ReDosLiteral/abc/(a+)+"; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-json/tests/HttpStringPayloadTest.cpp b/generated/protocol-tests/tests/input/rest-json/tests/HttpStringPayloadTest.cpp index 966f4deae66..27e91ebcfe6 100644 --- a/generated/protocol-tests/tests/input/rest-json/tests/HttpStringPayloadTest.cpp +++ b/generated/protocol-tests/tests/input/rest-json/tests/HttpStringPayloadTest.cpp @@ -20,8 +20,6 @@ AWS_PROTOCOL_TEST(HttpStringPayload, RestJsonStringPayloadRequest) { request.SetBody([](){ return Aws::MakeShared("Test", R"(rawstring)", std::ios_base::in | std::ios_base::binary); }() ); auto outcome = client.HttpStringPayload(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "cmF3c3RyaW5n"; @@ -29,4 +27,5 @@ AWS_PROTOCOL_TEST(HttpStringPayload, RestJsonStringPayloadRequest) { expectedRq.headers = {{"Content-Type", R"(text/plain)"}}; expectedRq.requireHeaders = {"Content-Length"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-json/tests/InputAndOutputWithHeadersTest.cpp b/generated/protocol-tests/tests/input/rest-json/tests/InputAndOutputWithHeadersTest.cpp index ca40491fb73..974e86af335 100644 --- a/generated/protocol-tests/tests/input/rest-json/tests/InputAndOutputWithHeadersTest.cpp +++ b/generated/protocol-tests/tests/input/rest-json/tests/InputAndOutputWithHeadersTest.cpp @@ -22,13 +22,12 @@ AWS_PROTOCOL_TEST(InputAndOutputWithHeaders, RestJsonInputAndOutputWithStringHea request.SetHeaderStringSet({R"(a)", R"(b)", R"(c)"}); auto outcome = client.InputAndOutputWithHeaders(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.uri = "/InputAndOutputWithHeaders"; expectedRq.headers = {{"X-String", R"(Hello)"}, {"X-StringList", R"(a, b, c)"}, {"X-StringSet", R"(a, b, c)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(InputAndOutputWithHeaders, RestJsonInputAndOutputWithQuotedStringHeaders) { @@ -40,13 +39,12 @@ AWS_PROTOCOL_TEST(InputAndOutputWithHeaders, RestJsonInputAndOutputWithQuotedStr request.SetHeaderStringList({R"(b,c)", R"("def")", R"(a)"}); auto outcome = client.InputAndOutputWithHeaders(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.uri = "/InputAndOutputWithHeaders"; expectedRq.headers = {{"X-StringList", R"("b,c", "\"def\"", a)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(InputAndOutputWithHeaders, RestJsonInputAndOutputWithNumericHeaders) { @@ -64,13 +62,12 @@ AWS_PROTOCOL_TEST(InputAndOutputWithHeaders, RestJsonInputAndOutputWithNumericHe request.SetHeaderIntegerList({1, 2, 3}); auto outcome = client.InputAndOutputWithHeaders(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.uri = "/InputAndOutputWithHeaders"; expectedRq.headers = {{"X-Byte", R"(1)"}, {"X-Double", R"(1.1)"}, {"X-Float", R"(1.1)"}, {"X-Integer", R"(123)"}, {"X-IntegerList", R"(1, 2, 3)"}, {"X-Long", R"(123)"}, {"X-Short", R"(123)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(InputAndOutputWithHeaders, RestJsonInputAndOutputWithBooleanHeaders) { @@ -84,13 +81,12 @@ AWS_PROTOCOL_TEST(InputAndOutputWithHeaders, RestJsonInputAndOutputWithBooleanHe request.SetHeaderBooleanList({true, false, true}); auto outcome = client.InputAndOutputWithHeaders(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.uri = "/InputAndOutputWithHeaders"; expectedRq.headers = {{"X-Boolean1", R"(true)"}, {"X-Boolean2", R"(false)"}, {"X-BooleanList", R"(true, false, true)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(InputAndOutputWithHeaders, RestJsonInputAndOutputWithTimestampHeaders) { @@ -102,13 +98,12 @@ AWS_PROTOCOL_TEST(InputAndOutputWithHeaders, RestJsonInputAndOutputWithTimestamp request.SetHeaderTimestampList({Aws::Utils::DateTime(1576540098L), Aws::Utils::DateTime(1576540098L)}); auto outcome = client.InputAndOutputWithHeaders(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.uri = "/InputAndOutputWithHeaders"; expectedRq.headers = {{"X-TimestampList", R"(Mon, 16 Dec 2019 23:48:18 GMT, Mon, 16 Dec 2019 23:48:18 GMT)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(InputAndOutputWithHeaders, RestJsonInputAndOutputWithEnumHeaders) { @@ -121,13 +116,12 @@ AWS_PROTOCOL_TEST(InputAndOutputWithHeaders, RestJsonInputAndOutputWithEnumHeade request.SetHeaderEnumList({FooEnumMapper::GetFooEnumForName(R"e(Foo)e"), FooEnumMapper::GetFooEnumForName(R"e(Bar)e"), FooEnumMapper::GetFooEnumForName(R"e(Baz)e")}); auto outcome = client.InputAndOutputWithHeaders(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.uri = "/InputAndOutputWithHeaders"; expectedRq.headers = {{"X-Enum", R"(Foo)"}, {"X-EnumList", R"(Foo, Bar, Baz)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(InputAndOutputWithHeaders, RestJsonInputAndOutputWithIntEnumHeaders) { @@ -140,13 +134,12 @@ AWS_PROTOCOL_TEST(InputAndOutputWithHeaders, RestJsonInputAndOutputWithIntEnumHe request.SetHeaderIntegerEnumList({1, 2, 3}); auto outcome = client.InputAndOutputWithHeaders(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.uri = "/InputAndOutputWithHeaders"; expectedRq.headers = {{"X-IntegerEnum", R"(1)"}, {"X-IntegerEnumList", R"(1, 2, 3)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(InputAndOutputWithHeaders, RestJsonSupportsNaNFloatHeaderInputs) { @@ -159,13 +152,12 @@ AWS_PROTOCOL_TEST(InputAndOutputWithHeaders, RestJsonSupportsNaNFloatHeaderInput request.SetHeaderDouble(std::numeric_limits::quiet_NaN()); auto outcome = client.InputAndOutputWithHeaders(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.uri = "/InputAndOutputWithHeaders"; expectedRq.headers = {{"X-Double", R"(NaN)"}, {"X-Float", R"(NaN)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(InputAndOutputWithHeaders, RestJsonSupportsInfinityFloatHeaderInputs) { @@ -178,13 +170,12 @@ AWS_PROTOCOL_TEST(InputAndOutputWithHeaders, RestJsonSupportsInfinityFloatHeader request.SetHeaderDouble(std::numeric_limits::infinity()); auto outcome = client.InputAndOutputWithHeaders(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.uri = "/InputAndOutputWithHeaders"; expectedRq.headers = {{"X-Double", R"(Infinity)"}, {"X-Float", R"(Infinity)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(InputAndOutputWithHeaders, RestJsonSupportsNegativeInfinityFloatHeaderInputs) { @@ -197,11 +188,10 @@ AWS_PROTOCOL_TEST(InputAndOutputWithHeaders, RestJsonSupportsNegativeInfinityFlo request.SetHeaderDouble(-std::numeric_limits::infinity()); auto outcome = client.InputAndOutputWithHeaders(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.uri = "/InputAndOutputWithHeaders"; expectedRq.headers = {{"X-Double", R"(-Infinity)"}, {"X-Float", R"(-Infinity)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-json/tests/JsonBlobsTest.cpp b/generated/protocol-tests/tests/input/rest-json/tests/JsonBlobsTest.cpp index 7ea2c016491..fd5bfa33d8f 100644 --- a/generated/protocol-tests/tests/input/rest-json/tests/JsonBlobsTest.cpp +++ b/generated/protocol-tests/tests/input/rest-json/tests/JsonBlobsTest.cpp @@ -20,12 +20,11 @@ AWS_PROTOCOL_TEST(JsonBlobs, RestJsonJsonBlobs) { request.SetData(Aws::String(R"(value)")); auto outcome = client.JsonBlobs(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "ewogICAgImRhdGEiOiAiZG1Gc2RXVT0iCn0="; expectedRq.uri = "/JsonBlobs"; expectedRq.headers = {{"Content-Type", R"(application/json)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-json/tests/JsonEnumsTest.cpp b/generated/protocol-tests/tests/input/rest-json/tests/JsonEnumsTest.cpp index 7a43bff62b1..3f3de7f63ce 100644 --- a/generated/protocol-tests/tests/input/rest-json/tests/JsonEnumsTest.cpp +++ b/generated/protocol-tests/tests/input/rest-json/tests/JsonEnumsTest.cpp @@ -25,12 +25,11 @@ AWS_PROTOCOL_TEST(JsonEnums, RestJsonJsonEnums) { request.SetFooEnumMap({{"hi", FooEnumMapper::GetFooEnumForName(R"e(Foo)e")}, {"zero", FooEnumMapper::GetFooEnumForName(R"e(0)e")}}); auto outcome = client.JsonEnums(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "PUT"; expectedRq.body = "ewogICAgImZvb0VudW0xIjogIkZvbyIsCiAgICAiZm9vRW51bTIiOiAiMCIsCiAgICAiZm9vRW51bTMiOiAiMSIsCiAgICAiZm9vRW51bUxpc3QiOiBbCiAgICAgICAgIkZvbyIsCiAgICAgICAgIjAiCiAgICBdLAogICAgImZvb0VudW1TZXQiOiBbCiAgICAgICAgIkZvbyIsCiAgICAgICAgIjAiCiAgICBdLAogICAgImZvb0VudW1NYXAiOiB7CiAgICAgICAgImhpIjogIkZvbyIsCiAgICAgICAgInplcm8iOiAiMCIKICAgIH0KfQ=="; expectedRq.uri = "/JsonEnums"; expectedRq.headers = {{"Content-Type", R"(application/json)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-json/tests/JsonIntEnumsTest.cpp b/generated/protocol-tests/tests/input/rest-json/tests/JsonIntEnumsTest.cpp index ca9170e7cc8..d0074bbc2c7 100644 --- a/generated/protocol-tests/tests/input/rest-json/tests/JsonIntEnumsTest.cpp +++ b/generated/protocol-tests/tests/input/rest-json/tests/JsonIntEnumsTest.cpp @@ -25,12 +25,11 @@ AWS_PROTOCOL_TEST(JsonIntEnums, RestJsonJsonIntEnums) { request.SetIntegerEnumMap({{"abc", 1}, {"def", 2}}); auto outcome = client.JsonIntEnums(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "PUT"; expectedRq.body = "ewogICAgImludGVnZXJFbnVtMSI6IDEsCiAgICAiaW50ZWdlckVudW0yIjogMiwKICAgICJpbnRlZ2VyRW51bTMiOiAzLAogICAgImludGVnZXJFbnVtTGlzdCI6IFsKICAgICAgICAxLAogICAgICAgIDIsCiAgICAgICAgMwogICAgXSwKICAgICJpbnRlZ2VyRW51bVNldCI6IFsKICAgICAgICAxLAogICAgICAgIDIKICAgIF0sCiAgICAiaW50ZWdlckVudW1NYXAiOiB7CiAgICAgICAgImFiYyI6IDEsCiAgICAgICAgImRlZiI6IDIKICAgIH0KfQ=="; expectedRq.uri = "/JsonIntEnums"; expectedRq.headers = {{"Content-Type", R"(application/json)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-json/tests/JsonListsTest.cpp b/generated/protocol-tests/tests/input/rest-json/tests/JsonListsTest.cpp index 1ef338682f2..3e7430cb8e8 100644 --- a/generated/protocol-tests/tests/input/rest-json/tests/JsonListsTest.cpp +++ b/generated/protocol-tests/tests/input/rest-json/tests/JsonListsTest.cpp @@ -50,14 +50,13 @@ AWS_PROTOCOL_TEST(JsonLists, RestJsonLists) { } auto outcome = client.JsonLists(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "PUT"; expectedRq.body = "ewogICAgInN0cmluZ0xpc3QiOiBbCiAgICAgICAgImZvbyIsCiAgICAgICAgImJhciIKICAgIF0sCiAgICAic3RyaW5nU2V0IjogWwogICAgICAgICJmb28iLAogICAgICAgICJiYXIiCiAgICBdLAogICAgImludGVnZXJMaXN0IjogWwogICAgICAgIDEsCiAgICAgICAgMgogICAgXSwKICAgICJib29sZWFuTGlzdCI6IFsKICAgICAgICB0cnVlLAogICAgICAgIGZhbHNlCiAgICBdLAogICAgInRpbWVzdGFtcExpc3QiOiBbCiAgICAgICAgMTM5ODc5NjIzOCwKICAgICAgICAxMzk4Nzk2MjM4CiAgICBdLAogICAgImVudW1MaXN0IjogWwogICAgICAgICJGb28iLAogICAgICAgICIwIgogICAgXSwKICAgICJpbnRFbnVtTGlzdCI6IFsKICAgICAgICAxLAogICAgICAgIDIKICAgIF0sCiAgICAibmVzdGVkU3RyaW5nTGlzdCI6IFsKICAgICAgICBbCiAgICAgICAgICAgICJmb28iLAogICAgICAgICAgICAiYmFyIgogICAgICAgIF0sCiAgICAgICAgWwogICAgICAgICAgICAiYmF6IiwKICAgICAgICAgICAgInF1eCIKICAgICAgICBdCiAgICBdLAogICAgIm15U3RydWN0dXJlTGlzdCI6IFsKICAgICAgICB7CiAgICAgICAgICAgICJ2YWx1ZSI6ICIxIiwKICAgICAgICAgICAgIm90aGVyIjogIjIiCiAgICAgICAgfSwKICAgICAgICB7CiAgICAgICAgICAgICJ2YWx1ZSI6ICIzIiwKICAgICAgICAgICAgIm90aGVyIjogIjQiCiAgICAgICAgfQogICAgXQp9"; expectedRq.uri = "/JsonLists"; expectedRq.headers = {{"Content-Type", R"(application/json)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(JsonLists, RestJsonListsEmpty) { @@ -69,12 +68,11 @@ AWS_PROTOCOL_TEST(JsonLists, RestJsonListsEmpty) { request.SetStringList({}); auto outcome = client.JsonLists(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "PUT"; expectedRq.body = "ewogICAgInN0cmluZ0xpc3QiOiBbXQp9"; expectedRq.uri = "/JsonLists"; expectedRq.headers = {{"Content-Type", R"(application/json)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-json/tests/JsonMapsTest.cpp b/generated/protocol-tests/tests/input/rest-json/tests/JsonMapsTest.cpp index 33e7ddcc2bd..be48c61824e 100644 --- a/generated/protocol-tests/tests/input/rest-json/tests/JsonMapsTest.cpp +++ b/generated/protocol-tests/tests/input/rest-json/tests/JsonMapsTest.cpp @@ -29,14 +29,13 @@ AWS_PROTOCOL_TEST(JsonMaps, RestJsonJsonMaps) { } auto outcome = client.JsonMaps(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "ewogICAgImRlbnNlU3RydWN0TWFwIjogewogICAgICAgICJmb28iOiB7CiAgICAgICAgICAgICJoaSI6ICJ0aGVyZSIKICAgICAgICB9LAogICAgICAgICJiYXoiOiB7CiAgICAgICAgICAgICJoaSI6ICJieWUiCiAgICAgICAgfQogICAgfQp9"; expectedRq.uri = "/JsonMaps"; expectedRq.headers = {{"Content-Type", R"(application/json)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(JsonMaps, RestJsonSerializesZeroValuesInMaps) { @@ -49,14 +48,13 @@ AWS_PROTOCOL_TEST(JsonMaps, RestJsonSerializesZeroValuesInMaps) { request.SetDenseBooleanMap({{"x", false}}); auto outcome = client.JsonMaps(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "ewogICAgImRlbnNlTnVtYmVyTWFwIjogewogICAgICAgICJ4IjogMAogICAgfSwKICAgICJkZW5zZUJvb2xlYW5NYXAiOiB7CiAgICAgICAgIngiOiBmYWxzZQogICAgfQp9"; expectedRq.uri = "/JsonMaps"; expectedRq.headers = {{"Content-Type", R"(application/json)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(JsonMaps, RestJsonSerializesDenseSetMap) { @@ -68,12 +66,11 @@ AWS_PROTOCOL_TEST(JsonMaps, RestJsonSerializesDenseSetMap) { request.SetDenseSetMap({{"x", {}}, {"y", {R"(a)", R"(b)"}}}); auto outcome = client.JsonMaps(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "ewogICAgImRlbnNlU2V0TWFwIjogewogICAgICAgICJ4IjogW10sCiAgICAgICAgInkiOiBbImEiLCAiYiJdCiAgICB9Cn0="; expectedRq.uri = "/JsonMaps"; expectedRq.headers = {{"Content-Type", R"(application/json)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-json/tests/JsonTimestampsTest.cpp b/generated/protocol-tests/tests/input/rest-json/tests/JsonTimestampsTest.cpp index 562e7fcf68f..d941df4a519 100644 --- a/generated/protocol-tests/tests/input/rest-json/tests/JsonTimestampsTest.cpp +++ b/generated/protocol-tests/tests/input/rest-json/tests/JsonTimestampsTest.cpp @@ -20,14 +20,13 @@ AWS_PROTOCOL_TEST(JsonTimestamps, RestJsonJsonTimestamps) { request.SetNormal(Aws::Utils::DateTime(1398796238L)); auto outcome = client.JsonTimestamps(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "ewogICAgIm5vcm1hbCI6IDEzOTg3OTYyMzgKfQ=="; expectedRq.uri = "/JsonTimestamps"; expectedRq.headers = {{"Content-Type", R"(application/json)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(JsonTimestamps, RestJsonJsonTimestampsWithDateTimeFormat) { @@ -39,14 +38,13 @@ AWS_PROTOCOL_TEST(JsonTimestamps, RestJsonJsonTimestampsWithDateTimeFormat) { request.SetDateTime(Aws::Utils::DateTime(1398796238L)); auto outcome = client.JsonTimestamps(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "ewogICAgImRhdGVUaW1lIjogIjIwMTQtMDQtMjlUMTg6MzA6MzhaIgp9"; expectedRq.uri = "/JsonTimestamps"; expectedRq.headers = {{"Content-Type", R"(application/json)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(JsonTimestamps, RestJsonJsonTimestampsWithDateTimeOnTargetFormat) { @@ -58,14 +56,13 @@ AWS_PROTOCOL_TEST(JsonTimestamps, RestJsonJsonTimestampsWithDateTimeOnTargetForm request.SetDateTimeOnTarget(Aws::Utils::DateTime(1398796238L)); auto outcome = client.JsonTimestamps(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "ewogICAgImRhdGVUaW1lT25UYXJnZXQiOiAiMjAxNC0wNC0yOVQxODozMDozOFoiCn0="; expectedRq.uri = "/JsonTimestamps"; expectedRq.headers = {{"Content-Type", R"(application/json)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(JsonTimestamps, RestJsonJsonTimestampsWithEpochSecondsFormat) { @@ -77,14 +74,13 @@ AWS_PROTOCOL_TEST(JsonTimestamps, RestJsonJsonTimestampsWithEpochSecondsFormat) request.SetEpochSeconds(Aws::Utils::DateTime(1398796238L)); auto outcome = client.JsonTimestamps(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "ewogICAgImVwb2NoU2Vjb25kcyI6IDEzOTg3OTYyMzgKfQ=="; expectedRq.uri = "/JsonTimestamps"; expectedRq.headers = {{"Content-Type", R"(application/json)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(JsonTimestamps, RestJsonJsonTimestampsWithEpochSecondsOnTargetFormat) { @@ -96,14 +92,13 @@ AWS_PROTOCOL_TEST(JsonTimestamps, RestJsonJsonTimestampsWithEpochSecondsOnTarget request.SetEpochSecondsOnTarget(Aws::Utils::DateTime(1398796238L)); auto outcome = client.JsonTimestamps(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "ewogICAgImVwb2NoU2Vjb25kc09uVGFyZ2V0IjogMTM5ODc5NjIzOAp9"; expectedRq.uri = "/JsonTimestamps"; expectedRq.headers = {{"Content-Type", R"(application/json)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(JsonTimestamps, RestJsonJsonTimestampsWithHttpDateFormat) { @@ -115,14 +110,13 @@ AWS_PROTOCOL_TEST(JsonTimestamps, RestJsonJsonTimestampsWithHttpDateFormat) { request.SetHttpDate(Aws::Utils::DateTime(1398796238L)); auto outcome = client.JsonTimestamps(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "ewogICAgImh0dHBEYXRlIjogIlR1ZSwgMjkgQXByIDIwMTQgMTg6MzA6MzggR01UIgp9"; expectedRq.uri = "/JsonTimestamps"; expectedRq.headers = {{"Content-Type", R"(application/json)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(JsonTimestamps, RestJsonJsonTimestampsWithHttpDateOnTargetFormat) { @@ -134,12 +128,11 @@ AWS_PROTOCOL_TEST(JsonTimestamps, RestJsonJsonTimestampsWithHttpDateOnTargetForm request.SetHttpDateOnTarget(Aws::Utils::DateTime(1398796238L)); auto outcome = client.JsonTimestamps(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "ewogICAgImh0dHBEYXRlT25UYXJnZXQiOiAiVHVlLCAyOSBBcHIgMjAxNCAxODozMDozOCBHTVQiCn0="; expectedRq.uri = "/JsonTimestamps"; expectedRq.headers = {{"Content-Type", R"(application/json)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-json/tests/JsonUnionsTest.cpp b/generated/protocol-tests/tests/input/rest-json/tests/JsonUnionsTest.cpp index 93d50b187ad..0c5c9f114d3 100644 --- a/generated/protocol-tests/tests/input/rest-json/tests/JsonUnionsTest.cpp +++ b/generated/protocol-tests/tests/input/rest-json/tests/JsonUnionsTest.cpp @@ -24,14 +24,13 @@ AWS_PROTOCOL_TEST(JsonUnions, RestJsonSerializeStringUnionValue) { } auto outcome = client.JsonUnions(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "PUT"; expectedRq.body = "ewogICAgImNvbnRlbnRzIjogewogICAgICAgICJzdHJpbmdWYWx1ZSI6ICJmb28iCiAgICB9Cn0="; expectedRq.uri = "/JsonUnions"; expectedRq.headers = {{"Content-Type", R"(application/json)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(JsonUnions, RestJsonSerializeBooleanUnionValue) { @@ -47,14 +46,13 @@ AWS_PROTOCOL_TEST(JsonUnions, RestJsonSerializeBooleanUnionValue) { } auto outcome = client.JsonUnions(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "PUT"; expectedRq.body = "ewogICAgImNvbnRlbnRzIjogewogICAgICAgICJib29sZWFuVmFsdWUiOiB0cnVlCiAgICB9Cn0="; expectedRq.uri = "/JsonUnions"; expectedRq.headers = {{"Content-Type", R"(application/json)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(JsonUnions, RestJsonSerializeNumberUnionValue) { @@ -70,14 +68,13 @@ AWS_PROTOCOL_TEST(JsonUnions, RestJsonSerializeNumberUnionValue) { } auto outcome = client.JsonUnions(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "PUT"; expectedRq.body = "ewogICAgImNvbnRlbnRzIjogewogICAgICAgICJudW1iZXJWYWx1ZSI6IDEKICAgIH0KfQ=="; expectedRq.uri = "/JsonUnions"; expectedRq.headers = {{"Content-Type", R"(application/json)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(JsonUnions, RestJsonSerializeBlobUnionValue) { @@ -93,14 +90,13 @@ AWS_PROTOCOL_TEST(JsonUnions, RestJsonSerializeBlobUnionValue) { } auto outcome = client.JsonUnions(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "PUT"; expectedRq.body = "ewogICAgImNvbnRlbnRzIjogewogICAgICAgICJibG9iVmFsdWUiOiAiWm05diIKICAgIH0KfQ=="; expectedRq.uri = "/JsonUnions"; expectedRq.headers = {{"Content-Type", R"(application/json)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(JsonUnions, RestJsonSerializeTimestampUnionValue) { @@ -116,14 +112,13 @@ AWS_PROTOCOL_TEST(JsonUnions, RestJsonSerializeTimestampUnionValue) { } auto outcome = client.JsonUnions(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "PUT"; expectedRq.body = "ewogICAgImNvbnRlbnRzIjogewogICAgICAgICJ0aW1lc3RhbXBWYWx1ZSI6IDEzOTg3OTYyMzgKICAgIH0KfQ=="; expectedRq.uri = "/JsonUnions"; expectedRq.headers = {{"Content-Type", R"(application/json)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(JsonUnions, RestJsonSerializeEnumUnionValue) { @@ -139,14 +134,13 @@ AWS_PROTOCOL_TEST(JsonUnions, RestJsonSerializeEnumUnionValue) { } auto outcome = client.JsonUnions(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "PUT"; expectedRq.body = "ewogICAgImNvbnRlbnRzIjogewogICAgICAgICJlbnVtVmFsdWUiOiAiRm9vIgogICAgfQp9"; expectedRq.uri = "/JsonUnions"; expectedRq.headers = {{"Content-Type", R"(application/json)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(JsonUnions, RestJsonSerializeListUnionValue) { @@ -162,14 +156,13 @@ AWS_PROTOCOL_TEST(JsonUnions, RestJsonSerializeListUnionValue) { } auto outcome = client.JsonUnions(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "PUT"; expectedRq.body = "ewogICAgImNvbnRlbnRzIjogewogICAgICAgICJsaXN0VmFsdWUiOiBbImZvbyIsICJiYXIiXQogICAgfQp9"; expectedRq.uri = "/JsonUnions"; expectedRq.headers = {{"Content-Type", R"(application/json)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(JsonUnions, RestJsonSerializeMapUnionValue) { @@ -185,14 +178,13 @@ AWS_PROTOCOL_TEST(JsonUnions, RestJsonSerializeMapUnionValue) { } auto outcome = client.JsonUnions(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "PUT"; expectedRq.body = "ewogICAgImNvbnRlbnRzIjogewogICAgICAgICJtYXBWYWx1ZSI6IHsKICAgICAgICAgICAgImZvbyI6ICJiYXIiLAogICAgICAgICAgICAic3BhbSI6ICJlZ2dzIgogICAgICAgIH0KICAgIH0KfQ=="; expectedRq.uri = "/JsonUnions"; expectedRq.headers = {{"Content-Type", R"(application/json)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(JsonUnions, RestJsonSerializeStructureUnionValue) { @@ -212,14 +204,13 @@ AWS_PROTOCOL_TEST(JsonUnions, RestJsonSerializeStructureUnionValue) { } auto outcome = client.JsonUnions(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "PUT"; expectedRq.body = "ewogICAgImNvbnRlbnRzIjogewogICAgICAgICJzdHJ1Y3R1cmVWYWx1ZSI6IHsKICAgICAgICAgICAgImhpIjogImhlbGxvIgogICAgICAgIH0KICAgIH0KfQ=="; expectedRq.uri = "/JsonUnions"; expectedRq.headers = {{"Content-Type", R"(application/json)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(JsonUnions, RestJsonSerializeRenamedStructureUnionValue) { @@ -239,12 +230,11 @@ AWS_PROTOCOL_TEST(JsonUnions, RestJsonSerializeRenamedStructureUnionValue) { } auto outcome = client.JsonUnions(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "PUT"; expectedRq.body = "ewogICAgImNvbnRlbnRzIjogewogICAgICAgICJyZW5hbWVkU3RydWN0dXJlVmFsdWUiOiB7CiAgICAgICAgICAgICJzYWx1dGF0aW9uIjogImhlbGxvISIKICAgICAgICB9CiAgICB9Cn0="; expectedRq.uri = "/JsonUnions"; expectedRq.headers = {{"Content-Type", R"(application/json)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-json/tests/MediaTypeHeaderTest.cpp b/generated/protocol-tests/tests/input/rest-json/tests/MediaTypeHeaderTest.cpp index 1a752a97b5b..88b73c41a60 100644 --- a/generated/protocol-tests/tests/input/rest-json/tests/MediaTypeHeaderTest.cpp +++ b/generated/protocol-tests/tests/input/rest-json/tests/MediaTypeHeaderTest.cpp @@ -20,11 +20,10 @@ AWS_PROTOCOL_TEST(MediaTypeHeader, MediaTypeHeaderInputBase64) { request.SetJson(R"(true)"); auto outcome = client.MediaTypeHeader(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "GET"; expectedRq.uri = "/MediaTypeHeader"; expectedRq.headers = {{"X-Json", R"(dHJ1ZQ==)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-json/tests/NoInputAndNoOutputTest.cpp b/generated/protocol-tests/tests/input/rest-json/tests/NoInputAndNoOutputTest.cpp index 217d3b5e0f6..117faacb658 100644 --- a/generated/protocol-tests/tests/input/rest-json/tests/NoInputAndNoOutputTest.cpp +++ b/generated/protocol-tests/tests/input/rest-json/tests/NoInputAndNoOutputTest.cpp @@ -19,10 +19,9 @@ AWS_PROTOCOL_TEST(NoInputAndNoOutput, RestJsonNoInputAndNoOutput) { NoInputAndNoOutputRequest request; auto outcome = client.NoInputAndNoOutput(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.uri = "/NoInputAndNoOutput"; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-json/tests/NoInputAndOutputTest.cpp b/generated/protocol-tests/tests/input/rest-json/tests/NoInputAndOutputTest.cpp index 91206a1b0c2..807615b7a70 100644 --- a/generated/protocol-tests/tests/input/rest-json/tests/NoInputAndOutputTest.cpp +++ b/generated/protocol-tests/tests/input/rest-json/tests/NoInputAndOutputTest.cpp @@ -19,10 +19,9 @@ AWS_PROTOCOL_TEST(NoInputAndOutput, RestJsonNoInputAndOutput) { NoInputAndOutputRequest request; auto outcome = client.NoInputAndOutput(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.uri = "/NoInputAndOutputOutput"; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-json/tests/NullAndEmptyHeadersClientTest.cpp b/generated/protocol-tests/tests/input/rest-json/tests/NullAndEmptyHeadersClientTest.cpp index 3e344e1c395..ca6cf27e48d 100644 --- a/generated/protocol-tests/tests/input/rest-json/tests/NullAndEmptyHeadersClientTest.cpp +++ b/generated/protocol-tests/tests/input/rest-json/tests/NullAndEmptyHeadersClientTest.cpp @@ -22,12 +22,11 @@ AWS_PROTOCOL_TEST(NullAndEmptyHeadersClient, RestJsonNullAndEmptyHeaders) { request.SetC({}); auto outcome = client.NullAndEmptyHeadersClient(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "GET"; expectedRq.uri = "/NullAndEmptyHeadersClient"; expectedRq.headers = {{"X-B", R"()"}, {"X-C", R"()"}}; expectedRq.forbidHeaders = {"X-A"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-json/tests/OmitsNullSerializesEmptyStringTest.cpp b/generated/protocol-tests/tests/input/rest-json/tests/OmitsNullSerializesEmptyStringTest.cpp index 53cf5c7f774..38f5cb7b956 100644 --- a/generated/protocol-tests/tests/input/rest-json/tests/OmitsNullSerializesEmptyStringTest.cpp +++ b/generated/protocol-tests/tests/input/rest-json/tests/OmitsNullSerializesEmptyStringTest.cpp @@ -20,12 +20,11 @@ AWS_PROTOCOL_TEST(OmitsNullSerializesEmptyString, RestJsonOmitsNullQuery) { request.SetNullValue(R"(null)"); auto outcome = client.OmitsNullSerializesEmptyString(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "GET"; expectedRq.uri = "/OmitsNullSerializesEmptyString"; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(OmitsNullSerializesEmptyString, RestJsonSerializesEmptyQueryValue) { @@ -37,10 +36,9 @@ AWS_PROTOCOL_TEST(OmitsNullSerializesEmptyString, RestJsonSerializesEmptyQueryVa request.SetEmptyString(R"()"); auto outcome = client.OmitsNullSerializesEmptyString(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "GET"; expectedRq.uri = "/OmitsNullSerializesEmptyString?Empty="; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-json/tests/OmitsSerializingEmptyListsTest.cpp b/generated/protocol-tests/tests/input/rest-json/tests/OmitsSerializingEmptyListsTest.cpp index 0baad297942..011b7099286 100644 --- a/generated/protocol-tests/tests/input/rest-json/tests/OmitsSerializingEmptyListsTest.cpp +++ b/generated/protocol-tests/tests/input/rest-json/tests/OmitsSerializingEmptyListsTest.cpp @@ -26,10 +26,9 @@ AWS_PROTOCOL_TEST(OmitsSerializingEmptyLists, RestJsonOmitsEmptyListQueryValues) request.SetQueryIntegerEnumList({}); auto outcome = client.OmitsSerializingEmptyLists(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.uri = "/OmitsSerializingEmptyLists"; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-json/tests/PostUnionWithJsonNameTest.cpp b/generated/protocol-tests/tests/input/rest-json/tests/PostUnionWithJsonNameTest.cpp index b6b862ec9c9..f7383f4ad5a 100644 --- a/generated/protocol-tests/tests/input/rest-json/tests/PostUnionWithJsonNameTest.cpp +++ b/generated/protocol-tests/tests/input/rest-json/tests/PostUnionWithJsonNameTest.cpp @@ -24,14 +24,13 @@ AWS_PROTOCOL_TEST(PostUnionWithJsonName, PostUnionWithJsonNameRequest1) { } auto outcome = client.PostUnionWithJsonName(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "ewogICAgInZhbHVlIjogewogICAgICAgICJGT08iOiAiaGkiCiAgICB9Cn0="; expectedRq.uri = "/PostUnionWithJsonName"; expectedRq.headers = {{"Content-Type", R"(application/json)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(PostUnionWithJsonName, PostUnionWithJsonNameRequest2) { @@ -47,14 +46,13 @@ AWS_PROTOCOL_TEST(PostUnionWithJsonName, PostUnionWithJsonNameRequest2) { } auto outcome = client.PostUnionWithJsonName(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "ewogICAgInZhbHVlIjogewogICAgICAgICJfYmF6IjogImhpIgogICAgfQp9"; expectedRq.uri = "/PostUnionWithJsonName"; expectedRq.headers = {{"Content-Type", R"(application/json)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(PostUnionWithJsonName, PostUnionWithJsonNameRequest3) { @@ -70,12 +68,11 @@ AWS_PROTOCOL_TEST(PostUnionWithJsonName, PostUnionWithJsonNameRequest3) { } auto outcome = client.PostUnionWithJsonName(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "ewogICAgInZhbHVlIjogewogICAgICAgICJiYXIiOiAiaGkiCiAgICB9Cn0="; expectedRq.uri = "/PostUnionWithJsonName"; expectedRq.headers = {{"Content-Type", R"(application/json)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-json/tests/PutWithContentEncodingTest.cpp b/generated/protocol-tests/tests/input/rest-json/tests/PutWithContentEncodingTest.cpp index e926f871869..2a2e3b5be62 100644 --- a/generated/protocol-tests/tests/input/rest-json/tests/PutWithContentEncodingTest.cpp +++ b/generated/protocol-tests/tests/input/rest-json/tests/PutWithContentEncodingTest.cpp @@ -148,13 +148,12 @@ EcffzjixWU9FpAyGp2rVl4ETRgqljOGw4UgK31r0ZIEGnH0xGz1FtbW1OcQM008JVujRqulCucEMmntr )"); auto outcome = client.PutWithContentEncoding(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.uri = "/requestcompression/putcontentwithencoding"; expectedRq.headers = {{"Content-Encoding", R"(gzip)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(PutWithContentEncoding, SDKAppendedGzipAfterProvidedEncoding_restJson1) { @@ -295,11 +294,10 @@ EcffzjixWU9FpAyGp2rVl4ETRgqljOGw4UgK31r0ZIEGnH0xGz1FtbW1OcQM008JVujRqulCucEMmntr )"); auto outcome = client.PutWithContentEncoding(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.uri = "/requestcompression/putcontentwithencoding"; expectedRq.headers = {{"Content-Encoding", R"(custom, gzip)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-json/tests/QueryIdempotencyTokenAutoFillTest.cpp b/generated/protocol-tests/tests/input/rest-json/tests/QueryIdempotencyTokenAutoFillTest.cpp index 71dce6be940..26c3b26b0d9 100644 --- a/generated/protocol-tests/tests/input/rest-json/tests/QueryIdempotencyTokenAutoFillTest.cpp +++ b/generated/protocol-tests/tests/input/rest-json/tests/QueryIdempotencyTokenAutoFillTest.cpp @@ -19,12 +19,11 @@ AWS_PROTOCOL_TEST(QueryIdempotencyTokenAutoFill, RestJsonQueryIdempotencyTokenAu QueryIdempotencyTokenAutoFillRequest request; auto outcome = client.QueryIdempotencyTokenAutoFill(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.uri = "/QueryIdempotencyTokenAutoFill?token=00000000-0000-4000-8000-000000000000"; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(QueryIdempotencyTokenAutoFill, RestJsonQueryIdempotencyTokenAutoFillIsSet) { @@ -36,10 +35,9 @@ AWS_PROTOCOL_TEST(QueryIdempotencyTokenAutoFill, RestJsonQueryIdempotencyTokenAu request.SetToken(R"(00000000-0000-4000-8000-000000000000)"); auto outcome = client.QueryIdempotencyTokenAutoFill(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.uri = "/QueryIdempotencyTokenAutoFill?token=00000000-0000-4000-8000-000000000000"; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-json/tests/QueryParamsAsStringListMapTest.cpp b/generated/protocol-tests/tests/input/rest-json/tests/QueryParamsAsStringListMapTest.cpp index c0ef53666b4..fbb7c3d6e85 100644 --- a/generated/protocol-tests/tests/input/rest-json/tests/QueryParamsAsStringListMapTest.cpp +++ b/generated/protocol-tests/tests/input/rest-json/tests/QueryParamsAsStringListMapTest.cpp @@ -21,10 +21,9 @@ AWS_PROTOCOL_TEST(QueryParamsAsStringListMap, RestJsonQueryParamsStringListMap) request.SetFoo({{"baz", {R"(bar)", R"(qux)"}}}); auto outcome = client.QueryParamsAsStringListMap(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.uri = "/StringListMap?corge=named&baz=bar&baz=qux"; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-json/tests/QueryPrecedenceTest.cpp b/generated/protocol-tests/tests/input/rest-json/tests/QueryPrecedenceTest.cpp index a85e6674044..6b5334852a2 100644 --- a/generated/protocol-tests/tests/input/rest-json/tests/QueryPrecedenceTest.cpp +++ b/generated/protocol-tests/tests/input/rest-json/tests/QueryPrecedenceTest.cpp @@ -21,10 +21,9 @@ AWS_PROTOCOL_TEST(QueryPrecedence, RestJsonQueryPrecedence) { request.SetBaz({{"bar", R"(fromMap)"}, {"qux", R"(alsoFromMap)"}}); auto outcome = client.QueryPrecedence(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.uri = "/Precedence?bar=named&qux=alsoFromMap"; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-json/tests/RecursiveShapesTest.cpp b/generated/protocol-tests/tests/input/rest-json/tests/RecursiveShapesTest.cpp index 8138ddbb7a6..12682e42c79 100644 --- a/generated/protocol-tests/tests/input/rest-json/tests/RecursiveShapesTest.cpp +++ b/generated/protocol-tests/tests/input/rest-json/tests/RecursiveShapesTest.cpp @@ -5,6 +5,7 @@ #include #include #include +#include #include #include @@ -40,12 +41,11 @@ AWS_PROTOCOL_TEST(RecursiveShapes, RestJsonRecursiveShapes) { } auto outcome = client.RecursiveShapes(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "PUT"; expectedRq.body = "ewogICAgIm5lc3RlZCI6IHsKICAgICAgICAiZm9vIjogIkZvbzEiLAogICAgICAgICJuZXN0ZWQiOiB7CiAgICAgICAgICAgICJiYXIiOiAiQmFyMSIsCiAgICAgICAgICAgICJyZWN1cnNpdmVNZW1iZXIiOiB7CiAgICAgICAgICAgICAgICAiZm9vIjogIkZvbzIiLAogICAgICAgICAgICAgICAgIm5lc3RlZCI6IHsKICAgICAgICAgICAgICAgICAgICAiYmFyIjogIkJhcjIiCiAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgIH0KICAgICAgICB9CiAgICB9Cn0="; expectedRq.uri = "/RecursiveShapes"; expectedRq.headers = {{"Content-Type", R"(application/json)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-json/tests/SimpleScalarPropertiesTest.cpp b/generated/protocol-tests/tests/input/rest-json/tests/SimpleScalarPropertiesTest.cpp index 0e44e198acf..23cf7c6505d 100644 --- a/generated/protocol-tests/tests/input/rest-json/tests/SimpleScalarPropertiesTest.cpp +++ b/generated/protocol-tests/tests/input/rest-json/tests/SimpleScalarPropertiesTest.cpp @@ -29,14 +29,13 @@ AWS_PROTOCOL_TEST(SimpleScalarProperties, RestJsonSimpleScalarProperties) { request.SetDoubleValue(6.5); auto outcome = client.SimpleScalarProperties(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "PUT"; expectedRq.body = "ewogICAgInN0cmluZ1ZhbHVlIjogInN0cmluZyIsCiAgICAidHJ1ZUJvb2xlYW5WYWx1ZSI6IHRydWUsCiAgICAiZmFsc2VCb29sZWFuVmFsdWUiOiBmYWxzZSwKICAgICJieXRlVmFsdWUiOiAxLAogICAgInNob3J0VmFsdWUiOiAyLAogICAgImludGVnZXJWYWx1ZSI6IDMsCiAgICAibG9uZ1ZhbHVlIjogNCwKICAgICJmbG9hdFZhbHVlIjogNS41LAogICAgIkRvdWJsZURyaWJibGUiOiA2LjUKfQ=="; expectedRq.uri = "/SimpleScalarProperties"; expectedRq.headers = {{"Content-Type", R"(application/json)"}, {"X-Foo", R"(Foo)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(SimpleScalarProperties, RestJsonDoesntSerializeNullStructureValues) { @@ -48,14 +47,13 @@ AWS_PROTOCOL_TEST(SimpleScalarProperties, RestJsonDoesntSerializeNullStructureVa request.SetStringValue(R"(null)"); auto outcome = client.SimpleScalarProperties(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "PUT"; expectedRq.body = "e30="; expectedRq.uri = "/SimpleScalarProperties"; expectedRq.headers = {{"Content-Type", R"(application/json)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(SimpleScalarProperties, RestJsonSupportsNaNFloatInputs) { @@ -68,14 +66,13 @@ AWS_PROTOCOL_TEST(SimpleScalarProperties, RestJsonSupportsNaNFloatInputs) { request.SetDoubleValue(std::numeric_limits::quiet_NaN()); auto outcome = client.SimpleScalarProperties(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "PUT"; expectedRq.body = "ewogICAgImZsb2F0VmFsdWUiOiAiTmFOIiwKICAgICJEb3VibGVEcmliYmxlIjogIk5hTiIKfQ=="; expectedRq.uri = "/SimpleScalarProperties"; expectedRq.headers = {{"Content-Type", R"(application/json)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(SimpleScalarProperties, RestJsonSupportsInfinityFloatInputs) { @@ -88,14 +85,13 @@ AWS_PROTOCOL_TEST(SimpleScalarProperties, RestJsonSupportsInfinityFloatInputs) { request.SetDoubleValue(std::numeric_limits::infinity()); auto outcome = client.SimpleScalarProperties(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "PUT"; expectedRq.body = "ewogICAgImZsb2F0VmFsdWUiOiAiSW5maW5pdHkiLAogICAgIkRvdWJsZURyaWJibGUiOiAiSW5maW5pdHkiCn0="; expectedRq.uri = "/SimpleScalarProperties"; expectedRq.headers = {{"Content-Type", R"(application/json)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(SimpleScalarProperties, RestJsonSupportsNegativeInfinityFloatInputs) { @@ -108,12 +104,11 @@ AWS_PROTOCOL_TEST(SimpleScalarProperties, RestJsonSupportsNegativeInfinityFloatI request.SetDoubleValue(-std::numeric_limits::infinity()); auto outcome = client.SimpleScalarProperties(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "PUT"; expectedRq.body = "ewogICAgImZsb2F0VmFsdWUiOiAiLUluZmluaXR5IiwKICAgICJEb3VibGVEcmliYmxlIjogIi1JbmZpbml0eSIKfQ=="; expectedRq.uri = "/SimpleScalarProperties"; expectedRq.headers = {{"Content-Type", R"(application/json)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-json/tests/TestBodyStructureTest.cpp b/generated/protocol-tests/tests/input/rest-json/tests/TestBodyStructureTest.cpp index 511c45778e5..26369a34ee9 100644 --- a/generated/protocol-tests/tests/input/rest-json/tests/TestBodyStructureTest.cpp +++ b/generated/protocol-tests/tests/input/rest-json/tests/TestBodyStructureTest.cpp @@ -24,8 +24,6 @@ AWS_PROTOCOL_TEST(TestBodyStructure, RestJsonTestBodyStructure) { } auto outcome = client.TestBodyStructure(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "eyJ0ZXN0Q29uZmlnIjoKICAgIHsidGltZW91dCI6IDEwfQp9"; @@ -33,6 +31,7 @@ AWS_PROTOCOL_TEST(TestBodyStructure, RestJsonTestBodyStructure) { expectedRq.headers = {{"Content-Type", R"(application/json)"}}; expectedRq.requireHeaders = {"Content-Length"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(TestBodyStructure, RestJsonHttpWithEmptyBody) { @@ -43,8 +42,6 @@ AWS_PROTOCOL_TEST(TestBodyStructure, RestJsonHttpWithEmptyBody) { TestBodyStructureRequest request; auto outcome = client.TestBodyStructure(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "e30="; @@ -52,4 +49,5 @@ AWS_PROTOCOL_TEST(TestBodyStructure, RestJsonHttpWithEmptyBody) { expectedRq.headers = {{"Content-Type", R"(application/json)"}}; expectedRq.requireHeaders = {"Content-Length"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-json/tests/TestGetNoInputNoPayloadTest.cpp b/generated/protocol-tests/tests/input/rest-json/tests/TestGetNoInputNoPayloadTest.cpp index b1ecf7c85b9..7213c16fb60 100644 --- a/generated/protocol-tests/tests/input/rest-json/tests/TestGetNoInputNoPayloadTest.cpp +++ b/generated/protocol-tests/tests/input/rest-json/tests/TestGetNoInputNoPayloadTest.cpp @@ -19,11 +19,10 @@ AWS_PROTOCOL_TEST(TestGetNoInputNoPayload, RestJsonHttpGetWithNoInput) { TestGetNoInputNoPayloadRequest request; auto outcome = client.TestGetNoInputNoPayload(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "GET"; expectedRq.uri = "/no_input_no_payload"; expectedRq.forbidHeaders = {"Content-Type", "Content-Length"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-json/tests/TestGetNoPayloadTest.cpp b/generated/protocol-tests/tests/input/rest-json/tests/TestGetNoPayloadTest.cpp index 11d80cd49b7..21ddfbecdab 100644 --- a/generated/protocol-tests/tests/input/rest-json/tests/TestGetNoPayloadTest.cpp +++ b/generated/protocol-tests/tests/input/rest-json/tests/TestGetNoPayloadTest.cpp @@ -19,13 +19,12 @@ AWS_PROTOCOL_TEST(TestGetNoPayload, RestJsonHttpGetWithNoModeledBody) { TestGetNoPayloadRequest request; auto outcome = client.TestGetNoPayload(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "GET"; expectedRq.uri = "/no_payload"; expectedRq.forbidHeaders = {"Content-Length", "Content-Type"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(TestGetNoPayload, RestJsonHttpGetWithHeaderMemberNoModeledBody) { @@ -37,12 +36,11 @@ AWS_PROTOCOL_TEST(TestGetNoPayload, RestJsonHttpGetWithHeaderMemberNoModeledBody request.SetTestId(R"(t-12345)"); auto outcome = client.TestGetNoPayload(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "GET"; expectedRq.uri = "/no_payload"; expectedRq.headers = {{"X-Amz-Test-Id", R"(t-12345)"}}; expectedRq.forbidHeaders = {"Content-Length", "Content-Type"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-json/tests/TestPayloadBlobTest.cpp b/generated/protocol-tests/tests/input/rest-json/tests/TestPayloadBlobTest.cpp index 095af57b428..c25a1750dd4 100644 --- a/generated/protocol-tests/tests/input/rest-json/tests/TestPayloadBlobTest.cpp +++ b/generated/protocol-tests/tests/input/rest-json/tests/TestPayloadBlobTest.cpp @@ -19,12 +19,11 @@ AWS_PROTOCOL_TEST(TestPayloadBlob, RestJsonHttpWithEmptyBlobPayload) { TestPayloadBlobRequest request; auto outcome = client.TestPayloadBlob(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.uri = "/blob_payload"; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(TestPayloadBlob, RestJsonTestPayloadBlob) { @@ -37,8 +36,6 @@ AWS_PROTOCOL_TEST(TestPayloadBlob, RestJsonTestPayloadBlob) { request.SetBody([](){ return Aws::MakeShared("Test", Aws::String(R"(1234)"), std::ios_base::in | std::ios_base::binary); }() ); auto outcome = client.TestPayloadBlob(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "MTIzNA=="; @@ -46,4 +43,5 @@ AWS_PROTOCOL_TEST(TestPayloadBlob, RestJsonTestPayloadBlob) { expectedRq.headers = {{"Content-Type", R"(image/jpg)"}}; expectedRq.requireHeaders = {"Content-Length"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-json/tests/TestPayloadStructureTest.cpp b/generated/protocol-tests/tests/input/rest-json/tests/TestPayloadStructureTest.cpp index 2d7ae119cc7..04b73734422 100644 --- a/generated/protocol-tests/tests/input/rest-json/tests/TestPayloadStructureTest.cpp +++ b/generated/protocol-tests/tests/input/rest-json/tests/TestPayloadStructureTest.cpp @@ -19,8 +19,6 @@ AWS_PROTOCOL_TEST(TestPayloadStructure, RestJsonHttpWithEmptyStructurePayload) { TestPayloadStructureRequest request; auto outcome = client.TestPayloadStructure(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "e30="; @@ -28,6 +26,7 @@ AWS_PROTOCOL_TEST(TestPayloadStructure, RestJsonHttpWithEmptyStructurePayload) { expectedRq.headers = {{"Content-Type", R"(application/json)"}}; expectedRq.requireHeaders = {"Content-Length"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(TestPayloadStructure, RestJsonTestPayloadStructure) { @@ -43,8 +42,6 @@ AWS_PROTOCOL_TEST(TestPayloadStructure, RestJsonTestPayloadStructure) { } auto outcome = client.TestPayloadStructure(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "eyJkYXRhIjogMjUKfQ=="; @@ -52,6 +49,7 @@ AWS_PROTOCOL_TEST(TestPayloadStructure, RestJsonTestPayloadStructure) { expectedRq.headers = {{"Content-Type", R"(application/json)"}}; expectedRq.requireHeaders = {"Content-Length"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(TestPayloadStructure, RestJsonHttpWithHeadersButNoPayload) { @@ -63,8 +61,6 @@ AWS_PROTOCOL_TEST(TestPayloadStructure, RestJsonHttpWithHeadersButNoPayload) { request.SetTestId(R"(t-12345)"); auto outcome = client.TestPayloadStructure(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "e30="; @@ -72,4 +68,5 @@ AWS_PROTOCOL_TEST(TestPayloadStructure, RestJsonHttpWithHeadersButNoPayload) { expectedRq.headers = {{"Content-Type", R"(application/json)"}, {"X-Amz-Test-Id", R"(t-12345)"}}; expectedRq.requireHeaders = {"Content-Length"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-json/tests/TestPostNoInputNoPayloadTest.cpp b/generated/protocol-tests/tests/input/rest-json/tests/TestPostNoInputNoPayloadTest.cpp index 8bd3c617b73..0926e2a3b2d 100644 --- a/generated/protocol-tests/tests/input/rest-json/tests/TestPostNoInputNoPayloadTest.cpp +++ b/generated/protocol-tests/tests/input/rest-json/tests/TestPostNoInputNoPayloadTest.cpp @@ -19,11 +19,10 @@ AWS_PROTOCOL_TEST(TestPostNoInputNoPayload, RestJsonHttpPostWithNoInput) { TestPostNoInputNoPayloadRequest request; auto outcome = client.TestPostNoInputNoPayload(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.uri = "/no_input_no_payload"; expectedRq.forbidHeaders = {"Content-Type"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-json/tests/TestPostNoPayloadTest.cpp b/generated/protocol-tests/tests/input/rest-json/tests/TestPostNoPayloadTest.cpp index 014a1123fd4..d6911c0077f 100644 --- a/generated/protocol-tests/tests/input/rest-json/tests/TestPostNoPayloadTest.cpp +++ b/generated/protocol-tests/tests/input/rest-json/tests/TestPostNoPayloadTest.cpp @@ -19,13 +19,12 @@ AWS_PROTOCOL_TEST(TestPostNoPayload, RestJsonHttpPostWithNoModeledBody) { TestPostNoPayloadRequest request; auto outcome = client.TestPostNoPayload(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.uri = "/no_payload"; expectedRq.forbidHeaders = {"Content-Type"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(TestPostNoPayload, RestJsonHttpWithPostHeaderMemberNoModeledBody) { @@ -37,12 +36,11 @@ AWS_PROTOCOL_TEST(TestPostNoPayload, RestJsonHttpWithPostHeaderMemberNoModeledBo request.SetTestId(R"(t-12345)"); auto outcome = client.TestPostNoPayload(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.uri = "/no_payload"; expectedRq.headers = {{"X-Amz-Test-Id", R"(t-12345)"}}; expectedRq.forbidHeaders = {"Content-Type"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-json/tests/TimestampFormatHeadersTest.cpp b/generated/protocol-tests/tests/input/rest-json/tests/TimestampFormatHeadersTest.cpp index 0212a95697d..a39c36a7a71 100644 --- a/generated/protocol-tests/tests/input/rest-json/tests/TimestampFormatHeadersTest.cpp +++ b/generated/protocol-tests/tests/input/rest-json/tests/TimestampFormatHeadersTest.cpp @@ -26,11 +26,10 @@ AWS_PROTOCOL_TEST(TimestampFormatHeaders, RestJsonTimestampFormatHeaders) { request.SetTargetDateTime(Aws::Utils::DateTime(1576540098L)); auto outcome = client.TimestampFormatHeaders(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.uri = "/TimestampFormatHeaders"; expectedRq.headers = {{"X-defaultFormat", R"(Mon, 16 Dec 2019 23:48:18 GMT)"}, {"X-memberDateTime", R"(2019-12-16T23:48:18Z)"}, {"X-memberEpochSeconds", R"(1576540098)"}, {"X-memberHttpDate", R"(Mon, 16 Dec 2019 23:48:18 GMT)"}, {"X-targetDateTime", R"(2019-12-16T23:48:18Z)"}, {"X-targetEpochSeconds", R"(1576540098)"}, {"X-targetHttpDate", R"(Mon, 16 Dec 2019 23:48:18 GMT)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-json/tests/UnitInputAndOutputTest.cpp b/generated/protocol-tests/tests/input/rest-json/tests/UnitInputAndOutputTest.cpp index fd47c2c49c3..a1ab156b1ca 100644 --- a/generated/protocol-tests/tests/input/rest-json/tests/UnitInputAndOutputTest.cpp +++ b/generated/protocol-tests/tests/input/rest-json/tests/UnitInputAndOutputTest.cpp @@ -19,10 +19,9 @@ AWS_PROTOCOL_TEST(UnitInputAndOutput, RestJsonUnitInputAndOutput) { UnitInputAndOutputRequest request; auto outcome = client.UnitInputAndOutput(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.uri = "/UnitInputAndOutput"; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-xml/tests/AllQueryStringTypesTest.cpp b/generated/protocol-tests/tests/input/rest-xml/tests/AllQueryStringTypesTest.cpp index f1342e951b5..07ef1206a3e 100644 --- a/generated/protocol-tests/tests/input/rest-xml/tests/AllQueryStringTypesTest.cpp +++ b/generated/protocol-tests/tests/input/rest-xml/tests/AllQueryStringTypesTest.cpp @@ -39,12 +39,11 @@ AWS_PROTOCOL_TEST(AllQueryStringTypes, AllQueryStringTypes) { request.SetQueryIntegerEnumList({1, 2}); auto outcome = client.AllQueryStringTypes(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "GET"; expectedRq.uri = "/AllQueryStringTypesInput?String=Hello%20there&StringList=a&StringList=b&StringList=c&StringSet=a&StringSet=b&StringSet=c&Byte=1&Short=2&Integer=3&IntegerList=1&IntegerList=2&IntegerList=3&IntegerSet=1&IntegerSet=2&IntegerSet=3&Long=4&Float=1.1&Double=1.1&DoubleList=1.1&DoubleList=2.1&DoubleList=3.1&Boolean=true&BooleanList=true&BooleanList=false&BooleanList=true&Timestamp=1970-01-01T00%3A00%3A01Z&TimestampList=1970-01-01T00%3A00%3A01Z&TimestampList=1970-01-01T00%3A00%3A02Z&TimestampList=1970-01-01T00%3A00%3A03Z&Enum=Foo&EnumList=Foo&EnumList=Baz&EnumList=Bar&IntegerEnum=1&IntegerEnumList=1&IntegerEnumList=2"; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(AllQueryStringTypes, RestXmlQueryStringMap) { @@ -56,12 +55,11 @@ AWS_PROTOCOL_TEST(AllQueryStringTypes, RestXmlQueryStringMap) { request.SetQueryParamsMapOfStrings({{"QueryParamsStringKeyA", R"(Foo)"}, {"QueryParamsStringKeyB", R"(Bar)"}}); auto outcome = client.AllQueryStringTypes(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "GET"; expectedRq.uri = "/AllQueryStringTypesInput?QueryParamsStringKeyA=Foo&QueryParamsStringKeyB=Bar"; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(AllQueryStringTypes, RestXmlQueryStringEscaping) { @@ -73,12 +71,11 @@ AWS_PROTOCOL_TEST(AllQueryStringTypes, RestXmlQueryStringEscaping) { request.SetQueryString(R"( %:/?#[]@!$&'()*+,;=😹)"); auto outcome = client.AllQueryStringTypes(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "GET"; expectedRq.uri = "/AllQueryStringTypesInput?String=%20%25%3A%2F%3F%23%5B%5D%40%21%24%26%27%28%29%2A%2B%2C%3B%3D%F0%9F%98%B9"; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(AllQueryStringTypes, RestXmlSupportsNaNFloatQueryValues) { @@ -91,12 +88,11 @@ AWS_PROTOCOL_TEST(AllQueryStringTypes, RestXmlSupportsNaNFloatQueryValues) { request.SetQueryDouble(std::numeric_limits::quiet_NaN()); auto outcome = client.AllQueryStringTypes(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "GET"; expectedRq.uri = "/AllQueryStringTypesInput?Float=NaN&Double=NaN"; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(AllQueryStringTypes, RestXmlSupportsInfinityFloatQueryValues) { @@ -109,12 +105,11 @@ AWS_PROTOCOL_TEST(AllQueryStringTypes, RestXmlSupportsInfinityFloatQueryValues) request.SetQueryDouble(std::numeric_limits::infinity()); auto outcome = client.AllQueryStringTypes(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "GET"; expectedRq.uri = "/AllQueryStringTypesInput?Float=Infinity&Double=Infinity"; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(AllQueryStringTypes, RestXmlSupportsNegativeInfinityFloatQueryValues) { @@ -127,12 +122,11 @@ AWS_PROTOCOL_TEST(AllQueryStringTypes, RestXmlSupportsNegativeInfinityFloatQuery request.SetQueryDouble(-std::numeric_limits::infinity()); auto outcome = client.AllQueryStringTypes(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "GET"; expectedRq.uri = "/AllQueryStringTypesInput?Float=-Infinity&Double=-Infinity"; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(AllQueryStringTypes, RestXmlZeroAndFalseQueryValues) { @@ -145,10 +139,9 @@ AWS_PROTOCOL_TEST(AllQueryStringTypes, RestXmlZeroAndFalseQueryValues) { request.SetQueryBoolean(false); auto outcome = client.AllQueryStringTypes(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "GET"; expectedRq.uri = "/AllQueryStringTypesInput?Integer=0&Boolean=false"; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-xml/tests/BodyWithXmlNameTest.cpp b/generated/protocol-tests/tests/input/rest-xml/tests/BodyWithXmlNameTest.cpp index 2af7571579d..a10838dcf9c 100644 --- a/generated/protocol-tests/tests/input/rest-xml/tests/BodyWithXmlNameTest.cpp +++ b/generated/protocol-tests/tests/input/rest-xml/tests/BodyWithXmlNameTest.cpp @@ -24,8 +24,6 @@ AWS_PROTOCOL_TEST(BodyWithXmlName, BodyWithXmlName) { } auto outcome = client.BodyWithXmlName(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "PUT"; expectedRq.body = "PEFob3k+PG5lc3RlZD48bmFtZT5QaHJlZGR5PC9uYW1lPjwvbmVzdGVkPjwvQWhveT4="; @@ -33,4 +31,5 @@ AWS_PROTOCOL_TEST(BodyWithXmlName, BodyWithXmlName) { expectedRq.headers = {{"Content-Type", R"(application/xml)"}}; expectedRq.requireHeaders = {"Content-Length"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-xml/tests/ConstantAndVariableQueryStringTest.cpp b/generated/protocol-tests/tests/input/rest-xml/tests/ConstantAndVariableQueryStringTest.cpp index 6d9c3f8bb0e..e3644fb06a4 100644 --- a/generated/protocol-tests/tests/input/rest-xml/tests/ConstantAndVariableQueryStringTest.cpp +++ b/generated/protocol-tests/tests/input/rest-xml/tests/ConstantAndVariableQueryStringTest.cpp @@ -20,12 +20,11 @@ AWS_PROTOCOL_TEST(ConstantAndVariableQueryString, ConstantAndVariableQueryString request.SetBaz(R"(bam)"); auto outcome = client.ConstantAndVariableQueryString(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "GET"; expectedRq.uri = "/ConstantAndVariableQueryString?foo=bar&baz=bam"; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(ConstantAndVariableQueryString, ConstantAndVariableQueryStringAllValues) { @@ -38,10 +37,9 @@ AWS_PROTOCOL_TEST(ConstantAndVariableQueryString, ConstantAndVariableQueryString request.SetMaybeSet(R"(yes)"); auto outcome = client.ConstantAndVariableQueryString(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "GET"; expectedRq.uri = "/ConstantAndVariableQueryString?foo=bar&baz=bam&maybeSet=yes"; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-xml/tests/ConstantQueryStringTest.cpp b/generated/protocol-tests/tests/input/rest-xml/tests/ConstantQueryStringTest.cpp index 1668b743671..8b028292995 100644 --- a/generated/protocol-tests/tests/input/rest-xml/tests/ConstantQueryStringTest.cpp +++ b/generated/protocol-tests/tests/input/rest-xml/tests/ConstantQueryStringTest.cpp @@ -20,10 +20,9 @@ AWS_PROTOCOL_TEST(ConstantQueryString, ConstantQueryString) { request.SetHello(R"(hi)"); auto outcome = client.ConstantQueryString(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "GET"; expectedRq.uri = "/ConstantQueryString/hi?foo=bar&hello"; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-xml/tests/EmptyInputAndEmptyOutputTest.cpp b/generated/protocol-tests/tests/input/rest-xml/tests/EmptyInputAndEmptyOutputTest.cpp index 8f0dc78cfda..c2392829b21 100644 --- a/generated/protocol-tests/tests/input/rest-xml/tests/EmptyInputAndEmptyOutputTest.cpp +++ b/generated/protocol-tests/tests/input/rest-xml/tests/EmptyInputAndEmptyOutputTest.cpp @@ -19,10 +19,9 @@ AWS_PROTOCOL_TEST(EmptyInputAndEmptyOutput, EmptyInputAndEmptyOutput) { EmptyInputAndEmptyOutputRequest request; auto outcome = client.EmptyInputAndEmptyOutput(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.uri = "/EmptyInputAndEmptyOutput"; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-xml/tests/EndpointOperationTest.cpp b/generated/protocol-tests/tests/input/rest-xml/tests/EndpointOperationTest.cpp index 921f8998fa0..89f97ecb1ec 100644 --- a/generated/protocol-tests/tests/input/rest-xml/tests/EndpointOperationTest.cpp +++ b/generated/protocol-tests/tests/input/rest-xml/tests/EndpointOperationTest.cpp @@ -19,11 +19,10 @@ AWS_PROTOCOL_TEST(EndpointOperation, RestXmlEndpointTrait) { EndpointOperationRequest request; auto outcome = client.EndpointOperation(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.uri = "/EndpointOperation"; expectedRq.host = "foo.example.com"; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-xml/tests/EndpointWithHostLabelHeaderOperationTest.cpp b/generated/protocol-tests/tests/input/rest-xml/tests/EndpointWithHostLabelHeaderOperationTest.cpp index 6982881bb9e..c2dc0b033b0 100644 --- a/generated/protocol-tests/tests/input/rest-xml/tests/EndpointWithHostLabelHeaderOperationTest.cpp +++ b/generated/protocol-tests/tests/input/rest-xml/tests/EndpointWithHostLabelHeaderOperationTest.cpp @@ -20,12 +20,11 @@ AWS_PROTOCOL_TEST(EndpointWithHostLabelHeaderOperation, RestXmlEndpointTraitWith request.SetAccountId(R"(bar)"); auto outcome = client.EndpointWithHostLabelHeaderOperation(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.uri = "/EndpointWithHostLabelHeaderOperation"; expectedRq.host = "bar.example.com"; expectedRq.headers = {{"X-Amz-Account-Id", R"(bar)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-xml/tests/EndpointWithHostLabelOperationTest.cpp b/generated/protocol-tests/tests/input/rest-xml/tests/EndpointWithHostLabelOperationTest.cpp index e65ea4c1f4a..1a9fece0283 100644 --- a/generated/protocol-tests/tests/input/rest-xml/tests/EndpointWithHostLabelOperationTest.cpp +++ b/generated/protocol-tests/tests/input/rest-xml/tests/EndpointWithHostLabelOperationTest.cpp @@ -20,12 +20,11 @@ AWS_PROTOCOL_TEST(EndpointWithHostLabelOperation, RestXmlEndpointTraitWithHostLa request.SetLabel(R"(bar)"); auto outcome = client.EndpointWithHostLabelOperation(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "PEVuZHBvaW50V2l0aEhvc3RMYWJlbE9wZXJhdGlvblJlcXVlc3Q+CiAgICA8bGFiZWw+YmFyPC9sYWJlbD4KPC9FbmRwb2ludFdpdGhIb3N0TGFiZWxPcGVyYXRpb25SZXF1ZXN0Pgo="; expectedRq.uri = "/EndpointWithHostLabelOperation"; expectedRq.host = "foo.bar.example.com"; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-xml/tests/FlattenedXmlMapTest.cpp b/generated/protocol-tests/tests/input/rest-xml/tests/FlattenedXmlMapTest.cpp index 8244742605f..256602af89a 100644 --- a/generated/protocol-tests/tests/input/rest-xml/tests/FlattenedXmlMapTest.cpp +++ b/generated/protocol-tests/tests/input/rest-xml/tests/FlattenedXmlMapTest.cpp @@ -20,12 +20,11 @@ AWS_PROTOCOL_TEST(FlattenedXmlMap, FlattenedXmlMap) { request.SetMyMap({{"foo", FooEnumMapper::GetFooEnumForName(R"e(Foo)e")}, {"baz", FooEnumMapper::GetFooEnumForName(R"e(Baz)e")}}); auto outcome = client.FlattenedXmlMap(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "PEZsYXR0ZW5lZFhtbE1hcFJlcXVlc3Q+CiAgICA8bXlNYXA+CiAgICAgICAgPGtleT5mb288L2tleT4KICAgICAgICA8dmFsdWU+Rm9vPC92YWx1ZT4KICAgIDwvbXlNYXA+CiAgICA8bXlNYXA+CiAgICAgICAgPGtleT5iYXo8L2tleT4KICAgICAgICA8dmFsdWU+QmF6PC92YWx1ZT4KICAgIDwvbXlNYXA+CjwvRmxhdHRlbmVkWG1sTWFwUmVxdWVzdD4="; expectedRq.uri = "/FlattenedXmlMap"; expectedRq.headers = {{"Content-Type", R"(application/xml)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-xml/tests/FlattenedXmlMapWithXmlNameTest.cpp b/generated/protocol-tests/tests/input/rest-xml/tests/FlattenedXmlMapWithXmlNameTest.cpp index 047832603f4..47609a2b0da 100644 --- a/generated/protocol-tests/tests/input/rest-xml/tests/FlattenedXmlMapWithXmlNameTest.cpp +++ b/generated/protocol-tests/tests/input/rest-xml/tests/FlattenedXmlMapWithXmlNameTest.cpp @@ -20,12 +20,11 @@ AWS_PROTOCOL_TEST(FlattenedXmlMapWithXmlName, FlattenedXmlMapWithXmlName) { request.SetMyMap({{"a", R"(A)"}, {"b", R"(B)"}}); auto outcome = client.FlattenedXmlMapWithXmlName(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "PEZsYXR0ZW5lZFhtbE1hcFdpdGhYbWxOYW1lUmVxdWVzdD4KICAgIDxLVlA+CiAgICAgICAgPEs+YTwvSz4KICAgICAgICA8Vj5BPC9WPgogICAgPC9LVlA+CiAgICA8S1ZQPgogICAgICAgIDxLPmI8L0s+CiAgICAgICAgPFY+QjwvVj4KICAgIDwvS1ZQPgo8L0ZsYXR0ZW5lZFhtbE1hcFdpdGhYbWxOYW1lUmVxdWVzdD4="; expectedRq.uri = "/FlattenedXmlMapWithXmlName"; expectedRq.headers = {{"Content-Type", R"(application/xml)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-xml/tests/HttpEnumPayloadTest.cpp b/generated/protocol-tests/tests/input/rest-xml/tests/HttpEnumPayloadTest.cpp index 0785b1b1c18..d6b9f5f4222 100644 --- a/generated/protocol-tests/tests/input/rest-xml/tests/HttpEnumPayloadTest.cpp +++ b/generated/protocol-tests/tests/input/rest-xml/tests/HttpEnumPayloadTest.cpp @@ -20,12 +20,11 @@ AWS_PROTOCOL_TEST(HttpEnumPayload, RestXmlEnumPayloadRequest) { request.SetPayload(StringEnumMapper::GetStringEnumForName(R"e(enumvalue)e")); auto outcome = client.HttpEnumPayload(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "ZW51bXZhbHVl"; expectedRq.uri = "/EnumPayload"; expectedRq.headers = {{"Content-Type", R"(text/plain)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-xml/tests/HttpPayloadTraitsTest.cpp b/generated/protocol-tests/tests/input/rest-xml/tests/HttpPayloadTraitsTest.cpp index 29804ee215b..3236f392592 100644 --- a/generated/protocol-tests/tests/input/rest-xml/tests/HttpPayloadTraitsTest.cpp +++ b/generated/protocol-tests/tests/input/rest-xml/tests/HttpPayloadTraitsTest.cpp @@ -21,8 +21,6 @@ AWS_PROTOCOL_TEST(HttpPayloadTraits, HttpPayloadTraitsWithBlob) { request.SetBody([](){ return Aws::MakeShared("Test", Aws::String(R"(blobby blob blob)"), std::ios_base::in | std::ios_base::binary); }() ); auto outcome = client.HttpPayloadTraits(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "YmxvYmJ5IGJsb2IgYmxvYg=="; @@ -30,6 +28,7 @@ AWS_PROTOCOL_TEST(HttpPayloadTraits, HttpPayloadTraitsWithBlob) { expectedRq.headers = {{"X-Foo", R"(Foo)"}}; expectedRq.requireHeaders = {"Content-Length"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(HttpPayloadTraits, HttpPayloadTraitsWithNoBlobBody) { @@ -41,11 +40,10 @@ AWS_PROTOCOL_TEST(HttpPayloadTraits, HttpPayloadTraitsWithNoBlobBody) { request.SetFoo(R"(Foo)"); auto outcome = client.HttpPayloadTraits(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.uri = "/HttpPayloadTraits"; expectedRq.headers = {{"X-Foo", R"(Foo)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-xml/tests/HttpPayloadWithMemberXmlNameTest.cpp b/generated/protocol-tests/tests/input/rest-xml/tests/HttpPayloadWithMemberXmlNameTest.cpp index 5a337fefd6a..6012e721ab7 100644 --- a/generated/protocol-tests/tests/input/rest-xml/tests/HttpPayloadWithMemberXmlNameTest.cpp +++ b/generated/protocol-tests/tests/input/rest-xml/tests/HttpPayloadWithMemberXmlNameTest.cpp @@ -24,8 +24,6 @@ AWS_PROTOCOL_TEST(HttpPayloadWithMemberXmlName, HttpPayloadWithMemberXmlName) { } auto outcome = client.HttpPayloadWithMemberXmlName(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "PUT"; expectedRq.body = "PEhvbGE+PG5hbWU+UGhyZWRkeTwvbmFtZT48L0hvbGE+"; @@ -33,4 +31,5 @@ AWS_PROTOCOL_TEST(HttpPayloadWithMemberXmlName, HttpPayloadWithMemberXmlName) { expectedRq.headers = {{"Content-Type", R"(application/xml)"}}; expectedRq.requireHeaders = {"Content-Length"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-xml/tests/HttpPayloadWithStructureTest.cpp b/generated/protocol-tests/tests/input/rest-xml/tests/HttpPayloadWithStructureTest.cpp index 3863e4e35c3..c3e8eb00841 100644 --- a/generated/protocol-tests/tests/input/rest-xml/tests/HttpPayloadWithStructureTest.cpp +++ b/generated/protocol-tests/tests/input/rest-xml/tests/HttpPayloadWithStructureTest.cpp @@ -25,8 +25,6 @@ AWS_PROTOCOL_TEST(HttpPayloadWithStructure, HttpPayloadWithStructure) { } auto outcome = client.HttpPayloadWithStructure(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "PUT"; expectedRq.body = "PE5lc3RlZFBheWxvYWQ+CiAgICA8Z3JlZXRpbmc+aGVsbG88L2dyZWV0aW5nPgogICAgPG5hbWU+UGhyZWRkeTwvbmFtZT4KPC9OZXN0ZWRQYXlsb2FkPgo="; @@ -34,4 +32,5 @@ AWS_PROTOCOL_TEST(HttpPayloadWithStructure, HttpPayloadWithStructure) { expectedRq.headers = {{"Content-Type", R"(application/xml)"}}; expectedRq.requireHeaders = {"Content-Length"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-xml/tests/HttpPayloadWithUnionTest.cpp b/generated/protocol-tests/tests/input/rest-xml/tests/HttpPayloadWithUnionTest.cpp index 4bc5ce2084a..cba97f920a6 100644 --- a/generated/protocol-tests/tests/input/rest-xml/tests/HttpPayloadWithUnionTest.cpp +++ b/generated/protocol-tests/tests/input/rest-xml/tests/HttpPayloadWithUnionTest.cpp @@ -24,8 +24,6 @@ AWS_PROTOCOL_TEST(HttpPayloadWithUnion, RestXmlHttpPayloadWithUnion) { } auto outcome = client.HttpPayloadWithUnion(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "PUT"; expectedRq.body = "PFVuaW9uUGF5bG9hZD4KICAgIDxncmVldGluZz5oZWxsbzwvZ3JlZXRpbmc+CjwvVW5pb25QYXlsb2FkPg=="; @@ -33,6 +31,7 @@ AWS_PROTOCOL_TEST(HttpPayloadWithUnion, RestXmlHttpPayloadWithUnion) { expectedRq.headers = {{"Content-Type", R"(application/xml)"}}; expectedRq.requireHeaders = {"Content-Length"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(HttpPayloadWithUnion, RestXmlHttpPayloadWithUnsetUnion) { @@ -43,10 +42,9 @@ AWS_PROTOCOL_TEST(HttpPayloadWithUnion, RestXmlHttpPayloadWithUnsetUnion) { HttpPayloadWithUnionRequest request; auto outcome = client.HttpPayloadWithUnion(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "PUT"; expectedRq.uri = "/HttpPayloadWithUnion"; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-xml/tests/HttpPayloadWithXmlNameTest.cpp b/generated/protocol-tests/tests/input/rest-xml/tests/HttpPayloadWithXmlNameTest.cpp index 2683a68a017..5acd1a0d22a 100644 --- a/generated/protocol-tests/tests/input/rest-xml/tests/HttpPayloadWithXmlNameTest.cpp +++ b/generated/protocol-tests/tests/input/rest-xml/tests/HttpPayloadWithXmlNameTest.cpp @@ -24,8 +24,6 @@ AWS_PROTOCOL_TEST(HttpPayloadWithXmlName, HttpPayloadWithXmlName) { } auto outcome = client.HttpPayloadWithXmlName(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "PUT"; expectedRq.body = "PEhlbGxvPjxuYW1lPlBocmVkZHk8L25hbWU+PC9IZWxsbz4="; @@ -33,4 +31,5 @@ AWS_PROTOCOL_TEST(HttpPayloadWithXmlName, HttpPayloadWithXmlName) { expectedRq.headers = {{"Content-Type", R"(application/xml)"}}; expectedRq.requireHeaders = {"Content-Length"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-xml/tests/HttpPayloadWithXmlNamespaceAndPrefixTest.cpp b/generated/protocol-tests/tests/input/rest-xml/tests/HttpPayloadWithXmlNamespaceAndPrefixTest.cpp index 4fdcda6037d..4b041d6ea08 100644 --- a/generated/protocol-tests/tests/input/rest-xml/tests/HttpPayloadWithXmlNamespaceAndPrefixTest.cpp +++ b/generated/protocol-tests/tests/input/rest-xml/tests/HttpPayloadWithXmlNamespaceAndPrefixTest.cpp @@ -24,8 +24,6 @@ AWS_PROTOCOL_TEST(HttpPayloadWithXmlNamespaceAndPrefix, HttpPayloadWithXmlNamesp } auto outcome = client.HttpPayloadWithXmlNamespaceAndPrefix(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "PUT"; expectedRq.body = "PFBheWxvYWRXaXRoWG1sTmFtZXNwYWNlQW5kUHJlZml4IHhtbG5zOmJhej0iaHR0cDovL2Zvby5jb20iPgogICAgPG5hbWU+UGhyZWRkeTwvbmFtZT4KPC9QYXlsb2FkV2l0aFhtbE5hbWVzcGFjZUFuZFByZWZpeD4="; @@ -33,4 +31,5 @@ AWS_PROTOCOL_TEST(HttpPayloadWithXmlNamespaceAndPrefix, HttpPayloadWithXmlNamesp expectedRq.headers = {{"Content-Type", R"(application/xml)"}}; expectedRq.requireHeaders = {"Content-Length"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-xml/tests/HttpPayloadWithXmlNamespaceTest.cpp b/generated/protocol-tests/tests/input/rest-xml/tests/HttpPayloadWithXmlNamespaceTest.cpp index d7ce6be7736..7a3a7164e5b 100644 --- a/generated/protocol-tests/tests/input/rest-xml/tests/HttpPayloadWithXmlNamespaceTest.cpp +++ b/generated/protocol-tests/tests/input/rest-xml/tests/HttpPayloadWithXmlNamespaceTest.cpp @@ -24,8 +24,6 @@ AWS_PROTOCOL_TEST(HttpPayloadWithXmlNamespace, HttpPayloadWithXmlNamespace) { } auto outcome = client.HttpPayloadWithXmlNamespace(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "PUT"; expectedRq.body = "PFBheWxvYWRXaXRoWG1sTmFtZXNwYWNlIHhtbG5zPSJodHRwOi8vZm9vLmNvbSI+CiAgICA8bmFtZT5QaHJlZGR5PC9uYW1lPgo8L1BheWxvYWRXaXRoWG1sTmFtZXNwYWNlPg=="; @@ -33,4 +31,5 @@ AWS_PROTOCOL_TEST(HttpPayloadWithXmlNamespace, HttpPayloadWithXmlNamespace) { expectedRq.headers = {{"Content-Type", R"(application/xml)"}}; expectedRq.requireHeaders = {"Content-Length"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-xml/tests/HttpPrefixHeadersTest.cpp b/generated/protocol-tests/tests/input/rest-xml/tests/HttpPrefixHeadersTest.cpp index ce74569e4b9..a9869343ae0 100644 --- a/generated/protocol-tests/tests/input/rest-xml/tests/HttpPrefixHeadersTest.cpp +++ b/generated/protocol-tests/tests/input/rest-xml/tests/HttpPrefixHeadersTest.cpp @@ -21,13 +21,12 @@ AWS_PROTOCOL_TEST(HttpPrefixHeaders, HttpPrefixHeadersArePresent) { request.SetFooMap({{"abc", R"(Abc value)"}, {"def", R"(Def value)"}}); auto outcome = client.HttpPrefixHeaders(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "GET"; expectedRq.uri = "/HttpPrefixHeaders"; expectedRq.headers = {{"x-foo", R"(Foo)"}, {"x-foo-abc", R"(Abc value)"}, {"x-foo-def", R"(Def value)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(HttpPrefixHeaders, HttpPrefixHeadersAreNotPresent) { @@ -40,13 +39,12 @@ AWS_PROTOCOL_TEST(HttpPrefixHeaders, HttpPrefixHeadersAreNotPresent) { request.SetFooMap({}); auto outcome = client.HttpPrefixHeaders(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "GET"; expectedRq.uri = "/HttpPrefixHeaders"; expectedRq.headers = {{"x-foo", R"(Foo)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(HttpPrefixHeaders, HttpPrefixEmptyHeaders) { @@ -58,11 +56,10 @@ AWS_PROTOCOL_TEST(HttpPrefixHeaders, HttpPrefixEmptyHeaders) { request.SetFooMap({{"abc", R"()"}}); auto outcome = client.HttpPrefixHeaders(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "GET"; expectedRq.uri = "/HttpPrefixHeaders"; expectedRq.headers = {{"x-foo-abc", R"()"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-xml/tests/HttpRequestWithFloatLabelsTest.cpp b/generated/protocol-tests/tests/input/rest-xml/tests/HttpRequestWithFloatLabelsTest.cpp index 8724cd4de51..19e265cdd38 100644 --- a/generated/protocol-tests/tests/input/rest-xml/tests/HttpRequestWithFloatLabelsTest.cpp +++ b/generated/protocol-tests/tests/input/rest-xml/tests/HttpRequestWithFloatLabelsTest.cpp @@ -21,12 +21,11 @@ AWS_PROTOCOL_TEST(HttpRequestWithFloatLabels, RestXmlSupportsNaNFloatLabels) { request.SetDouble(std::numeric_limits::quiet_NaN()); auto outcome = client.HttpRequestWithFloatLabels(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "GET"; expectedRq.uri = "/FloatHttpLabels/NaN/NaN"; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(HttpRequestWithFloatLabels, RestXmlSupportsInfinityFloatLabels) { @@ -39,12 +38,11 @@ AWS_PROTOCOL_TEST(HttpRequestWithFloatLabels, RestXmlSupportsInfinityFloatLabels request.SetDouble(std::numeric_limits::infinity()); auto outcome = client.HttpRequestWithFloatLabels(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "GET"; expectedRq.uri = "/FloatHttpLabels/Infinity/Infinity"; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(HttpRequestWithFloatLabels, RestXmlSupportsNegativeInfinityFloatLabels) { @@ -57,10 +55,9 @@ AWS_PROTOCOL_TEST(HttpRequestWithFloatLabels, RestXmlSupportsNegativeInfinityFlo request.SetDouble(-std::numeric_limits::infinity()); auto outcome = client.HttpRequestWithFloatLabels(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "GET"; expectedRq.uri = "/FloatHttpLabels/-Infinity/-Infinity"; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-xml/tests/HttpRequestWithGreedyLabelInPathTest.cpp b/generated/protocol-tests/tests/input/rest-xml/tests/HttpRequestWithGreedyLabelInPathTest.cpp index e327dbae6fc..ec3ca0399d6 100644 --- a/generated/protocol-tests/tests/input/rest-xml/tests/HttpRequestWithGreedyLabelInPathTest.cpp +++ b/generated/protocol-tests/tests/input/rest-xml/tests/HttpRequestWithGreedyLabelInPathTest.cpp @@ -21,10 +21,9 @@ AWS_PROTOCOL_TEST(HttpRequestWithGreedyLabelInPath, HttpRequestWithGreedyLabelIn request.SetBaz(R"(there/guy)"); auto outcome = client.HttpRequestWithGreedyLabelInPath(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "GET"; expectedRq.uri = "/HttpRequestWithGreedyLabelInPath/foo/hello/baz/there/guy"; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-xml/tests/HttpRequestWithLabelsAndTimestampFormatTest.cpp b/generated/protocol-tests/tests/input/rest-xml/tests/HttpRequestWithLabelsAndTimestampFormatTest.cpp index 2e78291b1cd..e40ee327695 100644 --- a/generated/protocol-tests/tests/input/rest-xml/tests/HttpRequestWithLabelsAndTimestampFormatTest.cpp +++ b/generated/protocol-tests/tests/input/rest-xml/tests/HttpRequestWithLabelsAndTimestampFormatTest.cpp @@ -26,10 +26,9 @@ AWS_PROTOCOL_TEST(HttpRequestWithLabelsAndTimestampFormat, HttpRequestWithLabels request.SetTargetDateTime(Aws::Utils::DateTime(1576540098L)); auto outcome = client.HttpRequestWithLabelsAndTimestampFormat(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "GET"; expectedRq.uri = "/HttpRequestWithLabelsAndTimestampFormat/1576540098/Mon%2C%2016%20Dec%202019%2023%3A48%3A18%20GMT/2019-12-16T23%3A48%3A18Z/2019-12-16T23%3A48%3A18Z/1576540098/Mon%2C%2016%20Dec%202019%2023%3A48%3A18%20GMT/2019-12-16T23%3A48%3A18Z"; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-xml/tests/HttpRequestWithLabelsTest.cpp b/generated/protocol-tests/tests/input/rest-xml/tests/HttpRequestWithLabelsTest.cpp index 227cb0d8a99..261822126c3 100644 --- a/generated/protocol-tests/tests/input/rest-xml/tests/HttpRequestWithLabelsTest.cpp +++ b/generated/protocol-tests/tests/input/rest-xml/tests/HttpRequestWithLabelsTest.cpp @@ -27,12 +27,11 @@ AWS_PROTOCOL_TEST(HttpRequestWithLabels, InputWithHeadersAndAllParams) { request.SetTimestamp(Aws::Utils::DateTime(1576540098L)); auto outcome = client.HttpRequestWithLabels(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "GET"; expectedRq.uri = "/HttpRequestWithLabels/string/1/2/3/4.1/5.1/true/2019-12-16T23%3A48%3A18Z"; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(HttpRequestWithLabels, HttpRequestLabelEscaping) { @@ -51,10 +50,9 @@ AWS_PROTOCOL_TEST(HttpRequestWithLabels, HttpRequestLabelEscaping) { request.SetTimestamp(Aws::Utils::DateTime(1576540098L)); auto outcome = client.HttpRequestWithLabels(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "GET"; expectedRq.uri = "/HttpRequestWithLabels/%20%25%3A%2F%3F%23%5B%5D%40%21%24%26%27%28%29%2A%2B%2C%3B%3D%F0%9F%98%B9/1/2/3/4.1/5.1/true/2019-12-16T23%3A48%3A18Z"; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-xml/tests/HttpStringPayloadTest.cpp b/generated/protocol-tests/tests/input/rest-xml/tests/HttpStringPayloadTest.cpp index 9207711469f..36b353758ae 100644 --- a/generated/protocol-tests/tests/input/rest-xml/tests/HttpStringPayloadTest.cpp +++ b/generated/protocol-tests/tests/input/rest-xml/tests/HttpStringPayloadTest.cpp @@ -20,12 +20,11 @@ AWS_PROTOCOL_TEST(HttpStringPayload, RestXmlStringPayloadRequest) { request.SetBody([](){ return Aws::MakeShared("Test", R"(rawstring)", std::ios_base::in | std::ios_base::binary); }() ); auto outcome = client.HttpStringPayload(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "cmF3c3RyaW5n"; expectedRq.uri = "/StringPayload"; expectedRq.headers = {{"Content-Type", R"(text/plain)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-xml/tests/InputAndOutputWithHeadersTest.cpp b/generated/protocol-tests/tests/input/rest-xml/tests/InputAndOutputWithHeadersTest.cpp index e6c7a49c6c2..9a1a87dc529 100644 --- a/generated/protocol-tests/tests/input/rest-xml/tests/InputAndOutputWithHeadersTest.cpp +++ b/generated/protocol-tests/tests/input/rest-xml/tests/InputAndOutputWithHeadersTest.cpp @@ -22,13 +22,12 @@ AWS_PROTOCOL_TEST(InputAndOutputWithHeaders, InputAndOutputWithStringHeaders) { request.SetHeaderStringSet({R"(a)", R"(b)", R"(c)"}); auto outcome = client.InputAndOutputWithHeaders(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.uri = "/InputAndOutputWithHeaders"; expectedRq.headers = {{"X-String", R"(Hello)"}, {"X-StringList", R"(a, b, c)"}, {"X-StringSet", R"(a, b, c)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(InputAndOutputWithHeaders, InputAndOutputWithNumericHeaders) { @@ -46,13 +45,12 @@ AWS_PROTOCOL_TEST(InputAndOutputWithHeaders, InputAndOutputWithNumericHeaders) { request.SetHeaderIntegerList({1, 2, 3}); auto outcome = client.InputAndOutputWithHeaders(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.uri = "/InputAndOutputWithHeaders"; expectedRq.headers = {{"X-Byte", R"(1)"}, {"X-Double", R"(1.1)"}, {"X-Float", R"(1.1)"}, {"X-Integer", R"(123)"}, {"X-IntegerList", R"(1, 2, 3)"}, {"X-Long", R"(123)"}, {"X-Short", R"(123)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(InputAndOutputWithHeaders, InputAndOutputWithBooleanHeaders) { @@ -66,13 +64,12 @@ AWS_PROTOCOL_TEST(InputAndOutputWithHeaders, InputAndOutputWithBooleanHeaders) { request.SetHeaderBooleanList({true, false, true}); auto outcome = client.InputAndOutputWithHeaders(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.uri = "/InputAndOutputWithHeaders"; expectedRq.headers = {{"X-Boolean1", R"(true)"}, {"X-Boolean2", R"(false)"}, {"X-BooleanList", R"(true, false, true)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(InputAndOutputWithHeaders, InputAndOutputWithTimestampHeaders) { @@ -84,13 +81,12 @@ AWS_PROTOCOL_TEST(InputAndOutputWithHeaders, InputAndOutputWithTimestampHeaders) request.SetHeaderTimestampList({Aws::Utils::DateTime(1576540098L), Aws::Utils::DateTime(1576540098L)}); auto outcome = client.InputAndOutputWithHeaders(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.uri = "/InputAndOutputWithHeaders"; expectedRq.headers = {{"X-TimestampList", R"(Mon, 16 Dec 2019 23:48:18 GMT, Mon, 16 Dec 2019 23:48:18 GMT)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(InputAndOutputWithHeaders, InputAndOutputWithEnumHeaders) { @@ -103,13 +99,12 @@ AWS_PROTOCOL_TEST(InputAndOutputWithHeaders, InputAndOutputWithEnumHeaders) { request.SetHeaderEnumList({FooEnumMapper::GetFooEnumForName(R"e(Foo)e"), FooEnumMapper::GetFooEnumForName(R"e(Bar)e"), FooEnumMapper::GetFooEnumForName(R"e(Baz)e")}); auto outcome = client.InputAndOutputWithHeaders(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.uri = "/InputAndOutputWithHeaders"; expectedRq.headers = {{"X-Enum", R"(Foo)"}, {"X-EnumList", R"(Foo, Bar, Baz)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(InputAndOutputWithHeaders, RestXmlSupportsNaNFloatHeaderInputs) { @@ -122,13 +117,12 @@ AWS_PROTOCOL_TEST(InputAndOutputWithHeaders, RestXmlSupportsNaNFloatHeaderInputs request.SetHeaderDouble(std::numeric_limits::quiet_NaN()); auto outcome = client.InputAndOutputWithHeaders(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.uri = "/InputAndOutputWithHeaders"; expectedRq.headers = {{"X-Double", R"(NaN)"}, {"X-Float", R"(NaN)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(InputAndOutputWithHeaders, RestXmlSupportsInfinityFloatHeaderInputs) { @@ -141,13 +135,12 @@ AWS_PROTOCOL_TEST(InputAndOutputWithHeaders, RestXmlSupportsInfinityFloatHeaderI request.SetHeaderDouble(std::numeric_limits::infinity()); auto outcome = client.InputAndOutputWithHeaders(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.uri = "/InputAndOutputWithHeaders"; expectedRq.headers = {{"X-Double", R"(Infinity)"}, {"X-Float", R"(Infinity)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(InputAndOutputWithHeaders, RestXmlSupportsNegativeInfinityFloatHeaderInputs) { @@ -160,11 +153,10 @@ AWS_PROTOCOL_TEST(InputAndOutputWithHeaders, RestXmlSupportsNegativeInfinityFloa request.SetHeaderDouble(-std::numeric_limits::infinity()); auto outcome = client.InputAndOutputWithHeaders(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.uri = "/InputAndOutputWithHeaders"; expectedRq.headers = {{"X-Double", R"(-Infinity)"}, {"X-Float", R"(-Infinity)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-xml/tests/NestedXmlMapWithXmlNameTest.cpp b/generated/protocol-tests/tests/input/rest-xml/tests/NestedXmlMapWithXmlNameTest.cpp index dfed0bc4b9a..c7eebe5d511 100644 --- a/generated/protocol-tests/tests/input/rest-xml/tests/NestedXmlMapWithXmlNameTest.cpp +++ b/generated/protocol-tests/tests/input/rest-xml/tests/NestedXmlMapWithXmlNameTest.cpp @@ -20,12 +20,11 @@ AWS_PROTOCOL_TEST(NestedXmlMapWithXmlName, NestedXmlMapWithXmlNameSerializes) { request.SetNestedXmlMapWithXmlNameMap({{"foo", {{"bar", R"(Baz)"}, {"fizz", R"(Buzz)"}}}, {"qux", {{"foobar", R"(Bar)"}, {"fizzbuzz", R"(Buzz)"}}}}); auto outcome = client.NestedXmlMapWithXmlName(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "ICAgIDxOZXN0ZWRYbWxNYXBXaXRoWG1sTmFtZUlucHV0T3V0cHV0PgogICAgICAgIDxuZXN0ZWRYbWxNYXBXaXRoWG1sTmFtZU1hcD4KICAgICAgICAgICAgPGVudHJ5PgogICAgICAgICAgICAgICAgPE91dGVyS2V5PmZvbzwvT3V0ZXJLZXk+CiAgICAgICAgICAgICAgICA8dmFsdWU+CiAgICAgICAgICAgICAgICAgICAgPGVudHJ5PgogICAgICAgICAgICAgICAgICAgICAgICA8SW5uZXJLZXk+YmFyPC9Jbm5lcktleT4KICAgICAgICAgICAgICAgICAgICAgICAgPElubmVyVmFsdWU+QmF6PC9Jbm5lclZhbHVlPgogICAgICAgICAgICAgICAgICAgIDwvZW50cnk+CiAgICAgICAgICAgICAgICAgICAgPGVudHJ5PgogICAgICAgICAgICAgICAgICAgICAgICA8SW5uZXJLZXk+Zml6ejwvSW5uZXJLZXk+CiAgICAgICAgICAgICAgICAgICAgICAgIDxJbm5lclZhbHVlPkJ1eno8L0lubmVyVmFsdWU+CiAgICAgICAgICAgICAgICAgICAgPC9lbnRyeT4KICAgICAgICAgICAgICAgIDwvdmFsdWU+CiAgICAgICAgICAgIDwvZW50cnk+CiAgICAgICAgICAgIDxlbnRyeT4KICAgICAgICAgICAgICAgIDxPdXRlcktleT5xdXg8L091dGVyS2V5PgogICAgICAgICAgICAgICAgPHZhbHVlPgogICAgICAgICAgICAgICAgICAgIDxlbnRyeT4KICAgICAgICAgICAgICAgICAgICAgICAgPElubmVyS2V5PmZvb2JhcjwvSW5uZXJLZXk+CiAgICAgICAgICAgICAgICAgICAgICAgIDxJbm5lclZhbHVlPkJhcjwvSW5uZXJWYWx1ZT4KICAgICAgICAgICAgICAgICAgICA8L2VudHJ5PgogICAgICAgICAgICAgICAgICAgIDxlbnRyeT4KICAgICAgICAgICAgICAgICAgICAgICAgPElubmVyS2V5PmZpenpidXp6PC9Jbm5lcktleT4KICAgICAgICAgICAgICAgICAgICAgICAgPElubmVyVmFsdWU+QnV6ejwvSW5uZXJWYWx1ZT4KICAgICAgICAgICAgICAgICAgICA8L2VudHJ5PgogICAgICAgICAgICAgICAgPC92YWx1ZT4KICAgICAgICAgICAgPC9lbnRyeT4KICAgICAgICA8L25lc3RlZFhtbE1hcFdpdGhYbWxOYW1lTWFwPgogICAgPC9OZXN0ZWRYbWxNYXBXaXRoWG1sTmFtZUlucHV0T3V0cHV0Pgo="; expectedRq.uri = "/NestedXmlMapWithXmlName"; expectedRq.headers = {{"Content-Type", R"(application/xml)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-xml/tests/NestedXmlMapsTest.cpp b/generated/protocol-tests/tests/input/rest-xml/tests/NestedXmlMapsTest.cpp index e1725c60a1b..fb187c2682e 100644 --- a/generated/protocol-tests/tests/input/rest-xml/tests/NestedXmlMapsTest.cpp +++ b/generated/protocol-tests/tests/input/rest-xml/tests/NestedXmlMapsTest.cpp @@ -20,14 +20,13 @@ AWS_PROTOCOL_TEST(NestedXmlMaps, NestedXmlMapRequest) { request.SetNestedMap({{"foo", {{"bar", FooEnumMapper::GetFooEnumForName(R"e(Bar)e")}}}}); auto outcome = client.NestedXmlMaps(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "PE5lc3RlZFhtbE1hcHNSZXF1ZXN0PgogICAgPG5lc3RlZE1hcD4KICAgICAgICA8ZW50cnk+CiAgICAgICAgICAgIDxrZXk+Zm9vPC9rZXk+CiAgICAgICAgICAgIDx2YWx1ZT4KICAgICAgICAgICAgICAgIDxlbnRyeT4KICAgICAgICAgICAgICAgICAgICA8a2V5PmJhcjwva2V5PgogICAgICAgICAgICAgICAgICAgIDx2YWx1ZT5CYXI8L3ZhbHVlPgogICAgICAgICAgICAgICAgPC9lbnRyeT4KICAgICAgICAgICAgPC92YWx1ZT4KICAgICAgICA8L2VudHJ5PgogICAgPC9uZXN0ZWRNYXA+CjwvTmVzdGVkWG1sTWFwc1JlcXVlc3Q+"; expectedRq.uri = "/NestedXmlMaps"; expectedRq.headers = {{"Content-Type", R"(application/xml)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(NestedXmlMaps, FlatNestedXmlMapRequest) { @@ -39,12 +38,11 @@ AWS_PROTOCOL_TEST(NestedXmlMaps, FlatNestedXmlMapRequest) { request.SetFlatNestedMap({{"foo", {{"bar", FooEnumMapper::GetFooEnumForName(R"e(Bar)e")}}}}); auto outcome = client.NestedXmlMaps(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "PE5lc3RlZFhtbE1hcHNSZXF1ZXN0PgogICAgPGZsYXROZXN0ZWRNYXA+CiAgICAgICAgPGtleT5mb288L2tleT4KICAgICAgICA8dmFsdWU+CiAgICAgICAgICAgIDxlbnRyeT4KICAgICAgICAgICAgICAgIDxrZXk+YmFyPC9rZXk+CiAgICAgICAgICAgICAgICA8dmFsdWU+QmFyPC92YWx1ZT4KICAgICAgICAgICAgPC9lbnRyeT4KICAgICAgICA8L3ZhbHVlPgogICAgPC9mbGF0TmVzdGVkTWFwPgo8L05lc3RlZFhtbE1hcHNSZXF1ZXN0Pg=="; expectedRq.uri = "/NestedXmlMaps"; expectedRq.headers = {{"Content-Type", R"(application/xml)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-xml/tests/NoInputAndNoOutputTest.cpp b/generated/protocol-tests/tests/input/rest-xml/tests/NoInputAndNoOutputTest.cpp index 8c956f97d5b..6d683b8bf26 100644 --- a/generated/protocol-tests/tests/input/rest-xml/tests/NoInputAndNoOutputTest.cpp +++ b/generated/protocol-tests/tests/input/rest-xml/tests/NoInputAndNoOutputTest.cpp @@ -19,10 +19,9 @@ AWS_PROTOCOL_TEST(NoInputAndNoOutput, NoInputAndNoOutput) { NoInputAndNoOutputRequest request; auto outcome = client.NoInputAndNoOutput(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.uri = "/NoInputAndNoOutput"; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-xml/tests/NoInputAndOutputTest.cpp b/generated/protocol-tests/tests/input/rest-xml/tests/NoInputAndOutputTest.cpp index c48df11e381..c8d9be5de10 100644 --- a/generated/protocol-tests/tests/input/rest-xml/tests/NoInputAndOutputTest.cpp +++ b/generated/protocol-tests/tests/input/rest-xml/tests/NoInputAndOutputTest.cpp @@ -19,10 +19,9 @@ AWS_PROTOCOL_TEST(NoInputAndOutput, NoInputAndOutput) { NoInputAndOutputRequest request; auto outcome = client.NoInputAndOutput(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.uri = "/NoInputAndOutputOutput"; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-xml/tests/NullAndEmptyHeadersClientTest.cpp b/generated/protocol-tests/tests/input/rest-xml/tests/NullAndEmptyHeadersClientTest.cpp index f9b8e39fa0f..3d0a6b793f7 100644 --- a/generated/protocol-tests/tests/input/rest-xml/tests/NullAndEmptyHeadersClientTest.cpp +++ b/generated/protocol-tests/tests/input/rest-xml/tests/NullAndEmptyHeadersClientTest.cpp @@ -22,12 +22,11 @@ AWS_PROTOCOL_TEST(NullAndEmptyHeadersClient, NullAndEmptyHeaders) { request.SetC({}); auto outcome = client.NullAndEmptyHeadersClient(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "GET"; expectedRq.uri = "/NullAndEmptyHeadersClient"; expectedRq.headers = {{"X-B", R"()"}, {"X-C", R"()"}}; expectedRq.forbidHeaders = {"X-A"}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-xml/tests/OmitsNullSerializesEmptyStringTest.cpp b/generated/protocol-tests/tests/input/rest-xml/tests/OmitsNullSerializesEmptyStringTest.cpp index 24178deb26c..24a28a92c07 100644 --- a/generated/protocol-tests/tests/input/rest-xml/tests/OmitsNullSerializesEmptyStringTest.cpp +++ b/generated/protocol-tests/tests/input/rest-xml/tests/OmitsNullSerializesEmptyStringTest.cpp @@ -20,12 +20,11 @@ AWS_PROTOCOL_TEST(OmitsNullSerializesEmptyString, RestXmlOmitsNullQuery) { request.SetNullValue(R"(null)"); auto outcome = client.OmitsNullSerializesEmptyString(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "GET"; expectedRq.uri = "/OmitsNullSerializesEmptyString"; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(OmitsNullSerializesEmptyString, RestXmlSerializesEmptyString) { @@ -37,10 +36,9 @@ AWS_PROTOCOL_TEST(OmitsNullSerializesEmptyString, RestXmlSerializesEmptyString) request.SetEmptyString(R"()"); auto outcome = client.OmitsNullSerializesEmptyString(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "GET"; expectedRq.uri = "/OmitsNullSerializesEmptyString?Empty="; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-xml/tests/PutWithContentEncodingTest.cpp b/generated/protocol-tests/tests/input/rest-xml/tests/PutWithContentEncodingTest.cpp index cfb6c497c87..da809e5d0af 100644 --- a/generated/protocol-tests/tests/input/rest-xml/tests/PutWithContentEncodingTest.cpp +++ b/generated/protocol-tests/tests/input/rest-xml/tests/PutWithContentEncodingTest.cpp @@ -148,13 +148,12 @@ EcffzjixWU9FpAyGp2rVl4ETRgqljOGw4UgK31r0ZIEGnH0xGz1FtbW1OcQM008JVujRqulCucEMmntr )"); auto outcome = client.PutWithContentEncoding(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.uri = "/requestcompression/putcontentwithencoding"; expectedRq.headers = {{"Content-Encoding", R"(gzip)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(PutWithContentEncoding, SDKAppendedGzipAfterProvidedEncoding_restXml) { @@ -295,11 +294,10 @@ EcffzjixWU9FpAyGp2rVl4ETRgqljOGw4UgK31r0ZIEGnH0xGz1FtbW1OcQM008JVujRqulCucEMmntr )"); auto outcome = client.PutWithContentEncoding(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.uri = "/requestcompression/putcontentwithencoding"; expectedRq.headers = {{"Content-Encoding", R"(custom, gzip)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-xml/tests/QueryIdempotencyTokenAutoFillTest.cpp b/generated/protocol-tests/tests/input/rest-xml/tests/QueryIdempotencyTokenAutoFillTest.cpp index 5d30a2adbed..9f95aa27654 100644 --- a/generated/protocol-tests/tests/input/rest-xml/tests/QueryIdempotencyTokenAutoFillTest.cpp +++ b/generated/protocol-tests/tests/input/rest-xml/tests/QueryIdempotencyTokenAutoFillTest.cpp @@ -19,12 +19,11 @@ AWS_PROTOCOL_TEST(QueryIdempotencyTokenAutoFill, QueryIdempotencyTokenAutoFill) QueryIdempotencyTokenAutoFillRequest request; auto outcome = client.QueryIdempotencyTokenAutoFill(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.uri = "/QueryIdempotencyTokenAutoFill?token=00000000-0000-4000-8000-000000000000"; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(QueryIdempotencyTokenAutoFill, QueryIdempotencyTokenAutoFillIsSet) { @@ -36,10 +35,9 @@ AWS_PROTOCOL_TEST(QueryIdempotencyTokenAutoFill, QueryIdempotencyTokenAutoFillIs request.SetToken(R"(00000000-0000-4000-8000-000000000000)"); auto outcome = client.QueryIdempotencyTokenAutoFill(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.uri = "/QueryIdempotencyTokenAutoFill?token=00000000-0000-4000-8000-000000000000"; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-xml/tests/QueryParamsAsStringListMapTest.cpp b/generated/protocol-tests/tests/input/rest-xml/tests/QueryParamsAsStringListMapTest.cpp index f0640f2a77d..e4b7d757db3 100644 --- a/generated/protocol-tests/tests/input/rest-xml/tests/QueryParamsAsStringListMapTest.cpp +++ b/generated/protocol-tests/tests/input/rest-xml/tests/QueryParamsAsStringListMapTest.cpp @@ -21,10 +21,9 @@ AWS_PROTOCOL_TEST(QueryParamsAsStringListMap, RestXmlQueryParamsStringListMap) { request.SetFoo({{"baz", {R"(bar)", R"(qux)"}}}); auto outcome = client.QueryParamsAsStringListMap(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.uri = "/StringListMap?corge=named&baz=bar&baz=qux"; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-xml/tests/QueryPrecedenceTest.cpp b/generated/protocol-tests/tests/input/rest-xml/tests/QueryPrecedenceTest.cpp index 6490de479b4..b901ffb8267 100644 --- a/generated/protocol-tests/tests/input/rest-xml/tests/QueryPrecedenceTest.cpp +++ b/generated/protocol-tests/tests/input/rest-xml/tests/QueryPrecedenceTest.cpp @@ -21,10 +21,9 @@ AWS_PROTOCOL_TEST(QueryPrecedence, RestXmlQueryPrecedence) { request.SetBaz({{"bar", R"(fromMap)"}, {"qux", R"(alsoFromMap)"}}); auto outcome = client.QueryPrecedence(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.uri = "/Precedence?bar=named&qux=alsoFromMap"; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-xml/tests/RecursiveShapesTest.cpp b/generated/protocol-tests/tests/input/rest-xml/tests/RecursiveShapesTest.cpp index 043831ca782..6e40141752d 100644 --- a/generated/protocol-tests/tests/input/rest-xml/tests/RecursiveShapesTest.cpp +++ b/generated/protocol-tests/tests/input/rest-xml/tests/RecursiveShapesTest.cpp @@ -5,6 +5,7 @@ #include #include #include +#include #include #include @@ -40,12 +41,11 @@ AWS_PROTOCOL_TEST(RecursiveShapes, RecursiveShapes) { } auto outcome = client.RecursiveShapes(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "PUT"; expectedRq.body = "PFJlY3Vyc2l2ZVNoYXBlc1JlcXVlc3Q+CiAgICA8bmVzdGVkPgogICAgICAgIDxmb28+Rm9vMTwvZm9vPgogICAgICAgIDxuZXN0ZWQ+CiAgICAgICAgICAgIDxiYXI+QmFyMTwvYmFyPgogICAgICAgICAgICA8cmVjdXJzaXZlTWVtYmVyPgogICAgICAgICAgICAgICAgPGZvbz5Gb28yPC9mb28+CiAgICAgICAgICAgICAgICA8bmVzdGVkPgogICAgICAgICAgICAgICAgICAgIDxiYXI+QmFyMjwvYmFyPgogICAgICAgICAgICAgICAgPC9uZXN0ZWQ+CiAgICAgICAgICAgIDwvcmVjdXJzaXZlTWVtYmVyPgogICAgICAgIDwvbmVzdGVkPgogICAgPC9uZXN0ZWQ+CjwvUmVjdXJzaXZlU2hhcGVzUmVxdWVzdD4K"; expectedRq.uri = "/RecursiveShapes"; expectedRq.headers = {{"Content-Type", R"(application/xml)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-xml/tests/SimpleScalarPropertiesTest.cpp b/generated/protocol-tests/tests/input/rest-xml/tests/SimpleScalarPropertiesTest.cpp index ca22c7c57ae..fc9c7521e11 100644 --- a/generated/protocol-tests/tests/input/rest-xml/tests/SimpleScalarPropertiesTest.cpp +++ b/generated/protocol-tests/tests/input/rest-xml/tests/SimpleScalarPropertiesTest.cpp @@ -29,14 +29,13 @@ AWS_PROTOCOL_TEST(SimpleScalarProperties, SimpleScalarProperties) { request.SetDoubleValue(6.5); auto outcome = client.SimpleScalarProperties(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "PUT"; expectedRq.body = "PFNpbXBsZVNjYWxhclByb3BlcnRpZXNSZXF1ZXN0PgogICAgPHN0cmluZ1ZhbHVlPnN0cmluZzwvc3RyaW5nVmFsdWU+CiAgICA8dHJ1ZUJvb2xlYW5WYWx1ZT50cnVlPC90cnVlQm9vbGVhblZhbHVlPgogICAgPGZhbHNlQm9vbGVhblZhbHVlPmZhbHNlPC9mYWxzZUJvb2xlYW5WYWx1ZT4KICAgIDxieXRlVmFsdWU+MTwvYnl0ZVZhbHVlPgogICAgPHNob3J0VmFsdWU+Mjwvc2hvcnRWYWx1ZT4KICAgIDxpbnRlZ2VyVmFsdWU+MzwvaW50ZWdlclZhbHVlPgogICAgPGxvbmdWYWx1ZT40PC9sb25nVmFsdWU+CiAgICA8ZmxvYXRWYWx1ZT41LjU8L2Zsb2F0VmFsdWU+CiAgICA8RG91YmxlRHJpYmJsZT42LjU8L0RvdWJsZURyaWJibGU+CjwvU2ltcGxlU2NhbGFyUHJvcGVydGllc1JlcXVlc3Q+Cg=="; expectedRq.uri = "/SimpleScalarProperties"; expectedRq.headers = {{"Content-Type", R"(application/xml)"}, {"X-Foo", R"(Foo)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(SimpleScalarProperties, SimpleScalarPropertiesWithEscapedCharacter) { @@ -49,14 +48,13 @@ AWS_PROTOCOL_TEST(SimpleScalarProperties, SimpleScalarPropertiesWithEscapedChara request.SetStringValue(R"()"); auto outcome = client.SimpleScalarProperties(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "PUT"; expectedRq.body = "PFNpbXBsZVNjYWxhclByb3BlcnRpZXNSZXF1ZXN0PgogICAgPHN0cmluZ1ZhbHVlPiZsdDtzdHJpbmcmZ3Q7PC9zdHJpbmdWYWx1ZT4KPC9TaW1wbGVTY2FsYXJQcm9wZXJ0aWVzUmVxdWVzdD4K"; expectedRq.uri = "/SimpleScalarProperties"; expectedRq.headers = {{"Content-Type", R"(application/xml)"}, {"X-Foo", R"(Foo)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(SimpleScalarProperties, SimpleScalarPropertiesWithWhiteSpace) { @@ -69,14 +67,13 @@ AWS_PROTOCOL_TEST(SimpleScalarProperties, SimpleScalarPropertiesWithWhiteSpace) request.SetStringValue(R"( string with white space )"); auto outcome = client.SimpleScalarProperties(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "PUT"; expectedRq.body = "PFNpbXBsZVNjYWxhclByb3BlcnRpZXNSZXF1ZXN0PgogICAgPHN0cmluZ1ZhbHVlPiAgc3RyaW5nIHdpdGggd2hpdGUgICAgc3BhY2UgIDwvc3RyaW5nVmFsdWU+CjwvU2ltcGxlU2NhbGFyUHJvcGVydGllc1JlcXVlc3Q+Cg=="; expectedRq.uri = "/SimpleScalarProperties"; expectedRq.headers = {{"Content-Type", R"(application/xml)"}, {"X-Foo", R"(Foo)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(SimpleScalarProperties, SimpleScalarPropertiesPureWhiteSpace) { @@ -89,14 +86,13 @@ AWS_PROTOCOL_TEST(SimpleScalarProperties, SimpleScalarPropertiesPureWhiteSpace) request.SetStringValue(R"( )"); auto outcome = client.SimpleScalarProperties(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "PUT"; expectedRq.body = "PFNpbXBsZVNjYWxhclByb3BlcnRpZXNSZXF1ZXN0PgogICAgPHN0cmluZ1ZhbHVlPiAgIDwvc3RyaW5nVmFsdWU+CjwvU2ltcGxlU2NhbGFyUHJvcGVydGllc1JlcXVlc3Q+Cg=="; expectedRq.uri = "/SimpleScalarProperties"; expectedRq.headers = {{"Content-Type", R"(application/xml)"}, {"X-Foo", R"(Foo)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(SimpleScalarProperties, RestXmlSupportsNaNFloatInputs) { @@ -109,14 +105,13 @@ AWS_PROTOCOL_TEST(SimpleScalarProperties, RestXmlSupportsNaNFloatInputs) { request.SetDoubleValue(std::numeric_limits::quiet_NaN()); auto outcome = client.SimpleScalarProperties(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "PUT"; expectedRq.body = "PFNpbXBsZVNjYWxhclByb3BlcnRpZXNSZXF1ZXN0PgogICAgPGZsb2F0VmFsdWU+TmFOPC9mbG9hdFZhbHVlPgogICAgPERvdWJsZURyaWJibGU+TmFOPC9Eb3VibGVEcmliYmxlPgo8L1NpbXBsZVNjYWxhclByb3BlcnRpZXNSZXF1ZXN0Pgo="; expectedRq.uri = "/SimpleScalarProperties"; expectedRq.headers = {{"Content-Type", R"(application/xml)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(SimpleScalarProperties, RestXmlSupportsInfinityFloatInputs) { @@ -129,14 +124,13 @@ AWS_PROTOCOL_TEST(SimpleScalarProperties, RestXmlSupportsInfinityFloatInputs) { request.SetDoubleValue(std::numeric_limits::infinity()); auto outcome = client.SimpleScalarProperties(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "PUT"; expectedRq.body = "PFNpbXBsZVNjYWxhclByb3BlcnRpZXNSZXF1ZXN0PgogICAgPGZsb2F0VmFsdWU+SW5maW5pdHk8L2Zsb2F0VmFsdWU+CiAgICA8RG91YmxlRHJpYmJsZT5JbmZpbml0eTwvRG91YmxlRHJpYmJsZT4KPC9TaW1wbGVTY2FsYXJQcm9wZXJ0aWVzUmVxdWVzdD4K"; expectedRq.uri = "/SimpleScalarProperties"; expectedRq.headers = {{"Content-Type", R"(application/xml)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(SimpleScalarProperties, RestXmlSupportsNegativeInfinityFloatInputs) { @@ -149,12 +143,11 @@ AWS_PROTOCOL_TEST(SimpleScalarProperties, RestXmlSupportsNegativeInfinityFloatIn request.SetDoubleValue(-std::numeric_limits::infinity()); auto outcome = client.SimpleScalarProperties(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "PUT"; expectedRq.body = "PFNpbXBsZVNjYWxhclByb3BlcnRpZXNSZXF1ZXN0PgogICAgPGZsb2F0VmFsdWU+LUluZmluaXR5PC9mbG9hdFZhbHVlPgogICAgPERvdWJsZURyaWJibGU+LUluZmluaXR5PC9Eb3VibGVEcmliYmxlPgo8L1NpbXBsZVNjYWxhclByb3BlcnRpZXNSZXF1ZXN0Pgo="; expectedRq.uri = "/SimpleScalarProperties"; expectedRq.headers = {{"Content-Type", R"(application/xml)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-xml/tests/TimestampFormatHeadersTest.cpp b/generated/protocol-tests/tests/input/rest-xml/tests/TimestampFormatHeadersTest.cpp index 16892bd6dd6..dc63dd526cf 100644 --- a/generated/protocol-tests/tests/input/rest-xml/tests/TimestampFormatHeadersTest.cpp +++ b/generated/protocol-tests/tests/input/rest-xml/tests/TimestampFormatHeadersTest.cpp @@ -26,11 +26,10 @@ AWS_PROTOCOL_TEST(TimestampFormatHeaders, TimestampFormatHeaders) { request.SetTargetDateTime(Aws::Utils::DateTime(1576540098L)); auto outcome = client.TimestampFormatHeaders(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.uri = "/TimestampFormatHeaders"; expectedRq.headers = {{"X-defaultFormat", R"(Mon, 16 Dec 2019 23:48:18 GMT)"}, {"X-memberDateTime", R"(2019-12-16T23:48:18Z)"}, {"X-memberEpochSeconds", R"(1576540098)"}, {"X-memberHttpDate", R"(Mon, 16 Dec 2019 23:48:18 GMT)"}, {"X-targetDateTime", R"(2019-12-16T23:48:18Z)"}, {"X-targetEpochSeconds", R"(1576540098)"}, {"X-targetHttpDate", R"(Mon, 16 Dec 2019 23:48:18 GMT)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-xml/tests/XmlAttributesOnPayloadTest.cpp b/generated/protocol-tests/tests/input/rest-xml/tests/XmlAttributesOnPayloadTest.cpp index 5bd6ed9304f..dbc6fd24e7d 100644 --- a/generated/protocol-tests/tests/input/rest-xml/tests/XmlAttributesOnPayloadTest.cpp +++ b/generated/protocol-tests/tests/input/rest-xml/tests/XmlAttributesOnPayloadTest.cpp @@ -25,12 +25,11 @@ AWS_PROTOCOL_TEST(XmlAttributesOnPayload, XmlAttributesOnPayload) { } auto outcome = client.XmlAttributesOnPayload(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "PUT"; expectedRq.body = "PFhtbEF0dHJpYnV0ZXNQYXlsb2FkUmVxdWVzdCB0ZXN0PSJ0ZXN0Ij4KICAgIDxmb28+aGk8L2Zvbz4KPC9YbWxBdHRyaWJ1dGVzUGF5bG9hZFJlcXVlc3Q+Cg=="; expectedRq.uri = "/XmlAttributesOnPayload"; expectedRq.headers = {{"Content-Type", R"(application/xml)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-xml/tests/XmlAttributesTest.cpp b/generated/protocol-tests/tests/input/rest-xml/tests/XmlAttributesTest.cpp index 88a0f147de2..03ddae18893 100644 --- a/generated/protocol-tests/tests/input/rest-xml/tests/XmlAttributesTest.cpp +++ b/generated/protocol-tests/tests/input/rest-xml/tests/XmlAttributesTest.cpp @@ -21,14 +21,13 @@ AWS_PROTOCOL_TEST(XmlAttributes, XmlAttributes) { request.SetAttr(R"(test)"); auto outcome = client.XmlAttributes(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "PUT"; expectedRq.body = "PFhtbEF0dHJpYnV0ZXNSZXF1ZXN0IHRlc3Q9InRlc3QiPgogICAgPGZvbz5oaTwvZm9vPgo8L1htbEF0dHJpYnV0ZXNSZXF1ZXN0Pgo="; expectedRq.uri = "/XmlAttributes"; expectedRq.headers = {{"Content-Type", R"(application/xml)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(XmlAttributes, XmlAttributesWithEscaping) { @@ -41,12 +40,11 @@ AWS_PROTOCOL_TEST(XmlAttributes, XmlAttributesWithEscaping) { request.SetAttr(R"()"); auto outcome = client.XmlAttributes(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "PUT"; expectedRq.body = "PFhtbEF0dHJpYnV0ZXNSZXF1ZXN0IHRlc3Q9IiZsdDt0ZXN0JmFtcDttb2NrJmd0OyI+CiAgICA8Zm9vPmhpPC9mb28+CjwvWG1sQXR0cmlidXRlc1JlcXVlc3Q+Cg=="; expectedRq.uri = "/XmlAttributes"; expectedRq.headers = {{"Content-Type", R"(application/xml)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-xml/tests/XmlBlobsTest.cpp b/generated/protocol-tests/tests/input/rest-xml/tests/XmlBlobsTest.cpp index 86186239033..5920a9f03c9 100644 --- a/generated/protocol-tests/tests/input/rest-xml/tests/XmlBlobsTest.cpp +++ b/generated/protocol-tests/tests/input/rest-xml/tests/XmlBlobsTest.cpp @@ -20,12 +20,11 @@ AWS_PROTOCOL_TEST(XmlBlobs, XmlBlobs) { request.SetData(Aws::String(R"(value)")); auto outcome = client.XmlBlobs(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "PFhtbEJsb2JzUmVxdWVzdD4KICAgIDxkYXRhPmRtRnNkV1U9PC9kYXRhPgo8L1htbEJsb2JzUmVxdWVzdD4K"; expectedRq.uri = "/XmlBlobs"; expectedRq.headers = {{"Content-Type", R"(application/xml)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-xml/tests/XmlEmptyListsTest.cpp b/generated/protocol-tests/tests/input/rest-xml/tests/XmlEmptyListsTest.cpp index b34b73331c6..b9e456471f2 100644 --- a/generated/protocol-tests/tests/input/rest-xml/tests/XmlEmptyListsTest.cpp +++ b/generated/protocol-tests/tests/input/rest-xml/tests/XmlEmptyListsTest.cpp @@ -21,12 +21,11 @@ AWS_PROTOCOL_TEST(XmlEmptyLists, XmlEmptyLists) { request.SetStringSet({}); auto outcome = client.XmlEmptyLists(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "PUT"; expectedRq.body = "PFhtbEVtcHR5TGlzdHNSZXF1ZXN0PgogICAgICAgIDxzdHJpbmdMaXN0Pjwvc3RyaW5nTGlzdD4KICAgICAgICA8c3RyaW5nU2V0Pjwvc3RyaW5nU2V0Pgo8L1htbEVtcHR5TGlzdHNSZXF1ZXN0Pgo="; expectedRq.uri = "/XmlEmptyLists"; expectedRq.headers = {{"Content-Type", R"(application/xml)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-xml/tests/XmlEmptyMapsTest.cpp b/generated/protocol-tests/tests/input/rest-xml/tests/XmlEmptyMapsTest.cpp index 9235a6d64f8..7778ab7159e 100644 --- a/generated/protocol-tests/tests/input/rest-xml/tests/XmlEmptyMapsTest.cpp +++ b/generated/protocol-tests/tests/input/rest-xml/tests/XmlEmptyMapsTest.cpp @@ -19,12 +19,11 @@ AWS_PROTOCOL_TEST(XmlEmptyMaps, XmlEmptyMaps) { XmlEmptyMapsRequest request; auto outcome = client.XmlEmptyMaps(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "PFhtbEVtcHR5TWFwc1JlcXVlc3Q+CiAgICA8bXlNYXA+PC9teU1hcD4KPC9YbWxFbXB0eU1hcHNSZXF1ZXN0Pgo="; expectedRq.uri = "/XmlEmptyMaps"; expectedRq.headers = {{"Content-Type", R"(application/xml)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-xml/tests/XmlEmptyStringsTest.cpp b/generated/protocol-tests/tests/input/rest-xml/tests/XmlEmptyStringsTest.cpp index 03adea02d92..003c220ed52 100644 --- a/generated/protocol-tests/tests/input/rest-xml/tests/XmlEmptyStringsTest.cpp +++ b/generated/protocol-tests/tests/input/rest-xml/tests/XmlEmptyStringsTest.cpp @@ -20,12 +20,11 @@ AWS_PROTOCOL_TEST(XmlEmptyStrings, XmlEmptyStrings) { request.SetEmptyString(R"()"); auto outcome = client.XmlEmptyStrings(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "PUT"; expectedRq.body = "PFhtbEVtcHR5U3RyaW5nc1JlcXVlc3Q+CiAgICA8ZW1wdHlTdHJpbmc+PC9lbXB0eVN0cmluZz4KPC9YbWxFbXB0eVN0cmluZ3NSZXF1ZXN0Pgo="; expectedRq.uri = "/XmlEmptyStrings"; expectedRq.headers = {{"Content-Type", R"(application/xml)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-xml/tests/XmlEnumsTest.cpp b/generated/protocol-tests/tests/input/rest-xml/tests/XmlEnumsTest.cpp index 6ca4d2b311d..2dd0ef9807a 100644 --- a/generated/protocol-tests/tests/input/rest-xml/tests/XmlEnumsTest.cpp +++ b/generated/protocol-tests/tests/input/rest-xml/tests/XmlEnumsTest.cpp @@ -25,12 +25,11 @@ AWS_PROTOCOL_TEST(XmlEnums, XmlEnums) { request.SetFooEnumMap({{"hi", FooEnumMapper::GetFooEnumForName(R"e(Foo)e")}, {"zero", FooEnumMapper::GetFooEnumForName(R"e(0)e")}}); auto outcome = client.XmlEnums(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "PUT"; expectedRq.body = "PFhtbEVudW1zUmVxdWVzdD4KICAgIDxmb29FbnVtMT5Gb288L2Zvb0VudW0xPgogICAgPGZvb0VudW0yPjA8L2Zvb0VudW0yPgogICAgPGZvb0VudW0zPjE8L2Zvb0VudW0zPgogICAgPGZvb0VudW1MaXN0PgogICAgICAgIDxtZW1iZXI+Rm9vPC9tZW1iZXI+CiAgICAgICAgPG1lbWJlcj4wPC9tZW1iZXI+CiAgICA8L2Zvb0VudW1MaXN0PgogICAgPGZvb0VudW1TZXQ+CiAgICAgICAgPG1lbWJlcj5Gb288L21lbWJlcj4KICAgICAgICA8bWVtYmVyPjA8L21lbWJlcj4KICAgIDwvZm9vRW51bVNldD4KICAgIDxmb29FbnVtTWFwPgogICAgICAgIDxlbnRyeT4KICAgICAgICAgICAgPGtleT5oaTwva2V5PgogICAgICAgICAgICA8dmFsdWU+Rm9vPC92YWx1ZT4KICAgICAgICA8L2VudHJ5PgogICAgICAgIDxlbnRyeT4KICAgICAgICAgICAgPGtleT56ZXJvPC9rZXk+CiAgICAgICAgICAgIDx2YWx1ZT4wPC92YWx1ZT4KICAgICAgICA8L2VudHJ5PgogICAgPC9mb29FbnVtTWFwPgo8L1htbEVudW1zUmVxdWVzdD4K"; expectedRq.uri = "/XmlEnums"; expectedRq.headers = {{"Content-Type", R"(application/xml)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-xml/tests/XmlIntEnumsTest.cpp b/generated/protocol-tests/tests/input/rest-xml/tests/XmlIntEnumsTest.cpp index 880d4ea9a36..f4d5efb5b86 100644 --- a/generated/protocol-tests/tests/input/rest-xml/tests/XmlIntEnumsTest.cpp +++ b/generated/protocol-tests/tests/input/rest-xml/tests/XmlIntEnumsTest.cpp @@ -25,12 +25,11 @@ AWS_PROTOCOL_TEST(XmlIntEnums, XmlIntEnums) { request.SetIntEnumMap({{"a", 1}, {"b", 2}}); auto outcome = client.XmlIntEnums(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "PUT"; expectedRq.body = "PFhtbEludEVudW1zUmVxdWVzdD4KICAgIDxpbnRFbnVtMT4xPC9pbnRFbnVtMT4KICAgIDxpbnRFbnVtMj4yPC9pbnRFbnVtMj4KICAgIDxpbnRFbnVtMz4zPC9pbnRFbnVtMz4KICAgIDxpbnRFbnVtTGlzdD4KICAgICAgICA8bWVtYmVyPjE8L21lbWJlcj4KICAgICAgICA8bWVtYmVyPjI8L21lbWJlcj4KICAgIDwvaW50RW51bUxpc3Q+CiAgICA8aW50RW51bVNldD4KICAgICAgICA8bWVtYmVyPjE8L21lbWJlcj4KICAgICAgICA8bWVtYmVyPjI8L21lbWJlcj4KICAgIDwvaW50RW51bVNldD4KICAgIDxpbnRFbnVtTWFwPgogICAgICAgIDxlbnRyeT4KICAgICAgICAgICAgPGtleT5hPC9rZXk+CiAgICAgICAgICAgIDx2YWx1ZT4xPC92YWx1ZT4KICAgICAgICA8L2VudHJ5PgogICAgICAgIDxlbnRyeT4KICAgICAgICAgICAgPGtleT5iPC9rZXk+CiAgICAgICAgICAgIDx2YWx1ZT4yPC92YWx1ZT4KICAgICAgICA8L2VudHJ5PgogICAgPC9pbnRFbnVtTWFwPgo8L1htbEludEVudW1zUmVxdWVzdD4K"; expectedRq.uri = "/XmlIntEnums"; expectedRq.headers = {{"Content-Type", R"(application/xml)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-xml/tests/XmlListsTest.cpp b/generated/protocol-tests/tests/input/rest-xml/tests/XmlListsTest.cpp index 1361c3ae50b..5616417076a 100644 --- a/generated/protocol-tests/tests/input/rest-xml/tests/XmlListsTest.cpp +++ b/generated/protocol-tests/tests/input/rest-xml/tests/XmlListsTest.cpp @@ -65,12 +65,11 @@ AWS_PROTOCOL_TEST(XmlLists, XmlLists) { } auto outcome = client.XmlLists(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "PUT"; expectedRq.body = "PFhtbExpc3RzUmVxdWVzdD4KICAgIDxzdHJpbmdMaXN0PgogICAgICAgIDxtZW1iZXI+Zm9vPC9tZW1iZXI+CiAgICAgICAgPG1lbWJlcj5iYXI8L21lbWJlcj4KICAgIDwvc3RyaW5nTGlzdD4KICAgIDxzdHJpbmdTZXQ+CiAgICAgICAgPG1lbWJlcj5mb288L21lbWJlcj4KICAgICAgICA8bWVtYmVyPmJhcjwvbWVtYmVyPgogICAgPC9zdHJpbmdTZXQ+CiAgICA8aW50ZWdlckxpc3Q+CiAgICAgICAgPG1lbWJlcj4xPC9tZW1iZXI+CiAgICAgICAgPG1lbWJlcj4yPC9tZW1iZXI+CiAgICA8L2ludGVnZXJMaXN0PgogICAgPGJvb2xlYW5MaXN0PgogICAgICAgIDxtZW1iZXI+dHJ1ZTwvbWVtYmVyPgogICAgICAgIDxtZW1iZXI+ZmFsc2U8L21lbWJlcj4KICAgIDwvYm9vbGVhbkxpc3Q+CiAgICA8dGltZXN0YW1wTGlzdD4KICAgICAgICA8bWVtYmVyPjIwMTQtMDQtMjlUMTg6MzA6MzhaPC9tZW1iZXI+CiAgICAgICAgPG1lbWJlcj4yMDE0LTA0LTI5VDE4OjMwOjM4WjwvbWVtYmVyPgogICAgPC90aW1lc3RhbXBMaXN0PgogICAgPGVudW1MaXN0PgogICAgICAgIDxtZW1iZXI+Rm9vPC9tZW1iZXI+CiAgICAgICAgPG1lbWJlcj4wPC9tZW1iZXI+CiAgICA8L2VudW1MaXN0PgogICAgPGludEVudW1MaXN0PgogICAgICAgIDxtZW1iZXI+MTwvbWVtYmVyPgogICAgICAgIDxtZW1iZXI+MjwvbWVtYmVyPgogICAgPC9pbnRFbnVtTGlzdD4KICAgIDxuZXN0ZWRTdHJpbmdMaXN0PgogICAgICAgIDxtZW1iZXI+CiAgICAgICAgICAgIDxtZW1iZXI+Zm9vPC9tZW1iZXI+CiAgICAgICAgICAgIDxtZW1iZXI+YmFyPC9tZW1iZXI+CiAgICAgICAgPC9tZW1iZXI+CiAgICAgICAgPG1lbWJlcj4KICAgICAgICAgICAgPG1lbWJlcj5iYXo8L21lbWJlcj4KICAgICAgICAgICAgPG1lbWJlcj5xdXg8L21lbWJlcj4KICAgICAgICA8L21lbWJlcj4KICAgIDwvbmVzdGVkU3RyaW5nTGlzdD4KICAgIDxyZW5hbWVkPgogICAgICAgIDxpdGVtPmZvbzwvaXRlbT4KICAgICAgICA8aXRlbT5iYXI8L2l0ZW0+CiAgICA8L3JlbmFtZWQ+CiAgICA8ZmxhdHRlbmVkTGlzdD5oaTwvZmxhdHRlbmVkTGlzdD4KICAgIDxmbGF0dGVuZWRMaXN0PmJ5ZTwvZmxhdHRlbmVkTGlzdD4KICAgIDxjdXN0b21OYW1lPnllcDwvY3VzdG9tTmFtZT4KICAgIDxjdXN0b21OYW1lPm5vcGU8L2N1c3RvbU5hbWU+CiAgICA8bXlTdHJ1Y3R1cmVMaXN0PgogICAgICAgIDxpdGVtPgogICAgICAgICAgICA8dmFsdWU+MTwvdmFsdWU+CiAgICAgICAgICAgIDxvdGhlcj4yPC9vdGhlcj4KICAgICAgICA8L2l0ZW0+CiAgICAgICAgPGl0ZW0+CiAgICAgICAgICAgIDx2YWx1ZT4zPC92YWx1ZT4KICAgICAgICAgICAgPG90aGVyPjQ8L290aGVyPgogICAgICAgIDwvaXRlbT4KICAgIDwvbXlTdHJ1Y3R1cmVMaXN0PgogICAgPGZsYXR0ZW5lZFN0cnVjdHVyZUxpc3Q+CiAgICAgICAgPHZhbHVlPjU8L3ZhbHVlPgogICAgICAgIDxvdGhlcj42PC9vdGhlcj4KICAgIDwvZmxhdHRlbmVkU3RydWN0dXJlTGlzdD4KICAgIDxmbGF0dGVuZWRTdHJ1Y3R1cmVMaXN0PgogICAgICAgIDx2YWx1ZT43PC92YWx1ZT4KICAgICAgICA8b3RoZXI+ODwvb3RoZXI+CiAgICA8L2ZsYXR0ZW5lZFN0cnVjdHVyZUxpc3Q+CjwvWG1sTGlzdHNSZXF1ZXN0Pgo="; expectedRq.uri = "/XmlLists"; expectedRq.headers = {{"Content-Type", R"(application/xml)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-xml/tests/XmlMapWithXmlNamespaceTest.cpp b/generated/protocol-tests/tests/input/rest-xml/tests/XmlMapWithXmlNamespaceTest.cpp index 99fb2182443..14b37ee0d1c 100644 --- a/generated/protocol-tests/tests/input/rest-xml/tests/XmlMapWithXmlNamespaceTest.cpp +++ b/generated/protocol-tests/tests/input/rest-xml/tests/XmlMapWithXmlNamespaceTest.cpp @@ -20,12 +20,11 @@ AWS_PROTOCOL_TEST(XmlMapWithXmlNamespace, RestXmlXmlMapWithXmlNamespace) { request.SetMyMap({{"a", R"(A)"}, {"b", R"(B)"}}); auto outcome = client.XmlMapWithXmlNamespace(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "PFhtbE1hcFdpdGhYbWxOYW1lc3BhY2VSZXF1ZXN0PgogICAgPEtWUCB4bWxucz0iaHR0cHM6Ly90aGUtbWVtYmVyLmV4YW1wbGUuY29tIj4KICAgICAgICA8ZW50cnk+CiAgICAgICAgICAgIDxLIHhtbG5zPSJodHRwczovL3RoZS1rZXkuZXhhbXBsZS5jb20iPmE8L0s+CiAgICAgICAgICAgIDxWIHhtbG5zPSJodHRwczovL3RoZS12YWx1ZS5leGFtcGxlLmNvbSI+QTwvVj4KICAgICAgICA8L2VudHJ5PgogICAgICAgIDxlbnRyeT4KICAgICAgICAgICAgPEsgeG1sbnM9Imh0dHBzOi8vdGhlLWtleS5leGFtcGxlLmNvbSI+YjwvSz4KICAgICAgICAgICAgPFYgeG1sbnM9Imh0dHBzOi8vdGhlLXZhbHVlLmV4YW1wbGUuY29tIj5CPC9WPgogICAgICAgIDwvZW50cnk+CiAgICA8L0tWUD4KPC9YbWxNYXBXaXRoWG1sTmFtZXNwYWNlUmVxdWVzdD4="; expectedRq.uri = "/XmlMapWithXmlNamespace"; expectedRq.headers = {{"Content-Type", R"(application/xml)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-xml/tests/XmlMapsTest.cpp b/generated/protocol-tests/tests/input/rest-xml/tests/XmlMapsTest.cpp index ab65ad2aef2..e6f18160c96 100644 --- a/generated/protocol-tests/tests/input/rest-xml/tests/XmlMapsTest.cpp +++ b/generated/protocol-tests/tests/input/rest-xml/tests/XmlMapsTest.cpp @@ -29,12 +29,11 @@ AWS_PROTOCOL_TEST(XmlMaps, XmlMaps) { } auto outcome = client.XmlMaps(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "PFhtbE1hcHNSZXF1ZXN0PgogICAgPG15TWFwPgogICAgICAgIDxlbnRyeT4KICAgICAgICAgICAgPGtleT5mb288L2tleT4KICAgICAgICAgICAgPHZhbHVlPgogICAgICAgICAgICAgICAgPGhpPnRoZXJlPC9oaT4KICAgICAgICAgICAgPC92YWx1ZT4KICAgICAgICA8L2VudHJ5PgogICAgICAgIDxlbnRyeT4KICAgICAgICAgICAgPGtleT5iYXo8L2tleT4KICAgICAgICAgICAgPHZhbHVlPgogICAgICAgICAgICAgICAgPGhpPmJ5ZTwvaGk+CiAgICAgICAgICAgIDwvdmFsdWU+CiAgICAgICAgPC9lbnRyeT4KICAgIDwvbXlNYXA+CjwvWG1sTWFwc1JlcXVlc3Q+Cg=="; expectedRq.uri = "/XmlMaps"; expectedRq.headers = {{"Content-Type", R"(application/xml)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-xml/tests/XmlMapsXmlNameTest.cpp b/generated/protocol-tests/tests/input/rest-xml/tests/XmlMapsXmlNameTest.cpp index bff7549d459..db26c19771d 100644 --- a/generated/protocol-tests/tests/input/rest-xml/tests/XmlMapsXmlNameTest.cpp +++ b/generated/protocol-tests/tests/input/rest-xml/tests/XmlMapsXmlNameTest.cpp @@ -29,12 +29,11 @@ AWS_PROTOCOL_TEST(XmlMapsXmlName, XmlMapsXmlName) { } auto outcome = client.XmlMapsXmlName(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "PFhtbE1hcHNYbWxOYW1lUmVxdWVzdD4KICAgIDxteU1hcD4KICAgICAgICA8ZW50cnk+CiAgICAgICAgICAgIDxBdHRyaWJ1dGU+Zm9vPC9BdHRyaWJ1dGU+CiAgICAgICAgICAgIDxTZXR0aW5nPgogICAgICAgICAgICAgICAgPGhpPnRoZXJlPC9oaT4KICAgICAgICAgICAgPC9TZXR0aW5nPgogICAgICAgIDwvZW50cnk+CiAgICAgICAgPGVudHJ5PgogICAgICAgICAgICA8QXR0cmlidXRlPmJhejwvQXR0cmlidXRlPgogICAgICAgICAgICA8U2V0dGluZz4KICAgICAgICAgICAgICAgIDxoaT5ieWU8L2hpPgogICAgICAgICAgICA8L1NldHRpbmc+CiAgICAgICAgPC9lbnRyeT4KICAgIDwvbXlNYXA+CjwvWG1sTWFwc1htbE5hbWVSZXF1ZXN0Pgo="; expectedRq.uri = "/XmlMapsXmlName"; expectedRq.headers = {{"Content-Type", R"(application/xml)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-xml/tests/XmlNamespacesTest.cpp b/generated/protocol-tests/tests/input/rest-xml/tests/XmlNamespacesTest.cpp index 55431bd385e..6cd0c94385d 100644 --- a/generated/protocol-tests/tests/input/rest-xml/tests/XmlNamespacesTest.cpp +++ b/generated/protocol-tests/tests/input/rest-xml/tests/XmlNamespacesTest.cpp @@ -25,12 +25,11 @@ AWS_PROTOCOL_TEST(XmlNamespaces, XmlNamespaces) { } auto outcome = client.XmlNamespaces(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "PFhtbE5hbWVzcGFjZXNSZXF1ZXN0IHhtbG5zPSJodHRwOi8vZm9vLmNvbSI+CiAgICA8bmVzdGVkIHhtbG5zPSJodHRwOi8vZm9vLmNvbSI+CiAgICAgICAgPGZvbyB4bWxuczpiYXo9Imh0dHA6Ly9iYXouY29tIj5Gb288L2Zvbz4KICAgICAgICA8dmFsdWVzIHhtbG5zPSJodHRwOi8vcXV4LmNvbSI+CiAgICAgICAgICAgIDxtZW1iZXIgeG1sbnM9Imh0dHA6Ly9idXguY29tIj5CYXI8L21lbWJlcj4KICAgICAgICAgICAgPG1lbWJlciB4bWxucz0iaHR0cDovL2J1eC5jb20iPkJhejwvbWVtYmVyPgogICAgICAgIDwvdmFsdWVzPgogICAgPC9uZXN0ZWQ+CjwvWG1sTmFtZXNwYWNlc1JlcXVlc3Q+Cg=="; expectedRq.uri = "/XmlNamespaces"; expectedRq.headers = {{"Content-Type", R"(application/xml)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-xml/tests/XmlTimestampsTest.cpp b/generated/protocol-tests/tests/input/rest-xml/tests/XmlTimestampsTest.cpp index b229d04b9f3..6a6b6ddaa12 100644 --- a/generated/protocol-tests/tests/input/rest-xml/tests/XmlTimestampsTest.cpp +++ b/generated/protocol-tests/tests/input/rest-xml/tests/XmlTimestampsTest.cpp @@ -20,14 +20,13 @@ AWS_PROTOCOL_TEST(XmlTimestamps, XmlTimestamps) { request.SetNormal(Aws::Utils::DateTime(1398796238L)); auto outcome = client.XmlTimestamps(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "PFhtbFRpbWVzdGFtcHNSZXF1ZXN0PgogICAgPG5vcm1hbD4yMDE0LTA0LTI5VDE4OjMwOjM4Wjwvbm9ybWFsPgo8L1htbFRpbWVzdGFtcHNSZXF1ZXN0Pgo="; expectedRq.uri = "/XmlTimestamps"; expectedRq.headers = {{"Content-Type", R"(application/xml)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(XmlTimestamps, XmlTimestampsWithDateTimeFormat) { @@ -39,14 +38,13 @@ AWS_PROTOCOL_TEST(XmlTimestamps, XmlTimestampsWithDateTimeFormat) { request.SetDateTime(Aws::Utils::DateTime(1398796238L)); auto outcome = client.XmlTimestamps(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "PFhtbFRpbWVzdGFtcHNSZXF1ZXN0PgogICAgPGRhdGVUaW1lPjIwMTQtMDQtMjlUMTg6MzA6MzhaPC9kYXRlVGltZT4KPC9YbWxUaW1lc3RhbXBzUmVxdWVzdD4K"; expectedRq.uri = "/XmlTimestamps"; expectedRq.headers = {{"Content-Type", R"(application/xml)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(XmlTimestamps, XmlTimestampsWithDateTimeOnTargetFormat) { @@ -58,14 +56,13 @@ AWS_PROTOCOL_TEST(XmlTimestamps, XmlTimestampsWithDateTimeOnTargetFormat) { request.SetDateTimeOnTarget(Aws::Utils::DateTime(1398796238L)); auto outcome = client.XmlTimestamps(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "PFhtbFRpbWVzdGFtcHNSZXF1ZXN0PgogICAgPGRhdGVUaW1lT25UYXJnZXQ+MjAxNC0wNC0yOVQxODozMDozOFo8L2RhdGVUaW1lT25UYXJnZXQ+CjwvWG1sVGltZXN0YW1wc1JlcXVlc3Q+Cg=="; expectedRq.uri = "/XmlTimestamps"; expectedRq.headers = {{"Content-Type", R"(application/xml)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(XmlTimestamps, XmlTimestampsWithEpochSecondsFormat) { @@ -77,14 +74,13 @@ AWS_PROTOCOL_TEST(XmlTimestamps, XmlTimestampsWithEpochSecondsFormat) { request.SetEpochSeconds(Aws::Utils::DateTime(1398796238L)); auto outcome = client.XmlTimestamps(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "PFhtbFRpbWVzdGFtcHNSZXF1ZXN0PgogICAgPGVwb2NoU2Vjb25kcz4xMzk4Nzk2MjM4PC9lcG9jaFNlY29uZHM+CjwvWG1sVGltZXN0YW1wc1JlcXVlc3Q+Cg=="; expectedRq.uri = "/XmlTimestamps"; expectedRq.headers = {{"Content-Type", R"(application/xml)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(XmlTimestamps, XmlTimestampsWithEpochSecondsOnTargetFormat) { @@ -96,14 +92,13 @@ AWS_PROTOCOL_TEST(XmlTimestamps, XmlTimestampsWithEpochSecondsOnTargetFormat) { request.SetEpochSecondsOnTarget(Aws::Utils::DateTime(1398796238L)); auto outcome = client.XmlTimestamps(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "PFhtbFRpbWVzdGFtcHNSZXF1ZXN0PgogICAgPGVwb2NoU2Vjb25kc09uVGFyZ2V0PjEzOTg3OTYyMzg8L2Vwb2NoU2Vjb25kc09uVGFyZ2V0Pgo8L1htbFRpbWVzdGFtcHNSZXF1ZXN0Pgo="; expectedRq.uri = "/XmlTimestamps"; expectedRq.headers = {{"Content-Type", R"(application/xml)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(XmlTimestamps, XmlTimestampsWithHttpDateFormat) { @@ -115,14 +110,13 @@ AWS_PROTOCOL_TEST(XmlTimestamps, XmlTimestampsWithHttpDateFormat) { request.SetHttpDate(Aws::Utils::DateTime(1398796238L)); auto outcome = client.XmlTimestamps(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "PFhtbFRpbWVzdGFtcHNSZXF1ZXN0PgogICAgPGh0dHBEYXRlPlR1ZSwgMjkgQXByIDIwMTQgMTg6MzA6MzggR01UPC9odHRwRGF0ZT4KPC9YbWxUaW1lc3RhbXBzUmVxdWVzdD4K"; expectedRq.uri = "/XmlTimestamps"; expectedRq.headers = {{"Content-Type", R"(application/xml)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(XmlTimestamps, XmlTimestampsWithHttpDateOnTargetFormat) { @@ -134,12 +128,11 @@ AWS_PROTOCOL_TEST(XmlTimestamps, XmlTimestampsWithHttpDateOnTargetFormat) { request.SetHttpDateOnTarget(Aws::Utils::DateTime(1398796238L)); auto outcome = client.XmlTimestamps(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "POST"; expectedRq.body = "PFhtbFRpbWVzdGFtcHNSZXF1ZXN0PgogICAgPGh0dHBEYXRlT25UYXJnZXQ+VHVlLCAyOSBBcHIgMjAxNCAxODozMDozOCBHTVQ8L2h0dHBEYXRlT25UYXJnZXQ+CjwvWG1sVGltZXN0YW1wc1JlcXVlc3Q+Cg=="; expectedRq.uri = "/XmlTimestamps"; expectedRq.headers = {{"Content-Type", R"(application/xml)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/input/rest-xml/tests/XmlUnionsTest.cpp b/generated/protocol-tests/tests/input/rest-xml/tests/XmlUnionsTest.cpp index 8fe51b91b92..3fa06778234 100644 --- a/generated/protocol-tests/tests/input/rest-xml/tests/XmlUnionsTest.cpp +++ b/generated/protocol-tests/tests/input/rest-xml/tests/XmlUnionsTest.cpp @@ -35,14 +35,13 @@ AWS_PROTOCOL_TEST(XmlUnions, XmlUnionsWithStructMember) { } auto outcome = client.XmlUnions(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "PUT"; expectedRq.body = "PFhtbFVuaW9uc1JlcXVlc3Q+CiAgICA8dW5pb25WYWx1ZT4KICAgICAgIDxzdHJ1Y3RWYWx1ZT4KICAgICAgICAgIDxzdHJpbmdWYWx1ZT5zdHJpbmc8L3N0cmluZ1ZhbHVlPgogICAgICAgICAgPGJvb2xlYW5WYWx1ZT50cnVlPC9ib29sZWFuVmFsdWU+CiAgICAgICAgICA8Ynl0ZVZhbHVlPjE8L2J5dGVWYWx1ZT4KICAgICAgICAgIDxzaG9ydFZhbHVlPjI8L3Nob3J0VmFsdWU+CiAgICAgICAgICA8aW50ZWdlclZhbHVlPjM8L2ludGVnZXJWYWx1ZT4KICAgICAgICAgIDxsb25nVmFsdWU+NDwvbG9uZ1ZhbHVlPgogICAgICAgICAgPGZsb2F0VmFsdWU+NS41PC9mbG9hdFZhbHVlPgogICAgICAgICAgPGRvdWJsZVZhbHVlPjYuNTwvZG91YmxlVmFsdWU+CiAgICAgICA8L3N0cnVjdFZhbHVlPgogICAgPC91bmlvblZhbHVlPgo8L1htbFVuaW9uc1JlcXVlc3Q+Cg=="; expectedRq.uri = "/XmlUnions"; expectedRq.headers = {{"Content-Type", R"(application/xml)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(XmlUnions, XmlUnionsWithStringMember) { @@ -58,14 +57,13 @@ AWS_PROTOCOL_TEST(XmlUnions, XmlUnionsWithStringMember) { } auto outcome = client.XmlUnions(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "PUT"; expectedRq.body = "PFhtbFVuaW9uc1JlcXVlc3Q+CiAgIDx1bmlvblZhbHVlPgogICAgICA8c3RyaW5nVmFsdWU+c29tZSBzdHJpbmc8L3N0cmluZ1ZhbHVlPgogICA8L3VuaW9uVmFsdWU+CjwvWG1sVW5pb25zUmVxdWVzdD4K"; expectedRq.uri = "/XmlUnions"; expectedRq.headers = {{"Content-Type", R"(application/xml)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(XmlUnions, XmlUnionsWithBooleanMember) { @@ -81,14 +79,13 @@ AWS_PROTOCOL_TEST(XmlUnions, XmlUnionsWithBooleanMember) { } auto outcome = client.XmlUnions(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "PUT"; expectedRq.body = "PFhtbFVuaW9uc1JlcXVlc3Q+CiAgIDx1bmlvblZhbHVlPgogICAgICA8Ym9vbGVhblZhbHVlPnRydWU8L2Jvb2xlYW5WYWx1ZT4KICAgPC91bmlvblZhbHVlPgo8L1htbFVuaW9uc1JlcXVlc3Q+Cg=="; expectedRq.uri = "/XmlUnions"; expectedRq.headers = {{"Content-Type", R"(application/xml)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } AWS_PROTOCOL_TEST(XmlUnions, XmlUnionsWithUnionMember) { @@ -108,12 +105,11 @@ AWS_PROTOCOL_TEST(XmlUnions, XmlUnionsWithUnionMember) { } auto outcome = client.XmlUnions(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ExpectedRequest expectedRq; expectedRq.method = "PUT"; expectedRq.body = "PFhtbFVuaW9uc1JlcXVlc3Q+CiAgIDx1bmlvblZhbHVlPgogICAgICA8dW5pb25WYWx1ZT4KICAgICAgICAgPGJvb2xlYW5WYWx1ZT50cnVlPC9ib29sZWFuVmFsdWU+CiAgICAgIDwvdW5pb25WYWx1ZT4KICAgPC91bmlvblZhbHVlPgo8L1htbFVuaW9uc1JlcXVlc3Q+Cg=="; expectedRq.uri = "/XmlUnions"; expectedRq.headers = {{"Content-Type", R"(application/xml)"}}; ValidateRequestSent(expectedRq); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); } diff --git a/generated/protocol-tests/tests/output/ec2/tests/DatetimeOffsetsTest.cpp b/generated/protocol-tests/tests/output/ec2/tests/DatetimeOffsetsTest.cpp index d078991a5a8..1440c3a8bb2 100644 --- a/generated/protocol-tests/tests/output/ec2/tests/DatetimeOffsetsTest.cpp +++ b/generated/protocol-tests/tests/output/ec2/tests/DatetimeOffsetsTest.cpp @@ -23,9 +23,11 @@ AWS_PROTOCOL_TEST(DatetimeOffsets, Ec2QueryDateTimeWithNegativeOffset) { DatetimeOffsetsRequest request; auto outcome = client.DatetimeOffsets(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const DatetimeOffsetsResponse& result = outcome.GetResult(); + /* expectedResult = R"( {"datetime":1576540098} )" */ + EXPECT_EQ(Aws::Utils::DateTime(1576540098L), result.GetDatetime()); } AWS_PROTOCOL_TEST(DatetimeOffsets, Ec2QueryDateTimeWithPositiveOffset) { @@ -40,7 +42,9 @@ AWS_PROTOCOL_TEST(DatetimeOffsets, Ec2QueryDateTimeWithPositiveOffset) { DatetimeOffsetsRequest request; auto outcome = client.DatetimeOffsets(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const DatetimeOffsetsResponse& result = outcome.GetResult(); + /* expectedResult = R"( {"datetime":1576540098} )" */ + EXPECT_EQ(Aws::Utils::DateTime(1576540098L), result.GetDatetime()); } diff --git a/generated/protocol-tests/tests/output/ec2/tests/EmptyInputAndEmptyOutputTest.cpp b/generated/protocol-tests/tests/output/ec2/tests/EmptyInputAndEmptyOutputTest.cpp index 792129c1705..a3998b01799 100644 --- a/generated/protocol-tests/tests/output/ec2/tests/EmptyInputAndEmptyOutputTest.cpp +++ b/generated/protocol-tests/tests/output/ec2/tests/EmptyInputAndEmptyOutputTest.cpp @@ -23,7 +23,7 @@ AWS_PROTOCOL_TEST(EmptyInputAndEmptyOutput, Ec2QueryEmptyInputAndEmptyOutput) { EmptyInputAndEmptyOutputRequest request; auto outcome = client.EmptyInputAndEmptyOutput(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + /* expectedResult = R"( {} )" */ } diff --git a/generated/protocol-tests/tests/output/ec2/tests/FractionalSecondsTest.cpp b/generated/protocol-tests/tests/output/ec2/tests/FractionalSecondsTest.cpp index 0fe47b27bbd..408288855de 100644 --- a/generated/protocol-tests/tests/output/ec2/tests/FractionalSecondsTest.cpp +++ b/generated/protocol-tests/tests/output/ec2/tests/FractionalSecondsTest.cpp @@ -23,7 +23,9 @@ AWS_PROTOCOL_TEST(FractionalSeconds, Ec2QueryDateTimeWithFractionalSeconds) { FractionalSecondsRequest request; auto outcome = client.FractionalSeconds(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const FractionalSecondsResponse& result = outcome.GetResult(); + /* expectedResult = R"( {"datetime":9.46845296123E8} )" */ + EXPECT_EQ(Aws::Utils::DateTime(9.46845296123E8), result.GetDatetime()); } diff --git a/generated/protocol-tests/tests/output/ec2/tests/GreetingWithErrors0Test.cpp b/generated/protocol-tests/tests/output/ec2/tests/GreetingWithErrors0Test.cpp index 93ce0796bdb..0d63cc233ee 100644 --- a/generated/protocol-tests/tests/output/ec2/tests/GreetingWithErrors0Test.cpp +++ b/generated/protocol-tests/tests/output/ec2/tests/GreetingWithErrors0Test.cpp @@ -23,7 +23,6 @@ AWS_PROTOCOL_TEST(GreetingWithErrors0, Ec2InvalidGreetingError) { GreetingWithErrorsRequest request; auto outcome = client.GreetingWithErrors(request); - ASSERT_FALSE(outcome.IsSuccess()); - ValidateRequestSent(); + ASSERT_FALSE(outcome.IsSuccess()); } diff --git a/generated/protocol-tests/tests/output/ec2/tests/GreetingWithErrors1Test.cpp b/generated/protocol-tests/tests/output/ec2/tests/GreetingWithErrors1Test.cpp index fd2da8c1074..82f9227c006 100644 --- a/generated/protocol-tests/tests/output/ec2/tests/GreetingWithErrors1Test.cpp +++ b/generated/protocol-tests/tests/output/ec2/tests/GreetingWithErrors1Test.cpp @@ -23,7 +23,6 @@ AWS_PROTOCOL_TEST(GreetingWithErrors1, Ec2ComplexError) { GreetingWithErrorsRequest request; auto outcome = client.GreetingWithErrors(request); - ASSERT_FALSE(outcome.IsSuccess()); - ValidateRequestSent(); + ASSERT_FALSE(outcome.IsSuccess()); } diff --git a/generated/protocol-tests/tests/output/ec2/tests/GreetingWithErrorsTest.cpp b/generated/protocol-tests/tests/output/ec2/tests/GreetingWithErrorsTest.cpp index ce439164303..e66929721d4 100644 --- a/generated/protocol-tests/tests/output/ec2/tests/GreetingWithErrorsTest.cpp +++ b/generated/protocol-tests/tests/output/ec2/tests/GreetingWithErrorsTest.cpp @@ -23,7 +23,9 @@ AWS_PROTOCOL_TEST(GreetingWithErrors, Ec2GreetingWithErrors) { GreetingWithErrorsRequest request; auto outcome = client.GreetingWithErrors(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const GreetingWithErrorsResponse& result = outcome.GetResult(); + /* expectedResult = R"( {"greeting":"Hello"} )" */ + EXPECT_EQ(R"(Hello)", result.GetGreeting()); } diff --git a/generated/protocol-tests/tests/output/ec2/tests/IgnoresWrappingXmlNameTest.cpp b/generated/protocol-tests/tests/output/ec2/tests/IgnoresWrappingXmlNameTest.cpp index 92bd81f4b94..9385975666b 100644 --- a/generated/protocol-tests/tests/output/ec2/tests/IgnoresWrappingXmlNameTest.cpp +++ b/generated/protocol-tests/tests/output/ec2/tests/IgnoresWrappingXmlNameTest.cpp @@ -23,7 +23,9 @@ AWS_PROTOCOL_TEST(IgnoresWrappingXmlName, Ec2IgnoresWrappingXmlName) { IgnoresWrappingXmlNameRequest request; auto outcome = client.IgnoresWrappingXmlName(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const IgnoresWrappingXmlNameResponse& result = outcome.GetResult(); + /* expectedResult = R"( {"foo":"bar"} )" */ + EXPECT_EQ(R"(bar)", result.GetFoo()); } diff --git a/generated/protocol-tests/tests/output/ec2/tests/NoInputAndOutputTest.cpp b/generated/protocol-tests/tests/output/ec2/tests/NoInputAndOutputTest.cpp index 51e2e1f91cc..7126dd0e928 100644 --- a/generated/protocol-tests/tests/output/ec2/tests/NoInputAndOutputTest.cpp +++ b/generated/protocol-tests/tests/output/ec2/tests/NoInputAndOutputTest.cpp @@ -23,7 +23,7 @@ AWS_PROTOCOL_TEST(NoInputAndOutput, Ec2QueryNoInputAndOutput) { NoInputAndOutputRequest request; auto outcome = client.NoInputAndOutput(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + /* expectedResult = R"( {} )" */ } diff --git a/generated/protocol-tests/tests/output/ec2/tests/RecursiveXmlShapesTest.cpp b/generated/protocol-tests/tests/output/ec2/tests/RecursiveXmlShapesTest.cpp index e90dcc27fe9..3326aba9be1 100644 --- a/generated/protocol-tests/tests/output/ec2/tests/RecursiveXmlShapesTest.cpp +++ b/generated/protocol-tests/tests/output/ec2/tests/RecursiveXmlShapesTest.cpp @@ -5,6 +5,8 @@ #include #include #include +#include +#include #include using RecursiveXmlShapes = AWS_PROTOCOL_TEST_SUITE; @@ -23,7 +25,24 @@ AWS_PROTOCOL_TEST(RecursiveXmlShapes, Ec2RecursiveShapes) { RecursiveXmlShapesRequest request; auto outcome = client.RecursiveXmlShapes(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const RecursiveXmlShapesResponse& result = outcome.GetResult(); + /* expectedResult = R"( {"nested":{"foo":"Foo1","nested":{"bar":"Bar1","recursiveMember":{"foo":"Foo2","nested":{"bar":"Bar2"}}}}} )" */ + { + const RecursiveXmlShapesOutputNested1& resultNested = result.GetNested(); + EXPECT_EQ(R"(Foo1)", resultNested.GetFoo()); + { + const RecursiveXmlShapesOutputNested2& resultNestedNested = resultNested.GetNested(); + EXPECT_EQ(R"(Bar1)", resultNestedNested.GetBar()); + { + const RecursiveXmlShapesOutputNested1& resultNestedNestedRecursiveMember = resultNestedNested.GetRecursiveMember(); + EXPECT_EQ(R"(Foo2)", resultNestedNestedRecursiveMember.GetFoo()); + { + const RecursiveXmlShapesOutputNested2& resultNestedNestedRecursiveMemberNested = resultNestedNestedRecursiveMember.GetNested(); + EXPECT_EQ(R"(Bar2)", resultNestedNestedRecursiveMemberNested.GetBar()); + } + } + } + } } diff --git a/generated/protocol-tests/tests/output/ec2/tests/SimpleScalarXmlPropertiesTest.cpp b/generated/protocol-tests/tests/output/ec2/tests/SimpleScalarXmlPropertiesTest.cpp index 911bc3937f7..8522446cfae 100644 --- a/generated/protocol-tests/tests/output/ec2/tests/SimpleScalarXmlPropertiesTest.cpp +++ b/generated/protocol-tests/tests/output/ec2/tests/SimpleScalarXmlPropertiesTest.cpp @@ -23,9 +23,20 @@ AWS_PROTOCOL_TEST(SimpleScalarXmlProperties, Ec2SimpleScalarProperties) { SimpleScalarXmlPropertiesRequest request; auto outcome = client.SimpleScalarXmlProperties(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const SimpleScalarXmlPropertiesResponse& result = outcome.GetResult(); + /* expectedResult = R"( {"stringValue":"string","emptyStringValue":"","trueBooleanValue":true,"falseBooleanValue":false,"byteValue":1,"shortValue":2,"integerValue":3,"longValue":4,"floatValue":5.5,"doubleValue":6.5} )" */ + EXPECT_EQ(R"(string)", result.GetStringValue()); + EXPECT_EQ(R"()", result.GetEmptyStringValue()); + EXPECT_EQ(true, result.GetTrueBooleanValue()); + EXPECT_EQ(false, result.GetFalseBooleanValue()); + EXPECT_EQ(1, result.GetByteValue()); + EXPECT_EQ(2, result.GetShortValue()); + EXPECT_EQ(3, result.GetIntegerValue()); + EXPECT_EQ(4, result.GetLongValue()); + EXPECT_EQ(5.5, result.GetFloatValue()); + EXPECT_EQ(6.5, result.GetDoubleValue()); } AWS_PROTOCOL_TEST(SimpleScalarXmlProperties, Ec2QuerySupportsNaNFloatOutputs) { @@ -40,9 +51,12 @@ AWS_PROTOCOL_TEST(SimpleScalarXmlProperties, Ec2QuerySupportsNaNFloatOutputs) { SimpleScalarXmlPropertiesRequest request; auto outcome = client.SimpleScalarXmlProperties(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const SimpleScalarXmlPropertiesResponse& result = outcome.GetResult(); + /* expectedResult = R"( {"floatValue":"NaN","doubleValue":"NaN"} )" */ + EXPECT_EQ(std::numeric_limits::quiet_NaN(), result.GetFloatValue()); + EXPECT_EQ(std::numeric_limits::quiet_NaN(), result.GetDoubleValue()); } AWS_PROTOCOL_TEST(SimpleScalarXmlProperties, Ec2QuerySupportsInfinityFloatOutputs) { @@ -57,9 +71,12 @@ AWS_PROTOCOL_TEST(SimpleScalarXmlProperties, Ec2QuerySupportsInfinityFloatOutput SimpleScalarXmlPropertiesRequest request; auto outcome = client.SimpleScalarXmlProperties(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const SimpleScalarXmlPropertiesResponse& result = outcome.GetResult(); + /* expectedResult = R"( {"floatValue":"Infinity","doubleValue":"Infinity"} )" */ + EXPECT_EQ(std::numeric_limits::infinity(), result.GetFloatValue()); + EXPECT_EQ(std::numeric_limits::infinity(), result.GetDoubleValue()); } AWS_PROTOCOL_TEST(SimpleScalarXmlProperties, Ec2QuerySupportsNegativeInfinityFloatOutputs) { @@ -74,7 +91,10 @@ AWS_PROTOCOL_TEST(SimpleScalarXmlProperties, Ec2QuerySupportsNegativeInfinityFlo SimpleScalarXmlPropertiesRequest request; auto outcome = client.SimpleScalarXmlProperties(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const SimpleScalarXmlPropertiesResponse& result = outcome.GetResult(); + /* expectedResult = R"( {"floatValue":"-Infinity","doubleValue":"-Infinity"} )" */ + EXPECT_EQ(-std::numeric_limits::infinity(), result.GetFloatValue()); + EXPECT_EQ(-std::numeric_limits::infinity(), result.GetDoubleValue()); } diff --git a/generated/protocol-tests/tests/output/ec2/tests/XmlBlobsTest.cpp b/generated/protocol-tests/tests/output/ec2/tests/XmlBlobsTest.cpp index bea299d643b..00a9695f28e 100644 --- a/generated/protocol-tests/tests/output/ec2/tests/XmlBlobsTest.cpp +++ b/generated/protocol-tests/tests/output/ec2/tests/XmlBlobsTest.cpp @@ -23,7 +23,9 @@ AWS_PROTOCOL_TEST(XmlBlobs, Ec2XmlBlobs) { XmlBlobsRequest request; auto outcome = client.XmlBlobs(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const XmlBlobsResponse& result = outcome.GetResult(); + /* expectedResult = R"( {"data":"value"} )" */ + EXPECT_EQ(Aws::Utils::ByteBuffer(R"(value)"), result.GetData()); } diff --git a/generated/protocol-tests/tests/output/ec2/tests/XmlEmptyBlobsTest.cpp b/generated/protocol-tests/tests/output/ec2/tests/XmlEmptyBlobsTest.cpp index 226b7491e89..def182ffb79 100644 --- a/generated/protocol-tests/tests/output/ec2/tests/XmlEmptyBlobsTest.cpp +++ b/generated/protocol-tests/tests/output/ec2/tests/XmlEmptyBlobsTest.cpp @@ -23,9 +23,11 @@ AWS_PROTOCOL_TEST(XmlEmptyBlobs, Ec2XmlEmptyBlobs) { XmlEmptyBlobsRequest request; auto outcome = client.XmlEmptyBlobs(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const XmlEmptyBlobsResponse& result = outcome.GetResult(); + /* expectedResult = R"( {"data":""} )" */ + EXPECT_EQ(Aws::Utils::ByteBuffer(R"()"), result.GetData()); } AWS_PROTOCOL_TEST(XmlEmptyBlobs, Ec2XmlEmptySelfClosedBlobs) { @@ -40,7 +42,9 @@ AWS_PROTOCOL_TEST(XmlEmptyBlobs, Ec2XmlEmptySelfClosedBlobs) { XmlEmptyBlobsRequest request; auto outcome = client.XmlEmptyBlobs(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const XmlEmptyBlobsResponse& result = outcome.GetResult(); + /* expectedResult = R"( {"data":""} )" */ + EXPECT_EQ(Aws::Utils::ByteBuffer(R"()"), result.GetData()); } diff --git a/generated/protocol-tests/tests/output/ec2/tests/XmlEmptyListsTest.cpp b/generated/protocol-tests/tests/output/ec2/tests/XmlEmptyListsTest.cpp index ed929330bd4..10b9c39abea 100644 --- a/generated/protocol-tests/tests/output/ec2/tests/XmlEmptyListsTest.cpp +++ b/generated/protocol-tests/tests/output/ec2/tests/XmlEmptyListsTest.cpp @@ -23,7 +23,12 @@ AWS_PROTOCOL_TEST(XmlEmptyLists, Ec2XmlEmptyLists) { XmlEmptyListsRequest request; auto outcome = client.XmlEmptyLists(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const XmlEmptyListsResponse& result = outcome.GetResult(); + /* expectedResult = R"( {"stringList":[],"stringSet":[]} )" */ + const Aws::Vector& resultStringListItem = result.GetStringList(); + EXPECT_EQ(0U, resultStringListItem.size()); + const Aws::Vector& resultStringSetItem = result.GetStringSet(); + EXPECT_EQ(0U, resultStringSetItem.size()); } diff --git a/generated/protocol-tests/tests/output/ec2/tests/XmlEnumsTest.cpp b/generated/protocol-tests/tests/output/ec2/tests/XmlEnumsTest.cpp index 0ff610e3954..d22fa7076af 100644 --- a/generated/protocol-tests/tests/output/ec2/tests/XmlEnumsTest.cpp +++ b/generated/protocol-tests/tests/output/ec2/tests/XmlEnumsTest.cpp @@ -23,7 +23,25 @@ AWS_PROTOCOL_TEST(XmlEnums, Ec2XmlEnums) { XmlEnumsRequest request; auto outcome = client.XmlEnums(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const XmlEnumsResponse& result = outcome.GetResult(); + /* expectedResult = R"( {"fooEnum1":"Foo","fooEnum2":"0","fooEnum3":"1","fooEnumList":["Foo","0"],"fooEnumSet":["Foo","0"],"fooEnumMap":{"hi":"Foo","zero":"0"}} )" */ + EXPECT_EQ(FooEnumMapper::GetFooEnumForName(R"e(Foo)e"), result.GetFooEnum1()); + EXPECT_EQ(FooEnumMapper::GetFooEnumForName(R"e(0)e"), result.GetFooEnum2()); + EXPECT_EQ(FooEnumMapper::GetFooEnumForName(R"e(1)e"), result.GetFooEnum3()); + const Aws::Vector& resultFooEnumListItem = result.GetFooEnumList(); + EXPECT_EQ(2U, resultFooEnumListItem.size()); + EXPECT_EQ(FooEnumMapper::GetFooEnumForName(R"e(Foo)e"), resultFooEnumListItem.at(0)); + EXPECT_EQ(FooEnumMapper::GetFooEnumForName(R"e(0)e"), resultFooEnumListItem.at(1)); + const Aws::Vector& resultFooEnumSetItem = result.GetFooEnumSet(); + EXPECT_EQ(2U, resultFooEnumSetItem.size()); + EXPECT_EQ(FooEnumMapper::GetFooEnumForName(R"e(Foo)e"), resultFooEnumSetItem.at(0)); + EXPECT_EQ(FooEnumMapper::GetFooEnumForName(R"e(0)e"), resultFooEnumSetItem.at(1)); + const Aws::Map& resultFooEnumMap = result.GetFooEnumMap(); + EXPECT_EQ(2U, resultFooEnumMap.size()); + EXPECT_TRUE(resultFooEnumMap.find("hi") != resultFooEnumMap.end()); + EXPECT_EQ(FooEnumMapper::GetFooEnumForName(R"e(Foo)e"), resultFooEnumMap.at("hi")); + EXPECT_TRUE(resultFooEnumMap.find("zero") != resultFooEnumMap.end()); + EXPECT_EQ(FooEnumMapper::GetFooEnumForName(R"e(0)e"), resultFooEnumMap.at("zero")); } diff --git a/generated/protocol-tests/tests/output/ec2/tests/XmlIntEnumsTest.cpp b/generated/protocol-tests/tests/output/ec2/tests/XmlIntEnumsTest.cpp index 6a4045dda07..7f69523432e 100644 --- a/generated/protocol-tests/tests/output/ec2/tests/XmlIntEnumsTest.cpp +++ b/generated/protocol-tests/tests/output/ec2/tests/XmlIntEnumsTest.cpp @@ -23,7 +23,25 @@ AWS_PROTOCOL_TEST(XmlIntEnums, Ec2XmlIntEnums) { XmlIntEnumsRequest request; auto outcome = client.XmlIntEnums(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const XmlIntEnumsResponse& result = outcome.GetResult(); + /* expectedResult = R"( {"intEnum1":1,"intEnum2":2,"intEnum3":3,"intEnumList":[1,2],"intEnumSet":[1,2],"intEnumMap":{"a":1,"b":2}} )" */ + EXPECT_EQ(1, result.GetIntEnum1()); + EXPECT_EQ(2, result.GetIntEnum2()); + EXPECT_EQ(3, result.GetIntEnum3()); + const Aws::Vector& resultIntEnumListItem = result.GetIntEnumList(); + EXPECT_EQ(2U, resultIntEnumListItem.size()); + EXPECT_EQ(1, resultIntEnumListItem.at(0)); + EXPECT_EQ(2, resultIntEnumListItem.at(1)); + const Aws::Vector& resultIntEnumSetItem = result.GetIntEnumSet(); + EXPECT_EQ(2U, resultIntEnumSetItem.size()); + EXPECT_EQ(1, resultIntEnumSetItem.at(0)); + EXPECT_EQ(2, resultIntEnumSetItem.at(1)); + const Aws::Map& resultIntEnumMap = result.GetIntEnumMap(); + EXPECT_EQ(2U, resultIntEnumMap.size()); + EXPECT_TRUE(resultIntEnumMap.find("a") != resultIntEnumMap.end()); + EXPECT_EQ(1, resultIntEnumMap.at("a")); + EXPECT_TRUE(resultIntEnumMap.find("b") != resultIntEnumMap.end()); + EXPECT_EQ(2, resultIntEnumMap.at("b")); } diff --git a/generated/protocol-tests/tests/output/ec2/tests/XmlListsTest.cpp b/generated/protocol-tests/tests/output/ec2/tests/XmlListsTest.cpp index b13fc962adf..c15f94ddbd7 100644 --- a/generated/protocol-tests/tests/output/ec2/tests/XmlListsTest.cpp +++ b/generated/protocol-tests/tests/output/ec2/tests/XmlListsTest.cpp @@ -23,7 +23,80 @@ AWS_PROTOCOL_TEST(XmlLists, Ec2XmlLists) { XmlListsRequest request; auto outcome = client.XmlLists(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const XmlListsResponse& result = outcome.GetResult(); + /* expectedResult = R"( {"stringList":["foo","bar"],"stringSet":["foo","bar"],"integerList":[1,2],"booleanList":[true,false],"timestampList":[1398796238,1398796238],"enumList":["Foo","0"],"intEnumList":[1,2],"nestedStringList":[["foo","bar"],["baz","qux"]],"renamedListMembers":["foo","bar"],"flattenedList":["hi","bye"],"flattenedList2":["yep","nope"],"flattenedListWithMemberNamespace":["a","b"],"flattenedListWithNamespace":["a","b"],"structureList":[{"a":"1","b":"2"},{"a":"3","b":"4"}]} )" */ + const Aws::Vector& resultStringListItem = result.GetStringList(); + EXPECT_EQ(2U, resultStringListItem.size()); + EXPECT_EQ(R"(foo)", resultStringListItem.at(0)); + EXPECT_EQ(R"(bar)", resultStringListItem.at(1)); + const Aws::Vector& resultStringSetItem = result.GetStringSet(); + EXPECT_EQ(2U, resultStringSetItem.size()); + EXPECT_EQ(R"(foo)", resultStringSetItem.at(0)); + EXPECT_EQ(R"(bar)", resultStringSetItem.at(1)); + const Aws::Vector& resultIntegerListItem = result.GetIntegerList(); + EXPECT_EQ(2U, resultIntegerListItem.size()); + EXPECT_EQ(1, resultIntegerListItem.at(0)); + EXPECT_EQ(2, resultIntegerListItem.at(1)); + const Aws::Vector& resultBooleanListItem = result.GetBooleanList(); + EXPECT_EQ(2U, resultBooleanListItem.size()); + EXPECT_EQ(true, resultBooleanListItem.at(0)); + EXPECT_EQ(false, resultBooleanListItem.at(1)); + const Aws::Vector& resultTimestampListItem = result.GetTimestampList(); + EXPECT_EQ(2U, resultTimestampListItem.size()); + EXPECT_EQ(Aws::Utils::DateTime(1398796238L), resultTimestampListItem.at(0)); + EXPECT_EQ(Aws::Utils::DateTime(1398796238L), resultTimestampListItem.at(1)); + const Aws::Vector& resultEnumListItem = result.GetEnumList(); + EXPECT_EQ(2U, resultEnumListItem.size()); + EXPECT_EQ(FooEnumMapper::GetFooEnumForName(R"e(Foo)e"), resultEnumListItem.at(0)); + EXPECT_EQ(FooEnumMapper::GetFooEnumForName(R"e(0)e"), resultEnumListItem.at(1)); + const Aws::Vector& resultIntEnumListItem = result.GetIntEnumList(); + EXPECT_EQ(2U, resultIntEnumListItem.size()); + EXPECT_EQ(1, resultIntEnumListItem.at(0)); + EXPECT_EQ(2, resultIntEnumListItem.at(1)); + EXPECT_EQ(2U, result.GetNestedStringList().size()); + { + const Aws::Vector& resultNestedStringListItem = result.GetNestedStringList().at(0); + EXPECT_EQ(2U, resultNestedStringListItem.size()); + EXPECT_EQ(R"(foo)", resultNestedStringListItem.at(0)); + EXPECT_EQ(R"(bar)", resultNestedStringListItem.at(1)); + } + { + const Aws::Vector& resultNestedStringListItem = result.GetNestedStringList().at(1); + EXPECT_EQ(2U, resultNestedStringListItem.size()); + EXPECT_EQ(R"(baz)", resultNestedStringListItem.at(0)); + EXPECT_EQ(R"(qux)", resultNestedStringListItem.at(1)); + } + const Aws::Vector& resultRenamedListMembersItem = result.GetRenamedListMembers(); + EXPECT_EQ(2U, resultRenamedListMembersItem.size()); + EXPECT_EQ(R"(foo)", resultRenamedListMembersItem.at(0)); + EXPECT_EQ(R"(bar)", resultRenamedListMembersItem.at(1)); + const Aws::Vector& resultFlattenedListItem = result.GetFlattenedList(); + EXPECT_EQ(2U, resultFlattenedListItem.size()); + EXPECT_EQ(R"(hi)", resultFlattenedListItem.at(0)); + EXPECT_EQ(R"(bye)", resultFlattenedListItem.at(1)); + const Aws::Vector& resultFlattenedList2Item = result.GetFlattenedList2(); + EXPECT_EQ(2U, resultFlattenedList2Item.size()); + EXPECT_EQ(R"(yep)", resultFlattenedList2Item.at(0)); + EXPECT_EQ(R"(nope)", resultFlattenedList2Item.at(1)); + const Aws::Vector& resultFlattenedListWithMemberNamespaceItem = result.GetFlattenedListWithMemberNamespace(); + EXPECT_EQ(2U, resultFlattenedListWithMemberNamespaceItem.size()); + EXPECT_EQ(R"(a)", resultFlattenedListWithMemberNamespaceItem.at(0)); + EXPECT_EQ(R"(b)", resultFlattenedListWithMemberNamespaceItem.at(1)); + const Aws::Vector& resultFlattenedListWithNamespaceItem = result.GetFlattenedListWithNamespace(); + EXPECT_EQ(2U, resultFlattenedListWithNamespaceItem.size()); + EXPECT_EQ(R"(a)", resultFlattenedListWithNamespaceItem.at(0)); + EXPECT_EQ(R"(b)", resultFlattenedListWithNamespaceItem.at(1)); + EXPECT_EQ(2U, result.GetStructureList().size()); + { + const StructureListMember& resultStructureListItem = result.GetStructureList().at(0); + EXPECT_EQ(R"(1)", resultStructureListItem.GetA()); + EXPECT_EQ(R"(2)", resultStructureListItem.GetB()); + } + { + const StructureListMember& resultStructureListItem = result.GetStructureList().at(1); + EXPECT_EQ(R"(3)", resultStructureListItem.GetA()); + EXPECT_EQ(R"(4)", resultStructureListItem.GetB()); + } } diff --git a/generated/protocol-tests/tests/output/ec2/tests/XmlNamespacesTest.cpp b/generated/protocol-tests/tests/output/ec2/tests/XmlNamespacesTest.cpp index e13f286aa5b..0ba34496b0a 100644 --- a/generated/protocol-tests/tests/output/ec2/tests/XmlNamespacesTest.cpp +++ b/generated/protocol-tests/tests/output/ec2/tests/XmlNamespacesTest.cpp @@ -23,7 +23,16 @@ AWS_PROTOCOL_TEST(XmlNamespaces, Ec2XmlNamespaces) { XmlNamespacesRequest request; auto outcome = client.XmlNamespaces(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const XmlNamespacesResponse& result = outcome.GetResult(); + /* expectedResult = R"( {"nested":{"foo":"Foo","values":["Bar","Baz"]}} )" */ + { + const XmlNamespaceNested& resultNested = result.GetNested(); + EXPECT_EQ(R"(Foo)", resultNested.GetFoo()); + const Aws::Vector& resultNestedValuesItem = resultNested.GetValues(); + EXPECT_EQ(2U, resultNestedValuesItem.size()); + EXPECT_EQ(R"(Bar)", resultNestedValuesItem.at(0)); + EXPECT_EQ(R"(Baz)", resultNestedValuesItem.at(1)); + } } diff --git a/generated/protocol-tests/tests/output/ec2/tests/XmlTimestampsTest.cpp b/generated/protocol-tests/tests/output/ec2/tests/XmlTimestampsTest.cpp index cf03b434bae..1c3b6c34b85 100644 --- a/generated/protocol-tests/tests/output/ec2/tests/XmlTimestampsTest.cpp +++ b/generated/protocol-tests/tests/output/ec2/tests/XmlTimestampsTest.cpp @@ -23,9 +23,11 @@ AWS_PROTOCOL_TEST(XmlTimestamps, Ec2XmlTimestamps) { XmlTimestampsRequest request; auto outcome = client.XmlTimestamps(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const XmlTimestampsResponse& result = outcome.GetResult(); + /* expectedResult = R"( {"normal":1398796238} )" */ + EXPECT_EQ(Aws::Utils::DateTime(1398796238L), result.GetNormal()); } AWS_PROTOCOL_TEST(XmlTimestamps, Ec2XmlTimestampsWithDateTimeFormat) { @@ -40,9 +42,11 @@ AWS_PROTOCOL_TEST(XmlTimestamps, Ec2XmlTimestampsWithDateTimeFormat) { XmlTimestampsRequest request; auto outcome = client.XmlTimestamps(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const XmlTimestampsResponse& result = outcome.GetResult(); + /* expectedResult = R"( {"dateTime":1398796238} )" */ + EXPECT_EQ(Aws::Utils::DateTime(1398796238L), result.GetDateTime()); } AWS_PROTOCOL_TEST(XmlTimestamps, Ec2XmlTimestampsWithDateTimeOnTargetFormat) { @@ -57,9 +61,11 @@ AWS_PROTOCOL_TEST(XmlTimestamps, Ec2XmlTimestampsWithDateTimeOnTargetFormat) { XmlTimestampsRequest request; auto outcome = client.XmlTimestamps(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const XmlTimestampsResponse& result = outcome.GetResult(); + /* expectedResult = R"( {"dateTimeOnTarget":1398796238} )" */ + EXPECT_EQ(Aws::Utils::DateTime(1398796238L), result.GetDateTimeOnTarget()); } AWS_PROTOCOL_TEST(XmlTimestamps, Ec2XmlTimestampsWithEpochSecondsFormat) { @@ -74,9 +80,11 @@ AWS_PROTOCOL_TEST(XmlTimestamps, Ec2XmlTimestampsWithEpochSecondsFormat) { XmlTimestampsRequest request; auto outcome = client.XmlTimestamps(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const XmlTimestampsResponse& result = outcome.GetResult(); + /* expectedResult = R"( {"epochSeconds":1398796238} )" */ + EXPECT_EQ(Aws::Utils::DateTime(1398796238L), result.GetEpochSeconds()); } AWS_PROTOCOL_TEST(XmlTimestamps, Ec2XmlTimestampsWithEpochSecondsOnTargetFormat) { @@ -91,9 +99,11 @@ AWS_PROTOCOL_TEST(XmlTimestamps, Ec2XmlTimestampsWithEpochSecondsOnTargetFormat) XmlTimestampsRequest request; auto outcome = client.XmlTimestamps(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const XmlTimestampsResponse& result = outcome.GetResult(); + /* expectedResult = R"( {"epochSecondsOnTarget":1398796238} )" */ + EXPECT_EQ(Aws::Utils::DateTime(1398796238L), result.GetEpochSecondsOnTarget()); } AWS_PROTOCOL_TEST(XmlTimestamps, Ec2XmlTimestampsWithHttpDateFormat) { @@ -108,9 +118,11 @@ AWS_PROTOCOL_TEST(XmlTimestamps, Ec2XmlTimestampsWithHttpDateFormat) { XmlTimestampsRequest request; auto outcome = client.XmlTimestamps(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const XmlTimestampsResponse& result = outcome.GetResult(); + /* expectedResult = R"( {"httpDate":1398796238} )" */ + EXPECT_EQ(Aws::Utils::DateTime(1398796238L), result.GetHttpDate()); } AWS_PROTOCOL_TEST(XmlTimestamps, Ec2XmlTimestampsWithHttpDateOnTargetFormat) { @@ -125,7 +137,9 @@ AWS_PROTOCOL_TEST(XmlTimestamps, Ec2XmlTimestampsWithHttpDateOnTargetFormat) { XmlTimestampsRequest request; auto outcome = client.XmlTimestamps(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const XmlTimestampsResponse& result = outcome.GetResult(); + /* expectedResult = R"( {"httpDateOnTarget":1398796238} )" */ + EXPECT_EQ(Aws::Utils::DateTime(1398796238L), result.GetHttpDateOnTarget()); } diff --git a/generated/protocol-tests/tests/output/json/tests/DatetimeOffsetsTest.cpp b/generated/protocol-tests/tests/output/json/tests/DatetimeOffsetsTest.cpp index 5aae1b7dd53..fa2f59a1b65 100644 --- a/generated/protocol-tests/tests/output/json/tests/DatetimeOffsetsTest.cpp +++ b/generated/protocol-tests/tests/output/json/tests/DatetimeOffsetsTest.cpp @@ -23,9 +23,11 @@ AWS_PROTOCOL_TEST(DatetimeOffsets, AwsJson11DateTimeWithNegativeOffset) { DatetimeOffsetsRequest request; auto outcome = client.DatetimeOffsets(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const DatetimeOffsetsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"datetime":1576540098} )" */ + EXPECT_EQ(Aws::Utils::DateTime(1576540098L), result.GetDatetime()); } AWS_PROTOCOL_TEST(DatetimeOffsets, AwsJson11DateTimeWithPositiveOffset) { @@ -40,7 +42,9 @@ AWS_PROTOCOL_TEST(DatetimeOffsets, AwsJson11DateTimeWithPositiveOffset) { DatetimeOffsetsRequest request; auto outcome = client.DatetimeOffsets(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const DatetimeOffsetsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"datetime":1576540098} )" */ + EXPECT_EQ(Aws::Utils::DateTime(1576540098L), result.GetDatetime()); } diff --git a/generated/protocol-tests/tests/output/json/tests/EmptyOperationTest.cpp b/generated/protocol-tests/tests/output/json/tests/EmptyOperationTest.cpp index 9c5495ea053..065b3bfb166 100644 --- a/generated/protocol-tests/tests/output/json/tests/EmptyOperationTest.cpp +++ b/generated/protocol-tests/tests/output/json/tests/EmptyOperationTest.cpp @@ -23,9 +23,9 @@ AWS_PROTOCOL_TEST(EmptyOperation, handles_empty_output_shape) { EmptyOperationRequest request; auto outcome = client.EmptyOperation(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + /* expectedResult = R"( {} )" */ } AWS_PROTOCOL_TEST(EmptyOperation, handles_unexpected_json_output) { @@ -40,9 +40,9 @@ AWS_PROTOCOL_TEST(EmptyOperation, handles_unexpected_json_output) { EmptyOperationRequest request; auto outcome = client.EmptyOperation(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + /* expectedResult = R"( {} )" */ } AWS_PROTOCOL_TEST(EmptyOperation, json_1_1_service_responds_with_no_payload) { @@ -56,7 +56,7 @@ AWS_PROTOCOL_TEST(EmptyOperation, json_1_1_service_responds_with_no_payload) { EmptyOperationRequest request; auto outcome = client.EmptyOperation(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + /* expectedResult = R"( {} )" */ } diff --git a/generated/protocol-tests/tests/output/json/tests/FractionalSecondsTest.cpp b/generated/protocol-tests/tests/output/json/tests/FractionalSecondsTest.cpp index d1359d72361..494273be9de 100644 --- a/generated/protocol-tests/tests/output/json/tests/FractionalSecondsTest.cpp +++ b/generated/protocol-tests/tests/output/json/tests/FractionalSecondsTest.cpp @@ -23,7 +23,9 @@ AWS_PROTOCOL_TEST(FractionalSeconds, AwsJson11DateTimeWithFractionalSeconds) { FractionalSecondsRequest request; auto outcome = client.FractionalSeconds(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const FractionalSecondsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"datetime":9.46845296123E8} )" */ + EXPECT_EQ(Aws::Utils::DateTime(9.46845296123E8), result.GetDatetime()); } diff --git a/generated/protocol-tests/tests/output/json/tests/GreetingWithErrors0Test.cpp b/generated/protocol-tests/tests/output/json/tests/GreetingWithErrors0Test.cpp index b236645a880..8c984ad8781 100644 --- a/generated/protocol-tests/tests/output/json/tests/GreetingWithErrors0Test.cpp +++ b/generated/protocol-tests/tests/output/json/tests/GreetingWithErrors0Test.cpp @@ -23,9 +23,8 @@ AWS_PROTOCOL_TEST(GreetingWithErrors0, AwsJson11ComplexError) { GreetingWithErrorsRequest request; auto outcome = client.GreetingWithErrors(request); - ASSERT_FALSE(outcome.IsSuccess()); - ValidateRequestSent(); + ASSERT_FALSE(outcome.IsSuccess()); } AWS_PROTOCOL_TEST(GreetingWithErrors0, AwsJson11EmptyComplexError) { @@ -40,7 +39,6 @@ AWS_PROTOCOL_TEST(GreetingWithErrors0, AwsJson11EmptyComplexError) { GreetingWithErrorsRequest request; auto outcome = client.GreetingWithErrors(request); - ASSERT_FALSE(outcome.IsSuccess()); - ValidateRequestSent(); + ASSERT_FALSE(outcome.IsSuccess()); } diff --git a/generated/protocol-tests/tests/output/json/tests/GreetingWithErrors1Test.cpp b/generated/protocol-tests/tests/output/json/tests/GreetingWithErrors1Test.cpp index d6e500b5dca..bab912c80bd 100644 --- a/generated/protocol-tests/tests/output/json/tests/GreetingWithErrors1Test.cpp +++ b/generated/protocol-tests/tests/output/json/tests/GreetingWithErrors1Test.cpp @@ -22,9 +22,8 @@ AWS_PROTOCOL_TEST(GreetingWithErrors1, AwsJson11FooErrorUsingXAmznErrorType) { GreetingWithErrorsRequest request; auto outcome = client.GreetingWithErrors(request); - ASSERT_FALSE(outcome.IsSuccess()); - ValidateRequestSent(); + ASSERT_FALSE(outcome.IsSuccess()); } AWS_PROTOCOL_TEST(GreetingWithErrors1, AwsJson11FooErrorUsingXAmznErrorTypeWithUri) { @@ -38,9 +37,8 @@ AWS_PROTOCOL_TEST(GreetingWithErrors1, AwsJson11FooErrorUsingXAmznErrorTypeWithU GreetingWithErrorsRequest request; auto outcome = client.GreetingWithErrors(request); - ASSERT_FALSE(outcome.IsSuccess()); - ValidateRequestSent(); + ASSERT_FALSE(outcome.IsSuccess()); } AWS_PROTOCOL_TEST(GreetingWithErrors1, AwsJson11FooErrorUsingXAmznErrorTypeWithUriAndNamespace) { @@ -54,9 +52,8 @@ AWS_PROTOCOL_TEST(GreetingWithErrors1, AwsJson11FooErrorUsingXAmznErrorTypeWithU GreetingWithErrorsRequest request; auto outcome = client.GreetingWithErrors(request); - ASSERT_FALSE(outcome.IsSuccess()); - ValidateRequestSent(); + ASSERT_FALSE(outcome.IsSuccess()); } AWS_PROTOCOL_TEST(GreetingWithErrors1, AwsJson11FooErrorUsingCode) { @@ -71,9 +68,8 @@ AWS_PROTOCOL_TEST(GreetingWithErrors1, AwsJson11FooErrorUsingCode) { GreetingWithErrorsRequest request; auto outcome = client.GreetingWithErrors(request); - ASSERT_FALSE(outcome.IsSuccess()); - ValidateRequestSent(); + ASSERT_FALSE(outcome.IsSuccess()); } AWS_PROTOCOL_TEST(GreetingWithErrors1, AwsJson11FooErrorUsingCodeAndNamespace) { @@ -88,9 +84,8 @@ AWS_PROTOCOL_TEST(GreetingWithErrors1, AwsJson11FooErrorUsingCodeAndNamespace) { GreetingWithErrorsRequest request; auto outcome = client.GreetingWithErrors(request); - ASSERT_FALSE(outcome.IsSuccess()); - ValidateRequestSent(); + ASSERT_FALSE(outcome.IsSuccess()); } AWS_PROTOCOL_TEST(GreetingWithErrors1, AwsJson11FooErrorUsingCodeUriAndNamespace) { @@ -105,9 +100,8 @@ AWS_PROTOCOL_TEST(GreetingWithErrors1, AwsJson11FooErrorUsingCodeUriAndNamespace GreetingWithErrorsRequest request; auto outcome = client.GreetingWithErrors(request); - ASSERT_FALSE(outcome.IsSuccess()); - ValidateRequestSent(); + ASSERT_FALSE(outcome.IsSuccess()); } AWS_PROTOCOL_TEST(GreetingWithErrors1, AwsJson11FooErrorWithDunderType) { @@ -122,9 +116,8 @@ AWS_PROTOCOL_TEST(GreetingWithErrors1, AwsJson11FooErrorWithDunderType) { GreetingWithErrorsRequest request; auto outcome = client.GreetingWithErrors(request); - ASSERT_FALSE(outcome.IsSuccess()); - ValidateRequestSent(); + ASSERT_FALSE(outcome.IsSuccess()); } AWS_PROTOCOL_TEST(GreetingWithErrors1, AwsJson11FooErrorWithDunderTypeAndNamespace) { @@ -139,9 +132,8 @@ AWS_PROTOCOL_TEST(GreetingWithErrors1, AwsJson11FooErrorWithDunderTypeAndNamespa GreetingWithErrorsRequest request; auto outcome = client.GreetingWithErrors(request); - ASSERT_FALSE(outcome.IsSuccess()); - ValidateRequestSent(); + ASSERT_FALSE(outcome.IsSuccess()); } AWS_PROTOCOL_TEST(GreetingWithErrors1, AwsJson11FooErrorWithDunderTypeUriAndNamespace) { @@ -156,7 +148,6 @@ AWS_PROTOCOL_TEST(GreetingWithErrors1, AwsJson11FooErrorWithDunderTypeUriAndName GreetingWithErrorsRequest request; auto outcome = client.GreetingWithErrors(request); - ASSERT_FALSE(outcome.IsSuccess()); - ValidateRequestSent(); + ASSERT_FALSE(outcome.IsSuccess()); } diff --git a/generated/protocol-tests/tests/output/json/tests/GreetingWithErrorsTest.cpp b/generated/protocol-tests/tests/output/json/tests/GreetingWithErrorsTest.cpp index fb2bf697359..85d1445da60 100644 --- a/generated/protocol-tests/tests/output/json/tests/GreetingWithErrorsTest.cpp +++ b/generated/protocol-tests/tests/output/json/tests/GreetingWithErrorsTest.cpp @@ -23,7 +23,6 @@ AWS_PROTOCOL_TEST(GreetingWithErrors, AwsJson11InvalidGreetingError) { GreetingWithErrorsRequest request; auto outcome = client.GreetingWithErrors(request); - ASSERT_FALSE(outcome.IsSuccess()); - ValidateRequestSent(); + ASSERT_FALSE(outcome.IsSuccess()); } diff --git a/generated/protocol-tests/tests/output/json/tests/JsonEnumsTest.cpp b/generated/protocol-tests/tests/output/json/tests/JsonEnumsTest.cpp index 0106e796c30..98661eef6fe 100644 --- a/generated/protocol-tests/tests/output/json/tests/JsonEnumsTest.cpp +++ b/generated/protocol-tests/tests/output/json/tests/JsonEnumsTest.cpp @@ -23,7 +23,25 @@ AWS_PROTOCOL_TEST(JsonEnums, AwsJson11Enums) { JsonEnumsRequest request; auto outcome = client.JsonEnums(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const JsonEnumsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"fooEnum1":"Foo","fooEnum2":"0","fooEnum3":"1","fooEnumList":["Foo","0"],"fooEnumSet":["Foo","0"],"fooEnumMap":{"hi":"Foo","zero":"0"}} )" */ + EXPECT_EQ(FooEnumMapper::GetFooEnumForName(R"e(Foo)e"), result.GetFooEnum1()); + EXPECT_EQ(FooEnumMapper::GetFooEnumForName(R"e(0)e"), result.GetFooEnum2()); + EXPECT_EQ(FooEnumMapper::GetFooEnumForName(R"e(1)e"), result.GetFooEnum3()); + const Aws::Vector& resultFooEnumListItem = result.GetFooEnumList(); + EXPECT_EQ(2U, resultFooEnumListItem.size()); + EXPECT_EQ(FooEnumMapper::GetFooEnumForName(R"e(Foo)e"), resultFooEnumListItem.at(0)); + EXPECT_EQ(FooEnumMapper::GetFooEnumForName(R"e(0)e"), resultFooEnumListItem.at(1)); + const Aws::Vector& resultFooEnumSetItem = result.GetFooEnumSet(); + EXPECT_EQ(2U, resultFooEnumSetItem.size()); + EXPECT_EQ(FooEnumMapper::GetFooEnumForName(R"e(Foo)e"), resultFooEnumSetItem.at(0)); + EXPECT_EQ(FooEnumMapper::GetFooEnumForName(R"e(0)e"), resultFooEnumSetItem.at(1)); + const Aws::Map& resultFooEnumMap = result.GetFooEnumMap(); + EXPECT_EQ(2U, resultFooEnumMap.size()); + EXPECT_TRUE(resultFooEnumMap.find("hi") != resultFooEnumMap.end()); + EXPECT_EQ(FooEnumMapper::GetFooEnumForName(R"e(Foo)e"), resultFooEnumMap.at("hi")); + EXPECT_TRUE(resultFooEnumMap.find("zero") != resultFooEnumMap.end()); + EXPECT_EQ(FooEnumMapper::GetFooEnumForName(R"e(0)e"), resultFooEnumMap.at("zero")); } diff --git a/generated/protocol-tests/tests/output/json/tests/JsonIntEnumsTest.cpp b/generated/protocol-tests/tests/output/json/tests/JsonIntEnumsTest.cpp index 56106ab5e8f..eafb61b5172 100644 --- a/generated/protocol-tests/tests/output/json/tests/JsonIntEnumsTest.cpp +++ b/generated/protocol-tests/tests/output/json/tests/JsonIntEnumsTest.cpp @@ -23,7 +23,25 @@ AWS_PROTOCOL_TEST(JsonIntEnums, AwsJson11IntEnums) { JsonIntEnumsRequest request; auto outcome = client.JsonIntEnums(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const JsonIntEnumsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"intEnum1":1,"intEnum2":2,"intEnum3":3,"intEnumList":[1,2],"intEnumSet":[1,2],"intEnumMap":{"a":1,"b":2}} )" */ + EXPECT_EQ(1, result.GetIntEnum1()); + EXPECT_EQ(2, result.GetIntEnum2()); + EXPECT_EQ(3, result.GetIntEnum3()); + const Aws::Vector& resultIntEnumListItem = result.GetIntEnumList(); + EXPECT_EQ(2U, resultIntEnumListItem.size()); + EXPECT_EQ(1, resultIntEnumListItem.at(0)); + EXPECT_EQ(2, resultIntEnumListItem.at(1)); + const Aws::Vector& resultIntEnumSetItem = result.GetIntEnumSet(); + EXPECT_EQ(2U, resultIntEnumSetItem.size()); + EXPECT_EQ(1, resultIntEnumSetItem.at(0)); + EXPECT_EQ(2, resultIntEnumSetItem.at(1)); + const Aws::Map& resultIntEnumMap = result.GetIntEnumMap(); + EXPECT_EQ(2U, resultIntEnumMap.size()); + EXPECT_TRUE(resultIntEnumMap.find("a") != resultIntEnumMap.end()); + EXPECT_EQ(1, resultIntEnumMap.at("a")); + EXPECT_TRUE(resultIntEnumMap.find("b") != resultIntEnumMap.end()); + EXPECT_EQ(2, resultIntEnumMap.at("b")); } diff --git a/generated/protocol-tests/tests/output/json/tests/JsonUnionsTest.cpp b/generated/protocol-tests/tests/output/json/tests/JsonUnionsTest.cpp index 2d8c35a0887..4370177be1f 100644 --- a/generated/protocol-tests/tests/output/json/tests/JsonUnionsTest.cpp +++ b/generated/protocol-tests/tests/output/json/tests/JsonUnionsTest.cpp @@ -23,9 +23,14 @@ AWS_PROTOCOL_TEST(JsonUnions, AwsJson11DeserializeStringUnionValue) { JsonUnionsRequest request; auto outcome = client.JsonUnions(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const JsonUnionsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"contents":{"stringValue":"foo"}} )" */ + { + const MyUnion& resultContents = result.GetContents(); + EXPECT_EQ(R"(foo)", resultContents.GetStringValue()); + } } AWS_PROTOCOL_TEST(JsonUnions, AwsJson11DeserializeBooleanUnionValue) { @@ -40,9 +45,14 @@ AWS_PROTOCOL_TEST(JsonUnions, AwsJson11DeserializeBooleanUnionValue) { JsonUnionsRequest request; auto outcome = client.JsonUnions(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const JsonUnionsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"contents":{"booleanValue":true}} )" */ + { + const MyUnion& resultContents = result.GetContents(); + EXPECT_EQ(true, resultContents.GetBooleanValue()); + } } AWS_PROTOCOL_TEST(JsonUnions, AwsJson11DeserializeNumberUnionValue) { @@ -57,9 +67,14 @@ AWS_PROTOCOL_TEST(JsonUnions, AwsJson11DeserializeNumberUnionValue) { JsonUnionsRequest request; auto outcome = client.JsonUnions(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const JsonUnionsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"contents":{"numberValue":1}} )" */ + { + const MyUnion& resultContents = result.GetContents(); + EXPECT_EQ(1, resultContents.GetNumberValue()); + } } AWS_PROTOCOL_TEST(JsonUnions, AwsJson11DeserializeBlobUnionValue) { @@ -74,9 +89,14 @@ AWS_PROTOCOL_TEST(JsonUnions, AwsJson11DeserializeBlobUnionValue) { JsonUnionsRequest request; auto outcome = client.JsonUnions(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const JsonUnionsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"contents":{"blobValue":"foo"}} )" */ + { + const MyUnion& resultContents = result.GetContents(); + EXPECT_EQ(Aws::Utils::ByteBuffer(R"(foo)"), resultContents.GetBlobValue()); + } } AWS_PROTOCOL_TEST(JsonUnions, AwsJson11DeserializeTimestampUnionValue) { @@ -91,9 +111,14 @@ AWS_PROTOCOL_TEST(JsonUnions, AwsJson11DeserializeTimestampUnionValue) { JsonUnionsRequest request; auto outcome = client.JsonUnions(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const JsonUnionsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"contents":{"timestampValue":1398796238}} )" */ + { + const MyUnion& resultContents = result.GetContents(); + EXPECT_EQ(Aws::Utils::DateTime(1398796238L), resultContents.GetTimestampValue()); + } } AWS_PROTOCOL_TEST(JsonUnions, AwsJson11DeserializeEnumUnionValue) { @@ -108,9 +133,14 @@ AWS_PROTOCOL_TEST(JsonUnions, AwsJson11DeserializeEnumUnionValue) { JsonUnionsRequest request; auto outcome = client.JsonUnions(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const JsonUnionsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"contents":{"enumValue":"Foo"}} )" */ + { + const MyUnion& resultContents = result.GetContents(); + EXPECT_EQ(FooEnumMapper::GetFooEnumForName(R"e(Foo)e"), resultContents.GetEnumValue()); + } } AWS_PROTOCOL_TEST(JsonUnions, AwsJson11DeserializeListUnionValue) { @@ -125,9 +155,17 @@ AWS_PROTOCOL_TEST(JsonUnions, AwsJson11DeserializeListUnionValue) { JsonUnionsRequest request; auto outcome = client.JsonUnions(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const JsonUnionsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"contents":{"listValue":["foo","bar"]}} )" */ + { + const MyUnion& resultContents = result.GetContents(); + const Aws::Vector& resultContentsListValueItem = resultContents.GetListValue(); + EXPECT_EQ(2U, resultContentsListValueItem.size()); + EXPECT_EQ(R"(foo)", resultContentsListValueItem.at(0)); + EXPECT_EQ(R"(bar)", resultContentsListValueItem.at(1)); + } } AWS_PROTOCOL_TEST(JsonUnions, AwsJson11DeserializeMapUnionValue) { @@ -142,9 +180,19 @@ AWS_PROTOCOL_TEST(JsonUnions, AwsJson11DeserializeMapUnionValue) { JsonUnionsRequest request; auto outcome = client.JsonUnions(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const JsonUnionsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"contents":{"mapValue":{"foo":"bar","spam":"eggs"}}} )" */ + { + const MyUnion& resultContents = result.GetContents(); + const Aws::Map& resultContentsMapValue = resultContents.GetMapValue(); + EXPECT_EQ(2U, resultContentsMapValue.size()); + EXPECT_TRUE(resultContentsMapValue.find("foo") != resultContentsMapValue.end()); + EXPECT_EQ(R"(bar)", resultContentsMapValue.at("foo")); + EXPECT_TRUE(resultContentsMapValue.find("spam") != resultContentsMapValue.end()); + EXPECT_EQ(R"(eggs)", resultContentsMapValue.at("spam")); + } } AWS_PROTOCOL_TEST(JsonUnions, AwsJson11DeserializeStructureUnionValue) { @@ -159,9 +207,17 @@ AWS_PROTOCOL_TEST(JsonUnions, AwsJson11DeserializeStructureUnionValue) { JsonUnionsRequest request; auto outcome = client.JsonUnions(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const JsonUnionsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"contents":{"structureValue":{"hi":"hello"}}} )" */ + { + const MyUnion& resultContents = result.GetContents(); + { + const GreetingStruct& resultContentsStructureValue = resultContents.GetStructureValue(); + EXPECT_EQ(R"(hello)", resultContentsStructureValue.GetHi()); + } + } } AWS_PROTOCOL_TEST(JsonUnions, AwsJson11DeserializeIgnoreType) { @@ -176,7 +232,15 @@ AWS_PROTOCOL_TEST(JsonUnions, AwsJson11DeserializeIgnoreType) { JsonUnionsRequest request; auto outcome = client.JsonUnions(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const JsonUnionsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"contents":{"structureValue":{"hi":"hello"}}} )" */ + { + const MyUnion& resultContents = result.GetContents(); + { + const GreetingStruct& resultContentsStructureValue = resultContents.GetStructureValue(); + EXPECT_EQ(R"(hello)", resultContentsStructureValue.GetHi()); + } + } } diff --git a/generated/protocol-tests/tests/output/json/tests/KitchenSinkOperationTest.cpp b/generated/protocol-tests/tests/output/json/tests/KitchenSinkOperationTest.cpp index b03a84a8613..953e863925d 100644 --- a/generated/protocol-tests/tests/output/json/tests/KitchenSinkOperationTest.cpp +++ b/generated/protocol-tests/tests/output/json/tests/KitchenSinkOperationTest.cpp @@ -23,9 +23,9 @@ AWS_PROTOCOL_TEST(KitchenSinkOperation, parses_operations_with_empty_json_bodies KitchenSinkOperationRequest request; auto outcome = client.KitchenSinkOperation(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + /* expectedResult = R"( {} )" */ } AWS_PROTOCOL_TEST(KitchenSinkOperation, parses_string_shapes) { @@ -40,9 +40,11 @@ AWS_PROTOCOL_TEST(KitchenSinkOperation, parses_string_shapes) { KitchenSinkOperationRequest request; auto outcome = client.KitchenSinkOperation(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const KitchenSinkOperationResult& result = outcome.GetResult(); + /* expectedResult = R"( {"String":"string-value"} )" */ + EXPECT_EQ(R"(string-value)", result.GetString()); } AWS_PROTOCOL_TEST(KitchenSinkOperation, parses_integer_shapes) { @@ -57,9 +59,11 @@ AWS_PROTOCOL_TEST(KitchenSinkOperation, parses_integer_shapes) { KitchenSinkOperationRequest request; auto outcome = client.KitchenSinkOperation(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const KitchenSinkOperationResult& result = outcome.GetResult(); + /* expectedResult = R"( {"Integer":1234} )" */ + EXPECT_EQ(1234, result.GetInteger()); } AWS_PROTOCOL_TEST(KitchenSinkOperation, parses_long_shapes) { @@ -74,9 +78,11 @@ AWS_PROTOCOL_TEST(KitchenSinkOperation, parses_long_shapes) { KitchenSinkOperationRequest request; auto outcome = client.KitchenSinkOperation(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const KitchenSinkOperationResult& result = outcome.GetResult(); + /* expectedResult = R"( {"Long":1234567890123456789} )" */ + EXPECT_EQ(1234567890123456789, result.GetLong()); } AWS_PROTOCOL_TEST(KitchenSinkOperation, parses_float_shapes) { @@ -91,9 +97,11 @@ AWS_PROTOCOL_TEST(KitchenSinkOperation, parses_float_shapes) { KitchenSinkOperationRequest request; auto outcome = client.KitchenSinkOperation(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const KitchenSinkOperationResult& result = outcome.GetResult(); + /* expectedResult = R"( {"Float":1234.5} )" */ + EXPECT_EQ(1234.5, result.GetFloat()); } AWS_PROTOCOL_TEST(KitchenSinkOperation, parses_double_shapes) { @@ -108,9 +116,11 @@ AWS_PROTOCOL_TEST(KitchenSinkOperation, parses_double_shapes) { KitchenSinkOperationRequest request; auto outcome = client.KitchenSinkOperation(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const KitchenSinkOperationResult& result = outcome.GetResult(); + /* expectedResult = R"( {"Double":1.2345678912345679E8} )" */ + EXPECT_EQ(1.2345678912345679E8, result.GetDouble()); } AWS_PROTOCOL_TEST(KitchenSinkOperation, parses_boolean_shapes_true) { @@ -125,9 +135,11 @@ AWS_PROTOCOL_TEST(KitchenSinkOperation, parses_boolean_shapes_true) { KitchenSinkOperationRequest request; auto outcome = client.KitchenSinkOperation(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const KitchenSinkOperationResult& result = outcome.GetResult(); + /* expectedResult = R"( {"Boolean":true} )" */ + EXPECT_EQ(true, result.GetBoolean()); } AWS_PROTOCOL_TEST(KitchenSinkOperation, parses_boolean_false) { @@ -142,9 +154,11 @@ AWS_PROTOCOL_TEST(KitchenSinkOperation, parses_boolean_false) { KitchenSinkOperationRequest request; auto outcome = client.KitchenSinkOperation(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const KitchenSinkOperationResult& result = outcome.GetResult(); + /* expectedResult = R"( {"Boolean":false} )" */ + EXPECT_EQ(false, result.GetBoolean()); } AWS_PROTOCOL_TEST(KitchenSinkOperation, parses_blob_shapes) { @@ -159,9 +173,11 @@ AWS_PROTOCOL_TEST(KitchenSinkOperation, parses_blob_shapes) { KitchenSinkOperationRequest request; auto outcome = client.KitchenSinkOperation(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const KitchenSinkOperationResult& result = outcome.GetResult(); + /* expectedResult = R"( {"Blob":"binary-value"} )" */ + EXPECT_EQ(Aws::Utils::ByteBuffer(R"(binary-value)"), result.GetBlob()); } AWS_PROTOCOL_TEST(KitchenSinkOperation, parses_timestamp_shapes) { @@ -176,9 +192,11 @@ AWS_PROTOCOL_TEST(KitchenSinkOperation, parses_timestamp_shapes) { KitchenSinkOperationRequest request; auto outcome = client.KitchenSinkOperation(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const KitchenSinkOperationResult& result = outcome.GetResult(); + /* expectedResult = R"( {"Timestamp":946845296} )" */ + EXPECT_EQ(Aws::Utils::DateTime(946845296L), result.GetTimestamp()); } AWS_PROTOCOL_TEST(KitchenSinkOperation, parses_iso8601_timestamps) { @@ -193,9 +211,11 @@ AWS_PROTOCOL_TEST(KitchenSinkOperation, parses_iso8601_timestamps) { KitchenSinkOperationRequest request; auto outcome = client.KitchenSinkOperation(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const KitchenSinkOperationResult& result = outcome.GetResult(); + /* expectedResult = R"( {"Iso8601Timestamp":946845296} )" */ + EXPECT_EQ(Aws::Utils::DateTime(946845296L), result.GetIso8601Timestamp()); } AWS_PROTOCOL_TEST(KitchenSinkOperation, parses_httpdate_timestamps) { @@ -210,9 +230,11 @@ AWS_PROTOCOL_TEST(KitchenSinkOperation, parses_httpdate_timestamps) { KitchenSinkOperationRequest request; auto outcome = client.KitchenSinkOperation(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const KitchenSinkOperationResult& result = outcome.GetResult(); + /* expectedResult = R"( {"HttpdateTimestamp":946845296} )" */ + EXPECT_EQ(Aws::Utils::DateTime(946845296L), result.GetHttpdateTimestamp()); } AWS_PROTOCOL_TEST(KitchenSinkOperation, parses_list_shapes) { @@ -227,9 +249,15 @@ AWS_PROTOCOL_TEST(KitchenSinkOperation, parses_list_shapes) { KitchenSinkOperationRequest request; auto outcome = client.KitchenSinkOperation(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const KitchenSinkOperationResult& result = outcome.GetResult(); + /* expectedResult = R"( {"ListOfStrings":["abc","mno","xyz"]} )" */ + const Aws::Vector& resultListOfStringsItem = result.GetListOfStrings(); + EXPECT_EQ(3U, resultListOfStringsItem.size()); + EXPECT_EQ(R"(abc)", resultListOfStringsItem.at(0)); + EXPECT_EQ(R"(mno)", resultListOfStringsItem.at(1)); + EXPECT_EQ(R"(xyz)", resultListOfStringsItem.at(2)); } AWS_PROTOCOL_TEST(KitchenSinkOperation, parses_list_of_map_shapes) { @@ -244,9 +272,23 @@ AWS_PROTOCOL_TEST(KitchenSinkOperation, parses_list_of_map_shapes) { KitchenSinkOperationRequest request; auto outcome = client.KitchenSinkOperation(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const KitchenSinkOperationResult& result = outcome.GetResult(); + /* expectedResult = R"( {"ListOfMapsOfStrings":[{"size":"large"},{"color":"red"}]} )" */ + EXPECT_EQ(2U, result.GetListOfMapsOfStrings().size()); + { + const Aws::Map& resultListOfMapsOfStringsItem = result.GetListOfMapsOfStrings().at(0); + EXPECT_EQ(1U, resultListOfMapsOfStringsItem.size()); + EXPECT_TRUE(resultListOfMapsOfStringsItem.find("size") != resultListOfMapsOfStringsItem.end()); + EXPECT_EQ(resultListOfMapsOfStringsItem.at("size"), R"(large)"); + } + { + const Aws::Map& resultListOfMapsOfStringsItem = result.GetListOfMapsOfStrings().at(1); + EXPECT_EQ(1U, resultListOfMapsOfStringsItem.size()); + EXPECT_TRUE(resultListOfMapsOfStringsItem.find("color") != resultListOfMapsOfStringsItem.end()); + EXPECT_EQ(resultListOfMapsOfStringsItem.at("color"), R"(red)"); + } } AWS_PROTOCOL_TEST(KitchenSinkOperation, parses_list_of_list_shapes) { @@ -261,9 +303,25 @@ AWS_PROTOCOL_TEST(KitchenSinkOperation, parses_list_of_list_shapes) { KitchenSinkOperationRequest request; auto outcome = client.KitchenSinkOperation(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const KitchenSinkOperationResult& result = outcome.GetResult(); + /* expectedResult = R"( {"ListOfLists":[["abc","mno","xyz"],["hjk","qrs","tuv"]]} )" */ + EXPECT_EQ(2U, result.GetListOfLists().size()); + { + const Aws::Vector& resultListOfListsItem = result.GetListOfLists().at(0); + EXPECT_EQ(3U, resultListOfListsItem.size()); + EXPECT_EQ(R"(abc)", resultListOfListsItem.at(0)); + EXPECT_EQ(R"(mno)", resultListOfListsItem.at(1)); + EXPECT_EQ(R"(xyz)", resultListOfListsItem.at(2)); + } + { + const Aws::Vector& resultListOfListsItem = result.GetListOfLists().at(1); + EXPECT_EQ(3U, resultListOfListsItem.size()); + EXPECT_EQ(R"(hjk)", resultListOfListsItem.at(0)); + EXPECT_EQ(R"(qrs)", resultListOfListsItem.at(1)); + EXPECT_EQ(R"(tuv)", resultListOfListsItem.at(2)); + } } AWS_PROTOCOL_TEST(KitchenSinkOperation, parses_list_of_structure_shapes) { @@ -278,9 +336,19 @@ AWS_PROTOCOL_TEST(KitchenSinkOperation, parses_list_of_structure_shapes) { KitchenSinkOperationRequest request; auto outcome = client.KitchenSinkOperation(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const KitchenSinkOperationResult& result = outcome.GetResult(); + /* expectedResult = R"( {"ListOfStructs":[{"Value":"value-1"},{"Value":"value-2"}]} )" */ + EXPECT_EQ(2U, result.GetListOfStructs().size()); + { + const SimpleStruct& resultListOfStructsItem = result.GetListOfStructs().at(0); + EXPECT_EQ(R"(value-1)", resultListOfStructsItem.GetValue()); + } + { + const SimpleStruct& resultListOfStructsItem = result.GetListOfStructs().at(1); + EXPECT_EQ(R"(value-2)", resultListOfStructsItem.GetValue()); + } } AWS_PROTOCOL_TEST(KitchenSinkOperation, parses_list_of_recursive_structure_shapes) { @@ -295,9 +363,23 @@ AWS_PROTOCOL_TEST(KitchenSinkOperation, parses_list_of_recursive_structure_shape KitchenSinkOperationRequest request; auto outcome = client.KitchenSinkOperation(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const KitchenSinkOperationResult& result = outcome.GetResult(); + /* expectedResult = R"( {"RecursiveList":[{"RecursiveList":[{"RecursiveList":[{"String":"value"}]}]}]} )" */ + EXPECT_EQ(1U, result.GetRecursiveList().size()); + { + const KitchenSink& resultRecursiveListItem = result.GetRecursiveList().at(0); + EXPECT_EQ(1U, resultRecursiveListItem.GetRecursiveList().size()); + { + const KitchenSink& resultRecursiveListItemRecursiveListItem = resultRecursiveListItem.GetRecursiveList().at(0); + EXPECT_EQ(1U, resultRecursiveListItemRecursiveListItem.GetRecursiveList().size()); + { + const KitchenSink& resultRecursiveListItemRecursiveListItemRecursiveListItem = resultRecursiveListItemRecursiveListItem.GetRecursiveList().at(0); + EXPECT_EQ(R"(value)", resultRecursiveListItemRecursiveListItemRecursiveListItem.GetString()); + } + } + } } AWS_PROTOCOL_TEST(KitchenSinkOperation, parses_map_shapes) { @@ -312,9 +394,16 @@ AWS_PROTOCOL_TEST(KitchenSinkOperation, parses_map_shapes) { KitchenSinkOperationRequest request; auto outcome = client.KitchenSinkOperation(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const KitchenSinkOperationResult& result = outcome.GetResult(); + /* expectedResult = R"( {"MapOfStrings":{"size":"large","color":"red"}} )" */ + const Aws::Map& resultMapOfStrings = result.GetMapOfStrings(); + EXPECT_EQ(2U, resultMapOfStrings.size()); + EXPECT_TRUE(resultMapOfStrings.find("size") != resultMapOfStrings.end()); + EXPECT_EQ(R"(large)", resultMapOfStrings.at("size")); + EXPECT_TRUE(resultMapOfStrings.find("color") != resultMapOfStrings.end()); + EXPECT_EQ(R"(red)", resultMapOfStrings.at("color")); } AWS_PROTOCOL_TEST(KitchenSinkOperation, parses_map_of_list_shapes) { @@ -329,9 +418,26 @@ AWS_PROTOCOL_TEST(KitchenSinkOperation, parses_map_of_list_shapes) { KitchenSinkOperationRequest request; auto outcome = client.KitchenSinkOperation(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const KitchenSinkOperationResult& result = outcome.GetResult(); + /* expectedResult = R"( {"MapOfListsOfStrings":{"sizes":["large","small"],"colors":["red","green"]}} )" */ + const Aws::Map>& resultMapOfListsOfStrings = result.GetMapOfListsOfStrings(); + EXPECT_EQ(2U, resultMapOfListsOfStrings.size()); + EXPECT_TRUE(resultMapOfListsOfStrings.find("sizes") != resultMapOfListsOfStrings.end()); + { + const Aws::Vector& resultMapOfListsOfStringsItem = resultMapOfListsOfStrings.at("sizes"); + EXPECT_EQ(2U, resultMapOfListsOfStringsItem.size()); + EXPECT_EQ(R"(large)", resultMapOfListsOfStringsItem.at(0)); + EXPECT_EQ(R"(small)", resultMapOfListsOfStringsItem.at(1)); + } + EXPECT_TRUE(resultMapOfListsOfStrings.find("colors") != resultMapOfListsOfStrings.end()); + { + const Aws::Vector& resultMapOfListsOfStringsItem = resultMapOfListsOfStrings.at("colors"); + EXPECT_EQ(2U, resultMapOfListsOfStringsItem.size()); + EXPECT_EQ(R"(red)", resultMapOfListsOfStringsItem.at(0)); + EXPECT_EQ(R"(green)", resultMapOfListsOfStringsItem.at(1)); + } } AWS_PROTOCOL_TEST(KitchenSinkOperation, parses_map_of_map_shapes) { @@ -346,9 +452,30 @@ AWS_PROTOCOL_TEST(KitchenSinkOperation, parses_map_of_map_shapes) { KitchenSinkOperationRequest request; auto outcome = client.KitchenSinkOperation(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const KitchenSinkOperationResult& result = outcome.GetResult(); + /* expectedResult = R"( {"MapOfMaps":{"sizes":{"large":"L","medium":"M"},"colors":{"red":"R","blue":"B"}}} )" */ + const Aws::Map>& resultMapOfMaps = result.GetMapOfMaps(); + EXPECT_EQ(2U, resultMapOfMaps.size()); + EXPECT_TRUE(resultMapOfMaps.find("sizes") != resultMapOfMaps.end()); + { + const Aws::Map& resultMapOfMapsNestedMap = resultMapOfMaps.at("sizes"); + EXPECT_EQ(2U, resultMapOfMapsNestedMap.size()); + EXPECT_TRUE(resultMapOfMapsNestedMap.find("large") != resultMapOfMapsNestedMap.end()); + EXPECT_EQ(R"(L)", resultMapOfMapsNestedMap.at("large")); + EXPECT_TRUE(resultMapOfMapsNestedMap.find("medium") != resultMapOfMapsNestedMap.end()); + EXPECT_EQ(R"(M)", resultMapOfMapsNestedMap.at("medium")); + } + EXPECT_TRUE(resultMapOfMaps.find("colors") != resultMapOfMaps.end()); + { + const Aws::Map& resultMapOfMapsNestedMap = resultMapOfMaps.at("colors"); + EXPECT_EQ(2U, resultMapOfMapsNestedMap.size()); + EXPECT_TRUE(resultMapOfMapsNestedMap.find("red") != resultMapOfMapsNestedMap.end()); + EXPECT_EQ(R"(R)", resultMapOfMapsNestedMap.at("red")); + EXPECT_TRUE(resultMapOfMapsNestedMap.find("blue") != resultMapOfMapsNestedMap.end()); + EXPECT_EQ(R"(B)", resultMapOfMapsNestedMap.at("blue")); + } } AWS_PROTOCOL_TEST(KitchenSinkOperation, parses_map_of_structure_shapes) { @@ -363,9 +490,22 @@ AWS_PROTOCOL_TEST(KitchenSinkOperation, parses_map_of_structure_shapes) { KitchenSinkOperationRequest request; auto outcome = client.KitchenSinkOperation(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const KitchenSinkOperationResult& result = outcome.GetResult(); + /* expectedResult = R"( {"MapOfStructs":{"size":{"Value":"small"},"color":{"Value":"red"}}} )" */ + const Aws::Map& resultMapOfStructs = result.GetMapOfStructs(); + EXPECT_EQ(2U, resultMapOfStructs.size()); + { + EXPECT_TRUE(resultMapOfStructs.find("size") != resultMapOfStructs.end()); + const SimpleStruct& resultMapOfStructsItem = resultMapOfStructs.at("size"); + EXPECT_EQ(R"(small)", resultMapOfStructsItem.GetValue()); + } + { + EXPECT_TRUE(resultMapOfStructs.find("color") != resultMapOfStructs.end()); + const SimpleStruct& resultMapOfStructsItem = resultMapOfStructs.at("color"); + EXPECT_EQ(R"(red)", resultMapOfStructsItem.GetValue()); + } } AWS_PROTOCOL_TEST(KitchenSinkOperation, parses_map_of_recursive_structure_shapes) { @@ -380,9 +520,29 @@ AWS_PROTOCOL_TEST(KitchenSinkOperation, parses_map_of_recursive_structure_shapes KitchenSinkOperationRequest request; auto outcome = client.KitchenSinkOperation(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const KitchenSinkOperationResult& result = outcome.GetResult(); + /* expectedResult = R"( {"RecursiveMap":{"key-1":{"RecursiveMap":{"key-2":{"RecursiveMap":{"key-3":{"String":"value"}}}}}}} )" */ + const Aws::Map& resultRecursiveMap = result.GetRecursiveMap(); + EXPECT_EQ(1U, resultRecursiveMap.size()); + { + EXPECT_TRUE(resultRecursiveMap.find("key-1") != resultRecursiveMap.end()); + const KitchenSink& resultRecursiveMapItem = resultRecursiveMap.at("key-1"); + const Aws::Map& resultRecursiveMapItemRecursiveMap = resultRecursiveMapItem.GetRecursiveMap(); + EXPECT_EQ(1U, resultRecursiveMapItemRecursiveMap.size()); + { + EXPECT_TRUE(resultRecursiveMapItemRecursiveMap.find("key-2") != resultRecursiveMapItemRecursiveMap.end()); + const KitchenSink& resultRecursiveMapItemRecursiveMapItem = resultRecursiveMapItemRecursiveMap.at("key-2"); + const Aws::Map& resultRecursiveMapItemRecursiveMapItemRecursiveMap = resultRecursiveMapItemRecursiveMapItem.GetRecursiveMap(); + EXPECT_EQ(1U, resultRecursiveMapItemRecursiveMapItemRecursiveMap.size()); + { + EXPECT_TRUE(resultRecursiveMapItemRecursiveMapItemRecursiveMap.find("key-3") != resultRecursiveMapItemRecursiveMapItemRecursiveMap.end()); + const KitchenSink& resultRecursiveMapItemRecursiveMapItemRecursiveMapItem = resultRecursiveMapItemRecursiveMapItemRecursiveMap.at("key-3"); + EXPECT_EQ(R"(value)", resultRecursiveMapItemRecursiveMapItemRecursiveMapItem.GetString()); + } + } + } } AWS_PROTOCOL_TEST(KitchenSinkOperation, parses_the_request_id_from_the_response) { @@ -397,7 +557,7 @@ AWS_PROTOCOL_TEST(KitchenSinkOperation, parses_the_request_id_from_the_response) KitchenSinkOperationRequest request; auto outcome = client.KitchenSinkOperation(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + /* expectedResult = R"( {} )" */ } diff --git a/generated/protocol-tests/tests/output/json/tests/NullOperationTest.cpp b/generated/protocol-tests/tests/output/json/tests/NullOperationTest.cpp index 9b8b1be0093..a225868e6e8 100644 --- a/generated/protocol-tests/tests/output/json/tests/NullOperationTest.cpp +++ b/generated/protocol-tests/tests/output/json/tests/NullOperationTest.cpp @@ -23,7 +23,7 @@ AWS_PROTOCOL_TEST(NullOperation, AwsJson11StructuresDontDeserializeNullValues) { NullOperationRequest request; auto outcome = client.NullOperation(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + /* expectedResult = R"( {} )" */ } diff --git a/generated/protocol-tests/tests/output/json/tests/PutAndGetInlineDocumentsTest.cpp b/generated/protocol-tests/tests/output/json/tests/PutAndGetInlineDocumentsTest.cpp index daece061c12..dfa6d417791 100644 --- a/generated/protocol-tests/tests/output/json/tests/PutAndGetInlineDocumentsTest.cpp +++ b/generated/protocol-tests/tests/output/json/tests/PutAndGetInlineDocumentsTest.cpp @@ -23,7 +23,12 @@ AWS_PROTOCOL_TEST(PutAndGetInlineDocuments, PutAndGetInlineDocumentsInput) { PutAndGetInlineDocumentsRequest request; auto outcome = client.PutAndGetInlineDocuments(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const PutAndGetInlineDocumentsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"inlineDocument":{"foo":"bar"}} )" */ + { + const Aws::Utils::DocumentView& resultInlineDocument = result.GetInlineDocument(); + EXPECT_STREQ(R"j({"foo":"bar"})j", resultInlineDocument.WriteCompact().c_str()); + } } diff --git a/generated/protocol-tests/tests/output/json/tests/SimpleScalarPropertiesTest.cpp b/generated/protocol-tests/tests/output/json/tests/SimpleScalarPropertiesTest.cpp index 9751b1690b8..087de031893 100644 --- a/generated/protocol-tests/tests/output/json/tests/SimpleScalarPropertiesTest.cpp +++ b/generated/protocol-tests/tests/output/json/tests/SimpleScalarPropertiesTest.cpp @@ -23,9 +23,12 @@ AWS_PROTOCOL_TEST(SimpleScalarProperties, AwsJson11SupportsNaNFloatInputs) { SimpleScalarPropertiesRequest request; auto outcome = client.SimpleScalarProperties(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const SimpleScalarPropertiesResult& result = outcome.GetResult(); + /* expectedResult = R"( {"floatValue":"NaN","doubleValue":"NaN"} )" */ + EXPECT_EQ(std::numeric_limits::quiet_NaN(), result.GetFloatValue()); + EXPECT_EQ(std::numeric_limits::quiet_NaN(), result.GetDoubleValue()); } AWS_PROTOCOL_TEST(SimpleScalarProperties, AwsJson11SupportsInfinityFloatInputs) { @@ -40,9 +43,12 @@ AWS_PROTOCOL_TEST(SimpleScalarProperties, AwsJson11SupportsInfinityFloatInputs) SimpleScalarPropertiesRequest request; auto outcome = client.SimpleScalarProperties(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const SimpleScalarPropertiesResult& result = outcome.GetResult(); + /* expectedResult = R"( {"floatValue":"Infinity","doubleValue":"Infinity"} )" */ + EXPECT_EQ(std::numeric_limits::infinity(), result.GetFloatValue()); + EXPECT_EQ(std::numeric_limits::infinity(), result.GetDoubleValue()); } AWS_PROTOCOL_TEST(SimpleScalarProperties, AwsJson11SupportsNegativeInfinityFloatInputs) { @@ -57,7 +63,10 @@ AWS_PROTOCOL_TEST(SimpleScalarProperties, AwsJson11SupportsNegativeInfinityFloat SimpleScalarPropertiesRequest request; auto outcome = client.SimpleScalarProperties(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const SimpleScalarPropertiesResult& result = outcome.GetResult(); + /* expectedResult = R"( {"floatValue":"-Infinity","doubleValue":"-Infinity"} )" */ + EXPECT_EQ(-std::numeric_limits::infinity(), result.GetFloatValue()); + EXPECT_EQ(-std::numeric_limits::infinity(), result.GetDoubleValue()); } diff --git a/generated/protocol-tests/tests/output/json_1_0/tests/EmptyInputAndEmptyOutputTest.cpp b/generated/protocol-tests/tests/output/json_1_0/tests/EmptyInputAndEmptyOutputTest.cpp index 402d21d11c0..ce043e9be56 100644 --- a/generated/protocol-tests/tests/output/json_1_0/tests/EmptyInputAndEmptyOutputTest.cpp +++ b/generated/protocol-tests/tests/output/json_1_0/tests/EmptyInputAndEmptyOutputTest.cpp @@ -23,7 +23,7 @@ AWS_PROTOCOL_TEST(EmptyInputAndEmptyOutput, AwsJson10EmptyInputAndEmptyOutputSen EmptyInputAndEmptyOutputRequest request; auto outcome = client.EmptyInputAndEmptyOutput(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + /* expectedResult = R"( {} )" */ } diff --git a/generated/protocol-tests/tests/output/json_1_0/tests/GreetingWithErrors0Test.cpp b/generated/protocol-tests/tests/output/json_1_0/tests/GreetingWithErrors0Test.cpp index 1ca7b59ce51..d098cbc27c8 100644 --- a/generated/protocol-tests/tests/output/json_1_0/tests/GreetingWithErrors0Test.cpp +++ b/generated/protocol-tests/tests/output/json_1_0/tests/GreetingWithErrors0Test.cpp @@ -22,9 +22,8 @@ AWS_PROTOCOL_TEST(GreetingWithErrors0, AwsJson10FooErrorUsingXAmznErrorType) { GreetingWithErrorsRequest request; auto outcome = client.GreetingWithErrors(request); - ASSERT_FALSE(outcome.IsSuccess()); - ValidateRequestSent(); + ASSERT_FALSE(outcome.IsSuccess()); } AWS_PROTOCOL_TEST(GreetingWithErrors0, AwsJson10FooErrorUsingXAmznErrorTypeWithUri) { @@ -38,9 +37,8 @@ AWS_PROTOCOL_TEST(GreetingWithErrors0, AwsJson10FooErrorUsingXAmznErrorTypeWithU GreetingWithErrorsRequest request; auto outcome = client.GreetingWithErrors(request); - ASSERT_FALSE(outcome.IsSuccess()); - ValidateRequestSent(); + ASSERT_FALSE(outcome.IsSuccess()); } AWS_PROTOCOL_TEST(GreetingWithErrors0, AwsJson10FooErrorUsingXAmznErrorTypeWithUriAndNamespace) { @@ -54,9 +52,8 @@ AWS_PROTOCOL_TEST(GreetingWithErrors0, AwsJson10FooErrorUsingXAmznErrorTypeWithU GreetingWithErrorsRequest request; auto outcome = client.GreetingWithErrors(request); - ASSERT_FALSE(outcome.IsSuccess()); - ValidateRequestSent(); + ASSERT_FALSE(outcome.IsSuccess()); } AWS_PROTOCOL_TEST(GreetingWithErrors0, AwsJson10FooErrorUsingCode) { @@ -71,9 +68,8 @@ AWS_PROTOCOL_TEST(GreetingWithErrors0, AwsJson10FooErrorUsingCode) { GreetingWithErrorsRequest request; auto outcome = client.GreetingWithErrors(request); - ASSERT_FALSE(outcome.IsSuccess()); - ValidateRequestSent(); + ASSERT_FALSE(outcome.IsSuccess()); } AWS_PROTOCOL_TEST(GreetingWithErrors0, AwsJson10FooErrorUsingCodeAndNamespace) { @@ -88,9 +84,8 @@ AWS_PROTOCOL_TEST(GreetingWithErrors0, AwsJson10FooErrorUsingCodeAndNamespace) { GreetingWithErrorsRequest request; auto outcome = client.GreetingWithErrors(request); - ASSERT_FALSE(outcome.IsSuccess()); - ValidateRequestSent(); + ASSERT_FALSE(outcome.IsSuccess()); } AWS_PROTOCOL_TEST(GreetingWithErrors0, AwsJson10FooErrorUsingCodeUriAndNamespace) { @@ -105,9 +100,8 @@ AWS_PROTOCOL_TEST(GreetingWithErrors0, AwsJson10FooErrorUsingCodeUriAndNamespace GreetingWithErrorsRequest request; auto outcome = client.GreetingWithErrors(request); - ASSERT_FALSE(outcome.IsSuccess()); - ValidateRequestSent(); + ASSERT_FALSE(outcome.IsSuccess()); } AWS_PROTOCOL_TEST(GreetingWithErrors0, AwsJson10FooErrorWithDunderType) { @@ -122,9 +116,8 @@ AWS_PROTOCOL_TEST(GreetingWithErrors0, AwsJson10FooErrorWithDunderType) { GreetingWithErrorsRequest request; auto outcome = client.GreetingWithErrors(request); - ASSERT_FALSE(outcome.IsSuccess()); - ValidateRequestSent(); + ASSERT_FALSE(outcome.IsSuccess()); } AWS_PROTOCOL_TEST(GreetingWithErrors0, AwsJson10FooErrorWithDunderTypeAndNamespace) { @@ -139,9 +132,8 @@ AWS_PROTOCOL_TEST(GreetingWithErrors0, AwsJson10FooErrorWithDunderTypeAndNamespa GreetingWithErrorsRequest request; auto outcome = client.GreetingWithErrors(request); - ASSERT_FALSE(outcome.IsSuccess()); - ValidateRequestSent(); + ASSERT_FALSE(outcome.IsSuccess()); } AWS_PROTOCOL_TEST(GreetingWithErrors0, AwsJson10FooErrorWithDunderTypeUriAndNamespace) { @@ -156,7 +148,6 @@ AWS_PROTOCOL_TEST(GreetingWithErrors0, AwsJson10FooErrorWithDunderTypeUriAndName GreetingWithErrorsRequest request; auto outcome = client.GreetingWithErrors(request); - ASSERT_FALSE(outcome.IsSuccess()); - ValidateRequestSent(); + ASSERT_FALSE(outcome.IsSuccess()); } diff --git a/generated/protocol-tests/tests/output/json_1_0/tests/GreetingWithErrors1Test.cpp b/generated/protocol-tests/tests/output/json_1_0/tests/GreetingWithErrors1Test.cpp index 2e7fc40596b..e5383f6e142 100644 --- a/generated/protocol-tests/tests/output/json_1_0/tests/GreetingWithErrors1Test.cpp +++ b/generated/protocol-tests/tests/output/json_1_0/tests/GreetingWithErrors1Test.cpp @@ -23,9 +23,8 @@ AWS_PROTOCOL_TEST(GreetingWithErrors1, AwsJson10ComplexError) { GreetingWithErrorsRequest request; auto outcome = client.GreetingWithErrors(request); - ASSERT_FALSE(outcome.IsSuccess()); - ValidateRequestSent(); + ASSERT_FALSE(outcome.IsSuccess()); } AWS_PROTOCOL_TEST(GreetingWithErrors1, AwsJson10EmptyComplexError) { @@ -40,7 +39,6 @@ AWS_PROTOCOL_TEST(GreetingWithErrors1, AwsJson10EmptyComplexError) { GreetingWithErrorsRequest request; auto outcome = client.GreetingWithErrors(request); - ASSERT_FALSE(outcome.IsSuccess()); - ValidateRequestSent(); + ASSERT_FALSE(outcome.IsSuccess()); } diff --git a/generated/protocol-tests/tests/output/json_1_0/tests/GreetingWithErrorsTest.cpp b/generated/protocol-tests/tests/output/json_1_0/tests/GreetingWithErrorsTest.cpp index d5158ea41fa..1c132fc0cbe 100644 --- a/generated/protocol-tests/tests/output/json_1_0/tests/GreetingWithErrorsTest.cpp +++ b/generated/protocol-tests/tests/output/json_1_0/tests/GreetingWithErrorsTest.cpp @@ -23,7 +23,6 @@ AWS_PROTOCOL_TEST(GreetingWithErrors, AwsJson10InvalidGreetingError) { GreetingWithErrorsRequest request; auto outcome = client.GreetingWithErrors(request); - ASSERT_FALSE(outcome.IsSuccess()); - ValidateRequestSent(); + ASSERT_FALSE(outcome.IsSuccess()); } diff --git a/generated/protocol-tests/tests/output/json_1_0/tests/JsonUnionsTest.cpp b/generated/protocol-tests/tests/output/json_1_0/tests/JsonUnionsTest.cpp index 1d80b63b48a..a3ad2580f0b 100644 --- a/generated/protocol-tests/tests/output/json_1_0/tests/JsonUnionsTest.cpp +++ b/generated/protocol-tests/tests/output/json_1_0/tests/JsonUnionsTest.cpp @@ -23,9 +23,14 @@ AWS_PROTOCOL_TEST(JsonUnions, AwsJson10DeserializeStringUnionValue) { JsonUnionsRequest request; auto outcome = client.JsonUnions(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const JsonUnionsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"contents":{"stringValue":"foo"}} )" */ + { + const MyUnion& resultContents = result.GetContents(); + EXPECT_EQ(R"(foo)", resultContents.GetStringValue()); + } } AWS_PROTOCOL_TEST(JsonUnions, AwsJson10DeserializeBooleanUnionValue) { @@ -40,9 +45,14 @@ AWS_PROTOCOL_TEST(JsonUnions, AwsJson10DeserializeBooleanUnionValue) { JsonUnionsRequest request; auto outcome = client.JsonUnions(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const JsonUnionsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"contents":{"booleanValue":true}} )" */ + { + const MyUnion& resultContents = result.GetContents(); + EXPECT_EQ(true, resultContents.GetBooleanValue()); + } } AWS_PROTOCOL_TEST(JsonUnions, AwsJson10DeserializeNumberUnionValue) { @@ -57,9 +67,14 @@ AWS_PROTOCOL_TEST(JsonUnions, AwsJson10DeserializeNumberUnionValue) { JsonUnionsRequest request; auto outcome = client.JsonUnions(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const JsonUnionsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"contents":{"numberValue":1}} )" */ + { + const MyUnion& resultContents = result.GetContents(); + EXPECT_EQ(1, resultContents.GetNumberValue()); + } } AWS_PROTOCOL_TEST(JsonUnions, AwsJson10DeserializeBlobUnionValue) { @@ -74,9 +89,14 @@ AWS_PROTOCOL_TEST(JsonUnions, AwsJson10DeserializeBlobUnionValue) { JsonUnionsRequest request; auto outcome = client.JsonUnions(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const JsonUnionsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"contents":{"blobValue":"foo"}} )" */ + { + const MyUnion& resultContents = result.GetContents(); + EXPECT_EQ(Aws::Utils::ByteBuffer(R"(foo)"), resultContents.GetBlobValue()); + } } AWS_PROTOCOL_TEST(JsonUnions, AwsJson10DeserializeTimestampUnionValue) { @@ -91,9 +111,14 @@ AWS_PROTOCOL_TEST(JsonUnions, AwsJson10DeserializeTimestampUnionValue) { JsonUnionsRequest request; auto outcome = client.JsonUnions(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const JsonUnionsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"contents":{"timestampValue":1398796238}} )" */ + { + const MyUnion& resultContents = result.GetContents(); + EXPECT_EQ(Aws::Utils::DateTime(1398796238L), resultContents.GetTimestampValue()); + } } AWS_PROTOCOL_TEST(JsonUnions, AwsJson10DeserializeEnumUnionValue) { @@ -108,9 +133,14 @@ AWS_PROTOCOL_TEST(JsonUnions, AwsJson10DeserializeEnumUnionValue) { JsonUnionsRequest request; auto outcome = client.JsonUnions(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const JsonUnionsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"contents":{"enumValue":"Foo"}} )" */ + { + const MyUnion& resultContents = result.GetContents(); + EXPECT_EQ(FooEnumMapper::GetFooEnumForName(R"e(Foo)e"), resultContents.GetEnumValue()); + } } AWS_PROTOCOL_TEST(JsonUnions, AwsJson10DeserializeIntEnumUnionValue) { @@ -125,9 +155,14 @@ AWS_PROTOCOL_TEST(JsonUnions, AwsJson10DeserializeIntEnumUnionValue) { JsonUnionsRequest request; auto outcome = client.JsonUnions(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const JsonUnionsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"contents":{"intEnumValue":1}} )" */ + { + const MyUnion& resultContents = result.GetContents(); + EXPECT_EQ(1, resultContents.GetIntEnumValue()); + } } AWS_PROTOCOL_TEST(JsonUnions, AwsJson10DeserializeListUnionValue) { @@ -142,9 +177,17 @@ AWS_PROTOCOL_TEST(JsonUnions, AwsJson10DeserializeListUnionValue) { JsonUnionsRequest request; auto outcome = client.JsonUnions(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const JsonUnionsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"contents":{"listValue":["foo","bar"]}} )" */ + { + const MyUnion& resultContents = result.GetContents(); + const Aws::Vector& resultContentsListValueItem = resultContents.GetListValue(); + EXPECT_EQ(2U, resultContentsListValueItem.size()); + EXPECT_EQ(R"(foo)", resultContentsListValueItem.at(0)); + EXPECT_EQ(R"(bar)", resultContentsListValueItem.at(1)); + } } AWS_PROTOCOL_TEST(JsonUnions, AwsJson10DeserializeMapUnionValue) { @@ -159,9 +202,19 @@ AWS_PROTOCOL_TEST(JsonUnions, AwsJson10DeserializeMapUnionValue) { JsonUnionsRequest request; auto outcome = client.JsonUnions(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const JsonUnionsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"contents":{"mapValue":{"foo":"bar","spam":"eggs"}}} )" */ + { + const MyUnion& resultContents = result.GetContents(); + const Aws::Map& resultContentsMapValue = resultContents.GetMapValue(); + EXPECT_EQ(2U, resultContentsMapValue.size()); + EXPECT_TRUE(resultContentsMapValue.find("foo") != resultContentsMapValue.end()); + EXPECT_EQ(R"(bar)", resultContentsMapValue.at("foo")); + EXPECT_TRUE(resultContentsMapValue.find("spam") != resultContentsMapValue.end()); + EXPECT_EQ(R"(eggs)", resultContentsMapValue.at("spam")); + } } AWS_PROTOCOL_TEST(JsonUnions, AwsJson10DeserializeStructureUnionValue) { @@ -176,9 +229,17 @@ AWS_PROTOCOL_TEST(JsonUnions, AwsJson10DeserializeStructureUnionValue) { JsonUnionsRequest request; auto outcome = client.JsonUnions(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const JsonUnionsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"contents":{"structureValue":{"hi":"hello"}}} )" */ + { + const MyUnion& resultContents = result.GetContents(); + { + const GreetingStruct& resultContentsStructureValue = resultContents.GetStructureValue(); + EXPECT_EQ(R"(hello)", resultContentsStructureValue.GetHi()); + } + } } AWS_PROTOCOL_TEST(JsonUnions, AwsJson10DeserializeIgnoreType) { @@ -193,9 +254,17 @@ AWS_PROTOCOL_TEST(JsonUnions, AwsJson10DeserializeIgnoreType) { JsonUnionsRequest request; auto outcome = client.JsonUnions(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const JsonUnionsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"contents":{"structureValue":{"hi":"hello"}}} )" */ + { + const MyUnion& resultContents = result.GetContents(); + { + const GreetingStruct& resultContentsStructureValue = resultContents.GetStructureValue(); + EXPECT_EQ(R"(hello)", resultContentsStructureValue.GetHi()); + } + } } AWS_PROTOCOL_TEST(JsonUnions, AwsJson10DeserializeAllowNulls) { @@ -210,7 +279,15 @@ AWS_PROTOCOL_TEST(JsonUnions, AwsJson10DeserializeAllowNulls) { JsonUnionsRequest request; auto outcome = client.JsonUnions(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const JsonUnionsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"contents":{"structureValue":{"hi":"hello"}}} )" */ + { + const MyUnion& resultContents = result.GetContents(); + { + const GreetingStruct& resultContentsStructureValue = resultContents.GetStructureValue(); + EXPECT_EQ(R"(hello)", resultContentsStructureValue.GetHi()); + } + } } diff --git a/generated/protocol-tests/tests/output/json_1_0/tests/NoInputAndNoOutputTest.cpp b/generated/protocol-tests/tests/output/json_1_0/tests/NoInputAndNoOutputTest.cpp index 665e0cfee35..45a651eece2 100644 --- a/generated/protocol-tests/tests/output/json_1_0/tests/NoInputAndNoOutputTest.cpp +++ b/generated/protocol-tests/tests/output/json_1_0/tests/NoInputAndNoOutputTest.cpp @@ -23,9 +23,9 @@ AWS_PROTOCOL_TEST(NoInputAndNoOutput, AwsJson10HandlesEmptyOutputShape) { NoInputAndNoOutputRequest request; auto outcome = client.NoInputAndNoOutput(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + /* expectedResult = R"( {} )" */ } AWS_PROTOCOL_TEST(NoInputAndNoOutput, AwsJson10HandlesUnexpectedJsonOutput) { @@ -40,9 +40,9 @@ AWS_PROTOCOL_TEST(NoInputAndNoOutput, AwsJson10HandlesUnexpectedJsonOutput) { NoInputAndNoOutputRequest request; auto outcome = client.NoInputAndNoOutput(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + /* expectedResult = R"( {} )" */ } AWS_PROTOCOL_TEST(NoInputAndNoOutput, AwsJson10ServiceRespondsWithNoPayload) { @@ -56,7 +56,7 @@ AWS_PROTOCOL_TEST(NoInputAndNoOutput, AwsJson10ServiceRespondsWithNoPayload) { NoInputAndNoOutputRequest request; auto outcome = client.NoInputAndNoOutput(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + /* expectedResult = R"( {} )" */ } diff --git a/generated/protocol-tests/tests/output/json_1_0/tests/NoInputAndOutputTest.cpp b/generated/protocol-tests/tests/output/json_1_0/tests/NoInputAndOutputTest.cpp index 790ccc7a9be..650181f5d1c 100644 --- a/generated/protocol-tests/tests/output/json_1_0/tests/NoInputAndOutputTest.cpp +++ b/generated/protocol-tests/tests/output/json_1_0/tests/NoInputAndOutputTest.cpp @@ -23,7 +23,7 @@ AWS_PROTOCOL_TEST(NoInputAndOutput, AwsJson10NoInputAndOutput) { NoInputAndOutputRequest request; auto outcome = client.NoInputAndOutput(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + /* expectedResult = R"( {} )" */ } diff --git a/generated/protocol-tests/tests/output/json_1_0/tests/SimpleScalarPropertiesTest.cpp b/generated/protocol-tests/tests/output/json_1_0/tests/SimpleScalarPropertiesTest.cpp index c4cd8efd45a..f4a5edafe03 100644 --- a/generated/protocol-tests/tests/output/json_1_0/tests/SimpleScalarPropertiesTest.cpp +++ b/generated/protocol-tests/tests/output/json_1_0/tests/SimpleScalarPropertiesTest.cpp @@ -23,9 +23,12 @@ AWS_PROTOCOL_TEST(SimpleScalarProperties, AwsJson10SupportsNaNFloatInputs) { SimpleScalarPropertiesRequest request; auto outcome = client.SimpleScalarProperties(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const SimpleScalarPropertiesResult& result = outcome.GetResult(); + /* expectedResult = R"( {"floatValue":"NaN","doubleValue":"NaN"} )" */ + EXPECT_EQ(std::numeric_limits::quiet_NaN(), result.GetFloatValue()); + EXPECT_EQ(std::numeric_limits::quiet_NaN(), result.GetDoubleValue()); } AWS_PROTOCOL_TEST(SimpleScalarProperties, AwsJson10SupportsInfinityFloatInputs) { @@ -40,9 +43,12 @@ AWS_PROTOCOL_TEST(SimpleScalarProperties, AwsJson10SupportsInfinityFloatInputs) SimpleScalarPropertiesRequest request; auto outcome = client.SimpleScalarProperties(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const SimpleScalarPropertiesResult& result = outcome.GetResult(); + /* expectedResult = R"( {"floatValue":"Infinity","doubleValue":"Infinity"} )" */ + EXPECT_EQ(std::numeric_limits::infinity(), result.GetFloatValue()); + EXPECT_EQ(std::numeric_limits::infinity(), result.GetDoubleValue()); } AWS_PROTOCOL_TEST(SimpleScalarProperties, AwsJson10SupportsNegativeInfinityFloatInputs) { @@ -57,7 +63,10 @@ AWS_PROTOCOL_TEST(SimpleScalarProperties, AwsJson10SupportsNegativeInfinityFloat SimpleScalarPropertiesRequest request; auto outcome = client.SimpleScalarProperties(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const SimpleScalarPropertiesResult& result = outcome.GetResult(); + /* expectedResult = R"( {"floatValue":"-Infinity","doubleValue":"-Infinity"} )" */ + EXPECT_EQ(-std::numeric_limits::infinity(), result.GetFloatValue()); + EXPECT_EQ(-std::numeric_limits::infinity(), result.GetDoubleValue()); } diff --git a/generated/protocol-tests/tests/output/query/tests/DatetimeOffsetsTest.cpp b/generated/protocol-tests/tests/output/query/tests/DatetimeOffsetsTest.cpp index 256fab52330..62c7d3e9a1c 100644 --- a/generated/protocol-tests/tests/output/query/tests/DatetimeOffsetsTest.cpp +++ b/generated/protocol-tests/tests/output/query/tests/DatetimeOffsetsTest.cpp @@ -23,9 +23,11 @@ AWS_PROTOCOL_TEST(DatetimeOffsets, AwsQueryDateTimeWithNegativeOffset) { DatetimeOffsetsRequest request; auto outcome = client.DatetimeOffsets(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const DatetimeOffsetsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"datetime":1576540098} )" */ + EXPECT_EQ(Aws::Utils::DateTime(1576540098L), result.GetDatetime()); } AWS_PROTOCOL_TEST(DatetimeOffsets, AwsQueryDateTimeWithPositiveOffset) { @@ -40,7 +42,9 @@ AWS_PROTOCOL_TEST(DatetimeOffsets, AwsQueryDateTimeWithPositiveOffset) { DatetimeOffsetsRequest request; auto outcome = client.DatetimeOffsets(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const DatetimeOffsetsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"datetime":1576540098} )" */ + EXPECT_EQ(Aws::Utils::DateTime(1576540098L), result.GetDatetime()); } diff --git a/generated/protocol-tests/tests/output/query/tests/EmptyInputAndEmptyOutputTest.cpp b/generated/protocol-tests/tests/output/query/tests/EmptyInputAndEmptyOutputTest.cpp index e4ec978411e..6f1c2f2dab1 100644 --- a/generated/protocol-tests/tests/output/query/tests/EmptyInputAndEmptyOutputTest.cpp +++ b/generated/protocol-tests/tests/output/query/tests/EmptyInputAndEmptyOutputTest.cpp @@ -21,7 +21,7 @@ AWS_PROTOCOL_TEST(EmptyInputAndEmptyOutput, QueryEmptyInputAndEmptyOutput) { EmptyInputAndEmptyOutputRequest request; auto outcome = client.EmptyInputAndEmptyOutput(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + /* expectedResult = R"( {} )" */ } diff --git a/generated/protocol-tests/tests/output/query/tests/FlattenedXmlMapTest.cpp b/generated/protocol-tests/tests/output/query/tests/FlattenedXmlMapTest.cpp index 316ff0a37b4..1968f1c3ad6 100644 --- a/generated/protocol-tests/tests/output/query/tests/FlattenedXmlMapTest.cpp +++ b/generated/protocol-tests/tests/output/query/tests/FlattenedXmlMapTest.cpp @@ -23,7 +23,14 @@ AWS_PROTOCOL_TEST(FlattenedXmlMap, QueryQueryFlattenedXmlMap) { FlattenedXmlMapRequest request; auto outcome = client.FlattenedXmlMap(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const FlattenedXmlMapResult& result = outcome.GetResult(); + /* expectedResult = R"( {"myMap":{"foo":"Foo","baz":"Baz"}} )" */ + const Aws::Map& resultMyMap = result.GetMyMap(); + EXPECT_EQ(2U, resultMyMap.size()); + EXPECT_TRUE(resultMyMap.find("foo") != resultMyMap.end()); + EXPECT_EQ(FooEnumMapper::GetFooEnumForName(R"e(Foo)e"), resultMyMap.at("foo")); + EXPECT_TRUE(resultMyMap.find("baz") != resultMyMap.end()); + EXPECT_EQ(FooEnumMapper::GetFooEnumForName(R"e(Baz)e"), resultMyMap.at("baz")); } diff --git a/generated/protocol-tests/tests/output/query/tests/FlattenedXmlMapWithXmlNameTest.cpp b/generated/protocol-tests/tests/output/query/tests/FlattenedXmlMapWithXmlNameTest.cpp index d8a98e6f75f..18847b07842 100644 --- a/generated/protocol-tests/tests/output/query/tests/FlattenedXmlMapWithXmlNameTest.cpp +++ b/generated/protocol-tests/tests/output/query/tests/FlattenedXmlMapWithXmlNameTest.cpp @@ -23,7 +23,14 @@ AWS_PROTOCOL_TEST(FlattenedXmlMapWithXmlName, QueryQueryFlattenedXmlMapWithXmlNa FlattenedXmlMapWithXmlNameRequest request; auto outcome = client.FlattenedXmlMapWithXmlName(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const FlattenedXmlMapWithXmlNameResult& result = outcome.GetResult(); + /* expectedResult = R"( {"myMap":{"a":"A","b":"B"}} )" */ + const Aws::Map& resultMyMap = result.GetMyMap(); + EXPECT_EQ(2U, resultMyMap.size()); + EXPECT_TRUE(resultMyMap.find("a") != resultMyMap.end()); + EXPECT_EQ(R"(A)", resultMyMap.at("a")); + EXPECT_TRUE(resultMyMap.find("b") != resultMyMap.end()); + EXPECT_EQ(R"(B)", resultMyMap.at("b")); } diff --git a/generated/protocol-tests/tests/output/query/tests/FlattenedXmlMapWithXmlNamespaceTest.cpp b/generated/protocol-tests/tests/output/query/tests/FlattenedXmlMapWithXmlNamespaceTest.cpp index 65e47f0285a..6791236e597 100644 --- a/generated/protocol-tests/tests/output/query/tests/FlattenedXmlMapWithXmlNamespaceTest.cpp +++ b/generated/protocol-tests/tests/output/query/tests/FlattenedXmlMapWithXmlNamespaceTest.cpp @@ -23,7 +23,14 @@ AWS_PROTOCOL_TEST(FlattenedXmlMapWithXmlNamespace, QueryQueryFlattenedXmlMapWith FlattenedXmlMapWithXmlNamespaceRequest request; auto outcome = client.FlattenedXmlMapWithXmlNamespace(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const FlattenedXmlMapWithXmlNamespaceResult& result = outcome.GetResult(); + /* expectedResult = R"( {"myMap":{"a":"A","b":"B"}} )" */ + const Aws::Map& resultMyMap = result.GetMyMap(); + EXPECT_EQ(2U, resultMyMap.size()); + EXPECT_TRUE(resultMyMap.find("a") != resultMyMap.end()); + EXPECT_EQ(R"(A)", resultMyMap.at("a")); + EXPECT_TRUE(resultMyMap.find("b") != resultMyMap.end()); + EXPECT_EQ(R"(B)", resultMyMap.at("b")); } diff --git a/generated/protocol-tests/tests/output/query/tests/FractionalSecondsTest.cpp b/generated/protocol-tests/tests/output/query/tests/FractionalSecondsTest.cpp index 5fd52802258..d919e31960b 100644 --- a/generated/protocol-tests/tests/output/query/tests/FractionalSecondsTest.cpp +++ b/generated/protocol-tests/tests/output/query/tests/FractionalSecondsTest.cpp @@ -23,7 +23,9 @@ AWS_PROTOCOL_TEST(FractionalSeconds, AwsQueryDateTimeWithFractionalSeconds) { FractionalSecondsRequest request; auto outcome = client.FractionalSeconds(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const FractionalSecondsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"datetime":9.46845296123E8} )" */ + EXPECT_EQ(Aws::Utils::DateTime(9.46845296123E8), result.GetDatetime()); } diff --git a/generated/protocol-tests/tests/output/query/tests/GreetingWithErrors0Test.cpp b/generated/protocol-tests/tests/output/query/tests/GreetingWithErrors0Test.cpp index bffd03004dd..ab6bca9b6c8 100644 --- a/generated/protocol-tests/tests/output/query/tests/GreetingWithErrors0Test.cpp +++ b/generated/protocol-tests/tests/output/query/tests/GreetingWithErrors0Test.cpp @@ -23,7 +23,6 @@ AWS_PROTOCOL_TEST(GreetingWithErrors0, QueryInvalidGreetingError) { GreetingWithErrorsRequest request; auto outcome = client.GreetingWithErrors(request); - ASSERT_FALSE(outcome.IsSuccess()); - ValidateRequestSent(); + ASSERT_FALSE(outcome.IsSuccess()); } diff --git a/generated/protocol-tests/tests/output/query/tests/GreetingWithErrors1Test.cpp b/generated/protocol-tests/tests/output/query/tests/GreetingWithErrors1Test.cpp index e61b946e468..acc95819558 100644 --- a/generated/protocol-tests/tests/output/query/tests/GreetingWithErrors1Test.cpp +++ b/generated/protocol-tests/tests/output/query/tests/GreetingWithErrors1Test.cpp @@ -23,7 +23,6 @@ AWS_PROTOCOL_TEST(GreetingWithErrors1, QueryCustomizedError) { GreetingWithErrorsRequest request; auto outcome = client.GreetingWithErrors(request); - ASSERT_FALSE(outcome.IsSuccess()); - ValidateRequestSent(); + ASSERT_FALSE(outcome.IsSuccess()); } diff --git a/generated/protocol-tests/tests/output/query/tests/GreetingWithErrors2Test.cpp b/generated/protocol-tests/tests/output/query/tests/GreetingWithErrors2Test.cpp index a7bd3dc92af..c0c9829282b 100644 --- a/generated/protocol-tests/tests/output/query/tests/GreetingWithErrors2Test.cpp +++ b/generated/protocol-tests/tests/output/query/tests/GreetingWithErrors2Test.cpp @@ -23,7 +23,6 @@ AWS_PROTOCOL_TEST(GreetingWithErrors2, QueryComplexError) { GreetingWithErrorsRequest request; auto outcome = client.GreetingWithErrors(request); - ASSERT_FALSE(outcome.IsSuccess()); - ValidateRequestSent(); + ASSERT_FALSE(outcome.IsSuccess()); } diff --git a/generated/protocol-tests/tests/output/query/tests/GreetingWithErrorsTest.cpp b/generated/protocol-tests/tests/output/query/tests/GreetingWithErrorsTest.cpp index 41f894858a5..0f0cf96aafa 100644 --- a/generated/protocol-tests/tests/output/query/tests/GreetingWithErrorsTest.cpp +++ b/generated/protocol-tests/tests/output/query/tests/GreetingWithErrorsTest.cpp @@ -23,7 +23,9 @@ AWS_PROTOCOL_TEST(GreetingWithErrors, QueryGreetingWithErrors) { GreetingWithErrorsRequest request; auto outcome = client.GreetingWithErrors(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const GreetingWithErrorsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"greeting":"Hello"} )" */ + EXPECT_EQ(R"(Hello)", result.GetGreeting()); } diff --git a/generated/protocol-tests/tests/output/query/tests/IgnoresWrappingXmlNameTest.cpp b/generated/protocol-tests/tests/output/query/tests/IgnoresWrappingXmlNameTest.cpp index f030b209c7d..e7d3e117a5c 100644 --- a/generated/protocol-tests/tests/output/query/tests/IgnoresWrappingXmlNameTest.cpp +++ b/generated/protocol-tests/tests/output/query/tests/IgnoresWrappingXmlNameTest.cpp @@ -23,7 +23,9 @@ AWS_PROTOCOL_TEST(IgnoresWrappingXmlName, QueryIgnoresWrappingXmlName) { IgnoresWrappingXmlNameRequest request; auto outcome = client.IgnoresWrappingXmlName(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const IgnoresWrappingXmlNameResult& result = outcome.GetResult(); + /* expectedResult = R"( {"foo":"bar"} )" */ + EXPECT_EQ(R"(bar)", result.GetFoo()); } diff --git a/generated/protocol-tests/tests/output/query/tests/NoInputAndNoOutputTest.cpp b/generated/protocol-tests/tests/output/query/tests/NoInputAndNoOutputTest.cpp index 59e66c63bfe..f07736fc826 100644 --- a/generated/protocol-tests/tests/output/query/tests/NoInputAndNoOutputTest.cpp +++ b/generated/protocol-tests/tests/output/query/tests/NoInputAndNoOutputTest.cpp @@ -21,7 +21,7 @@ AWS_PROTOCOL_TEST(NoInputAndNoOutput, QueryNoInputAndNoOutput) { NoInputAndNoOutputRequest request; auto outcome = client.NoInputAndNoOutput(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + /* expectedResult = R"( {} )" */ } diff --git a/generated/protocol-tests/tests/output/query/tests/NoInputAndOutputTest.cpp b/generated/protocol-tests/tests/output/query/tests/NoInputAndOutputTest.cpp index a9599558e73..c9ada3cba13 100644 --- a/generated/protocol-tests/tests/output/query/tests/NoInputAndOutputTest.cpp +++ b/generated/protocol-tests/tests/output/query/tests/NoInputAndOutputTest.cpp @@ -21,7 +21,7 @@ AWS_PROTOCOL_TEST(NoInputAndOutput, QueryNoInputAndOutput) { NoInputAndOutputRequest request; auto outcome = client.NoInputAndOutput(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + /* expectedResult = R"( {} )" */ } diff --git a/generated/protocol-tests/tests/output/query/tests/RecursiveXmlShapesTest.cpp b/generated/protocol-tests/tests/output/query/tests/RecursiveXmlShapesTest.cpp index 01cd70eb8fd..6f108f53742 100644 --- a/generated/protocol-tests/tests/output/query/tests/RecursiveXmlShapesTest.cpp +++ b/generated/protocol-tests/tests/output/query/tests/RecursiveXmlShapesTest.cpp @@ -5,6 +5,8 @@ #include #include #include +#include +#include #include using RecursiveXmlShapes = AWS_PROTOCOL_TEST_SUITE; @@ -23,7 +25,24 @@ AWS_PROTOCOL_TEST(RecursiveXmlShapes, QueryRecursiveShapes) { RecursiveXmlShapesRequest request; auto outcome = client.RecursiveXmlShapes(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const RecursiveXmlShapesResult& result = outcome.GetResult(); + /* expectedResult = R"( {"nested":{"foo":"Foo1","nested":{"bar":"Bar1","recursiveMember":{"foo":"Foo2","nested":{"bar":"Bar2"}}}}} )" */ + { + const RecursiveXmlShapesOutputNested1& resultNested = result.GetNested(); + EXPECT_EQ(R"(Foo1)", resultNested.GetFoo()); + { + const RecursiveXmlShapesOutputNested2& resultNestedNested = resultNested.GetNested(); + EXPECT_EQ(R"(Bar1)", resultNestedNested.GetBar()); + { + const RecursiveXmlShapesOutputNested1& resultNestedNestedRecursiveMember = resultNestedNested.GetRecursiveMember(); + EXPECT_EQ(R"(Foo2)", resultNestedNestedRecursiveMember.GetFoo()); + { + const RecursiveXmlShapesOutputNested2& resultNestedNestedRecursiveMemberNested = resultNestedNestedRecursiveMember.GetNested(); + EXPECT_EQ(R"(Bar2)", resultNestedNestedRecursiveMemberNested.GetBar()); + } + } + } + } } diff --git a/generated/protocol-tests/tests/output/query/tests/SimpleScalarXmlPropertiesTest.cpp b/generated/protocol-tests/tests/output/query/tests/SimpleScalarXmlPropertiesTest.cpp index 5368accad82..0618ee1dc30 100644 --- a/generated/protocol-tests/tests/output/query/tests/SimpleScalarXmlPropertiesTest.cpp +++ b/generated/protocol-tests/tests/output/query/tests/SimpleScalarXmlPropertiesTest.cpp @@ -23,9 +23,20 @@ AWS_PROTOCOL_TEST(SimpleScalarXmlProperties, QuerySimpleScalarProperties) { SimpleScalarXmlPropertiesRequest request; auto outcome = client.SimpleScalarXmlProperties(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const SimpleScalarXmlPropertiesResult& result = outcome.GetResult(); + /* expectedResult = R"( {"stringValue":"string","emptyStringValue":"","trueBooleanValue":true,"falseBooleanValue":false,"byteValue":1,"shortValue":2,"integerValue":3,"longValue":4,"floatValue":5.5,"doubleValue":6.5} )" */ + EXPECT_EQ(R"(string)", result.GetStringValue()); + EXPECT_EQ(R"()", result.GetEmptyStringValue()); + EXPECT_EQ(true, result.GetTrueBooleanValue()); + EXPECT_EQ(false, result.GetFalseBooleanValue()); + EXPECT_EQ(1, result.GetByteValue()); + EXPECT_EQ(2, result.GetShortValue()); + EXPECT_EQ(3, result.GetIntegerValue()); + EXPECT_EQ(4, result.GetLongValue()); + EXPECT_EQ(5.5, result.GetFloatValue()); + EXPECT_EQ(6.5, result.GetDoubleValue()); } AWS_PROTOCOL_TEST(SimpleScalarXmlProperties, AwsQuerySupportsNaNFloatOutputs) { @@ -40,9 +51,12 @@ AWS_PROTOCOL_TEST(SimpleScalarXmlProperties, AwsQuerySupportsNaNFloatOutputs) { SimpleScalarXmlPropertiesRequest request; auto outcome = client.SimpleScalarXmlProperties(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const SimpleScalarXmlPropertiesResult& result = outcome.GetResult(); + /* expectedResult = R"( {"floatValue":"NaN","doubleValue":"NaN"} )" */ + EXPECT_EQ(std::numeric_limits::quiet_NaN(), result.GetFloatValue()); + EXPECT_EQ(std::numeric_limits::quiet_NaN(), result.GetDoubleValue()); } AWS_PROTOCOL_TEST(SimpleScalarXmlProperties, AwsQuerySupportsInfinityFloatOutputs) { @@ -57,9 +71,12 @@ AWS_PROTOCOL_TEST(SimpleScalarXmlProperties, AwsQuerySupportsInfinityFloatOutput SimpleScalarXmlPropertiesRequest request; auto outcome = client.SimpleScalarXmlProperties(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const SimpleScalarXmlPropertiesResult& result = outcome.GetResult(); + /* expectedResult = R"( {"floatValue":"Infinity","doubleValue":"Infinity"} )" */ + EXPECT_EQ(std::numeric_limits::infinity(), result.GetFloatValue()); + EXPECT_EQ(std::numeric_limits::infinity(), result.GetDoubleValue()); } AWS_PROTOCOL_TEST(SimpleScalarXmlProperties, AwsQuerySupportsNegativeInfinityFloatOutputs) { @@ -74,7 +91,10 @@ AWS_PROTOCOL_TEST(SimpleScalarXmlProperties, AwsQuerySupportsNegativeInfinityFlo SimpleScalarXmlPropertiesRequest request; auto outcome = client.SimpleScalarXmlProperties(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const SimpleScalarXmlPropertiesResult& result = outcome.GetResult(); + /* expectedResult = R"( {"floatValue":"-Infinity","doubleValue":"-Infinity"} )" */ + EXPECT_EQ(-std::numeric_limits::infinity(), result.GetFloatValue()); + EXPECT_EQ(-std::numeric_limits::infinity(), result.GetDoubleValue()); } diff --git a/generated/protocol-tests/tests/output/query/tests/XmlBlobsTest.cpp b/generated/protocol-tests/tests/output/query/tests/XmlBlobsTest.cpp index dc7aecfbcd1..ed22597ac65 100644 --- a/generated/protocol-tests/tests/output/query/tests/XmlBlobsTest.cpp +++ b/generated/protocol-tests/tests/output/query/tests/XmlBlobsTest.cpp @@ -23,7 +23,9 @@ AWS_PROTOCOL_TEST(XmlBlobs, QueryXmlBlobs) { XmlBlobsRequest request; auto outcome = client.XmlBlobs(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const XmlBlobsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"data":"value"} )" */ + EXPECT_EQ(Aws::Utils::ByteBuffer(R"(value)"), result.GetData()); } diff --git a/generated/protocol-tests/tests/output/query/tests/XmlEmptyBlobsTest.cpp b/generated/protocol-tests/tests/output/query/tests/XmlEmptyBlobsTest.cpp index 19e395e837e..88bf57b45af 100644 --- a/generated/protocol-tests/tests/output/query/tests/XmlEmptyBlobsTest.cpp +++ b/generated/protocol-tests/tests/output/query/tests/XmlEmptyBlobsTest.cpp @@ -23,9 +23,11 @@ AWS_PROTOCOL_TEST(XmlEmptyBlobs, QueryXmlEmptyBlobs) { XmlEmptyBlobsRequest request; auto outcome = client.XmlEmptyBlobs(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const XmlEmptyBlobsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"data":""} )" */ + EXPECT_EQ(Aws::Utils::ByteBuffer(R"()"), result.GetData()); } AWS_PROTOCOL_TEST(XmlEmptyBlobs, QueryXmlEmptySelfClosedBlobs) { @@ -40,7 +42,9 @@ AWS_PROTOCOL_TEST(XmlEmptyBlobs, QueryXmlEmptySelfClosedBlobs) { XmlEmptyBlobsRequest request; auto outcome = client.XmlEmptyBlobs(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const XmlEmptyBlobsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"data":""} )" */ + EXPECT_EQ(Aws::Utils::ByteBuffer(R"()"), result.GetData()); } diff --git a/generated/protocol-tests/tests/output/query/tests/XmlEmptyListsTest.cpp b/generated/protocol-tests/tests/output/query/tests/XmlEmptyListsTest.cpp index 6e74d2cffb3..df1a1aad15a 100644 --- a/generated/protocol-tests/tests/output/query/tests/XmlEmptyListsTest.cpp +++ b/generated/protocol-tests/tests/output/query/tests/XmlEmptyListsTest.cpp @@ -23,7 +23,12 @@ AWS_PROTOCOL_TEST(XmlEmptyLists, QueryXmlEmptyLists) { XmlEmptyListsRequest request; auto outcome = client.XmlEmptyLists(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const XmlEmptyListsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"stringList":[],"stringSet":[]} )" */ + const Aws::Vector& resultStringListItem = result.GetStringList(); + EXPECT_EQ(0U, resultStringListItem.size()); + const Aws::Vector& resultStringSetItem = result.GetStringSet(); + EXPECT_EQ(0U, resultStringSetItem.size()); } diff --git a/generated/protocol-tests/tests/output/query/tests/XmlEmptyMapsTest.cpp b/generated/protocol-tests/tests/output/query/tests/XmlEmptyMapsTest.cpp index 24808a1d311..91b63a3a0ab 100644 --- a/generated/protocol-tests/tests/output/query/tests/XmlEmptyMapsTest.cpp +++ b/generated/protocol-tests/tests/output/query/tests/XmlEmptyMapsTest.cpp @@ -23,9 +23,12 @@ AWS_PROTOCOL_TEST(XmlEmptyMaps, QueryXmlEmptyMaps) { XmlEmptyMapsRequest request; auto outcome = client.XmlEmptyMaps(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const XmlEmptyMapsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"myMap":{}} )" */ + const Aws::Map& resultMyMap = result.GetMyMap(); + EXPECT_EQ(0U, resultMyMap.size()); } AWS_PROTOCOL_TEST(XmlEmptyMaps, QueryXmlEmptySelfClosedMaps) { @@ -40,7 +43,10 @@ AWS_PROTOCOL_TEST(XmlEmptyMaps, QueryXmlEmptySelfClosedMaps) { XmlEmptyMapsRequest request; auto outcome = client.XmlEmptyMaps(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const XmlEmptyMapsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"myMap":{}} )" */ + const Aws::Map& resultMyMap = result.GetMyMap(); + EXPECT_EQ(0U, resultMyMap.size()); } diff --git a/generated/protocol-tests/tests/output/query/tests/XmlEnumsTest.cpp b/generated/protocol-tests/tests/output/query/tests/XmlEnumsTest.cpp index d95f6278c0f..ad73433d4c7 100644 --- a/generated/protocol-tests/tests/output/query/tests/XmlEnumsTest.cpp +++ b/generated/protocol-tests/tests/output/query/tests/XmlEnumsTest.cpp @@ -23,7 +23,25 @@ AWS_PROTOCOL_TEST(XmlEnums, QueryXmlEnums) { XmlEnumsRequest request; auto outcome = client.XmlEnums(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const XmlEnumsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"fooEnum1":"Foo","fooEnum2":"0","fooEnum3":"1","fooEnumList":["Foo","0"],"fooEnumSet":["Foo","0"],"fooEnumMap":{"hi":"Foo","zero":"0"}} )" */ + EXPECT_EQ(FooEnumMapper::GetFooEnumForName(R"e(Foo)e"), result.GetFooEnum1()); + EXPECT_EQ(FooEnumMapper::GetFooEnumForName(R"e(0)e"), result.GetFooEnum2()); + EXPECT_EQ(FooEnumMapper::GetFooEnumForName(R"e(1)e"), result.GetFooEnum3()); + const Aws::Vector& resultFooEnumListItem = result.GetFooEnumList(); + EXPECT_EQ(2U, resultFooEnumListItem.size()); + EXPECT_EQ(FooEnumMapper::GetFooEnumForName(R"e(Foo)e"), resultFooEnumListItem.at(0)); + EXPECT_EQ(FooEnumMapper::GetFooEnumForName(R"e(0)e"), resultFooEnumListItem.at(1)); + const Aws::Vector& resultFooEnumSetItem = result.GetFooEnumSet(); + EXPECT_EQ(2U, resultFooEnumSetItem.size()); + EXPECT_EQ(FooEnumMapper::GetFooEnumForName(R"e(Foo)e"), resultFooEnumSetItem.at(0)); + EXPECT_EQ(FooEnumMapper::GetFooEnumForName(R"e(0)e"), resultFooEnumSetItem.at(1)); + const Aws::Map& resultFooEnumMap = result.GetFooEnumMap(); + EXPECT_EQ(2U, resultFooEnumMap.size()); + EXPECT_TRUE(resultFooEnumMap.find("hi") != resultFooEnumMap.end()); + EXPECT_EQ(FooEnumMapper::GetFooEnumForName(R"e(Foo)e"), resultFooEnumMap.at("hi")); + EXPECT_TRUE(resultFooEnumMap.find("zero") != resultFooEnumMap.end()); + EXPECT_EQ(FooEnumMapper::GetFooEnumForName(R"e(0)e"), resultFooEnumMap.at("zero")); } diff --git a/generated/protocol-tests/tests/output/query/tests/XmlIntEnumsTest.cpp b/generated/protocol-tests/tests/output/query/tests/XmlIntEnumsTest.cpp index fdee61658af..ce9926265f3 100644 --- a/generated/protocol-tests/tests/output/query/tests/XmlIntEnumsTest.cpp +++ b/generated/protocol-tests/tests/output/query/tests/XmlIntEnumsTest.cpp @@ -23,7 +23,25 @@ AWS_PROTOCOL_TEST(XmlIntEnums, QueryXmlIntEnums) { XmlIntEnumsRequest request; auto outcome = client.XmlIntEnums(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const XmlIntEnumsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"intEnum1":1,"intEnum2":2,"intEnum3":3,"intEnumList":[1,2],"intEnumSet":[1,2],"intEnumMap":{"a":1,"b":2}} )" */ + EXPECT_EQ(1, result.GetIntEnum1()); + EXPECT_EQ(2, result.GetIntEnum2()); + EXPECT_EQ(3, result.GetIntEnum3()); + const Aws::Vector& resultIntEnumListItem = result.GetIntEnumList(); + EXPECT_EQ(2U, resultIntEnumListItem.size()); + EXPECT_EQ(1, resultIntEnumListItem.at(0)); + EXPECT_EQ(2, resultIntEnumListItem.at(1)); + const Aws::Vector& resultIntEnumSetItem = result.GetIntEnumSet(); + EXPECT_EQ(2U, resultIntEnumSetItem.size()); + EXPECT_EQ(1, resultIntEnumSetItem.at(0)); + EXPECT_EQ(2, resultIntEnumSetItem.at(1)); + const Aws::Map& resultIntEnumMap = result.GetIntEnumMap(); + EXPECT_EQ(2U, resultIntEnumMap.size()); + EXPECT_TRUE(resultIntEnumMap.find("a") != resultIntEnumMap.end()); + EXPECT_EQ(1, resultIntEnumMap.at("a")); + EXPECT_TRUE(resultIntEnumMap.find("b") != resultIntEnumMap.end()); + EXPECT_EQ(2, resultIntEnumMap.at("b")); } diff --git a/generated/protocol-tests/tests/output/query/tests/XmlListsTest.cpp b/generated/protocol-tests/tests/output/query/tests/XmlListsTest.cpp index 84c1b10454d..06d74ab5226 100644 --- a/generated/protocol-tests/tests/output/query/tests/XmlListsTest.cpp +++ b/generated/protocol-tests/tests/output/query/tests/XmlListsTest.cpp @@ -23,7 +23,80 @@ AWS_PROTOCOL_TEST(XmlLists, QueryXmlLists) { XmlListsRequest request; auto outcome = client.XmlLists(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const XmlListsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"stringList":["foo","bar"],"stringSet":["foo","bar"],"integerList":[1,2],"booleanList":[true,false],"timestampList":[1398796238,1398796238],"enumList":["Foo","0"],"intEnumList":[1,2],"nestedStringList":[["foo","bar"],["baz","qux"]],"renamedListMembers":["foo","bar"],"flattenedList":["hi","bye"],"flattenedList2":["yep","nope"],"flattenedListWithMemberNamespace":["a","b"],"flattenedListWithNamespace":["a","b"],"structureList":[{"a":"1","b":"2"},{"a":"3","b":"4"}]} )" */ + const Aws::Vector& resultStringListItem = result.GetStringList(); + EXPECT_EQ(2U, resultStringListItem.size()); + EXPECT_EQ(R"(foo)", resultStringListItem.at(0)); + EXPECT_EQ(R"(bar)", resultStringListItem.at(1)); + const Aws::Vector& resultStringSetItem = result.GetStringSet(); + EXPECT_EQ(2U, resultStringSetItem.size()); + EXPECT_EQ(R"(foo)", resultStringSetItem.at(0)); + EXPECT_EQ(R"(bar)", resultStringSetItem.at(1)); + const Aws::Vector& resultIntegerListItem = result.GetIntegerList(); + EXPECT_EQ(2U, resultIntegerListItem.size()); + EXPECT_EQ(1, resultIntegerListItem.at(0)); + EXPECT_EQ(2, resultIntegerListItem.at(1)); + const Aws::Vector& resultBooleanListItem = result.GetBooleanList(); + EXPECT_EQ(2U, resultBooleanListItem.size()); + EXPECT_EQ(true, resultBooleanListItem.at(0)); + EXPECT_EQ(false, resultBooleanListItem.at(1)); + const Aws::Vector& resultTimestampListItem = result.GetTimestampList(); + EXPECT_EQ(2U, resultTimestampListItem.size()); + EXPECT_EQ(Aws::Utils::DateTime(1398796238L), resultTimestampListItem.at(0)); + EXPECT_EQ(Aws::Utils::DateTime(1398796238L), resultTimestampListItem.at(1)); + const Aws::Vector& resultEnumListItem = result.GetEnumList(); + EXPECT_EQ(2U, resultEnumListItem.size()); + EXPECT_EQ(FooEnumMapper::GetFooEnumForName(R"e(Foo)e"), resultEnumListItem.at(0)); + EXPECT_EQ(FooEnumMapper::GetFooEnumForName(R"e(0)e"), resultEnumListItem.at(1)); + const Aws::Vector& resultIntEnumListItem = result.GetIntEnumList(); + EXPECT_EQ(2U, resultIntEnumListItem.size()); + EXPECT_EQ(1, resultIntEnumListItem.at(0)); + EXPECT_EQ(2, resultIntEnumListItem.at(1)); + EXPECT_EQ(2U, result.GetNestedStringList().size()); + { + const Aws::Vector& resultNestedStringListItem = result.GetNestedStringList().at(0); + EXPECT_EQ(2U, resultNestedStringListItem.size()); + EXPECT_EQ(R"(foo)", resultNestedStringListItem.at(0)); + EXPECT_EQ(R"(bar)", resultNestedStringListItem.at(1)); + } + { + const Aws::Vector& resultNestedStringListItem = result.GetNestedStringList().at(1); + EXPECT_EQ(2U, resultNestedStringListItem.size()); + EXPECT_EQ(R"(baz)", resultNestedStringListItem.at(0)); + EXPECT_EQ(R"(qux)", resultNestedStringListItem.at(1)); + } + const Aws::Vector& resultRenamedListMembersItem = result.GetRenamedListMembers(); + EXPECT_EQ(2U, resultRenamedListMembersItem.size()); + EXPECT_EQ(R"(foo)", resultRenamedListMembersItem.at(0)); + EXPECT_EQ(R"(bar)", resultRenamedListMembersItem.at(1)); + const Aws::Vector& resultFlattenedListItem = result.GetFlattenedList(); + EXPECT_EQ(2U, resultFlattenedListItem.size()); + EXPECT_EQ(R"(hi)", resultFlattenedListItem.at(0)); + EXPECT_EQ(R"(bye)", resultFlattenedListItem.at(1)); + const Aws::Vector& resultFlattenedList2Item = result.GetFlattenedList2(); + EXPECT_EQ(2U, resultFlattenedList2Item.size()); + EXPECT_EQ(R"(yep)", resultFlattenedList2Item.at(0)); + EXPECT_EQ(R"(nope)", resultFlattenedList2Item.at(1)); + const Aws::Vector& resultFlattenedListWithMemberNamespaceItem = result.GetFlattenedListWithMemberNamespace(); + EXPECT_EQ(2U, resultFlattenedListWithMemberNamespaceItem.size()); + EXPECT_EQ(R"(a)", resultFlattenedListWithMemberNamespaceItem.at(0)); + EXPECT_EQ(R"(b)", resultFlattenedListWithMemberNamespaceItem.at(1)); + const Aws::Vector& resultFlattenedListWithNamespaceItem = result.GetFlattenedListWithNamespace(); + EXPECT_EQ(2U, resultFlattenedListWithNamespaceItem.size()); + EXPECT_EQ(R"(a)", resultFlattenedListWithNamespaceItem.at(0)); + EXPECT_EQ(R"(b)", resultFlattenedListWithNamespaceItem.at(1)); + EXPECT_EQ(2U, result.GetStructureList().size()); + { + const StructureListMember& resultStructureListItem = result.GetStructureList().at(0); + EXPECT_EQ(R"(1)", resultStructureListItem.GetA()); + EXPECT_EQ(R"(2)", resultStructureListItem.GetB()); + } + { + const StructureListMember& resultStructureListItem = result.GetStructureList().at(1); + EXPECT_EQ(R"(3)", resultStructureListItem.GetA()); + EXPECT_EQ(R"(4)", resultStructureListItem.GetB()); + } } diff --git a/generated/protocol-tests/tests/output/query/tests/XmlMapsTest.cpp b/generated/protocol-tests/tests/output/query/tests/XmlMapsTest.cpp index 7271b7b55b0..2ad38ac604e 100644 --- a/generated/protocol-tests/tests/output/query/tests/XmlMapsTest.cpp +++ b/generated/protocol-tests/tests/output/query/tests/XmlMapsTest.cpp @@ -23,7 +23,20 @@ AWS_PROTOCOL_TEST(XmlMaps, QueryXmlMaps) { XmlMapsRequest request; auto outcome = client.XmlMaps(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const XmlMapsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"myMap":{"foo":{"hi":"there"},"baz":{"hi":"bye"}}} )" */ + const Aws::Map& resultMyMap = result.GetMyMap(); + EXPECT_EQ(2U, resultMyMap.size()); + { + EXPECT_TRUE(resultMyMap.find("foo") != resultMyMap.end()); + const GreetingStruct& resultMyMapItem = resultMyMap.at("foo"); + EXPECT_EQ(R"(there)", resultMyMapItem.GetHi()); + } + { + EXPECT_TRUE(resultMyMap.find("baz") != resultMyMap.end()); + const GreetingStruct& resultMyMapItem = resultMyMap.at("baz"); + EXPECT_EQ(R"(bye)", resultMyMapItem.GetHi()); + } } diff --git a/generated/protocol-tests/tests/output/query/tests/XmlMapsXmlNameTest.cpp b/generated/protocol-tests/tests/output/query/tests/XmlMapsXmlNameTest.cpp index 709eca7f5ee..761e3a5ecb0 100644 --- a/generated/protocol-tests/tests/output/query/tests/XmlMapsXmlNameTest.cpp +++ b/generated/protocol-tests/tests/output/query/tests/XmlMapsXmlNameTest.cpp @@ -23,7 +23,20 @@ AWS_PROTOCOL_TEST(XmlMapsXmlName, QueryQueryXmlMapsXmlName) { XmlMapsXmlNameRequest request; auto outcome = client.XmlMapsXmlName(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const XmlMapsXmlNameResult& result = outcome.GetResult(); + /* expectedResult = R"( {"myMap":{"foo":{"hi":"there"},"baz":{"hi":"bye"}}} )" */ + const Aws::Map& resultMyMap = result.GetMyMap(); + EXPECT_EQ(2U, resultMyMap.size()); + { + EXPECT_TRUE(resultMyMap.find("foo") != resultMyMap.end()); + const GreetingStruct& resultMyMapItem = resultMyMap.at("foo"); + EXPECT_EQ(R"(there)", resultMyMapItem.GetHi()); + } + { + EXPECT_TRUE(resultMyMap.find("baz") != resultMyMap.end()); + const GreetingStruct& resultMyMapItem = resultMyMap.at("baz"); + EXPECT_EQ(R"(bye)", resultMyMapItem.GetHi()); + } } diff --git a/generated/protocol-tests/tests/output/query/tests/XmlNamespacesTest.cpp b/generated/protocol-tests/tests/output/query/tests/XmlNamespacesTest.cpp index 576be2f6b67..1c1cb80475e 100644 --- a/generated/protocol-tests/tests/output/query/tests/XmlNamespacesTest.cpp +++ b/generated/protocol-tests/tests/output/query/tests/XmlNamespacesTest.cpp @@ -23,7 +23,16 @@ AWS_PROTOCOL_TEST(XmlNamespaces, QueryXmlNamespaces) { XmlNamespacesRequest request; auto outcome = client.XmlNamespaces(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const XmlNamespacesResult& result = outcome.GetResult(); + /* expectedResult = R"( {"nested":{"foo":"Foo","values":["Bar","Baz"]}} )" */ + { + const XmlNamespaceNested& resultNested = result.GetNested(); + EXPECT_EQ(R"(Foo)", resultNested.GetFoo()); + const Aws::Vector& resultNestedValuesItem = resultNested.GetValues(); + EXPECT_EQ(2U, resultNestedValuesItem.size()); + EXPECT_EQ(R"(Bar)", resultNestedValuesItem.at(0)); + EXPECT_EQ(R"(Baz)", resultNestedValuesItem.at(1)); + } } diff --git a/generated/protocol-tests/tests/output/query/tests/XmlTimestampsTest.cpp b/generated/protocol-tests/tests/output/query/tests/XmlTimestampsTest.cpp index fb9e03ad711..fb5d5eef166 100644 --- a/generated/protocol-tests/tests/output/query/tests/XmlTimestampsTest.cpp +++ b/generated/protocol-tests/tests/output/query/tests/XmlTimestampsTest.cpp @@ -23,9 +23,11 @@ AWS_PROTOCOL_TEST(XmlTimestamps, QueryXmlTimestamps) { XmlTimestampsRequest request; auto outcome = client.XmlTimestamps(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const XmlTimestampsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"normal":1398796238} )" */ + EXPECT_EQ(Aws::Utils::DateTime(1398796238L), result.GetNormal()); } AWS_PROTOCOL_TEST(XmlTimestamps, QueryXmlTimestampsWithDateTimeFormat) { @@ -40,9 +42,11 @@ AWS_PROTOCOL_TEST(XmlTimestamps, QueryXmlTimestampsWithDateTimeFormat) { XmlTimestampsRequest request; auto outcome = client.XmlTimestamps(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const XmlTimestampsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"dateTime":1398796238} )" */ + EXPECT_EQ(Aws::Utils::DateTime(1398796238L), result.GetDateTime()); } AWS_PROTOCOL_TEST(XmlTimestamps, QueryXmlTimestampsWithDateTimeOnTargetFormat) { @@ -57,9 +61,11 @@ AWS_PROTOCOL_TEST(XmlTimestamps, QueryXmlTimestampsWithDateTimeOnTargetFormat) { XmlTimestampsRequest request; auto outcome = client.XmlTimestamps(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const XmlTimestampsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"dateTimeOnTarget":1398796238} )" */ + EXPECT_EQ(Aws::Utils::DateTime(1398796238L), result.GetDateTimeOnTarget()); } AWS_PROTOCOL_TEST(XmlTimestamps, QueryXmlTimestampsWithEpochSecondsFormat) { @@ -74,9 +80,11 @@ AWS_PROTOCOL_TEST(XmlTimestamps, QueryXmlTimestampsWithEpochSecondsFormat) { XmlTimestampsRequest request; auto outcome = client.XmlTimestamps(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const XmlTimestampsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"epochSeconds":1398796238} )" */ + EXPECT_EQ(Aws::Utils::DateTime(1398796238L), result.GetEpochSeconds()); } AWS_PROTOCOL_TEST(XmlTimestamps, QueryXmlTimestampsWithEpochSecondsOnTargetFormat) { @@ -91,9 +99,11 @@ AWS_PROTOCOL_TEST(XmlTimestamps, QueryXmlTimestampsWithEpochSecondsOnTargetForma XmlTimestampsRequest request; auto outcome = client.XmlTimestamps(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const XmlTimestampsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"epochSecondsOnTarget":1398796238} )" */ + EXPECT_EQ(Aws::Utils::DateTime(1398796238L), result.GetEpochSecondsOnTarget()); } AWS_PROTOCOL_TEST(XmlTimestamps, QueryXmlTimestampsWithHttpDateFormat) { @@ -108,9 +118,11 @@ AWS_PROTOCOL_TEST(XmlTimestamps, QueryXmlTimestampsWithHttpDateFormat) { XmlTimestampsRequest request; auto outcome = client.XmlTimestamps(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const XmlTimestampsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"httpDate":1398796238} )" */ + EXPECT_EQ(Aws::Utils::DateTime(1398796238L), result.GetHttpDate()); } AWS_PROTOCOL_TEST(XmlTimestamps, QueryXmlTimestampsWithHttpDateOnTargetFormat) { @@ -125,7 +137,9 @@ AWS_PROTOCOL_TEST(XmlTimestamps, QueryXmlTimestampsWithHttpDateOnTargetFormat) { XmlTimestampsRequest request; auto outcome = client.XmlTimestamps(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const XmlTimestampsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"httpDateOnTarget":1398796238} )" */ + EXPECT_EQ(Aws::Utils::DateTime(1398796238L), result.GetHttpDateOnTarget()); } diff --git a/generated/protocol-tests/tests/output/rest-json/tests/DatetimeOffsetsTest.cpp b/generated/protocol-tests/tests/output/rest-json/tests/DatetimeOffsetsTest.cpp index c6b8893ec82..8264012035f 100644 --- a/generated/protocol-tests/tests/output/rest-json/tests/DatetimeOffsetsTest.cpp +++ b/generated/protocol-tests/tests/output/rest-json/tests/DatetimeOffsetsTest.cpp @@ -22,9 +22,11 @@ AWS_PROTOCOL_TEST(DatetimeOffsets, RestJsonDateTimeWithNegativeOffset) { DatetimeOffsetsRequest request; auto outcome = client.DatetimeOffsets(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const DatetimeOffsetsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"datetime":1576540098} )" */ + EXPECT_EQ(Aws::Utils::DateTime(1576540098L), result.GetDatetime()); } AWS_PROTOCOL_TEST(DatetimeOffsets, RestJsonDateTimeWithPositiveOffset) { @@ -38,7 +40,9 @@ AWS_PROTOCOL_TEST(DatetimeOffsets, RestJsonDateTimeWithPositiveOffset) { DatetimeOffsetsRequest request; auto outcome = client.DatetimeOffsets(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const DatetimeOffsetsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"datetime":1576540098} )" */ + EXPECT_EQ(Aws::Utils::DateTime(1576540098L), result.GetDatetime()); } diff --git a/generated/protocol-tests/tests/output/rest-json/tests/DocumentTypeAsMapValueTest.cpp b/generated/protocol-tests/tests/output/rest-json/tests/DocumentTypeAsMapValueTest.cpp index 83981ee5e87..7adc2a20cb1 100644 --- a/generated/protocol-tests/tests/output/rest-json/tests/DocumentTypeAsMapValueTest.cpp +++ b/generated/protocol-tests/tests/output/rest-json/tests/DocumentTypeAsMapValueTest.cpp @@ -23,7 +23,13 @@ AWS_PROTOCOL_TEST(DocumentTypeAsMapValue, DocumentTypeAsMapValueOutput) { DocumentTypeAsMapValueRequest request; auto outcome = client.DocumentTypeAsMapValue(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const DocumentTypeAsMapValueResult& result = outcome.GetResult(); + /* expectedResult = R"( {"docValuedMap":{"foo":{"f":1,"o":2},"bar":["b","a","r"],"baz":"BAZ"}} )" */ + const Aws::Map& resultDocValuedMap = result.GetDocValuedMap(); + EXPECT_EQ(3U, resultDocValuedMap.size()); + EXPECT_STREQ(R"j({"f":1,"o":2})j", resultDocValuedMap.at("foo").View().WriteCompact().c_str()); + EXPECT_STREQ(R"j(["b","a","r"])j", resultDocValuedMap.at("bar").View().WriteCompact().c_str()); + EXPECT_STREQ(R"j("BAZ")j", resultDocValuedMap.at("baz").View().WriteCompact().c_str()); } diff --git a/generated/protocol-tests/tests/output/rest-json/tests/DocumentTypeAsPayloadTest.cpp b/generated/protocol-tests/tests/output/rest-json/tests/DocumentTypeAsPayloadTest.cpp index dfc2f353460..01517ebe9a4 100644 --- a/generated/protocol-tests/tests/output/rest-json/tests/DocumentTypeAsPayloadTest.cpp +++ b/generated/protocol-tests/tests/output/rest-json/tests/DocumentTypeAsPayloadTest.cpp @@ -23,9 +23,14 @@ AWS_PROTOCOL_TEST(DocumentTypeAsPayload, DocumentTypeAsPayloadOutput) { DocumentTypeAsPayloadRequest request; auto outcome = client.DocumentTypeAsPayload(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const DocumentTypeAsPayloadResult& result = outcome.GetResult(); + /* expectedResult = R"( {"documentValue":{"foo":"bar"}} )" */ + { + const Aws::Utils::DocumentView& resultDocumentValue = result.GetDocumentValue(); + EXPECT_STREQ(R"j({"foo":"bar"})j", resultDocumentValue.WriteCompact().c_str()); + } } AWS_PROTOCOL_TEST(DocumentTypeAsPayload, DocumentTypeAsPayloadOutputString) { @@ -40,7 +45,12 @@ AWS_PROTOCOL_TEST(DocumentTypeAsPayload, DocumentTypeAsPayloadOutputString) { DocumentTypeAsPayloadRequest request; auto outcome = client.DocumentTypeAsPayload(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const DocumentTypeAsPayloadResult& result = outcome.GetResult(); + /* expectedResult = R"( {"documentValue":"hello"} )" */ + { + const Aws::Utils::DocumentView& resultDocumentValue = result.GetDocumentValue(); + EXPECT_STREQ(R"j("hello")j", resultDocumentValue.WriteCompact().c_str()); + } } diff --git a/generated/protocol-tests/tests/output/rest-json/tests/DocumentTypeTest.cpp b/generated/protocol-tests/tests/output/rest-json/tests/DocumentTypeTest.cpp index 47db40186db..e35b3548cf3 100644 --- a/generated/protocol-tests/tests/output/rest-json/tests/DocumentTypeTest.cpp +++ b/generated/protocol-tests/tests/output/rest-json/tests/DocumentTypeTest.cpp @@ -23,9 +23,15 @@ AWS_PROTOCOL_TEST(DocumentType, DocumentOutput) { DocumentTypeRequest request; auto outcome = client.DocumentType(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const DocumentTypeResult& result = outcome.GetResult(); + /* expectedResult = R"( {"stringValue":"string","documentValue":{"foo":"bar"}} )" */ + EXPECT_EQ(R"(string)", result.GetStringValue()); + { + const Aws::Utils::DocumentView& resultDocumentValue = result.GetDocumentValue(); + EXPECT_STREQ(R"j({"foo":"bar"})j", resultDocumentValue.WriteCompact().c_str()); + } } AWS_PROTOCOL_TEST(DocumentType, DocumentOutputString) { @@ -40,9 +46,15 @@ AWS_PROTOCOL_TEST(DocumentType, DocumentOutputString) { DocumentTypeRequest request; auto outcome = client.DocumentType(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const DocumentTypeResult& result = outcome.GetResult(); + /* expectedResult = R"( {"stringValue":"string","documentValue":"hello"} )" */ + EXPECT_EQ(R"(string)", result.GetStringValue()); + { + const Aws::Utils::DocumentView& resultDocumentValue = result.GetDocumentValue(); + EXPECT_STREQ(R"j("hello")j", resultDocumentValue.WriteCompact().c_str()); + } } AWS_PROTOCOL_TEST(DocumentType, DocumentOutputNumber) { @@ -57,9 +69,15 @@ AWS_PROTOCOL_TEST(DocumentType, DocumentOutputNumber) { DocumentTypeRequest request; auto outcome = client.DocumentType(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const DocumentTypeResult& result = outcome.GetResult(); + /* expectedResult = R"( {"stringValue":"string","documentValue":10} )" */ + EXPECT_EQ(R"(string)", result.GetStringValue()); + { + const Aws::Utils::DocumentView& resultDocumentValue = result.GetDocumentValue(); + EXPECT_STREQ(R"j(10)j", resultDocumentValue.WriteCompact().c_str()); + } } AWS_PROTOCOL_TEST(DocumentType, DocumentOutputBoolean) { @@ -74,9 +92,15 @@ AWS_PROTOCOL_TEST(DocumentType, DocumentOutputBoolean) { DocumentTypeRequest request; auto outcome = client.DocumentType(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const DocumentTypeResult& result = outcome.GetResult(); + /* expectedResult = R"( {"stringValue":"string","documentValue":false} )" */ + EXPECT_EQ(R"(string)", result.GetStringValue()); + { + const Aws::Utils::DocumentView& resultDocumentValue = result.GetDocumentValue(); + EXPECT_STREQ(R"j(false)j", resultDocumentValue.WriteCompact().c_str()); + } } AWS_PROTOCOL_TEST(DocumentType, DocumentOutputArray) { @@ -91,7 +115,13 @@ AWS_PROTOCOL_TEST(DocumentType, DocumentOutputArray) { DocumentTypeRequest request; auto outcome = client.DocumentType(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const DocumentTypeResult& result = outcome.GetResult(); + /* expectedResult = R"( {"stringValue":"string","documentValue":[true,false]} )" */ + EXPECT_EQ(R"(string)", result.GetStringValue()); + { + const Aws::Utils::DocumentView& resultDocumentValue = result.GetDocumentValue(); + EXPECT_STREQ(R"j([true,false])j", resultDocumentValue.WriteCompact().c_str()); + } } diff --git a/generated/protocol-tests/tests/output/rest-json/tests/EmptyInputAndEmptyOutputTest.cpp b/generated/protocol-tests/tests/output/rest-json/tests/EmptyInputAndEmptyOutputTest.cpp index 46d409b5865..945415b0cfa 100644 --- a/generated/protocol-tests/tests/output/rest-json/tests/EmptyInputAndEmptyOutputTest.cpp +++ b/generated/protocol-tests/tests/output/rest-json/tests/EmptyInputAndEmptyOutputTest.cpp @@ -23,9 +23,9 @@ AWS_PROTOCOL_TEST(EmptyInputAndEmptyOutput, RestJsonEmptyInputAndEmptyOutput) { EmptyInputAndEmptyOutputRequest request; auto outcome = client.EmptyInputAndEmptyOutput(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + /* expectedResult = R"( {} )" */ } AWS_PROTOCOL_TEST(EmptyInputAndEmptyOutput, RestJsonEmptyInputAndEmptyOutputJsonObjectOutput) { @@ -38,7 +38,7 @@ AWS_PROTOCOL_TEST(EmptyInputAndEmptyOutput, RestJsonEmptyInputAndEmptyOutputJson EmptyInputAndEmptyOutputRequest request; auto outcome = client.EmptyInputAndEmptyOutput(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + /* expectedResult = R"( {} )" */ } diff --git a/generated/protocol-tests/tests/output/rest-json/tests/FractionalSecondsTest.cpp b/generated/protocol-tests/tests/output/rest-json/tests/FractionalSecondsTest.cpp index e2d26bccb40..d917e63c35a 100644 --- a/generated/protocol-tests/tests/output/rest-json/tests/FractionalSecondsTest.cpp +++ b/generated/protocol-tests/tests/output/rest-json/tests/FractionalSecondsTest.cpp @@ -22,7 +22,9 @@ AWS_PROTOCOL_TEST(FractionalSeconds, RestJsonDateTimeWithFractionalSeconds) { FractionalSecondsRequest request; auto outcome = client.FractionalSeconds(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const FractionalSecondsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"datetime":9.46845296123E8} )" */ + EXPECT_EQ(Aws::Utils::DateTime(9.46845296123E8), result.GetDatetime()); } diff --git a/generated/protocol-tests/tests/output/rest-json/tests/GreetingWithErrors0Test.cpp b/generated/protocol-tests/tests/output/rest-json/tests/GreetingWithErrors0Test.cpp index fe804fc95c3..dfd989c7681 100644 --- a/generated/protocol-tests/tests/output/rest-json/tests/GreetingWithErrors0Test.cpp +++ b/generated/protocol-tests/tests/output/rest-json/tests/GreetingWithErrors0Test.cpp @@ -22,9 +22,8 @@ AWS_PROTOCOL_TEST(GreetingWithErrors0, RestJsonFooErrorUsingXAmznErrorType) { GreetingWithErrorsRequest request; auto outcome = client.GreetingWithErrors(request); - ASSERT_FALSE(outcome.IsSuccess()); - ValidateRequestSent(); + ASSERT_FALSE(outcome.IsSuccess()); } AWS_PROTOCOL_TEST(GreetingWithErrors0, RestJsonFooErrorUsingXAmznErrorTypeWithUri) { @@ -38,9 +37,8 @@ AWS_PROTOCOL_TEST(GreetingWithErrors0, RestJsonFooErrorUsingXAmznErrorTypeWithUr GreetingWithErrorsRequest request; auto outcome = client.GreetingWithErrors(request); - ASSERT_FALSE(outcome.IsSuccess()); - ValidateRequestSent(); + ASSERT_FALSE(outcome.IsSuccess()); } AWS_PROTOCOL_TEST(GreetingWithErrors0, RestJsonFooErrorUsingXAmznErrorTypeWithUriAndNamespace) { @@ -54,9 +52,8 @@ AWS_PROTOCOL_TEST(GreetingWithErrors0, RestJsonFooErrorUsingXAmznErrorTypeWithUr GreetingWithErrorsRequest request; auto outcome = client.GreetingWithErrors(request); - ASSERT_FALSE(outcome.IsSuccess()); - ValidateRequestSent(); + ASSERT_FALSE(outcome.IsSuccess()); } AWS_PROTOCOL_TEST(GreetingWithErrors0, RestJsonFooErrorUsingCode) { @@ -71,9 +68,8 @@ AWS_PROTOCOL_TEST(GreetingWithErrors0, RestJsonFooErrorUsingCode) { GreetingWithErrorsRequest request; auto outcome = client.GreetingWithErrors(request); - ASSERT_FALSE(outcome.IsSuccess()); - ValidateRequestSent(); + ASSERT_FALSE(outcome.IsSuccess()); } AWS_PROTOCOL_TEST(GreetingWithErrors0, RestJsonFooErrorUsingCodeAndNamespace) { @@ -88,9 +84,8 @@ AWS_PROTOCOL_TEST(GreetingWithErrors0, RestJsonFooErrorUsingCodeAndNamespace) { GreetingWithErrorsRequest request; auto outcome = client.GreetingWithErrors(request); - ASSERT_FALSE(outcome.IsSuccess()); - ValidateRequestSent(); + ASSERT_FALSE(outcome.IsSuccess()); } AWS_PROTOCOL_TEST(GreetingWithErrors0, RestJsonFooErrorUsingCodeUriAndNamespace) { @@ -105,9 +100,8 @@ AWS_PROTOCOL_TEST(GreetingWithErrors0, RestJsonFooErrorUsingCodeUriAndNamespace) GreetingWithErrorsRequest request; auto outcome = client.GreetingWithErrors(request); - ASSERT_FALSE(outcome.IsSuccess()); - ValidateRequestSent(); + ASSERT_FALSE(outcome.IsSuccess()); } AWS_PROTOCOL_TEST(GreetingWithErrors0, RestJsonFooErrorWithDunderType) { @@ -122,9 +116,8 @@ AWS_PROTOCOL_TEST(GreetingWithErrors0, RestJsonFooErrorWithDunderType) { GreetingWithErrorsRequest request; auto outcome = client.GreetingWithErrors(request); - ASSERT_FALSE(outcome.IsSuccess()); - ValidateRequestSent(); + ASSERT_FALSE(outcome.IsSuccess()); } AWS_PROTOCOL_TEST(GreetingWithErrors0, RestJsonFooErrorWithDunderTypeAndNamespace) { @@ -139,9 +132,8 @@ AWS_PROTOCOL_TEST(GreetingWithErrors0, RestJsonFooErrorWithDunderTypeAndNamespac GreetingWithErrorsRequest request; auto outcome = client.GreetingWithErrors(request); - ASSERT_FALSE(outcome.IsSuccess()); - ValidateRequestSent(); + ASSERT_FALSE(outcome.IsSuccess()); } AWS_PROTOCOL_TEST(GreetingWithErrors0, RestJsonFooErrorWithDunderTypeUriAndNamespace) { @@ -156,7 +148,6 @@ AWS_PROTOCOL_TEST(GreetingWithErrors0, RestJsonFooErrorWithDunderTypeUriAndNames GreetingWithErrorsRequest request; auto outcome = client.GreetingWithErrors(request); - ASSERT_FALSE(outcome.IsSuccess()); - ValidateRequestSent(); + ASSERT_FALSE(outcome.IsSuccess()); } diff --git a/generated/protocol-tests/tests/output/rest-json/tests/GreetingWithErrors1Test.cpp b/generated/protocol-tests/tests/output/rest-json/tests/GreetingWithErrors1Test.cpp index 97f40e13a97..8d7a22ef067 100644 --- a/generated/protocol-tests/tests/output/rest-json/tests/GreetingWithErrors1Test.cpp +++ b/generated/protocol-tests/tests/output/rest-json/tests/GreetingWithErrors1Test.cpp @@ -23,9 +23,8 @@ AWS_PROTOCOL_TEST(GreetingWithErrors1, RestJsonComplexErrorWithNoMessage) { GreetingWithErrorsRequest request; auto outcome = client.GreetingWithErrors(request); - ASSERT_FALSE(outcome.IsSuccess()); - ValidateRequestSent(); + ASSERT_FALSE(outcome.IsSuccess()); } AWS_PROTOCOL_TEST(GreetingWithErrors1, RestJsonEmptyComplexErrorWithNoMessage) { @@ -40,7 +39,6 @@ AWS_PROTOCOL_TEST(GreetingWithErrors1, RestJsonEmptyComplexErrorWithNoMessage) { GreetingWithErrorsRequest request; auto outcome = client.GreetingWithErrors(request); - ASSERT_FALSE(outcome.IsSuccess()); - ValidateRequestSent(); + ASSERT_FALSE(outcome.IsSuccess()); } diff --git a/generated/protocol-tests/tests/output/rest-json/tests/GreetingWithErrors2Test.cpp b/generated/protocol-tests/tests/output/rest-json/tests/GreetingWithErrors2Test.cpp index fc947bbafd2..79d43f19d90 100644 --- a/generated/protocol-tests/tests/output/rest-json/tests/GreetingWithErrors2Test.cpp +++ b/generated/protocol-tests/tests/output/rest-json/tests/GreetingWithErrors2Test.cpp @@ -23,7 +23,6 @@ AWS_PROTOCOL_TEST(GreetingWithErrors2, RestJsonInvalidGreetingError) { GreetingWithErrorsRequest request; auto outcome = client.GreetingWithErrors(request); - ASSERT_FALSE(outcome.IsSuccess()); - ValidateRequestSent(); + ASSERT_FALSE(outcome.IsSuccess()); } diff --git a/generated/protocol-tests/tests/output/rest-json/tests/GreetingWithErrorsTest.cpp b/generated/protocol-tests/tests/output/rest-json/tests/GreetingWithErrorsTest.cpp index d43b2941356..6c11609a97a 100644 --- a/generated/protocol-tests/tests/output/rest-json/tests/GreetingWithErrorsTest.cpp +++ b/generated/protocol-tests/tests/output/rest-json/tests/GreetingWithErrorsTest.cpp @@ -23,9 +23,11 @@ AWS_PROTOCOL_TEST(GreetingWithErrors, RestJsonGreetingWithErrors) { GreetingWithErrorsRequest request; auto outcome = client.GreetingWithErrors(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const GreetingWithErrorsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"greeting":"Hello"} )" */ + EXPECT_EQ(R"(Hello)", result.GetGreeting()); } AWS_PROTOCOL_TEST(GreetingWithErrors, RestJsonGreetingWithErrorsNoPayload) { @@ -39,7 +41,9 @@ AWS_PROTOCOL_TEST(GreetingWithErrors, RestJsonGreetingWithErrorsNoPayload) { GreetingWithErrorsRequest request; auto outcome = client.GreetingWithErrors(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const GreetingWithErrorsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"greeting":"Hello"} )" */ + EXPECT_EQ(R"(Hello)", result.GetGreeting()); } diff --git a/generated/protocol-tests/tests/output/rest-json/tests/HttpEnumPayloadTest.cpp b/generated/protocol-tests/tests/output/rest-json/tests/HttpEnumPayloadTest.cpp index cae4d67073c..6f24ec8a7da 100644 --- a/generated/protocol-tests/tests/output/rest-json/tests/HttpEnumPayloadTest.cpp +++ b/generated/protocol-tests/tests/output/rest-json/tests/HttpEnumPayloadTest.cpp @@ -23,7 +23,9 @@ AWS_PROTOCOL_TEST(HttpEnumPayload, RestJsonEnumPayloadResponse) { HttpEnumPayloadRequest request; auto outcome = client.HttpEnumPayload(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const HttpEnumPayloadResult& result = outcome.GetResult(); + /* expectedResult = R"( {"payload":"enumvalue"} )" */ + EXPECT_EQ(StringEnumMapper::GetStringEnumForName(R"e(enumvalue)e"), result.GetPayload()); } diff --git a/generated/protocol-tests/tests/output/rest-json/tests/HttpPayloadTraitsTest.cpp b/generated/protocol-tests/tests/output/rest-json/tests/HttpPayloadTraitsTest.cpp index 097971e006b..974f921d596 100644 --- a/generated/protocol-tests/tests/output/rest-json/tests/HttpPayloadTraitsTest.cpp +++ b/generated/protocol-tests/tests/output/rest-json/tests/HttpPayloadTraitsTest.cpp @@ -23,9 +23,13 @@ AWS_PROTOCOL_TEST(HttpPayloadTraits, RestJsonHttpPayloadTraitsWithBlob) { HttpPayloadTraitsRequest request; auto outcome = client.HttpPayloadTraits(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const HttpPayloadTraitsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"foo":"Foo","blob":"blobby blob blob"} )" */ + EXPECT_EQ(R"(Foo)", result.GetFoo()); + const Aws::String resultBlob = [&result](){Aws::StringStream ss; ss << result.GetBlob().rdbuf(); return ss.str();}(); + EXPECT_STREQ(R"(blobby blob blob)", resultBlob.c_str()); } AWS_PROTOCOL_TEST(HttpPayloadTraits, RestJsonHttpPayloadTraitsWithNoBlobBody) { @@ -39,7 +43,9 @@ AWS_PROTOCOL_TEST(HttpPayloadTraits, RestJsonHttpPayloadTraitsWithNoBlobBody) { HttpPayloadTraitsRequest request; auto outcome = client.HttpPayloadTraits(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const HttpPayloadTraitsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"foo":"Foo"} )" */ + EXPECT_EQ(R"(Foo)", result.GetFoo()); } diff --git a/generated/protocol-tests/tests/output/rest-json/tests/HttpPayloadWithStructureTest.cpp b/generated/protocol-tests/tests/output/rest-json/tests/HttpPayloadWithStructureTest.cpp index 7a55a1d5ae2..226db8198b8 100644 --- a/generated/protocol-tests/tests/output/rest-json/tests/HttpPayloadWithStructureTest.cpp +++ b/generated/protocol-tests/tests/output/rest-json/tests/HttpPayloadWithStructureTest.cpp @@ -23,7 +23,13 @@ AWS_PROTOCOL_TEST(HttpPayloadWithStructure, RestJsonHttpPayloadWithStructure) { HttpPayloadWithStructureRequest request; auto outcome = client.HttpPayloadWithStructure(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const HttpPayloadWithStructureResult& result = outcome.GetResult(); + /* expectedResult = R"( {"nested":{"greeting":"hello","name":"Phreddy"}} )" */ + { + const NestedPayload& resultNested = result.GetNested(); + EXPECT_EQ(R"(hello)", resultNested.GetGreeting()); + EXPECT_EQ(R"(Phreddy)", resultNested.GetName()); + } } diff --git a/generated/protocol-tests/tests/output/rest-json/tests/HttpPayloadWithUnionTest.cpp b/generated/protocol-tests/tests/output/rest-json/tests/HttpPayloadWithUnionTest.cpp index 281ede69664..d9714040439 100644 --- a/generated/protocol-tests/tests/output/rest-json/tests/HttpPayloadWithUnionTest.cpp +++ b/generated/protocol-tests/tests/output/rest-json/tests/HttpPayloadWithUnionTest.cpp @@ -23,9 +23,14 @@ AWS_PROTOCOL_TEST(HttpPayloadWithUnion, RestJsonHttpPayloadWithUnion) { HttpPayloadWithUnionRequest request; auto outcome = client.HttpPayloadWithUnion(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const HttpPayloadWithUnionResult& result = outcome.GetResult(); + /* expectedResult = R"( {"nested":{"greeting":"hello"}} )" */ + { + const UnionPayload& resultNested = result.GetNested(); + EXPECT_EQ(R"(hello)", resultNested.GetGreeting()); + } } AWS_PROTOCOL_TEST(HttpPayloadWithUnion, RestJsonHttpPayloadWithUnsetUnion) { @@ -39,7 +44,7 @@ AWS_PROTOCOL_TEST(HttpPayloadWithUnion, RestJsonHttpPayloadWithUnsetUnion) { HttpPayloadWithUnionRequest request; auto outcome = client.HttpPayloadWithUnion(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + /* expectedResult = R"( {} )" */ } diff --git a/generated/protocol-tests/tests/output/rest-json/tests/HttpPrefixHeadersInResponseTest.cpp b/generated/protocol-tests/tests/output/rest-json/tests/HttpPrefixHeadersInResponseTest.cpp index ea8bbe800c6..71df5bad1f6 100644 --- a/generated/protocol-tests/tests/output/rest-json/tests/HttpPrefixHeadersInResponseTest.cpp +++ b/generated/protocol-tests/tests/output/rest-json/tests/HttpPrefixHeadersInResponseTest.cpp @@ -22,7 +22,14 @@ AWS_PROTOCOL_TEST(HttpPrefixHeadersInResponse, HttpPrefixHeadersResponse) { HttpPrefixHeadersInResponseRequest request; auto outcome = client.HttpPrefixHeadersInResponse(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const HttpPrefixHeadersInResponseResult& result = outcome.GetResult(); + /* expectedResult = R"( {"prefixHeaders":{"x-foo":"Foo","hello":"Hello"}} )" */ + const Aws::Map& resultPrefixHeaders = result.GetPrefixHeaders(); + EXPECT_EQ(2U, resultPrefixHeaders.size()); + EXPECT_TRUE(resultPrefixHeaders.find("x-foo") != resultPrefixHeaders.end()); + EXPECT_EQ(R"(Foo)", resultPrefixHeaders.at("x-foo")); + EXPECT_TRUE(resultPrefixHeaders.find("hello") != resultPrefixHeaders.end()); + EXPECT_EQ(R"(Hello)", resultPrefixHeaders.at("hello")); } diff --git a/generated/protocol-tests/tests/output/rest-json/tests/HttpPrefixHeadersTest.cpp b/generated/protocol-tests/tests/output/rest-json/tests/HttpPrefixHeadersTest.cpp index a0dd7d4f58c..1768c3df1c4 100644 --- a/generated/protocol-tests/tests/output/rest-json/tests/HttpPrefixHeadersTest.cpp +++ b/generated/protocol-tests/tests/output/rest-json/tests/HttpPrefixHeadersTest.cpp @@ -22,7 +22,15 @@ AWS_PROTOCOL_TEST(HttpPrefixHeaders, RestJsonHttpPrefixHeadersArePresent) { HttpPrefixHeadersRequest request; auto outcome = client.HttpPrefixHeaders(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const HttpPrefixHeadersResult& result = outcome.GetResult(); + /* expectedResult = R"( {"foo":"Foo","fooMap":{"abc":"Abc value","def":"Def value"}} )" */ + EXPECT_EQ(R"(Foo)", result.GetFoo()); + const Aws::Map& resultFooMap = result.GetFooMap(); + EXPECT_EQ(2U, resultFooMap.size()); + EXPECT_TRUE(resultFooMap.find("abc") != resultFooMap.end()); + EXPECT_EQ(R"(Abc value)", resultFooMap.at("abc")); + EXPECT_TRUE(resultFooMap.find("def") != resultFooMap.end()); + EXPECT_EQ(R"(Def value)", resultFooMap.at("def")); } diff --git a/generated/protocol-tests/tests/output/rest-json/tests/HttpResponseCodeTest.cpp b/generated/protocol-tests/tests/output/rest-json/tests/HttpResponseCodeTest.cpp index 124337446dd..ce563b92deb 100644 --- a/generated/protocol-tests/tests/output/rest-json/tests/HttpResponseCodeTest.cpp +++ b/generated/protocol-tests/tests/output/rest-json/tests/HttpResponseCodeTest.cpp @@ -23,9 +23,11 @@ AWS_PROTOCOL_TEST(HttpResponseCode, RestJsonHttpResponseCode) { HttpResponseCodeRequest request; auto outcome = client.HttpResponseCode(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const HttpResponseCodeResult& result = outcome.GetResult(); + /* expectedResult = R"( {"Status":201} )" */ + EXPECT_EQ(201, result.GetStatus()); } AWS_PROTOCOL_TEST(HttpResponseCode, RestJsonHttpResponseCodeWithNoPayload) { @@ -38,7 +40,9 @@ AWS_PROTOCOL_TEST(HttpResponseCode, RestJsonHttpResponseCodeWithNoPayload) { HttpResponseCodeRequest request; auto outcome = client.HttpResponseCode(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const HttpResponseCodeResult& result = outcome.GetResult(); + /* expectedResult = R"( {"Status":201} )" */ + EXPECT_EQ(201, result.GetStatus()); } diff --git a/generated/protocol-tests/tests/output/rest-json/tests/HttpStringPayloadTest.cpp b/generated/protocol-tests/tests/output/rest-json/tests/HttpStringPayloadTest.cpp index 86157dcaaba..f10bbc29daa 100644 --- a/generated/protocol-tests/tests/output/rest-json/tests/HttpStringPayloadTest.cpp +++ b/generated/protocol-tests/tests/output/rest-json/tests/HttpStringPayloadTest.cpp @@ -23,7 +23,10 @@ AWS_PROTOCOL_TEST(HttpStringPayload, RestJsonStringPayloadResponse) { HttpStringPayloadRequest request; auto outcome = client.HttpStringPayload(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const HttpStringPayloadResult& result = outcome.GetResult(); + /* expectedResult = R"( {"payload":"rawstring"} )" */ + const Aws::String resultPayload = [&result](){Aws::StringStream ss; ss << result.GetPayload().rdbuf(); return ss.str();}(); + EXPECT_STREQ(R"(rawstring)", resultPayload.c_str()); } diff --git a/generated/protocol-tests/tests/output/rest-json/tests/IgnoreQueryParamsInResponseTest.cpp b/generated/protocol-tests/tests/output/rest-json/tests/IgnoreQueryParamsInResponseTest.cpp index 59f7414e57d..6483fc95519 100644 --- a/generated/protocol-tests/tests/output/rest-json/tests/IgnoreQueryParamsInResponseTest.cpp +++ b/generated/protocol-tests/tests/output/rest-json/tests/IgnoreQueryParamsInResponseTest.cpp @@ -23,9 +23,9 @@ AWS_PROTOCOL_TEST(IgnoreQueryParamsInResponse, RestJsonIgnoreQueryParamsInRespon IgnoreQueryParamsInResponseRequest request; auto outcome = client.IgnoreQueryParamsInResponse(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + /* expectedResult = R"( {} )" */ } AWS_PROTOCOL_TEST(IgnoreQueryParamsInResponse, RestJsonIgnoreQueryParamsInResponseNoPayload) { @@ -38,7 +38,7 @@ AWS_PROTOCOL_TEST(IgnoreQueryParamsInResponse, RestJsonIgnoreQueryParamsInRespon IgnoreQueryParamsInResponseRequest request; auto outcome = client.IgnoreQueryParamsInResponse(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + /* expectedResult = R"( {} )" */ } diff --git a/generated/protocol-tests/tests/output/rest-json/tests/InputAndOutputWithHeadersTest.cpp b/generated/protocol-tests/tests/output/rest-json/tests/InputAndOutputWithHeadersTest.cpp index c4f51721614..0b3139e2607 100644 --- a/generated/protocol-tests/tests/output/rest-json/tests/InputAndOutputWithHeadersTest.cpp +++ b/generated/protocol-tests/tests/output/rest-json/tests/InputAndOutputWithHeadersTest.cpp @@ -22,9 +22,21 @@ AWS_PROTOCOL_TEST(InputAndOutputWithHeaders, RestJsonInputAndOutputWithStringHea InputAndOutputWithHeadersRequest request; auto outcome = client.InputAndOutputWithHeaders(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const InputAndOutputWithHeadersResult& result = outcome.GetResult(); + /* expectedResult = R"( {"headerString":"Hello","headerStringList":["a","b","c"],"headerStringSet":["a","b","c"]} )" */ + EXPECT_EQ(R"(Hello)", result.GetHeaderString()); + const Aws::Vector& resultHeaderStringListItem = result.GetHeaderStringList(); + EXPECT_EQ(3U, resultHeaderStringListItem.size()); + EXPECT_EQ(R"(a)", resultHeaderStringListItem.at(0)); + EXPECT_EQ(R"(b)", resultHeaderStringListItem.at(1)); + EXPECT_EQ(R"(c)", resultHeaderStringListItem.at(2)); + const Aws::Vector& resultHeaderStringSetItem = result.GetHeaderStringSet(); + EXPECT_EQ(3U, resultHeaderStringSetItem.size()); + EXPECT_EQ(R"(a)", resultHeaderStringSetItem.at(0)); + EXPECT_EQ(R"(b)", resultHeaderStringSetItem.at(1)); + EXPECT_EQ(R"(c)", resultHeaderStringSetItem.at(2)); } AWS_PROTOCOL_TEST(InputAndOutputWithHeaders, RestJsonInputAndOutputWithQuotedStringHeaders) { @@ -38,9 +50,15 @@ AWS_PROTOCOL_TEST(InputAndOutputWithHeaders, RestJsonInputAndOutputWithQuotedStr InputAndOutputWithHeadersRequest request; auto outcome = client.InputAndOutputWithHeaders(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const InputAndOutputWithHeadersResult& result = outcome.GetResult(); + /* expectedResult = R"( {"headerStringList":["b,c","\"def\"","a"]} )" */ + const Aws::Vector& resultHeaderStringListItem = result.GetHeaderStringList(); + EXPECT_EQ(3U, resultHeaderStringListItem.size()); + EXPECT_EQ(R"(b,c)", resultHeaderStringListItem.at(0)); + EXPECT_EQ(R"("def")", resultHeaderStringListItem.at(1)); + EXPECT_EQ(R"(a)", resultHeaderStringListItem.at(2)); } AWS_PROTOCOL_TEST(InputAndOutputWithHeaders, RestJsonInputAndOutputWithNumericHeaders) { @@ -54,9 +72,21 @@ AWS_PROTOCOL_TEST(InputAndOutputWithHeaders, RestJsonInputAndOutputWithNumericHe InputAndOutputWithHeadersRequest request; auto outcome = client.InputAndOutputWithHeaders(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const InputAndOutputWithHeadersResult& result = outcome.GetResult(); + /* expectedResult = R"( {"headerByte":1,"headerShort":123,"headerInteger":123,"headerLong":123,"headerFloat":1.1,"headerDouble":1.1,"headerIntegerList":[1,2,3]} )" */ + EXPECT_EQ(1, result.GetHeaderByte()); + EXPECT_EQ(123, result.GetHeaderShort()); + EXPECT_EQ(123, result.GetHeaderInteger()); + EXPECT_EQ(123, result.GetHeaderLong()); + EXPECT_EQ(1.1, result.GetHeaderFloat()); + EXPECT_EQ(1.1, result.GetHeaderDouble()); + const Aws::Vector& resultHeaderIntegerListItem = result.GetHeaderIntegerList(); + EXPECT_EQ(3U, resultHeaderIntegerListItem.size()); + EXPECT_EQ(1, resultHeaderIntegerListItem.at(0)); + EXPECT_EQ(2, resultHeaderIntegerListItem.at(1)); + EXPECT_EQ(3, resultHeaderIntegerListItem.at(2)); } AWS_PROTOCOL_TEST(InputAndOutputWithHeaders, RestJsonInputAndOutputWithBooleanHeaders) { @@ -70,9 +100,17 @@ AWS_PROTOCOL_TEST(InputAndOutputWithHeaders, RestJsonInputAndOutputWithBooleanHe InputAndOutputWithHeadersRequest request; auto outcome = client.InputAndOutputWithHeaders(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const InputAndOutputWithHeadersResult& result = outcome.GetResult(); + /* expectedResult = R"( {"headerTrueBool":true,"headerFalseBool":false,"headerBooleanList":[true,false,true]} )" */ + EXPECT_EQ(true, result.GetHeaderTrueBool()); + EXPECT_EQ(false, result.GetHeaderFalseBool()); + const Aws::Vector& resultHeaderBooleanListItem = result.GetHeaderBooleanList(); + EXPECT_EQ(3U, resultHeaderBooleanListItem.size()); + EXPECT_EQ(true, resultHeaderBooleanListItem.at(0)); + EXPECT_EQ(false, resultHeaderBooleanListItem.at(1)); + EXPECT_EQ(true, resultHeaderBooleanListItem.at(2)); } AWS_PROTOCOL_TEST(InputAndOutputWithHeaders, RestJsonInputAndOutputWithTimestampHeaders) { @@ -86,9 +124,14 @@ AWS_PROTOCOL_TEST(InputAndOutputWithHeaders, RestJsonInputAndOutputWithTimestamp InputAndOutputWithHeadersRequest request; auto outcome = client.InputAndOutputWithHeaders(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const InputAndOutputWithHeadersResult& result = outcome.GetResult(); + /* expectedResult = R"( {"headerTimestampList":[1576540098,1576540098]} )" */ + const Aws::Vector& resultHeaderTimestampListItem = result.GetHeaderTimestampList(); + EXPECT_EQ(2U, resultHeaderTimestampListItem.size()); + EXPECT_EQ(Aws::Utils::DateTime(1576540098L), resultHeaderTimestampListItem.at(0)); + EXPECT_EQ(Aws::Utils::DateTime(1576540098L), resultHeaderTimestampListItem.at(1)); } AWS_PROTOCOL_TEST(InputAndOutputWithHeaders, RestJsonInputAndOutputWithEnumHeaders) { @@ -102,9 +145,16 @@ AWS_PROTOCOL_TEST(InputAndOutputWithHeaders, RestJsonInputAndOutputWithEnumHeade InputAndOutputWithHeadersRequest request; auto outcome = client.InputAndOutputWithHeaders(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const InputAndOutputWithHeadersResult& result = outcome.GetResult(); + /* expectedResult = R"( {"headerEnum":"Foo","headerEnumList":["Foo","Bar","Baz"]} )" */ + EXPECT_EQ(FooEnumMapper::GetFooEnumForName(R"e(Foo)e"), result.GetHeaderEnum()); + const Aws::Vector& resultHeaderEnumListItem = result.GetHeaderEnumList(); + EXPECT_EQ(3U, resultHeaderEnumListItem.size()); + EXPECT_EQ(FooEnumMapper::GetFooEnumForName(R"e(Foo)e"), resultHeaderEnumListItem.at(0)); + EXPECT_EQ(FooEnumMapper::GetFooEnumForName(R"e(Bar)e"), resultHeaderEnumListItem.at(1)); + EXPECT_EQ(FooEnumMapper::GetFooEnumForName(R"e(Baz)e"), resultHeaderEnumListItem.at(2)); } AWS_PROTOCOL_TEST(InputAndOutputWithHeaders, RestJsonInputAndOutputWithIntEnumHeaders) { @@ -118,9 +168,16 @@ AWS_PROTOCOL_TEST(InputAndOutputWithHeaders, RestJsonInputAndOutputWithIntEnumHe InputAndOutputWithHeadersRequest request; auto outcome = client.InputAndOutputWithHeaders(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const InputAndOutputWithHeadersResult& result = outcome.GetResult(); + /* expectedResult = R"( {"headerIntegerEnum":1,"headerIntegerEnumList":[1,2,3]} )" */ + EXPECT_EQ(1, result.GetHeaderIntegerEnum()); + const Aws::Vector& resultHeaderIntegerEnumListItem = result.GetHeaderIntegerEnumList(); + EXPECT_EQ(3U, resultHeaderIntegerEnumListItem.size()); + EXPECT_EQ(1, resultHeaderIntegerEnumListItem.at(0)); + EXPECT_EQ(2, resultHeaderIntegerEnumListItem.at(1)); + EXPECT_EQ(3, resultHeaderIntegerEnumListItem.at(2)); } AWS_PROTOCOL_TEST(InputAndOutputWithHeaders, RestJsonSupportsNaNFloatHeaderOutputs) { @@ -134,9 +191,12 @@ AWS_PROTOCOL_TEST(InputAndOutputWithHeaders, RestJsonSupportsNaNFloatHeaderOutpu InputAndOutputWithHeadersRequest request; auto outcome = client.InputAndOutputWithHeaders(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const InputAndOutputWithHeadersResult& result = outcome.GetResult(); + /* expectedResult = R"( {"headerFloat":"NaN","headerDouble":"NaN"} )" */ + EXPECT_EQ(std::numeric_limits::quiet_NaN(), result.GetHeaderFloat()); + EXPECT_EQ(std::numeric_limits::quiet_NaN(), result.GetHeaderDouble()); } AWS_PROTOCOL_TEST(InputAndOutputWithHeaders, RestJsonSupportsInfinityFloatHeaderOutputs) { @@ -150,9 +210,12 @@ AWS_PROTOCOL_TEST(InputAndOutputWithHeaders, RestJsonSupportsInfinityFloatHeader InputAndOutputWithHeadersRequest request; auto outcome = client.InputAndOutputWithHeaders(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const InputAndOutputWithHeadersResult& result = outcome.GetResult(); + /* expectedResult = R"( {"headerFloat":"Infinity","headerDouble":"Infinity"} )" */ + EXPECT_EQ(std::numeric_limits::infinity(), result.GetHeaderFloat()); + EXPECT_EQ(std::numeric_limits::infinity(), result.GetHeaderDouble()); } AWS_PROTOCOL_TEST(InputAndOutputWithHeaders, RestJsonSupportsNegativeInfinityFloatHeaderOutputs) { @@ -166,7 +229,10 @@ AWS_PROTOCOL_TEST(InputAndOutputWithHeaders, RestJsonSupportsNegativeInfinityFlo InputAndOutputWithHeadersRequest request; auto outcome = client.InputAndOutputWithHeaders(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const InputAndOutputWithHeadersResult& result = outcome.GetResult(); + /* expectedResult = R"( {"headerFloat":"-Infinity","headerDouble":"-Infinity"} )" */ + EXPECT_EQ(-std::numeric_limits::infinity(), result.GetHeaderFloat()); + EXPECT_EQ(-std::numeric_limits::infinity(), result.GetHeaderDouble()); } diff --git a/generated/protocol-tests/tests/output/rest-json/tests/JsonBlobsTest.cpp b/generated/protocol-tests/tests/output/rest-json/tests/JsonBlobsTest.cpp index 4617f567d82..339d26b3f36 100644 --- a/generated/protocol-tests/tests/output/rest-json/tests/JsonBlobsTest.cpp +++ b/generated/protocol-tests/tests/output/rest-json/tests/JsonBlobsTest.cpp @@ -23,7 +23,9 @@ AWS_PROTOCOL_TEST(JsonBlobs, RestJsonJsonBlobs) { JsonBlobsRequest request; auto outcome = client.JsonBlobs(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const JsonBlobsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"data":"value"} )" */ + EXPECT_EQ(Aws::Utils::ByteBuffer(R"(value)"), result.GetData()); } diff --git a/generated/protocol-tests/tests/output/rest-json/tests/JsonEnumsTest.cpp b/generated/protocol-tests/tests/output/rest-json/tests/JsonEnumsTest.cpp index 675ce42dd0b..315dd149974 100644 --- a/generated/protocol-tests/tests/output/rest-json/tests/JsonEnumsTest.cpp +++ b/generated/protocol-tests/tests/output/rest-json/tests/JsonEnumsTest.cpp @@ -23,7 +23,25 @@ AWS_PROTOCOL_TEST(JsonEnums, RestJsonJsonEnums) { JsonEnumsRequest request; auto outcome = client.JsonEnums(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const JsonEnumsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"fooEnum1":"Foo","fooEnum2":"0","fooEnum3":"1","fooEnumList":["Foo","0"],"fooEnumSet":["Foo","0"],"fooEnumMap":{"hi":"Foo","zero":"0"}} )" */ + EXPECT_EQ(FooEnumMapper::GetFooEnumForName(R"e(Foo)e"), result.GetFooEnum1()); + EXPECT_EQ(FooEnumMapper::GetFooEnumForName(R"e(0)e"), result.GetFooEnum2()); + EXPECT_EQ(FooEnumMapper::GetFooEnumForName(R"e(1)e"), result.GetFooEnum3()); + const Aws::Vector& resultFooEnumListItem = result.GetFooEnumList(); + EXPECT_EQ(2U, resultFooEnumListItem.size()); + EXPECT_EQ(FooEnumMapper::GetFooEnumForName(R"e(Foo)e"), resultFooEnumListItem.at(0)); + EXPECT_EQ(FooEnumMapper::GetFooEnumForName(R"e(0)e"), resultFooEnumListItem.at(1)); + const Aws::Vector& resultFooEnumSetItem = result.GetFooEnumSet(); + EXPECT_EQ(2U, resultFooEnumSetItem.size()); + EXPECT_EQ(FooEnumMapper::GetFooEnumForName(R"e(Foo)e"), resultFooEnumSetItem.at(0)); + EXPECT_EQ(FooEnumMapper::GetFooEnumForName(R"e(0)e"), resultFooEnumSetItem.at(1)); + const Aws::Map& resultFooEnumMap = result.GetFooEnumMap(); + EXPECT_EQ(2U, resultFooEnumMap.size()); + EXPECT_TRUE(resultFooEnumMap.find("hi") != resultFooEnumMap.end()); + EXPECT_EQ(FooEnumMapper::GetFooEnumForName(R"e(Foo)e"), resultFooEnumMap.at("hi")); + EXPECT_TRUE(resultFooEnumMap.find("zero") != resultFooEnumMap.end()); + EXPECT_EQ(FooEnumMapper::GetFooEnumForName(R"e(0)e"), resultFooEnumMap.at("zero")); } diff --git a/generated/protocol-tests/tests/output/rest-json/tests/JsonIntEnumsTest.cpp b/generated/protocol-tests/tests/output/rest-json/tests/JsonIntEnumsTest.cpp index 964b08fcbb0..bd35c1b2142 100644 --- a/generated/protocol-tests/tests/output/rest-json/tests/JsonIntEnumsTest.cpp +++ b/generated/protocol-tests/tests/output/rest-json/tests/JsonIntEnumsTest.cpp @@ -23,7 +23,26 @@ AWS_PROTOCOL_TEST(JsonIntEnums, RestJsonJsonIntEnums) { JsonIntEnumsRequest request; auto outcome = client.JsonIntEnums(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const JsonIntEnumsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"integerEnum1":1,"integerEnum2":2,"integerEnum3":3,"integerEnumList":[1,2,3],"integerEnumSet":[1,2],"integerEnumMap":{"abc":1,"def":2}} )" */ + EXPECT_EQ(1, result.GetIntegerEnum1()); + EXPECT_EQ(2, result.GetIntegerEnum2()); + EXPECT_EQ(3, result.GetIntegerEnum3()); + const Aws::Vector& resultIntegerEnumListItem = result.GetIntegerEnumList(); + EXPECT_EQ(3U, resultIntegerEnumListItem.size()); + EXPECT_EQ(1, resultIntegerEnumListItem.at(0)); + EXPECT_EQ(2, resultIntegerEnumListItem.at(1)); + EXPECT_EQ(3, resultIntegerEnumListItem.at(2)); + const Aws::Vector& resultIntegerEnumSetItem = result.GetIntegerEnumSet(); + EXPECT_EQ(2U, resultIntegerEnumSetItem.size()); + EXPECT_EQ(1, resultIntegerEnumSetItem.at(0)); + EXPECT_EQ(2, resultIntegerEnumSetItem.at(1)); + const Aws::Map& resultIntegerEnumMap = result.GetIntegerEnumMap(); + EXPECT_EQ(2U, resultIntegerEnumMap.size()); + EXPECT_TRUE(resultIntegerEnumMap.find("abc") != resultIntegerEnumMap.end()); + EXPECT_EQ(1, resultIntegerEnumMap.at("abc")); + EXPECT_TRUE(resultIntegerEnumMap.find("def") != resultIntegerEnumMap.end()); + EXPECT_EQ(2, resultIntegerEnumMap.at("def")); } diff --git a/generated/protocol-tests/tests/output/rest-json/tests/JsonListsTest.cpp b/generated/protocol-tests/tests/output/rest-json/tests/JsonListsTest.cpp index 96da7252f05..2627acf1f66 100644 --- a/generated/protocol-tests/tests/output/rest-json/tests/JsonListsTest.cpp +++ b/generated/protocol-tests/tests/output/rest-json/tests/JsonListsTest.cpp @@ -23,9 +23,62 @@ AWS_PROTOCOL_TEST(JsonLists, RestJsonLists) { JsonListsRequest request; auto outcome = client.JsonLists(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const JsonListsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"stringList":["foo","bar"],"stringSet":["foo","bar"],"integerList":[1,2],"booleanList":[true,false],"timestampList":[1398796238,1398796238],"enumList":["Foo","0"],"intEnumList":[1,2],"nestedStringList":[["foo","bar"],["baz","qux"]],"structureList":[{"a":"1","b":"2"},{"a":"3","b":"4"}]} )" */ + const Aws::Vector& resultStringListItem = result.GetStringList(); + EXPECT_EQ(2U, resultStringListItem.size()); + EXPECT_EQ(R"(foo)", resultStringListItem.at(0)); + EXPECT_EQ(R"(bar)", resultStringListItem.at(1)); + const Aws::Vector& resultStringSetItem = result.GetStringSet(); + EXPECT_EQ(2U, resultStringSetItem.size()); + EXPECT_EQ(R"(foo)", resultStringSetItem.at(0)); + EXPECT_EQ(R"(bar)", resultStringSetItem.at(1)); + const Aws::Vector& resultIntegerListItem = result.GetIntegerList(); + EXPECT_EQ(2U, resultIntegerListItem.size()); + EXPECT_EQ(1, resultIntegerListItem.at(0)); + EXPECT_EQ(2, resultIntegerListItem.at(1)); + const Aws::Vector& resultBooleanListItem = result.GetBooleanList(); + EXPECT_EQ(2U, resultBooleanListItem.size()); + EXPECT_EQ(true, resultBooleanListItem.at(0)); + EXPECT_EQ(false, resultBooleanListItem.at(1)); + const Aws::Vector& resultTimestampListItem = result.GetTimestampList(); + EXPECT_EQ(2U, resultTimestampListItem.size()); + EXPECT_EQ(Aws::Utils::DateTime(1398796238L), resultTimestampListItem.at(0)); + EXPECT_EQ(Aws::Utils::DateTime(1398796238L), resultTimestampListItem.at(1)); + const Aws::Vector& resultEnumListItem = result.GetEnumList(); + EXPECT_EQ(2U, resultEnumListItem.size()); + EXPECT_EQ(FooEnumMapper::GetFooEnumForName(R"e(Foo)e"), resultEnumListItem.at(0)); + EXPECT_EQ(FooEnumMapper::GetFooEnumForName(R"e(0)e"), resultEnumListItem.at(1)); + const Aws::Vector& resultIntEnumListItem = result.GetIntEnumList(); + EXPECT_EQ(2U, resultIntEnumListItem.size()); + EXPECT_EQ(1, resultIntEnumListItem.at(0)); + EXPECT_EQ(2, resultIntEnumListItem.at(1)); + EXPECT_EQ(2U, result.GetNestedStringList().size()); + { + const Aws::Vector& resultNestedStringListItem = result.GetNestedStringList().at(0); + EXPECT_EQ(2U, resultNestedStringListItem.size()); + EXPECT_EQ(R"(foo)", resultNestedStringListItem.at(0)); + EXPECT_EQ(R"(bar)", resultNestedStringListItem.at(1)); + } + { + const Aws::Vector& resultNestedStringListItem = result.GetNestedStringList().at(1); + EXPECT_EQ(2U, resultNestedStringListItem.size()); + EXPECT_EQ(R"(baz)", resultNestedStringListItem.at(0)); + EXPECT_EQ(R"(qux)", resultNestedStringListItem.at(1)); + } + EXPECT_EQ(2U, result.GetStructureList().size()); + { + const StructureListMember& resultStructureListItem = result.GetStructureList().at(0); + EXPECT_EQ(R"(1)", resultStructureListItem.GetA()); + EXPECT_EQ(R"(2)", resultStructureListItem.GetB()); + } + { + const StructureListMember& resultStructureListItem = result.GetStructureList().at(1); + EXPECT_EQ(R"(3)", resultStructureListItem.GetA()); + EXPECT_EQ(R"(4)", resultStructureListItem.GetB()); + } } AWS_PROTOCOL_TEST(JsonLists, RestJsonListsEmpty) { @@ -40,7 +93,10 @@ AWS_PROTOCOL_TEST(JsonLists, RestJsonListsEmpty) { JsonListsRequest request; auto outcome = client.JsonLists(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const JsonListsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"stringList":[]} )" */ + const Aws::Vector& resultStringListItem = result.GetStringList(); + EXPECT_EQ(0U, resultStringListItem.size()); } diff --git a/generated/protocol-tests/tests/output/rest-json/tests/JsonMapsTest.cpp b/generated/protocol-tests/tests/output/rest-json/tests/JsonMapsTest.cpp index 62ba4ac0540..379b240a260 100644 --- a/generated/protocol-tests/tests/output/rest-json/tests/JsonMapsTest.cpp +++ b/generated/protocol-tests/tests/output/rest-json/tests/JsonMapsTest.cpp @@ -23,9 +23,22 @@ AWS_PROTOCOL_TEST(JsonMaps, RestJsonJsonMaps) { JsonMapsRequest request; auto outcome = client.JsonMaps(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const JsonMapsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"denseStructMap":{"foo":{"hi":"there"},"baz":{"hi":"bye"}}} )" */ + const Aws::Map& resultDenseStructMap = result.GetDenseStructMap(); + EXPECT_EQ(2U, resultDenseStructMap.size()); + { + EXPECT_TRUE(resultDenseStructMap.find("foo") != resultDenseStructMap.end()); + const GreetingStruct& resultDenseStructMapItem = resultDenseStructMap.at("foo"); + EXPECT_EQ(R"(there)", resultDenseStructMapItem.GetHi()); + } + { + EXPECT_TRUE(resultDenseStructMap.find("baz") != resultDenseStructMap.end()); + const GreetingStruct& resultDenseStructMapItem = resultDenseStructMap.at("baz"); + EXPECT_EQ(R"(bye)", resultDenseStructMapItem.GetHi()); + } } AWS_PROTOCOL_TEST(JsonMaps, RestJsonDeserializesZeroValuesInMaps) { @@ -40,9 +53,18 @@ AWS_PROTOCOL_TEST(JsonMaps, RestJsonDeserializesZeroValuesInMaps) { JsonMapsRequest request; auto outcome = client.JsonMaps(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const JsonMapsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"denseNumberMap":{"x":0},"denseBooleanMap":{"x":false}} )" */ + const Aws::Map& resultDenseNumberMap = result.GetDenseNumberMap(); + EXPECT_EQ(1U, resultDenseNumberMap.size()); + EXPECT_TRUE(resultDenseNumberMap.find("x") != resultDenseNumberMap.end()); + EXPECT_EQ(0, resultDenseNumberMap.at("x")); + const Aws::Map& resultDenseBooleanMap = result.GetDenseBooleanMap(); + EXPECT_EQ(1U, resultDenseBooleanMap.size()); + EXPECT_TRUE(resultDenseBooleanMap.find("x") != resultDenseBooleanMap.end()); + EXPECT_EQ(false, resultDenseBooleanMap.at("x")); } AWS_PROTOCOL_TEST(JsonMaps, RestJsonDeserializesDenseSetMap) { @@ -57,9 +79,24 @@ AWS_PROTOCOL_TEST(JsonMaps, RestJsonDeserializesDenseSetMap) { JsonMapsRequest request; auto outcome = client.JsonMaps(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const JsonMapsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"denseSetMap":{"x":[],"y":["a","b"]}} )" */ + const Aws::Map>& resultDenseSetMap = result.GetDenseSetMap(); + EXPECT_EQ(2U, resultDenseSetMap.size()); + EXPECT_TRUE(resultDenseSetMap.find("x") != resultDenseSetMap.end()); + { + const Aws::Vector& resultDenseSetMapItem = resultDenseSetMap.at("x"); + EXPECT_EQ(0U, resultDenseSetMapItem.size()); + } + EXPECT_TRUE(resultDenseSetMap.find("y") != resultDenseSetMap.end()); + { + const Aws::Vector& resultDenseSetMapItem = resultDenseSetMap.at("y"); + EXPECT_EQ(2U, resultDenseSetMapItem.size()); + EXPECT_EQ(R"(a)", resultDenseSetMapItem.at(0)); + EXPECT_EQ(R"(b)", resultDenseSetMapItem.at(1)); + } } AWS_PROTOCOL_TEST(JsonMaps, RestJsonDeserializesDenseSetMapAndSkipsNull) { @@ -74,7 +111,22 @@ AWS_PROTOCOL_TEST(JsonMaps, RestJsonDeserializesDenseSetMapAndSkipsNull) { JsonMapsRequest request; auto outcome = client.JsonMaps(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const JsonMapsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"denseSetMap":{"x":[],"y":["a","b"]}} )" */ + const Aws::Map>& resultDenseSetMap = result.GetDenseSetMap(); + EXPECT_EQ(2U, resultDenseSetMap.size()); + EXPECT_TRUE(resultDenseSetMap.find("x") != resultDenseSetMap.end()); + { + const Aws::Vector& resultDenseSetMapItem = resultDenseSetMap.at("x"); + EXPECT_EQ(0U, resultDenseSetMapItem.size()); + } + EXPECT_TRUE(resultDenseSetMap.find("y") != resultDenseSetMap.end()); + { + const Aws::Vector& resultDenseSetMapItem = resultDenseSetMap.at("y"); + EXPECT_EQ(2U, resultDenseSetMapItem.size()); + EXPECT_EQ(R"(a)", resultDenseSetMapItem.at(0)); + EXPECT_EQ(R"(b)", resultDenseSetMapItem.at(1)); + } } diff --git a/generated/protocol-tests/tests/output/rest-json/tests/JsonTimestampsTest.cpp b/generated/protocol-tests/tests/output/rest-json/tests/JsonTimestampsTest.cpp index 827e843e407..0f9d87f1ed0 100644 --- a/generated/protocol-tests/tests/output/rest-json/tests/JsonTimestampsTest.cpp +++ b/generated/protocol-tests/tests/output/rest-json/tests/JsonTimestampsTest.cpp @@ -23,9 +23,11 @@ AWS_PROTOCOL_TEST(JsonTimestamps, RestJsonJsonTimestamps) { JsonTimestampsRequest request; auto outcome = client.JsonTimestamps(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const JsonTimestampsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"normal":1398796238} )" */ + EXPECT_EQ(Aws::Utils::DateTime(1398796238L), result.GetNormal()); } AWS_PROTOCOL_TEST(JsonTimestamps, RestJsonJsonTimestampsWithDateTimeFormat) { @@ -40,9 +42,11 @@ AWS_PROTOCOL_TEST(JsonTimestamps, RestJsonJsonTimestampsWithDateTimeFormat) { JsonTimestampsRequest request; auto outcome = client.JsonTimestamps(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const JsonTimestampsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"dateTime":1398796238} )" */ + EXPECT_EQ(Aws::Utils::DateTime(1398796238L), result.GetDateTime()); } AWS_PROTOCOL_TEST(JsonTimestamps, RestJsonJsonTimestampsWithDateTimeOnTargetFormat) { @@ -57,9 +61,11 @@ AWS_PROTOCOL_TEST(JsonTimestamps, RestJsonJsonTimestampsWithDateTimeOnTargetForm JsonTimestampsRequest request; auto outcome = client.JsonTimestamps(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const JsonTimestampsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"dateTimeOnTarget":1398796238} )" */ + EXPECT_EQ(Aws::Utils::DateTime(1398796238L), result.GetDateTimeOnTarget()); } AWS_PROTOCOL_TEST(JsonTimestamps, RestJsonJsonTimestampsWithEpochSecondsFormat) { @@ -74,9 +80,11 @@ AWS_PROTOCOL_TEST(JsonTimestamps, RestJsonJsonTimestampsWithEpochSecondsFormat) JsonTimestampsRequest request; auto outcome = client.JsonTimestamps(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const JsonTimestampsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"epochSeconds":1398796238} )" */ + EXPECT_EQ(Aws::Utils::DateTime(1398796238L), result.GetEpochSeconds()); } AWS_PROTOCOL_TEST(JsonTimestamps, RestJsonJsonTimestampsWithEpochSecondsOnTargetFormat) { @@ -91,9 +99,11 @@ AWS_PROTOCOL_TEST(JsonTimestamps, RestJsonJsonTimestampsWithEpochSecondsOnTarget JsonTimestampsRequest request; auto outcome = client.JsonTimestamps(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const JsonTimestampsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"epochSecondsOnTarget":1398796238} )" */ + EXPECT_EQ(Aws::Utils::DateTime(1398796238L), result.GetEpochSecondsOnTarget()); } AWS_PROTOCOL_TEST(JsonTimestamps, RestJsonJsonTimestampsWithHttpDateFormat) { @@ -108,9 +118,11 @@ AWS_PROTOCOL_TEST(JsonTimestamps, RestJsonJsonTimestampsWithHttpDateFormat) { JsonTimestampsRequest request; auto outcome = client.JsonTimestamps(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const JsonTimestampsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"httpDate":1398796238} )" */ + EXPECT_EQ(Aws::Utils::DateTime(1398796238L), result.GetHttpDate()); } AWS_PROTOCOL_TEST(JsonTimestamps, RestJsonJsonTimestampsWithHttpDateOnTargetFormat) { @@ -125,7 +137,9 @@ AWS_PROTOCOL_TEST(JsonTimestamps, RestJsonJsonTimestampsWithHttpDateOnTargetForm JsonTimestampsRequest request; auto outcome = client.JsonTimestamps(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const JsonTimestampsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"httpDateOnTarget":1398796238} )" */ + EXPECT_EQ(Aws::Utils::DateTime(1398796238L), result.GetHttpDateOnTarget()); } diff --git a/generated/protocol-tests/tests/output/rest-json/tests/JsonUnionsTest.cpp b/generated/protocol-tests/tests/output/rest-json/tests/JsonUnionsTest.cpp index 9d391741a02..a9ad7f87a7e 100644 --- a/generated/protocol-tests/tests/output/rest-json/tests/JsonUnionsTest.cpp +++ b/generated/protocol-tests/tests/output/rest-json/tests/JsonUnionsTest.cpp @@ -23,9 +23,14 @@ AWS_PROTOCOL_TEST(JsonUnions, RestJsonDeserializeStringUnionValue) { JsonUnionsRequest request; auto outcome = client.JsonUnions(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const JsonUnionsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"contents":{"stringValue":"foo"}} )" */ + { + const MyUnion& resultContents = result.GetContents(); + EXPECT_EQ(R"(foo)", resultContents.GetStringValue()); + } } AWS_PROTOCOL_TEST(JsonUnions, RestJsonDeserializeBooleanUnionValue) { @@ -40,9 +45,14 @@ AWS_PROTOCOL_TEST(JsonUnions, RestJsonDeserializeBooleanUnionValue) { JsonUnionsRequest request; auto outcome = client.JsonUnions(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const JsonUnionsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"contents":{"booleanValue":true}} )" */ + { + const MyUnion& resultContents = result.GetContents(); + EXPECT_EQ(true, resultContents.GetBooleanValue()); + } } AWS_PROTOCOL_TEST(JsonUnions, RestJsonDeserializeNumberUnionValue) { @@ -57,9 +67,14 @@ AWS_PROTOCOL_TEST(JsonUnions, RestJsonDeserializeNumberUnionValue) { JsonUnionsRequest request; auto outcome = client.JsonUnions(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const JsonUnionsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"contents":{"numberValue":1}} )" */ + { + const MyUnion& resultContents = result.GetContents(); + EXPECT_EQ(1, resultContents.GetNumberValue()); + } } AWS_PROTOCOL_TEST(JsonUnions, RestJsonDeserializeBlobUnionValue) { @@ -74,9 +89,14 @@ AWS_PROTOCOL_TEST(JsonUnions, RestJsonDeserializeBlobUnionValue) { JsonUnionsRequest request; auto outcome = client.JsonUnions(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const JsonUnionsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"contents":{"blobValue":"foo"}} )" */ + { + const MyUnion& resultContents = result.GetContents(); + EXPECT_EQ(Aws::Utils::ByteBuffer(R"(foo)"), resultContents.GetBlobValue()); + } } AWS_PROTOCOL_TEST(JsonUnions, RestJsonDeserializeTimestampUnionValue) { @@ -91,9 +111,14 @@ AWS_PROTOCOL_TEST(JsonUnions, RestJsonDeserializeTimestampUnionValue) { JsonUnionsRequest request; auto outcome = client.JsonUnions(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const JsonUnionsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"contents":{"timestampValue":1398796238}} )" */ + { + const MyUnion& resultContents = result.GetContents(); + EXPECT_EQ(Aws::Utils::DateTime(1398796238L), resultContents.GetTimestampValue()); + } } AWS_PROTOCOL_TEST(JsonUnions, RestJsonDeserializeEnumUnionValue) { @@ -108,9 +133,14 @@ AWS_PROTOCOL_TEST(JsonUnions, RestJsonDeserializeEnumUnionValue) { JsonUnionsRequest request; auto outcome = client.JsonUnions(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const JsonUnionsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"contents":{"enumValue":"Foo"}} )" */ + { + const MyUnion& resultContents = result.GetContents(); + EXPECT_EQ(FooEnumMapper::GetFooEnumForName(R"e(Foo)e"), resultContents.GetEnumValue()); + } } AWS_PROTOCOL_TEST(JsonUnions, RestJsonDeserializeListUnionValue) { @@ -125,9 +155,17 @@ AWS_PROTOCOL_TEST(JsonUnions, RestJsonDeserializeListUnionValue) { JsonUnionsRequest request; auto outcome = client.JsonUnions(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const JsonUnionsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"contents":{"listValue":["foo","bar"]}} )" */ + { + const MyUnion& resultContents = result.GetContents(); + const Aws::Vector& resultContentsListValueItem = resultContents.GetListValue(); + EXPECT_EQ(2U, resultContentsListValueItem.size()); + EXPECT_EQ(R"(foo)", resultContentsListValueItem.at(0)); + EXPECT_EQ(R"(bar)", resultContentsListValueItem.at(1)); + } } AWS_PROTOCOL_TEST(JsonUnions, RestJsonDeserializeMapUnionValue) { @@ -142,9 +180,19 @@ AWS_PROTOCOL_TEST(JsonUnions, RestJsonDeserializeMapUnionValue) { JsonUnionsRequest request; auto outcome = client.JsonUnions(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const JsonUnionsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"contents":{"mapValue":{"foo":"bar","spam":"eggs"}}} )" */ + { + const MyUnion& resultContents = result.GetContents(); + const Aws::Map& resultContentsMapValue = resultContents.GetMapValue(); + EXPECT_EQ(2U, resultContentsMapValue.size()); + EXPECT_TRUE(resultContentsMapValue.find("foo") != resultContentsMapValue.end()); + EXPECT_EQ(R"(bar)", resultContentsMapValue.at("foo")); + EXPECT_TRUE(resultContentsMapValue.find("spam") != resultContentsMapValue.end()); + EXPECT_EQ(R"(eggs)", resultContentsMapValue.at("spam")); + } } AWS_PROTOCOL_TEST(JsonUnions, RestJsonDeserializeStructureUnionValue) { @@ -159,9 +207,17 @@ AWS_PROTOCOL_TEST(JsonUnions, RestJsonDeserializeStructureUnionValue) { JsonUnionsRequest request; auto outcome = client.JsonUnions(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const JsonUnionsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"contents":{"structureValue":{"hi":"hello"}}} )" */ + { + const MyUnion& resultContents = result.GetContents(); + { + const GreetingStruct& resultContentsStructureValue = resultContents.GetStructureValue(); + EXPECT_EQ(R"(hello)", resultContentsStructureValue.GetHi()); + } + } } AWS_PROTOCOL_TEST(JsonUnions, RestJsonDeserializeIgnoreType) { @@ -176,7 +232,15 @@ AWS_PROTOCOL_TEST(JsonUnions, RestJsonDeserializeIgnoreType) { JsonUnionsRequest request; auto outcome = client.JsonUnions(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const JsonUnionsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"contents":{"structureValue":{"hi":"hello"}}} )" */ + { + const MyUnion& resultContents = result.GetContents(); + { + const GreetingStruct& resultContentsStructureValue = resultContents.GetStructureValue(); + EXPECT_EQ(R"(hello)", resultContentsStructureValue.GetHi()); + } + } } diff --git a/generated/protocol-tests/tests/output/rest-json/tests/MediaTypeHeaderTest.cpp b/generated/protocol-tests/tests/output/rest-json/tests/MediaTypeHeaderTest.cpp index ac1bf15891a..14423c95d3a 100644 --- a/generated/protocol-tests/tests/output/rest-json/tests/MediaTypeHeaderTest.cpp +++ b/generated/protocol-tests/tests/output/rest-json/tests/MediaTypeHeaderTest.cpp @@ -22,7 +22,9 @@ AWS_PROTOCOL_TEST(MediaTypeHeader, MediaTypeHeaderOutputBase64) { MediaTypeHeaderRequest request; auto outcome = client.MediaTypeHeader(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const MediaTypeHeaderResult& result = outcome.GetResult(); + /* expectedResult = R"( {"json":"true"} )" */ + EXPECT_EQ(R"(true)", result.GetJson()); } diff --git a/generated/protocol-tests/tests/output/rest-json/tests/NoInputAndNoOutputTest.cpp b/generated/protocol-tests/tests/output/rest-json/tests/NoInputAndNoOutputTest.cpp index 0359081f2bb..9996ff223cd 100644 --- a/generated/protocol-tests/tests/output/rest-json/tests/NoInputAndNoOutputTest.cpp +++ b/generated/protocol-tests/tests/output/rest-json/tests/NoInputAndNoOutputTest.cpp @@ -21,7 +21,7 @@ AWS_PROTOCOL_TEST(NoInputAndNoOutput, RestJsonNoInputAndNoOutput) { NoInputAndNoOutputRequest request; auto outcome = client.NoInputAndNoOutput(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + /* expectedResult = R"( {} )" */ } diff --git a/generated/protocol-tests/tests/output/rest-json/tests/NoInputAndOutputTest.cpp b/generated/protocol-tests/tests/output/rest-json/tests/NoInputAndOutputTest.cpp index c7e8ca033a9..3970b82cedc 100644 --- a/generated/protocol-tests/tests/output/rest-json/tests/NoInputAndOutputTest.cpp +++ b/generated/protocol-tests/tests/output/rest-json/tests/NoInputAndOutputTest.cpp @@ -23,9 +23,9 @@ AWS_PROTOCOL_TEST(NoInputAndOutput, RestJsonNoInputAndOutputWithJson) { NoInputAndOutputRequest request; auto outcome = client.NoInputAndOutput(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + /* expectedResult = R"( {} )" */ } AWS_PROTOCOL_TEST(NoInputAndOutput, RestJsonNoInputAndOutputNoPayload) { @@ -38,7 +38,7 @@ AWS_PROTOCOL_TEST(NoInputAndOutput, RestJsonNoInputAndOutputNoPayload) { NoInputAndOutputRequest request; auto outcome = client.NoInputAndOutput(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + /* expectedResult = R"( {} )" */ } diff --git a/generated/protocol-tests/tests/output/rest-json/tests/PostUnionWithJsonNameTest.cpp b/generated/protocol-tests/tests/output/rest-json/tests/PostUnionWithJsonNameTest.cpp index fbcb487a6f1..105d22d9b4f 100644 --- a/generated/protocol-tests/tests/output/rest-json/tests/PostUnionWithJsonNameTest.cpp +++ b/generated/protocol-tests/tests/output/rest-json/tests/PostUnionWithJsonNameTest.cpp @@ -23,9 +23,14 @@ AWS_PROTOCOL_TEST(PostUnionWithJsonName, PostUnionWithJsonNameResponse1) { PostUnionWithJsonNameRequest request; auto outcome = client.PostUnionWithJsonName(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const PostUnionWithJsonNameResult& result = outcome.GetResult(); + /* expectedResult = R"( {"value":{"foo":"hi"}} )" */ + { + const UnionWithJsonName& resultValue = result.GetValue(); + EXPECT_EQ(R"(hi)", resultValue.GetFoo()); + } } AWS_PROTOCOL_TEST(PostUnionWithJsonName, PostUnionWithJsonNameResponse2) { @@ -40,9 +45,14 @@ AWS_PROTOCOL_TEST(PostUnionWithJsonName, PostUnionWithJsonNameResponse2) { PostUnionWithJsonNameRequest request; auto outcome = client.PostUnionWithJsonName(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const PostUnionWithJsonNameResult& result = outcome.GetResult(); + /* expectedResult = R"( {"value":{"baz":"hi"}} )" */ + { + const UnionWithJsonName& resultValue = result.GetValue(); + EXPECT_EQ(R"(hi)", resultValue.GetBaz()); + } } AWS_PROTOCOL_TEST(PostUnionWithJsonName, PostUnionWithJsonNameResponse3) { @@ -57,7 +67,12 @@ AWS_PROTOCOL_TEST(PostUnionWithJsonName, PostUnionWithJsonNameResponse3) { PostUnionWithJsonNameRequest request; auto outcome = client.PostUnionWithJsonName(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const PostUnionWithJsonNameResult& result = outcome.GetResult(); + /* expectedResult = R"( {"value":{"bar":"hi"}} )" */ + { + const UnionWithJsonName& resultValue = result.GetValue(); + EXPECT_EQ(R"(hi)", resultValue.GetBar()); + } } diff --git a/generated/protocol-tests/tests/output/rest-json/tests/RecursiveShapesTest.cpp b/generated/protocol-tests/tests/output/rest-json/tests/RecursiveShapesTest.cpp index bc32a21a0dd..d6a062be84f 100644 --- a/generated/protocol-tests/tests/output/rest-json/tests/RecursiveShapesTest.cpp +++ b/generated/protocol-tests/tests/output/rest-json/tests/RecursiveShapesTest.cpp @@ -5,6 +5,7 @@ #include #include #include +#include #include #include @@ -24,7 +25,24 @@ AWS_PROTOCOL_TEST(RecursiveShapes, RestJsonRecursiveShapes) { RecursiveShapesRequest request; auto outcome = client.RecursiveShapes(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const RecursiveShapesResult& result = outcome.GetResult(); + /* expectedResult = R"( {"nested":{"foo":"Foo1","nested":{"bar":"Bar1","recursiveMember":{"foo":"Foo2","nested":{"bar":"Bar2"}}}}} )" */ + { + const RecursiveShapesInputOutputNested1& resultNested = result.GetNested(); + EXPECT_EQ(R"(Foo1)", resultNested.GetFoo()); + { + const RecursiveShapesInputOutputNested2& resultNestedNested = resultNested.GetNested(); + EXPECT_EQ(R"(Bar1)", resultNestedNested.GetBar()); + { + const RecursiveShapesInputOutputNested1& resultNestedNestedRecursiveMember = resultNestedNested.GetRecursiveMember(); + EXPECT_EQ(R"(Foo2)", resultNestedNestedRecursiveMember.GetFoo()); + { + const RecursiveShapesInputOutputNested2& resultNestedNestedRecursiveMemberNested = resultNestedNestedRecursiveMember.GetNested(); + EXPECT_EQ(R"(Bar2)", resultNestedNestedRecursiveMemberNested.GetBar()); + } + } + } + } } diff --git a/generated/protocol-tests/tests/output/rest-json/tests/SimpleScalarPropertiesTest.cpp b/generated/protocol-tests/tests/output/rest-json/tests/SimpleScalarPropertiesTest.cpp index 0eb8fa69f13..5ac6fc0cdbe 100644 --- a/generated/protocol-tests/tests/output/rest-json/tests/SimpleScalarPropertiesTest.cpp +++ b/generated/protocol-tests/tests/output/rest-json/tests/SimpleScalarPropertiesTest.cpp @@ -23,9 +23,20 @@ AWS_PROTOCOL_TEST(SimpleScalarProperties, RestJsonSimpleScalarProperties) { SimpleScalarPropertiesRequest request; auto outcome = client.SimpleScalarProperties(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const SimpleScalarPropertiesResult& result = outcome.GetResult(); + /* expectedResult = R"( {"foo":"Foo","stringValue":"string","trueBooleanValue":true,"falseBooleanValue":false,"byteValue":1,"shortValue":2,"integerValue":3,"longValue":4,"floatValue":5.5,"doubleValue":6.5} )" */ + EXPECT_EQ(R"(Foo)", result.GetFoo()); + EXPECT_EQ(R"(string)", result.GetStringValue()); + EXPECT_EQ(true, result.GetTrueBooleanValue()); + EXPECT_EQ(false, result.GetFalseBooleanValue()); + EXPECT_EQ(1, result.GetByteValue()); + EXPECT_EQ(2, result.GetShortValue()); + EXPECT_EQ(3, result.GetIntegerValue()); + EXPECT_EQ(4, result.GetLongValue()); + EXPECT_EQ(5.5, result.GetFloatValue()); + EXPECT_EQ(6.5, result.GetDoubleValue()); } AWS_PROTOCOL_TEST(SimpleScalarProperties, RestJsonDoesntDeserializeNullStructureValues) { @@ -40,9 +51,9 @@ AWS_PROTOCOL_TEST(SimpleScalarProperties, RestJsonDoesntDeserializeNullStructure SimpleScalarPropertiesRequest request; auto outcome = client.SimpleScalarProperties(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + /* expectedResult = R"( {} )" */ } AWS_PROTOCOL_TEST(SimpleScalarProperties, RestJsonSupportsNaNFloatInputs) { @@ -57,9 +68,12 @@ AWS_PROTOCOL_TEST(SimpleScalarProperties, RestJsonSupportsNaNFloatInputs) { SimpleScalarPropertiesRequest request; auto outcome = client.SimpleScalarProperties(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const SimpleScalarPropertiesResult& result = outcome.GetResult(); + /* expectedResult = R"( {"floatValue":"NaN","doubleValue":"NaN"} )" */ + EXPECT_EQ(std::numeric_limits::quiet_NaN(), result.GetFloatValue()); + EXPECT_EQ(std::numeric_limits::quiet_NaN(), result.GetDoubleValue()); } AWS_PROTOCOL_TEST(SimpleScalarProperties, RestJsonSupportsInfinityFloatInputs) { @@ -74,9 +88,12 @@ AWS_PROTOCOL_TEST(SimpleScalarProperties, RestJsonSupportsInfinityFloatInputs) { SimpleScalarPropertiesRequest request; auto outcome = client.SimpleScalarProperties(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const SimpleScalarPropertiesResult& result = outcome.GetResult(); + /* expectedResult = R"( {"floatValue":"Infinity","doubleValue":"Infinity"} )" */ + EXPECT_EQ(std::numeric_limits::infinity(), result.GetFloatValue()); + EXPECT_EQ(std::numeric_limits::infinity(), result.GetDoubleValue()); } AWS_PROTOCOL_TEST(SimpleScalarProperties, RestJsonSupportsNegativeInfinityFloatInputs) { @@ -91,7 +108,10 @@ AWS_PROTOCOL_TEST(SimpleScalarProperties, RestJsonSupportsNegativeInfinityFloatI SimpleScalarPropertiesRequest request; auto outcome = client.SimpleScalarProperties(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const SimpleScalarPropertiesResult& result = outcome.GetResult(); + /* expectedResult = R"( {"floatValue":"-Infinity","doubleValue":"-Infinity"} )" */ + EXPECT_EQ(-std::numeric_limits::infinity(), result.GetFloatValue()); + EXPECT_EQ(-std::numeric_limits::infinity(), result.GetDoubleValue()); } diff --git a/generated/protocol-tests/tests/output/rest-json/tests/TimestampFormatHeadersTest.cpp b/generated/protocol-tests/tests/output/rest-json/tests/TimestampFormatHeadersTest.cpp index 509dfbf5615..d3422d1660e 100644 --- a/generated/protocol-tests/tests/output/rest-json/tests/TimestampFormatHeadersTest.cpp +++ b/generated/protocol-tests/tests/output/rest-json/tests/TimestampFormatHeadersTest.cpp @@ -22,7 +22,15 @@ AWS_PROTOCOL_TEST(TimestampFormatHeaders, RestJsonTimestampFormatHeaders) { TimestampFormatHeadersRequest request; auto outcome = client.TimestampFormatHeaders(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const TimestampFormatHeadersResult& result = outcome.GetResult(); + /* expectedResult = R"( {"memberEpochSeconds":1576540098,"memberHttpDate":1576540098,"memberDateTime":1576540098,"defaultFormat":1576540098,"targetEpochSeconds":1576540098,"targetHttpDate":1576540098,"targetDateTime":1576540098} )" */ + EXPECT_EQ(Aws::Utils::DateTime(1576540098L), result.GetMemberEpochSeconds()); + EXPECT_EQ(Aws::Utils::DateTime(1576540098L), result.GetMemberHttpDate()); + EXPECT_EQ(Aws::Utils::DateTime(1576540098L), result.GetMemberDateTime()); + EXPECT_EQ(Aws::Utils::DateTime(1576540098L), result.GetDefaultFormat()); + EXPECT_EQ(Aws::Utils::DateTime(1576540098L), result.GetTargetEpochSeconds()); + EXPECT_EQ(Aws::Utils::DateTime(1576540098L), result.GetTargetHttpDate()); + EXPECT_EQ(Aws::Utils::DateTime(1576540098L), result.GetTargetDateTime()); } diff --git a/generated/protocol-tests/tests/output/rest-json/tests/UnitInputAndOutputTest.cpp b/generated/protocol-tests/tests/output/rest-json/tests/UnitInputAndOutputTest.cpp index a62094aba00..66319aed6ab 100644 --- a/generated/protocol-tests/tests/output/rest-json/tests/UnitInputAndOutputTest.cpp +++ b/generated/protocol-tests/tests/output/rest-json/tests/UnitInputAndOutputTest.cpp @@ -21,7 +21,7 @@ AWS_PROTOCOL_TEST(UnitInputAndOutput, RestJsonUnitInputAndOutputNoOutput) { UnitInputAndOutputRequest request; auto outcome = client.UnitInputAndOutput(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + /* expectedResult = R"( {} )" */ } diff --git a/generated/protocol-tests/tests/output/rest-xml/tests/BodyWithXmlNameTest.cpp b/generated/protocol-tests/tests/output/rest-xml/tests/BodyWithXmlNameTest.cpp index 05e8a774266..163fb047454 100644 --- a/generated/protocol-tests/tests/output/rest-xml/tests/BodyWithXmlNameTest.cpp +++ b/generated/protocol-tests/tests/output/rest-xml/tests/BodyWithXmlNameTest.cpp @@ -23,7 +23,12 @@ AWS_PROTOCOL_TEST(BodyWithXmlName, BodyWithXmlName) { BodyWithXmlNameRequest request; auto outcome = client.BodyWithXmlName(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const BodyWithXmlNameResult& result = outcome.GetResult(); + /* expectedResult = R"( {"nested":{"name":"Phreddy"}} )" */ + { + const PayloadWithXmlName& resultNested = result.GetNested(); + EXPECT_EQ(R"(Phreddy)", resultNested.GetName()); + } } diff --git a/generated/protocol-tests/tests/output/rest-xml/tests/DatetimeOffsetsTest.cpp b/generated/protocol-tests/tests/output/rest-xml/tests/DatetimeOffsetsTest.cpp index 09f91f26935..39379164106 100644 --- a/generated/protocol-tests/tests/output/rest-xml/tests/DatetimeOffsetsTest.cpp +++ b/generated/protocol-tests/tests/output/rest-xml/tests/DatetimeOffsetsTest.cpp @@ -23,9 +23,11 @@ AWS_PROTOCOL_TEST(DatetimeOffsets, RestXmlDateTimeWithNegativeOffset) { DatetimeOffsetsRequest request; auto outcome = client.DatetimeOffsets(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const DatetimeOffsetsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"datetime":1576540098} )" */ + EXPECT_EQ(Aws::Utils::DateTime(1576540098L), result.GetDatetime()); } AWS_PROTOCOL_TEST(DatetimeOffsets, RestXmlDateTimeWithPositiveOffset) { @@ -40,7 +42,9 @@ AWS_PROTOCOL_TEST(DatetimeOffsets, RestXmlDateTimeWithPositiveOffset) { DatetimeOffsetsRequest request; auto outcome = client.DatetimeOffsets(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const DatetimeOffsetsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"datetime":1576540098} )" */ + EXPECT_EQ(Aws::Utils::DateTime(1576540098L), result.GetDatetime()); } diff --git a/generated/protocol-tests/tests/output/rest-xml/tests/EmptyInputAndEmptyOutputTest.cpp b/generated/protocol-tests/tests/output/rest-xml/tests/EmptyInputAndEmptyOutputTest.cpp index ea8a1a7dc6b..be4d6448dcf 100644 --- a/generated/protocol-tests/tests/output/rest-xml/tests/EmptyInputAndEmptyOutputTest.cpp +++ b/generated/protocol-tests/tests/output/rest-xml/tests/EmptyInputAndEmptyOutputTest.cpp @@ -21,7 +21,7 @@ AWS_PROTOCOL_TEST(EmptyInputAndEmptyOutput, EmptyInputAndEmptyOutput) { EmptyInputAndEmptyOutputRequest request; auto outcome = client.EmptyInputAndEmptyOutput(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + /* expectedResult = R"( {} )" */ } diff --git a/generated/protocol-tests/tests/output/rest-xml/tests/FlattenedXmlMapTest.cpp b/generated/protocol-tests/tests/output/rest-xml/tests/FlattenedXmlMapTest.cpp index 83693c4557d..1dacffbdabc 100644 --- a/generated/protocol-tests/tests/output/rest-xml/tests/FlattenedXmlMapTest.cpp +++ b/generated/protocol-tests/tests/output/rest-xml/tests/FlattenedXmlMapTest.cpp @@ -23,7 +23,14 @@ AWS_PROTOCOL_TEST(FlattenedXmlMap, FlattenedXmlMap) { FlattenedXmlMapRequest request; auto outcome = client.FlattenedXmlMap(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const FlattenedXmlMapResult& result = outcome.GetResult(); + /* expectedResult = R"( {"myMap":{"foo":"Foo","baz":"Baz"}} )" */ + const Aws::Map& resultMyMap = result.GetMyMap(); + EXPECT_EQ(2U, resultMyMap.size()); + EXPECT_TRUE(resultMyMap.find("foo") != resultMyMap.end()); + EXPECT_EQ(FooEnumMapper::GetFooEnumForName(R"e(Foo)e"), resultMyMap.at("foo")); + EXPECT_TRUE(resultMyMap.find("baz") != resultMyMap.end()); + EXPECT_EQ(FooEnumMapper::GetFooEnumForName(R"e(Baz)e"), resultMyMap.at("baz")); } diff --git a/generated/protocol-tests/tests/output/rest-xml/tests/FlattenedXmlMapWithXmlNameTest.cpp b/generated/protocol-tests/tests/output/rest-xml/tests/FlattenedXmlMapWithXmlNameTest.cpp index 39b771ad464..b6d201a1694 100644 --- a/generated/protocol-tests/tests/output/rest-xml/tests/FlattenedXmlMapWithXmlNameTest.cpp +++ b/generated/protocol-tests/tests/output/rest-xml/tests/FlattenedXmlMapWithXmlNameTest.cpp @@ -23,7 +23,14 @@ AWS_PROTOCOL_TEST(FlattenedXmlMapWithXmlName, FlattenedXmlMapWithXmlName) { FlattenedXmlMapWithXmlNameRequest request; auto outcome = client.FlattenedXmlMapWithXmlName(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const FlattenedXmlMapWithXmlNameResult& result = outcome.GetResult(); + /* expectedResult = R"( {"myMap":{"a":"A","b":"B"}} )" */ + const Aws::Map& resultMyMap = result.GetMyMap(); + EXPECT_EQ(2U, resultMyMap.size()); + EXPECT_TRUE(resultMyMap.find("a") != resultMyMap.end()); + EXPECT_EQ(R"(A)", resultMyMap.at("a")); + EXPECT_TRUE(resultMyMap.find("b") != resultMyMap.end()); + EXPECT_EQ(R"(B)", resultMyMap.at("b")); } diff --git a/generated/protocol-tests/tests/output/rest-xml/tests/FlattenedXmlMapWithXmlNamespaceTest.cpp b/generated/protocol-tests/tests/output/rest-xml/tests/FlattenedXmlMapWithXmlNamespaceTest.cpp index 9bdd9af2696..9d161ffa872 100644 --- a/generated/protocol-tests/tests/output/rest-xml/tests/FlattenedXmlMapWithXmlNamespaceTest.cpp +++ b/generated/protocol-tests/tests/output/rest-xml/tests/FlattenedXmlMapWithXmlNamespaceTest.cpp @@ -23,7 +23,14 @@ AWS_PROTOCOL_TEST(FlattenedXmlMapWithXmlNamespace, RestXmlFlattenedXmlMapWithXml FlattenedXmlMapWithXmlNamespaceRequest request; auto outcome = client.FlattenedXmlMapWithXmlNamespace(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const FlattenedXmlMapWithXmlNamespaceResult& result = outcome.GetResult(); + /* expectedResult = R"( {"myMap":{"a":"A","b":"B"}} )" */ + const Aws::Map& resultMyMap = result.GetMyMap(); + EXPECT_EQ(2U, resultMyMap.size()); + EXPECT_TRUE(resultMyMap.find("a") != resultMyMap.end()); + EXPECT_EQ(R"(A)", resultMyMap.at("a")); + EXPECT_TRUE(resultMyMap.find("b") != resultMyMap.end()); + EXPECT_EQ(R"(B)", resultMyMap.at("b")); } diff --git a/generated/protocol-tests/tests/output/rest-xml/tests/FractionalSecondsTest.cpp b/generated/protocol-tests/tests/output/rest-xml/tests/FractionalSecondsTest.cpp index a2e492c0f2b..63f34272e94 100644 --- a/generated/protocol-tests/tests/output/rest-xml/tests/FractionalSecondsTest.cpp +++ b/generated/protocol-tests/tests/output/rest-xml/tests/FractionalSecondsTest.cpp @@ -23,7 +23,9 @@ AWS_PROTOCOL_TEST(FractionalSeconds, RestXmlDateTimeWithFractionalSeconds) { FractionalSecondsRequest request; auto outcome = client.FractionalSeconds(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const FractionalSecondsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"datetime":9.46845296123E8} )" */ + EXPECT_EQ(Aws::Utils::DateTime(9.46845296123E8), result.GetDatetime()); } diff --git a/generated/protocol-tests/tests/output/rest-xml/tests/GreetingWithErrors0Test.cpp b/generated/protocol-tests/tests/output/rest-xml/tests/GreetingWithErrors0Test.cpp index 8c7b71d4e80..23f21e1e677 100644 --- a/generated/protocol-tests/tests/output/rest-xml/tests/GreetingWithErrors0Test.cpp +++ b/generated/protocol-tests/tests/output/rest-xml/tests/GreetingWithErrors0Test.cpp @@ -23,7 +23,6 @@ AWS_PROTOCOL_TEST(GreetingWithErrors0, InvalidGreetingError) { GreetingWithErrorsRequest request; auto outcome = client.GreetingWithErrors(request); - ASSERT_FALSE(outcome.IsSuccess()); - ValidateRequestSent(); + ASSERT_FALSE(outcome.IsSuccess()); } diff --git a/generated/protocol-tests/tests/output/rest-xml/tests/GreetingWithErrors1Test.cpp b/generated/protocol-tests/tests/output/rest-xml/tests/GreetingWithErrors1Test.cpp index 632b8bb988c..d01c7b4e57c 100644 --- a/generated/protocol-tests/tests/output/rest-xml/tests/GreetingWithErrors1Test.cpp +++ b/generated/protocol-tests/tests/output/rest-xml/tests/GreetingWithErrors1Test.cpp @@ -23,7 +23,6 @@ AWS_PROTOCOL_TEST(GreetingWithErrors1, ComplexError) { GreetingWithErrorsRequest request; auto outcome = client.GreetingWithErrors(request); - ASSERT_FALSE(outcome.IsSuccess()); - ValidateRequestSent(); + ASSERT_FALSE(outcome.IsSuccess()); } diff --git a/generated/protocol-tests/tests/output/rest-xml/tests/GreetingWithErrorsTest.cpp b/generated/protocol-tests/tests/output/rest-xml/tests/GreetingWithErrorsTest.cpp index cce60ba4cbd..b53abe9c750 100644 --- a/generated/protocol-tests/tests/output/rest-xml/tests/GreetingWithErrorsTest.cpp +++ b/generated/protocol-tests/tests/output/rest-xml/tests/GreetingWithErrorsTest.cpp @@ -22,7 +22,9 @@ AWS_PROTOCOL_TEST(GreetingWithErrors, GreetingWithErrors) { GreetingWithErrorsRequest request; auto outcome = client.GreetingWithErrors(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const GreetingWithErrorsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"greeting":"Hello"} )" */ + EXPECT_EQ(R"(Hello)", result.GetGreeting()); } diff --git a/generated/protocol-tests/tests/output/rest-xml/tests/HttpEnumPayloadTest.cpp b/generated/protocol-tests/tests/output/rest-xml/tests/HttpEnumPayloadTest.cpp index 20d4d1c6377..b96b20df07a 100644 --- a/generated/protocol-tests/tests/output/rest-xml/tests/HttpEnumPayloadTest.cpp +++ b/generated/protocol-tests/tests/output/rest-xml/tests/HttpEnumPayloadTest.cpp @@ -23,7 +23,9 @@ AWS_PROTOCOL_TEST(HttpEnumPayload, RestXmlEnumPayloadResponse) { HttpEnumPayloadRequest request; auto outcome = client.HttpEnumPayload(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const HttpEnumPayloadResult& result = outcome.GetResult(); + /* expectedResult = R"( {"payload":"enumvalue"} )" */ + EXPECT_EQ(StringEnumMapper::GetStringEnumForName(R"e(enumvalue)e"), result.GetPayload()); } diff --git a/generated/protocol-tests/tests/output/rest-xml/tests/HttpPayloadTraitsTest.cpp b/generated/protocol-tests/tests/output/rest-xml/tests/HttpPayloadTraitsTest.cpp index 61f82d255fb..6d118bd49ed 100644 --- a/generated/protocol-tests/tests/output/rest-xml/tests/HttpPayloadTraitsTest.cpp +++ b/generated/protocol-tests/tests/output/rest-xml/tests/HttpPayloadTraitsTest.cpp @@ -23,9 +23,13 @@ AWS_PROTOCOL_TEST(HttpPayloadTraits, HttpPayloadTraitsWithBlob) { HttpPayloadTraitsRequest request; auto outcome = client.HttpPayloadTraits(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const HttpPayloadTraitsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"foo":"Foo","blob":"blobby blob blob"} )" */ + EXPECT_EQ(R"(Foo)", result.GetFoo()); + const Aws::String resultBlob = [&result](){Aws::StringStream ss; ss << result.GetBlob().rdbuf(); return ss.str();}(); + EXPECT_STREQ(R"(blobby blob blob)", resultBlob.c_str()); } AWS_PROTOCOL_TEST(HttpPayloadTraits, HttpPayloadTraitsWithNoBlobBody) { @@ -39,7 +43,9 @@ AWS_PROTOCOL_TEST(HttpPayloadTraits, HttpPayloadTraitsWithNoBlobBody) { HttpPayloadTraitsRequest request; auto outcome = client.HttpPayloadTraits(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const HttpPayloadTraitsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"foo":"Foo"} )" */ + EXPECT_EQ(R"(Foo)", result.GetFoo()); } diff --git a/generated/protocol-tests/tests/output/rest-xml/tests/HttpPayloadWithMemberXmlNameTest.cpp b/generated/protocol-tests/tests/output/rest-xml/tests/HttpPayloadWithMemberXmlNameTest.cpp index eb0c021e517..1024c2922fc 100644 --- a/generated/protocol-tests/tests/output/rest-xml/tests/HttpPayloadWithMemberXmlNameTest.cpp +++ b/generated/protocol-tests/tests/output/rest-xml/tests/HttpPayloadWithMemberXmlNameTest.cpp @@ -23,7 +23,12 @@ AWS_PROTOCOL_TEST(HttpPayloadWithMemberXmlName, HttpPayloadWithMemberXmlName) { HttpPayloadWithMemberXmlNameRequest request; auto outcome = client.HttpPayloadWithMemberXmlName(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const HttpPayloadWithMemberXmlNameResult& result = outcome.GetResult(); + /* expectedResult = R"( {"nested":{"name":"Phreddy"}} )" */ + { + const PayloadWithXmlName& resultNested = result.GetNested(); + EXPECT_EQ(R"(Phreddy)", resultNested.GetName()); + } } diff --git a/generated/protocol-tests/tests/output/rest-xml/tests/HttpPayloadWithStructureTest.cpp b/generated/protocol-tests/tests/output/rest-xml/tests/HttpPayloadWithStructureTest.cpp index 783320345de..8bb1ba72b5a 100644 --- a/generated/protocol-tests/tests/output/rest-xml/tests/HttpPayloadWithStructureTest.cpp +++ b/generated/protocol-tests/tests/output/rest-xml/tests/HttpPayloadWithStructureTest.cpp @@ -23,7 +23,13 @@ AWS_PROTOCOL_TEST(HttpPayloadWithStructure, HttpPayloadWithStructure) { HttpPayloadWithStructureRequest request; auto outcome = client.HttpPayloadWithStructure(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const HttpPayloadWithStructureResult& result = outcome.GetResult(); + /* expectedResult = R"( {"nested":{"greeting":"hello","name":"Phreddy"}} )" */ + { + const NestedPayload& resultNested = result.GetNested(); + EXPECT_EQ(R"(hello)", resultNested.GetGreeting()); + EXPECT_EQ(R"(Phreddy)", resultNested.GetName()); + } } diff --git a/generated/protocol-tests/tests/output/rest-xml/tests/HttpPayloadWithUnionTest.cpp b/generated/protocol-tests/tests/output/rest-xml/tests/HttpPayloadWithUnionTest.cpp index f7b518e4c0a..81ccd0a95d6 100644 --- a/generated/protocol-tests/tests/output/rest-xml/tests/HttpPayloadWithUnionTest.cpp +++ b/generated/protocol-tests/tests/output/rest-xml/tests/HttpPayloadWithUnionTest.cpp @@ -23,9 +23,14 @@ AWS_PROTOCOL_TEST(HttpPayloadWithUnion, RestXmlHttpPayloadWithUnion) { HttpPayloadWithUnionRequest request; auto outcome = client.HttpPayloadWithUnion(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const HttpPayloadWithUnionResult& result = outcome.GetResult(); + /* expectedResult = R"( {"nested":{"greeting":"hello"}} )" */ + { + const UnionPayload& resultNested = result.GetNested(); + EXPECT_EQ(R"(hello)", resultNested.GetGreeting()); + } } AWS_PROTOCOL_TEST(HttpPayloadWithUnion, RestXmlHttpPayloadWithUnsetUnion) { @@ -39,7 +44,7 @@ AWS_PROTOCOL_TEST(HttpPayloadWithUnion, RestXmlHttpPayloadWithUnsetUnion) { HttpPayloadWithUnionRequest request; auto outcome = client.HttpPayloadWithUnion(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + /* expectedResult = R"( {} )" */ } diff --git a/generated/protocol-tests/tests/output/rest-xml/tests/HttpPayloadWithXmlNameTest.cpp b/generated/protocol-tests/tests/output/rest-xml/tests/HttpPayloadWithXmlNameTest.cpp index 7eb40e95d93..fd447423c56 100644 --- a/generated/protocol-tests/tests/output/rest-xml/tests/HttpPayloadWithXmlNameTest.cpp +++ b/generated/protocol-tests/tests/output/rest-xml/tests/HttpPayloadWithXmlNameTest.cpp @@ -23,7 +23,12 @@ AWS_PROTOCOL_TEST(HttpPayloadWithXmlName, HttpPayloadWithXmlName) { HttpPayloadWithXmlNameRequest request; auto outcome = client.HttpPayloadWithXmlName(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const HttpPayloadWithXmlNameResult& result = outcome.GetResult(); + /* expectedResult = R"( {"nested":{"name":"Phreddy"}} )" */ + { + const PayloadWithXmlName& resultNested = result.GetNested(); + EXPECT_EQ(R"(Phreddy)", resultNested.GetName()); + } } diff --git a/generated/protocol-tests/tests/output/rest-xml/tests/HttpPayloadWithXmlNamespaceAndPrefixTest.cpp b/generated/protocol-tests/tests/output/rest-xml/tests/HttpPayloadWithXmlNamespaceAndPrefixTest.cpp index 346e7d7840d..5e02b506231 100644 --- a/generated/protocol-tests/tests/output/rest-xml/tests/HttpPayloadWithXmlNamespaceAndPrefixTest.cpp +++ b/generated/protocol-tests/tests/output/rest-xml/tests/HttpPayloadWithXmlNamespaceAndPrefixTest.cpp @@ -23,7 +23,12 @@ AWS_PROTOCOL_TEST(HttpPayloadWithXmlNamespaceAndPrefix, HttpPayloadWithXmlNamesp HttpPayloadWithXmlNamespaceAndPrefixRequest request; auto outcome = client.HttpPayloadWithXmlNamespaceAndPrefix(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const HttpPayloadWithXmlNamespaceAndPrefixResult& result = outcome.GetResult(); + /* expectedResult = R"( {"nested":{"name":"Phreddy"}} )" */ + { + const PayloadWithXmlNamespaceAndPrefix& resultNested = result.GetNested(); + EXPECT_EQ(R"(Phreddy)", resultNested.GetName()); + } } diff --git a/generated/protocol-tests/tests/output/rest-xml/tests/HttpPayloadWithXmlNamespaceTest.cpp b/generated/protocol-tests/tests/output/rest-xml/tests/HttpPayloadWithXmlNamespaceTest.cpp index 36f57215ba6..b4fc09ed739 100644 --- a/generated/protocol-tests/tests/output/rest-xml/tests/HttpPayloadWithXmlNamespaceTest.cpp +++ b/generated/protocol-tests/tests/output/rest-xml/tests/HttpPayloadWithXmlNamespaceTest.cpp @@ -23,7 +23,12 @@ AWS_PROTOCOL_TEST(HttpPayloadWithXmlNamespace, HttpPayloadWithXmlNamespace) { HttpPayloadWithXmlNamespaceRequest request; auto outcome = client.HttpPayloadWithXmlNamespace(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const HttpPayloadWithXmlNamespaceResult& result = outcome.GetResult(); + /* expectedResult = R"( {"nested":{"name":"Phreddy"}} )" */ + { + const PayloadWithXmlNamespace& resultNested = result.GetNested(); + EXPECT_EQ(R"(Phreddy)", resultNested.GetName()); + } } diff --git a/generated/protocol-tests/tests/output/rest-xml/tests/HttpPrefixHeadersTest.cpp b/generated/protocol-tests/tests/output/rest-xml/tests/HttpPrefixHeadersTest.cpp index 8ab3b76e598..8a040364e68 100644 --- a/generated/protocol-tests/tests/output/rest-xml/tests/HttpPrefixHeadersTest.cpp +++ b/generated/protocol-tests/tests/output/rest-xml/tests/HttpPrefixHeadersTest.cpp @@ -22,9 +22,17 @@ AWS_PROTOCOL_TEST(HttpPrefixHeaders, HttpPrefixHeadersArePresent) { HttpPrefixHeadersRequest request; auto outcome = client.HttpPrefixHeaders(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const HttpPrefixHeadersResult& result = outcome.GetResult(); + /* expectedResult = R"( {"foo":"Foo","fooMap":{"abc":"Abc value","def":"Def value"}} )" */ + EXPECT_EQ(R"(Foo)", result.GetFoo()); + const Aws::Map& resultFooMap = result.GetFooMap(); + EXPECT_EQ(2U, resultFooMap.size()); + EXPECT_TRUE(resultFooMap.find("abc") != resultFooMap.end()); + EXPECT_EQ(R"(Abc value)", resultFooMap.at("abc")); + EXPECT_TRUE(resultFooMap.find("def") != resultFooMap.end()); + EXPECT_EQ(R"(Def value)", resultFooMap.at("def")); } AWS_PROTOCOL_TEST(HttpPrefixHeaders, HttpPrefixHeadersAreNotPresent) { @@ -38,7 +46,11 @@ AWS_PROTOCOL_TEST(HttpPrefixHeaders, HttpPrefixHeadersAreNotPresent) { HttpPrefixHeadersRequest request; auto outcome = client.HttpPrefixHeaders(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const HttpPrefixHeadersResult& result = outcome.GetResult(); + /* expectedResult = R"( {"foo":"Foo","fooMap":{}} )" */ + EXPECT_EQ(R"(Foo)", result.GetFoo()); + const Aws::Map& resultFooMap = result.GetFooMap(); + EXPECT_EQ(0U, resultFooMap.size()); } diff --git a/generated/protocol-tests/tests/output/rest-xml/tests/HttpResponseCodeTest.cpp b/generated/protocol-tests/tests/output/rest-xml/tests/HttpResponseCodeTest.cpp index c0c6df835b8..40d7d7e450c 100644 --- a/generated/protocol-tests/tests/output/rest-xml/tests/HttpResponseCodeTest.cpp +++ b/generated/protocol-tests/tests/output/rest-xml/tests/HttpResponseCodeTest.cpp @@ -22,7 +22,9 @@ AWS_PROTOCOL_TEST(HttpResponseCode, RestXmlHttpResponseCode) { HttpResponseCodeRequest request; auto outcome = client.HttpResponseCode(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const HttpResponseCodeResult& result = outcome.GetResult(); + /* expectedResult = R"( {"Status":201} )" */ + EXPECT_EQ(201, result.GetStatus()); } diff --git a/generated/protocol-tests/tests/output/rest-xml/tests/HttpStringPayloadTest.cpp b/generated/protocol-tests/tests/output/rest-xml/tests/HttpStringPayloadTest.cpp index 3b0895b2089..548ff565a7c 100644 --- a/generated/protocol-tests/tests/output/rest-xml/tests/HttpStringPayloadTest.cpp +++ b/generated/protocol-tests/tests/output/rest-xml/tests/HttpStringPayloadTest.cpp @@ -23,7 +23,10 @@ AWS_PROTOCOL_TEST(HttpStringPayload, RestXmlStringPayloadResponse) { HttpStringPayloadRequest request; auto outcome = client.HttpStringPayload(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const HttpStringPayloadResult& result = outcome.GetResult(); + /* expectedResult = R"( {"payload":"rawstring"} )" */ + const Aws::String resultPayload = [&result](){Aws::StringStream ss; ss << result.GetPayload().rdbuf(); return ss.str();}(); + EXPECT_STREQ(R"(rawstring)", resultPayload.c_str()); } diff --git a/generated/protocol-tests/tests/output/rest-xml/tests/IgnoreQueryParamsInResponseTest.cpp b/generated/protocol-tests/tests/output/rest-xml/tests/IgnoreQueryParamsInResponseTest.cpp index 00a416deb8c..46158246868 100644 --- a/generated/protocol-tests/tests/output/rest-xml/tests/IgnoreQueryParamsInResponseTest.cpp +++ b/generated/protocol-tests/tests/output/rest-xml/tests/IgnoreQueryParamsInResponseTest.cpp @@ -23,7 +23,9 @@ AWS_PROTOCOL_TEST(IgnoreQueryParamsInResponse, IgnoreQueryParamsInResponse) { IgnoreQueryParamsInResponseRequest request; auto outcome = client.IgnoreQueryParamsInResponse(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const IgnoreQueryParamsInResponseResult& result = outcome.GetResult(); + /* expectedResult = R"( {"baz":"bam"} )" */ + EXPECT_EQ(R"(bam)", result.GetBaz()); } diff --git a/generated/protocol-tests/tests/output/rest-xml/tests/InputAndOutputWithHeadersTest.cpp b/generated/protocol-tests/tests/output/rest-xml/tests/InputAndOutputWithHeadersTest.cpp index ba18e08372c..d6dfa348920 100644 --- a/generated/protocol-tests/tests/output/rest-xml/tests/InputAndOutputWithHeadersTest.cpp +++ b/generated/protocol-tests/tests/output/rest-xml/tests/InputAndOutputWithHeadersTest.cpp @@ -22,9 +22,21 @@ AWS_PROTOCOL_TEST(InputAndOutputWithHeaders, InputAndOutputWithStringHeaders) { InputAndOutputWithHeadersRequest request; auto outcome = client.InputAndOutputWithHeaders(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const InputAndOutputWithHeadersResult& result = outcome.GetResult(); + /* expectedResult = R"( {"headerString":"Hello","headerStringList":["a","b","c"],"headerStringSet":["a","b","c"]} )" */ + EXPECT_EQ(R"(Hello)", result.GetHeaderString()); + const Aws::Vector& resultHeaderStringListItem = result.GetHeaderStringList(); + EXPECT_EQ(3U, resultHeaderStringListItem.size()); + EXPECT_EQ(R"(a)", resultHeaderStringListItem.at(0)); + EXPECT_EQ(R"(b)", resultHeaderStringListItem.at(1)); + EXPECT_EQ(R"(c)", resultHeaderStringListItem.at(2)); + const Aws::Vector& resultHeaderStringSetItem = result.GetHeaderStringSet(); + EXPECT_EQ(3U, resultHeaderStringSetItem.size()); + EXPECT_EQ(R"(a)", resultHeaderStringSetItem.at(0)); + EXPECT_EQ(R"(b)", resultHeaderStringSetItem.at(1)); + EXPECT_EQ(R"(c)", resultHeaderStringSetItem.at(2)); } AWS_PROTOCOL_TEST(InputAndOutputWithHeaders, InputAndOutputWithNumericHeaders) { @@ -38,9 +50,21 @@ AWS_PROTOCOL_TEST(InputAndOutputWithHeaders, InputAndOutputWithNumericHeaders) { InputAndOutputWithHeadersRequest request; auto outcome = client.InputAndOutputWithHeaders(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const InputAndOutputWithHeadersResult& result = outcome.GetResult(); + /* expectedResult = R"( {"headerByte":1,"headerShort":123,"headerInteger":123,"headerLong":123,"headerFloat":1.1,"headerDouble":1.1,"headerIntegerList":[1,2,3]} )" */ + EXPECT_EQ(1, result.GetHeaderByte()); + EXPECT_EQ(123, result.GetHeaderShort()); + EXPECT_EQ(123, result.GetHeaderInteger()); + EXPECT_EQ(123, result.GetHeaderLong()); + EXPECT_EQ(1.1, result.GetHeaderFloat()); + EXPECT_EQ(1.1, result.GetHeaderDouble()); + const Aws::Vector& resultHeaderIntegerListItem = result.GetHeaderIntegerList(); + EXPECT_EQ(3U, resultHeaderIntegerListItem.size()); + EXPECT_EQ(1, resultHeaderIntegerListItem.at(0)); + EXPECT_EQ(2, resultHeaderIntegerListItem.at(1)); + EXPECT_EQ(3, resultHeaderIntegerListItem.at(2)); } AWS_PROTOCOL_TEST(InputAndOutputWithHeaders, InputAndOutputWithBooleanHeaders) { @@ -54,9 +78,17 @@ AWS_PROTOCOL_TEST(InputAndOutputWithHeaders, InputAndOutputWithBooleanHeaders) { InputAndOutputWithHeadersRequest request; auto outcome = client.InputAndOutputWithHeaders(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const InputAndOutputWithHeadersResult& result = outcome.GetResult(); + /* expectedResult = R"( {"headerTrueBool":true,"headerFalseBool":false,"headerBooleanList":[true,false,true]} )" */ + EXPECT_EQ(true, result.GetHeaderTrueBool()); + EXPECT_EQ(false, result.GetHeaderFalseBool()); + const Aws::Vector& resultHeaderBooleanListItem = result.GetHeaderBooleanList(); + EXPECT_EQ(3U, resultHeaderBooleanListItem.size()); + EXPECT_EQ(true, resultHeaderBooleanListItem.at(0)); + EXPECT_EQ(false, resultHeaderBooleanListItem.at(1)); + EXPECT_EQ(true, resultHeaderBooleanListItem.at(2)); } AWS_PROTOCOL_TEST(InputAndOutputWithHeaders, InputAndOutputWithTimestampHeaders) { @@ -70,9 +102,14 @@ AWS_PROTOCOL_TEST(InputAndOutputWithHeaders, InputAndOutputWithTimestampHeaders) InputAndOutputWithHeadersRequest request; auto outcome = client.InputAndOutputWithHeaders(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const InputAndOutputWithHeadersResult& result = outcome.GetResult(); + /* expectedResult = R"( {"headerTimestampList":[1576540098,1576540098]} )" */ + const Aws::Vector& resultHeaderTimestampListItem = result.GetHeaderTimestampList(); + EXPECT_EQ(2U, resultHeaderTimestampListItem.size()); + EXPECT_EQ(Aws::Utils::DateTime(1576540098L), resultHeaderTimestampListItem.at(0)); + EXPECT_EQ(Aws::Utils::DateTime(1576540098L), resultHeaderTimestampListItem.at(1)); } AWS_PROTOCOL_TEST(InputAndOutputWithHeaders, InputAndOutputWithEnumHeaders) { @@ -86,9 +123,16 @@ AWS_PROTOCOL_TEST(InputAndOutputWithHeaders, InputAndOutputWithEnumHeaders) { InputAndOutputWithHeadersRequest request; auto outcome = client.InputAndOutputWithHeaders(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const InputAndOutputWithHeadersResult& result = outcome.GetResult(); + /* expectedResult = R"( {"headerEnum":"Foo","headerEnumList":["Foo","Bar","Baz"]} )" */ + EXPECT_EQ(FooEnumMapper::GetFooEnumForName(R"e(Foo)e"), result.GetHeaderEnum()); + const Aws::Vector& resultHeaderEnumListItem = result.GetHeaderEnumList(); + EXPECT_EQ(3U, resultHeaderEnumListItem.size()); + EXPECT_EQ(FooEnumMapper::GetFooEnumForName(R"e(Foo)e"), resultHeaderEnumListItem.at(0)); + EXPECT_EQ(FooEnumMapper::GetFooEnumForName(R"e(Bar)e"), resultHeaderEnumListItem.at(1)); + EXPECT_EQ(FooEnumMapper::GetFooEnumForName(R"e(Baz)e"), resultHeaderEnumListItem.at(2)); } AWS_PROTOCOL_TEST(InputAndOutputWithHeaders, RestXmlSupportsNaNFloatHeaderOutputs) { @@ -102,9 +146,12 @@ AWS_PROTOCOL_TEST(InputAndOutputWithHeaders, RestXmlSupportsNaNFloatHeaderOutput InputAndOutputWithHeadersRequest request; auto outcome = client.InputAndOutputWithHeaders(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const InputAndOutputWithHeadersResult& result = outcome.GetResult(); + /* expectedResult = R"( {"headerFloat":"NaN","headerDouble":"NaN"} )" */ + EXPECT_EQ(std::numeric_limits::quiet_NaN(), result.GetHeaderFloat()); + EXPECT_EQ(std::numeric_limits::quiet_NaN(), result.GetHeaderDouble()); } AWS_PROTOCOL_TEST(InputAndOutputWithHeaders, RestXmlSupportsInfinityFloatHeaderOutputs) { @@ -118,9 +165,12 @@ AWS_PROTOCOL_TEST(InputAndOutputWithHeaders, RestXmlSupportsInfinityFloatHeaderO InputAndOutputWithHeadersRequest request; auto outcome = client.InputAndOutputWithHeaders(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const InputAndOutputWithHeadersResult& result = outcome.GetResult(); + /* expectedResult = R"( {"headerFloat":"Infinity","headerDouble":"Infinity"} )" */ + EXPECT_EQ(std::numeric_limits::infinity(), result.GetHeaderFloat()); + EXPECT_EQ(std::numeric_limits::infinity(), result.GetHeaderDouble()); } AWS_PROTOCOL_TEST(InputAndOutputWithHeaders, RestXmlSupportsNegativeInfinityFloatHeaderOutputs) { @@ -134,7 +184,10 @@ AWS_PROTOCOL_TEST(InputAndOutputWithHeaders, RestXmlSupportsNegativeInfinityFloa InputAndOutputWithHeadersRequest request; auto outcome = client.InputAndOutputWithHeaders(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const InputAndOutputWithHeadersResult& result = outcome.GetResult(); + /* expectedResult = R"( {"headerFloat":"-Infinity","headerDouble":"-Infinity"} )" */ + EXPECT_EQ(-std::numeric_limits::infinity(), result.GetHeaderFloat()); + EXPECT_EQ(-std::numeric_limits::infinity(), result.GetHeaderDouble()); } diff --git a/generated/protocol-tests/tests/output/rest-xml/tests/NestedXmlMapWithXmlNameTest.cpp b/generated/protocol-tests/tests/output/rest-xml/tests/NestedXmlMapWithXmlNameTest.cpp index 49b69adf88e..cd5591c3636 100644 --- a/generated/protocol-tests/tests/output/rest-xml/tests/NestedXmlMapWithXmlNameTest.cpp +++ b/generated/protocol-tests/tests/output/rest-xml/tests/NestedXmlMapWithXmlNameTest.cpp @@ -23,7 +23,28 @@ AWS_PROTOCOL_TEST(NestedXmlMapWithXmlName, NestedXmlMapWithXmlNameDeserializes) NestedXmlMapWithXmlNameRequest request; auto outcome = client.NestedXmlMapWithXmlName(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const NestedXmlMapWithXmlNameResult& result = outcome.GetResult(); + /* expectedResult = R"( {"nestedXmlMapWithXmlNameMap":{"foo":{"bar":"Baz","fizz":"Buzz"},"qux":{"foobar":"Bar","fizzbuzz":"Buzz"}}} )" */ + const Aws::Map>& resultNestedXmlMapWithXmlNameMap = result.GetNestedXmlMapWithXmlNameMap(); + EXPECT_EQ(2U, resultNestedXmlMapWithXmlNameMap.size()); + EXPECT_TRUE(resultNestedXmlMapWithXmlNameMap.find("foo") != resultNestedXmlMapWithXmlNameMap.end()); + { + const Aws::Map& resultNestedXmlMapWithXmlNameMapNestedMap = resultNestedXmlMapWithXmlNameMap.at("foo"); + EXPECT_EQ(2U, resultNestedXmlMapWithXmlNameMapNestedMap.size()); + EXPECT_TRUE(resultNestedXmlMapWithXmlNameMapNestedMap.find("bar") != resultNestedXmlMapWithXmlNameMapNestedMap.end()); + EXPECT_EQ(R"(Baz)", resultNestedXmlMapWithXmlNameMapNestedMap.at("bar")); + EXPECT_TRUE(resultNestedXmlMapWithXmlNameMapNestedMap.find("fizz") != resultNestedXmlMapWithXmlNameMapNestedMap.end()); + EXPECT_EQ(R"(Buzz)", resultNestedXmlMapWithXmlNameMapNestedMap.at("fizz")); + } + EXPECT_TRUE(resultNestedXmlMapWithXmlNameMap.find("qux") != resultNestedXmlMapWithXmlNameMap.end()); + { + const Aws::Map& resultNestedXmlMapWithXmlNameMapNestedMap = resultNestedXmlMapWithXmlNameMap.at("qux"); + EXPECT_EQ(2U, resultNestedXmlMapWithXmlNameMapNestedMap.size()); + EXPECT_TRUE(resultNestedXmlMapWithXmlNameMapNestedMap.find("foobar") != resultNestedXmlMapWithXmlNameMapNestedMap.end()); + EXPECT_EQ(R"(Bar)", resultNestedXmlMapWithXmlNameMapNestedMap.at("foobar")); + EXPECT_TRUE(resultNestedXmlMapWithXmlNameMapNestedMap.find("fizzbuzz") != resultNestedXmlMapWithXmlNameMapNestedMap.end()); + EXPECT_EQ(R"(Buzz)", resultNestedXmlMapWithXmlNameMapNestedMap.at("fizzbuzz")); + } } diff --git a/generated/protocol-tests/tests/output/rest-xml/tests/NestedXmlMapsTest.cpp b/generated/protocol-tests/tests/output/rest-xml/tests/NestedXmlMapsTest.cpp index 5bc1a4a7fb3..e426cd05315 100644 --- a/generated/protocol-tests/tests/output/rest-xml/tests/NestedXmlMapsTest.cpp +++ b/generated/protocol-tests/tests/output/rest-xml/tests/NestedXmlMapsTest.cpp @@ -23,9 +23,19 @@ AWS_PROTOCOL_TEST(NestedXmlMaps, NestedXmlMapResponse) { NestedXmlMapsRequest request; auto outcome = client.NestedXmlMaps(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const NestedXmlMapsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"nestedMap":{"foo":{"bar":"Bar"}}} )" */ + const Aws::Map>& resultNestedMap = result.GetNestedMap(); + EXPECT_EQ(1U, resultNestedMap.size()); + EXPECT_TRUE(resultNestedMap.find("foo") != resultNestedMap.end()); + { + const Aws::Map& resultNestedMapNestedMap = resultNestedMap.at("foo"); + EXPECT_EQ(1U, resultNestedMapNestedMap.size()); + EXPECT_TRUE(resultNestedMapNestedMap.find("bar") != resultNestedMapNestedMap.end()); + EXPECT_EQ(FooEnumMapper::GetFooEnumForName(R"e(Bar)e"), resultNestedMapNestedMap.at("bar")); + } } AWS_PROTOCOL_TEST(NestedXmlMaps, FlatNestedXmlMapResponse) { @@ -40,7 +50,17 @@ AWS_PROTOCOL_TEST(NestedXmlMaps, FlatNestedXmlMapResponse) { NestedXmlMapsRequest request; auto outcome = client.NestedXmlMaps(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const NestedXmlMapsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"flatNestedMap":{"foo":{"bar":"Bar"}}} )" */ + const Aws::Map>& resultFlatNestedMap = result.GetFlatNestedMap(); + EXPECT_EQ(1U, resultFlatNestedMap.size()); + EXPECT_TRUE(resultFlatNestedMap.find("foo") != resultFlatNestedMap.end()); + { + const Aws::Map& resultFlatNestedMapNestedMap = resultFlatNestedMap.at("foo"); + EXPECT_EQ(1U, resultFlatNestedMapNestedMap.size()); + EXPECT_TRUE(resultFlatNestedMapNestedMap.find("bar") != resultFlatNestedMapNestedMap.end()); + EXPECT_EQ(FooEnumMapper::GetFooEnumForName(R"e(Bar)e"), resultFlatNestedMapNestedMap.at("bar")); + } } diff --git a/generated/protocol-tests/tests/output/rest-xml/tests/NoInputAndNoOutputTest.cpp b/generated/protocol-tests/tests/output/rest-xml/tests/NoInputAndNoOutputTest.cpp index 83823524f4c..d05f889b095 100644 --- a/generated/protocol-tests/tests/output/rest-xml/tests/NoInputAndNoOutputTest.cpp +++ b/generated/protocol-tests/tests/output/rest-xml/tests/NoInputAndNoOutputTest.cpp @@ -21,7 +21,7 @@ AWS_PROTOCOL_TEST(NoInputAndNoOutput, NoInputAndNoOutput) { NoInputAndNoOutputRequest request; auto outcome = client.NoInputAndNoOutput(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + /* expectedResult = R"( {} )" */ } diff --git a/generated/protocol-tests/tests/output/rest-xml/tests/NoInputAndOutputTest.cpp b/generated/protocol-tests/tests/output/rest-xml/tests/NoInputAndOutputTest.cpp index 78a8c3965f3..4c8f95769db 100644 --- a/generated/protocol-tests/tests/output/rest-xml/tests/NoInputAndOutputTest.cpp +++ b/generated/protocol-tests/tests/output/rest-xml/tests/NoInputAndOutputTest.cpp @@ -21,7 +21,7 @@ AWS_PROTOCOL_TEST(NoInputAndOutput, NoInputAndOutput) { NoInputAndOutputRequest request; auto outcome = client.NoInputAndOutput(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + /* expectedResult = R"( {} )" */ } diff --git a/generated/protocol-tests/tests/output/rest-xml/tests/RecursiveShapesTest.cpp b/generated/protocol-tests/tests/output/rest-xml/tests/RecursiveShapesTest.cpp index 6c2f7f420d4..5b1d1924aa6 100644 --- a/generated/protocol-tests/tests/output/rest-xml/tests/RecursiveShapesTest.cpp +++ b/generated/protocol-tests/tests/output/rest-xml/tests/RecursiveShapesTest.cpp @@ -5,6 +5,7 @@ #include #include #include +#include #include #include @@ -24,7 +25,24 @@ AWS_PROTOCOL_TEST(RecursiveShapes, RecursiveShapes) { RecursiveShapesRequest request; auto outcome = client.RecursiveShapes(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const RecursiveShapesResult& result = outcome.GetResult(); + /* expectedResult = R"( {"nested":{"foo":"Foo1","nested":{"bar":"Bar1","recursiveMember":{"foo":"Foo2","nested":{"bar":"Bar2"}}}}} )" */ + { + const RecursiveShapesInputOutputNested1& resultNested = result.GetNested(); + EXPECT_EQ(R"(Foo1)", resultNested.GetFoo()); + { + const RecursiveShapesInputOutputNested2& resultNestedNested = resultNested.GetNested(); + EXPECT_EQ(R"(Bar1)", resultNestedNested.GetBar()); + { + const RecursiveShapesInputOutputNested1& resultNestedNestedRecursiveMember = resultNestedNested.GetRecursiveMember(); + EXPECT_EQ(R"(Foo2)", resultNestedNestedRecursiveMember.GetFoo()); + { + const RecursiveShapesInputOutputNested2& resultNestedNestedRecursiveMemberNested = resultNestedNestedRecursiveMember.GetNested(); + EXPECT_EQ(R"(Bar2)", resultNestedNestedRecursiveMemberNested.GetBar()); + } + } + } + } } diff --git a/generated/protocol-tests/tests/output/rest-xml/tests/SimpleScalarPropertiesTest.cpp b/generated/protocol-tests/tests/output/rest-xml/tests/SimpleScalarPropertiesTest.cpp index 1dd372efb83..30b22759844 100644 --- a/generated/protocol-tests/tests/output/rest-xml/tests/SimpleScalarPropertiesTest.cpp +++ b/generated/protocol-tests/tests/output/rest-xml/tests/SimpleScalarPropertiesTest.cpp @@ -23,9 +23,20 @@ AWS_PROTOCOL_TEST(SimpleScalarProperties, SimpleScalarProperties) { SimpleScalarPropertiesRequest request; auto outcome = client.SimpleScalarProperties(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const SimpleScalarPropertiesResult& result = outcome.GetResult(); + /* expectedResult = R"( {"foo":"Foo","stringValue":"string","trueBooleanValue":true,"falseBooleanValue":false,"byteValue":1,"shortValue":2,"integerValue":3,"longValue":4,"floatValue":5.5,"doubleValue":6.5} )" */ + EXPECT_EQ(R"(Foo)", result.GetFoo()); + EXPECT_EQ(R"(string)", result.GetStringValue()); + EXPECT_EQ(true, result.GetTrueBooleanValue()); + EXPECT_EQ(false, result.GetFalseBooleanValue()); + EXPECT_EQ(1, result.GetByteValue()); + EXPECT_EQ(2, result.GetShortValue()); + EXPECT_EQ(3, result.GetIntegerValue()); + EXPECT_EQ(4, result.GetLongValue()); + EXPECT_EQ(5.5, result.GetFloatValue()); + EXPECT_EQ(6.5, result.GetDoubleValue()); } AWS_PROTOCOL_TEST(SimpleScalarProperties, SimpleScalarPropertiesComplexEscapes) { @@ -40,9 +51,13 @@ AWS_PROTOCOL_TEST(SimpleScalarProperties, SimpleScalarPropertiesComplexEscapes) SimpleScalarPropertiesRequest request; auto outcome = client.SimpleScalarProperties(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const SimpleScalarPropertiesResult& result = outcome.GetResult(); + /* expectedResult = R"( {"foo":"Foo","stringValue":"escaped data: <\r\n"} )" */ + EXPECT_EQ(R"(Foo)", result.GetFoo()); + EXPECT_EQ(R"(escaped data: < +)", result.GetStringValue()); } AWS_PROTOCOL_TEST(SimpleScalarProperties, SimpleScalarPropertiesWithEscapedCharacter) { @@ -57,9 +72,12 @@ AWS_PROTOCOL_TEST(SimpleScalarProperties, SimpleScalarPropertiesWithEscapedChara SimpleScalarPropertiesRequest request; auto outcome = client.SimpleScalarProperties(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const SimpleScalarPropertiesResult& result = outcome.GetResult(); + /* expectedResult = R"( {"foo":"Foo","stringValue":""} )" */ + EXPECT_EQ(R"(Foo)", result.GetFoo()); + EXPECT_EQ(R"()", result.GetStringValue()); } AWS_PROTOCOL_TEST(SimpleScalarProperties, SimpleScalarPropertiesWithXMLPreamble) { @@ -74,9 +92,12 @@ AWS_PROTOCOL_TEST(SimpleScalarProperties, SimpleScalarPropertiesWithXMLPreamble) SimpleScalarPropertiesRequest request; auto outcome = client.SimpleScalarProperties(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const SimpleScalarPropertiesResult& result = outcome.GetResult(); + /* expectedResult = R"( {"foo":"Foo","stringValue":"string"} )" */ + EXPECT_EQ(R"(Foo)", result.GetFoo()); + EXPECT_EQ(R"(string)", result.GetStringValue()); } AWS_PROTOCOL_TEST(SimpleScalarProperties, SimpleScalarPropertiesWithWhiteSpace) { @@ -91,9 +112,12 @@ AWS_PROTOCOL_TEST(SimpleScalarProperties, SimpleScalarPropertiesWithWhiteSpace) SimpleScalarPropertiesRequest request; auto outcome = client.SimpleScalarProperties(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const SimpleScalarPropertiesResult& result = outcome.GetResult(); + /* expectedResult = R"( {"foo":"Foo","stringValue":" string with white space "} )" */ + EXPECT_EQ(R"(Foo)", result.GetFoo()); + EXPECT_EQ(R"( string with white space )", result.GetStringValue()); } AWS_PROTOCOL_TEST(SimpleScalarProperties, SimpleScalarPropertiesPureWhiteSpace) { @@ -108,9 +132,12 @@ AWS_PROTOCOL_TEST(SimpleScalarProperties, SimpleScalarPropertiesPureWhiteSpace) SimpleScalarPropertiesRequest request; auto outcome = client.SimpleScalarProperties(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const SimpleScalarPropertiesResult& result = outcome.GetResult(); + /* expectedResult = R"( {"foo":"Foo","stringValue":" "} )" */ + EXPECT_EQ(R"(Foo)", result.GetFoo()); + EXPECT_EQ(R"( )", result.GetStringValue()); } AWS_PROTOCOL_TEST(SimpleScalarProperties, RestXmlSupportsNaNFloatOutputs) { @@ -125,9 +152,12 @@ AWS_PROTOCOL_TEST(SimpleScalarProperties, RestXmlSupportsNaNFloatOutputs) { SimpleScalarPropertiesRequest request; auto outcome = client.SimpleScalarProperties(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const SimpleScalarPropertiesResult& result = outcome.GetResult(); + /* expectedResult = R"( {"floatValue":"NaN","doubleValue":"NaN"} )" */ + EXPECT_EQ(std::numeric_limits::quiet_NaN(), result.GetFloatValue()); + EXPECT_EQ(std::numeric_limits::quiet_NaN(), result.GetDoubleValue()); } AWS_PROTOCOL_TEST(SimpleScalarProperties, RestXmlSupportsInfinityFloatOutputs) { @@ -142,9 +172,12 @@ AWS_PROTOCOL_TEST(SimpleScalarProperties, RestXmlSupportsInfinityFloatOutputs) { SimpleScalarPropertiesRequest request; auto outcome = client.SimpleScalarProperties(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const SimpleScalarPropertiesResult& result = outcome.GetResult(); + /* expectedResult = R"( {"floatValue":"Infinity","doubleValue":"Infinity"} )" */ + EXPECT_EQ(std::numeric_limits::infinity(), result.GetFloatValue()); + EXPECT_EQ(std::numeric_limits::infinity(), result.GetDoubleValue()); } AWS_PROTOCOL_TEST(SimpleScalarProperties, RestXmlSupportsNegativeInfinityFloatOutputs) { @@ -159,7 +192,10 @@ AWS_PROTOCOL_TEST(SimpleScalarProperties, RestXmlSupportsNegativeInfinityFloatOu SimpleScalarPropertiesRequest request; auto outcome = client.SimpleScalarProperties(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const SimpleScalarPropertiesResult& result = outcome.GetResult(); + /* expectedResult = R"( {"floatValue":"-Infinity","doubleValue":"-Infinity"} )" */ + EXPECT_EQ(-std::numeric_limits::infinity(), result.GetFloatValue()); + EXPECT_EQ(-std::numeric_limits::infinity(), result.GetDoubleValue()); } diff --git a/generated/protocol-tests/tests/output/rest-xml/tests/TimestampFormatHeadersTest.cpp b/generated/protocol-tests/tests/output/rest-xml/tests/TimestampFormatHeadersTest.cpp index 22a7cb3ae98..eb20785c4b9 100644 --- a/generated/protocol-tests/tests/output/rest-xml/tests/TimestampFormatHeadersTest.cpp +++ b/generated/protocol-tests/tests/output/rest-xml/tests/TimestampFormatHeadersTest.cpp @@ -22,7 +22,15 @@ AWS_PROTOCOL_TEST(TimestampFormatHeaders, TimestampFormatHeaders) { TimestampFormatHeadersRequest request; auto outcome = client.TimestampFormatHeaders(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const TimestampFormatHeadersResult& result = outcome.GetResult(); + /* expectedResult = R"( {"memberEpochSeconds":1576540098,"memberHttpDate":1576540098,"memberDateTime":1576540098,"defaultFormat":1576540098,"targetEpochSeconds":1576540098,"targetHttpDate":1576540098,"targetDateTime":1576540098} )" */ + EXPECT_EQ(Aws::Utils::DateTime(1576540098L), result.GetMemberEpochSeconds()); + EXPECT_EQ(Aws::Utils::DateTime(1576540098L), result.GetMemberHttpDate()); + EXPECT_EQ(Aws::Utils::DateTime(1576540098L), result.GetMemberDateTime()); + EXPECT_EQ(Aws::Utils::DateTime(1576540098L), result.GetDefaultFormat()); + EXPECT_EQ(Aws::Utils::DateTime(1576540098L), result.GetTargetEpochSeconds()); + EXPECT_EQ(Aws::Utils::DateTime(1576540098L), result.GetTargetHttpDate()); + EXPECT_EQ(Aws::Utils::DateTime(1576540098L), result.GetTargetDateTime()); } diff --git a/generated/protocol-tests/tests/output/rest-xml/tests/XmlAttributesOnPayloadTest.cpp b/generated/protocol-tests/tests/output/rest-xml/tests/XmlAttributesOnPayloadTest.cpp index 7e198e539a3..96e4ad0eedd 100644 --- a/generated/protocol-tests/tests/output/rest-xml/tests/XmlAttributesOnPayloadTest.cpp +++ b/generated/protocol-tests/tests/output/rest-xml/tests/XmlAttributesOnPayloadTest.cpp @@ -23,7 +23,13 @@ AWS_PROTOCOL_TEST(XmlAttributesOnPayload, XmlAttributesOnPayload) { XmlAttributesOnPayloadRequest request; auto outcome = client.XmlAttributesOnPayload(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const XmlAttributesOnPayloadResult& result = outcome.GetResult(); + /* expectedResult = R"( {"payload":{"foo":"hi","attr":"test"}} )" */ + { + const XmlAttributesPayloadResponse& resultPayload = result.GetPayload(); + EXPECT_EQ(R"(hi)", resultPayload.GetFoo()); + EXPECT_EQ(R"(test)", resultPayload.GetAttr()); + } } diff --git a/generated/protocol-tests/tests/output/rest-xml/tests/XmlAttributesTest.cpp b/generated/protocol-tests/tests/output/rest-xml/tests/XmlAttributesTest.cpp index f43e18c9a1b..9ee393596eb 100644 --- a/generated/protocol-tests/tests/output/rest-xml/tests/XmlAttributesTest.cpp +++ b/generated/protocol-tests/tests/output/rest-xml/tests/XmlAttributesTest.cpp @@ -23,7 +23,10 @@ AWS_PROTOCOL_TEST(XmlAttributes, XmlAttributes) { XmlAttributesRequest request; auto outcome = client.XmlAttributes(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const XmlAttributesResult& result = outcome.GetResult(); + /* expectedResult = R"( {"foo":"hi","attr":"test"} )" */ + EXPECT_EQ(R"(hi)", result.GetFoo()); + EXPECT_EQ(R"(test)", result.GetAttr()); } diff --git a/generated/protocol-tests/tests/output/rest-xml/tests/XmlBlobsTest.cpp b/generated/protocol-tests/tests/output/rest-xml/tests/XmlBlobsTest.cpp index 5391079c09f..5b940fa5735 100644 --- a/generated/protocol-tests/tests/output/rest-xml/tests/XmlBlobsTest.cpp +++ b/generated/protocol-tests/tests/output/rest-xml/tests/XmlBlobsTest.cpp @@ -23,7 +23,9 @@ AWS_PROTOCOL_TEST(XmlBlobs, XmlBlobs) { XmlBlobsRequest request; auto outcome = client.XmlBlobs(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const XmlBlobsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"data":"value"} )" */ + EXPECT_EQ(Aws::Utils::ByteBuffer(R"(value)"), result.GetData()); } diff --git a/generated/protocol-tests/tests/output/rest-xml/tests/XmlEmptyBlobsTest.cpp b/generated/protocol-tests/tests/output/rest-xml/tests/XmlEmptyBlobsTest.cpp index f9eb17de56e..bcf85ba1530 100644 --- a/generated/protocol-tests/tests/output/rest-xml/tests/XmlEmptyBlobsTest.cpp +++ b/generated/protocol-tests/tests/output/rest-xml/tests/XmlEmptyBlobsTest.cpp @@ -23,9 +23,11 @@ AWS_PROTOCOL_TEST(XmlEmptyBlobs, XmlEmptyBlobs) { XmlEmptyBlobsRequest request; auto outcome = client.XmlEmptyBlobs(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const XmlEmptyBlobsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"data":""} )" */ + EXPECT_EQ(Aws::Utils::ByteBuffer(R"()"), result.GetData()); } AWS_PROTOCOL_TEST(XmlEmptyBlobs, XmlEmptySelfClosedBlobs) { @@ -40,7 +42,9 @@ AWS_PROTOCOL_TEST(XmlEmptyBlobs, XmlEmptySelfClosedBlobs) { XmlEmptyBlobsRequest request; auto outcome = client.XmlEmptyBlobs(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const XmlEmptyBlobsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"data":""} )" */ + EXPECT_EQ(Aws::Utils::ByteBuffer(R"()"), result.GetData()); } diff --git a/generated/protocol-tests/tests/output/rest-xml/tests/XmlEmptyListsTest.cpp b/generated/protocol-tests/tests/output/rest-xml/tests/XmlEmptyListsTest.cpp index 5e701757fc6..f4295f9a815 100644 --- a/generated/protocol-tests/tests/output/rest-xml/tests/XmlEmptyListsTest.cpp +++ b/generated/protocol-tests/tests/output/rest-xml/tests/XmlEmptyListsTest.cpp @@ -23,7 +23,12 @@ AWS_PROTOCOL_TEST(XmlEmptyLists, XmlEmptyLists) { XmlEmptyListsRequest request; auto outcome = client.XmlEmptyLists(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const XmlEmptyListsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"stringList":[],"stringSet":[]} )" */ + const Aws::Vector& resultStringListItem = result.GetStringList(); + EXPECT_EQ(0U, resultStringListItem.size()); + const Aws::Vector& resultStringSetItem = result.GetStringSet(); + EXPECT_EQ(0U, resultStringSetItem.size()); } diff --git a/generated/protocol-tests/tests/output/rest-xml/tests/XmlEmptyMapsTest.cpp b/generated/protocol-tests/tests/output/rest-xml/tests/XmlEmptyMapsTest.cpp index 2bcd5fe2fda..a441f9ddff4 100644 --- a/generated/protocol-tests/tests/output/rest-xml/tests/XmlEmptyMapsTest.cpp +++ b/generated/protocol-tests/tests/output/rest-xml/tests/XmlEmptyMapsTest.cpp @@ -23,9 +23,12 @@ AWS_PROTOCOL_TEST(XmlEmptyMaps, XmlEmptyMaps) { XmlEmptyMapsRequest request; auto outcome = client.XmlEmptyMaps(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const XmlEmptyMapsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"myMap":{}} )" */ + const Aws::Map& resultMyMap = result.GetMyMap(); + EXPECT_EQ(0U, resultMyMap.size()); } AWS_PROTOCOL_TEST(XmlEmptyMaps, XmlEmptySelfClosedMaps) { @@ -40,7 +43,10 @@ AWS_PROTOCOL_TEST(XmlEmptyMaps, XmlEmptySelfClosedMaps) { XmlEmptyMapsRequest request; auto outcome = client.XmlEmptyMaps(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const XmlEmptyMapsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"myMap":{}} )" */ + const Aws::Map& resultMyMap = result.GetMyMap(); + EXPECT_EQ(0U, resultMyMap.size()); } diff --git a/generated/protocol-tests/tests/output/rest-xml/tests/XmlEmptyStringsTest.cpp b/generated/protocol-tests/tests/output/rest-xml/tests/XmlEmptyStringsTest.cpp index 0f6b91c808a..dd522c39397 100644 --- a/generated/protocol-tests/tests/output/rest-xml/tests/XmlEmptyStringsTest.cpp +++ b/generated/protocol-tests/tests/output/rest-xml/tests/XmlEmptyStringsTest.cpp @@ -23,9 +23,11 @@ AWS_PROTOCOL_TEST(XmlEmptyStrings, XmlEmptyStrings) { XmlEmptyStringsRequest request; auto outcome = client.XmlEmptyStrings(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const XmlEmptyStringsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"emptyString":""} )" */ + EXPECT_EQ(R"()", result.GetEmptyString()); } AWS_PROTOCOL_TEST(XmlEmptyStrings, XmlEmptySelfClosedStrings) { @@ -40,7 +42,9 @@ AWS_PROTOCOL_TEST(XmlEmptyStrings, XmlEmptySelfClosedStrings) { XmlEmptyStringsRequest request; auto outcome = client.XmlEmptyStrings(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const XmlEmptyStringsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"emptyString":""} )" */ + EXPECT_EQ(R"()", result.GetEmptyString()); } diff --git a/generated/protocol-tests/tests/output/rest-xml/tests/XmlEnumsTest.cpp b/generated/protocol-tests/tests/output/rest-xml/tests/XmlEnumsTest.cpp index 3c854c1f9a8..a85b1bb67af 100644 --- a/generated/protocol-tests/tests/output/rest-xml/tests/XmlEnumsTest.cpp +++ b/generated/protocol-tests/tests/output/rest-xml/tests/XmlEnumsTest.cpp @@ -23,7 +23,25 @@ AWS_PROTOCOL_TEST(XmlEnums, XmlEnums) { XmlEnumsRequest request; auto outcome = client.XmlEnums(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const XmlEnumsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"fooEnum1":"Foo","fooEnum2":"0","fooEnum3":"1","fooEnumList":["Foo","0"],"fooEnumSet":["Foo","0"],"fooEnumMap":{"hi":"Foo","zero":"0"}} )" */ + EXPECT_EQ(FooEnumMapper::GetFooEnumForName(R"e(Foo)e"), result.GetFooEnum1()); + EXPECT_EQ(FooEnumMapper::GetFooEnumForName(R"e(0)e"), result.GetFooEnum2()); + EXPECT_EQ(FooEnumMapper::GetFooEnumForName(R"e(1)e"), result.GetFooEnum3()); + const Aws::Vector& resultFooEnumListItem = result.GetFooEnumList(); + EXPECT_EQ(2U, resultFooEnumListItem.size()); + EXPECT_EQ(FooEnumMapper::GetFooEnumForName(R"e(Foo)e"), resultFooEnumListItem.at(0)); + EXPECT_EQ(FooEnumMapper::GetFooEnumForName(R"e(0)e"), resultFooEnumListItem.at(1)); + const Aws::Vector& resultFooEnumSetItem = result.GetFooEnumSet(); + EXPECT_EQ(2U, resultFooEnumSetItem.size()); + EXPECT_EQ(FooEnumMapper::GetFooEnumForName(R"e(Foo)e"), resultFooEnumSetItem.at(0)); + EXPECT_EQ(FooEnumMapper::GetFooEnumForName(R"e(0)e"), resultFooEnumSetItem.at(1)); + const Aws::Map& resultFooEnumMap = result.GetFooEnumMap(); + EXPECT_EQ(2U, resultFooEnumMap.size()); + EXPECT_TRUE(resultFooEnumMap.find("hi") != resultFooEnumMap.end()); + EXPECT_EQ(FooEnumMapper::GetFooEnumForName(R"e(Foo)e"), resultFooEnumMap.at("hi")); + EXPECT_TRUE(resultFooEnumMap.find("zero") != resultFooEnumMap.end()); + EXPECT_EQ(FooEnumMapper::GetFooEnumForName(R"e(0)e"), resultFooEnumMap.at("zero")); } diff --git a/generated/protocol-tests/tests/output/rest-xml/tests/XmlIntEnumsTest.cpp b/generated/protocol-tests/tests/output/rest-xml/tests/XmlIntEnumsTest.cpp index 97d434b996d..7dcebfe6144 100644 --- a/generated/protocol-tests/tests/output/rest-xml/tests/XmlIntEnumsTest.cpp +++ b/generated/protocol-tests/tests/output/rest-xml/tests/XmlIntEnumsTest.cpp @@ -23,7 +23,25 @@ AWS_PROTOCOL_TEST(XmlIntEnums, XmlIntEnums) { XmlIntEnumsRequest request; auto outcome = client.XmlIntEnums(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const XmlIntEnumsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"intEnum1":1,"intEnum2":2,"intEnum3":3,"intEnumList":[1,2],"intEnumSet":[1,2],"intEnumMap":{"a":1,"b":2}} )" */ + EXPECT_EQ(1, result.GetIntEnum1()); + EXPECT_EQ(2, result.GetIntEnum2()); + EXPECT_EQ(3, result.GetIntEnum3()); + const Aws::Vector& resultIntEnumListItem = result.GetIntEnumList(); + EXPECT_EQ(2U, resultIntEnumListItem.size()); + EXPECT_EQ(1, resultIntEnumListItem.at(0)); + EXPECT_EQ(2, resultIntEnumListItem.at(1)); + const Aws::Vector& resultIntEnumSetItem = result.GetIntEnumSet(); + EXPECT_EQ(2U, resultIntEnumSetItem.size()); + EXPECT_EQ(1, resultIntEnumSetItem.at(0)); + EXPECT_EQ(2, resultIntEnumSetItem.at(1)); + const Aws::Map& resultIntEnumMap = result.GetIntEnumMap(); + EXPECT_EQ(2U, resultIntEnumMap.size()); + EXPECT_TRUE(resultIntEnumMap.find("a") != resultIntEnumMap.end()); + EXPECT_EQ(1, resultIntEnumMap.at("a")); + EXPECT_TRUE(resultIntEnumMap.find("b") != resultIntEnumMap.end()); + EXPECT_EQ(2, resultIntEnumMap.at("b")); } diff --git a/generated/protocol-tests/tests/output/rest-xml/tests/XmlListsTest.cpp b/generated/protocol-tests/tests/output/rest-xml/tests/XmlListsTest.cpp index e84a0b6a7d7..d9b07aa828c 100644 --- a/generated/protocol-tests/tests/output/rest-xml/tests/XmlListsTest.cpp +++ b/generated/protocol-tests/tests/output/rest-xml/tests/XmlListsTest.cpp @@ -23,7 +23,91 @@ AWS_PROTOCOL_TEST(XmlLists, XmlLists) { XmlListsRequest request; auto outcome = client.XmlLists(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const XmlListsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"stringList":["foo","bar"],"stringSet":["foo","bar"],"integerList":[1,2],"booleanList":[true,false],"timestampList":[1398796238,1398796238],"enumList":["Foo","0"],"intEnumList":[1,2],"nestedStringList":[["foo","bar"],["baz","qux"]],"renamedListMembers":["foo","bar"],"flattenedList":["hi","bye"],"flattenedList2":["yep","nope"],"flattenedListWithMemberNamespace":["a","b"],"flattenedListWithNamespace":["a","b"],"structureList":[{"a":"1","b":"2"},{"a":"3","b":"4"}],"flattenedStructureList":[{"a":"5","b":"6"},{"a":"7","b":"8"}]} )" */ + const Aws::Vector& resultStringListItem = result.GetStringList(); + EXPECT_EQ(2U, resultStringListItem.size()); + EXPECT_EQ(R"(foo)", resultStringListItem.at(0)); + EXPECT_EQ(R"(bar)", resultStringListItem.at(1)); + const Aws::Vector& resultStringSetItem = result.GetStringSet(); + EXPECT_EQ(2U, resultStringSetItem.size()); + EXPECT_EQ(R"(foo)", resultStringSetItem.at(0)); + EXPECT_EQ(R"(bar)", resultStringSetItem.at(1)); + const Aws::Vector& resultIntegerListItem = result.GetIntegerList(); + EXPECT_EQ(2U, resultIntegerListItem.size()); + EXPECT_EQ(1, resultIntegerListItem.at(0)); + EXPECT_EQ(2, resultIntegerListItem.at(1)); + const Aws::Vector& resultBooleanListItem = result.GetBooleanList(); + EXPECT_EQ(2U, resultBooleanListItem.size()); + EXPECT_EQ(true, resultBooleanListItem.at(0)); + EXPECT_EQ(false, resultBooleanListItem.at(1)); + const Aws::Vector& resultTimestampListItem = result.GetTimestampList(); + EXPECT_EQ(2U, resultTimestampListItem.size()); + EXPECT_EQ(Aws::Utils::DateTime(1398796238L), resultTimestampListItem.at(0)); + EXPECT_EQ(Aws::Utils::DateTime(1398796238L), resultTimestampListItem.at(1)); + const Aws::Vector& resultEnumListItem = result.GetEnumList(); + EXPECT_EQ(2U, resultEnumListItem.size()); + EXPECT_EQ(FooEnumMapper::GetFooEnumForName(R"e(Foo)e"), resultEnumListItem.at(0)); + EXPECT_EQ(FooEnumMapper::GetFooEnumForName(R"e(0)e"), resultEnumListItem.at(1)); + const Aws::Vector& resultIntEnumListItem = result.GetIntEnumList(); + EXPECT_EQ(2U, resultIntEnumListItem.size()); + EXPECT_EQ(1, resultIntEnumListItem.at(0)); + EXPECT_EQ(2, resultIntEnumListItem.at(1)); + EXPECT_EQ(2U, result.GetNestedStringList().size()); + { + const Aws::Vector& resultNestedStringListItem = result.GetNestedStringList().at(0); + EXPECT_EQ(2U, resultNestedStringListItem.size()); + EXPECT_EQ(R"(foo)", resultNestedStringListItem.at(0)); + EXPECT_EQ(R"(bar)", resultNestedStringListItem.at(1)); + } + { + const Aws::Vector& resultNestedStringListItem = result.GetNestedStringList().at(1); + EXPECT_EQ(2U, resultNestedStringListItem.size()); + EXPECT_EQ(R"(baz)", resultNestedStringListItem.at(0)); + EXPECT_EQ(R"(qux)", resultNestedStringListItem.at(1)); + } + const Aws::Vector& resultRenamedListMembersItem = result.GetRenamedListMembers(); + EXPECT_EQ(2U, resultRenamedListMembersItem.size()); + EXPECT_EQ(R"(foo)", resultRenamedListMembersItem.at(0)); + EXPECT_EQ(R"(bar)", resultRenamedListMembersItem.at(1)); + const Aws::Vector& resultFlattenedListItem = result.GetFlattenedList(); + EXPECT_EQ(2U, resultFlattenedListItem.size()); + EXPECT_EQ(R"(hi)", resultFlattenedListItem.at(0)); + EXPECT_EQ(R"(bye)", resultFlattenedListItem.at(1)); + const Aws::Vector& resultFlattenedList2Item = result.GetFlattenedList2(); + EXPECT_EQ(2U, resultFlattenedList2Item.size()); + EXPECT_EQ(R"(yep)", resultFlattenedList2Item.at(0)); + EXPECT_EQ(R"(nope)", resultFlattenedList2Item.at(1)); + const Aws::Vector& resultFlattenedListWithMemberNamespaceItem = result.GetFlattenedListWithMemberNamespace(); + EXPECT_EQ(2U, resultFlattenedListWithMemberNamespaceItem.size()); + EXPECT_EQ(R"(a)", resultFlattenedListWithMemberNamespaceItem.at(0)); + EXPECT_EQ(R"(b)", resultFlattenedListWithMemberNamespaceItem.at(1)); + const Aws::Vector& resultFlattenedListWithNamespaceItem = result.GetFlattenedListWithNamespace(); + EXPECT_EQ(2U, resultFlattenedListWithNamespaceItem.size()); + EXPECT_EQ(R"(a)", resultFlattenedListWithNamespaceItem.at(0)); + EXPECT_EQ(R"(b)", resultFlattenedListWithNamespaceItem.at(1)); + EXPECT_EQ(2U, result.GetStructureList().size()); + { + const StructureListMember& resultStructureListItem = result.GetStructureList().at(0); + EXPECT_EQ(R"(1)", resultStructureListItem.GetA()); + EXPECT_EQ(R"(2)", resultStructureListItem.GetB()); + } + { + const StructureListMember& resultStructureListItem = result.GetStructureList().at(1); + EXPECT_EQ(R"(3)", resultStructureListItem.GetA()); + EXPECT_EQ(R"(4)", resultStructureListItem.GetB()); + } + EXPECT_EQ(2U, result.GetFlattenedStructureList().size()); + { + const StructureListMember& resultFlattenedStructureListItem = result.GetFlattenedStructureList().at(0); + EXPECT_EQ(R"(5)", resultFlattenedStructureListItem.GetA()); + EXPECT_EQ(R"(6)", resultFlattenedStructureListItem.GetB()); + } + { + const StructureListMember& resultFlattenedStructureListItem = result.GetFlattenedStructureList().at(1); + EXPECT_EQ(R"(7)", resultFlattenedStructureListItem.GetA()); + EXPECT_EQ(R"(8)", resultFlattenedStructureListItem.GetB()); + } } diff --git a/generated/protocol-tests/tests/output/rest-xml/tests/XmlMapWithXmlNamespaceTest.cpp b/generated/protocol-tests/tests/output/rest-xml/tests/XmlMapWithXmlNamespaceTest.cpp index 3e0253db7b0..f56d6948b4b 100644 --- a/generated/protocol-tests/tests/output/rest-xml/tests/XmlMapWithXmlNamespaceTest.cpp +++ b/generated/protocol-tests/tests/output/rest-xml/tests/XmlMapWithXmlNamespaceTest.cpp @@ -23,7 +23,14 @@ AWS_PROTOCOL_TEST(XmlMapWithXmlNamespace, RestXmlXmlMapWithXmlNamespace) { XmlMapWithXmlNamespaceRequest request; auto outcome = client.XmlMapWithXmlNamespace(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const XmlMapWithXmlNamespaceResult& result = outcome.GetResult(); + /* expectedResult = R"( {"myMap":{"a":"A","b":"B"}} )" */ + const Aws::Map& resultMyMap = result.GetMyMap(); + EXPECT_EQ(2U, resultMyMap.size()); + EXPECT_TRUE(resultMyMap.find("a") != resultMyMap.end()); + EXPECT_EQ(R"(A)", resultMyMap.at("a")); + EXPECT_TRUE(resultMyMap.find("b") != resultMyMap.end()); + EXPECT_EQ(R"(B)", resultMyMap.at("b")); } diff --git a/generated/protocol-tests/tests/output/rest-xml/tests/XmlMapsTest.cpp b/generated/protocol-tests/tests/output/rest-xml/tests/XmlMapsTest.cpp index 52af9c32249..b85795790cc 100644 --- a/generated/protocol-tests/tests/output/rest-xml/tests/XmlMapsTest.cpp +++ b/generated/protocol-tests/tests/output/rest-xml/tests/XmlMapsTest.cpp @@ -23,7 +23,20 @@ AWS_PROTOCOL_TEST(XmlMaps, XmlMaps) { XmlMapsRequest request; auto outcome = client.XmlMaps(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const XmlMapsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"myMap":{"foo":{"hi":"there"},"baz":{"hi":"bye"}}} )" */ + const Aws::Map& resultMyMap = result.GetMyMap(); + EXPECT_EQ(2U, resultMyMap.size()); + { + EXPECT_TRUE(resultMyMap.find("foo") != resultMyMap.end()); + const GreetingStruct& resultMyMapItem = resultMyMap.at("foo"); + EXPECT_EQ(R"(there)", resultMyMapItem.GetHi()); + } + { + EXPECT_TRUE(resultMyMap.find("baz") != resultMyMap.end()); + const GreetingStruct& resultMyMapItem = resultMyMap.at("baz"); + EXPECT_EQ(R"(bye)", resultMyMapItem.GetHi()); + } } diff --git a/generated/protocol-tests/tests/output/rest-xml/tests/XmlMapsXmlNameTest.cpp b/generated/protocol-tests/tests/output/rest-xml/tests/XmlMapsXmlNameTest.cpp index 646a40bf9fb..1bcabac5633 100644 --- a/generated/protocol-tests/tests/output/rest-xml/tests/XmlMapsXmlNameTest.cpp +++ b/generated/protocol-tests/tests/output/rest-xml/tests/XmlMapsXmlNameTest.cpp @@ -23,7 +23,20 @@ AWS_PROTOCOL_TEST(XmlMapsXmlName, XmlMapsXmlName) { XmlMapsXmlNameRequest request; auto outcome = client.XmlMapsXmlName(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const XmlMapsXmlNameResult& result = outcome.GetResult(); + /* expectedResult = R"( {"myMap":{"foo":{"hi":"there"},"baz":{"hi":"bye"}}} )" */ + const Aws::Map& resultMyMap = result.GetMyMap(); + EXPECT_EQ(2U, resultMyMap.size()); + { + EXPECT_TRUE(resultMyMap.find("foo") != resultMyMap.end()); + const GreetingStruct& resultMyMapItem = resultMyMap.at("foo"); + EXPECT_EQ(R"(there)", resultMyMapItem.GetHi()); + } + { + EXPECT_TRUE(resultMyMap.find("baz") != resultMyMap.end()); + const GreetingStruct& resultMyMapItem = resultMyMap.at("baz"); + EXPECT_EQ(R"(bye)", resultMyMapItem.GetHi()); + } } diff --git a/generated/protocol-tests/tests/output/rest-xml/tests/XmlNamespacesTest.cpp b/generated/protocol-tests/tests/output/rest-xml/tests/XmlNamespacesTest.cpp index 67ede253464..501e3c1182d 100644 --- a/generated/protocol-tests/tests/output/rest-xml/tests/XmlNamespacesTest.cpp +++ b/generated/protocol-tests/tests/output/rest-xml/tests/XmlNamespacesTest.cpp @@ -23,7 +23,16 @@ AWS_PROTOCOL_TEST(XmlNamespaces, XmlNamespaces) { XmlNamespacesRequest request; auto outcome = client.XmlNamespaces(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const XmlNamespacesResult& result = outcome.GetResult(); + /* expectedResult = R"( {"nested":{"foo":"Foo","values":["Bar","Baz"]}} )" */ + { + const XmlNamespaceNested& resultNested = result.GetNested(); + EXPECT_EQ(R"(Foo)", resultNested.GetFoo()); + const Aws::Vector& resultNestedValuesItem = resultNested.GetValues(); + EXPECT_EQ(2U, resultNestedValuesItem.size()); + EXPECT_EQ(R"(Bar)", resultNestedValuesItem.at(0)); + EXPECT_EQ(R"(Baz)", resultNestedValuesItem.at(1)); + } } diff --git a/generated/protocol-tests/tests/output/rest-xml/tests/XmlTimestampsTest.cpp b/generated/protocol-tests/tests/output/rest-xml/tests/XmlTimestampsTest.cpp index 2b49dfd571f..e528f75f2c4 100644 --- a/generated/protocol-tests/tests/output/rest-xml/tests/XmlTimestampsTest.cpp +++ b/generated/protocol-tests/tests/output/rest-xml/tests/XmlTimestampsTest.cpp @@ -23,9 +23,11 @@ AWS_PROTOCOL_TEST(XmlTimestamps, XmlTimestamps) { XmlTimestampsRequest request; auto outcome = client.XmlTimestamps(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const XmlTimestampsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"normal":1398796238} )" */ + EXPECT_EQ(Aws::Utils::DateTime(1398796238L), result.GetNormal()); } AWS_PROTOCOL_TEST(XmlTimestamps, XmlTimestampsWithDateTimeFormat) { @@ -40,9 +42,11 @@ AWS_PROTOCOL_TEST(XmlTimestamps, XmlTimestampsWithDateTimeFormat) { XmlTimestampsRequest request; auto outcome = client.XmlTimestamps(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const XmlTimestampsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"dateTime":1398796238} )" */ + EXPECT_EQ(Aws::Utils::DateTime(1398796238L), result.GetDateTime()); } AWS_PROTOCOL_TEST(XmlTimestamps, XmlTimestampsWithDateTimeOnTargetFormat) { @@ -57,9 +61,11 @@ AWS_PROTOCOL_TEST(XmlTimestamps, XmlTimestampsWithDateTimeOnTargetFormat) { XmlTimestampsRequest request; auto outcome = client.XmlTimestamps(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const XmlTimestampsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"dateTimeOnTarget":1398796238} )" */ + EXPECT_EQ(Aws::Utils::DateTime(1398796238L), result.GetDateTimeOnTarget()); } AWS_PROTOCOL_TEST(XmlTimestamps, XmlTimestampsWithEpochSecondsFormat) { @@ -74,9 +80,11 @@ AWS_PROTOCOL_TEST(XmlTimestamps, XmlTimestampsWithEpochSecondsFormat) { XmlTimestampsRequest request; auto outcome = client.XmlTimestamps(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const XmlTimestampsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"epochSeconds":1398796238} )" */ + EXPECT_EQ(Aws::Utils::DateTime(1398796238L), result.GetEpochSeconds()); } AWS_PROTOCOL_TEST(XmlTimestamps, XmlTimestampsWithEpochSecondsOnTargetFormat) { @@ -91,9 +99,11 @@ AWS_PROTOCOL_TEST(XmlTimestamps, XmlTimestampsWithEpochSecondsOnTargetFormat) { XmlTimestampsRequest request; auto outcome = client.XmlTimestamps(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const XmlTimestampsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"epochSecondsOnTarget":1398796238} )" */ + EXPECT_EQ(Aws::Utils::DateTime(1398796238L), result.GetEpochSecondsOnTarget()); } AWS_PROTOCOL_TEST(XmlTimestamps, XmlTimestampsWithHttpDateFormat) { @@ -108,9 +118,11 @@ AWS_PROTOCOL_TEST(XmlTimestamps, XmlTimestampsWithHttpDateFormat) { XmlTimestampsRequest request; auto outcome = client.XmlTimestamps(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const XmlTimestampsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"httpDate":1398796238} )" */ + EXPECT_EQ(Aws::Utils::DateTime(1398796238L), result.GetHttpDate()); } AWS_PROTOCOL_TEST(XmlTimestamps, XmlTimestampsWithHttpDateOnTargetFormat) { @@ -125,7 +137,9 @@ AWS_PROTOCOL_TEST(XmlTimestamps, XmlTimestampsWithHttpDateOnTargetFormat) { XmlTimestampsRequest request; auto outcome = client.XmlTimestamps(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const XmlTimestampsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"httpDateOnTarget":1398796238} )" */ + EXPECT_EQ(Aws::Utils::DateTime(1398796238L), result.GetHttpDateOnTarget()); } diff --git a/generated/protocol-tests/tests/output/rest-xml/tests/XmlUnionsTest.cpp b/generated/protocol-tests/tests/output/rest-xml/tests/XmlUnionsTest.cpp index fb32ad84b17..62375ae15ec 100644 --- a/generated/protocol-tests/tests/output/rest-xml/tests/XmlUnionsTest.cpp +++ b/generated/protocol-tests/tests/output/rest-xml/tests/XmlUnionsTest.cpp @@ -23,9 +23,24 @@ AWS_PROTOCOL_TEST(XmlUnions, XmlUnionsWithStructMember) { XmlUnionsRequest request; auto outcome = client.XmlUnions(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const XmlUnionsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"unionValue":{"structValue":{"stringValue":"string","booleanValue":true,"byteValue":1,"shortValue":2,"integerValue":3,"longValue":4,"floatValue":5.5,"doubleValue":6.5}}} )" */ + { + const XmlUnionShape& resultUnionValue = result.GetUnionValue(); + { + const XmlNestedUnionStruct& resultUnionValueStructValue = resultUnionValue.GetStructValue(); + EXPECT_EQ(R"(string)", resultUnionValueStructValue.GetStringValue()); + EXPECT_EQ(true, resultUnionValueStructValue.GetBooleanValue()); + EXPECT_EQ(1, resultUnionValueStructValue.GetByteValue()); + EXPECT_EQ(2, resultUnionValueStructValue.GetShortValue()); + EXPECT_EQ(3, resultUnionValueStructValue.GetIntegerValue()); + EXPECT_EQ(4, resultUnionValueStructValue.GetLongValue()); + EXPECT_EQ(5.5, resultUnionValueStructValue.GetFloatValue()); + EXPECT_EQ(6.5, resultUnionValueStructValue.GetDoubleValue()); + } + } } AWS_PROTOCOL_TEST(XmlUnions, XmlUnionsWithStringMember) { @@ -40,9 +55,14 @@ AWS_PROTOCOL_TEST(XmlUnions, XmlUnionsWithStringMember) { XmlUnionsRequest request; auto outcome = client.XmlUnions(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const XmlUnionsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"unionValue":{"stringValue":"some string"}} )" */ + { + const XmlUnionShape& resultUnionValue = result.GetUnionValue(); + EXPECT_EQ(R"(some string)", resultUnionValue.GetStringValue()); + } } AWS_PROTOCOL_TEST(XmlUnions, XmlUnionsWithBooleanMember) { @@ -57,9 +77,14 @@ AWS_PROTOCOL_TEST(XmlUnions, XmlUnionsWithBooleanMember) { XmlUnionsRequest request; auto outcome = client.XmlUnions(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const XmlUnionsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"unionValue":{"booleanValue":true}} )" */ + { + const XmlUnionShape& resultUnionValue = result.GetUnionValue(); + EXPECT_EQ(true, resultUnionValue.GetBooleanValue()); + } } AWS_PROTOCOL_TEST(XmlUnions, XmlUnionsWithUnionMember) { @@ -74,7 +99,15 @@ AWS_PROTOCOL_TEST(XmlUnions, XmlUnionsWithUnionMember) { XmlUnionsRequest request; auto outcome = client.XmlUnions(request); - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); - ValidateRequestSent(); + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); + const XmlUnionsResult& result = outcome.GetResult(); + /* expectedResult = R"( {"unionValue":{"unionValue":{"booleanValue":true}}} )" */ + { + const XmlUnionShape& resultUnionValue = result.GetUnionValue(); + { + const XmlUnionShape& resultUnionValueUnionValue = resultUnionValue.GetUnionValue(); + EXPECT_EQ(true, resultUnionValueUnionValue.GetBooleanValue()); + } + } } diff --git a/tools/code-generation/generator/src/main/java/com/amazonaws/util/awsclientgenerator/domainmodels/c2j_protocol_test/C2jGiven.java b/tools/code-generation/generator/src/main/java/com/amazonaws/util/awsclientgenerator/domainmodels/c2j_protocol_test/C2jGiven.java index 479061122f7..67fb27a045a 100644 --- a/tools/code-generation/generator/src/main/java/com/amazonaws/util/awsclientgenerator/domainmodels/c2j_protocol_test/C2jGiven.java +++ b/tools/code-generation/generator/src/main/java/com/amazonaws/util/awsclientgenerator/domainmodels/c2j_protocol_test/C2jGiven.java @@ -21,6 +21,11 @@ public class C2jGivenInput { private String locationName; } + @Data + public class C2jGivenOutput { + private String shape; + } + @Data public class C2jGivenEndpoint { private String hostPrefix; @@ -29,5 +34,6 @@ public class C2jGivenEndpoint { private String name; private C2jGivenHttp http; private C2jGivenInput input; + private C2jGivenOutput output; private C2jGivenEndpoint endpoint; } diff --git a/tools/code-generation/generator/src/main/java/com/amazonaws/util/awsclientgenerator/generators/cpp/CppProtocolTestGenerator.java b/tools/code-generation/generator/src/main/java/com/amazonaws/util/awsclientgenerator/generators/cpp/CppProtocolTestGenerator.java index 2c93d97a274..f87b0b44505 100644 --- a/tools/code-generation/generator/src/main/java/com/amazonaws/util/awsclientgenerator/generators/cpp/CppProtocolTestGenerator.java +++ b/tools/code-generation/generator/src/main/java/com/amazonaws/util/awsclientgenerator/generators/cpp/CppProtocolTestGenerator.java @@ -56,6 +56,8 @@ public CppProtocolTestGenerator(ServiceModel serviceModel, ProtocolTestModel tes velocityEngine.setProperty(RuntimeConstants.SPACE_GOBBLING, RuntimeConstants.SpaceGobbling.BC.toString()); velocityEngine.init(); + + legacyPatchEc2Model(); } protected SdkFileEntry generateTestSuiteSourceFile(ProtocolTestSuite testSuite) throws IOException { @@ -141,10 +143,10 @@ protected final SdkFileEntry makeFile(Template template, VelocityContext context ); private List computeTestSourceIncludes(ProtocolTestSuite testSuite) { - Set set = testSuite.getCases().stream() + Set set = testSuite.getShapes().entrySet().stream() .map(entry -> { - Shape shape = serviceModel.getShapes().getOrDefault(entry.getGiven().getName(), - serviceModel.getShapes().get(entry.getGiven().getName() + "Request")); + Shape shape = serviceModel.getShapes().getOrDefault(entry.getKey(), + serviceModel.getShapes().get(entry.getKey() + "Request")); // operation with no input shape defined but cpp sdk generates an empty request class Set includes = shape != null ? CppViewHelper.computeSourceIncludes(serviceModel.getMetadata().getProjectName(), shape) : @@ -157,7 +159,14 @@ private List computeTestSourceIncludes(ProtocolTestSuite testSuite) { } } - // include the request shape itself + return includes; + }) + .flatMap(entrySet -> entrySet.stream()) + .collect(Collectors.toSet()); + // include the request shapes + Set requestShapes = testSuite.getCases().stream() + .map(entry -> { + Set includes = new HashSet<>(); includes.add(String.format("", serviceModel.getMetadata().getProjectName(), entry.getGiven().getName() + "Request")); @@ -165,7 +174,33 @@ private List computeTestSourceIncludes(ProtocolTestSuite testSuite) { }) .flatMap(entrySet -> entrySet.stream()) .collect(Collectors.toSet()); + + set.addAll(requestShapes); set.removeAll(HEADERS_TO_NOT_INCLUDE); return set.stream().sorted().collect(Collectors.toList()); } + + /** + * Perform legacy patching of the ec2 model present from the very beginning. + */ + private void legacyPatchEc2Model() { + if (!serviceModel.getMetadata().getProtocol().equals("ec2")) { + return; + } + + List keysToRename = new LinkedList<>(); + Map shapes = serviceModel.getShapes(); + for (final String key : shapes.keySet()) { + final Shape shape = shapes.get(key); + shape.setName(shape.getName().replaceAll("Result$", "Response")); + shape.setType(shape.getType().replaceAll("Result$", "Response")); + keysToRename.add(key); + } + + for (final String key : keysToRename) { + final Shape shape = shapes.get(key); + shapes.remove(key); + shapes.put(key.replaceAll("Result$", "Response"), shape); + } + } } diff --git a/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/protocoltests/ProtocolTestsTestSuiteSrc.vm b/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/protocoltests/ProtocolTestsTestSuiteSrc.vm index 03fc1bca98d..503ab397f60 100644 --- a/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/protocoltests/ProtocolTestsTestSuiteSrc.vm +++ b/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/protocoltests/ProtocolTestsTestSuiteSrc.vm @@ -38,17 +38,6 @@ AWS_PROTOCOL_TEST($testSuite.name, $case.id) { #parse("com/amazonaws/util/awsclientgenerator/velocity/cpp/protocoltests/request/FillRequest.vm") auto outcome = client.${case.given.name}(request); -#if($case.input) - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); -#else -#if($case.output.get().successResult) - AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); -#end -#if($case.output.get().errorResult) - ASSERT_FALSE(outcome.IsSuccess()); -#end -#end - #if($case.input) #set($serialized = $case.input.get().serialized) ExpectedRequest expectedRq; @@ -89,5 +78,6 @@ AWS_PROTOCOL_TEST($testSuite.name, $case.id) { #else ValidateRequestSent(); #end +#parse("com/amazonaws/util/awsclientgenerator/velocity/cpp/protocoltests/result/ValidateOutcome.vm") } #end diff --git a/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/protocoltests/result/ValidateListMacro.vm b/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/protocoltests/result/ValidateListMacro.vm new file mode 100644 index 00000000000..7c9070a317b --- /dev/null +++ b/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/protocoltests/result/ValidateListMacro.vm @@ -0,0 +1,57 @@ +#parse("com/amazonaws/util/awsclientgenerator/velocity/cpp/protocoltests/result/ValidateSingleParameterMacro.vm") +#parse("com/amazonaws/util/awsclientgenerator/velocity/cpp/protocoltests/result/ValidateParamsMacro.vm") +##-------------------- ValidateListMacro macro +#macro( ValidateListMacro $spaces $dstObject $listShape $testValidateParam $listGetter="") +#set($macro.spaces = $spaces) +#set($macro.listMemberShape=$listShape.listMember.shape) +#if(false) +/* ValidateListMacro dstObject = $dstObject */ +/* ValidateListMacro listShape = $listShape */ +/* ValidateListMacro testValidateParam = $testValidateParam */ +/* ValidateListMacro listGetter = $listGetter */ +#break +#end +#set($macro.fieldGetter = $listGetter) +#if($macro.fieldGetter) +## this is a nested list (i.e. a list inside a map/list/structure) +#set($testValidateParamVal = $testValidateParam) +#set($macro.listItemVarName = "${dstObject}Item") +#else +## this is list at the root level) +#set($macro.fieldGetter = "Get${CppViewHelper.capitalizeFirstChar($testValidateParam.key)}()") +#set($testValidateParamVal = $testValidateParam.value) +#set($macro.listItemVarName = "${dstObject}${CppViewHelper.capitalizeFirstChar(${CppViewHelper.computeVariableName($testValidateParam.key)})}Item") +#end +#if($macro.listMemberShape.list || $macro.listMemberShape.map || $macro.listMemberShape.structure) +${macro.spaces}EXPECT_EQ(${testValidateParamVal.size()}U, ${dstObject}.${macro.fieldGetter}.size()); +#foreach($arrayItem in $testValidateParamVal) +${macro.spaces}{ +#if($macro.listMemberShape.list) + ${macro.spaces}const Aws::Vector<$CppViewHelper.computeCppType($macro.listMemberShape.listMember.shape)>& $macro.listItemVarName = ${dstObject}.${macro.fieldGetter}.at(${foreach.index}); + ${macro.spaces}EXPECT_EQ(${arrayItem.size()}U, ${macro.listItemVarName}.size()); +#foreach($innerListEl in $arrayItem) + ${macro.spaces}EXPECT_EQ(#ValidateSingleParameterMacro($macro.listMemberShape.listMember.shape, $innerListEl), ${macro.listItemVarName}.at(${foreach.index})); +#end +#elseif($macro.listMemberShape.map) + ${macro.spaces}const Aws::Map<$CppViewHelper.computeCppType($macro.listMemberShape.mapKey.shape), $CppViewHelper.computeCppType($macro.listMemberShape.mapValue.shape)>& $macro.listItemVarName = ${dstObject}.${macro.fieldGetter}.at(${foreach.index}); + ${macro.spaces}EXPECT_EQ(${arrayItem.size()}U, ${macro.listItemVarName}.size()); +#foreach($innerMapEl in $arrayItem.fields()) + ${macro.spaces}EXPECT_TRUE(${macro.listItemVarName}.find("$innerMapEl.key") != ${macro.listItemVarName}.end()); + ${macro.spaces}EXPECT_EQ(${macro.listItemVarName}.at("$innerMapEl.key"), #ValidateSingleParameterMacro($macro.listMemberShape.mapValue.shape, $innerMapEl.value)); +#end +#elseif($macro.listMemberShape.structure) + ${macro.spaces}const ${macro.listMemberShape.name}& $macro.listItemVarName = ${dstObject}.${macro.fieldGetter}.at(${foreach.index}); +#foreach($innerParam in $arrayItem.fields()) +#ValidateParamsMacro("${macro.spaces} " $macro.listItemVarName $macro.listMemberShape $innerParam) +#end +#end##list +${macro.spaces}} +#end##foreach +#else## not (list || map || structure) +${macro.spaces}const Aws::Vector<$CppViewHelper.computeCppType($macro.listMemberShape)>& $macro.listItemVarName = ${dstObject}.${macro.fieldGetter}; +${macro.spaces}EXPECT_EQ(${testValidateParamVal.size()}U, ${macro.listItemVarName}.size()); +#foreach($arrayItem in $testValidateParamVal) +${macro.spaces}EXPECT_EQ(#ValidateSingleParameterMacro($macro.listMemberShape, $arrayItem), ${macro.listItemVarName}.at(${foreach.index})); +#end +#end##(list || map || structure) +#end##macro ValidateListMacro \ No newline at end of file diff --git a/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/protocoltests/result/ValidateMapMacro.vm b/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/protocoltests/result/ValidateMapMacro.vm new file mode 100644 index 00000000000..845748270b7 --- /dev/null +++ b/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/protocoltests/result/ValidateMapMacro.vm @@ -0,0 +1,51 @@ +#parse("com/amazonaws/util/awsclientgenerator/velocity/cpp/protocoltests/result/ValidateSingleParameterMacro.vm") +#parse("com/amazonaws/util/awsclientgenerator/velocity/cpp/protocoltests/result/ValidateSingleVariableMacro.vm") +##-------------------- ValidateMapMacro macro +#macro( ValidateMapMacro $spaces $dstObject $mapShape $testValidateParam $mapGetter="") +#set($macro.fieldGetter = $mapGetter) +#if($macro.fieldGetter) +## this is a nested map (i.e. a list inside a map/list/structure) +#set($testValidateParamVal = $testValidateParam) +#set($macro.mapVarName = "${dstObject}NestedMap") +#set($macro.mapItemVarName = "${dstObject}Item") +#else +## this is map at the root level) +#set($macro.fieldGetter = "Get${CppViewHelper.capitalizeFirstChar($testValidateParam.key)}()") +#set($testValidateParamVal = $testValidateParam.value) +#set($macro.mapVarName = "${dstObject}${CppViewHelper.capitalizeFirstChar(${CppViewHelper.computeVariableName($testValidateParam.key)})}") +#set($macro.mapItemVarName = "${dstObject}${CppViewHelper.capitalizeFirstChar(${CppViewHelper.computeVariableName($testValidateParam.key)})}Item") +#end +#set($macro.spaces = $spaces) +#if($mapShape.mapValue.shape.document) +${macro.spaces}const Aws::Map<$CppViewHelper.computeCppType($mapShape.mapKey.shape), $CppViewHelper.computeCppType($mapShape.mapValue.shape)>& $macro.mapVarName = ${dstObject}.${macro.fieldGetter}; +${macro.spaces}EXPECT_EQ(${testValidateParamVal.size()}U, ${macro.mapVarName}.size()); +#foreach($mapItem in $testValidateParamVal.fields()) +${macro.spaces}EXPECT_STREQ(R"j(${mapItem.value})j", ${macro.mapVarName}.at("$mapItem.key").View().WriteCompact().c_str()); +#end +#break +#end +#if($mapShape.mapValue.shape.structure) +${macro.spaces}const Aws::Map<$CppViewHelper.computeCppType($mapShape.mapKey.shape), $CppViewHelper.computeCppType($mapShape.mapValue.shape)>& $macro.mapVarName = ${dstObject}.${macro.fieldGetter}; +${macro.spaces}EXPECT_EQ(${testValidateParamVal.size()}U, ${macro.mapVarName}.size()); +#foreach($mapItem in $testValidateParamVal.fields()) +${macro.spaces}{ + ${macro.spaces}EXPECT_TRUE(${macro.mapVarName}.find("$mapItem.key") != ${macro.mapVarName}.end()); + ${macro.spaces}const $CppViewHelper.computeCppType($mapShape.mapValue.shape)& $macro.mapItemVarName = ${macro.mapVarName}.at("$mapItem.key"); +#foreach($innerParam in $mapItem.value.fields()) +#ValidateParamsMacro("${macro.spaces} " $macro.mapItemVarName $mapShape.mapValue.shape $innerParam) +#end +${macro.spaces}} +#end +#break +#end +###----- the map value is not nested structure or document +${macro.spaces}const Aws::Map<$CppViewHelper.computeCppType($mapShape.mapKey.shape), $CppViewHelper.computeCppType($mapShape.mapValue.shape)>& $macro.mapVarName = ${dstObject}.${macro.fieldGetter}; +${macro.spaces}EXPECT_EQ(${testValidateParamVal.size()}U, ${macro.mapVarName}.size()); +#foreach($mapItem in $testValidateParamVal.fields()) +${macro.spaces}EXPECT_TRUE(${macro.mapVarName}.find("$mapItem.key") != ${macro.mapVarName}.end()); +#set($macro.parentVarName = $macro.mapVarName) +#set($macro.getter = "at(" + '"' + $mapItem.key + '"' + ")") +#set($macro.var = $macro.mapItemVarName) +#ValidateSingleVariableMacro($macro.spaces, $mapShape.mapValue.shape, $mapItem.value, $macro.parentVarName, $macro.getter, $macro.var) +#end +#end##macro ValidateMapMacro \ No newline at end of file diff --git a/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/protocoltests/result/ValidateOutcome.vm b/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/protocoltests/result/ValidateOutcome.vm new file mode 100644 index 00000000000..03a626ba56a --- /dev/null +++ b/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/protocoltests/result/ValidateOutcome.vm @@ -0,0 +1,19 @@ +#parse("com/amazonaws/util/awsclientgenerator/velocity/cpp/protocoltests/result/ValidateParamsMacro.vm") +#if($case.input || $case.output.get().successResult) + AWS_ASSERT_SUCCESS(outcome) << outcome.GetError(); +#if($case.output && $case.output.get().successResult) +#set($expectedResult = $case.output.get().successResult.get().result.get()) +#set($responseShape = $serviceModel.operations.get("${case.given.name}").result.shape) +#if(!$expectedResult.isEmpty()) + const ${responseShape.name}& result = outcome.GetResult(); +#end + /* expectedResult = R"( ${expectedResult} )" */ +#foreach($param in $expectedResult.fields()) +#ValidateParamsMacro(" ", "result", $responseShape, $param) +#end +#end +#end +#if($case.output && $case.output.get().errorResult) + ASSERT_FALSE(outcome.IsSuccess()); +#set($expectedError = $case.output.get().errorResult.get().error.get()) +#end \ No newline at end of file diff --git a/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/protocoltests/result/ValidateParamsMacro.vm b/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/protocoltests/result/ValidateParamsMacro.vm new file mode 100644 index 00000000000..d778c6e8a0d --- /dev/null +++ b/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/protocoltests/result/ValidateParamsMacro.vm @@ -0,0 +1,39 @@ +#parse("com/amazonaws/util/awsclientgenerator/velocity/cpp/protocoltests/result/ValidateSingleParameterMacro.vm") +#parse("com/amazonaws/util/awsclientgenerator/velocity/cpp/protocoltests/result/ValidateListMacro.vm") +#parse("com/amazonaws/util/awsclientgenerator/velocity/cpp/protocoltests/result/ValidateMapMacro.vm") +##-------------------- ValidateParamsMacro macro +#macro( ValidateParamsMacro $spaces $dstObject $currentShape $testValidateParam ) +#set($macro.spaces = $spaces) +#if(!$currentShape.members.containsKey($testValidateParam.key) && $testValidateParam.key != "contentType") +static_assert(false, "Codegen failure: Test input has a key $testValidateParam.key not found in the model for the current shape: $currentShape"); +#end +#set($macro.fieldGetter = "Get${CppViewHelper.capitalizeFirstChar($testValidateParam.key)}") +#set($macro.memberToGet = $currentShape.members.get($testValidateParam.key)) +#if($macro.memberToGet.shape.list) +#ValidateListMacro($macro.spaces $dstObject $macro.memberToGet.shape $testValidateParam) +#elseif($macro.memberToGet.shape.map) +#ValidateMapMacro($macro.spaces $dstObject $macro.memberToGet.shape $testValidateParam) +#elseif($macro.memberToGet.shape.document) +#set($macro.innerStructVarName = "${dstObject}${CppViewHelper.capitalizeFirstChar(${CppViewHelper.computeVariableName($testValidateParam.key)})}") +${macro.spaces}{ + ${macro.spaces}const Aws::Utils::DocumentView& ${macro.innerStructVarName} = ${dstObject}.${macro.fieldGetter}(); + ${macro.spaces}EXPECT_STREQ(R"j(${testValidateParam.value})j", ${macro.innerStructVarName}.WriteCompact().c_str()); +${macro.spaces}} +#elseif($macro.memberToGet.shape.structure) +${macro.spaces}{ +#set($macro.innerStructVarName = "${dstObject}${CppViewHelper.capitalizeFirstChar(${CppViewHelper.computeVariableName($testValidateParam.key)})}") + ${macro.spaces}const ${macro.memberToGet.shape.name}& $macro.innerStructVarName = ${dstObject}.${macro.fieldGetter}(); +#foreach($innerParam in $testValidateParam.value.fields()) +#ValidateParamsMacro("${macro.spaces} ", $macro.innerStructVarName, $macro.memberToGet.shape, $innerParam) +#end +${macro.spaces}} +#elseif($testValidateParam.key != "contentType" && $currentShape.members.containsKey($testValidateParam.key) && $CppViewHelper.isStreamingPayloadMember($currentShape, $testValidateParam.key)) +#set($macro.payloadVarName = "${dstObject}${CppViewHelper.capitalizeFirstChar(${CppViewHelper.computeVariableName($testValidateParam.key)})}") +${macro.spaces}const Aws::String $macro.payloadVarName = [&${dstObject}](){Aws::StringStream ss; ss << ${dstObject}.${macro.fieldGetter}().rdbuf(); return ss.str();}(); +${macro.spaces}EXPECT_STREQ(R"(${testValidateParam.value.asText()})", ${macro.payloadVarName}.c_str()); +#elseif(!$macro.memberToGet) +${macro.spaces}EXPECT_EQ($testValidateParam.value, ${dstObject}.${macro.fieldGetter}()); +#else +${macro.spaces}EXPECT_EQ(#ValidateSingleParameterMacro($macro.memberToGet.shape, $testValidateParam.value), ${dstObject}.${macro.fieldGetter}()); +#end +#end##macro ValidateParamsMacro \ No newline at end of file diff --git a/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/protocoltests/result/ValidateSingleParameterMacro.vm b/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/protocoltests/result/ValidateSingleParameterMacro.vm new file mode 100644 index 00000000000..f3043b7dab7 --- /dev/null +++ b/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/protocoltests/result/ValidateSingleParameterMacro.vm @@ -0,0 +1,56 @@ +##-------------------- ValidateSingleParameterMacro macro +#macro( ValidateSingleParameterMacro $shape $value ) +##/* shape = R"($shape)"; value = $value */ ## +#if($shape.type == "float" || $shape.type == "double") +##float is code generated as double in CPP SDK +#if($value == '"NaN"') +std::numeric_limits::quiet_NaN()## +#elseif($value == '"Infinity"') +std::numeric_limits::infinity()## +#elseif($value == '"-Infinity"') +-std::numeric_limits::infinity()## +#else +${value}## +#end +#break +#end###if($shape.double) +#if($shape.primitive || $shape.boolean) +${value}## +#elseif($shape.string) +R"(${value.asText()})"## +#elseif($shape.blob) +Aws::Utils::ByteBuffer(R"(${value.asText()})")## +#elseif($shape.timeStamp) +#set($macro.tsVal = "${value}") +#if($macro.tsVal.contains(".") || $macro.tsVal.contains("E")) +Aws::Utils::DateTime(${value})## +#else +Aws::Utils::DateTime(${value}L)## +#end +#elseif($shape.enum) +${shape.name}Mapper::Get${shape.name}ForName(R"e(${value.asText()})e")## +#elseif($shape.list) +#set($macro.listResult="Aws::Vector<$CppViewHelper.computeCppType($shape)>({") +#foreach($listItem in $value) +#set($macro.listResult=$macro.listResult + "#ValidateSingleParameterMacro($shape.listMember.shape, $listItem)") +#if($foreach.hasNext)#set($macro.listResult=$macro.listResult + ", ")#end +#end +#set($macro.listResult=$macro.listResult + "})") +$macro.listResult## +#elseif($shape.map) +#set($macro.mapResult="Aws::Map<$CppViewHelper.computeCppType($shape.mapKey.shape), $CppViewHelper.computeCppType($shape.mapValue.shape)>({") +#foreach($mapItem in $value.fields()) +#set($macro.mapItem="{" + '"' + "$mapItem.key" + '"' + ", ") +#set($macro.mapItem=$macro.mapItem + "#ValidateSingleParameterMacro($shape.mapValue.shape, $mapItem.value)" + "}") +#set($macro.mapResult=$macro.mapResult + $macro.mapItem) +#if($foreach.hasNext)#set($macro.mapResult=$macro.mapResult + ", ")#end +#end +#set($macro.mapResult=$macro.mapResult + "})") +$macro.mapResult## +#elseif($shape.structure) +${shape.name}(JsonValue(R"j($value)j"))## +#else +${value}; +static_assert(false, R"(Codegen failure: Unsupported input $value for shape ${shape} with type ${shape.type})"; +#end +#end##macro ValidateSingleParameterMacro \ No newline at end of file diff --git a/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/protocoltests/result/ValidateSingleVariableMacro.vm b/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/protocoltests/result/ValidateSingleVariableMacro.vm new file mode 100644 index 00000000000..add89f5cac7 --- /dev/null +++ b/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/protocoltests/result/ValidateSingleVariableMacro.vm @@ -0,0 +1,26 @@ +#parse("com/amazonaws/util/awsclientgenerator/velocity/cpp/protocoltests/result/ValidateSingleParameterMacro.vm") +##-------------------- ValidateSingleVariableMacro macro +#macro( ValidateSingleVariableMacro $spaces $shape $expectedValue $parentVarName $getter $varName="" ) +#set($macro.spaces = $spaces) +##/* ValidateSingleVariableMacro: shape = R"($shape)"; expectedValue = R"($expectedValue)"; varName = R"($varName)" */ ## +#if($shape.list) +${macro.spaces}{ +#ValidateListMacro("${macro.spaces} ", $parentVarName, $shape, $expectedValue, $getter) +${macro.spaces}} +#break +#end +#if($shape.map) +${macro.spaces}{ +#ValidateMapMacro("${macro.spaces} ", $parentVarName, $shape, $expectedValue, $getter) +${macro.spaces}} +#break +#end +#if($shape.structure) +/* TODO: validate, currently no such case exist*/ +#foreach($innerParam in $arrayItem.fields()) +#ValidateParamsMacro("${macro.spaces} " "${parentVarName}.${getter}" $shape $expectedValue) +#end +#break +#end +${macro.spaces}EXPECT_EQ(#ValidateSingleParameterMacro($shape, $expectedValue), ${parentVarName}.${getter}); +#end##macro ValidateSingleVariableMacro \ No newline at end of file diff --git a/tools/scripts/run_protocol_tests.py b/tools/scripts/run_protocol_tests.py new file mode 100644 index 00000000000..b286864d8d2 --- /dev/null +++ b/tools/scripts/run_protocol_tests.py @@ -0,0 +1,136 @@ +#!/usr/bin/env python3 + +# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +# SPDX-License-Identifier: Apache-2.0. + +""" +A script to run protocol tests for AWS SDK for C++: +Provided --build_dir, it runs each built protocol test found. +For each test executed, a mock http server is launched in parallel. +""" +import argparse +import os +import shutil +import signal +import subprocess +import time + +SCRIPTS_DIR = os.path.dirname(__file__) +PROTO_TEST_MOCK_HANDLER = f"{SCRIPTS_DIR}/protocol_tests_mock_server/protocol_tests_mock_server.py" + + +def parse_arguments() -> dict: + """Parse arguments and/or print help + + :return: dict with parsed arguments + """ + parser = argparse.ArgumentParser(description="Protocol tests driver for AWS-SDK-CPP") + parser.add_argument("--debug", action="store_true", help="Print additional information") + parser.add_argument("--build_dir", action="store", required=True, help="Path to a directory with built SDK") + args = vars(parser.parse_args()) + arg_map = {"debug": args.get("debug", False)} + arg_map["build_dir"] = args.get("build_dir") + return arg_map + + +class MockHttpServerHandle: + """A RAII-style helper wrapper around mini mock http server. + Launches a server on construction and kills it on destruction + """ + + def __init__(self): + python_cmd = [shutil.which("python3"), PROTO_TEST_MOCK_HANDLER] + self.process = subprocess.Popen(python_cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + print(f"Started mock server with PID {self.process.pid}") + + def __del__(self): + """Destructor that sends Ctrl-C/SIGINT to the subprocess.""" + if self.process and self.process.poll() is None: + print(f"Sending SIGINT to subprocess with PID {self.process.pid}") + if os.name == 'nt': # Windows + self.process.send_signal(signal.CTRL_C_EVENT) + else: # Unix-like + self.process.send_signal(signal.SIGINT) + + time.sleep(0.5) + + if self.process.poll() is None: + print(f"Process didn't terminate, sending SIGTERM to PID {self.process.pid}") + self.process.terminate() + + self.process.wait() + print(f"Subprocess with PID {self.process.pid} terminated") + print(f"Mock http logs:\n{self.process.communicate()[0]}\n") + + def is_running(self): + """Check if the subprocess is still running.""" + return self.process.poll() is None if self.process else False + + def wait(self): + """Wait for the subprocess to complete.""" + if self.process: + return self.process.wait() + return None + + +class ProtocolTestRunner: + """Actual test runner: collects available tests and runs them + """ + + def __init__(self, args): + self.debug = args.get("debug", False) + self.build_dir = args.get("build_dir") + self.args = args + self.fail = False + + def run(self): + tests = self._collect_tests() + if not tests or not len(tests): + print(f"No protocol tests found in {self.build_dir}") + self.fail = True + for test in tests: + mock_server = MockHttpServerHandle() + try: + process = subprocess.run([test], timeout=6 * 60, check=True) + process.check_returncode() + except Exception as exc: + print(f"Protocol test {test} failed with exception: {exc}") + self.fail = True + + def _collect_tests(self): + all_tests = [] + protocol_tests_root = self.build_dir + "/generated/protocol-tests/tests" + test_groups = os.listdir(protocol_tests_root) + for test_group in test_groups: + if not os.path.isdir("/".join([protocol_tests_root, test_group])): + continue + test_protocols = os.listdir("/".join([protocol_tests_root, test_group])) + for test_protocol in test_protocols: + test_protocol_exe = "/".join( + [protocol_tests_root, test_group, test_protocol, f"protocol-{test_protocol}-{test_group}-tests"]) + if not os.path.isfile(test_protocol_exe): + print(f"Found a build directory for a test {test_protocol_exe} but no binary found!") + self.fail = True + else: + print(f"Found protocol tests {test_protocol}") + all_tests.append(test_protocol_exe) + return all_tests + + +def main(): + """Main entrypoint for protocol tests runner + :return: 0 if success, failure otherwise + """ + if not os.path.isfile(PROTO_TEST_MOCK_HANDLER): + print("Can't find protocol_tests_mock_server.py") + exit(-1) + args = parse_arguments() + runner = ProtocolTestRunner(args) + runner.run() + + return runner.fail + + +if __name__ == "__main__": + ret_code = main() + exit(ret_code)