diff --git a/driver/src/test/java/cz/muni/pa165/driver/rest/DriverServiceTest.java b/driver/src/test/java/cz/muni/pa165/driver/rest/DriverServiceTest.java index cfb6dca20f453cbdbe0ee260737817f0012e9505..6eb536cc450f63c930e5fca6f0e3b5bf5c615d08 100644 --- a/driver/src/test/java/cz/muni/pa165/driver/rest/DriverServiceTest.java +++ b/driver/src/test/java/cz/muni/pa165/driver/rest/DriverServiceTest.java @@ -3,7 +3,6 @@ package cz.muni.pa165.driver.rest; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.BDDMockito.given; -import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.when; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; @@ -12,20 +11,15 @@ import static org.springframework.test.web.servlet.request.MockMvcRequestBuilder import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import com.fasterxml.jackson.databind.ObjectMapper; -import cz.muni.pa165.common_library.dtos.DriverAddDto; import cz.muni.pa165.common_library.dtos.DriverInsightDto; import cz.muni.pa165.common_library.dtos.DriverResponseDto; import cz.muni.pa165.common_library.dtos.DriverUpdateDto; import cz.muni.pa165.driver.data.model.Driver; import cz.muni.pa165.driver.data.repository.DriverRepository; -import cz.muni.pa165.driver.service.DriverService; -import java.util.HashMap; import java.util.List; import java.util.Optional; import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.mockito.Mock; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; @@ -35,7 +29,7 @@ import org.springframework.test.web.servlet.MockMvc; @SpringBootTest @AutoConfigureMockMvc -public class DriverServiceTest { +class DriverServiceTest { @Autowired private MockMvc mockMvc; diff --git a/driver/src/test/java/cz/muni/pa165/driver/rest/DriverTestUtil.java b/driver/src/test/java/cz/muni/pa165/driver/rest/DriverTestUtil.java index 532b5882324a17674865732679dc1159d32c336f..9fa615fa939d9c1f5c69e9e58d3e8f91cb0b18c3 100644 --- a/driver/src/test/java/cz/muni/pa165/driver/rest/DriverTestUtil.java +++ b/driver/src/test/java/cz/muni/pa165/driver/rest/DriverTestUtil.java @@ -6,23 +6,47 @@ import cz.muni.pa165.common_library.dtos.DriverUpdateDto; import cz.muni.pa165.driver.data.model.Driver; import java.util.HashMap; +/** + * Util for getting driver objects. + */ public class DriverTestUtil { + /** + * Get add driver dto. + * + * @return add driver dto object. + */ public static DriverAddDto getAddDriver() { var driver = new DriverAddDto("Name", "Surname", "Nationality", new HashMap<>()); return driver; } + /** + * Get insight driver dto. + * + * @return insight driver dto object. + */ public static DriverInsightDto getInsightDriver() { return new DriverInsightDto(1L, "Name", "Surname", "Nationality", new HashMap<>()); } + /** + * Get update driver dto. + * + * @return update driver dto object. + */ public static DriverUpdateDto getUpdateDriver() { return new DriverUpdateDto("Name", "Surname", "Nationality", new HashMap<>()); } + + /** + * Get entity driver object. + * + * @return entity driver object. + */ public static Driver getDaoDriver() { return Driver.builder() .name("Name")