[fix]

Author: rustavil

src/test/java/ru/rustavil/fuel_consumption/rest/endpoints/FuelConsumptionEndpointIntegrationTest.java

@@ -11,13 +11,11 @@
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.http.MediaType;
 import org.springframework.mock.web.MockMultipartFile;
-import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.web.servlet.MockMvc;
 import ru.rustavil.fuel_consumption.Application;
 import ru.rustavil.fuel_consumption.domain.FuelType;
 import ru.rustavil.fuel_consumption.domain.service.NotificationSender;
-import ru.rustavil.fuel_consumption.repository.entities.FuelConsumptionDto;
 import ru.rustavil.fuel_consumption.repository.jpa.DriverRepositoryJpa;
 import ru.rustavil.fuel_consumption.repository.jpa.FuelConsumptionRepositoryJpa;
 import ru.rustavil.fuel_consumption.rest.dto.FuelConsumptionRequestDto;
@@ -30,8 +28,10 @@
 import java.util.UUID;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.hamcrest.Matchers.hasSize;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doNothing;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.multipart;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
@@ -77,8 +77,9 @@ public void whenRegisteredValidFuelConsumptionThenExpected() throws Exception {
                 post("/fuel_consumption").
                         contentType(MediaType.APPLICATION_JSON).
                         content(json))
-                .andExpect(status().isOk()).
-                andDo(r -> {
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$", hasSize(1)))
+                .andDo(r -> {
                     List<String> ids = objectMapper.readValue(r.getResponse().getContentAsString(), new TypeReference<List<String>>(){});
                     ids.forEach(id -> fuelConsumptionRepository.deleteById(UUID.fromString(id)));
                 });
@@ -97,8 +98,9 @@ public void whenRegisteredValidFuelConsumptionBulkFileThenExpected() throws Exce
 
         mvc.perform(multipart("/fuel_consumption/bulk")
                 .file(file))
-                .andExpect(status().isOk()).
-                andDo(r -> {
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$", hasSize(1)))
+                .andDo(r -> {
                     List<String> ids = objectMapper.readValue(r.getResponse().getContentAsString(), new TypeReference<List<String>>(){});
                     ids.forEach(id -> fuelConsumptionRepository.deleteById(UUID.fromString(id)));
                 });

src/test/java/ru/rustavil/fuel_consumption/rest/endpoints/FuelConsumptionRegistrationDtoEndpointsUnitTest.java

@@ -12,6 +12,9 @@
 import org.springframework.mock.web.MockMultipartFile;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.web.servlet.MockMvc;
+import ru.rustavil.fuel_consumption.domain.Driver;
+import ru.rustavil.fuel_consumption.domain.FuelConsumption;
+import ru.rustavil.fuel_consumption.domain.FuelPurchase;
 import ru.rustavil.fuel_consumption.domain.FuelType;
 import ru.rustavil.fuel_consumption.domain.exceptions.ResourceNotFoundException;
 import ru.rustavil.fuel_consumption.rest.dto.FuelConsumptionRequestDto;
@@ -22,11 +25,11 @@
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.util.Collections;
+import java.util.UUID;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.*;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.multipart;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
@@ -53,7 +56,14 @@ public void setUp() throws Exception {
 
     @Test
     public void whenRegisteredValidFuelConsumptionThenExpected() throws Exception {
-        doNothing().when(register).registerPurchase(any(FuelPurchaseRequestDto.class));
+        when(register.registerPurchase(any(FuelPurchaseRequestDto.class))).
+                thenReturn(
+                        new FuelPurchase(new FuelConsumption(
+                                UUID.randomUUID(),
+                                Driver.builder().identifier(11111L).build(),
+                                FuelType.TYPE_95,
+                                100.0,
+                                BigDecimal.valueOf(1000.0))));
 
         FuelConsumptionRequestDto fuelConsumptionRequestDto = new FuelConsumptionRequestDto(
                 LocalDate.now(), 11111L, FuelType.TYPE_95, 100.0, BigDecimal.valueOf(200.0)
@@ -125,7 +135,14 @@ public void whenRegisteredValidFuelConsumptionAndHappenedInternalErrorThenExpect
 
     @Test
     public void whenRegisteredValidFuelConsumptionBulkFileThenExpected() throws Exception {
-        doNothing().when(register).registerPurchase(any(FuelPurchaseRequestDto.class));
+        when(register.registerPurchase(any(FuelPurchaseRequestDto.class))).
+                thenReturn(
+                        new FuelPurchase(new FuelConsumption(
+                                UUID.randomUUID(),
+                                Driver.builder().identifier(11111L).build(),
+                                FuelType.TYPE_95,
+                                100.0,
+                                BigDecimal.valueOf(1000.0))));
 
         FuelConsumptionRequestDto fuelConsumptionRequestDto = new FuelConsumptionRequestDto(
                 LocalDate.now(), 11111L, FuelType.TYPE_95, 100.0, BigDecimal.valueOf(200.0)