[2237] Test Containers Fail To Start For Classes Not Using The TestContainers On Windows

server/src/test/java/com/objectcomputing/checkins/security/GoogleServiceConfigurationTest.java

@@ -1,6 +1,6 @@
 package com.objectcomputing.checkins.security;
 
-import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
+import com.objectcomputing.checkins.services.TestContainersSuite;
 import io.micronaut.validation.validator.Validator;
 import jakarta.inject.Inject;
 import jakarta.validation.ConstraintViolation;
@@ -10,8 +10,7 @@
 
 import static org.junit.jupiter.api.Assertions.*;
 
-@MicronautTest
-public class GoogleServiceConfigurationTest {
+public class GoogleServiceConfigurationTest extends TestContainersSuite {
 
     @Inject
     private Validator validator;
@@ -41,7 +40,7 @@ void testConstraintViolation() {
         Set<ConstraintViolation<GoogleServiceConfiguration>> violations = validator.validate(googleServiceConfiguration);
         assertEquals(13, violations.size());
         for (ConstraintViolation<GoogleServiceConfiguration> violation : violations) {
-            assertEquals(violation.getMessage(), "must not be null");
+            assertEquals("must not be null", violation.getMessage());
         }
     }
 

server/src/test/java/com/objectcomputing/checkins/security/SecurityRuleResultTest.java

@@ -1,6 +1,7 @@
 package com.objectcomputing.checkins.security;
 
 import com.objectcomputing.checkins.security.permissions.PermissionSecurityRule;
+import com.objectcomputing.checkins.services.TestContainersSuite;
 import com.objectcomputing.checkins.services.permissions.Permission;
 import com.objectcomputing.checkins.services.permissions.RequiredPermission;
 import com.objectcomputing.checkins.services.role.Role;
@@ -12,13 +13,11 @@
 import io.micronaut.http.HttpRequest;
 import io.micronaut.security.authentication.Authentication;
 import io.micronaut.security.rules.SecurityRuleResult;
-import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
 import io.micronaut.web.router.MethodBasedRouteMatch;
 import jakarta.inject.Inject;
-import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
 import org.mockito.Mock;
 import org.reactivestreams.Publisher;
 import reactor.test.StepVerifier;
@@ -33,9 +32,7 @@
 import static org.mockito.Mockito.when;
 import static org.mockito.MockitoAnnotations.openMocks;
 
-@MicronautTest
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
-class SecurityRuleResultTest {
+class SecurityRuleResultTest extends TestContainersSuite {
 
     List<String> userPermissions = List.of(
             "CAN_VIEW_FEEDBACK_REQUEST",
@@ -60,19 +57,20 @@ class SecurityRuleResultTest {
     @Mock
     private AnnotationValue<RequiredPermission> mockRequiredPermissionAnnotation;
 
-    @BeforeAll
-    void initMocksAndInitializeFile() {
+    private AutoCloseable mockFinalizer;
 
+    @BeforeEach
+    void resetMocks() {
         Role role = roleServices.save(new Role(RoleType.ADMIN.name(), "Admin Role"));
         rolePermissionServices.save(role.getId(), Permission.CAN_VIEW_FEEDBACK_REQUEST);
-
-        openMocks(this);
+        mockFinalizer = openMocks(this);
     }
 
-    @BeforeEach
-    void resetMocks() {
+    @AfterEach
+    void afterEach() throws Exception {
         reset(mockMethodBasedRouteMatch);
         reset(mockRequiredPermissionAnnotation);
+        mockFinalizer.close();
     }
 
     @Test
@@ -87,7 +85,6 @@ void allowSecurityRuleResultTest() {
         attributes.put("roles", userRoles);
         attributes.put("email", "test.email.address");
 
-
         when(mockMethodBasedRouteMatch.hasAnnotation(RequiredPermission.class)).thenReturn(true);
         when(mockMethodBasedRouteMatch.findAnnotation(RequiredPermission.class)).thenReturn(Optional.of(mockRequiredPermissionAnnotation));
         when(mockRequiredPermissionAnnotation.stringValue("value")).thenReturn(Optional.of("CAN_VIEW_FEEDBACK_REQUEST"));

server/src/test/java/com/objectcomputing/checkins/services/action_item/ActionItemCreateDTOTest.java

@@ -1,6 +1,6 @@
 package com.objectcomputing.checkins.services.action_item;
 
-import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
+import com.objectcomputing.checkins.services.TestContainersSuite;
 import io.micronaut.validation.validator.Validator;
 import jakarta.inject.Inject;
 import jakarta.validation.ConstraintViolation;
@@ -11,8 +11,7 @@
 
 import static org.junit.jupiter.api.Assertions.*;
 
-@MicronautTest
-class ActionItemCreateDTOTest {
+class ActionItemCreateDTOTest extends TestContainersSuite {
 
     @Inject
     private Validator validator;
@@ -32,7 +31,7 @@ void testConstraintViolation() {
         Set<ConstraintViolation<ActionItemCreateDTO>> violations = validator.validate(dto);
         assertEquals(violations.size(), 2);
         for (ConstraintViolation<ActionItemCreateDTO> violation : violations) {
-            assertEquals(violation.getMessage(), "must not be null");
+            assertEquals("must not be null", violation.getMessage());
         }
     }
 

server/src/test/java/com/objectcomputing/checkins/services/action_item/ActionItemTest.java

@@ -1,6 +1,6 @@
 package com.objectcomputing.checkins.services.action_item;
 
-import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
+import com.objectcomputing.checkins.services.TestContainersSuite;
 import io.micronaut.validation.validator.Validator;
 import jakarta.inject.Inject;
 import jakarta.validation.ConstraintViolation;
@@ -12,8 +12,7 @@
 
 import static org.junit.jupiter.api.Assertions.*;
 
-@MicronautTest
-class ActionItemTest {
+class ActionItemTest extends TestContainersSuite {
 
     @Inject
     private Validator validator;
@@ -61,7 +60,7 @@ void testConstraintViolation() {
         Set<ConstraintViolation<ActionItem>> violations = validator.validate(actionItem);
         assertEquals(2, violations.size());
         for (ConstraintViolation<ActionItem> violation : violations) {
-            assertEquals(violation.getMessage(), "must not be null");
+            assertEquals("must not be null", violation.getMessage());
         }
     }
 

server/src/test/java/com/objectcomputing/checkins/services/agenda_item/AgendaItemCreateDTOTest.java

@@ -1,6 +1,6 @@
 package com.objectcomputing.checkins.services.agenda_item;
 
-import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
+import com.objectcomputing.checkins.services.TestContainersSuite;
 import io.micronaut.validation.validator.Validator;
 import jakarta.inject.Inject;
 import jakarta.validation.ConstraintViolation;
@@ -11,8 +11,7 @@
 
 import static org.junit.jupiter.api.Assertions.*;
 
-@MicronautTest
-class AgendaItemCreateDTOTest {
+class AgendaItemCreateDTOTest extends TestContainersSuite {
 
     @Inject
     private Validator validator;
@@ -32,7 +31,7 @@ void testConstraintViolation() {
         Set<ConstraintViolation<AgendaItemCreateDTO>> violations = validator.validate(dto);
         assertEquals(violations.size(), 2);
         for (ConstraintViolation<AgendaItemCreateDTO> violation : violations) {
-            assertEquals(violation.getMessage(), "must not be null");
+            assertEquals("must not be null", violation.getMessage());
         }
     }
 

server/src/test/java/com/objectcomputing/checkins/services/agenda_item/AgendaItemTest.java

@@ -1,21 +1,18 @@
 package com.objectcomputing.checkins.services.agenda_item;
 
-import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
+import com.objectcomputing.checkins.services.TestContainersSuite;
 import io.micronaut.validation.validator.Validator;
 import jakarta.inject.Inject;
 import jakarta.validation.ConstraintViolation;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
 
 import java.util.HashMap;
 import java.util.Set;
 import java.util.UUID;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-@MicronautTest
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
-class AgendaItemTest {
+class AgendaItemTest extends TestContainersSuite {
 
     @Inject
     private Validator validator;
@@ -63,7 +60,7 @@ void testConstraintViolation() {
         Set<ConstraintViolation<AgendaItem>> violations = validator.validate(agendaItem);
         assertEquals(2, violations.size());
         for (ConstraintViolation<AgendaItem> violation : violations) {
-            assertEquals(violation.getMessage(), "must not be null");
+            assertEquals("must not be null", violation.getMessage());
         }
     }
 

server/src/test/java/com/objectcomputing/checkins/services/checkin_notes/CheckinNoteCreateDTOTest.java

@@ -1,17 +1,16 @@
 package com.objectcomputing.checkins.services.checkin_notes;
 
-import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
+import com.objectcomputing.checkins.services.TestContainersSuite;
 import org.junit.jupiter.api.Test;
 
 import java.util.UUID;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-@MicronautTest
-public class CheckinNoteCreateDTOTest {
+class CheckinNoteCreateDTOTest extends TestContainersSuite {
 
     @Test
-    public void testPopulateDTO() {
+    void testPopulateDTO() {
         CheckinNoteCreateDTO checkinNoteCreateDTO = new CheckinNoteCreateDTO();
         UUID checkinid = UUID.randomUUID();
         UUID createdById = UUID.randomUUID();

server/src/test/java/com/objectcomputing/checkins/services/checkindocument/CheckinDocumentCreateDTOTest.java

@@ -1,6 +1,6 @@
 package com.objectcomputing.checkins.services.checkindocument;
 
-import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
+import com.objectcomputing.checkins.services.TestContainersSuite;
 import io.micronaut.validation.validator.Validator;
 import jakarta.inject.Inject;
 import jakarta.validation.ConstraintViolation;
@@ -11,8 +11,7 @@
 
 import static org.junit.jupiter.api.Assertions.*;
 
-@MicronautTest
-public class CheckinDocumentCreateDTOTest {
+class CheckinDocumentCreateDTOTest extends TestContainersSuite {
 
     @Inject
     private Validator validator;
@@ -31,7 +30,7 @@ void testConstraintViolation() {
         Set<ConstraintViolation<CheckinDocumentCreateDTO>> violations = validator.validate(dto);
         assertEquals(violations.size(), 2);
         for (ConstraintViolation<CheckinDocumentCreateDTO> violation : violations) {
-            assertEquals(violation.getMessage(), "must not be null");
+            assertEquals("must not be null", violation.getMessage());
         }
     }
 

server/src/test/java/com/objectcomputing/checkins/services/checkindocument/CheckinDocumentServiceImplTest.java

@@ -1,17 +1,16 @@
 package com.objectcomputing.checkins.services.checkindocument;
 
 import com.objectcomputing.checkins.exceptions.BadArgException;
+import com.objectcomputing.checkins.services.TestContainersSuite;
 import com.objectcomputing.checkins.services.checkins.CheckIn;
 import com.objectcomputing.checkins.services.checkins.CheckInRepository;
 import com.objectcomputing.checkins.services.memberprofile.currentuser.CurrentUserServices;
-import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
+import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
 
 import java.util.Optional;
@@ -22,9 +21,7 @@
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
-@MicronautTest
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
-public class CheckinDocumentServiceImplTest {
+class CheckinDocumentServiceImplTest extends TestContainersSuite {
 
     @Mock
     private CheckInRepository checkinRepository;
@@ -38,14 +35,21 @@ public class CheckinDocumentServiceImplTest {
     @InjectMocks
     private CheckinDocumentServicesImpl services;
 
+    private AutoCloseable mockFinalizer;
+
     @BeforeAll
     void initMocks() {
-        MockitoAnnotations.initMocks(this);
+        mockFinalizer = MockitoAnnotations.openMocks(this);
     }
 
     @BeforeEach
     void resetMocks() {
-        Mockito.reset(checkinRepository, checkinDocumentRepository, currentUserServices);
+        reset(checkinRepository, checkinDocumentRepository, currentUserServices);
+    }
+
+    @AfterAll
+    void close() throws Exception {
+        mockFinalizer.close();
     }
 
     @Test

server/src/test/java/com/objectcomputing/checkins/services/checkindocument/CheckinDocumentTest.java

@@ -1,20 +1,17 @@
 package com.objectcomputing.checkins.services.checkindocument;
 
-import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
+import com.objectcomputing.checkins.services.TestContainersSuite;
 import io.micronaut.validation.validator.Validator;
 import jakarta.inject.Inject;
 import jakarta.validation.ConstraintViolation;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
 
 import java.util.Set;
 import java.util.UUID;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-@MicronautTest
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
-public class CheckinDocumentTest {
+class CheckinDocumentTest extends TestContainersSuite {
 
     @Inject
     private Validator validator;
@@ -39,7 +36,7 @@ void testConstraintViolation() {
         Set<ConstraintViolation<CheckinDocument>> violations = validator.validate(checkinDocument);
         assertEquals(1, violations.size());
         for (ConstraintViolation<CheckinDocument> violation : violations) {
-            assertEquals(violation.getMessage(), "must not be null");
+            assertEquals("must not be null", violation.getMessage());
         }
     }