From f36ab6c06b09249a11231b34c974dfafbb153e80 Mon Sep 17 00:00:00 2001
From: Amit Pandey <amit2103@users.noreply.github.com>
Date: Wed, 17 Apr 2024 14:45:48 +0530
Subject: [PATCH] JAVA-31141:- Fix
 spring-cloud-eureka-feign-client-integration-test -
 ServiceDiscoveryBooksClientLiveTest (#16407)

---
 .../pom.xml                                                | 3 ++-
 .../cloud/client/ServiceDiscoveryBooksClientLiveTest.java  | 7 ++++++-
 .../src/test/resources/application-eureka-test.yml         | 5 +++++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/pom.xml b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/pom.xml
index 3c059e65fa..e4f833a47b 100644
--- a/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/pom.xml
+++ b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/pom.xml
@@ -79,7 +79,7 @@
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>testcontainers</artifactId>
-            <version>1.14.3</version>
+            <version>${testcontainers.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -108,6 +108,7 @@
         <maven.compiler.target>17</maven.compiler.target>
         <wiremock.version>3.3.1</wiremock.version>
         <junit-jupiter.version>5.10.2</junit-jupiter.version>
+        <testcontainers.version>1.17.3</testcontainers.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/ServiceDiscoveryBooksClientLiveTest.java b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/ServiceDiscoveryBooksClientLiveTest.java
index 3ac067b8f8..cd916b53d5 100644
--- a/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/ServiceDiscoveryBooksClientLiveTest.java
+++ b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/ServiceDiscoveryBooksClientLiveTest.java
@@ -24,7 +24,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 @EnableConfigurationProperties
 @ExtendWith(SpringExtension.class)
 @SpringBootTest(classes = Application.class, webEnvironment =  SpringBootTest.WebEnvironment.RANDOM_PORT)
-@ContextConfiguration(classes = { MockBookServiceConfig.class }, initializers = { EurekaContainerConfig.Initializer.class })
+@ContextConfiguration(classes = { MockBookServiceConfig.class })
 class ServiceDiscoveryBooksClientLiveTest {
 
     @Autowired
@@ -39,6 +39,11 @@ class ServiceDiscoveryBooksClientLiveTest {
         await().atMost(60, SECONDS).until(() -> eurekaClient.getApplications().size() > 0);
     }
 
+    /**
+     *  Please ensure that Eureka is running on port , 8761 for this test to pass.
+     *  The EurekaServerApplication.main in spring-cloud-eureka-server project can be
+     *  run to make an Eureka Server available.
+     */
     @Test
     public void whenGetBooks_thenTheCorrectBooksAreReturned() {
         List<Book> books = booksClient.getBooks();
diff --git a/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/resources/application-eureka-test.yml b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/resources/application-eureka-test.yml
index 6f6af6a080..e0b164bb55 100644
--- a/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/resources/application-eureka-test.yml
+++ b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/resources/application-eureka-test.yml
@@ -1,3 +1,8 @@
 spring:
   application:
     name: books-service
+
+eureka:
+  client:
+    serviceUrl:
+      defaultZone: ${EUREKA_URI:http://localhost:8761/eureka}