tag LiquibaseCompatibilityIntegrationTest with officeIntegrationTest instead of importOfficeData and cleanup

This commit is contained in:
Michael Hoennig 2025-01-28 11:45:28 +01:00
parent 80f72b3038
commit 6eba18fb68
2 changed files with 9 additions and 10 deletions

View File

@ -335,7 +335,7 @@ jacocoTestCoverageVerification {
} }
} }
// HOWTO: run all unit-tests which don't need a database: gw unitTest // HOWTO: run all unit-tests which don't need a database: gw-test unitTest
tasks.register('unitTest', Test) { tasks.register('unitTest', Test) {
useJUnitPlatform { useJUnitPlatform {
excludeTags 'importOfficeData', 'importHostingAssets', 'scenarioTest', 'generalIntegrationTest', excludeTags 'importOfficeData', 'importHostingAssets', 'scenarioTest', 'generalIntegrationTest',
@ -360,7 +360,7 @@ tasks.register('generalIntegrationTest', Test) {
mustRunAfter spotlessJava mustRunAfter spotlessJava
} }
// HOWTO: run all integration tests of the office module: gw officeIntegrationTest // HOWTO: run all integration tests of the office module: gw-test officeIntegrationTest
tasks.register('officeIntegrationTest', Test) { tasks.register('officeIntegrationTest', Test) {
useJUnitPlatform { useJUnitPlatform {
includeTags 'officeIntegrationTest' includeTags 'officeIntegrationTest'
@ -372,26 +372,26 @@ tasks.register('officeIntegrationTest', Test) {
mustRunAfter spotlessJava mustRunAfter spotlessJava
} }
// HOWTO: run all integration tests of the booking module: gw bookingIntegrationTest // HOWTO: run all integration tests of the booking module: gw-test bookingIntegrationTest
tasks.register('bookingIntegrationTest', Test) { tasks.register('bookingIntegrationTest', Test) {
useJUnitPlatform { useJUnitPlatform {
includeTags 'bookingIntegrationTest' includeTags 'bookingIntegrationTest'
} }
group 'verification' group 'verification'
description 'runs integration tests of the office module' description 'runs integration tests of the booking module'
mustRunAfter spotlessJava mustRunAfter spotlessJava
} }
// HOWTO: run all integration tests of the hosting module: gw hostingIntegrationTest // HOWTO: run all integration tests of the hosting module: gw-test hostingIntegrationTest
tasks.register('hostingIntegrationTest', Test) { tasks.register('hostingIntegrationTest', Test) {
useJUnitPlatform { useJUnitPlatform {
includeTags 'hostingIntegrationTest' includeTags 'hostingIntegrationTest'
} }
group 'verification' group 'verification'
description 'runs integration tests of the office module' description 'runs integration tests of the hosting module'
mustRunAfter spotlessJava mustRunAfter spotlessJava
} }

View File

@ -12,7 +12,6 @@ import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
import org.springframework.context.annotation.Import; import org.springframework.context.annotation.Import;
import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.TestPropertySource;
import org.springframework.test.context.jdbc.Sql; import org.springframework.test.context.jdbc.Sql;
import javax.sql.DataSource; import javax.sql.DataSource;
@ -23,6 +22,7 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.springframework.test.context.jdbc.Sql.ExecutionPhase.BEFORE_TEST_CLASS; import static org.springframework.test.context.jdbc.Sql.ExecutionPhase.BEFORE_TEST_CLASS;
// TODO.impl: The reference-SQL-dump-generation needs to be automated // TODO.impl: The reference-SQL-dump-generation needs to be automated
// BLOG: Liquibase-migration-test (not before the reference-SQL-dump-generation is simplified)
// HOWTO: generate the prod-reference-SQL-dump during a prod-release // HOWTO: generate the prod-reference-SQL-dump during a prod-release
/** /**
@ -70,13 +70,12 @@ import static org.springframework.test.context.jdbc.Sql.ExecutionPhase.BEFORE_TE
* <p>The generated dump has to be committed to git and will be used in future test-runs * <p>The generated dump has to be committed to git and will be used in future test-runs
* until it gets replaced at the next release.</p> * until it gets replaced at the next release.</p>
*/ */
@Tag("importOfficeData") @Tag("officeIntegrationTest")
@DataJpaTest(properties = { @DataJpaTest(properties = {
"spring.liquibase.enabled=false" // @Sql should go first, Liquibase will be initialized programmatically "spring.liquibase.enabled=false" // @Sql should go first, Liquibase will be initialized programmatically
}) })
@ActiveProfiles({"only-office", "liquibase-migration-test"})
@TestPropertySource(properties = "spring.liquibase.contexts=only-office")
@DirtiesContext @DirtiesContext
@ActiveProfiles("liquibase-migration-test")
@Import({ Context.class, JpaAttempt.class, LiquibaseConfig.class }) @Import({ Context.class, JpaAttempt.class, LiquibaseConfig.class })
@Sql(value = "/db/prod-only-office-schema-with-test-data.sql", executionPhase = BEFORE_TEST_CLASS) @Sql(value = "/db/prod-only-office-schema-with-test-data.sql", executionPhase = BEFORE_TEST_CLASS)
public class LiquibaseCompatibilityIntegrationTest extends CsvDataImport { public class LiquibaseCompatibilityIntegrationTest extends CsvDataImport {