Repository navigation
Conversation
Replace the hand-made spring_boot_staged, spring_boot_multi_framework, integration_valid and java_cf_boot_3 fixtures with the Spring Boot 3 and 4.1 apps from java-test-applications. Tests run on Java 25 unless they exercise a specific Java version, and a matrix covers Spring Boot 3 (Java 17/21/25) and 4 (Java 21/25). Raise the default Eventually timeout to 2 minutes for the slower real apps.
Contributor
There was a problem hiding this comment.
🟢 Approval recommended
No active review issues were identified for the integration-test fixture and Java-version updates.
No open issues 🎉
What changed in this PR
This PR makes the Java buildpack’s integration tests more representative by replacing fake Spring Boot fixtures with real downloaded applications and using Java 25 for version-independent tests.
Changes:
- Replace obsolete fixtures with real Spring Boot apps, runtime diagnostic endpoints, and temporary JRebel-enabled copies.
- Add a Spring Boot 3/4 Java-version matrix while retaining version-specific coverage.
- Increase the default polling timeout to two minutes and document fixture usage.
| File | Description |
|---|---|
src/integration/tomcat_test.go |
Moves version-independent Tomcat tests to Java 25. |
src/integration/testdata/README.md |
Documents downloaded apps, structural stubs, and small fixtures. |
src/integration/testdata/frameworks/java_cf_boot_3/META-INF/MANIFEST.MF |
Removes the fake Java CF Env fixture manifest. |
src/integration/testdata/frameworks/java_cf_boot_3/bin/application |
Removes the fake Java CF Env fixture launcher. |
src/integration/testdata/containers/spring_boot_staged/src/SimpleSpringBootApp.java |
Removes a fake Spring Boot server implementation. |
src/integration/testdata/containers/spring_boot_staged/src/SimpleJava.java |
Removes the obsolete staged fixture’s Java server. |
src/integration/testdata/containers/spring_boot_staged/META-INF/MANIFEST.MF |
Removes the staged fixture manifest. |
src/integration/testdata/containers/spring_boot_staged/bin/application |
Removes the staged fixture launcher. |
src/integration/testdata/containers/spring_boot_multi_framework/src/SimpleSpringBootApp.java |
Removes the multi-framework fixture’s fake Spring Boot server. |
src/integration/testdata/containers/spring_boot_multi_framework/src/SimpleJava.java |
Removes the multi-framework fixture’s Java server. |
src/integration/testdata/containers/spring_boot_multi_framework/rebel-remote.xml |
Removes static JRebel configuration, now added by a helper. |
src/integration/testdata/containers/spring_boot_multi_framework/META-INF/MANIFEST.MF |
Removes the multi-framework fixture manifest. |
src/integration/testdata/containers/spring_boot_multi_framework/bin/application |
Removes the multi-framework fixture launcher. |
src/integration/testdata/apps/integration_valid/system.properties |
Removes the retired fixture’s Java runtime setting. |
src/integration/testdata/apps/integration_valid/META-INF/MANIFEST.MF |
Removes the retired fixture’s manifest. |
src/integration/testdata/apps/integration_valid/BOOT-INF/lib/.gitignore |
Retires the old fixture’s library-directory placeholder. |
src/integration/spring_boot_test.go |
Uses real apps and diagnostic endpoints; adds the Java-version matrix. |
src/integration/ratpack_test.go |
Uses the shared Java default. |
src/integration/play_test.go |
Uses the shared Java default. |
src/integration/java_main_test.go |
Updates version-independent tests to the shared Java default. |
src/integration/init_test.go |
Extends polling timeouts and supplies real apps to framework tests. |
src/integration/groovy_test.go |
Uses the shared Java default. |
src/integration/frameworks_test.go |
Replaces fake apps and updates runtime versions and response assertions. |
src/integration/dist_zip_test.go |
Updates version-independent tests to the shared Java default. |
src/integration/container_detection_test.go |
Uses the shared Java default for selected detection tests. |
src/integration/app_fixtures_test.go |
Adds the Java default, fixture availability checks, and app-copy helpers. |
Review effort: Balanced
Contributor
Author
|
@copilot resolve the merge conflicts on this branch. |
Resolve the conflicts with cloudfoundry#1550: - frameworks/java_cf_boot_3: keep the deletion, the fixture is replaced by the real Spring Boot apps. - testdata/README.md: merge both versions. Keep the sections about the downloaded real apps, and the stub notes of cloudfoundry#1550 (manifests, no_container_* cases, the 324 byte Spring stubs) that still apply.
Contributor
Author
|
Merged main into the branch to resolve the conflicts with #1550 (the testdata README and the |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The tests used hand-made fake fixtures (
spring_boot_staged,spring_boot_multi_framework,apps/integration_valid,frameworks/java_cf_boot_3): a 60-line JDK web server with a fakespring-boot-1.0.0.RELEASE.jar, on Java 11. They are replaced by the real Spring Boot apps from java-test-applicationsv1.0.1, which the suite already downloads.defaultJavaVersion). Tests named after a version or JRE keep theirs, and Java 8 and 11 stay covered by the Tomcat, DistZip and JavaMain suites./jvm-argschecks use/input-argumentsand/system-propertiesof the real app; the Java CF Env test now expectsJava CF Envfor a real Spring Boot app (the fake was not a Spring 3 app).rebel-remote.xmladded (appWithFile).Eventuallydefault timeout 40 s to 2 minutes: the real apps start slower (JRebel adds about 40 s).Verified: Docker, cflinuxfs4, zip built from this branch, same settings as
scripts/integration.sh(3 nodes, uncached zip): 130 tests, 121 passed, 0 failed, 9 skipped (the usual vendor-credential skips), 31 minutes.Overlap: #1550 also touches
testdata/README.mdand thejava_cf_boot_3jar. Whichever merges second needs a small rebase.Follow-up: about 50 of the tests that now use the real Spring Boot 4.1 app (nearly all of the Frameworks suite and the Java Opts tests) do not need Spring, only a JVM that answers on
/. A later PR will move them to a dependency-free JDK test app (simple-java-application, starts in under a second, runs on Java 8 and up) and add runtime assertions for the agents.