Implement Steel Thread 10: End-to-end tests as standalone project

Transform ftgo-end-to-end-tests into a self-contained Gradle project:
- Create standalone settings.gradle, gradle.properties, build.gradle
- Add endToEndTest source set with modern dependencies (JUnit 5, REST Assured 5.x, Awaitility, Testcontainers)
- Create ApplicationUnderTest abstraction with DockerCompose and TestContainers implementations
- Update EndToEndTests.java to modern tech while preserving all test methods
- Create self-contained DTO classes (no external API dependencies)
- Remove legacy swagger-codegen configuration

Co-authored by Claude Code

Author: cer

docs/features/upgrade-to-2026/upgrade-to-2026-plan.md

@@ -753,67 +753,59 @@ Transform `ftgo-end-to-end-tests/` into a standalone self-contained Gradle proje
 
 Transform the existing `ftgo-end-to-end-tests/` into a self-contained project:
 
-- [ ] Create `ftgo-end-to-end-tests/settings.gradle` with:
-  - [ ] `pluginManagement` block for Eventuate testing plugins
-  - [ ] `rootProject.name = 'ftgo-end-to-end-tests'`
-- [ ] Create `ftgo-end-to-end-tests/gradle.properties` with version properties
-- [ ] Rewrite `ftgo-end-to-end-tests/build.gradle`:
-  - [ ] Java 17 toolchain configuration
-  - [ ] Spring Boot 3.4.0 plugin
-  - [ ] Custom `endToEndTest` source set (separate from `test`)
-  - [ ] Modern dependencies:
+- [x] Create `ftgo-end-to-end-tests/settings.gradle` with:
+  - [x] `rootProject.name = 'ftgo-end-to-end-tests'`
+- [x] Create `ftgo-end-to-end-tests/gradle.properties` with version properties
+- [x] Rewrite `ftgo-end-to-end-tests/build.gradle`:
+  - [x] Java 17 toolchain configuration
+  - [x] Custom `endToEndTest` source set (separate from `test`)
+  - [x] Modern dependencies:
     - REST Assured 5.x (`io.rest-assured:rest-assured`)
     - Awaitility 4.x
     - JUnit 5
     - Testcontainers 1.19+
     - Eventuate Testcontainers support
-  - [ ] Remove legacy dependencies (com.jayway.restassured, swagger-codegen)
-  - [ ] Remove dependencies on *-api projects (not self-contained)
-- [ ] Generate Gradle wrapper using `gradle wrapper`
-- [ ] Verify `./gradlew tasks` runs successfully
+  - [x] Remove legacy dependencies (com.jayway.restassured, swagger-codegen)
+  - [x] Remove dependencies on *-api projects (not self-contained)
+- [x] Generate Gradle wrapper using `gradle wrapper`
+- [x] Verify `./gradlew tasks` runs successfully
 
 ### Task 10.2: Create ApplicationUnderTest abstraction
 
 Following the realguardio pattern, create an abstraction for launching the system under test:
 
-- [ ] Create `ApplicationUnderTest` interface:
-  ```java
-  public interface ApplicationUnderTest {
-      void start();
-      void stop();
-      String getApiGatewayUrl();
-  }
-  ```
-- [ ] Create `ApplicationUnderTestUsingTestContainers` implementation:
+- [x] Create `ApplicationUnderTest` interface with factory method and port accessors
+- [x] Create `ApplicationUnderTestUsingTestContainers` implementation:
   - Uses Testcontainers to programmatically start all service containers
   - Uses `EventuateKafkaNativeCluster` for Kafka
   - Uses `EventuateCdcContainer` for CDC service
   - Starts all FTGO service containers with proper networking
-- [ ] Create `ApplicationUnderTestUsingDockerCompose` implementation:
+- [x] Create `ApplicationUnderTestUsingDockerCompose` implementation:
   - Connects to pre-started docker-compose services
-  - Reads service URLs from environment or configuration
-- [ ] Create factory to select implementation based on system property or environment variable
+  - Returns hardcoded ports for docker-compose setup
+- [x] Factory method in interface selects implementation based on `endToEndTestMode` system property
 
 ### Task 10.3: Update EndToEndTests.java to modern tech
 
 Update the existing test class while preserving all test methods:
 
