Skip to content

Commit d8d79fd

Browse files
[JAVA-38382] Tearing down WireMockServer (eugenp#17256)
1 parent 568c2c0 commit d8d79fd

File tree

3 files changed

+27
-0
lines changed

3 files changed

+27
-0
lines changed

spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/BooksClientIntegrationTest.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22

33
import com.baeldung.spring.cloud.model.Book;
44
import com.github.tomakehurst.wiremock.WireMockServer;
5+
import org.junit.jupiter.api.AfterAll;
56
import org.junit.jupiter.api.BeforeEach;
67
import org.junit.jupiter.api.Test;
8+
import org.junit.jupiter.api.TestInstance;
79
import org.junit.jupiter.api.extension.ExtendWith;
810
import org.springframework.beans.factory.annotation.Autowired;
911
import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -26,6 +28,7 @@
2628
@EnableConfigurationProperties
2729
@ExtendWith(SpringExtension.class)
2830
@ContextConfiguration(classes = { WireMockConfig.class })
31+
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
2932
class BooksClientIntegrationTest {
3033

3134
@Autowired
@@ -56,4 +59,10 @@ public void whenGetBooks_thenTheCorrectBooksShouldBeReturned() {
5659
new Book("Foundation", "Isaac Asimov"))));
5760
}
5861

62+
@AfterAll
63+
void tearDown() {
64+
mockBooksService.shutdownServer();
65+
mockBooksService2.shutdownServer();
66+
}
67+
5968
}

spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/LoadBalancerBooksClientIntegrationTest.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@
33
import com.baeldung.spring.cloud.model.Book;
44
import com.github.tomakehurst.wiremock.WireMockServer;
55
import com.github.tomakehurst.wiremock.client.WireMock;
6+
import org.junit.jupiter.api.AfterAll;
67
import org.junit.jupiter.api.BeforeEach;
78
import org.junit.jupiter.api.Test;
9+
import org.junit.jupiter.api.TestInstance;
810
import org.junit.jupiter.api.extension.ExtendWith;
911
import org.springframework.beans.factory.annotation.Autowired;
1012
import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -42,6 +44,7 @@
4244
@EnableFeignClients
4345
@ExtendWith(SpringExtension.class)
4446
@ContextConfiguration(classes = { TestConfig.class })
47+
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
4548
class LoadBalancerBooksClientIntegrationTest {
4649

4750
@Autowired
@@ -139,4 +142,10 @@ private void assertLoadBalancer(ReactorLoadBalancer<ServiceInstance> loadBalance
139142
}).verifyComplete();
140143
}
141144
}
145+
146+
@AfterAll
147+
void tearDown() {
148+
mockBooksService.shutdownServer();
149+
secondMockBooksService.shutdownServer();
150+
}
142151
}

spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/LoadBalancerIntegrationTest.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55
import java.util.Arrays;
66
import java.util.List;
77

8+
import org.junit.jupiter.api.AfterAll;
89
import org.junit.jupiter.api.Test;
10+
import org.junit.jupiter.api.TestInstance;
911
import org.junit.jupiter.api.extension.ExtendWith;
1012
import org.springframework.beans.factory.annotation.Autowired;
1113
import org.springframework.boot.SpringBootConfiguration;
@@ -41,6 +43,7 @@
4143
@ExtendWith(SpringExtension.class)
4244
@ActiveProfiles("test")
4345
@ContextConfiguration(classes = { TestConfig.class })
46+
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
4447
class LoadBalancerIntegrationTest {
4548

4649
@Autowired
@@ -109,4 +112,10 @@ public RoundRobinLoadBalancer roundRobinContextLoadBalancer(LoadBalancerClientFa
109112

110113
}
111114

115+
@AfterAll
116+
void tearDown() {
117+
mockBooksService.shutdownServer();
118+
secondMockBooksService.shutdownServer();
119+
}
120+
112121
}

0 commit comments

Comments
 (0)