From 33052f154b0b4e81b8eb88228fb077a42ca27dd7 Mon Sep 17 00:00:00 2001
From: Valerie Lambert <lavaleri@amazon.com>
Date: Thu, 9 Dec 2021 15:25:58 -0800
Subject: [PATCH 1/2] chore: Upgrade mockito to 4.0.0

---
 pom.xml                                                       | 2 +-
 .../amazonaws/encryptionsdk/kms/KmsMasterKeyProviderTest.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index a3747076d..d3c19a0b1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,7 +55,7 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>3.12.4</version>
+            <version>4.0.0</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/src/test/java/com/amazonaws/encryptionsdk/kms/KmsMasterKeyProviderTest.java b/src/test/java/com/amazonaws/encryptionsdk/kms/KmsMasterKeyProviderTest.java
index 66dd72922..3e11724fe 100644
--- a/src/test/java/com/amazonaws/encryptionsdk/kms/KmsMasterKeyProviderTest.java
+++ b/src/test/java/com/amazonaws/encryptionsdk/kms/KmsMasterKeyProviderTest.java
@@ -19,7 +19,7 @@
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 
 import com.amazonaws.AmazonServiceException;
@@ -326,7 +326,7 @@ public void testDecrypt() throws Exception {
             () -> mkp.decryptDataKey(ALGORITHM_SUITE, inputEDKs, ENCRYPTION_CONTEXT));
 
         ArgumentCaptor<DecryptRequest> decrypt = ArgumentCaptor.forClass(DecryptRequest.class);
-        verifyZeroInteractions(client);
+        verifyNoInteractions(client);
         return;
       }
 

From 9c8a81d0727152dd8ebc144a0e274b225352f922 Mon Sep 17 00:00:00 2001
From: Valerie Lambert <lavaleri@amazon.com>
Date: Thu, 9 Dec 2021 15:59:13 -0800
Subject: [PATCH 2/2] format

---
 .../amazonaws/encryptionsdk/kms/KmsMasterKeyProviderTest.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/com/amazonaws/encryptionsdk/kms/KmsMasterKeyProviderTest.java b/src/test/java/com/amazonaws/encryptionsdk/kms/KmsMasterKeyProviderTest.java
index 3e11724fe..c70a90b7b 100644
--- a/src/test/java/com/amazonaws/encryptionsdk/kms/KmsMasterKeyProviderTest.java
+++ b/src/test/java/com/amazonaws/encryptionsdk/kms/KmsMasterKeyProviderTest.java
@@ -18,8 +18,8 @@
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
 import com.amazonaws.AmazonServiceException;