From ca34df2af9bd6be9eb0e5706f0184ae5a9861b95 Mon Sep 17 00:00:00 2001 From: Maxime Pierront Date: Wed, 26 Nov 2025 16:57:57 +0100 Subject: [PATCH] Refactor test classes: remove redundant `public` modifiers & update test values. --- .../ModulithStructureTests.java | 2 +- .../RockPaperScissorsPlayApplicationTest.java | 2 +- .../play/domain/MoveTest.java | 2 +- .../domain/RockPaperScissorsPlayTest.java | 11 ++++---- .../stat/StatApplicationTest.java | 10 +++---- .../stat/StatBoardGetterTest.java | 26 ++++++++++--------- .../stat/StatControllerTest.java | 6 ++--- .../stat/StatSaverTest.java | 2 +- 8 files changed, 31 insertions(+), 30 deletions(-) diff --git a/src/test/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/ModulithStructureTests.java b/src/test/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/ModulithStructureTests.java index 68dc552..3976e01 100644 --- a/src/test/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/ModulithStructureTests.java +++ b/src/test/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/ModulithStructureTests.java @@ -3,7 +3,7 @@ package fr.iut_fbleau.info.but3.automation.rock_paper_scissors; import org.junit.jupiter.api.Test; import org.springframework.modulith.core.ApplicationModules; -public class ModulithStructureTests { +class ModulithStructureTests { @Test void verifyModularStructure() { diff --git a/src/test/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/play/RockPaperScissorsPlayApplicationTest.java b/src/test/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/play/RockPaperScissorsPlayApplicationTest.java index 0fcbca9..1b2ce9b 100644 --- a/src/test/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/play/RockPaperScissorsPlayApplicationTest.java +++ b/src/test/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/play/RockPaperScissorsPlayApplicationTest.java @@ -26,7 +26,7 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen webEnvironment = RANDOM_PORT ) @Import(FakeCpuConfiguration.class) -public class RockPaperScissorsPlayApplicationTest { +class RockPaperScissorsPlayApplicationTest { @Autowired private TestRestTemplate restTemplate; diff --git a/src/test/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/play/domain/MoveTest.java b/src/test/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/play/domain/MoveTest.java index ae910fd..c21526b 100644 --- a/src/test/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/play/domain/MoveTest.java +++ b/src/test/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/play/domain/MoveTest.java @@ -10,7 +10,7 @@ import java.util.stream.Stream; import static org.junit.jupiter.api.Assertions.*; -public class MoveTest { +class MoveTest { @Test void should_check_move_size(){ diff --git a/src/test/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/play/domain/RockPaperScissorsPlayTest.java b/src/test/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/play/domain/RockPaperScissorsPlayTest.java index 8b7824f..019b992 100644 --- a/src/test/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/play/domain/RockPaperScissorsPlayTest.java +++ b/src/test/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/play/domain/RockPaperScissorsPlayTest.java @@ -1,17 +1,16 @@ package fr.iut_fbleau.info.but3.automation.rock_paper_scissors.play.domain; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; + import fr.iut_fbleau.info.but3.automation.rock_paper_scissors.play.RockPaperScissorsPlay; import fr.iut_fbleau.info.but3.automation.rock_paper_scissors.play.spi.FakeCpuPicker; import fr.iut_fbleau.info.but3.automation.rock_paper_scissors.stat.domain.StatSaver; -import fr.iut_fbleau.info.but3.automation.rock_paper_scissors.stat.spi.stub.InMemoryStatRepository; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import org.springframework.test.context.bean.override.mockito.MockitoBean; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.mockito.Mockito.*; @ExtendWith(MockitoExtension.class) public class RockPaperScissorsPlayTest { diff --git a/src/test/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/stat/StatApplicationTest.java b/src/test/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/stat/StatApplicationTest.java index 5e0b273..2a57b43 100644 --- a/src/test/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/stat/StatApplicationTest.java +++ b/src/test/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/stat/StatApplicationTest.java @@ -14,7 +14,7 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen @ApplicationModuleTest( webEnvironment = RANDOM_PORT ) -public class StatApplicationTest { +class StatApplicationTest { @Autowired private TestRestTemplate restTemplate; @@ -27,9 +27,9 @@ public class StatApplicationTest { assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK); assertThat(json.from(response.getBody())).extractingJsonPathArrayValue("@.stats").hasSize(2); - assertThat(json.from(response.getBody())).extractingJsonPathStringValue("@.stats[0].name").isEqualTo("joe"); - assertThat(json.from(response.getBody())).extractingJsonPathNumberValue("@.stats[0].wins").isEqualTo(1); - assertThat(json.from(response.getBody())).extractingJsonPathStringValue("@.stats[1].name").isEqualTo("eoj"); - assertThat(json.from(response.getBody())).extractingJsonPathNumberValue("@.stats[1].wins").isEqualTo(3); + assertThat(json.from(response.getBody())).extractingJsonPathStringValue("@.stats[0].name").isEqualTo("eoj"); + assertThat(json.from(response.getBody())).extractingJsonPathNumberValue("@.stats[0].wins").isEqualTo(3); + assertThat(json.from(response.getBody())).extractingJsonPathStringValue("@.stats[1].name").isEqualTo("joe"); + assertThat(json.from(response.getBody())).extractingJsonPathNumberValue("@.stats[1].wins").isEqualTo(1); } } diff --git a/src/test/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/stat/StatBoardGetterTest.java b/src/test/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/stat/StatBoardGetterTest.java index 75b0b59..aec2ebf 100644 --- a/src/test/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/stat/StatBoardGetterTest.java +++ b/src/test/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/stat/StatBoardGetterTest.java @@ -3,6 +3,7 @@ package fr.iut_fbleau.info.but3.automation.rock_paper_scissors.stat; import fr.iut_fbleau.info.but3.automation.rock_paper_scissors.stat.domain.StatBoard; import fr.iut_fbleau.info.but3.automation.rock_paper_scissors.stat.domain.StatBoardGetter; import fr.iut_fbleau.info.but3.automation.rock_paper_scissors.stat.spi.stub.InMemoryStatRepository; +import java.util.LinkedHashMap; import org.junit.jupiter.api.Test; import java.util.HashMap; @@ -10,19 +11,20 @@ import java.util.HashMap; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -public class StatBoardGetterTest { - @Test - public void should_get_stat_board() { - HashMap stats = new HashMap<>(); - stats.put("joe", 1); - stats.put("eoj", 5); - InMemoryStatRepository statRepository = new InMemoryStatRepository(stats); +class StatBoardGetterTest { - StatBoardGet statBoardGet = new StatBoardGetter(statRepository); + @Test + void should_get_stat_board() { + HashMap stats = new LinkedHashMap<>(); + stats.put("eoj", 5); + stats.put("joe", 1); + InMemoryStatRepository statRepository = new InMemoryStatRepository(stats); - StatBoard statBoard = statBoardGet.board(); + StatBoardGet statBoardGet = new StatBoardGetter(statRepository); - assertNotNull(statBoard); - assertEquals(stats, statBoard.stats()); - } + StatBoard statBoard = statBoardGet.board(); + + assertNotNull(statBoard); + assertEquals(stats, statBoard.stats()); + } } diff --git a/src/test/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/stat/StatControllerTest.java b/src/test/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/stat/StatControllerTest.java index 3e56835..f2b337d 100644 --- a/src/test/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/stat/StatControllerTest.java +++ b/src/test/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/stat/StatControllerTest.java @@ -20,7 +20,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. @WebMvcTest(StatController.class) @Import(StatConfiguration.class) -public class StatControllerTest { +class StatControllerTest { private static final String STAT_ENDPOINT = "/stat"; @@ -36,8 +36,8 @@ public class StatControllerTest { mockMvc.perform(get(STAT_ENDPOINT)) .andExpect(status().isOk()) .andExpect(jsonPath("$.stats").isArray()) - .andExpect(jsonPath("$.stats[0].name").value("joe")) - .andExpect(jsonPath("$.stats[0].wins").value(1)); + .andExpect(jsonPath("$.stats[0].name").value("eoj")) + .andExpect(jsonPath("$.stats[0].wins").value(3)); } @TestConfiguration diff --git a/src/test/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/stat/StatSaverTest.java b/src/test/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/stat/StatSaverTest.java index 5360676..fbe8d62 100644 --- a/src/test/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/stat/StatSaverTest.java +++ b/src/test/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/stat/StatSaverTest.java @@ -10,7 +10,7 @@ import java.util.Map; import static org.junit.jupiter.api.Assertions.assertEquals; -public class StatSaverTest { +class StatSaverTest { @ParameterizedTest(name = "name = {0}, initial = {1}, expected = {2}") @CsvSource({"joe,0,1", "eoj,2,3"}) void should_save(String name, int initial, int expected) {