Replace spring-cloud-contract-wiremock with wiremock-spring-boot

scordio · Oct 15, 2024 · 03df417 · 03df417
1 parent e9c1738
commit 03df417
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 33 deletions.
diff --git a/pom.xml b/pom.xml
@@ -43,17 +43,6 @@
     <notion-sdk-jvm.version>1.11.1</notion-sdk-jvm.version>
   </properties>
 
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.springframework.cloud</groupId>
-        <artifactId>spring-cloud-dependencies</artifactId>
-        <version>2022.0.4</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
   <dependencies>
     <!-- Compile -->
     <dependency>
@@ -107,8 +96,9 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.springframework.cloud</groupId>
-      <artifactId>spring-cloud-contract-wiremock</artifactId>
+      <groupId>org.wiremock.integrations</groupId>
+      <artifactId>wiremock-spring-boot</artifactId>
+      <version>3.0.2</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/...st/java/io/github/scordio/springframework/batch/extensions/notion/it/IntegrationTest.java b/...st/java/io/github/scordio/springframework/batch/extensions/notion/it/IntegrationTest.java
@@ -17,7 +17,7 @@
 
 import org.springframework.batch.test.context.SpringBatchTest;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.contract.wiremock.AutoConfigureWireMock;
+import org.wiremock.spring.EnableWireMock;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
@@ -29,7 +29,7 @@
 @Retention(RUNTIME)
 @SpringBootTest(properties = "spring.batch.job.enabled=false")
 @SpringBatchTest
-@AutoConfigureWireMock(port = 0)
+@EnableWireMock
 public @interface IntegrationTest {
 
 }
diff --git a/...o/springframework/batch/extensions/notion/it/pagination/MultiplePagesDescendingTests.java b/...o/springframework/batch/extensions/notion/it/pagination/MultiplePagesDescendingTests.java
@@ -21,7 +21,6 @@
 import io.github.scordio.springframework.batch.extensions.notion.it.pagination.MultiplePagesDescendingTests.PaginatedDescendingJob.Item;
 import io.github.scordio.springframework.batch.extensions.notion.mapping.RecordPropertyMapper;
 import org.json.JSONObject;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.springframework.batch.core.Job;
 import org.springframework.batch.core.JobExecution;
@@ -76,8 +75,9 @@ class MultiplePagesDescendingTests {
 	@Autowired
 	ListItemWriter<Item> itemWriter;
 
-	@BeforeAll
-	static void wiremockStubbing() {
+	@Test
+	void should_succeed() throws Exception {
+		// GIVEN
 		UUID thirdResultId = randomUUID();
 
 		JSONObject firstResult = result(randomUUID(), DATABASE_ID,
@@ -100,12 +100,10 @@ static void wiremockStubbing() {
 			.withHeader(NOTION_VERSION, equalTo(NOTION_VERSION_VALUE))
 			.withRequestBody(equalToJson(queryRequest(thirdResultId, PAGE_SIZE, sortByProperty("Name", DESCENDING))))
 			.willReturn(okJson(queryResponse(thirdResult))));
-	}
 
-	@Test
-	void should_succeed() throws Exception {
 		// WHEN
 		JobExecution jobExecution = launcher.launchJob();
+
 		// THEN
 		then(jobExecution.getExitStatus()).isEqualTo(COMPLETED);
 
@@ -119,8 +117,8 @@ void should_succeed() throws Exception {
 	@SpringBootApplication
 	static class PaginatedDescendingJob {
 
-		@Value("${wiremock.server.port}")
-		private int wiremockPort;
+		@Value("${wiremock.server.baseUrl}")
+		private String wiremockBaseUrl;
 
 		@Bean
 		Job job(JobRepository jobRepository, Step step) {
@@ -143,7 +141,7 @@ NotionDatabaseItemReader<Item> itemReader() {
 			reader.setSaveState(false);
 
 			reader.setToken("token");
-			reader.setBaseUrl("http://localhost:" + wiremockPort);
+			reader.setBaseUrl(wiremockBaseUrl);
 			reader.setDatabaseId(DATABASE_ID.toString());
 
 			reader.setPageSize(PAGE_SIZE);

diff --git a/...hub/scordio/springframework/batch/extensions/notion/it/pagination/MultiplePagesTests.java b/...hub/scordio/springframework/batch/extensions/notion/it/pagination/MultiplePagesTests.java
@@ -20,7 +20,6 @@
 import io.github.scordio.springframework.batch.extensions.notion.it.pagination.MultiplePagesTests.PaginatedJob.Item;
 import io.github.scordio.springframework.batch.extensions.notion.mapping.RecordPropertyMapper;
 import org.json.JSONObject;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.springframework.batch.core.Job;
 import org.springframework.batch.core.JobExecution;
@@ -73,8 +72,9 @@ class MultiplePagesTests {
 	@Autowired
 	ListItemWriter<Item> itemWriter;
 
-	@BeforeAll
-	static void wiremockStubbing() {
+	@Test
+	void should_succeed() throws Exception {
+		// GIVEN
 		UUID thirdResultId = randomUUID();
 
 		JSONObject firstResult = result(randomUUID(), DATABASE_ID,
@@ -97,10 +97,7 @@ static void wiremockStubbing() {
 			.withHeader(NOTION_VERSION, equalTo(NOTION_VERSION_VALUE))
 			.withRequestBody(equalToJson(queryRequest(thirdResultId, PAGE_SIZE)))
 			.willReturn(okJson(queryResponse(thirdResult))));
-	}
 
-	@Test
-	void should_succeed() throws Exception {
 		// WHEN
 		JobExecution jobExecution = launcher.launchJob();
 
@@ -117,8 +114,8 @@ void should_succeed() throws Exception {
 	@SpringBootApplication
 	static class PaginatedJob {
 
-		@Value("${wiremock.server.port}")
-		private int wiremockPort;
+		@Value("${wiremock.server.baseUrl}")
+		private String wiremockBaseUrl;
 
 		@Bean
 		Job job(JobRepository jobRepository, Step step) {
@@ -141,7 +138,7 @@ NotionDatabaseItemReader<Item> itemReader() {
 			reader.setSaveState(false);
 
 			reader.setToken("token");
-			reader.setBaseUrl("http://localhost:" + wiremockPort);
+			reader.setBaseUrl(wiremockBaseUrl);
 			reader.setDatabaseId(DATABASE_ID.toString());
 
 			reader.setPageSize(PAGE_SIZE);