diff --git a/test/ruleset-testing-core/src/main/java/software/amazon/awssdk/core/rules/testing/BaseEndpointProviderTest.java b/test/ruleset-testing-core/src/main/java/software/amazon/awssdk/core/rules/testing/BaseEndpointProviderTest.java index db94ae170ff9..ed0a197575e9 100644 --- a/test/ruleset-testing-core/src/main/java/software/amazon/awssdk/core/rules/testing/BaseEndpointProviderTest.java +++ b/test/ruleset-testing-core/src/main/java/software/amazon/awssdk/core/rules/testing/BaseEndpointProviderTest.java @@ -22,13 +22,16 @@ import software.amazon.awssdk.awscore.endpoints.AwsEndpointAttribute; import software.amazon.awssdk.core.rules.testing.model.Expect; import software.amazon.awssdk.endpoints.Endpoint; +import software.amazon.awssdk.utils.http.SdkHttpUtils; public class BaseEndpointProviderTest { protected final void verify(EndpointProviderTestCase tc) { Expect expect = tc.getExpect(); Supplier testMethod = tc.getTestMethod(); if (expect.error() != null) { - assertThatThrownBy(testMethod::get).hasMessageContaining(expect.error()); + assertThatThrownBy(testMethod::get).satisfiesAnyOf( + e -> assertThat(e).hasMessageContaining(expect.error()), + e -> assertThat(decodeOrSelf(e.getMessage())).contains(expect.error())); } else { Endpoint actualEndpoint = testMethod.get(); Endpoint expectedEndpoint = expect.endpoint(); @@ -43,4 +46,15 @@ protected final void verify(EndpointProviderTestCase tc) { }); } } + + private static String decodeOrSelf(String message) { + if (message == null) { + return null; + } + try { + return SdkHttpUtils.urlDecode(message); + } catch (IllegalArgumentException e) { + return message; + } + } }