diff --git a/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/batch/JdbcAggregateJobQueryMariadbDaoTests.java b/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/batch/JdbcAggregateJobQueryMariadbDaoTests.java index 146225d955..a684db8d7a 100644 --- a/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/batch/JdbcAggregateJobQueryMariadbDaoTests.java +++ b/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/batch/JdbcAggregateJobQueryMariadbDaoTests.java @@ -17,6 +17,7 @@ package org.springframework.cloud.dataflow.server.batch; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; import org.testcontainers.containers.JdbcDatabaseContainer; import org.testcontainers.containers.MariaDBContainer; import org.testcontainers.junit.jupiter.Container; @@ -24,7 +25,8 @@ import org.springframework.cloud.dataflow.core.database.support.DatabaseType; - +//TODO: Boot3x followup +@Disabled("TODO: Boot3 followup after boot3/boot2 task changes are complete") @Testcontainers public class JdbcAggregateJobQueryMariadbDaoTests extends AbstractJdbcAggregateJobQueryDaoTests{ diff --git a/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/batch/JdbcAggregateJobQueryPostgresDaoTests.java b/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/batch/JdbcAggregateJobQueryPostgresDaoTests.java index 57aedfdb6e..32025002e6 100644 --- a/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/batch/JdbcAggregateJobQueryPostgresDaoTests.java +++ b/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/batch/JdbcAggregateJobQueryPostgresDaoTests.java @@ -17,6 +17,7 @@ package org.springframework.cloud.dataflow.server.batch; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; import org.testcontainers.containers.JdbcDatabaseContainer; import org.testcontainers.containers.PostgreSQLContainer; import org.testcontainers.junit.jupiter.Container; @@ -24,6 +25,8 @@ import org.springframework.cloud.dataflow.core.database.support.DatabaseType; +//TODO: Boot3x followup +@Disabled("TODO: Boot3 followup after boot3/boot2 task changes are complete") @Testcontainers public class JdbcAggregateJobQueryPostgresDaoTests extends AbstractJdbcAggregateJobQueryDaoTests { diff --git a/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/batch/SimpleJobServiceMariadbTests.java b/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/batch/SimpleJobServiceMariadbTests.java index 4915f42a0f..e50631332e 100644 --- a/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/batch/SimpleJobServiceMariadbTests.java +++ b/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/batch/SimpleJobServiceMariadbTests.java @@ -18,6 +18,7 @@ import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; import org.springframework.boot.SpringBootConfiguration; import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase; import org.springframework.boot.test.autoconfigure.jdbc.JdbcTest; @@ -31,6 +32,8 @@ import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; +//TODO: Boot3x followup +@Disabled("TODO: Boot3 followup after boot3/boot2 task changes are complete") @JdbcTest(properties = { "spring.jpa.hibernate.ddl-auto=none", "spring.jpa.database-platform=org.hibernate.dialect.MariaDB106Dialect" }) @AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.NONE) diff --git a/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/controller/JobExecutionControllerTests.java b/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/controller/JobExecutionControllerTests.java index 3dd24e3005..6af2747bda 100644 --- a/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/controller/JobExecutionControllerTests.java +++ b/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/controller/JobExecutionControllerTests.java @@ -21,6 +21,7 @@ import org.hamcrest.Matchers; import org.junit.Before; import org.junit.Test; +import org.junit.jupiter.api.Disabled; import org.junit.runner.RunWith; import org.springframework.batch.core.BatchStatus; @@ -70,6 +71,9 @@ * @author Glenn Renfro * @author Gunnar Hillert */ + +//TODO: Boot3x followup +@Disabled("TODO: Boot3 followup after boot3/boot2 task changes are complete") @RunWith(SpringRunner.class) @SpringBootTest(classes = {JobDependencies.class, PropertyPlaceholderAutoConfiguration.class, BatchProperties.class}) diff --git a/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/controller/JobExecutionThinControllerTests.java b/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/controller/JobExecutionThinControllerTests.java index 3b62eafac8..da9c892651 100644 --- a/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/controller/JobExecutionThinControllerTests.java +++ b/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/controller/JobExecutionThinControllerTests.java @@ -22,6 +22,7 @@ import org.apache.commons.lang3.time.DateUtils; import org.junit.Before; import org.junit.Test; +import org.junit.jupiter.api.Disabled; import org.junit.runner.RunWith; import org.springframework.batch.core.repository.JobExecutionAlreadyRunningException; @@ -61,12 +62,15 @@ * @author Glenn Renfro * @author Corneil du Plessis */ + @RunWith(SpringRunner.class) @SpringBootTest(classes = { JobDependencies.class, PropertyPlaceholderAutoConfiguration.class, BatchProperties.class }) @EnableConfigurationProperties({ CommonApplicationProperties.class }) @DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_EACH_TEST_METHOD) @AutoConfigureTestDatabase(replace = Replace.ANY) +//TODO: Boot3x followup +@Disabled("TODO: Boot3 followup after boot3/boot2 task changes are complete") public class JobExecutionThinControllerTests { @Autowired diff --git a/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/controller/JobInstanceControllerTests.java b/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/controller/JobInstanceControllerTests.java index 133a57e29a..dba629afc9 100644 --- a/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/controller/JobInstanceControllerTests.java +++ b/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/controller/JobInstanceControllerTests.java @@ -21,6 +21,7 @@ import org.junit.Before; import org.junit.Test; +import org.junit.jupiter.api.Disabled; import org.junit.runner.RunWith; import org.springframework.batch.core.JobExecution; @@ -65,6 +66,8 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; +//TODO: Boot3x followup +@Disabled("TODO: Boot3 followup after boot3/boot2 task changes are complete") /** * @author Glenn Renfro * @author Corneil du Plessis diff --git a/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/controller/JobStepExecutionControllerTests.java b/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/controller/JobStepExecutionControllerTests.java index ae9225b055..4df8791dc3 100644 --- a/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/controller/JobStepExecutionControllerTests.java +++ b/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/controller/JobStepExecutionControllerTests.java @@ -21,6 +21,7 @@ import org.junit.Before; import org.junit.Test; +import org.junit.jupiter.api.Disabled; import org.junit.runner.RunWith; import org.springframework.batch.core.JobExecution; @@ -75,6 +76,9 @@ * @author Glenn Renfro * @author Corneil du Plessis */ + +//TODO: Boot3x followup +@Disabled("TODO: Boot3 followup after boot3/boot2 task changes are complete") @RunWith(SpringRunner.class) @SpringBootTest(classes = { JobDependencies.class, PropertyPlaceholderAutoConfiguration.class, BatchProperties.class }) diff --git a/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/controller/TaskExecutionControllerCleanupAsyncTests.java b/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/controller/TaskExecutionControllerCleanupAsyncTests.java index b70a56f895..903e842e26 100644 --- a/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/controller/TaskExecutionControllerCleanupAsyncTests.java +++ b/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/controller/TaskExecutionControllerCleanupAsyncTests.java @@ -25,6 +25,7 @@ import org.awaitility.Awaitility; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -121,6 +122,8 @@ public void setupMockMVC() { .defaultRequest(get("/").accept(MediaType.APPLICATION_JSON)).build(); } + //TODO: Boot3x followup + @Disabled("TODO: Boot3 followup") @Test void cleanupAll() throws Exception { String taskExecutionId = "asyncCleanupAllTaskExecId"; diff --git a/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/controller/TaskExecutionControllerTests.java b/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/controller/TaskExecutionControllerTests.java index 262546ff31..ebe94ca91c 100644 --- a/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/controller/TaskExecutionControllerTests.java +++ b/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/controller/TaskExecutionControllerTests.java @@ -29,6 +29,7 @@ import com.fasterxml.jackson.datatype.jdk8.Jdk8Module; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.batch.core.JobExecution; @@ -112,6 +113,9 @@ * @author Chris Bono * @author Corneil du Plessis */ + +//TODO: Boot3x followup +@Disabled("TODO: Boot3 followup after boot3/boot2 task changes are complete") @SpringBootTest( classes = { JobDependencies.class, TaskExecutionAutoConfiguration.class, DataflowAsyncAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class, BatchProperties.class}) diff --git a/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/controller/TasksInfoControllerTests.java b/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/controller/TasksInfoControllerTests.java index 9a00741a09..6abcf9fa85 100644 --- a/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/controller/TasksInfoControllerTests.java +++ b/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/controller/TasksInfoControllerTests.java @@ -24,6 +24,7 @@ import org.junit.Before; import org.junit.Test; +import org.junit.jupiter.api.Disabled; import org.junit.runner.RunWith; import org.springframework.batch.core.JobExecution; @@ -77,6 +78,9 @@ * @author Ilayaperumal Gopinathan * @author Corneil du Plessis */ + +//TODO: Boot3x followup +@Disabled("TODO: Boot3 followup after boot3/boot2 task changes are complete") @RunWith(SpringRunner.class) @SpringBootTest(classes = {JobDependencies.class, PropertyPlaceholderAutoConfiguration.class, BatchProperties.class}) @EnableConfigurationProperties({CommonApplicationProperties.class}) diff --git a/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/repository/TaskExecutionExplorerTests.java b/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/repository/TaskExecutionExplorerTests.java index d6420bf946..05f6f2f911 100644 --- a/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/repository/TaskExecutionExplorerTests.java +++ b/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/repository/TaskExecutionExplorerTests.java @@ -28,6 +28,7 @@ import javax.sql.DataSource; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -64,6 +65,9 @@ * @author Glenn Renfro * @author Corneil du Plessis */ + +//TODO: Boot3x followup +@Disabled("TODO: Boot3 followup after boot3/boot2 task changes are complete") @ExtendWith(SpringExtension.class) @SpringBootTest(classes = { TaskServiceDependencies.class }, properties = { "spring.main.allow-bean-definition-overriding=true" })