From 69b3b319882228b28723e2a61e58614c6bfb9af5 Mon Sep 17 00:00:00 2001
From: Vitaliy Fedoriv <vitaliy.fedoriv@gmail.com>
Date: Sat, 1 Jul 2017 16:21:08 +0300
Subject: [PATCH] remove xml test config , close #3

---
 .../rest/OwnerRestControllerTests.java        |  9 ++++++--
 .../rest/PetRestControllerTests.java          | 11 +++++++---
 .../rest/PetTypeRestControllerTests.java      |  8 +++++--
 .../rest/SpecialtyRestControllerTests.java    |  8 +++++--
 .../rest/VetRestControllerTests.java          | 10 ++++++---
 .../rest/VisitRestControllerTests.java        |  9 +++++---
 .../service/AbstractClinicServiceTests.java   |  7 +++++++
 .../service/ApplicationTestConfig.java        | 13 ++++++++++++
 src/test/resources/spring/mvc-test-config.xml | 21 -------------------
 9 files changed, 60 insertions(+), 36 deletions(-)
 create mode 100644 src/test/java/org/springframework/samples/petclinic/service/ApplicationTestConfig.java
 delete mode 100644 src/test/resources/spring/mvc-test-config.xml

diff --git a/src/test/java/org/springframework/samples/petclinic/rest/OwnerRestControllerTests.java b/src/test/java/org/springframework/samples/petclinic/rest/OwnerRestControllerTests.java
index d3ac7dbc..d5224274 100644
--- a/src/test/java/org/springframework/samples/petclinic/rest/OwnerRestControllerTests.java
+++ b/src/test/java/org/springframework/samples/petclinic/rest/OwnerRestControllerTests.java
@@ -32,8 +32,11 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.http.MediaType;
 import org.springframework.samples.petclinic.model.Owner;
+import org.springframework.samples.petclinic.service.ApplicationTestConfig;
 import org.springframework.samples.petclinic.service.ClinicService;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -49,15 +52,16 @@ import com.fasterxml.jackson.databind.ObjectMapper;
  *
  * @author Vitaliy Fedoriv
  */
