From f61c0e38e36fb20bb0c935769dac654e7009cc16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrej=20=C5=A0imurka?= <492781@mail.muni.cz>
Date: Mon, 17 Apr 2023 02:15:46 +0200
Subject: [PATCH] test fixes
---
.../muni/pa165/race/rest/RaceServiceTest.java | 126 ------------------
.../pa165/race/rest/SeasonRepositoryTest.java | 3 +-
.../pa165/race/rest/SeasonServiceTest.java | 119 -----------------
3 files changed, 1 insertion(+), 247 deletions(-)
delete mode 100644 race/src/test/java/cz/muni/pa165/race/rest/RaceServiceTest.java
delete mode 100644 race/src/test/java/cz/muni/pa165/race/rest/SeasonServiceTest.java
diff --git a/race/src/test/java/cz/muni/pa165/race/rest/RaceServiceTest.java b/race/src/test/java/cz/muni/pa165/race/rest/RaceServiceTest.java
deleted file mode 100644
index a57e4003..00000000
--- a/race/src/test/java/cz/muni/pa165/race/rest/RaceServiceTest.java
+++ /dev/null
@@ -1,126 +0,0 @@
-package cz.muni.pa165.race.rest;
-
-import cz.muni.pa165.race.data.model.Race;
-import cz.muni.pa165.race.data.repository.RaceRepository;
-import org.junit.jupiter.api.BeforeEach;
-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.boot.test.mock.mockito.MockBean;
-import org.springframework.http.MediaType;
-import org.springframework.test.web.servlet.MockMvc;
-
-import java.util.List;
-import java.util.Optional;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyLong;
-import static org.mockito.BDDMockito.given;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.patch;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
-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.*;
-
-
-@SpringBootTest
-@AutoConfigureMockMvc
-class RaceServiceTest {
-
- private String bodyContent = """
- {
- "id": 1,
- "raceInfo": {
- "location": "MONACO",
- "name": "Monaco Grand Prix 2023",
- "prizePool": 30000000
- }
- }
- """;
- private String expectedMessagePost = "{\"id\":1,\"raceInfo\":{\"location\":\"MONACO\",\"name\":\"Monaco Grand Prix 2023\",\"prizePool\":30000000},\"driverOne\":{\"driverId\":1,\"carId\":1,\"position\":null},\"driverTwo\":{\"driverId\":2,\"carId\":2,\"position\":null}}";
-
-
- @Autowired
- private MockMvc mockMvc;
-
- @MockBean
- private RaceRepository raceRepository;
-
- @BeforeEach
- void setup() {
- Race raceDao = RaceTestUtil.getDaoRace();
- given(raceRepository.save(any(Race.class))).willReturn(
- raceDao);
- given(raceRepository.findById(anyLong())).willReturn(
- Optional.of(raceDao));
- given(raceRepository.findAll()).willReturn(List.of(raceDao));
- }
-
-
- @Test
- void createRace() throws Exception {
- var request = post("/race/")
- .content(bodyContent)
- .contentType(MediaType.APPLICATION_JSON_VALUE);
-
- this.mockMvc.perform(request)
- .andDo(print())
- .andExpect(status().isOk())
- .andExpect(content().string(expectedMessagePost));
- }
-
- @Test
- void deleteRace() throws Exception {
- String expectedMessage = "Race with id: 1was succesfully deleted";
-
- var requestDelete = delete("/race/")
- .param("raceId", "1")
- .contentType(MediaType.APPLICATION_JSON_VALUE);
- this.mockMvc.perform(requestDelete)
- .andDo(print())
- .andExpect(status().isOk())
- .andExpect(content().string(expectedMessage));
- }
-
- @Test
- void getExistingRace() throws Exception {
- String expectedMessage = "{\"id\":1,\"raceInfo\":{\"location\":\"MONACO\",\"name\":\"Monaco Grand Prix 2023\",\"prizePool\":30000000},\"driverOne\":{\"driverId\":1,\"carId\":1,\"position\":null},\"driverTwo\":{\"driverId\":2,\"carId\":2,\"position\":null}}";
-
- var requestGet = get("/race/id")
- .param("raceId", "1")
- .contentType(MediaType.APPLICATION_JSON_VALUE);
- this.mockMvc.perform(requestGet)
- .andDo(print())
- .andExpect(status().isOk())
- .andExpect(content().string(expectedMessage));
- }
-
- @Test
- void getAllRaces() throws Exception {
- var requestGet = get("/race/");
- String expectedMessage = "[{\"id\":1,\"raceInfo\":{\"location\":\"MONACO\",\"name\":\"Monaco Grand Prix 2023\",\"prizePool\":30000000},\"driverOne\":{\"driverId\":1,\"carId\":1,\"position\":null},\"driverTwo\":{\"driverId\":2,\"carId\":2,\"position\":null}}]";
-
- this.mockMvc.perform(requestGet)
- .andDo(print())
- .andExpect(status().isOk())
- .andExpect(content().string(expectedMessage));
- }
-
- @Test
- void assignDriverOne() throws Exception {
- var requestAssign = patch("/race/assignDriverOne")
- .param("driverOneId", "1")
- .param("raceId", "1")
- .param("carId", "2")
- .contentType(MediaType.APPLICATION_JSON_VALUE);
-
- this.mockMvc.perform(requestAssign)
- .andDo(print())
- .andExpect(status().isOk())
- .andExpect(content().string(expectedMessagePost));
- }
-
-}
diff --git a/race/src/test/java/cz/muni/pa165/race/rest/SeasonRepositoryTest.java b/race/src/test/java/cz/muni/pa165/race/rest/SeasonRepositoryTest.java
index 0bd3acc2..52ac3330 100644
--- a/race/src/test/java/cz/muni/pa165/race/rest/SeasonRepositoryTest.java
+++ b/race/src/test/java/cz/muni/pa165/race/rest/SeasonRepositoryTest.java
@@ -33,8 +33,7 @@ public class SeasonRepositoryTest {
var savedId = saved.getId();
Season found = seasonRepository.findById(savedId).get();
Assertions.assertAll(
- () -> assertEquals(found.getSeasonYear(), season.getSeasonYear()),
- () -> assertEquals(found.getRaces(), season.getRaces())
+ () -> assertEquals(found.getSeasonYear(), season.getSeasonYear())
);
}
}
diff --git a/race/src/test/java/cz/muni/pa165/race/rest/SeasonServiceTest.java b/race/src/test/java/cz/muni/pa165/race/rest/SeasonServiceTest.java
deleted file mode 100644
index ab6b3a6e..00000000
--- a/race/src/test/java/cz/muni/pa165/race/rest/SeasonServiceTest.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package cz.muni.pa165.race.rest;
-
-import cz.muni.pa165.race.data.model.Season;
-import cz.muni.pa165.race.data.repository.SeasonRepository;
-import org.junit.jupiter.api.BeforeEach;
-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.boot.test.mock.mockito.MockBean;
-import org.springframework.http.MediaType;
-import org.springframework.test.web.servlet.MockMvc;
-
-import java.util.List;
-import java.util.Optional;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyLong;
-import static org.mockito.BDDMockito.given;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.patch;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
-import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-
-@SpringBootTest
-@AutoConfigureMockMvc
-public class SeasonServiceTest {
- private String bodyContent = """
- {
- "id": 1,
- "year": 2020,
- "races": []
- }
- """;
- private String expectedMessagePost = "{\"id\":1,\"year\":2023,\"races\":[]}";
-
-
- @Autowired
- private MockMvc mockMvc;
-
- @MockBean
- private SeasonRepository seasonRepository;
-
- @BeforeEach
- void setup() {
- Season seasonDao = SeasonTestUtil.getDaoSeason();
- given(seasonRepository.save(any(Season.class))).willReturn(
- seasonDao);
- given(seasonRepository.findById(anyLong())).willReturn(
- Optional.of(seasonDao));
- given(seasonRepository.findAll()).willReturn(List.of(seasonDao));
- }
-
-
- @Test
- void createSeason() throws Exception {
- var request = post("/season/")
- .content(bodyContent)
- .contentType(MediaType.APPLICATION_JSON_VALUE);
-
- this.mockMvc.perform(request)
- .andDo(print())
- .andExpect(status().isOk())
- .andExpect(content().string(expectedMessagePost));
- }
-
- @Test
- void deleteRace() throws Exception {
- String expectedMessage = "Season with id: 1was succesfully deleted";
-
- var requestDelete = delete("/season/")
- .param("seasonId", "1")
- .contentType(MediaType.APPLICATION_JSON_VALUE);
- this.mockMvc.perform(requestDelete)
- .andDo(print())
- .andExpect(status().isOk())
- .andExpect(content().string(expectedMessage));
- }
-
- @Test
- void getExistingRace() throws Exception {
- String expectedMessage = "{\"id\":1,\"year\":2023,\"races\":[]}";
-
- var requestGet = get("/season/id")
- .param("seasonId", "1")
- .contentType(MediaType.APPLICATION_JSON_VALUE);
- this.mockMvc.perform(requestGet)
- .andDo(print())
- .andExpect(status().isOk())
- .andExpect(content().string(expectedMessage));
- }
-
- @Test
- void getAllRaces() throws Exception {
- var requestGet = get("/season/");
- String expectedMessage = "[{\"id\":1,\"year\":2023,\"races\":[]}]";
-
- this.mockMvc.perform(requestGet)
- .andDo(print())
- .andExpect(status().isOk())
- .andExpect(content().string(expectedMessage));
- }
-
- @Test
- void addRace() throws Exception {
- var requestPatch = patch("/season/addRace")
- .param("seasonId", "1")
- .param("raceId", "1");
- String expectedMessage = "[{\"id\":1,\"year\":2023,\"races\":[]}]";
-
- this.mockMvc.perform(requestPatch)
- .andDo(print())
- .andExpect(status().isOk())
- .andExpect(content().string(expectedMessage));
- }
-}
--
GitLab