chore: re-organizing test cases

tomasbjerre · tomasbjerre · commit 3d78d2bc378a · 2024-11-03T09:30:54.000+01:00
diff --git a/README.md b/README.md
@@ -58,7 +58,7 @@ class DefaultPropertiesTest {
 }
 ```
 
-There are more running examples in [the repo](/wiremock-spring-boot-example/src/test/java/app).
+There are more running examples in [the repo](/src/test/java/usecases).
 
 ## Annotations
 
diff --git a/build.gradle b/build.gradle
@@ -6,58 +6,50 @@ buildscript {
 	}
 	dependencies {
 		classpath "se.bjurr.gradle.java-convention:se.bjurr.gradle.java-convention.gradle.plugin:0.+"
+		classpath "org.wiremock.tools.gradle:extension-convention-plugin:0.3.0"
 	}
 }
 
-plugins {
-	id 'org.wiremock.tools.gradle.wiremock-extension-convention' version '0.3.0'
-}
-
 apply plugin: "project-report"
+apply plugin: "se.bjurr.gradle.java-convention"
 
-group 'org.wiremock.integrations'
+// Or else it will be 11 in wiremock-extension-convention
+sourceCompatibility = 17
+targetCompatibility = 17
+apply plugin: "org.wiremock.tools.gradle.wiremock-extension-convention"
 
-allprojects {
-	apply plugin: "se.bjurr.gradle.java-convention"
 
-	dependencies {
-		testImplementation "org.springframework.boot:spring-boot-starter-test:3.3.4"
-		testImplementation 'org.assertj:assertj-core:3.26.3'
-		testImplementation platform('org.junit:junit-bom:5.11.2')
-		testImplementation 'org.junit.jupiter:junit-jupiter'
-		testImplementation 'org.junit.platform:junit-platform-launcher'
-		testImplementation 'io.rest-assured:rest-assured:5.5.0'
-
-		constraints {
-			implementation('org.apache.commons:commons-compress:1.26.0') {
-				because 'version 1.24.0 has a vulnerability'
-			}
-		}
-	}
-}
+group 'org.wiremock.integrations'
+
+// Because older version is set in wiremock-extension-convention
+def wiremockVersion = "3.9.2"
 
 dependencies {
-	api 'org.wiremock:wiremock-standalone:3.9.2'
+	api "org.wiremock:wiremock-standalone:${wiremockVersion}"
+	compileOnly "org.wiremock:wiremock:${wiremockVersion}"
+	shadow "org.wiremock:wiremock:${wiremockVersion}"
 	api "org.springframework.boot:spring-boot-test:3.3.4"
 	api "org.springframework:spring-test:6.1.13"
 	api "org.slf4j:slf4j-api:2.0.16"
 	api 'org.junit.jupiter:junit-jupiter-api:5.11.2'
+
+	testImplementation "org.springframework.boot:spring-boot-starter-test:3.3.4"
+	testImplementation 'org.assertj:assertj-core:3.26.3'
+	testImplementation platform('org.junit:junit-bom:5.11.2')
+	testImplementation 'org.junit.jupiter:junit-jupiter'
+	testImplementation 'org.junit.platform:junit-platform-launcher'
+	testImplementation 'io.rest-assured:rest-assured:5.5.0'
+
+	constraints {
+		implementation('org.apache.commons:commons-compress:1.26.0') {
+			because 'version 1.24.0 has a vulnerability'
+		}
+	}
 }
 
+// Not using shadowJar, but currently not possible to disable in wiremock-extension-convention
 shadowJar {
 	mergeServiceFiles()
 
-	exclude 'META-INF/maven/**'
-	exclude 'META-INF/versions/17/**'
-	exclude 'META-INF/versions/21/**'
-	exclude 'module-info.class'
+	exclude '**/*'
 }
-
-project('wiremock-spring-boot-example', {
-	dependencies {
-		implementation "org.springframework.boot:spring-boot-starter-web:3.3.4"
-		implementation "org.springframework.boot:spring-boot-starter-webflux:3.3.4"
-
-		testImplementation rootProject
-	}
-})
diff --git a/settings.gradle b/settings.gradle
@@ -1,2 +1 @@
 rootProject.name = 'wiremock-spring-boot'
-include 'wiremock-spring-boot-example'
diff --git a/src/main/java/org/wiremock/spring/internal/WireMockSpringJunitExtension.java b/src/main/java/org/wiremock/spring/internal/WireMockSpringJunitExtension.java
@@ -85,7 +85,7 @@ private void configureWireMockForDefaultInstance(final ExtensionContext extensio
 
   @Override
   public void afterEach(final ExtensionContext context) throws Exception {
-    WireMock.configureFor(8080);
+    WireMock.configureFor(-1);
   }
 
   private static <T extends Annotation> void injectWireMockInstances(
diff --git a/src/test/files-under-directory/mappings/get.json b/src/test/files-under-directory/mappings/get.json
diff --git a/src/test/java/test/ConfigurationValidationTest.java b/src/test/java/test/ConfigurationValidationTest.java
@@ -1,4 +1,4 @@
-package app;
+package test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertThrows;
diff --git a/src/test/java/test/LoggingTest.java b/src/test/java/test/LoggingTest.java
@@ -1,4 +1,4 @@
-package org.wiremock.spring;
+package test;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
 import static com.github.tomakehurst.wiremock.client.WireMock.get;
@@ -19,22 +19,24 @@
 import org.springframework.boot.test.system.CapturedOutput;
 import org.springframework.boot.test.system.OutputCaptureExtension;
 import org.springframework.test.util.TestSocketUtils;
+import org.wiremock.spring.ConfigureWireMock;
+import org.wiremock.spring.EnableWireMock;
+import org.wiremock.spring.InjectWireMock;
+import org.wiremock.spring.WireMockConfigurationCustomizer;
 
-@SpringBootTest(classes = WireMockConfigurationCustomizerTest.AppConfiguration.class)
+@SpringBootTest(classes = LoggingTest.AppConfiguration.class)
 @EnableWireMock({
   @ConfigureWireMock(
       name = "user-service",
       baseUrlProperties = "user-service.url",
-      configurationCustomizers =
-          WireMockConfigurationCustomizerTest.SampleConfigurationCustomizer.class),
+      configurationCustomizers = LoggingTest.SampleConfigurationCustomizer.class),
   @ConfigureWireMock(
       name = "todo-service",
       baseUrlProperties = "todo-service.url",
-      configurationCustomizers =
-          WireMockConfigurationCustomizerTest.SampleConfigurationCustomizer.class),
+      configurationCustomizers = LoggingTest.SampleConfigurationCustomizer.class),
 })
 @ExtendWith(OutputCaptureExtension.class)
-class WireMockConfigurationCustomizerTest {
+class LoggingTest {
   private static final int USER_SERVICE_PORT = TestSocketUtils.findAvailableTcpPort();
   private static final int TODO_SERVICE_PORT = TestSocketUtils.findAvailableTcpPort();
 
diff --git a/src/test/java/test/MultiplePropertiesBindingTest.java b/src/test/java/test/MultiplePropertiesBindingTest.java
@@ -1,4 +1,4 @@
-package app;
+package test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/src/test/java/test/NestedClassSingleWireMockTest.java b/src/test/java/test/NestedClassSingleWireMockTest.java
@@ -1,4 +1,4 @@
-package app;
+package test;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
 import static com.github.tomakehurst.wiremock.client.WireMock.get;
diff --git a/src/test/java/test/NestedClassWireMockSpringExtensionTest.java b/src/test/java/test/NestedClassWireMockSpringExtensionTest.java
@@ -1,4 +1,4 @@
-package app;
+package test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/src/test/java/test/SinglePropertyBindingTest.java b/src/test/java/test/SinglePropertyBindingTest.java
@@ -1,4 +1,4 @@
-package app;
+package test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/src/test/java/test/WireMockSpringExtensionTest.java b/src/test/java/test/WireMockSpringExtensionTest.java
@@ -1,4 +1,4 @@
-package app;
+package test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/src/test/java/usecases/App.java b/src/test/java/usecases/App.java
@@ -1,9 +1,9 @@
-package app;
+package usecases;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
-@SpringBootApplication
+@SpringBootApplication(scanBasePackages = "usecases")
 public class App {
 
   public static void main(final String[] args) {
diff --git a/src/test/java/usecases/CustomPropertiesTest.java b/src/test/java/usecases/CustomPropertiesTest.java
@@ -1,4 +1,4 @@
-package app;
+package usecases;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
 import static com.github.tomakehurst.wiremock.client.WireMock.get;
diff --git a/src/test/java/usecases/DefaultInstanceTest.java b/src/test/java/usecases/DefaultInstanceTest.java
@@ -1,4 +1,4 @@
-package app;
+package usecases;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
 import static com.github.tomakehurst.wiremock.client.WireMock.get;
diff --git a/src/test/java/usecases/DefaultPropertiesTest.java b/src/test/java/usecases/DefaultPropertiesTest.java
@@ -1,4 +1,4 @@
-package app;
+package usecases;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
 import static com.github.tomakehurst.wiremock.client.WireMock.get;
diff --git a/src/test/java/usecases/FilesUnderClasspathTest.java b/src/test/java/usecases/FilesUnderClasspathTest.java
@@ -1,4 +1,4 @@
-package app;
+package usecases;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/src/test/java/usecases/FilesUnderDirectoryTests.java b/src/test/java/usecases/FilesUnderDirectoryTests.java
@@ -1,4 +1,4 @@
-package app;
+package usecases;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/src/test/java/usecases/HttpsAndHttpTest.java b/src/test/java/usecases/HttpsAndHttpTest.java
@@ -1,4 +1,4 @@
-package app;
+package usecases;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
 import static com.github.tomakehurst.wiremock.client.WireMock.anyRequestedFor;
diff --git a/src/test/java/usecases/HttpsOnlyTest.java b/src/test/java/usecases/HttpsOnlyTest.java
@@ -1,4 +1,4 @@
-package app;
+package usecases;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
 import static com.github.tomakehurst.wiremock.client.WireMock.anyRequestedFor;
diff --git a/src/test/java/usecases/InjectDefaultWireMockTest.java b/src/test/java/usecases/InjectDefaultWireMockTest.java
@@ -1,4 +1,4 @@
-package app;
+package usecases;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
 import static com.github.tomakehurst.wiremock.client.WireMock.get;
diff --git a/src/test/java/usecases/InjectNamedWireMockTest.java b/src/test/java/usecases/InjectNamedWireMockTest.java
@@ -1,4 +1,4 @@
-package app;
+package usecases;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
 import static com.github.tomakehurst.wiremock.client.WireMock.get;
diff --git a/src/test/java/usecases/JavaStubbingTest.java b/src/test/java/usecases/JavaStubbingTest.java
@@ -1,4 +1,4 @@
-package app;
+package usecases;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
 import static com.github.tomakehurst.wiremock.client.WireMock.get;
diff --git a/src/test/java/usecases/MetaAnnotation.java b/src/test/java/usecases/MetaAnnotation.java
@@ -1,4 +1,4 @@
-package app;
+package usecases;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/test/java/usecases/MetaAnnotationTest.java b/src/test/java/usecases/MetaAnnotationTest.java
@@ -1,4 +1,4 @@
-package app;
+package usecases;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
 import static com.github.tomakehurst.wiremock.client.WireMock.get;
diff --git a/src/test/java/usecases/MultipleWireMocksTest.java b/src/test/java/usecases/MultipleWireMocksTest.java
@@ -1,4 +1,4 @@
-package app;
+package usecases;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
 import static com.github.tomakehurst.wiremock.client.WireMock.get;
diff --git a/src/test/java/usecases/NotEnabledTest.java b/src/test/java/usecases/NotEnabledTest.java
@@ -1,4 +1,4 @@
-package app;
+package usecases;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
 import static com.github.tomakehurst.wiremock.client.WireMock.get;
diff --git a/src/test/java/usecases/ResetWireMockBetweenTest.java b/src/test/java/usecases/ResetWireMockBetweenTest.java
@@ -1,4 +1,4 @@
-package app;
+package usecases;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
 import static com.github.tomakehurst.wiremock.client.WireMock.anyRequestedFor;
diff --git a/src/test/java/usecases/SingleNamedWireMockTest.java b/src/test/java/usecases/SingleNamedWireMockTest.java
@@ -1,4 +1,4 @@
-package app;
+package usecases;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
 import static com.github.tomakehurst.wiremock.client.WireMock.get;
diff --git a/src/test/java/usecases/UsePortFromPropertyTest.java b/src/test/java/usecases/UsePortFromPropertyTest.java
@@ -1,4 +1,4 @@
-package app;
+package usecases;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
 import static com.github.tomakehurst.wiremock.client.WireMock.anyRequestedFor;
diff --git a/src/test/resources/custom-location/mappings/todos.json b/src/test/resources/custom-location/mappings/todos.json
diff --git a/src/test/resources/wiremock/user-client/mappings/get-users.json b/src/test/resources/wiremock/user-client/mappings/get-users.json
diff --git a/wiremock-spring-boot-example/src/main/resources/application.properties b/wiremock-spring-boot-example/src/main/resources/application.properties

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ class DefaultPropertiesTest {`
`58`	`58`	`}`
`59`	`59`	```
`60`	`60`
`61`		`-There are more running examples in [the repo](/wiremock-spring-boot-example/src/test/java/app).`
	`61`	`+There are more running examples in [the repo](/src/test/java/usecases).`
`62`	`62`
`63`	`63`	`## Annotations`
`64`	`64`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1 @@`
`1`	`1`	`rootProject.name = 'wiremock-spring-boot'`
`2`		`-include 'wiremock-spring-boot-example'`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ private void configureWireMockForDefaultInstance(final ExtensionContext extensio`
`85`	`85`
`86`	`86`	`@Override`
`87`	`87`	`public void afterEach(final ExtensionContext context) throws Exception {`
`88`		`- WireMock.configureFor(8080);`
	`88`	`+ WireMock.configureFor(-1);`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`private static <T extends Annotation> void injectWireMockInstances(`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package app;`
	`1`	`+package test;`
`2`	`2`
`3`	`3`	`import static org.assertj.core.api.Assertions.assertThat;`
`4`	`4`	`import static org.junit.Assert.assertThrows;`