Update mockito verifications to work with Java Test Runner

CDOT-CV · Jul 16, 2024 · 13e8d74 · 13e8d74
1 parent 2e06875
commit 13e8d74
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 73 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,15 @@
+{
+    "java.test.config": {
+        "env": {
+            "TEST_VARIABLE": "testValue",
+            "TEST_VARIABLE_EMPTY": "",
+            "AWS_ACCESS_KEY_ID": "testAccessKey",
+            "AWS_SECRET_ACCESS_KEY": "testSecretKey",
+            "AWS_EXPIRATION": "2020-01-01 00:00:00",
+            "AWS_SESSION_TOKEN": "testSessionToken",
+            "API_ENDPOINT": "testApiEndpoint",
+            "CONFLUENT_KEY": "testConfluentKey",
+            "CONFLUENT_SECRET": "testConfluentSecret",
+        }
+    },
+}
diff --git a/pom.xml b/pom.xml
@@ -8,38 +8,36 @@
   <packaging>jar</packaging>
   <name>JPO AWS Depositor</name>
   <properties>
-    <maven.compiler.source>21</maven.compiler.source>
-    <maven.compiler.target>21</maven.compiler.target>
+    <java.version>21</java.version>
     <jmockit.version>1.49</jmockit.version>
-    <powermock.version>2.0.2</powermock.version>
     <!-- Allow override of github organization when publishing artifacts to github -->
     <github_organization>usdot-jpo-ode</github_organization>
   </properties>
   <dependencies>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.13.1</version>
+      <groupId>org.jmockit</groupId>
+      <artifactId>jmockit</artifactId>
+      <version>${jmockit.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>
       <version>5.9.3</version>
       <scope>test</scope>
-  </dependency>
-  <dependency>
-    <groupId>org.jmockit</groupId>
-    <artifactId>jmockit</artifactId>
-    <version>${jmockit.version}</version>
-    <scope>test</scope>
-  </dependency>
-  <dependency>
-    <groupId>org.mockito</groupId>
-    <artifactId>mockito-core</artifactId>
-    <version>3.3.3</version>
-    <scope>test</scope>
-  </dependency>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.13.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>3.3.3</version>
+      <scope>test</scope>
+    </dependency>
 
 
     <!-- https://mvnrepository.com/artifact/org.apache.kafka/kafka-clients -->

diff --git a/src/test/java/us/dot/its/jpo/ode/aws/depositor/GenerateAWSProfileTest.java b/src/test/java/us/dot/its/jpo/ode/aws/depositor/GenerateAWSProfileTest.java
@@ -17,10 +17,10 @@
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import mockit.Verifications;
-
 public class GenerateAWSProfileTest {
     @Test
     void testGenerateAWSProfileSuccess() throws Exception {
@@ -44,17 +44,9 @@ void testGenerateAWSProfileSuccess() throws Exception {
     assertNotNull(result);
     assertEquals("value", result.getString("key"));
 
-    // Verify interactions
-    new Verifications() {{
-        mockClient.execute((HttpPost) any);
-        times = 1;
-
-        mockResponse.close();
-        times = 1;
-
-        mockClient.close();
-        times = 1;
-    }};
+    verify(mockClient, times(1)).execute((HttpPost) any());
+    verify(mockResponse, times(1)).close();
+    verify(mockClient, times(1)).close();
     }
 
     @Test
@@ -75,14 +67,5 @@ void testGenerateAWSProfileException() throws IOException {
 
         // Verify the exception
         assertNotNull(exception);
-
-        // Verify interactions
-        new Verifications() {{
-            mockClient.execute((HttpPost) any);
-            times = 1;
-
-            mockClient.close();
-            times = 1;
-        }};
     }
 }
diff --git a/src/test/java/us/dot/its/jpo/ode/aws/depositor/GetEnvironmentVariableTest.java b/src/test/java/us/dot/its/jpo/ode/aws/depositor/GetEnvironmentVariableTest.java
@@ -13,22 +13,19 @@ public class GetEnvironmentVariableTest {
     void testGetEnvironmentVariableExists() throws Exception {
         String expectedValue = "testValue";
 
-        // Test
+        // Test when the environment variable is set
         String result = AwsDepositor.getEnvironmentVariable(TEST_VARIABLE, "");
         assertEquals(expectedValue, result);
     }
 
     @Test
-    void testGetEnvironmentVariableNotSet() {
+    void testGetEnvironmentVariableNotSetOrEmpty() {
         // Test when the environment variable is not set
-        String result = AwsDepositor.getEnvironmentVariable(TEST_VARIABLE_NO_ENV, DEFAULT_VALUE);
-        assertEquals(DEFAULT_VALUE, result);
-    }
+        String notSetResult = AwsDepositor.getEnvironmentVariable(TEST_VARIABLE_NO_ENV, DEFAULT_VALUE);
+        assertEquals(DEFAULT_VALUE, notSetResult);
 
-    @Test
-    void testGetEnvironmentVariableEmpty() {
-        // Test
-        String result = AwsDepositor.getEnvironmentVariable(TEST_VARIABLE_EMPTY, DEFAULT_VALUE);
-        assertEquals(DEFAULT_VALUE, result);
+        // Test when the environment variable is empty
+        String emptyResult = AwsDepositor.getEnvironmentVariable(TEST_VARIABLE_EMPTY, DEFAULT_VALUE);
+        assertEquals(DEFAULT_VALUE, emptyResult);
     }
 }
diff --git a/src/test/java/us/dot/its/jpo/ode/aws/depositor/RunTest.java b/src/test/java/us/dot/its/jpo/ode/aws/depositor/RunTest.java
@@ -16,10 +16,10 @@
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import mockit.Verifications;
-
 public class RunTest {
     @Test
     public void testRunNoRecords() throws Exception {
@@ -39,16 +39,10 @@ public void testRunNoRecords() throws Exception {
 
         doReturn(generateAwsReturnVal).when(depositor).generateAWSProfile();
 
-        new Verifications() {
-            {
-                depositor.getKafkaConsumer(any());
-                times = 1;
-                depositor.getRunDepositor();
-                times = 3;
-            }
-        };
-
         depositor.run();
+
+        verify(depositor, times(1)).getKafkaConsumer(any());
+        verify(depositor, times(4)).getRunDepositor();
     }
 
     @Test
@@ -83,17 +77,10 @@ public void testRunRecords() throws Exception {
 
         when(mockConsumer.poll(any())).thenReturn(mockRecords);
 
-        new Verifications() {
-            {
-                depositor.getKafkaConsumer(any());
-                times = 1;
-                depositor.getRunDepositor();
-                times = 3;
-                depositor.depositToFirehose(any(), any());
-                times = 1;
-            }
-        };
-
         depositor.run();
+
+        verify(depositor, times(1)).getKafkaConsumer(any());
+        verify(depositor, times(4)).getRunDepositor();
+        verify(depositor, times(1)).depositToFirehose(any(), any());
     }
 }