diff --git a/applications/spring-shell/src/test/java/org/springframework/sbm/BootUpgrade_27_30_IntegrationTest.java b/applications/spring-shell/src/test/java/org/springframework/sbm/BootUpgrade_27_30_IntegrationTest.java index a77cf1b02..d636c9c8d 100644 --- a/applications/spring-shell/src/test/java/org/springframework/sbm/BootUpgrade_27_30_IntegrationTest.java +++ b/applications/spring-shell/src/test/java/org/springframework/sbm/BootUpgrade_27_30_IntegrationTest.java @@ -30,7 +30,6 @@ import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat; -@Disabled("Falky at CI hence disabling it") public class BootUpgrade_27_30_IntegrationTest extends IntegrationTestBaseClass { @Override @@ -46,6 +45,7 @@ void migrateSimpleApplication() { scanProject(); applyRecipe("boot-2.7-3.0-dependency-version-update"); + applyRecipe("sbu30-migrate-to-jakarta-packages"); buildProject(); verifyParentPomVersion(); @@ -56,9 +56,32 @@ void migrateSimpleApplication() { verifyAutoConfigurationIsRefactored(); verifyEhCacheVersionIsUpgraded(); verifyJohnzonCoreDependencyIsUpgraded(); - verifyWireMockDependency(); + verifyJavaxMigrationToJakarta(); +// TODO: Verify if wiremock recipe is required for 3.0.0 migration +// verifyWireMockDependency(); verifySpringCloudDependency(); -} + } + + private void verifyJavaxMigrationToJakarta() { + + String studentClass = loadJavaFile( + "org.springboot.example.upgrade", + "Student"); + + assertThat(studentClass).isEqualTo(""" + package org.springboot.example.upgrade; + + import jakarta.persistence.Entity; + import jakarta.persistence.Id; + + @Entity + public class Student { + @Id + private long id; + private String name; + } + """); + } private void verifyWireMockDependency() { Optional wireMock = @@ -168,7 +191,7 @@ public interface StudentRepoReactiveSorting extends ReactiveSortingRepository