From aba5340f014bcf3aa4971ee2ee33fd8a7e21ae7f Mon Sep 17 00:00:00 2001 From: William Harrington Date: Wed, 12 Feb 2025 20:14:48 -0600 Subject: Rename BuilddbHomeControllerTest, remove some public modifiers, fix some Assertions and change deprecated initMocks to openMocks. --- .../berzerkula/builddb/BuilddbApplicationTest.java | 10 +++---- .../controllers/BuilddbHomeControllerTest.java | 33 ++++++++++++++++++++++ .../controllers/BuilddbTestHomeController.java | 33 ---------------------- .../repositories/AppUserRepositoryTest.java | 4 +-- .../builddb/repositories/PkgRepositoryTest.java | 4 +-- .../builddb/services/AppUserServiceTest.java | 5 ++-- 6 files changed, 45 insertions(+), 44 deletions(-) create mode 100644 src/test/java/org/berzerkula/builddb/controllers/BuilddbHomeControllerTest.java delete mode 100644 src/test/java/org/berzerkula/builddb/controllers/BuilddbTestHomeController.java diff --git a/src/test/java/org/berzerkula/builddb/BuilddbApplicationTest.java b/src/test/java/org/berzerkula/builddb/BuilddbApplicationTest.java index 57604be..fa82164 100644 --- a/src/test/java/org/berzerkula/builddb/BuilddbApplicationTest.java +++ b/src/test/java/org/berzerkula/builddb/BuilddbApplicationTest.java @@ -1,6 +1,6 @@ package org.berzerkula.builddb; -import org.assertj.core.api.Assertions; +import org.junit.jupiter.api.Assertions; import org.berzerkula.builddb.services.AppUserService; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -13,12 +13,12 @@ class BuilddbApplicationTest { AppUserService appUserService; @Test - public void contextLoads() { - Assertions.assertThat(appUserService).isNotNull(); + void contextLoads() { + Assertions.assertNotNull(appUserService); } @Test - public void main() { - BuilddbApplication.main(new String[] {}); + void mainTest() { + Assertions.assertDoesNotThrow(() -> BuilddbApplication.main(new String[]{})); } } \ No newline at end of file diff --git a/src/test/java/org/berzerkula/builddb/controllers/BuilddbHomeControllerTest.java b/src/test/java/org/berzerkula/builddb/controllers/BuilddbHomeControllerTest.java new file mode 100644 index 0000000..b22277e --- /dev/null +++ b/src/test/java/org/berzerkula/builddb/controllers/BuilddbHomeControllerTest.java @@ -0,0 +1,33 @@ +package org.berzerkula.builddb.controllers; + +import org.berzerkula.builddb.config.SecurityConfig; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.context.annotation.Import; +import org.springframework.test.web.servlet.MockMvc; + +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.view; + +@Import(SecurityConfig.class) +@AutoConfigureMockMvc +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) + +class BuilddbHomeControllerTest { + + @Autowired + private MockMvc mockMvc; + + @Test + void shouldReturnContactOk() throws Exception { + mockMvc.perform(get("/contact")) + .andExpect(status().isOk()) + .andExpect(view().name("contact")) + .andDo(print()); + } + +} diff --git a/src/test/java/org/berzerkula/builddb/controllers/BuilddbTestHomeController.java b/src/test/java/org/berzerkula/builddb/controllers/BuilddbTestHomeController.java deleted file mode 100644 index 94ae655..0000000 --- a/src/test/java/org/berzerkula/builddb/controllers/BuilddbTestHomeController.java +++ /dev/null @@ -1,33 +0,0 @@ -package org.berzerkula.builddb.controllers; - -import org.berzerkula.builddb.config.SecurityConfig; -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.context.annotation.Import; -import org.springframework.test.web.servlet.MockMvc; - -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.view; - -@Import(SecurityConfig.class) -@AutoConfigureMockMvc -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) - -public class BuilddbTestHomeController { - - @Autowired - private MockMvc mockMvc; - - @Test - void shouldReturnContactOk() throws Exception { - mockMvc.perform(get("/contact")) - .andExpect(status().isOk()) - .andExpect(view().name("contact")) - .andDo(print()); - } - -} diff --git a/src/test/java/org/berzerkula/builddb/repositories/AppUserRepositoryTest.java b/src/test/java/org/berzerkula/builddb/repositories/AppUserRepositoryTest.java index 58ca267..59fa9f4 100644 --- a/src/test/java/org/berzerkula/builddb/repositories/AppUserRepositoryTest.java +++ b/src/test/java/org/berzerkula/builddb/repositories/AppUserRepositoryTest.java @@ -14,7 +14,7 @@ class AppUserRepositoryTest { @Autowired AppUserRepository appUserRepository; @Test - public void testCreateReadDelete() { + void testCreateReadDelete() { AppUser appUser = new AppUser("John", "Doe", "john.doe@test.com", "", "", "password","client"); @@ -25,7 +25,7 @@ class AppUserRepositoryTest { Assertions.assertThat(appUsers).extracting(AppUser::getFirstName).containsOnly("John"); appUserRepository.deleteAll(); - Assertions.assertThat(appUserRepository.findAll().isEmpty()); + Assertions.assertThat(appUserRepository.findAll()).isEmpty(); } } \ No newline at end of file diff --git a/src/test/java/org/berzerkula/builddb/repositories/PkgRepositoryTest.java b/src/test/java/org/berzerkula/builddb/repositories/PkgRepositoryTest.java index 0203fb0..1ae2cff 100644 --- a/src/test/java/org/berzerkula/builddb/repositories/PkgRepositoryTest.java +++ b/src/test/java/org/berzerkula/builddb/repositories/PkgRepositoryTest.java @@ -15,7 +15,7 @@ class PkgRepositoryTest { PkgRepository pkgRepository; @Test - public void testCreateReadDelete() { + void testCreateReadDelete() { Pkg pkg = new Pkg(123, "Test", "1.2.3", "", "", "", "", "", ""); @@ -26,7 +26,7 @@ class PkgRepositoryTest { Assertions.assertThat(pkgs).extracting(Pkg::getSequence).containsOnly(123); pkgRepository.deleteAll(); - Assertions.assertThat(pkgRepository.findAll().isEmpty()); + Assertions.assertThat(pkgRepository.findAll()).isEmpty(); } } \ No newline at end of file diff --git a/src/test/java/org/berzerkula/builddb/services/AppUserServiceTest.java b/src/test/java/org/berzerkula/builddb/services/AppUserServiceTest.java index d3b19f7..a3ecb82 100644 --- a/src/test/java/org/berzerkula/builddb/services/AppUserServiceTest.java +++ b/src/test/java/org/berzerkula/builddb/services/AppUserServiceTest.java @@ -14,7 +14,8 @@ import org.springframework.security.core.userdetails.UserDetails; import java.util.ArrayList; import java.util.List; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; import static org.mockito.Mockito.when; @ExtendWith(MockitoExtension.class) @@ -28,7 +29,7 @@ class AppUserServiceTest { @BeforeEach public void init() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); } @Test -- cgit v1.2.3-54-g00ecf