Add integration tests

Author: smswz

pom.xml

@@ -61,35 +61,54 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.bouncycastle</groupId>
-      <artifactId>bcprov-jdk18on</artifactId>
-      <version>1.71</version>
+      <groupId>software.amazon.awssdk</groupId>
+      <artifactId>s3</artifactId>
+      <version>2.17.204</version>
       <optional>true</optional>
     </dependency>
 
     <dependency>
-      <groupId>com.amazonaws</groupId>
-      <artifactId>aws-java-sdk-kms</artifactId>
+      <groupId>software.amazon.awssdk</groupId>
+      <artifactId>kms</artifactId>
+      <version>2.17.204</version>
+      <optional>true</optional>
+    </dependency>
+
+    <!-- Test Dependencies -->
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter</artifactId>
+      <version>5.9.0</version>
+      <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>com.amazonaws</groupId>
-      <artifactId>aws-java-sdk-s3</artifactId>
+      <artifactId>aws-java-sdk-kms</artifactId>
+      <scope>test</scope>
     </dependency>
 
     <dependency>
-      <groupId>software.amazon.awssdk</groupId>
-      <artifactId>s3</artifactId>
-      <version>2.17.204</version>
-      <optional>true</optional>
+      <groupId>com.amazonaws</groupId>
+      <artifactId>aws-java-sdk-s3</artifactId>
+      <scope>test</scope>
     </dependency>
 
     <dependency>
-      <groupId>software.amazon.awssdk</groupId>
-      <artifactId>kms</artifactId>
-      <version>2.17.204</version>
-      <optional>true</optional>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcprov-jdk18on</artifactId>
+      <version>1.71</version>
+      <scope>test</scope>
     </dependency>
   </dependencies>
 
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>2.22.2</version>
+      </plugin>
+    </plugins>
+  </build>
+
 </project>

src/main/java/software/amazon/encryption/s3/materials/EncryptDataKeyStrategy.java

@@ -2,10 +2,15 @@
 
 import java.security.GeneralSecurityException;
 import java.security.SecureRandom;
+import java.util.Map;
 
 public interface EncryptDataKeyStrategy {
     String keyProviderId();
 
+    default EncryptionMaterials modifyMaterials(EncryptionMaterials materials) {
+        return materials;
+    }
+
     byte[] encryptDataKey(
             SecureRandom secureRandom,
             EncryptionMaterials materials

src/main/java/software/amazon/encryption/s3/materials/KmsKeyring.java

@@ -1,6 +1,7 @@
 package software.amazon.encryption.s3.materials;
 
 import java.security.SecureRandom;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.TreeMap;
@@ -69,14 +70,23 @@ public String keyProviderId() {
         }
 
         @Override
-        public byte[] encryptDataKey(SecureRandom secureRandom, EncryptionMaterials materials) {
+        public EncryptionMaterials modifyMaterials(EncryptionMaterials materials) {
             if (materials.encryptionContext().containsKey(ENCRYPTION_CONTEXT_ALGORITHM_KEY)) {
                 throw new S3EncryptionClientException(ENCRYPTION_CONTEXT_ALGORITHM_KEY + " is a reserved key for the S3 encryption client");
             }
 
-            TreeMap<String, String> encryptionContext = new TreeMap<>(materials.encryptionContext());
+            Map<String, String> encryptionContext = new HashMap<>(materials.encryptionContext());
             encryptionContext.put(ENCRYPTION_CONTEXT_ALGORITHM_KEY, materials.algorithmSuite().cipherName());
 
+            return materials.toBuilder()
+                    .encryptionContext(encryptionContext)
+                    .build();
+        }
+
+        @Override
+        public byte[] encryptDataKey(SecureRandom secureRandom, EncryptionMaterials materials) {
+            // Convert to TreeMap for sorting of keys
+            TreeMap<String, String> encryptionContext = new TreeMap<>(materials.encryptionContext());
             EncryptRequest request = EncryptRequest.builder()
                     .keyId(_wrappingKeyId)
                     .encryptionContext(encryptionContext)

src/main/java/software/amazon/encryption/s3/materials/S3Keyring.java

@@ -34,6 +34,9 @@ public EncryptionMaterials onEncrypt(EncryptionMaterials materials) {
 
         EncryptDataKeyStrategy encryptStrategy = encryptStrategy();
         try {
+            // Allow encrypt strategy to modify the materials if necessary
+            materials = encryptStrategy.modifyMaterials(materials);
+
             byte[] ciphertext = encryptStrategy.encryptDataKey(_secureRandom, materials);
             EncryptedDataKey encryptedDataKey = EncryptedDataKey.builder()
                     .keyProviderId(encryptStrategy.keyProviderId())