Fixed static mocking error in ReconcilerMainTest

SoftwareDesignLab · Nov 2, 2023 · 3d3c21f · 3d3c21f
1 parent 3098385
commit 3d3c21f
Showing 1 changed file with 7 additions and 12 deletions.
diff --git a/reconciler/src/test/java/edu/rit/se/nvip/ReconcilerMainTest.java b/reconciler/src/test/java/edu/rit/se/nvip/ReconcilerMainTest.java
@@ -2,6 +2,7 @@
 
 import edu.rit.se.nvip.messenger.Messenger;
 import edu.rit.se.nvip.utils.ReconcilerEnvVars;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -33,6 +34,12 @@ void initMocks(){
         mockedEnvVars = mockStatic(ReconcilerEnvVars.class);
     }
 
+    @AfterEach
+    void clearMocks(){
+        mockedDb.close();
+        mockedEnvVars.close();
+    }
+
     //verifies that the main can properly get jobs and process them for the reconciler controller, this tests both rabbit and db
     @Test
     void testMainWithDb() {
@@ -53,9 +60,6 @@ void testMainWithDb() {
         doNothing().when(mockCon).main(anySet());
         //test for db
         main.main();
-
-        mockedEnvVars.close();
-        mockedDb.close();
     }
 
     @Test
@@ -71,9 +75,6 @@ void testMainWithDbNoJobs() {
 
         when(mockDb.getJobs()).thenReturn(null);
         main.main();
-
-        mockedEnvVars.close();
-        mockedDb.close();
     }
 
     @Test
@@ -100,9 +101,6 @@ void testMainWithRabbit() {
         doNothing().when(mockCon).main(anySet());
 
         main.main();
-
-        mockedEnvVars.close();
-        mockedDb.close();
     }
 
     @Test
@@ -127,8 +125,5 @@ void testMainWithRabbitNoMessages() {
             fail("Caught Unexpected exception");
         }
         main.main();
-
-        mockedEnvVars.close();
-        mockedDb.close();
     }
 }