+@SpringBootTest
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration({"classpath:spring/mvc-test-config.xml"})
+@ContextConfiguration(classes=ApplicationTestConfig.class)
 @WebAppConfiguration
 public class OwnerRestControllerTests {
 
     @Autowired
     private OwnerRestController ownerRestController;
 
-    @Autowired
+    @MockBean
     private ClinicService clinicService;
 
     private MockMvc mockMvc;
@@ -202,6 +206,7 @@ public class OwnerRestControllerTests {
 
     @Test
     public void testUpdateOwnerSuccess() throws Exception {
+    	given(this.clinicService.findOwnerById(1)).willReturn(owners.get(0));
     	Owner newOwner = owners.get(0);
     	newOwner.setFirstName("George I");
     	ObjectMapper mapper = new ObjectMapper();
diff --git a/src/test/java/org/springframework/samples/petclinic/rest/PetRestControllerTests.java b/src/test/java/org/springframework/samples/petclinic/rest/PetRestControllerTests.java
index 9a637013..178d7178 100644
--- a/src/test/java/org/springframework/samples/petclinic/rest/PetRestControllerTests.java
+++ b/src/test/java/org/springframework/samples/petclinic/rest/PetRestControllerTests.java
@@ -33,10 +33,13 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.http.MediaType;
 import org.springframework.samples.petclinic.model.Owner;
 import org.springframework.samples.petclinic.model.Pet;
 import org.springframework.samples.petclinic.model.PetType;
+import org.springframework.samples.petclinic.service.ApplicationTestConfig;
 import org.springframework.samples.petclinic.service.ClinicService;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -52,16 +55,18 @@ import com.fasterxml.jackson.databind.ObjectMapper;
  *
  * @author Vitaliy Fedoriv
  */
+
+@SpringBootTest
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration({"classpath:spring/mvc-test-config.xml"})
+@ContextConfiguration(classes=ApplicationTestConfig.class)
 @WebAppConfiguration
 public class PetRestControllerTests {
 
     @Autowired
     private PetRestController petRestController;
 
-    @Autowired
-    private ClinicService clinicService;
+    @MockBean
+    protected ClinicService clinicService;
 
     private MockMvc mockMvc;
 
diff --git a/src/test/java/org/springframework/samples/petclinic/rest/PetTypeRestControllerTests.java b/src/test/java/org/springframework/samples/petclinic/rest/PetTypeRestControllerTests.java
index 8bb2da31..4b11bf33 100644
--- a/src/test/java/org/springframework/samples/petclinic/rest/PetTypeRestControllerTests.java
+++ b/src/test/java/org/springframework/samples/petclinic/rest/PetTypeRestControllerTests.java
@@ -32,8 +32,11 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.http.MediaType;
 import org.springframework.samples.petclinic.model.PetType;
+import org.springframework.samples.petclinic.service.ApplicationTestConfig;
 import org.springframework.samples.petclinic.service.ClinicService;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -49,15 +52,16 @@ import com.fasterxml.jackson.databind.ObjectMapper;
  *
  * @author Vitaliy Fedoriv
  */
+@SpringBootTest
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration({"classpath:spring/mvc-test-config.xml"})
+@ContextConfiguration(classes=ApplicationTestConfig.class)
 @WebAppConfiguration
 public class PetTypeRestControllerTests {
 
     @Autowired
     private PetTypeRestController petTypeRestController;
 
-    @Autowired
+    @MockBean
     private ClinicService clinicService;
 
     private MockMvc mockMvc;
diff --git a/src/test/java/org/springframework/samples/petclinic/rest/SpecialtyRestControllerTests.java b/src/test/java/org/springframework/samples/petclinic/rest/SpecialtyRestControllerTests.java
index f82dcc96..4b0c5272 100644
--- a/src/test/java/org/springframework/samples/petclinic/rest/SpecialtyRestControllerTests.java
+++ b/src/test/java/org/springframework/samples/petclinic/rest/SpecialtyRestControllerTests.java
@@ -32,8 +32,11 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.http.MediaType;
 import org.springframework.samples.petclinic.model.Specialty;
+import org.springframework.samples.petclinic.service.ApplicationTestConfig;
 import org.springframework.samples.petclinic.service.ClinicService;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -48,15 +51,16 @@ import com.fasterxml.jackson.databind.ObjectMapper;
  *
  * @author Vitaliy Fedoriv
  */
+@SpringBootTest
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration({"classpath:spring/mvc-test-config.xml"})
+@ContextConfiguration(classes=ApplicationTestConfig.class)
 @WebAppConfiguration
 public class SpecialtyRestControllerTests {
 
     @Autowired
     private SpecialtyRestController specialtyRestController;
 
-    @Autowired
+	@MockBean
     private ClinicService clinicService;
 
     private MockMvc mockMvc;
diff --git a/src/test/java/org/springframework/samples/petclinic/rest/VetRestControllerTests.java b/src/test/java/org/springframework/samples/petclinic/rest/VetRestControllerTests.java
index 528b4c42..a1adbea6 100644
--- a/src/test/java/org/springframework/samples/petclinic/rest/VetRestControllerTests.java
+++ b/src/test/java/org/springframework/samples/petclinic/rest/VetRestControllerTests.java
@@ -32,8 +32,11 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.http.MediaType;
 import org.springframework.samples.petclinic.model.Vet;
+import org.springframework.samples.petclinic.service.ApplicationTestConfig;
 import org.springframework.samples.petclinic.service.ClinicService;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -48,16 +51,16 @@ import com.fasterxml.jackson.databind.ObjectMapper;
  *
  * @author Vitaliy Fedoriv
  */
-
+@SpringBootTest
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration({"classpath:spring/mvc-test-config.xml"})
+@ContextConfiguration(classes=ApplicationTestConfig.class)
 @WebAppConfiguration
 public class VetRestControllerTests {
 
     @Autowired
     private VetRestController vetRestController;
 
-    @Autowired
+	@MockBean
     private ClinicService clinicService;
 
     private MockMvc mockMvc;
@@ -157,6 +160,7 @@ public class VetRestControllerTests {
 
     @Test
     public void testUpdateVetSuccess() throws Exception {
+    	given(this.clinicService.findVetById(1)).willReturn(vets.get(0));
     	Vet newVet = vets.get(0);
     	newVet.setFirstName("James");
     	ObjectMapper mapper = new ObjectMapper();
diff --git a/src/test/java/org/springframework/samples/petclinic/rest/VisitRestControllerTests.java b/src/test/java/org/springframework/samples/petclinic/rest/VisitRestControllerTests.java
index 092fd99a..5d4dc5ee 100644
--- a/src/test/java/org/springframework/samples/petclinic/rest/VisitRestControllerTests.java
+++ b/src/test/java/org/springframework/samples/petclinic/rest/VisitRestControllerTests.java
@@ -34,11 +34,14 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.http.MediaType;
 import org.springframework.samples.petclinic.model.Owner;
 import org.springframework.samples.petclinic.model.Pet;
 import org.springframework.samples.petclinic.model.PetType;
 import org.springframework.samples.petclinic.model.Visit;
+import org.springframework.samples.petclinic.service.ApplicationTestConfig;
 import org.springframework.samples.petclinic.service.ClinicService;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -53,16 +56,16 @@ import com.fasterxml.jackson.databind.ObjectMapper;
  *
  * @author Vitaliy Fedoriv
  */
-
+@SpringBootTest
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration({"classpath:spring/mvc-test-config.xml"})
+@ContextConfiguration(classes=ApplicationTestConfig.class)
 @WebAppConfiguration
 public class VisitRestControllerTests {
 
     @Autowired
     private VisitRestController visitRestController;
 
-    @Autowired
+    @MockBean
     private ClinicService clinicService;
 
     private MockMvc mockMvc;
diff --git a/src/test/java/org/springframework/samples/petclinic/service/AbstractClinicServiceTests.java b/src/test/java/org/springframework/samples/petclinic/service/AbstractClinicServiceTests.java
index f989ea20..d2625ad9 100644
--- a/src/test/java/org/springframework/samples/petclinic/service/AbstractClinicServiceTests.java
+++ b/src/test/java/org/springframework/samples/petclinic/service/AbstractClinicServiceTests.java
@@ -20,7 +20,9 @@ import static org.assertj.core.api.Assertions.assertThat;
 import java.util.Collection;
 import java.util.Date;
 
+import org.junit.Before;
 import org.junit.Test;
+import org.mockito.MockitoAnnotations;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.samples.petclinic.model.Owner;
 import org.springframework.samples.petclinic.model.Pet;
@@ -56,6 +58,11 @@ public abstract class AbstractClinicServiceTests {
 
     @Autowired
     protected ClinicService clinicService;
+    
+    @Before
+    public void init() {
+        MockitoAnnotations.initMocks(this);
+    }
 
     @Test
     public void shouldFindOwnersByLastName() {
diff --git a/src/test/java/org/springframework/samples/petclinic/service/ApplicationTestConfig.java b/src/test/java/org/springframework/samples/petclinic/service/ApplicationTestConfig.java
new file mode 100644
index 00000000..ac3898b3
--- /dev/null
+++ b/src/test/java/org/springframework/samples/petclinic/service/ApplicationTestConfig.java
@@ -0,0 +1,13 @@
+package org.springframework.samples.petclinic.service;
+
+import org.mockito.MockitoAnnotations;
+import org.springframework.boot.test.context.TestConfiguration;
+
+@TestConfiguration
+public class ApplicationTestConfig {
+	
+	public ApplicationTestConfig(){
+		MockitoAnnotations.initMocks(this);
+	}
+
+}
diff --git a/src/test/resources/spring/mvc-test-config.xml b/src/test/resources/spring/mvc-test-config.xml
deleted file mode 100644
index 926851ec..00000000
--- a/src/test/resources/spring/mvc-test-config.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:p="http://www.springframework.org/schema/p"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:mvc="http://www.springframework.org/schema/mvc"
-       xmlns="http://www.springframework.org/schema/beans"
-       xsi:schemaLocation="http://www.springframework.org/schema/mvc
-        http://www.springframework.org/schema/mvc/spring-mvc.xsd
-        http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans.xsd
-        http://www.springframework.org/schema/context
-        http://www.springframework.org/schema/context/spring-context.xsd">
-
-	<context:component-scan
-        base-package="org.springframework.samples.petclinic.rest"/>
-
-    <bean id="ClinicService" class="org.mockito.Mockito" factory-method="mock">
-        <constructor-arg value="org.springframework.samples.petclinic.service.ClinicService"/>
-    </bean>
-
-</beans>
-- 
GitLab