diff --git a/services/s3control/src/it/java/software.amazon.awssdk.services.s3control/S3ControlIntegrationTest.java b/services/s3control/src/it/java/software.amazon.awssdk.services.s3control/S3ControlIntegrationTest.java index 10bb77d58858..4ef0ae260c80 100644 --- a/services/s3control/src/it/java/software.amazon.awssdk.services.s3control/S3ControlIntegrationTest.java +++ b/services/s3control/src/it/java/software.amazon.awssdk.services.s3control/S3ControlIntegrationTest.java @@ -16,7 +16,6 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Fail.fail; -import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @@ -86,7 +85,7 @@ public void putPublicAccessBlock_NoSuchAccount() { .publicAccessBlockConfiguration(r2 -> r2.restrictPublicBuckets(true)))); fail("Expected exception"); } catch (S3ControlException e) { - assertEquals("AccessDenied", e.awsErrorDetails().errorCode()); + assertThat(e.awsErrorDetails().errorCode()).isEqualTo("AccessDenied"); assertNotNull(e.requestId()); } } @@ -97,7 +96,41 @@ public void getPublicAccessBlock_NoSuchAccount() { client.getPublicAccessBlock(r -> r.accountId(INVALID_ACCOUNT_ID)); fail("Expected exception"); } catch (S3ControlException e) { - assertEquals("AccessDenied", e.awsErrorDetails().errorCode()); + assertThat(e.awsErrorDetails().errorCode()).isEqualTo("AccessDenied"); + assertNotNull(e.requestId()); + } + } + + @Test + public void getPublicAccessBlock_NoSuchPublicAccessBlock() { + try { + client.getPublicAccessBlock(r -> r.accountId(accountId)); + fail("Expected exception"); + } catch (S3ControlException e) { + assertThat(e.awsErrorDetails().errorCode()).isEqualTo("NoSuchPublicAccessBlockConfiguration"); + assertThat(e).isInstanceOf(NoSuchPublicAccessBlockConfigurationException.class); + assertNotNull(e.requestId()); + } + } + + @Test + public void listJobs_InvalidRequest() { + try { + client.listJobs(r -> r.accountId(accountId).jobStatusesWithStrings("test")); + fail("Expected exception"); + } catch (S3ControlException e) { + assertThat(e.awsErrorDetails().errorCode()).isEqualTo("InvalidRequest"); + assertNotNull(e.requestId()); + } + } + + @Test + public void describeJob_InvalidRequest() { + try { + client.describeJob(r -> r.accountId(accountId).jobId("someid")); + fail("Expected exception"); + } catch (S3ControlException e) { + assertThat(e.awsErrorDetails().errorCode()).isEqualTo("InvalidRequest"); assertNotNull(e.requestId()); } } @@ -108,7 +141,7 @@ public void deletePublicAccessBlock_NoSuchAccount() { client.deletePublicAccessBlock(r -> r.accountId(INVALID_ACCOUNT_ID)); fail("Expected exception"); } catch (S3ControlException e) { - assertEquals("AccessDenied", e.awsErrorDetails().errorCode()); + assertThat(e.awsErrorDetails().errorCode()).isEqualTo("AccessDenied"); assertNotNull(e.requestId()); } }