diff --git a/server/src/test/java/com/objectcomputing/checkins/security/GoogleServiceConfigurationTest.java b/server/src/test/java/com/objectcomputing/checkins/security/GoogleServiceConfigurationTest.java index cf68623d21..c12b5d49e7 100644 --- a/server/src/test/java/com/objectcomputing/checkins/security/GoogleServiceConfigurationTest.java +++ b/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> violations = validator.validate(googleServiceConfiguration); assertEquals(13, violations.size()); for (ConstraintViolation violation : violations) { - assertEquals(violation.getMessage(), "must not be null"); + assertEquals("must not be null", violation.getMessage()); } } diff --git a/server/src/test/java/com/objectcomputing/checkins/security/SecurityRuleResultTest.java b/server/src/test/java/com/objectcomputing/checkins/security/SecurityRuleResultTest.java index ee69ab27a1..a17ec0317e 100644 --- a/server/src/test/java/com/objectcomputing/checkins/security/SecurityRuleResultTest.java +++ b/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 userPermissions = List.of( "CAN_VIEW_FEEDBACK_REQUEST", @@ -60,19 +57,20 @@ class SecurityRuleResultTest { @Mock private AnnotationValue 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")); diff --git a/server/src/test/java/com/objectcomputing/checkins/services/action_item/ActionItemCreateDTOTest.java b/server/src/test/java/com/objectcomputing/checkins/services/action_item/ActionItemCreateDTOTest.java index cb692130c5..eb6e90127a 100644 --- a/server/src/test/java/com/objectcomputing/checkins/services/action_item/ActionItemCreateDTOTest.java +++ b/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> violations = validator.validate(dto); assertEquals(violations.size(), 2); for (ConstraintViolation violation : violations) { - assertEquals(violation.getMessage(), "must not be null"); + assertEquals("must not be null", violation.getMessage()); } } diff --git a/server/src/test/java/com/objectcomputing/checkins/services/action_item/ActionItemTest.java b/server/src/test/java/com/objectcomputing/checkins/services/action_item/ActionItemTest.java index c23081e260..34c679d7ea 100644 --- a/server/src/test/java/com/objectcomputing/checkins/services/action_item/ActionItemTest.java +++ b/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> violations = validator.validate(actionItem); assertEquals(2, violations.size()); for (ConstraintViolation violation : violations) { - assertEquals(violation.getMessage(), "must not be null"); + assertEquals("must not be null", violation.getMessage()); } } diff --git a/server/src/test/java/com/objectcomputing/checkins/services/agenda_item/AgendaItemCreateDTOTest.java b/server/src/test/java/com/objectcomputing/checkins/services/agenda_item/AgendaItemCreateDTOTest.java index 1c8b5d98a1..06cdb84504 100644 --- a/server/src/test/java/com/objectcomputing/checkins/services/agenda_item/AgendaItemCreateDTOTest.java +++ b/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> violations = validator.validate(dto); assertEquals(violations.size(), 2); for (ConstraintViolation violation : violations) { - assertEquals(violation.getMessage(), "must not be null"); + assertEquals("must not be null", violation.getMessage()); } } diff --git a/server/src/test/java/com/objectcomputing/checkins/services/agenda_item/AgendaItemTest.java b/server/src/test/java/com/objectcomputing/checkins/services/agenda_item/AgendaItemTest.java index 061c119a12..dbe2e89794 100644 --- a/server/src/test/java/com/objectcomputing/checkins/services/agenda_item/AgendaItemTest.java +++ b/server/src/test/java/com/objectcomputing/checkins/services/agenda_item/AgendaItemTest.java @@ -1,11 +1,10 @@ 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; @@ -13,9 +12,7 @@ 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> violations = validator.validate(agendaItem); assertEquals(2, violations.size()); for (ConstraintViolation violation : violations) { - assertEquals(violation.getMessage(), "must not be null"); + assertEquals("must not be null", violation.getMessage()); } } diff --git a/server/src/test/java/com/objectcomputing/checkins/services/checkin_notes/CheckinNoteCreateDTOTest.java b/server/src/test/java/com/objectcomputing/checkins/services/checkin_notes/CheckinNoteCreateDTOTest.java index 9478c63c76..f1fb4fc832 100644 --- a/server/src/test/java/com/objectcomputing/checkins/services/checkin_notes/CheckinNoteCreateDTOTest.java +++ b/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(); diff --git a/server/src/test/java/com/objectcomputing/checkins/services/checkindocument/CheckinDocumentCreateDTOTest.java b/server/src/test/java/com/objectcomputing/checkins/services/checkindocument/CheckinDocumentCreateDTOTest.java index 403a46ae19..a9a38ee07c 100644 --- a/server/src/test/java/com/objectcomputing/checkins/services/checkindocument/CheckinDocumentCreateDTOTest.java +++ b/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> violations = validator.validate(dto); assertEquals(violations.size(), 2); for (ConstraintViolation violation : violations) { - assertEquals(violation.getMessage(), "must not be null"); + assertEquals("must not be null", violation.getMessage()); } } diff --git a/server/src/test/java/com/objectcomputing/checkins/services/checkindocument/CheckinDocumentServiceImplTest.java b/server/src/test/java/com/objectcomputing/checkins/services/checkindocument/CheckinDocumentServiceImplTest.java index af27027fe0..9f5dc81e23 100644 --- a/server/src/test/java/com/objectcomputing/checkins/services/checkindocument/CheckinDocumentServiceImplTest.java +++ b/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 diff --git a/server/src/test/java/com/objectcomputing/checkins/services/checkindocument/CheckinDocumentTest.java b/server/src/test/java/com/objectcomputing/checkins/services/checkindocument/CheckinDocumentTest.java index 0e249953a1..e68924bc71 100644 --- a/server/src/test/java/com/objectcomputing/checkins/services/checkindocument/CheckinDocumentTest.java +++ b/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> violations = validator.validate(checkinDocument); assertEquals(1, violations.size()); for (ConstraintViolation violation : violations) { - assertEquals(violation.getMessage(), "must not be null"); + assertEquals("must not be null", violation.getMessage()); } } diff --git a/server/src/test/java/com/objectcomputing/checkins/services/file/FileControllerTest.java b/server/src/test/java/com/objectcomputing/checkins/services/file/FileControllerTest.java index dd80b422d1..2da0723864 100644 --- a/server/src/test/java/com/objectcomputing/checkins/services/file/FileControllerTest.java +++ b/server/src/test/java/com/objectcomputing/checkins/services/file/FileControllerTest.java @@ -1,5 +1,6 @@ package com.objectcomputing.checkins.services.file; +import com.objectcomputing.checkins.services.TestContainersSuite; import io.micronaut.core.type.Argument; import io.micronaut.http.HttpRequest; import io.micronaut.http.HttpResponse; @@ -10,12 +11,10 @@ import io.micronaut.http.client.multipart.MultipartBody; import io.micronaut.http.multipart.CompletedFileUpload; import io.micronaut.test.annotation.MockBean; -import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import jakarta.inject.Inject; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.TestInstance; import java.io.File; import java.io.FileWriter; @@ -31,9 +30,7 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; -@MicronautTest -@TestInstance(TestInstance.Lifecycle.PER_CLASS) -public class FileControllerTest { +class FileControllerTest extends TestContainersSuite { @Inject @Client("/services/files") @@ -59,7 +56,7 @@ void deleteTestFile() { } @Test - public void testFindAll() { + void testFindAll() { UUID testCheckinId = UUID.randomUUID(); @@ -88,7 +85,7 @@ public void testFindAll() { } @Test - public void testFindByCheckinId() { + void testFindByCheckinId() { UUID testCheckinId = UUID.randomUUID(); @@ -117,7 +114,7 @@ public void testFindByCheckinId() { } @Test - public void testDownloadDocument() { + void testDownloadDocument() { String uploadDocId = "some.upload.id"; when(fileServices.downloadFiles(uploadDocId)).thenReturn(testFile); @@ -132,7 +129,7 @@ public void testDownloadDocument() { } @Test - public void testUploadEndpoint() { + void testUploadEndpoint() { UUID testCheckinId = UUID.randomUUID(); @@ -161,7 +158,7 @@ public void testUploadEndpoint() { } @Test - public void testUploadEndpointFailsForInvalidFile() { + void testUploadEndpointFailsForInvalidFile() { UUID testCheckinId = UUID.randomUUID(); File badFile = new File(""); @@ -179,7 +176,7 @@ public void testUploadEndpointFailsForInvalidFile() { } @Test - public void testDeleteEndpoint() { + void testDeleteEndpoint() { String uploadDocId = "some.upload.id"; when(fileServices.deleteFile(uploadDocId)).thenReturn(true); @@ -194,7 +191,7 @@ public void testDeleteEndpoint() { } @Test - public void testHandleBadArgs() { + void testHandleBadArgs() { String uploadDocId = "some.upload.id"; doThrow(FileRetrievalException.class).when(fileServices).deleteFile(uploadDocId); diff --git a/server/src/test/java/com/objectcomputing/checkins/services/file/FileInfoDTOTest.java b/server/src/test/java/com/objectcomputing/checkins/services/file/FileInfoDTOTest.java index e8e0359830..9d324407f3 100644 --- a/server/src/test/java/com/objectcomputing/checkins/services/file/FileInfoDTOTest.java +++ b/server/src/test/java/com/objectcomputing/checkins/services/file/FileInfoDTOTest.java @@ -1,6 +1,6 @@ package com.objectcomputing.checkins.services.file; -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 FileInfoDTOTest { +class FileInfoDTOTest extends TestContainersSuite { @Inject private Validator validator; @@ -31,9 +30,9 @@ void testConstraintViolation() { FileInfoDTO dto = new FileInfoDTO(); Set> violations = validator.validate(dto); - assertEquals(violations.size(), 4); + assertEquals(4, violations.size()); for (ConstraintViolation violation : violations) { - assertEquals(violation.getMessage(), "must not be null"); + assertEquals("must not be null", violation.getMessage()); } } @@ -44,10 +43,10 @@ void testPopulatedDTO() { UUID testCheckinId = UUID.randomUUID(); dto.setFileId("some.file.id"); - assertEquals(dto.getFileId(), "some.file.id"); + assertEquals("some.file.id", dto.getFileId()); dto.setName("some.file.name"); - assertEquals(dto.getName(), "some.file.name"); + assertEquals("some.file.name", dto.getName()); dto.setCheckInId(testCheckinId); assertEquals(dto.getCheckInId(), testCheckinId); diff --git a/server/src/test/java/com/objectcomputing/checkins/services/file/FileRetrievalExceptionTest.java b/server/src/test/java/com/objectcomputing/checkins/services/file/FileRetrievalExceptionTest.java index 3036dd9d6b..b9f9bd8834 100644 --- a/server/src/test/java/com/objectcomputing/checkins/services/file/FileRetrievalExceptionTest.java +++ b/server/src/test/java/com/objectcomputing/checkins/services/file/FileRetrievalExceptionTest.java @@ -1,11 +1,11 @@ package com.objectcomputing.checkins.services.file; -import io.micronaut.test.extensions.junit5.annotation.MicronautTest; +import com.objectcomputing.checkins.services.TestContainersSuite; import org.junit.jupiter.api.Test; + import static org.junit.jupiter.api.Assertions.assertEquals; -@MicronautTest -public class FileRetrievalExceptionTest { +class FileRetrievalExceptionTest extends TestContainersSuite { @Test void testExceptionMessage() { diff --git a/server/src/test/java/com/objectcomputing/checkins/services/file/FileServicesImplTest.java b/server/src/test/java/com/objectcomputing/checkins/services/file/FileServicesImplTest.java index 1657c856f2..0e69c95a86 100644 --- a/server/src/test/java/com/objectcomputing/checkins/services/file/FileServicesImplTest.java +++ b/server/src/test/java/com/objectcomputing/checkins/services/file/FileServicesImplTest.java @@ -9,6 +9,7 @@ import com.google.api.services.drive.model.FileList; import com.google.common.io.ByteStreams; import com.objectcomputing.checkins.security.GoogleServiceConfiguration; +import com.objectcomputing.checkins.services.TestContainersSuite; import com.objectcomputing.checkins.services.checkindocument.CheckinDocument; import com.objectcomputing.checkins.services.checkindocument.CheckinDocumentServices; import com.objectcomputing.checkins.services.checkins.CheckIn; @@ -20,26 +21,45 @@ import com.objectcomputing.checkins.util.googleapiaccess.GoogleApiAccess; import io.micronaut.http.multipart.CompletedFileUpload; import io.micronaut.security.authentication.Authentication; -import io.micronaut.test.extensions.junit5.annotation.MicronautTest; -import org.junit.jupiter.api.*; +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.mockito.InjectMocks; import org.mockito.Mock; -import org.mockito.Mockito; -import org.mockito.MockitoAnnotations; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; -import java.io.*; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileWriter; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; import java.time.LocalDate; -import java.util.*; - -import static org.junit.jupiter.api.Assertions.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.UUID; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.eq; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.reset; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; +import static org.mockito.MockitoAnnotations.openMocks; -@MicronautTest -@TestInstance(TestInstance.Lifecycle.PER_CLASS) -public class FileServicesImplTest { +class FileServicesImplTest extends TestContainersSuite { private static File testFile; private final static String filePath = "testFile.txt"; @@ -111,10 +131,11 @@ public class FileServicesImplTest { @InjectMocks private FileServicesImpl services; + private AutoCloseable mockFinalizer; + @BeforeAll void initMocksAndInitializeFile() throws IOException { - MockitoAnnotations.initMocks(this); - + mockFinalizer = openMocks(this); testFile = new File(filePath); FileWriter myWriter = new FileWriter(testFile); myWriter.write("This.Is.A.Test.File"); @@ -122,33 +143,34 @@ void initMocksAndInitializeFile() throws IOException { } @AfterAll - void deleteTestFile() { + void deleteTestFile() throws Exception { testFile.deleteOnExit(); + mockFinalizer.close(); } @BeforeEach void resetMocks() { - Mockito.reset(authentication); - Mockito.reset(mockAttributes); - Mockito.reset(drive); - Mockito.reset(files); - Mockito.reset(list); - Mockito.reset(get); - Mockito.reset(delete); - Mockito.reset(create); - Mockito.reset(update); - Mockito.reset(fileToUpload); - Mockito.reset(testMemberProfile); - Mockito.reset(testCheckIn); - Mockito.reset(testCd); - Mockito.reset(mockInputStream); - Mockito.reset(checkInServices); - Mockito.reset(checkinDocumentServices); - Mockito.reset(mockGoogleApiAccess); - Mockito.reset(currentUserServices); - Mockito.reset(memberProfileServices); - Mockito.reset(completedFileUpload); - Mockito.reset(googleServiceConfiguration); + reset(authentication); + reset(mockAttributes); + reset(drive); + reset(files); + reset(list); + reset(get); + reset(delete); + reset(create); + reset(update); + reset(fileToUpload); + reset(testMemberProfile); + reset(testCheckIn); + reset(testCd); + reset(mockInputStream); + reset(checkInServices); + reset(checkinDocumentServices); + reset(mockGoogleApiAccess); + reset(currentUserServices); + reset(memberProfileServices); + reset(completedFileUpload); + reset(googleServiceConfiguration); when(authentication.getAttributes()).thenReturn(mockAttributes); when(mockAttributes.get("email")).thenReturn(mockAttributes); diff --git a/server/src/test/java/com/objectcomputing/checkins/services/github/GithubControllerTest.java b/server/src/test/java/com/objectcomputing/checkins/services/github/GithubControllerTest.java index 1b3d93d8dc..911d60ff9d 100644 --- a/server/src/test/java/com/objectcomputing/checkins/services/github/GithubControllerTest.java +++ b/server/src/test/java/com/objectcomputing/checkins/services/github/GithubControllerTest.java @@ -1,29 +1,29 @@ package com.objectcomputing.checkins.services.github; +import com.objectcomputing.checkins.services.TestContainersSuite; import io.micronaut.http.HttpRequest; import io.micronaut.http.HttpStatus; import io.micronaut.http.MutableHttpRequest; import io.micronaut.http.client.HttpClient; import io.micronaut.http.client.annotation.Client; import io.micronaut.http.client.exceptions.HttpClientResponseException; -import io.micronaut.test.extensions.junit5.annotation.MicronautTest; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; -import jakarta.inject.Inject; import java.util.Map; import static com.objectcomputing.checkins.services.role.RoleType.Constants.MEMBER_ROLE; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -@MicronautTest -public class GithubControllerTest { +class GithubControllerTest extends TestContainersSuite { + @Inject @Client("/services/github-issue") HttpClient client; @Test - public void testBadRequestExceptionThrownWithBlankTitle() { + void testBadRequestExceptionThrownWithBlankTitle() { IssueCreateDTO issue = new IssueCreateDTO(); issue.setTitle(""); issue.setBody("body"); @@ -35,7 +35,7 @@ public void testBadRequestExceptionThrownWithBlankTitle() { } @Test - public void testBadRequestExceptionThrownWithBlankBody() { + void testBadRequestExceptionThrownWithBlankBody() { IssueCreateDTO issue = new IssueCreateDTO(); issue.setTitle("title"); issue.setBody(""); diff --git a/server/src/test/java/com/objectcomputing/checkins/services/guild/GuildCreateDTOTest.java b/server/src/test/java/com/objectcomputing/checkins/services/guild/GuildCreateDTOTest.java index 4d27819150..e44abe81b2 100644 --- a/server/src/test/java/com/objectcomputing/checkins/services/guild/GuildCreateDTOTest.java +++ b/server/src/test/java/com/objectcomputing/checkins/services/guild/GuildCreateDTOTest.java @@ -1,24 +1,20 @@ package com.objectcomputing.checkins.services.guild; -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 static org.junit.jupiter.api.Assertions.*; -@MicronautTest -@TestInstance(TestInstance.Lifecycle.PER_CLASS) -class GuildCreateDTOTest { +class GuildCreateDTOTest extends TestContainersSuite { @Inject private Validator validator; - @Test void testDTOInstantiation() { GuildCreateDTO dto = new GuildCreateDTO(); @@ -35,7 +31,7 @@ void testConstraintViolationName() { Set> violations = validator.validate(dto); assertEquals(1, violations.size()); for (ConstraintViolation violation : violations) { - assertEquals(violation.getMessage(), "must not be blank"); + assertEquals("must not be blank", violation.getMessage()); } } diff --git a/server/src/test/java/com/objectcomputing/checkins/services/guild/GuildTest.java b/server/src/test/java/com/objectcomputing/checkins/services/guild/GuildTest.java index 56307a91c6..bcd0a85130 100644 --- a/server/src/test/java/com/objectcomputing/checkins/services/guild/GuildTest.java +++ b/server/src/test/java/com/objectcomputing/checkins/services/guild/GuildTest.java @@ -1,11 +1,10 @@ package com.objectcomputing.checkins.services.guild; -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; @@ -13,14 +12,11 @@ import static org.junit.jupiter.api.Assertions.*; -@MicronautTest -@TestInstance(TestInstance.Lifecycle.PER_CLASS) -class GuildTest { +class GuildTest extends TestContainersSuite { @Inject private Validator validator; - @Test void testGuildInstantiation() { final String name = "name"; @@ -45,7 +41,6 @@ void testGuildInstantiation2() { assertTrue(violations.isEmpty()); } - @Test void testConstraintViolation() { final UUID id = UUID.randomUUID(); @@ -58,7 +53,7 @@ void testConstraintViolation() { Set> violations = validator.validate(guild); assertEquals(violations.size(), 1); for (ConstraintViolation violation : violations) { - assertEquals(violation.getMessage(), "must not be blank"); + assertEquals("must not be blank", violation.getMessage()); } } diff --git a/server/src/test/java/com/objectcomputing/checkins/services/guild/member/GuildMemberTest.java b/server/src/test/java/com/objectcomputing/checkins/services/guild/member/GuildMemberTest.java index 49b5a0a5b2..996133bf1f 100644 --- a/server/src/test/java/com/objectcomputing/checkins/services/guild/member/GuildMemberTest.java +++ b/server/src/test/java/com/objectcomputing/checkins/services/guild/member/GuildMemberTest.java @@ -1,11 +1,10 @@ package com.objectcomputing.checkins.services.guild.member; -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; @@ -13,14 +12,11 @@ import static org.junit.jupiter.api.Assertions.*; -@MicronautTest -@TestInstance(TestInstance.Lifecycle.PER_CLASS) -class GuildMemberTest { +class GuildMemberTest extends TestContainersSuite { @Inject private Validator validator; - @Test void testGuildMemberInstantiation() { final UUID guildId = UUID.randomUUID(); @@ -63,7 +59,7 @@ void testConstraintViolation() { Set> violations = validator.validate(guildMember); assertEquals(2, violations.size()); for (ConstraintViolation violation : violations) { - assertEquals(violation.getMessage(), "must not be null"); + assertEquals("must not be null", violation.getMessage()); } } diff --git a/server/src/test/java/com/objectcomputing/checkins/services/member_skill/MemberSkillServiceImplTest.java b/server/src/test/java/com/objectcomputing/checkins/services/member_skill/MemberSkillServiceImplTest.java index 4ef6095c68..9ceb93783b 100644 --- a/server/src/test/java/com/objectcomputing/checkins/services/member_skill/MemberSkillServiceImplTest.java +++ b/server/src/test/java/com/objectcomputing/checkins/services/member_skill/MemberSkillServiceImplTest.java @@ -2,29 +2,38 @@ import com.objectcomputing.checkins.exceptions.AlreadyExistsException; import com.objectcomputing.checkins.exceptions.BadArgException; +import com.objectcomputing.checkins.services.TestContainersSuite; import com.objectcomputing.checkins.services.memberprofile.MemberProfile; import com.objectcomputing.checkins.services.memberprofile.MemberProfileRepository; import com.objectcomputing.checkins.services.skills.Skill; import com.objectcomputing.checkins.services.skills.SkillRepository; -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.*; +import java.util.HashSet; +import java.util.List; +import java.util.Optional; +import java.util.Set; +import java.util.UUID; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.eq; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.reset; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; -@MicronautTest -@TestInstance(TestInstance.Lifecycle.PER_CLASS) -class MemberSkillServiceImplTest { +class MemberSkillServiceImplTest extends TestContainersSuite { @Mock private MemberSkillRepository memberSkillRepository; @@ -38,14 +47,21 @@ class MemberSkillServiceImplTest { @InjectMocks private MemberSkillServiceImpl memberSkillsServices; + private AutoCloseable mockFinalizer; + @BeforeAll void initMocks() { - MockitoAnnotations.initMocks(this); + mockFinalizer = MockitoAnnotations.openMocks(this); } @BeforeEach void resetMocks() { - Mockito.reset(memberSkillRepository, skillRepository, memberProfileRepository); + reset(memberSkillRepository, skillRepository, memberProfileRepository); + } + + @AfterAll + void closeMocks() throws Exception { + mockFinalizer.close(); } @Test diff --git a/server/src/test/java/com/objectcomputing/checkins/services/member_skill/MemberSkillsCreateDTOTest.java b/server/src/test/java/com/objectcomputing/checkins/services/member_skill/MemberSkillsCreateDTOTest.java index 7a7e916b6f..5a9a5813c8 100644 --- a/server/src/test/java/com/objectcomputing/checkins/services/member_skill/MemberSkillsCreateDTOTest.java +++ b/server/src/test/java/com/objectcomputing/checkins/services/member_skill/MemberSkillsCreateDTOTest.java @@ -1,6 +1,6 @@ package com.objectcomputing.checkins.services.member_skill; -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 MemberSkillsCreateDTOTest { +class MemberSkillsCreateDTOTest extends TestContainersSuite { @Inject private Validator validator; @@ -33,7 +32,7 @@ void testConstraintViolation() { Set> violations = validator.validate(dto); assertEquals(violations.size(), 2); for (ConstraintViolation violation : violations) { - assertEquals(violation.getMessage(), "must not be null"); + assertEquals("must not be null", violation.getMessage()); } } @@ -53,5 +52,4 @@ void testPopulatedDTO() { Set> violations = validator.validate(dto); assertTrue(violations.isEmpty()); } - } diff --git a/server/src/test/java/com/objectcomputing/checkins/services/member_skill/skillsreport/SkillsReportServicesImplTest.java b/server/src/test/java/com/objectcomputing/checkins/services/member_skill/skillsreport/SkillsReportServicesImplTest.java index 3351dd8f9a..ba38018919 100644 --- a/server/src/test/java/com/objectcomputing/checkins/services/member_skill/skillsreport/SkillsReportServicesImplTest.java +++ b/server/src/test/java/com/objectcomputing/checkins/services/member_skill/skillsreport/SkillsReportServicesImplTest.java @@ -1,31 +1,41 @@ package com.objectcomputing.checkins.services.member_skill.skillsreport; import com.objectcomputing.checkins.exceptions.BadArgException; +import com.objectcomputing.checkins.services.TestContainersSuite; import com.objectcomputing.checkins.services.member_skill.MemberSkill; import com.objectcomputing.checkins.services.member_skill.MemberSkillRepository; import com.objectcomputing.checkins.services.memberprofile.MemberProfile; import com.objectcomputing.checkins.services.memberprofile.MemberProfileRepository; import com.objectcomputing.checkins.services.memberprofile.MemberProfileServices; import com.objectcomputing.checkins.services.skills.SkillRepository; -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.TestInstance; import org.junit.jupiter.api.Test; import org.mockito.InjectMocks; import org.mockito.Mock; -import org.mockito.Mockito; import org.mockito.MockitoAnnotations; import java.time.LocalDate; -import java.util.*; - -import static org.junit.jupiter.api.Assertions.*; -import static org.mockito.Mockito.*; - -@MicronautTest -@TestInstance(TestInstance.Lifecycle.PER_CLASS) -public class SkillsReportServicesImplTest { +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.UUID; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.reset; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +class SkillsReportServicesImplTest extends TestContainersSuite { @Mock private MemberSkillRepository memberSkillRepository; @@ -42,14 +52,21 @@ public class SkillsReportServicesImplTest { @InjectMocks private SkillsReportServicesImpl skillsReportServices; + private AutoCloseable mockFinalizer; + @BeforeAll void initMocks() { - MockitoAnnotations.initMocks(this); + mockFinalizer = MockitoAnnotations.openMocks(this); } @BeforeEach void resetMocks() { - Mockito.reset(memberSkillRepository, memberProfileRepository, skillRepository); + reset(memberSkillRepository, memberProfileRepository, skillRepository); + } + + @AfterAll + void finalizeMocks() throws Exception { + mockFinalizer.close(); } @Test diff --git a/server/src/test/java/com/objectcomputing/checkins/services/memberprofile/csvreport/MemberProfileReportServicesImplTest.java b/server/src/test/java/com/objectcomputing/checkins/services/memberprofile/csvreport/MemberProfileReportServicesImplTest.java index 38d7993dd3..f1ccff9eed 100644 --- a/server/src/test/java/com/objectcomputing/checkins/services/memberprofile/csvreport/MemberProfileReportServicesImplTest.java +++ b/server/src/test/java/com/objectcomputing/checkins/services/memberprofile/csvreport/MemberProfileReportServicesImplTest.java @@ -1,13 +1,13 @@ package com.objectcomputing.checkins.services.memberprofile.csvreport; -import io.micronaut.test.extensions.junit5.annotation.MicronautTest; +import com.objectcomputing.checkins.services.TestContainersSuite; import org.apache.commons.csv.CSVFormat; import org.apache.commons.csv.CSVParser; import org.apache.commons.csv.CSVRecord; +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; @@ -22,11 +22,10 @@ import java.util.UUID; import static org.junit.jupiter.api.Assertions.*; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.eq; +import static org.mockito.Mockito.when; -@MicronautTest -@TestInstance(TestInstance.Lifecycle.PER_CLASS) -class MemberProfileReportServicesImplTest { +class MemberProfileReportServicesImplTest extends TestContainersSuite { @Mock private MemberProfileReportRepository memberProfileReportRepository; @@ -37,9 +36,11 @@ class MemberProfileReportServicesImplTest { @InjectMocks private MemberProfileReportServicesImpl memberProfileReportServices; + private AutoCloseable mockFinalizer; + @BeforeAll void initMocks() { - MockitoAnnotations.openMocks(this); + mockFinalizer = MockitoAnnotations.openMocks(this); } @BeforeEach @@ -47,6 +48,11 @@ void resetMocks() { Mockito.reset(memberProfileReportRepository); } + @AfterAll + void close() throws Exception { + mockFinalizer.close(); + } + @Test void testGenerateFileWithAllMemberProfiles() throws IOException { List expectedRecords = createSampleRecords(); diff --git a/server/src/test/java/com/objectcomputing/checkins/services/memberprofile/currentuser/CurrentUserControllerTest.java b/server/src/test/java/com/objectcomputing/checkins/services/memberprofile/currentuser/CurrentUserControllerTest.java index 9ba40560ee..26b169e8cf 100644 --- a/server/src/test/java/com/objectcomputing/checkins/services/memberprofile/currentuser/CurrentUserControllerTest.java +++ b/server/src/test/java/com/objectcomputing/checkins/services/memberprofile/currentuser/CurrentUserControllerTest.java @@ -1,5 +1,6 @@ package com.objectcomputing.checkins.services.memberprofile.currentuser; +import com.objectcomputing.checkins.services.TestContainersSuite; import com.objectcomputing.checkins.services.fixture.MemberProfileFixture; import com.objectcomputing.checkins.services.fixture.RoleFixture; import com.objectcomputing.checkins.services.memberprofile.MemberProfile; @@ -10,11 +11,10 @@ import io.micronaut.http.HttpStatus; import io.micronaut.runtime.server.EmbeddedServer; import io.micronaut.security.authentication.Authentication; -import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import jakarta.inject.Inject; +import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.TestInstance; import org.mockito.Mock; import org.mockito.MockitoAnnotations; @@ -27,9 +27,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.mockito.Mockito.when; -@MicronautTest -@TestInstance(TestInstance.Lifecycle.PER_CLASS) -public class CurrentUserControllerTest implements MemberProfileFixture, RoleFixture { +class CurrentUserControllerTest extends TestContainersSuite implements MemberProfileFixture, RoleFixture { private static final Map userAttributes = new HashMap<>(); private static final String firstName = "some.first.name"; @@ -40,26 +38,29 @@ public class CurrentUserControllerTest implements MemberProfileFixture, RoleFixt @Mock CurrentUserServices currentUserServices; - @Inject CurrentUserController currentUserController; - @Inject - EmbeddedServer embeddedServer; + private AutoCloseable mockFinalizer; @BeforeAll - void setup() throws Exception { - MockitoAnnotations.openMocks(this).close(); + void setupMocks() { + mockFinalizer = MockitoAnnotations.openMocks(this); + } + + @AfterAll + void close() throws Exception { + mockFinalizer.close(); } @Test - public void testCurrentUserReturnsUnauthorizedWhenAuthenticationFails() { + void testCurrentUserReturnsUnauthorizedWhenAuthenticationFails() { HttpResponse response = currentUserController.currentUser(null); assertEquals(HttpStatus.UNAUTHORIZED, response.getStatus()); } @Test - public void testCurrentUserReturnsValidDTO() { + void testCurrentUserReturnsValidDTO() { Authentication auth = new Authentication() { @NonNull @Override @@ -97,9 +98,7 @@ public String getName() { @Test - public void testCurrentUserReturnsCorrectPermissions() { - - + void testCurrentUserReturnsCorrectPermissions() { Role memberRole = createRole(new Role(RoleType.MEMBER.name(), "Member Role")); setPermissionsForMember(memberRole.getId()); MemberProfile member = createADefaultMemberProfile(); @@ -135,9 +134,7 @@ public String getName() { @Test - public void testCurrentUserReturnsCorrectPermissionsAdmin() { - - + void testCurrentUserReturnsCorrectPermissionsAdmin() { Role adminRole = createRole(new Role(RoleType.ADMIN.name(), "Member Role")); setPermissionsForAdmin(adminRole.getId()); MemberProfile admin = createADefaultMemberProfile(); @@ -171,10 +168,4 @@ public String getName() { assertEquals(adminPermissions, currentUserDTO.getPermissions()); assertNotNull(actual.getHeaders().get("location")); } - - - @Override - public EmbeddedServer getEmbeddedServer() { - return embeddedServer; - } } diff --git a/server/src/test/java/com/objectcomputing/checkins/services/memberprofile/currentuser/CurrentUserDtoTest.java b/server/src/test/java/com/objectcomputing/checkins/services/memberprofile/currentuser/CurrentUserDtoTest.java index ec64e236f4..2a9606f289 100644 --- a/server/src/test/java/com/objectcomputing/checkins/services/memberprofile/currentuser/CurrentUserDtoTest.java +++ b/server/src/test/java/com/objectcomputing/checkins/services/memberprofile/currentuser/CurrentUserDtoTest.java @@ -1,7 +1,7 @@ package com.objectcomputing.checkins.services.memberprofile.currentuser; +import com.objectcomputing.checkins.services.TestContainersSuite; import com.objectcomputing.checkins.services.memberprofile.MemberProfile; -import io.micronaut.test.extensions.junit5.annotation.MicronautTest; 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 CurrentUserDtoTest { +class CurrentUserDtoTest extends TestContainersSuite { @Inject private Validator validator; diff --git a/server/src/test/java/com/objectcomputing/checkins/services/memberprofile/currentuser/CurrentUserServicesImplTest.java b/server/src/test/java/com/objectcomputing/checkins/services/memberprofile/currentuser/CurrentUserServicesImplTest.java index cc91efd0c8..6f3a574b8a 100644 --- a/server/src/test/java/com/objectcomputing/checkins/services/memberprofile/currentuser/CurrentUserServicesImplTest.java +++ b/server/src/test/java/com/objectcomputing/checkins/services/memberprofile/currentuser/CurrentUserServicesImplTest.java @@ -1,15 +1,15 @@ package com.objectcomputing.checkins.services.memberprofile.currentuser; +import com.objectcomputing.checkins.services.TestContainersSuite; import com.objectcomputing.checkins.services.memberprofile.MemberProfile; import com.objectcomputing.checkins.services.memberprofile.MemberProfileRepository; import com.objectcomputing.checkins.services.role.Role; import com.objectcomputing.checkins.services.role.RoleServices; import com.objectcomputing.checkins.services.role.RoleType; import com.objectcomputing.checkins.services.role.member_roles.MemberRoleServices; -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.Test; -import org.junit.jupiter.api.TestInstance; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.MockitoAnnotations; @@ -21,9 +21,7 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; -@MicronautTest -@TestInstance(TestInstance.Lifecycle.PER_CLASS) -public class CurrentUserServicesImplTest { +class CurrentUserServicesImplTest extends TestContainersSuite { @Mock MemberProfileRepository memberProfileRepo; @@ -37,13 +35,20 @@ public class CurrentUserServicesImplTest { @InjectMocks CurrentUserServicesImpl testObject; + private AutoCloseable mockFinalizer; + @BeforeAll public void before() { - MockitoAnnotations.initMocks(this); + mockFinalizer = MockitoAnnotations.openMocks(this); + } + + @AfterAll + public void after() throws Exception { + mockFinalizer.close(); } @Test - public void testFindOrSaveUserForNewUser() { + void testFindOrSaveUserForNewUser() { MemberProfile expected = mkMemberProfile(); expected.setWorkEmail("test.email"); @@ -55,7 +60,7 @@ public void testFindOrSaveUserForNewUser() { } @Test - public void testFindOrSaveUserForExistingUser() { + void testFindOrSaveUserForExistingUser() { MemberProfile expected = mkMemberProfile(); expected.setId(UUID.randomUUID()); expected.setWorkEmail("test.email"); diff --git a/server/src/test/java/com/objectcomputing/checkins/services/memberprofile/memberphoto/MemberPhotoControllerTest.java b/server/src/test/java/com/objectcomputing/checkins/services/memberprofile/memberphoto/MemberPhotoControllerTest.java index 215d643cef..98e71a4811 100644 --- a/server/src/test/java/com/objectcomputing/checkins/services/memberprofile/memberphoto/MemberPhotoControllerTest.java +++ b/server/src/test/java/com/objectcomputing/checkins/services/memberprofile/memberphoto/MemberPhotoControllerTest.java @@ -1,28 +1,24 @@ package com.objectcomputing.checkins.services.memberprofile.memberphoto; +import com.objectcomputing.checkins.services.TestContainersSuite; import io.micronaut.http.HttpRequest; import io.micronaut.http.HttpResponse; import io.micronaut.http.HttpStatus; import io.micronaut.http.client.HttpClient; import io.micronaut.http.client.annotation.Client; import io.micronaut.test.annotation.MockBean; -import io.micronaut.test.extensions.junit5.annotation.MicronautTest; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.TestInstance; -import jakarta.inject.Inject; import java.io.IOException; import java.util.Base64; +import static com.objectcomputing.checkins.services.role.RoleType.Constants.MEMBER_ROLE; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static com.objectcomputing.checkins.services.role.RoleType.Constants.MEMBER_ROLE; - -@MicronautTest -@TestInstance(TestInstance.Lifecycle.PER_CLASS) -public class MemberPhotoControllerTest { +class MemberPhotoControllerTest extends TestContainersSuite { @Inject @Client("/services/member-profiles/member-photos") @@ -33,7 +29,7 @@ public class MemberPhotoControllerTest { //Happy path @Test - public void testGetForValidInput() throws IOException { + void testGetForValidInput() throws IOException { String testEmail = "test@test.com"; String testPhotoData = "test.photo.data"; @@ -55,5 +51,4 @@ public void testGetForValidInput() throws IOException { public MemberPhotoService memberPhotoService() { return mock(MemberPhotoService.class); } - } diff --git a/server/src/test/java/com/objectcomputing/checkins/services/memberprofile/memberphoto/MemberPhotoServiceImplTest.java b/server/src/test/java/com/objectcomputing/checkins/services/memberprofile/memberphoto/MemberPhotoServiceImplTest.java index b9df56bfd4..fdc1b7d0aa 100644 --- a/server/src/test/java/com/objectcomputing/checkins/services/memberprofile/memberphoto/MemberPhotoServiceImplTest.java +++ b/server/src/test/java/com/objectcomputing/checkins/services/memberprofile/memberphoto/MemberPhotoServiceImplTest.java @@ -3,36 +3,27 @@ import com.google.api.client.googleapis.json.GoogleJsonResponseException; import com.google.api.services.directory.Directory; import com.google.api.services.directory.model.UserPhoto; +import com.objectcomputing.checkins.services.TestContainersSuite; import com.objectcomputing.checkins.services.memberprofile.MemberProfileServices; import com.objectcomputing.checkins.util.googleapiaccess.GoogleApiAccess; import io.micronaut.context.env.Environment; -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.io.ByteArrayInputStream; import java.io.IOException; -import java.io.InputStream; -import java.net.URL; -import java.net.URLConnection; -import java.net.URLStreamHandler; import java.nio.charset.StandardCharsets; import java.util.Base64; -import java.util.Optional; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.mockito.Mockito.*; -@MicronautTest -@TestInstance(TestInstance.Lifecycle.PER_CLASS) -public class MemberPhotoServiceImplTest { +class MemberPhotoServiceImplTest extends TestContainersSuite { @Mock private MemberProfileServices mockMemberProfileServices; @@ -58,25 +49,32 @@ public class MemberPhotoServiceImplTest { @InjectMocks private MemberPhotoServiceImpl services; + private AutoCloseable mockFinalizer; + @BeforeAll - void initMocks() throws IOException { - MockitoAnnotations.openMocks(this); + void initMocks() { + mockFinalizer = MockitoAnnotations.openMocks(this); + } + + @AfterAll + void close() throws Exception { + mockFinalizer.close(); } @BeforeEach void resetMocks() { - Mockito.reset(mockMemberProfileServices); - Mockito.reset(mockGoogleApiAccess); - Mockito.reset(mockDirectory); - Mockito.reset(mockUsers); - Mockito.reset(mockPhotos); - Mockito.reset(mockGet); - Mockito.reset(mockEnvironment); + reset(mockMemberProfileServices); + reset(mockGoogleApiAccess); + reset(mockDirectory); + reset(mockUsers); + reset(mockPhotos); + reset(mockGet); + reset(mockEnvironment); } // happy path @Test - public void testGetImageByEmailAddress() throws IOException { + void testGetImageByEmailAddress() throws IOException { String testEmail = "test@test.com"; String testPhotoData = "test.photo.data"; byte[] testData = Base64.getUrlEncoder().encode(testPhotoData.getBytes()); @@ -104,7 +102,7 @@ public void testGetImageByEmailAddress() throws IOException { } @Test - public void testDirectoryServiceThrowsGoogleJsonResponseException() throws IOException { + void testDirectoryServiceThrowsGoogleJsonResponseException() throws IOException { String testEmail = "test@test.com"; when(mockGoogleApiAccess.getDirectory()).thenReturn(mockDirectory); @@ -120,18 +118,4 @@ public void testDirectoryServiceThrowsGoogleJsonResponseException() throws IOExc verify(mockGoogleApiAccess, times(1)).getDirectory(); verify(mockGet, times(1)).execute(); } - - private URL setupUrl() throws IOException { - //URL is a final class and cannot be mocked directly - final URLConnection mockConnection = Mockito.mock(URLConnection.class); - final URLStreamHandler handler = new URLStreamHandler() { - - @Override - protected URLConnection openConnection(final URL arg0) { - return mockConnection; - } - }; - - return new URL("http://foo.bar", "foo.bar", 80, "", handler); - } } diff --git a/server/src/test/java/com/objectcomputing/checkins/services/pulseresponse/PulseResponseCreateDTOTest.java b/server/src/test/java/com/objectcomputing/checkins/services/pulseresponse/PulseResponseCreateDTOTest.java index 5cf5d4369f..1339a742d8 100644 --- a/server/src/test/java/com/objectcomputing/checkins/services/pulseresponse/PulseResponseCreateDTOTest.java +++ b/server/src/test/java/com/objectcomputing/checkins/services/pulseresponse/PulseResponseCreateDTOTest.java @@ -1,6 +1,6 @@ package com.objectcomputing.checkins.services.pulseresponse; -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; @@ -14,8 +14,7 @@ import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; -@MicronautTest -class PulseResponseCreateDTOTest { +class PulseResponseCreateDTOTest extends TestContainersSuite { @Inject protected Validator validator; @@ -38,7 +37,7 @@ void testConstraintViolation() { Set> violations = validator.validate(dto); assertEquals(violations.size(), 3); for (ConstraintViolation violation : violations) { - assertEquals(violation.getMessage(), "must not be null"); + assertEquals("must not be null", violation.getMessage()); } } diff --git a/server/src/test/java/com/objectcomputing/checkins/services/pulseresponse/PulseResponseTest.java b/server/src/test/java/com/objectcomputing/checkins/services/pulseresponse/PulseResponseTest.java index 733ccf59ed..710953307c 100644 --- a/server/src/test/java/com/objectcomputing/checkins/services/pulseresponse/PulseResponseTest.java +++ b/server/src/test/java/com/objectcomputing/checkins/services/pulseresponse/PulseResponseTest.java @@ -1,11 +1,10 @@ package com.objectcomputing.checkins.services.pulseresponse; -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.time.LocalDate; import java.util.Set; @@ -13,9 +12,7 @@ import static org.junit.jupiter.api.Assertions.*; -@MicronautTest -@TestInstance(TestInstance.Lifecycle.PER_CLASS) -class PulseResponseTest { +class PulseResponseTest extends TestContainersSuite { @Inject protected Validator validator; @@ -48,7 +45,7 @@ void testConstraintViolation() { Set> violations = validator.validate(pulseResponse); assertEquals(1, violations.size()); for (ConstraintViolation violation : violations) { - assertEquals(violation.getMessage(), "must not be null"); + assertEquals("must not be null", violation.getMessage()); } } diff --git a/server/src/test/java/com/objectcomputing/checkins/services/request_notifications/CheckServicesImplTest.java b/server/src/test/java/com/objectcomputing/checkins/services/request_notifications/CheckServicesImplTest.java index f87789b6ea..3c3a8a81b2 100644 --- a/server/src/test/java/com/objectcomputing/checkins/services/request_notifications/CheckServicesImplTest.java +++ b/server/src/test/java/com/objectcomputing/checkins/services/request_notifications/CheckServicesImplTest.java @@ -1,10 +1,12 @@ package com.objectcomputing.checkins.services.request_notifications; +import com.objectcomputing.checkins.services.TestContainersSuite; import com.objectcomputing.checkins.services.feedback_request.FeedbackRequest; import com.objectcomputing.checkins.services.feedback_request.FeedbackRequestRepository; import com.objectcomputing.checkins.services.feedback_request.FeedbackRequestServicesImpl; -import io.micronaut.test.extensions.junit5.annotation.MicronautTest; -import org.junit.jupiter.api.*; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.MockitoAnnotations; @@ -16,11 +18,12 @@ import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@MicronautTest -@TestInstance(TestInstance.Lifecycle.PER_CLASS) -class CheckServicesImplTest { + +class CheckServicesImplTest extends TestContainersSuite { + @Mock private FeedbackRequestServicesImpl feedbackRequestServices; + @Mock private FeedbackRequestRepository feedbackRequestRepository; @@ -33,12 +36,12 @@ class CheckServicesImplTest { void initMocks() { openMocks = MockitoAnnotations.openMocks(this); } + @AfterEach void resetMocks() throws Exception { openMocks.close(); } - @Test void sendScheduledEmails() { FeedbackRequest retrievedRequest = new FeedbackRequest(); diff --git a/server/src/test/java/com/objectcomputing/checkins/services/role/RoleCreateDTOTest.java b/server/src/test/java/com/objectcomputing/checkins/services/role/RoleCreateDTOTest.java index 74e07f43fb..4f539ac0dc 100644 --- a/server/src/test/java/com/objectcomputing/checkins/services/role/RoleCreateDTOTest.java +++ b/server/src/test/java/com/objectcomputing/checkins/services/role/RoleCreateDTOTest.java @@ -1,6 +1,6 @@ package com.objectcomputing.checkins.services.role; -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 -class RoleCreateDTOTest { +class RoleCreateDTOTest extends TestContainersSuite { @Inject private Validator validator; @@ -29,7 +28,7 @@ void testConstraintViolation() { Set> violations = validator.validate(dto); assertEquals(violations.size(), 1); for (ConstraintViolation violation : violations) { - assertEquals(violation.getMessage(), "must not be null"); + assertEquals("must not be null", violation.getMessage()); } } diff --git a/server/src/test/java/com/objectcomputing/checkins/services/role/RoleTest.java b/server/src/test/java/com/objectcomputing/checkins/services/role/RoleTest.java index 3db51a17ce..52e5ff7e59 100644 --- a/server/src/test/java/com/objectcomputing/checkins/services/role/RoleTest.java +++ b/server/src/test/java/com/objectcomputing/checkins/services/role/RoleTest.java @@ -1,11 +1,10 @@ package com.objectcomputing.checkins.services.role; -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; @@ -13,14 +12,11 @@ import static org.junit.jupiter.api.Assertions.*; -@MicronautTest -@TestInstance(TestInstance.Lifecycle.PER_CLASS) -class RoleTest { +class RoleTest extends TestContainersSuite { @Inject private Validator validator; - @Test void testRoleInstantiation() { final RoleType roleType = RoleType.ADMIN; @@ -46,7 +42,6 @@ void testRoleInstantiation2() { void testConstraintViolation() { final UUID id = UUID.randomUUID(); final RoleType roleType = RoleType.ADMIN; - final UUID memberId = UUID.randomUUID(); Role role = new Role(id, roleType.toString(), "role description"); role.setRole(null); @@ -55,7 +50,7 @@ void testConstraintViolation() { Set> violations = validator.validate(role); assertEquals(1, violations.size()); for (ConstraintViolation violation : violations) { - assertEquals(violation.getMessage(), "must not be null"); + assertEquals("must not be null", violation.getMessage()); } } diff --git a/server/src/test/java/com/objectcomputing/checkins/services/skill_record/SkillRecordServicesImplTest.java b/server/src/test/java/com/objectcomputing/checkins/services/skill_record/SkillRecordServicesImplTest.java index 134b69dca0..42f12ac5a2 100644 --- a/server/src/test/java/com/objectcomputing/checkins/services/skill_record/SkillRecordServicesImplTest.java +++ b/server/src/test/java/com/objectcomputing/checkins/services/skill_record/SkillRecordServicesImplTest.java @@ -1,13 +1,12 @@ package com.objectcomputing.checkins.services.skill_record; -import io.micronaut.test.extensions.junit5.annotation.MicronautTest; +import com.objectcomputing.checkins.services.TestContainersSuite; import org.apache.commons.csv.CSVFormat; import org.apache.commons.csv.CSVParser; import org.apache.commons.csv.CSVRecord; import org.junit.jupiter.api.*; import org.mockito.InjectMocks; import org.mockito.Mock; -import org.mockito.Mockito; import org.mockito.MockitoAnnotations; import java.io.File; @@ -18,12 +17,11 @@ import java.util.List; import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.Mockito.reset; import static org.mockito.Mockito.when; -@MicronautTest @TestMethodOrder(MethodOrderer.OrderAnnotation.class) -@TestInstance(TestInstance.Lifecycle.PER_CLASS) -class SkillRecordServicesImplTest { +class SkillRecordServicesImplTest extends TestContainersSuite { @Mock private SkillRecordRepository skillRecordRepository; @@ -34,14 +32,21 @@ class SkillRecordServicesImplTest { @InjectMocks private SkillRecordServicesImpl skillRecordServices; + private AutoCloseable mockFinalizer; + @BeforeAll void initMocks() { - MockitoAnnotations.openMocks(this); + mockFinalizer = MockitoAnnotations.openMocks(this); } @BeforeEach void resetMocks() { - Mockito.reset(skillRecordRepository); + reset(skillRecordRepository); + } + + @AfterAll + void close() throws Exception { + mockFinalizer.close(); } @Test diff --git a/server/src/test/java/com/objectcomputing/checkins/services/team/TeamCreateDTOTest.java b/server/src/test/java/com/objectcomputing/checkins/services/team/TeamCreateDTOTest.java index 97a2ca2a17..a518131a12 100644 --- a/server/src/test/java/com/objectcomputing/checkins/services/team/TeamCreateDTOTest.java +++ b/server/src/test/java/com/objectcomputing/checkins/services/team/TeamCreateDTOTest.java @@ -1,19 +1,16 @@ package com.objectcomputing.checkins.services.team; -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 static org.junit.jupiter.api.Assertions.*; -@MicronautTest -@TestInstance(TestInstance.Lifecycle.PER_CLASS) -class TeamCreateDTOTest { +class TeamCreateDTOTest extends TestContainersSuite { @Inject private Validator validator; @@ -34,7 +31,7 @@ void testConstraintViolation() { Set> violations = validator.validate(dto); assertEquals(1, violations.size()); for (ConstraintViolation violation : violations) { - assertEquals(violation.getMessage(), "must not be blank"); + assertEquals("must not be blank", violation.getMessage()); } } diff --git a/server/src/test/java/com/objectcomputing/checkins/services/team/member/TeamMemberTest.java b/server/src/test/java/com/objectcomputing/checkins/services/team/member/TeamMemberTest.java index 29c5da0126..4d05840019 100644 --- a/server/src/test/java/com/objectcomputing/checkins/services/team/member/TeamMemberTest.java +++ b/server/src/test/java/com/objectcomputing/checkins/services/team/member/TeamMemberTest.java @@ -1,11 +1,10 @@ package com.objectcomputing.checkins.services.team.member; -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; @@ -13,14 +12,11 @@ import static org.junit.jupiter.api.Assertions.*; -@MicronautTest -@TestInstance(TestInstance.Lifecycle.PER_CLASS) -class TeamMemberTest { +class TeamMemberTest extends TestContainersSuite { @Inject private Validator validator; - @Test void testTeamMemberInstantiation() { final UUID teamId = UUID.randomUUID(); @@ -48,7 +44,6 @@ void testTeamMemberInstantiation2() { assertTrue(violations.isEmpty()); } - @Test void testConstraintViolation() { final UUID id = UUID.randomUUID(); @@ -63,7 +58,7 @@ void testConstraintViolation() { Set> violations = validator.validate(teamMember); assertEquals(2, violations.size()); for (ConstraintViolation violation : violations) { - assertEquals(violation.getMessage(), "must not be null"); + assertEquals("must not be null", violation.getMessage()); } } diff --git a/server/src/test/java/com/objectcomputing/checkins/util/UtilTest.java b/server/src/test/java/com/objectcomputing/checkins/util/UtilTest.java index 40e8b73d30..2a53a4efb8 100644 --- a/server/src/test/java/com/objectcomputing/checkins/util/UtilTest.java +++ b/server/src/test/java/com/objectcomputing/checkins/util/UtilTest.java @@ -1,6 +1,6 @@ package com.objectcomputing.checkins.util; -import io.micronaut.test.extensions.junit5.annotation.MicronautTest; +import com.objectcomputing.checkins.services.TestContainersSuite; import org.junit.jupiter.api.Test; import java.util.UUID; @@ -8,20 +8,19 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; -@MicronautTest -public class UtilTest { +class UtilTest extends TestContainersSuite { private static final String sampleUUIDString = "c0df7236-f200-11ea-adc1-0242ac120002"; private static final UUID sampleUUID = UUID.fromString(sampleUUIDString); @Test - public void testNullSafeUUIDTranslationNotNull() { + void testNullSafeUUIDTranslationNotNull() { String result = Util.nullSafeUUIDToString(sampleUUID); assertEquals(sampleUUIDString, result); } @Test - public void testNullSafeUUIDTranslationNull() { + void testNullSafeUUIDTranslationNull() { String result = Util.nullSafeUUIDToString(null); assertNull(result); } diff --git a/server/src/test/resources/application-test.yml b/server/src/test/resources/application-test.yml index 8811fb0ddd..c79e07d73d 100644 --- a/server/src/test/resources/application-test.yml +++ b/server/src/test/resources/application-test.yml @@ -5,11 +5,6 @@ micronaut: oauth2: enabled: false --- -datasources: - default: - url: jdbc:tc:postgresql:11.6:/// - driverClassName: org.testcontainers.jdbc.ContainerDatabaseDriver ---- mail-jet: from_address: "someEmail@test.com" from_name: "John Doe"