From b5adcf753dbb8fa4d775d18c32fee47f5254772a Mon Sep 17 00:00:00 2001
From: Oto Stanko <493068@fi.muni.cz>
Date: Mon, 17 Apr 2023 01:05:54 +0200
Subject: [PATCH] Some conflicts resolved, but cannot run tests
---
.../car/rest/CarComponentPairController.java | 7 +-
.../rest/CarComponentPairControllerTest.java | 71 ++++++++++++-------
.../pa165/car/rest/CarControllerTest.java | 3 +-
.../pa165/car/service/CarServiceTests.java | 4 +-
.../pa165/race/rest/RaceControllerTest.java | 1 -
5 files changed, 54 insertions(+), 32 deletions(-)
diff --git a/car/src/main/java/cz/muni/pa165/car/rest/CarComponentPairController.java b/car/src/main/java/cz/muni/pa165/car/rest/CarComponentPairController.java
index 43cf40b0..1b242046 100644
--- a/car/src/main/java/cz/muni/pa165/car/rest/CarComponentPairController.java
+++ b/car/src/main/java/cz/muni/pa165/car/rest/CarComponentPairController.java
@@ -7,6 +7,8 @@ import cz.muni.pa165.common_library.dtos.CarResponseDto;
import io.swagger.v3.oas.annotations.Operation;
import java.util.ArrayList;
import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
@@ -26,6 +28,9 @@ public class CarComponentPairController {
CarComponentPairService carComponentService;
+ @Autowired
+ DbGetter dbGetter;
+
public CarComponentPairController(CarComponentPairService carComponentService) {
this.carComponentService = carComponentService;
}
@@ -87,7 +92,7 @@ public class CarComponentPairController {
produces = MediaType.APPLICATION_JSON_VALUE)
public ResponseEntity<List<CarComponentResponseDto>>
getAllCarComponents(@RequestParam Long carId, @RequestParam Long componentId) {
- List<CarComponentResponseDto> allComponents = DbGetter.getAllComponentsFromDb();
+ List<CarComponentResponseDto> allComponents = dbGetter.getAllComponentsFromDb();
var carComponentsResponse = getAllComponentsOfCar(carId);
var carComponents = carComponentsResponse.getBody();
CarComponentResponseDto requestedComponent = null;
diff --git a/car/src/test/java/cz/muni/pa165/car/rest/CarComponentPairControllerTest.java b/car/src/test/java/cz/muni/pa165/car/rest/CarComponentPairControllerTest.java
index e2ac92de..578d2fcf 100644
--- a/car/src/test/java/cz/muni/pa165/car/rest/CarComponentPairControllerTest.java
+++ b/car/src/test/java/cz/muni/pa165/car/rest/CarComponentPairControllerTest.java
@@ -1,31 +1,33 @@
package cz.muni.pa165.car.rest;
import com.fasterxml.jackson.databind.ObjectMapper;
-import cz.muni.pa165.car.rest.CarComponentPairController;
+import cz.muni.pa165.car.rest.CarDriverPairController;
import cz.muni.pa165.car.service.CarComponentPairService;
-import cz.muni.pa165.common_library.dtos.CarComponentDto;
+import cz.muni.pa165.car.service.CarDriverPairService;
+import cz.muni.pa165.common_library.dtos.CarComponentResponseDto;
import cz.muni.pa165.common_library.dtos.CarResponseDto;
+import cz.muni.pa165.common_library.dtos.DriverDto;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
+
import static org.mockito.BDDMockito.given;
-import org.mockito.junit.jupiter.MockitoExtension;
+
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.http.MediaType;
import org.springframework.test.web.servlet.MockMvc;
+
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
import java.math.BigDecimal;
+import java.util.ArrayList;
import java.util.List;
-@AutoConfigureMockMvc
+
@WebMvcTest(CarComponentPairController.class)
-@ExtendWith(MockitoExtension.class)
public class CarComponentPairControllerTest {
@Autowired
@@ -37,10 +39,13 @@ public class CarComponentPairControllerTest {
@Autowired
private ObjectMapper objectMapper;
+
private static CarResponseDto carResponseDto;
private static CarResponseDto carResponseDto2;
- private static CarComponentDto carComponentDto;
- private static CarComponentDto carComponentDto2;
+ // private static CarComponentRequestDto carComponentRequestDto;
+// private static CarComponentRequestDto carComponentRequestDto2;
+ private static CarComponentResponseDto carComponentResponseDto;
+ private static CarComponentResponseDto carComponentResponseDto2;
@BeforeEach
void initializeTestObjects() {
@@ -59,15 +64,29 @@ public class CarComponentPairControllerTest {
.mainDriverId(1L)
.build();
- carComponentDto = CarComponentDto.builder()
+// carComponentRequestDto = CarComponentRequestDto.builder()
+// .name("")
+// .weight(BigDecimal.TEN)
+// .manufacturer("")
+// .price(BigDecimal.TEN)
+// .build();
+//
+// carComponentRequestDto2 = CarComponentRequestDto.builder()
+// .name("")
+// .manufacturer("")
+// .price(BigDecimal.TEN)
+// .weight(BigDecimal.TEN)
+// .build();
+
+ carComponentResponseDto = CarComponentResponseDto.builder()
.id(1L)
.name("")
+ .weight(BigDecimal.TEN)
.manufacturer("")
.price(BigDecimal.TEN)
- .weight(BigDecimal.TEN)
.build();
- carComponentDto2 = CarComponentDto.builder()
+ carComponentResponseDto2 = CarComponentResponseDto.builder()
.id(2L)
.name("")
.manufacturer("")
@@ -82,10 +101,10 @@ public class CarComponentPairControllerTest {
given(carComponentPairServiceMock.addComponent(1L, 1L)).willReturn(carResponseDto);
String response = mockMvc.perform(put("/carcomponent/addcomponent")
- .param("componentId", String.valueOf(1L))
- .param("carId", String.valueOf(1L))
- .contentType(MediaType.APPLICATION_JSON)
- )
+ .param("componentId", String.valueOf(1L))
+ .param("carId", String.valueOf(1L))
+ .contentType(MediaType.APPLICATION_JSON)
+ )
.andExpect(status().isOk()).andReturn().getResponse().getContentAsString();
CarResponseDto carResponseDto = objectMapper.readValue(response, CarResponseDto.class);
@@ -98,10 +117,10 @@ public class CarComponentPairControllerTest {
given(carComponentPairServiceMock.removeComponent(1L, 1L)).willReturn(carResponseDto2);
String response = mockMvc.perform(put("/carcomponent/removecomponent")
- .param("componentId", String.valueOf(1L))
- .param("carId", String.valueOf(1L))
- .contentType(MediaType.APPLICATION_JSON)
- )
+ .param("componentId", String.valueOf(1L))
+ .param("carId", String.valueOf(1L))
+ .contentType(MediaType.APPLICATION_JSON)
+ )
.andExpect(status().isOk()).andReturn().getResponse().getContentAsString();
CarResponseDto carResponseDto = objectMapper.readValue(response, CarResponseDto.class);
Assertions.assertEquals(1L, carResponseDto.getId());
@@ -110,14 +129,14 @@ public class CarComponentPairControllerTest {
@Test
void getAllComponentsOfCar() throws Exception {
- given(carComponentPairServiceMock.getAllComponentsOfCar(1L)).willReturn(List.of(carComponentDto, carComponentDto2));
+ given(carComponentPairServiceMock.getAllComponentsOfCar(1L)).willReturn(List.of(carComponentResponseDto, carComponentResponseDto2));
String response = mockMvc.perform(put("/carcomponent/getcomponents")
- .param("carId", String.valueOf(1L))
- .contentType(MediaType.APPLICATION_JSON)
- )
+ .param("carId", String.valueOf(1L))
+ .contentType(MediaType.APPLICATION_JSON)
+ )
.andExpect(status().isOk()).andReturn().getResponse().getContentAsString();
- List<CarComponentDto> carComponentListResponse = List.of(objectMapper.readValue(response, CarComponentDto[].class));
- Assertions.assertEquals(List.of(carComponentDto, carComponentDto2), carComponentListResponse);
+ List<CarComponentResponseDto> carComponentListResponse = List.of(objectMapper.readValue(response, CarComponentResponseDto[].class));
+ Assertions.assertEquals(List.of(carComponentResponseDto, carComponentResponseDto2), carComponentListResponse);
}
}
\ No newline at end of file
diff --git a/car/src/test/java/cz/muni/pa165/car/rest/CarControllerTest.java b/car/src/test/java/cz/muni/pa165/car/rest/CarControllerTest.java
index e8ea83db..62d6b046 100644
--- a/car/src/test/java/cz/muni/pa165/car/rest/CarControllerTest.java
+++ b/car/src/test/java/cz/muni/pa165/car/rest/CarControllerTest.java
@@ -26,9 +26,8 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put;
import java.util.List;
-@AutoConfigureMockMvc
+
@WebMvcTest(CarController.class)
-@ExtendWith(MockitoExtension.class)
public class CarControllerTest {
@Autowired
diff --git a/car/src/test/java/cz/muni/pa165/car/service/CarServiceTests.java b/car/src/test/java/cz/muni/pa165/car/service/CarServiceTests.java
index 3b0e807c..13072e2e 100644
--- a/car/src/test/java/cz/muni/pa165/car/service/CarServiceTests.java
+++ b/car/src/test/java/cz/muni/pa165/car/service/CarServiceTests.java
@@ -4,7 +4,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import cz.muni.pa165.car.data.model.Car;
import cz.muni.pa165.car.data.repository.CarRepository;
import cz.muni.pa165.car.restemplate.DbGetter;
-import cz.muni.pa165.common_library.dtos.CarComponentDto;
+import cz.muni.pa165.common_library.dtos.CarComponentResponseDto;
import cz.muni.pa165.common_library.dtos.CarRequestDto;
import cz.muni.pa165.common_library.dtos.CarResponseDto;
import cz.muni.pa165.common_library.dtos.DriverInsightDto;
@@ -90,7 +90,7 @@ public class CarServiceTests {
given(carRepository.findById(1L)).willReturn(
Optional.of(car1));
DriverInsightDto driverInsightDto = new DriverInsightDto(1L, "name", "surname", "nationality", Map.of());
- CarComponentDto carComponentDto = CarComponentDto.builder().build();
+ CarComponentResponseDto carComponentDto = CarComponentResponseDto.builder().build();
given(dbGetter.getDriverFromDb(anyLong())).willReturn(driverInsightDto);
given(dbGetter.getComponentFromDb(anyLong())).willReturn(carComponentDto);
diff --git a/race/src/test/java/cz/muni/pa165/race/rest/RaceControllerTest.java b/race/src/test/java/cz/muni/pa165/race/rest/RaceControllerTest.java
index 590aab0f..05249bab 100644
--- a/race/src/test/java/cz/muni/pa165/race/rest/RaceControllerTest.java
+++ b/race/src/test/java/cz/muni/pa165/race/rest/RaceControllerTest.java
@@ -10,7 +10,6 @@ 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;
--
GitLab