From aa85eb8aeb90ee185dffd1a7f7900bbb58042126 Mon Sep 17 00:00:00 2001
From: Spencer Gibb <spencer@gibb.us>
Date: Mon, 14 Mar 2016 11:23:13 -0600
Subject: [PATCH] Update tests to use @WebIntegrationTest

---
 .../demo/HelloClientApplicationTests.java     | 26 +++++++++----------
 .../test/java/demo/NoWebApplicationTests.java |  8 +++---
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/feign-eureka/src/test/java/demo/HelloClientApplicationTests.java b/feign-eureka/src/test/java/demo/HelloClientApplicationTests.java
index a3c0e00..8c94a41 100644
--- a/feign-eureka/src/test/java/demo/HelloClientApplicationTests.java
+++ b/feign-eureka/src/test/java/demo/HelloClientApplicationTests.java
@@ -1,25 +1,23 @@
 package demo;
 
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.boot.test.TestRestTemplate;
+import org.springframework.boot.test.WebIntegrationTest;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.test.IntegrationTest;
-import org.springframework.boot.test.SpringApplicationConfiguration;
-import org.springframework.boot.test.TestRestTemplate;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.web.WebAppConfiguration;
-
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringApplicationConfiguration(classes = HelloClientApplication.class)
-@WebAppConfiguration
-@IntegrationTest("server.port=0")
+@WebIntegrationTest(randomPort = true)
 @DirtiesContext
 public class HelloClientApplicationTests {
 
diff --git a/feign-eureka/src/test/java/demo/NoWebApplicationTests.java b/feign-eureka/src/test/java/demo/NoWebApplicationTests.java
index 46657da..c2c5b91 100644
--- a/feign-eureka/src/test/java/demo/NoWebApplicationTests.java
+++ b/feign-eureka/src/test/java/demo/NoWebApplicationTests.java
@@ -1,20 +1,20 @@
 package demo;
 
-import static org.junit.Assert.assertTrue;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.IntegrationTest;
 import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.boot.test.WebIntegrationTest;
 import org.springframework.cloud.client.discovery.DiscoveryClient;
 import org.springframework.cloud.client.discovery.noop.NoopDiscoveryClient;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
+import static org.junit.Assert.assertTrue;
+
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringApplicationConfiguration(classes = HelloClientApplication.class)
-@IntegrationTest("eureka.client.enabled=false")
+@WebIntegrationTest(value = "eureka.client.enabled=false", randomPort = true)
 @DirtiesContext
 public class NoWebApplicationTests {