SpringCloud/spring-cloud-task
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updated Deployer Version to 2.8

Browse Source 
Reactivated tests for rempote partition
This commit is contained in:
Glenn Renfro
2022-03-11 09:57:50 -05:00
parent 270b24be8b
commit 40b9840506
4 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@@ -102,8 +102,8 @@
<properties>
<spring-cloud-stream.version>4.0.0-SNAPSHOT</spring-cloud-stream.version>
<spring-cloud-deployer.version>2.7.0</spring-cloud-deployer.version>
<spring-cloud-deployer-local.version>2.7.0
<spring-cloud-deployer.version>2.8.0-SNAPSHOT</spring-cloud-deployer.version>
<spring-cloud-deployer-local.version>2.8.0-SNAPSHOT
</spring-cloud-deployer-local.version>
<spring-cloud-stream-binder-rabbit.version>${spring-cloud-stream.version}
</spring-cloud-stream-binder-rabbit.version>

2
spring-cloud-task-samples/partitioned-batch-job/pom.xml
View File

@@ -20,7 +20,7 @@
<test.cloud.support>4.0.0-SNAPSHOT</test.cloud.support>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>17</java.version>
<spring-cloud-deployer>2.7.0</spring-cloud-deployer>
<spring-cloud-deployer>2.8.0-SNAPSHOT</spring-cloud-deployer>
</properties>
<dependencyManagement>

42
spring-cloud-task-samples/partitioned-batch-job/src/test/java/org/springframework/cloud/task/partitioner/TaskPartitionerTests.java
View File

@@ -90,27 +90,27 @@ public class TaskPartitionerTests {
@Test
public void testWithLocalDeployer() throws Exception {
// SpringApplication app = new SpringApplication(PartitionedBatchJobApplication.class);
// app.setAdditionalProfiles("master");
// Properties properties = new Properties();
// properties.setProperty("spring.datasource.url", DATASOURCE_URL);
// properties.setProperty("spring.datasource.username", DATASOURCE_USER_NAME);
// properties.setProperty("spring.datasource.driverClassName", DATASOURCE_DRIVER_CLASS_NAME);
// properties.setProperty("spring.cloud.deployer.local.use-spring-application-json", "false");
// app.setDefaultProperties(properties);
// app.run();
//
// Page<TaskExecution> taskExecutions = this.taskExplorer
// .findAll(PageRequest.of(0, 10));
// assertThat(taskExecutions.getTotalElements()).as("Five rows are expected")
// .isEqualTo(5);
// assertThat(this.taskExplorer
// .getTaskExecutionCountByTaskName("PartitionedBatchJobTask"))
// .as("Only One master is expected").isEqualTo(1);
// for (TaskExecution taskExecution : taskExecutions) {
// assertThat(taskExecution.getExitCode()
// .intValue()).as("return code should be 0").isEqualTo(0);
// }
SpringApplication app = new SpringApplication(PartitionedBatchJobApplication.class);
app.setAdditionalProfiles("master");
Properties properties = new Properties();
properties.setProperty("spring.datasource.url", DATASOURCE_URL);
properties.setProperty("spring.datasource.username", DATASOURCE_USER_NAME);
properties.setProperty("spring.datasource.driverClassName", DATASOURCE_DRIVER_CLASS_NAME);
properties.setProperty("spring.cloud.deployer.local.use-spring-application-json", "false");
app.setDefaultProperties(properties);
app.run();
Page<TaskExecution> taskExecutions = this.taskExplorer
.findAll(PageRequest.of(0, 10));
assertThat(taskExecutions.getTotalElements()).as("Five rows are expected")
.isEqualTo(5);
assertThat(this.taskExplorer
.getTaskExecutionCountByTaskName("PartitionedBatchJobTask"))
.as("Only One master is expected").isEqualTo(1);
for (TaskExecution taskExecution : taskExecutions) {
assertThat(taskExecution.getExitCode()
.intValue()).as("return code should be 0").isEqualTo(0);
}
}
@Configuration(proxyBeanMethods = false)

2
spring-cloud-task-samples/tasksink/pom.xml
View File

@@ -24,7 +24,7 @@
<skipInstall>true</skipInstall>
<spring-cloud-stream>4.0.0-M1</spring-cloud-stream>
<spring-cloud-task>4.0.0-SNAPSHOT</spring-cloud-task>
<spring-cloud-deployer-version>2.7.0</spring-cloud-deployer-version>
<spring-cloud-deployer-version>2.8.0-SNAPSHOT</spring-cloud-deployer-version>
</properties>
<dependencyManagement>