Refactor tests such that the same tests can be run as unit- and ed2-tests

Author: turing85

.github/actions/integration-test/action.yml

@@ -72,7 +72,7 @@ runs:
               --batch-mode \
               --color always \
               --define ci \
-              failsafe:integration-test failsafe:verify \
+              failsafe:integration-test@e2e-test failsafe:verify@e2e-test \
               || return_code="${?}"
 
             echo "Stopping Application"

pom.xml

@@ -33,6 +33,7 @@
 		<maven.compiler.release>17</maven.compiler.release>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+		<run-e2e-test>false</run-e2e-test>
 
 		<!-- Dependency versions -->
 		<lombok.version>1.18.28</lombok.version>
@@ -52,17 +53,32 @@
 				<version>${surefire-plugin.version}</version>
 				<executions>
 					<execution>
+						<id>e2e-test</id>
 						<goals>
 							<goal>integration-test</goal>
 							<goal>verify</goal>
 						</goals>
-						<phase>verify</phase>
+						<phase>none</phase>
+						<configuration>
+							<argLine>-Dspring.profiles.active=e2e</argLine>
+							<includes>
+								<include>**/*CucumberTest.java</include>
+							</includes>
+						</configuration>
 					</execution>
 				</executions>
 			</plugin>
 			<plugin>
 				<artifactId>maven-surefire-plugin</artifactId>
 				<version>${surefire-plugin.version}</version>
+				<executions>
+					<execution>
+						<id>default-test</id>
+						<configuration>
+							<argLine>-Dspring.profiles.active=test</argLine>
+						</configuration>
+					</execution>
+				</executions>
 			</plugin>
 			<plugin>
 				<groupId>net.revelc.code.formatter</groupId>

src/test/java/de/turing85/spring/fileupload/FileUploadIT.java renamed to src/test/java/de/turing85/spring/fileupload/FileUploadCucumberTest.java

@@ -10,6 +10,6 @@
 @SelectClasspathResource("de/turing85/spring/fileupload")
 @CucumberContextConfiguration
 @ContextConfiguration(classes = FileUploadApplication.class)
-@SpringBootTest
-class FileUploadIT {
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+class FileUploadCucumberTest {
 }

src/test/java/de/turing85/spring/fileupload/TestApplication.java

@@ -1,7 +1,30 @@
 package de.turing85.spring.fileupload;
 
+import java.net.URI;
+
+import de.turing85.spring.fileupload.actor.FileUploadActor;
+import io.cucumber.spring.ScenarioScope;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.test.web.server.LocalServerPort;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Profile;
 
 @SpringBootApplication
 class TestApplication {
+  @Bean
+  @ScenarioScope
+  @Profile("test")
+  static FileUploadActor testActor(
+      @SuppressWarnings("SpringJavaInjectionPointsAutowiringInspection")
+      @LocalServerPort int port) {
+    return new FileUploadActor(URI.create("http://localhost:%d".formatted(port)));
+  }
+
+  @Bean
+  @ScenarioScope
+  @Profile("e2e")
+  static FileUploadActor e2eActor(@Value("${sut.url}") URI sutUrl) {
+    return new FileUploadActor(sutUrl);
+  }
 }

src/test/java/de/turing85/spring/fileupload/actor/FileUploadActor.java

@@ -8,19 +8,14 @@
 
 import com.google.common.truth.Truth;
 import de.turing85.spring.fileupload.UploadResource;
-import io.cucumber.spring.ScenarioScope;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.ContentType;
 import org.apache.http.entity.mime.MultipartEntityBuilder;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpStatus;
-import org.springframework.stereotype.Component;
 
-@Component
-@ScenarioScope
 public class FileUploadActor {
   private static final Random RANDOM = new Random();
   private static final int EXPECTED_SIZE_NOT_SET = -1;
@@ -32,7 +27,7 @@ public class FileUploadActor {
   private CloseableHttpClient client;
   private CloseableHttpResponse response;
 
-  public FileUploadActor(@Value("${sut.url}") URI sutUrl) {
+  public FileUploadActor(URI sutUrl) {
     this.sutUrl = sutUrl;
   }