-- [ ] Move `EndToEndTests.java` from `src/test/java/` to `src/endToEndTest/java/`
-- [ ] Update JUnit 4 annotations to JUnit 5:
-  - `@Before` → `@BeforeEach` / `@BeforeAll`
+- [x] Create new `EndToEndTests.java` in `src/endToEndTest/java/`
+- [x] Update JUnit 4 annotations to JUnit 5:
+  - `@BeforeClass` → `@BeforeAll`
   - `@Test` → `@Test` (JUnit 5 version)
-- [ ] Update REST Assured imports:
+- [x] Update REST Assured imports:
   - `com.jayway.restassured` → `io.restassured`
-- [ ] Update Awaitility imports to version 4.x
-- [ ] Integrate with `ApplicationUnderTest`:
+- [x] Replace `Eventually` with Awaitility 4.x
+- [x] Integrate with `ApplicationUnderTest`:
   - Use `@BeforeAll` to start `ApplicationUnderTest`
   - Get service URLs from `ApplicationUnderTest` instead of hardcoded ports
   - Use `@AfterAll` to stop `ApplicationUnderTest`
-- [ ] Preserve existing test methods:
+- [x] Create self-contained DTO classes (no external dependencies)
+- [x] Preserve existing test methods:
   - `shouldCreateReviseAndCancelOrder()`
   - `shouldDeliverOrder()`
   - `testSwaggerUiUrls()`
-- [ ] Verify all tests compile
+- [x] Verify all tests compile
 
 ### Task 10.4: Verify end-to-end tests pass
 

ftgo-end-to-end-tests/build.gradle

@@ -1,68 +1,118 @@
-apply plugin: FtgoOpenApiCodeGenPlugin
-
-/*
 plugins {
-  id 'org.hidetake.swagger.generator' version '2.18.1'
+    id 'java'
 }
-*/
 
-apply plugin: 'docker-compose'
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(17)
+    }
+}
 
