From 61ff3819db7fb214affb98cfe4afcc3e27075634 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrej=20=C5=A0imurka?= <492781@mail.muni.cz>
Date: Mon, 17 Apr 2023 01:32:20 +0200
Subject: [PATCH] Zelena je sexi

---
 .../rest/CarComponentPairControllerTest.java  | 29 +++++++++++++------
 .../cz/muni/pa165/car/rest/TestConfig.java    | 14 ---------
 .../pa165/car/service/CarServiceTests.java    |  5 ++--
 3 files changed, 22 insertions(+), 26 deletions(-)
 delete mode 100644 car/src/test/java/cz/muni/pa165/car/rest/TestConfig.java

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 d53de6a2..c214cf06 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,28 +1,29 @@
 package cz.muni.pa165.car.rest;
 
-import static org.mockito.BDDMockito.given;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
+import cz.muni.pa165.car.restemplate.DbGetter;
 import cz.muni.pa165.car.service.CarComponentPairService;
 import cz.muni.pa165.common_library.dtos.CarComponentResponseDto;
 import cz.muni.pa165.common_library.dtos.CarResponseDto;
-import java.math.BigDecimal;
-import java.util.List;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import static org.mockito.BDDMockito.given;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
+import org.springframework.boot.test.context.TestConfiguration;
 import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.context.annotation.Import;
+import org.springframework.context.annotation.Bean;
 import org.springframework.http.MediaType;
 import org.springframework.test.web.servlet.MockMvc;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+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.List;
 
 @WebMvcTest(CarComponentPairController.class)
-@Import(TestConfig.class)
 public class CarComponentPairControllerTest {
 
   private static CarResponseDto carResponseDto;
@@ -36,6 +37,16 @@ public class CarComponentPairControllerTest {
   @Autowired
   private ObjectMapper objectMapper;
 
+  @TestConfiguration
+  static class TestConfig {
+
+    @Bean
+    DbGetter dbGetter() {
+      return new DbGetter();
+    }
+
+  }
+
   @BeforeEach
   void initializeTestObjects() {
 
diff --git a/car/src/test/java/cz/muni/pa165/car/rest/TestConfig.java b/car/src/test/java/cz/muni/pa165/car/rest/TestConfig.java
deleted file mode 100644
index f34d68da..00000000
--- a/car/src/test/java/cz/muni/pa165/car/rest/TestConfig.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package cz.muni.pa165.car.rest;
-
-import cz.muni.pa165.car.restemplate.DbGetter;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-public class TestConfig {
-
-  @Bean
-  DbGetter dbGetter() {
-    return new DbGetter();
-  }
-}
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 13072e2e..5b588258 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
@@ -8,7 +8,6 @@ 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;
-import cz.muni.pa165.common_library.dtos.DriverResponseDto;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -30,8 +29,8 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 
-@SpringBootTest
-@AutoConfigureMockMvc
+@SpringBootTest()
+@AutoConfigureMockMvc()
 public class CarServiceTests {
 
   @Autowired
-- 
GitLab