diff --git a/codegen-server/src/main/kotlin/software/amazon/smithy/rust/codegen/server/smithy/generators/protocol/ServerProtocolTestGenerator.kt b/codegen-server/src/main/kotlin/software/amazon/smithy/rust/codegen/server/smithy/generators/protocol/ServerProtocolTestGenerator.kt index 9727ca580b..08f29b8ea5 100644 --- a/codegen-server/src/main/kotlin/software/amazon/smithy/rust/codegen/server/smithy/generators/protocol/ServerProtocolTestGenerator.kt +++ b/codegen-server/src/main/kotlin/software/amazon/smithy/rust/codegen/server/smithy/generators/protocol/ServerProtocolTestGenerator.kt @@ -759,9 +759,6 @@ class ServerProtocolTestGenerator( private const val RestJsonValidation = "aws.protocoltests.restjson.validation#RestJsonValidation" private const val MalformedRangeValidation = "aws.protocoltests.extras.restjson.validation#MalformedRangeValidation" private val ExpectFail: Set = setOf( - // Pending merge from the Smithy team: see https://github.com/awslabs/smithy/pull/1477. - FailingTest(RestJson, "RestJsonWithPayloadExpectsImpliedContentType", TestType.MalformedRequest), - // Pending resolution from the Smithy team, see https://github.com/awslabs/smithy/issues/1068. FailingTest(RestJson, "RestJsonHttpWithHeadersButNoPayload", TestType.Request), @@ -915,6 +912,8 @@ class ServerProtocolTestGenerator( "queryTimestamp": 1, "queryTimestampList": [1, 2, 3], "queryEnum": "Foo", + "queryIntegerEnum": 1, + "queryIntegerEnumList": [1,2,3], "queryEnumList": ["Foo", "Baz", "Bar"], "queryParamsMapOfStringList": { "String": ["Hello there"], @@ -992,7 +991,7 @@ class ServerProtocolTestGenerator( // TODO(https://github.com/awslabs/smithy-rs/issues/1288): Contribute a PR to fix them upstream. private val BrokenRequestTests = mapOf( // TODO(https://github.com/awslabs/smithy/pull/1564) - Pair(RestJson, "RestJsonAllQueryStringTypes") to ::fixRestJsonAllQueryStringTypes, + // Pair(RestJson, "RestJsonAllQueryStringTypes") to ::fixRestJsonAllQueryStringTypes, // TODO(https://github.com/awslabs/smithy/pull/1562) Pair(RestJson, "RestJsonQueryStringEscaping") to ::fixRestJsonQueryStringEscaping, ) diff --git a/gradle.properties b/gradle.properties index 4539140646..575f93afff 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,7 +15,7 @@ kotlin.code.style=official # codegen smithyGradlePluginVersion=0.6.0 -smithyVersion=1.27.1 +smithyVersion=1.27.2 # kotlin kotlinVersion=1.6.21