fixed feign tests

feign-eureka/src/test/java/demo/HelloClientApplicationTests.java

@@ -12,6 +12,7 @@ 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;
 
@@ -19,6 +20,7 @@ import org.springframework.test.context.web.WebAppConfiguration;
 @SpringApplicationConfiguration(classes = HelloClientApplication.class)
 @WebAppConfiguration
 @IntegrationTest("server.port=0")
+@DirtiesContext
 public class HelloClientApplicationTests {
 
 	@Value("${local.server.port}")

feign/src/main/java/demo/FeignClientApplication.java

@@ -18,7 +18,7 @@ public class FeignClientApplication {
 	}
 }
 
-@FeignClient(url = "http://example.com")
+@FeignClient(url = "example.com")
 interface RestClient {
 	@RequestMapping(value = "/", method = RequestMethod.GET)
 	String hello();

feign/src/test/java/demo/AdhocTestSuite.java

@@ -0,0 +1,35 @@
+/*
+ * Copyright 2012-2013 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package demo;
+
+import org.junit.Ignore;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
+
+/**
+ * A test suite for probing weird ordering problems in the tests.
+ *
+ * @author Dave Syer
+ */
+@RunWith(Suite.class)
+@SuiteClasses({ FeignClientApplicationTests.class,
+		FeignClientWithServerListApplicationTests.class })
+@Ignore("Test suite for tracking order dependencies")
+public class AdhocTestSuite {
+
+}

feign/src/test/java/demo/FeignClientApplicationTests.java

@@ -6,10 +6,12 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringApplicationConfiguration(classes = FeignClientApplication.class)
+@DirtiesContext
 public class FeignClientApplicationTests {
 
 	@Autowired

feign/src/test/java/demo/FeignClientWithServerListApplicationTests.java

@@ -12,6 +12,7 @@ import org.springframework.boot.test.SpringApplicationConfiguration;
 import org.springframework.cloud.netflix.feign.EnableFeignClients;
 import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -20,7 +21,8 @@ import demo.FeignClientWithServerListApplicationTests.TestApplication;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringApplicationConfiguration(classes = TestApplication.class)
-@IntegrationTest("example.ribbon.listOfServers:example.com")
+@IntegrationTest("myexample.ribbon.listOfServers:example.com")
+@DirtiesContext
 public class FeignClientWithServerListApplicationTests {
 
 	@Autowired
@@ -41,7 +43,7 @@ public class FeignClientWithServerListApplicationTests {
 	    }
 	}
 
-	@FeignClient("example")
+	@FeignClient("myexample")
 	static interface RestClient {
 		@RequestMapping(value="/", method=RequestMethod.GET)
 		String hello();

hystrix/src/test/java/demo/HystrixApplicationTests.java

@@ -13,6 +13,7 @@ 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;
 
@@ -20,6 +21,7 @@ import org.springframework.test.context.web.WebAppConfiguration;
 @SpringApplicationConfiguration(classes = HystrixApplication.class)
 @IntegrationTest("server.port=0")
 @WebAppConfiguration
+@DirtiesContext
 public class HystrixApplicationTests {
 
 	@Value("${local.server.port}")

zuul-proxy-eureka/src/test/java/demo/ZuulProxyEurekaApplicationTests.java

@@ -6,12 +6,14 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.SpringApplicationConfiguration;
 import org.springframework.cloud.client.discovery.DiscoveryClient;
 import org.springframework.cloud.netflix.eureka.EurekaDiscoveryClient;
+import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 import static org.junit.Assert.*;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringApplicationConfiguration(classes = ZuulProxyEurekaApplication.class)
+@DirtiesContext
 public class ZuulProxyEurekaApplicationTests {
 
 	@Autowired

zuul-proxy/src/test/java/demo/ZuulProxyApplicationTests.java

@@ -8,10 +8,12 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.SpringApplicationConfiguration;
 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;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringApplicationConfiguration(classes = ZuulProxyApplication.class)
+@DirtiesContext
 public class ZuulProxyApplicationTests {
 
 	@Autowired