Updating tests to use assertThrows

Author: WesleyRosenblum

src/main/java/com/amazonaws/encryptionsdk/kms/AwsKmsCmkId.java

@@ -30,7 +30,7 @@ public final class AwsKmsCmkId {
     private String keyId;
 
     private AwsKmsCmkId(String keyId) throws MalformedArnException {
-        Validate.notBlank(keyId, "keyId is required");
+        Validate.notBlank(keyId, "keyId must be neither null, empty nor whitespace");
 
         if (keyId.startsWith(ARN_PREFIX)) {
             try {

src/test/java/com/amazonaws/crypto/examples/FileStreamingExampleTest.java

@@ -26,14 +26,14 @@ class FileStreamingExampleTest {
     @Test
     void testEncryptAndDecrypt() throws IOException {
         final File tempFile = File.createTempFile("FileStreamingExampleTest-TempTestData", ".tmp");
-        final File encryptedFile = new File(tempFile.getPath()  + ".encrypted");
+        final File encryptedFile = new File(tempFile.getPath() + ".encrypted");
         final File decryptedFile = new File(tempFile.getPath() + ".decrypted");
         tempFile.deleteOnExit();
         encryptedFile.deleteOnExit();
         decryptedFile.deleteOnExit();
 
-        try(BufferedWriter writer = Files.newBufferedWriter(tempFile.toPath())) {
-            for(int i = 0; i < 1000 ; i++) {
+        try (BufferedWriter writer = Files.newBufferedWriter(tempFile.toPath())) {
+            for (int i = 0; i < 1000 ; i++) {
                 writer.write(RandomStringUtils.randomAlphanumeric(100));
                 writer.newLine();
             }

src/test/java/com/amazonaws/encryptionsdk/AwsCryptoTest.java

@@ -21,7 +21,6 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.spy;
@@ -126,15 +125,10 @@ private void doTamperedEncryptDecrypt(final CryptoAlgorithm cryptoAlg, final int
                 plaintextBytes,
                 encryptionContext).getResult();
         cipherText[cipherText.length - 2] ^= (byte) 0xff;
-        try {
-            encryptionClient_.decryptData(
-                    masterKeyProvider,
-                    cipherText
-                    ).getResult();
-            fail("Expected BadCiphertextException");
-        } catch (final BadCiphertextException ex) {
-            // Expected exception
-        }
+
+        assertThrows(BadCiphertextException.class, () -> encryptionClient_.decryptData(
+                masterKeyProvider,
+                cipherText));
     }
 
     private void doTamperedEncryptDecryptWithKeyring(final CryptoAlgorithm cryptoAlg, final int byteSize, final int frameSize) {
@@ -150,14 +144,10 @@ private void doTamperedEncryptDecryptWithKeyring(final CryptoAlgorithm cryptoAlg
                 .keyring(keyring)
                 .plaintext(plaintextBytes).build()).getResult();
         cipherText[cipherText.length - 2] ^= (byte) 0xff;
-        try {
-            encryptionClient_.decrypt(DecryptRequest.builder()
-                    .keyring(keyring)
-                    .ciphertext(cipherText).build());
-            fail("Expected BadCiphertextException");
-        } catch (final BadCiphertextException ex) {
-            // Expected exception
-        }
+
+        assertThrows(BadCiphertextException.class, () -> encryptionClient_.decrypt(DecryptRequest.builder()
+                .keyring(keyring)
+                .ciphertext(cipherText).build()));
     }
 
     private void doEncryptDecryptWithParsedCiphertext(final int byteSize, final int frameSize) {

src/test/java/com/amazonaws/encryptionsdk/DecryptRequestTest.java

@@ -56,10 +56,11 @@ void testKeyringUsesDefaultCmm() {
                 .plaintext(new byte[]{4, 5, 6})
                 .build()).getResult();
 
-
-        assertTrue(DecryptRequest.builder()
+        final CryptoMaterialsManager cryptoMaterialsManager = DecryptRequest.builder()
                 .keyring(keyring)
-                .ciphertext(ciphertext).build().cryptoMaterialsManager()
-                instanceof DefaultCryptoMaterialsManager);
+                .ciphertext(ciphertext).build()
+                .cryptoMaterialsManager();
+
+        assertTrue(cryptoMaterialsManager instanceof DefaultCryptoMaterialsManager);
     }
 }

src/test/java/com/amazonaws/encryptionsdk/DefaultCryptoMaterialsManagerTest.java

@@ -6,7 +6,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.argThat;
 import static org.mockito.Matchers.same;
@@ -414,13 +414,8 @@ public void decrypt_whenTrailingSigMissing_throwsException() {
                                                                            .setEncryptionContext(Collections.emptyMap())
                                                                            .build();
 
-            try {
-                new DefaultCryptoMaterialsManager(mk1).decryptMaterials(request);
-                fail("expected exception");
-            } catch (AwsCryptoException e) {
-                // ok
-                continue;
-            }
+            assertThrows(AwsCryptoException.class, () ->
+                    new DefaultCryptoMaterialsManager(mk1).decryptMaterials(request));
         }
     }
 
@@ -441,13 +436,8 @@ public void decrypt_whenTrailingSigMissingForKeyring_throwsException() {
                     .setEncryptionContext(Collections.emptyMap())
                     .build();
 
-            try {
-                new DefaultCryptoMaterialsManager(keyring1).decryptMaterials(request);
-                fail("expected exception");
-            } catch (AwsCryptoException e) {
-                // ok
-                continue;
-            }
+            assertThrows(AwsCryptoException.class, () ->
+                    new DefaultCryptoMaterialsManager(keyring1).decryptMaterials(request));
         }
     }
 }

src/test/java/com/amazonaws/encryptionsdk/kms/AwsKmsCmkIdTest.java

@@ -58,6 +58,5 @@ void testToString() {
     void testEquals() {
         assertEquals(AwsKmsCmkId.fromString(VALID_ARN), AwsKmsCmkId.fromString(VALID_ARN));
         assertNotEquals(AwsKmsCmkId.fromString(VALID_ALIAS), AwsKmsCmkId.fromString(VALID_ALIAS_ARN));
-
     }
 }