-dependencies {
-  swaggerCodegen 'org.openapitools:openapi-generator-cli:3.3.4'     // or OpenAPI Generator
+repositories {
+    mavenCentral()
+    maven { url eventuateMavenRepoUrl }
 }
 
-swaggerSources {
-  consumerService {
-    inputFile = file("${ftgoApiSpecsDir}/ftgo-consumer-service-swagger.json")
-    code {
-      language = 'java'
-      configFile = file('swagger-codegen-config/consumer-service.json')
-      components = ['models']
-      // Supports additionalProperties: https://github.com/swagger-api/swagger-codegen#to-generate-a-sample-client-library
-    }
-  }
-  restaurantService {
-    inputFile = file("${ftgoApiSpecsDir}/ftgo-restaurant-service-api-spec/web/ftgo-restaurant-service-swagger.json")
-    code {
-      language = 'java'
-      configFile = file('swagger-codegen-config/restaurant-service.json')
-      components = ['models']
+sourceSets {
+    endToEndTest {
+        java {
+            srcDir 'src/endToEndTest/java'
+        }
+        resources {
+            srcDir 'src/endToEndTest/resources'
+        }
+        compileClasspath += sourceSets.main.output
+        runtimeClasspath += sourceSets.main.output
     }
-  }
+}
+
+configurations {
+    endToEndTestImplementation.extendsFrom implementation
+    endToEndTestRuntimeOnly.extendsFrom runtimeOnly
 }
 
 dependencies {
-    ftgoApiSpecification project(":ftgo-consumer-service-api-spec")
-    ftgoApiSpecification project(":ftgo-restaurant-service-api-spec")
+    // Eventuate Platform BOM
+    endToEndTestImplementation platform("io.eventuate.platform:eventuate-platform-dependencies:$eventuatePlatformVersion")
+
+    // Test Framework - JUnit 5
+    endToEndTestImplementation 'org.junit.jupiter:junit-jupiter:5.10.0'
+    endToEndTestRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+
+    // REST Assured for API Testing (modern groupId)
+    endToEndTestImplementation 'io.rest-assured:rest-assured:5.4.0'
+
+    // Testcontainers
+    endToEndTestImplementation "org.testcontainers:testcontainers:$testContainersVersion"
+    endToEndTestImplementation "org.testcontainers:junit-jupiter:$testContainersVersion"
+
+    // Eventuate Testcontainers support
+    endToEndTestImplementation 'io.eventuate.common:eventuate-common-testcontainers'
+    endToEndTestImplementation 'io.eventuate.messaging.kafka:eventuate-messaging-kafka-testcontainers'
+    endToEndTestImplementation 'io.eventuate.cdc:eventuate-cdc-testcontainers'
+    endToEndTestImplementation "io.eventuate.platform.testcontainer.support:eventuate-platform-testcontainer-support-service:$eventuatePlatformTestContainerSupportVersion"
+
+    // Eventuate JSON mapper for object mapping
+    endToEndTestImplementation 'io.eventuate.common:eventuate-common-json-mapper'
 
-    compile project(":ftgo-accounting-service-api")
-    compile project(":ftgo-consumer-service-api")
-    compile project(":ftgo-kitchen-service-api")
-    compile project(":ftgo-restaurant-service-api")
-    compile project(":ftgo-order-service-api")
-    compile project(":ftgo-delivery-service-api")
+    // Spring Core for ClassUtils (used in ApplicationUnderTest factory)
+    endToEndTestImplementation "org.springframework:spring-core:6.2.1"
 
-    compile "io.eventuate.util:eventuate-util-test"
+    // Awaitility for polling/waiting (replaces Eventuate Eventually)
+    endToEndTestImplementation 'org.awaitility:awaitility:4.2.0'
 
-    compile 'io.swagger:swagger-annotations:1.5.24'
+    // Assertions
+    endToEndTestImplementation 'org.assertj:assertj-core:3.24.2'
 
-    testCompile "org.springframework.boot:spring-boot-starter-test:$springBootVersion"
-    testCompile "com.jayway.restassured:rest-assured:$restAssuredVersion"
-    testCompile "com.jayway.jsonpath:json-path:2.3.0"
-    testCompile project(":ftgo-test-util")
+    // Logging
+    endToEndTestImplementation 'org.slf4j:slf4j-api:2.0.9'
+    endToEndTestImplementation 'ch.qos.logback:logback-classic:1.4.14'
 
+    // JSON Processing
+    endToEndTestImplementation 'com.fasterxml.jackson.core:jackson-databind'
+    endToEndTestImplementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310'
 
+    // Main dependencies (for shared DTOs if any)
+    implementation 'com.fasterxml.jackson.core:jackson-databind'
 }
 
-dockerCompose {
-    environment.put "EVENTUATE_COMMON_VERSION", eventuateCommonImageVersion
-    environment.put "EVENTUATE_CDC_VERSION", eventuateCdcImageVersion
-    environment.put "EVENTUATE_SAGA_VERSION", eventuateTramSagasImageVersion
-    environment.put "EVENTUATE_JAVA_BASE_IMAGE_VERSION", eventuateExamplesBaseImageVersion
-    environment.put "EVENTUATE_MESSAGING_KAFKA_IMAGE_VERSION", eventuateMessagingKafkaImageVersion
+task endToEndTest(type: Test) {
+    description = 'Runs end-to-end tests'
+    group = 'verification'
 
-    projectName = null
+    testClassesDirs = sourceSets.endToEndTest.output.classesDirs
+    classpath = sourceSets.endToEndTest.runtimeClasspath
+
+    useJUnitPlatform()
+
+    testLogging {
+        events "passed", "skipped", "failed"
+        exceptionFormat "full"
+    }
+
+    // Increase heap size for Testcontainers
+    maxHeapSize = '2g'
+    jvmArgs '-XX:MaxMetaspaceSize=512m'
+
+    // Fork a new JVM for each test class
+    forkEvery = 1
+
+    // Pass system properties
+    if (project.hasProperty('endToEndTestMode'))
+        systemProperty "endToEndTestMode", endToEndTestMode
 }
 
-test.dependsOn(composeUp)
+check.dependsOn endToEndTest
+
+// Docker Compose mode support
+task dockerComposeUp(type: Exec) {
+    description = 'Starts all services using docker compose'
+    group = 'application'
+
+    workingDir = '../'
+    commandLine 'docker', 'compose', 'up', '-d', '--wait'
+}
+
+if (project.hasProperty('endToEndTestMode') && endToEndTestMode == 'DockerCompose') {
+    endToEndTest.dependsOn dockerComposeUp
+}

ftgo-end-to-end-tests/gradle.properties

@@ -0,0 +1,8 @@
+eventuateMavenRepoUrl=https://snapshots.repositories.eventuate.io/repository
+eventuatePlatformVersion=2025.1.BUILD-SNAPSHOT
+springBootVersion=3.4.0
+eventuatePlatformTestContainerSupportVersion=0.5.0.BUILD-SNAPSHOT
+testContainersVersion=1.20.4
+
+version=0.1.0-SNAPSHOT
+group=net.chrisrichardson.ftgo.endtoendtests

ftgo-end-to-end-tests/gradle/wrapper/gradle-wrapper.jar

@@ -0,0 +1,7 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists