From a173cde4c933f86fc5931a754f56d6dd4ae5b1cb Mon Sep 17 00:00:00 2001
From: Charles Moulliard <cmoulliard@apache.org>
Date: Fri, 26 May 2017 11:33:59 +0200
Subject: [PATCH] Replace deprecated annotations with @SpringBootTest &
 @ContextConfiguration as CI Build was failing

---
 .../cloud/kubernetes/config/CoreTest.groovy    | 18 +++++++++---------
 .../kubernetes/ribbon/test/RibbonTest.groovy   |  8 ++++----
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/spring-cloud-kubernetes-config/src/test/groovy/org/springframework/cloud/kubernetes/config/CoreTest.groovy b/spring-cloud-kubernetes-config/src/test/groovy/org/springframework/cloud/kubernetes/config/CoreTest.groovy
index 8d37bee7..547f7ee7 100644
--- a/spring-cloud-kubernetes-config/src/test/groovy/org/springframework/cloud/kubernetes/config/CoreTest.groovy
+++ b/spring-cloud-kubernetes-config/src/test/groovy/org/springframework/cloud/kubernetes/config/CoreTest.groovy
@@ -24,20 +24,20 @@ import io.fabric8.kubernetes.client.KubernetesClient
 import io.fabric8.kubernetes.server.mock.KubernetesMockServer
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.context.properties.EnableConfigurationProperties
-import org.springframework.boot.test.IntegrationTest
-import org.springframework.boot.test.SpringApplicationConfiguration
+import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.core.env.Environment
+import org.springframework.test.context.ContextConfiguration
 import spock.lang.Specification
 import groovy.util.logging.Slf4j
 
 @Slf4j
-@SpringApplicationConfiguration(TestApplication.class)
-@IntegrationTest([
-    "spring.application.name=testapp",
-    "spring.cloud.kubernetes.client.namespace=testns",
-    "spring.cloud.kubernetes.client.trustCerts=true",
-    "spring.cloud.kubernetes.config.namespace=testns",
-    "spring.cloud.kubernetes.secrets.enableApi=true"
+@ContextConfiguration(classes=[TestApplication.class])
+@SpringBootTest(properties=[
+	"spring.application.name=testapp",
+	"spring.cloud.kubernetes.client.namespace=testns",
+	"spring.cloud.kubernetes.client.trustCerts=true",
+	"spring.cloud.kubernetes.config.namespace=testns",
+	"spring.cloud.kubernetes.secrets.enableApi=true"
 ])
 @EnableConfigurationProperties
 class CoreTest extends Specification {
diff --git a/spring-cloud-kubernetes-ribbon/src/test/groovy/io/fabric8/spring/cloud/kubernetes/ribbon/test/RibbonTest.groovy b/spring-cloud-kubernetes-ribbon/src/test/groovy/io/fabric8/spring/cloud/kubernetes/ribbon/test/RibbonTest.groovy
index 1792d0be..43e0a313 100644
--- a/spring-cloud-kubernetes-ribbon/src/test/groovy/io/fabric8/spring/cloud/kubernetes/ribbon/test/RibbonTest.groovy
+++ b/spring-cloud-kubernetes-ribbon/src/test/groovy/io/fabric8/spring/cloud/kubernetes/ribbon/test/RibbonTest.groovy
@@ -21,19 +21,19 @@ import io.fabric8.kubernetes.api.model.EndpointsBuilder
 import io.fabric8.kubernetes.client.Config
 import io.fabric8.kubernetes.client.KubernetesClient
 import io.fabric8.kubernetes.server.mock.KubernetesMockServer
+import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.cloud.kubernetes.ribbon.KubernetesRibbonClientConfiguration
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration
-import org.springframework.boot.test.IntegrationTest
-import org.springframework.boot.test.SpringApplicationConfiguration
 import org.springframework.cloud.client.loadbalancer.LoadBalancerInterceptor
 import org.springframework.cloud.netflix.ribbon.RibbonClient
+import org.springframework.test.context.ContextConfiguration
 import org.springframework.web.client.RestTemplate
 import spock.lang.Specification
 
 @EnableAutoConfiguration
-@SpringApplicationConfiguration(TestApplication.class)
-@IntegrationTest(
+@ContextConfiguration(classes=[TestApplication.class])
+@SpringBootTest(properties=
         [
                 "spring.application.name=testapp",
                 "spring.cloud.kubernetes.client.namespace=testns",