Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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<Endpoint> 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();
Expand All @@ -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;
}
}
}
Loading