7 Commits

Author SHA1 Message Date
Maxime Pierront
9865e9dcc2 Sort stats by descending win count in StatBoardReponse constructor.
All checks were successful
rock-paper-scissors/pipeline/head This commit looks good
rock-paper-scissors/pipeline/pr-main This commit looks good
2025-11-26 16:58:06 +01:00
Maxime Pierront
ca34df2af9 Refactor test classes: remove redundant public modifiers & update test values. 2025-11-26 16:57:57 +01:00
b451ad2233 Merge pull request 'add-ci' (#5) from add-ci into main
Some checks failed
rock-paper-scissors/pipeline/head There was a failure building this commit
Reviewed-on: #5
2025-11-23 20:07:11 +01:00
8bf1594329 Merge pull request 'add-ci' (#4) from add-ci into main
Some checks failed
rock-paper-scissors/pipeline/head There was a failure building this commit
Reviewed-on: #4
2025-11-23 01:19:53 +01:00
b8c9b382d8 Merge pull request 'Add Jenkinsfile for CI/CD pipeline setup, including build, test, package, and deployment stages.' (#3) from add-ci into main
Some checks failed
rock-paper-scissors/pipeline/head There was a failure building this commit
Reviewed-on: #3
2025-11-23 00:40:16 +01:00
56206c02bb Merge pull request 'Add Jenkinsfile for CI/CD pipeline setup, including build, test, package, and deployment stages.' (#2) from add-ci into main
Reviewed-on: #2
2025-11-23 00:28:21 +01:00
9405b66593 Merge pull request 'Add Jenkinsfile for CI/CD pipeline setup, including build, test, package, and deployment stages.' (#1) from add-ci into main
Reviewed-on: #1
2025-11-23 00:22:12 +01:00
9 changed files with 39 additions and 35 deletions

View File

@@ -2,6 +2,7 @@ package fr.iut_fbleau.info.but3.automation.rock_paper_scissors.stat.web;
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.StatBoard;
import java.util.Comparator;
import java.util.List; import java.util.List;
public record StatBoardReponse(List<Stat> stats) { public record StatBoardReponse(List<Stat> stats) {
@@ -9,6 +10,8 @@ public record StatBoardReponse(List<Stat> stats) {
public StatBoardReponse(StatBoard statBoard) { public StatBoardReponse(StatBoard statBoard) {
this(statBoard.stats().entrySet().stream() this(statBoard.stats().entrySet().stream()
.map(Stat::fromMap) .map(Stat::fromMap)
.sorted(Comparator.comparingInt(
stat -> -stat.wins()))
.toList()); .toList());
} }
} }

View File

@@ -3,7 +3,7 @@ package fr.iut_fbleau.info.but3.automation.rock_paper_scissors;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.springframework.modulith.core.ApplicationModules; import org.springframework.modulith.core.ApplicationModules;
public class ModulithStructureTests { class ModulithStructureTests {
@Test @Test
void verifyModularStructure() { void verifyModularStructure() {

View File

@@ -26,7 +26,7 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
webEnvironment = RANDOM_PORT webEnvironment = RANDOM_PORT
) )
@Import(FakeCpuConfiguration.class) @Import(FakeCpuConfiguration.class)
public class RockPaperScissorsPlayApplicationTest { class RockPaperScissorsPlayApplicationTest {
@Autowired @Autowired
private TestRestTemplate restTemplate; private TestRestTemplate restTemplate;

View File

@@ -10,7 +10,7 @@ import java.util.stream.Stream;
import static org.junit.jupiter.api.Assertions.*; import static org.junit.jupiter.api.Assertions.*;
public class MoveTest { class MoveTest {
@Test @Test
void should_check_move_size(){ void should_check_move_size(){

View File

@@ -1,17 +1,16 @@
package fr.iut_fbleau.info.but3.automation.rock_paper_scissors.play.domain; 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.RockPaperScissorsPlay;
import fr.iut_fbleau.info.but3.automation.rock_paper_scissors.play.spi.FakeCpuPicker; 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.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.Test;
import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension; 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) @ExtendWith(MockitoExtension.class)
public class RockPaperScissorsPlayTest { public class RockPaperScissorsPlayTest {

View File

@@ -14,7 +14,7 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
@ApplicationModuleTest( @ApplicationModuleTest(
webEnvironment = RANDOM_PORT webEnvironment = RANDOM_PORT
) )
public class StatApplicationTest { class StatApplicationTest {
@Autowired @Autowired
private TestRestTemplate restTemplate; private TestRestTemplate restTemplate;
@@ -27,9 +27,9 @@ public class StatApplicationTest {
assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK); assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
assertThat(json.from(response.getBody())).extractingJsonPathArrayValue("@.stats").hasSize(2); 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())).extractingJsonPathStringValue("@.stats[0].name").isEqualTo("eoj");
assertThat(json.from(response.getBody())).extractingJsonPathNumberValue("@.stats[0].wins").isEqualTo(1); assertThat(json.from(response.getBody())).extractingJsonPathNumberValue("@.stats[0].wins").isEqualTo(3);
assertThat(json.from(response.getBody())).extractingJsonPathStringValue("@.stats[1].name").isEqualTo("eoj"); assertThat(json.from(response.getBody())).extractingJsonPathStringValue("@.stats[1].name").isEqualTo("joe");
assertThat(json.from(response.getBody())).extractingJsonPathNumberValue("@.stats[1].wins").isEqualTo(3); assertThat(json.from(response.getBody())).extractingJsonPathNumberValue("@.stats[1].wins").isEqualTo(1);
} }
} }

View File

@@ -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.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.domain.StatBoardGetter;
import fr.iut_fbleau.info.but3.automation.rock_paper_scissors.stat.spi.stub.InMemoryStatRepository; 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 org.junit.jupiter.api.Test;
import java.util.HashMap; import java.util.HashMap;
@@ -10,12 +11,13 @@ import java.util.HashMap;
import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNotNull;
public class StatBoardGetterTest { class StatBoardGetterTest {
@Test @Test
public void should_get_stat_board() { void should_get_stat_board() {
HashMap<String, Integer> stats = new HashMap<>(); HashMap<String, Integer> stats = new LinkedHashMap<>();
stats.put("joe", 1);
stats.put("eoj", 5); stats.put("eoj", 5);
stats.put("joe", 1);
InMemoryStatRepository statRepository = new InMemoryStatRepository(stats); InMemoryStatRepository statRepository = new InMemoryStatRepository(stats);
StatBoardGet statBoardGet = new StatBoardGetter(statRepository); StatBoardGet statBoardGet = new StatBoardGetter(statRepository);

View File

@@ -20,7 +20,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
@WebMvcTest(StatController.class) @WebMvcTest(StatController.class)
@Import(StatConfiguration.class) @Import(StatConfiguration.class)
public class StatControllerTest { class StatControllerTest {
private static final String STAT_ENDPOINT = "/stat"; private static final String STAT_ENDPOINT = "/stat";
@@ -36,8 +36,8 @@ public class StatControllerTest {
mockMvc.perform(get(STAT_ENDPOINT)) mockMvc.perform(get(STAT_ENDPOINT))
.andExpect(status().isOk()) .andExpect(status().isOk())
.andExpect(jsonPath("$.stats").isArray()) .andExpect(jsonPath("$.stats").isArray())
.andExpect(jsonPath("$.stats[0].name").value("joe")) .andExpect(jsonPath("$.stats[0].name").value("eoj"))
.andExpect(jsonPath("$.stats[0].wins").value(1)); .andExpect(jsonPath("$.stats[0].wins").value(3));
} }
@TestConfiguration @TestConfiguration

View File

@@ -10,7 +10,7 @@ import java.util.Map;
import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertEquals;
public class StatSaverTest { class StatSaverTest {
@ParameterizedTest(name = "name = {0}, initial = {1}, expected = {2}") @ParameterizedTest(name = "name = {0}, initial = {1}, expected = {2}")
@CsvSource({"joe,0,1", "eoj,2,3"}) @CsvSource({"joe,0,1", "eoj,2,3"})
void should_save(String name, int initial, int expected) { void should_save(String name, int initial, int expected) {