diff --git a/spring-cloud-task-integration-tests/pom.xml b/spring-cloud-task-integration-tests/pom.xml index cfecb06f..b6c06fa2 100644 --- a/spring-cloud-task-integration-tests/pom.xml +++ b/spring-cloud-task-integration-tests/pom.xml @@ -11,6 +11,18 @@ org.springframework.cloud spring-cloud-task-integration-tests + + + + org.springframework.cloud + spring-cloud-task-dependencies + 1.0.2.BUILD-SNAPSHOT + pom + import + + + + org.springframework.cloud @@ -32,11 +44,6 @@ spring-cloud-starter-stream-rabbit test - - org.springframework.cloud - spring-cloud-task-batch - test - org.springframework.batch spring-batch-core @@ -56,6 +63,31 @@ spring-cloud-deployer-local test + + io.spring.cloud + partitioned-batch-job + 1.0.2.BUILD-SNAPSHOT + test + + + org.springframework.cloud + spring-cloud-task-batch + + + com.h2database + h2 + test + + + org.springframework.cloud + spring-cloud-deployer-spi + test + + + org.springframework.cloud + spring-cloud-deployer-local + test + com.h2database h2 diff --git a/spring-cloud-task-integration-tests/src/test/java/org/springframework/cloud/task/launcher/TaskLauncherSinkTests.java b/spring-cloud-task-integration-tests/src/test/java/org/springframework/cloud/task/launcher/TaskLauncherSinkTests.java index 95687f81..51c2acd7 100644 --- a/spring-cloud-task-integration-tests/src/test/java/org/springframework/cloud/task/launcher/TaskLauncherSinkTests.java +++ b/spring-cloud-task-integration-tests/src/test/java/org/springframework/cloud/task/launcher/TaskLauncherSinkTests.java @@ -46,6 +46,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; +import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.datasource.DriverManagerDataSource; import org.springframework.messaging.support.GenericMessage; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -66,6 +67,7 @@ public class TaskLauncherSinkTests { private final static String DATASOURCE_USER_NAME = "SA"; private final static String DATASOURCE_USER_PASSWORD = ""; private final static String DATASOURCE_DRIVER_CLASS_NAME = "org.h2.Driver"; + private final static String TASK_NAME = "TASK_LAUNCHER_SINK_TEST"; private static int randomPort; @@ -101,6 +103,22 @@ public class TaskLauncherSinkTests { properties.put("spring.datasource.username", DATASOURCE_USER_NAME); properties.put("spring.datasource.password", DATASOURCE_USER_PASSWORD); properties.put("spring.datasource.driverClassName", DATASOURCE_DRIVER_CLASS_NAME); + properties.put("spring.application.name",TASK_NAME); + + JdbcTemplate template = new JdbcTemplate(this.dataSource); + template.execute("DROP TABLE IF EXISTS TASK_TASK_BATCH"); + template.execute("DROP TABLE IF EXISTS TASK_SEQ"); + template.execute("DROP TABLE IF EXISTS TASK_EXECUTION_PARAMS"); + template.execute("DROP TABLE IF EXISTS TASK_EXECUTION"); + template.execute("DROP TABLE IF EXISTS BATCH_STEP_EXECUTION_SEQ"); + template.execute("DROP TABLE IF EXISTS BATCH_STEP_EXECUTION_CONTEXT"); + template.execute("DROP TABLE IF EXISTS BATCH_STEP_EXECUTION"); + template.execute("DROP TABLE IF EXISTS BATCH_JOB_SEQ"); + template.execute("DROP TABLE IF EXISTS BATCH_JOB_EXECUTION_SEQ"); + template.execute("DROP TABLE IF EXISTS BATCH_JOB_EXECUTION_PARAMS"); + template.execute("DROP TABLE IF EXISTS BATCH_JOB_EXECUTION_CONTEXT"); + template.execute("DROP TABLE IF EXISTS BATCH_JOB_EXECUTION"); + template.execute("DROP TABLE IF EXISTS BATCH_JOB_INSTANCE"); } @Test @@ -109,6 +127,7 @@ public class TaskLauncherSinkTests { assertTrue(waitForDBToBePopulated()); Page taskExecutions = taskExplorer.findAll(new PageRequest(0, 10)); + TaskExecution te = taskExecutions.iterator().next(); assertEquals("Only one row is expected", 1, taskExecutions.getTotalElements()); assertEquals("return code should be 0", 0, taskExecutions.iterator().next().getExitCode().intValue()); } diff --git a/spring-cloud-task-integration-tests/src/test/java/org/springframework/cloud/task/listener/BatchExecutionEventTests.java b/spring-cloud-task-integration-tests/src/test/java/org/springframework/cloud/task/listener/BatchExecutionEventTests.java index 6ae41d13..2d8e2028 100644 --- a/spring-cloud-task-integration-tests/src/test/java/org/springframework/cloud/task/listener/BatchExecutionEventTests.java +++ b/spring-cloud-task-integration-tests/src/test/java/org/springframework/cloud/task/listener/BatchExecutionEventTests.java @@ -36,6 +36,7 @@ import org.springframework.cloud.stream.test.junit.rabbit.RabbitTestSupport; import org.springframework.cloud.task.batch.listener.BatchEventAutoConfiguration; import org.springframework.cloud.task.batch.listener.support.JobExecutionEvent; import org.springframework.cloud.task.batch.listener.support.StepExecutionEvent; +import org.springframework.cloud.task.configuration.SimpleTaskConfiguration; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.PropertySource; diff --git a/spring-cloud-task-integration-tests/src/test/java/org/springframework/cloud/task/paritioner/TaskPartitionerTests.java b/spring-cloud-task-integration-tests/src/test/java/org/springframework/cloud/task/paritioner/TaskPartitionerTests.java new file mode 100644 index 00000000..2f618798 --- /dev/null +++ b/spring-cloud-task-integration-tests/src/test/java/org/springframework/cloud/task/paritioner/TaskPartitionerTests.java @@ -0,0 +1,136 @@ +/* + * Copyright 2016 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.cloud.task.paritioner; + +import java.sql.SQLException; +import javax.sql.DataSource; + +import io.spring.PartitionedBatchJobApplication; +import org.h2.tools.Server; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.test.SpringApplicationConfiguration; +import org.springframework.cloud.task.repository.TaskExecution; +import org.springframework.cloud.task.repository.TaskExplorer; +import org.springframework.cloud.task.repository.support.SimpleTaskExplorer; +import org.springframework.cloud.task.repository.support.TaskExecutionDaoFactoryBean; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.jdbc.datasource.DriverManagerDataSource; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.util.SocketUtils; + +import static org.junit.Assert.assertEquals; + +@RunWith(SpringJUnit4ClassRunner.class) +@SpringApplicationConfiguration(classes = {TaskPartitionerTests.TaskLauncherConfiguration.class}) +public class TaskPartitionerTests { + + private static String DATASOURCE_URL; + private final static String DATASOURCE_USER_NAME = "SA"; + private final static String DATASOURCE_USER_PASSWORD = ""; + private final static String DATASOURCE_DRIVER_CLASS_NAME = "org.h2.Driver"; + + private TaskExplorer taskExplorer; + + @Autowired + + private DataSource dataSource; + + @Autowired + public void setDataSource(DataSource dataSource) { + taskExplorer = new SimpleTaskExplorer(new TaskExecutionDaoFactoryBean(dataSource)); + } + + private static int randomPort; + + static { + randomPort = SocketUtils.findAvailableTcpPort(); + DATASOURCE_URL = "jdbc:h2:tcp://localhost:" + randomPort + "/mem:dataflow;DB_CLOSE_DELAY=-1;" + + "DB_CLOSE_ON_EXIT=FALSE"; + } + + @Before + public void setup() { + JdbcTemplate template = new JdbcTemplate(this.dataSource); + template.execute("DROP TABLE IF EXISTS TASK_TASK_BATCH"); + template.execute("DROP TABLE IF EXISTS TASK_SEQ"); + template.execute("DROP TABLE IF EXISTS TASK_EXECUTION_PARAMS"); + template.execute("DROP TABLE IF EXISTS TASK_EXECUTION"); + template.execute("DROP TABLE IF EXISTS BATCH_STEP_EXECUTION_SEQ"); + template.execute("DROP TABLE IF EXISTS BATCH_STEP_EXECUTION_CONTEXT"); + template.execute("DROP TABLE IF EXISTS BATCH_STEP_EXECUTION"); + template.execute("DROP TABLE IF EXISTS BATCH_JOB_SEQ"); + template.execute("DROP TABLE IF EXISTS BATCH_JOB_EXECUTION_SEQ"); + template.execute("DROP TABLE IF EXISTS BATCH_JOB_EXECUTION_PARAMS"); + template.execute("DROP TABLE IF EXISTS BATCH_JOB_EXECUTION_CONTEXT"); + template.execute("DROP TABLE IF EXISTS BATCH_JOB_EXECUTION"); + template.execute("DROP TABLE IF EXISTS BATCH_JOB_INSTANCE"); + } + + @Test + public void testWithLocalDeployer() throws Exception { + SpringApplication app = new SpringApplication(PartitionedBatchJobApplication.class); + app.setAdditionalProfiles("master"); + app.run("--server.port=0", "--spring.datasource.url=" + DATASOURCE_URL, + "--spring.datasource.username=" + DATASOURCE_USER_NAME, + "--spring.datasource.driverClassName=" + DATASOURCE_DRIVER_CLASS_NAME); + + Page taskExecutions = taskExplorer.findAll(new PageRequest(0, 10)); + assertEquals("Five rows are expected", 5, taskExecutions.getTotalElements()); + assertEquals("Only One master is expected", 1, taskExplorer.getTaskExecutionCountByTaskName("batchEvents:master:0")); + assertEquals("4 partitions is expected", 4, taskExplorer.getTaskExecutionCountByTaskName("batchEvents:worker:0")); + for (TaskExecution taskExecution : taskExecutions) { + assertEquals("return code should be 0", 0, taskExecution.getExitCode().intValue()); + } + } + + @Configuration + public static class TaskLauncherConfiguration { + + @Bean(destroyMethod = "stop") + public org.h2.tools.Server initH2TCPServer() { + Server server; + try { + server = Server.createTcpServer("-tcp", "-tcpAllowOthers", "-tcpPort", + String.valueOf(randomPort)).start(); + } + catch (SQLException e) { + throw new IllegalStateException(e); + } + return server; + } + + @Bean + public DataSource dataSource() { + DriverManagerDataSource dataSource = new DriverManagerDataSource(); + dataSource.setDriverClassName(DATASOURCE_DRIVER_CLASS_NAME); + dataSource.setUrl(DATASOURCE_URL); + dataSource.setUsername(DATASOURCE_USER_NAME); + dataSource.setPassword(DATASOURCE_USER_PASSWORD); + return dataSource; + } + } + +} diff --git a/spring-cloud-task-samples/partitioned-batch-job/pom.xml b/spring-cloud-task-samples/partitioned-batch-job/pom.xml index ddcb68a2..49bf1e64 100644 --- a/spring-cloud-task-samples/partitioned-batch-job/pom.xml +++ b/spring-cloud-task-samples/partitioned-batch-job/pom.xml @@ -58,6 +58,11 @@ mariadb-java-client + + com.h2database + h2 + + org.springframework.boot spring-boot-starter-jdbc