Merge remote-tracking branch 'origin/1.4.x'

spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/feign/ribbon/FeignRibbonClientRetryTests.java

@@ -105,7 +105,6 @@ public class FeignRibbonClientRetryTests {
 	}
 
 	@Test
-	@Ignore //FIXME: broken test
 	public void testRetries() {
 		int retryMe = this.testClient.retryMe();
 		assertEquals("retryCount didn't match", retryMe, 1);

spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/feign/ribbon/FeignRibbonHttpClientConfigurationTests.java

@@ -31,9 +31,9 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.util.ReflectionUtils;
-import org.springframework.web.bind.annotation.RestController;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
@@ -42,8 +42,10 @@ import static org.junit.Assert.assertNull;
  * @author Ryan Baxter
  */
 @RunWith(SpringRunner.class)
-@SpringBootTest(classes = FeignRibbonHttpClientConfigurationTests.Application.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
+@SpringBootTest(classes = FeignRibbonHttpClientConfigurationTests.FeignRibbonHttpClientConfigurationTestsApplication.class,
+		webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
 		properties = {"debug=true","feign.httpclient.disableSslValidation=true"})
+@DirtiesContext
 public class FeignRibbonHttpClientConfigurationTests {
 
 	@Autowired
@@ -77,8 +79,7 @@ public class FeignRibbonHttpClientConfigurationTests {
 
 	@Configuration
 	@EnableAutoConfiguration
-	@RestController
-	public static class Application {
+	static class FeignRibbonHttpClientConfigurationTestsApplication {
 		public static void main(String[] args) {
 			new SpringApplicationBuilder(FeignRibbonClientRetryTests.Application.class)
 					.run(args);

spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/feign/ribbon/FeignRibbonOkHttpClientConfigurationTests.java

@@ -29,17 +29,19 @@ import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.cloud.commons.httpclient.OkHttpClientFactory;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.util.ReflectionUtils;
-import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @author Ryan Baxter
  */
 @RunWith(SpringRunner.class)
-@SpringBootTest(classes = FeignRibbonOkHttpClientConfigurationTests.Application.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
+@SpringBootTest(classes = FeignRibbonOkHttpClientConfigurationTests.FeignRibbonOkHttpClientConfigurationTestsApplication.class,
+		webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
 		properties = {"debug=true","feign.httpclient.disableSslValidation=true",
 				"feign.okhttp.enabled=true", "feign.httpclient.enabled=false"})
+@DirtiesContext
 public class FeignRibbonOkHttpClientConfigurationTests {
 
 	@Autowired
@@ -60,8 +62,7 @@ public class FeignRibbonOkHttpClientConfigurationTests {
 
 	@Configuration
 	@EnableAutoConfiguration
-	@RestController
-	public static class Application {
+	static class FeignRibbonOkHttpClientConfigurationTestsApplication {
 		public static void main(String[] args) {
 			new SpringApplicationBuilder(FeignRibbonClientRetryTests.Application.class)
 					.run(args);