From 652def889a147bbfe59d757fb13817d15d953ac0 Mon Sep 17 00:00:00 2001
From: Tomasz Lelek <tomasz.lelek@allegrogroup.com>
Date: Sat, 4 Feb 2017 20:44:16 +0100
Subject: [PATCH] BAEL-542 start application properly when integation test
 started

---
 pom.xml                                                  | 1 +
 spring-security-cache-control/pom.xml                    | 4 ++++
 .../baeldung/cachecontrol/ResourceEndpointLiveTest.java  | 9 ++++-----
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 41235dcc26..a24e3d4667 100644
--- a/pom.xml
+++ b/pom.xml
@@ -147,6 +147,7 @@
         <module>spring-rest-docs</module>
         <module>spring-rest</module>
         <module>spring-security-basic-auth</module>
+        <module>spring-security-cache-control</module>
         <module>spring-security-client/spring-security-jsp-authentication</module>
         <module>spring-security-client/spring-security-jsp-authorize</module>
         <module>spring-security-client/spring-security-jsp-config</module>
diff --git a/spring-security-cache-control/pom.xml b/spring-security-cache-control/pom.xml
index 1d154f333d..c30b0cd1aa 100644
--- a/spring-security-cache-control/pom.xml
+++ b/spring-security-cache-control/pom.xml
@@ -35,6 +35,10 @@
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-web</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+        </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
diff --git a/spring-security-cache-control/src/test/java/com/baeldung/cachecontrol/ResourceEndpointLiveTest.java b/spring-security-cache-control/src/test/java/com/baeldung/cachecontrol/ResourceEndpointLiveTest.java
index f6e95779cb..0c23b1969d 100644
--- a/spring-security-cache-control/src/test/java/com/baeldung/cachecontrol/ResourceEndpointLiveTest.java
+++ b/spring-security-cache-control/src/test/java/com/baeldung/cachecontrol/ResourceEndpointLiveTest.java
@@ -3,14 +3,13 @@ package com.baeldung.cachecontrol;
 import com.jayway.restassured.http.ContentType;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.support.AnnotationConfigContextLoader;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
 
 import static com.jayway.restassured.RestAssured.given;
 
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = {TestConfig.class}, loader = AnnotationConfigContextLoader.class)
+@RunWith(SpringRunner.class)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT, classes = AppRunner.class)
 public class ResourceEndpointLiveTest {
         private static final String URL_PREFIX = "http://localhost:8080";