Fixes intermittently failing tests.

Author: simonbrowndotje

structurizr-client/src/main/java/com/structurizr/encryption/AesEncryptionStrategy.java

@@ -7,6 +7,7 @@
 import javax.crypto.spec.PBEKeySpec;
 import javax.crypto.spec.SecretKeySpec;
 import javax.xml.bind.DatatypeConverter;
+import java.nio.charset.StandardCharsets;
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
 import java.security.spec.InvalidKeySpecException;
@@ -79,7 +80,7 @@ public String decrypt(String ciphertext) throws Exception {
         cipher.init(Cipher.DECRYPT_MODE, secretKey, new IvParameterSpec(DatatypeConverter.parseHexBinary(iv)));
         byte[] unencrypted = cipher.doFinal(Base64.getDecoder().decode(ciphertext));
 
-        return new String(unencrypted, "UTF-8");
+        return new String(unencrypted, StandardCharsets.UTF_8);
     }
 
     private SecretKey createSecretKey() throws NoSuchAlgorithmException, InvalidKeySpecException {

structurizr-client/src/test/java/com/structurizr/encryption/AesEncryptionStrategyTests.java

@@ -2,33 +2,30 @@
 
 import org.junit.jupiter.api.Test;
 
-import javax.crypto.BadPaddingException;
-import java.security.InvalidKeyException;
-
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 
 public class AesEncryptionStrategyTests {
 
     @Test
     void encrypt_EncryptsPlaintext() throws Exception {
         AesEncryptionStrategy strategy = new AesEncryptionStrategy(128, 1000, "06DC30A48ADEEE72D98E33C2CEAEAD3E", "ED124530AF64A5CAD8EF463CF5628434", "password");
-
         String ciphertext = strategy.encrypt("Hello world");
+
         assertEquals("A/DzjV17WVS6ZAKsLOaC/Q==", ciphertext);
     }
 
     @Test
     void decrypt_decryptsTheCiphertext_WhenTheSameStrategyInstanceIsUsed() throws Exception {
         AesEncryptionStrategy strategy = new AesEncryptionStrategy(128, 1000, "password");
-
         String ciphertext = strategy.encrypt("Hello world");
+
         assertEquals("Hello world", strategy.decrypt(ciphertext));
     }
 
     @Test
     void decrypt_decryptsTheCiphertext_WhenTheSameConfigurationIsUsed() throws Exception {
         AesEncryptionStrategy strategy = new AesEncryptionStrategy(128, 1000, "password");
-
         String ciphertext = strategy.encrypt("Hello world");
 
         strategy = new AesEncryptionStrategy(strategy.getKeySize(), strategy.getIterationCount(), strategy.getSalt(), strategy.getIv(), "password");
@@ -39,65 +36,65 @@ void decrypt_decryptsTheCiphertext_WhenTheSameConfigurationIsUsed() throws Excep
     void decrypt_doesNotDecryptTheCiphertext_WhenTheIncorrectKeySizeIsUsed() throws Exception {
         try {
             AesEncryptionStrategy strategy = new AesEncryptionStrategy(128, 1000, "password");
-
             String ciphertext = strategy.encrypt("Hello world");
 
             strategy = new AesEncryptionStrategy(256, strategy.getIterationCount(), strategy.getSalt(), strategy.getIv(), "password");
-            strategy.decrypt(ciphertext);
-        } catch (BadPaddingException | InvalidKeyException bpe) {
-            // BadPaddingException is thrown on Mac and Linux
-            // InvalidKeyException is thrown in Windows
+            assertNotEquals("Hello world", strategy.decrypt(ciphertext));
         } catch (Exception e) {
-            fail();
+            // this is okay
         }
     }
 
     @Test
     void decrypt_doesNotDecryptTheCiphertext_WhenTheIncorrectIterationCountIsUsed() throws Exception {
-        assertThrows(BadPaddingException.class, () -> {
+        try {
             AesEncryptionStrategy strategy = new AesEncryptionStrategy(128, 1000, "password");
-
             String ciphertext = strategy.encrypt("Hello world");
 
             strategy = new AesEncryptionStrategy(strategy.getKeySize(), 2000, strategy.getSalt(), strategy.getIv(), "password");
-            strategy.decrypt(ciphertext);
-        });
+            assertNotEquals("Hello world", strategy.decrypt(ciphertext));
+        } catch (Exception e) {
+            // this is okay
+        }
     }
 
     @Test
     void decrypt_doesNotDecryptTheCiphertext_WhenTheIncorrectSaltIsUsed() throws Exception {
-        assertThrows(BadPaddingException.class, () -> {
+        try {
             AesEncryptionStrategy strategy = new AesEncryptionStrategy(128, 1000, "password");
-
             String ciphertext = strategy.encrypt("Hello world");
 
             strategy = new AesEncryptionStrategy(strategy.getKeySize(), strategy.getIterationCount(), "133D30C2A658B3081279A97FD3B1F7CDE10C4FB61D39EEA8", strategy.getIv(), "password");
-            strategy.decrypt(ciphertext);
-        });
+            assertNotEquals("Hello world", strategy.decrypt(ciphertext));
+        } catch (Exception e) {
+            // this is okay
+        }
     }
 
     @Test
     void decrypt_doesNotDecryptTheCiphertext_WhenTheIncorrectIvIsUsed() throws Exception {
-        assertThrows(BadPaddingException.class, () -> {
+        try {
             AesEncryptionStrategy strategy = new AesEncryptionStrategy(128, 1000, "password");
-
             String ciphertext = strategy.encrypt("Hello world");
 
             strategy = new AesEncryptionStrategy(strategy.getKeySize(), strategy.getIterationCount(), strategy.getSalt(), "1DED89E4FB15F61DC6433E3BADA4A891", "password");
-            strategy.decrypt(ciphertext);
-        });
+            assertNotEquals("Hello world", strategy.decrypt(ciphertext));
+        } catch (Exception e) {
+            // this is okay
+        }
     }
 
     @Test
     void decrypt_doesNotDecryptTheCiphertext_WhenTheIncorrectPassphraseIsUsed() throws Exception {
-        assertThrows(BadPaddingException.class, () -> {
+        try {
             AesEncryptionStrategy strategy = new AesEncryptionStrategy(128, 1000, "password");
-
             String ciphertext = strategy.encrypt("Hello world");
 
             strategy = new AesEncryptionStrategy(strategy.getKeySize(), strategy.getIterationCount(), strategy.getSalt(), strategy.getIv(), "The Wrong Password");
-            strategy.decrypt(ciphertext);
-        });
+            assertNotEquals("Hello world", strategy.decrypt(ciphertext));
+        } catch (Exception e) {
+            // this is okay
+        }
     }
 
-}
+}