diff --git a/pom.xml b/pom.xml index d1f34057..167b0de5 100755 --- a/pom.xml +++ b/pom.xml @@ -137,12 +137,12 @@ - 1.2.0.RC1 - 1.2.0.M3 - 1.2.0.M3 - 1.2.0.RC1 - 1.2.0.M3 - 1.2.0.M3 + 1.2.1.RELEASE + 1.2.0.RC1 + 1.2.0.RC1 + 1.2.0.RELEASE + 1.2.0.RC1 + 1.2.0.RC1 3.0.7.RELEASE 1.1 diff --git a/spring-cloud-task-samples/batch-events/pom.xml b/spring-cloud-task-samples/batch-events/pom.xml index ff66c11e..d9e58ea3 100644 --- a/spring-cloud-task-samples/batch-events/pom.xml +++ b/spring-cloud-task-samples/batch-events/pom.xml @@ -51,19 +51,19 @@ org.springframework.cloud spring-cloud-starter-stream-rabbit - 1.1.2.RELEASE + 1.2.0.RELEASE compile org.springframework.cloud spring-cloud-stream-binder-rabbit-test-support - 1.1.2.RELEASE + 1.2.0.RELEASE test org.springframework.cloud spring-cloud-stream-test-support-internal - 1.1.1.RELEASE + 1.2.1.RELEASE test diff --git a/spring-cloud-task-samples/partitioned-batch-job/pom.xml b/spring-cloud-task-samples/partitioned-batch-job/pom.xml index 0dcda5c7..9171d45d 100644 --- a/spring-cloud-task-samples/partitioned-batch-job/pom.xml +++ b/spring-cloud-task-samples/partitioned-batch-job/pom.xml @@ -53,7 +53,7 @@ org.springframework.cloud spring-cloud-deployer-local - 1.1.3.RELEASE + 1.2.0.RC1 diff --git a/spring-cloud-task-samples/task-events/pom.xml b/spring-cloud-task-samples/task-events/pom.xml index fbd48367..7a66c77c 100644 --- a/spring-cloud-task-samples/task-events/pom.xml +++ b/spring-cloud-task-samples/task-events/pom.xml @@ -48,7 +48,7 @@ org.springframework.cloud spring-cloud-starter-stream-rabbit - 1.1.2.RELEASE + 1.2.0.RELEASE compile diff --git a/spring-cloud-task-samples/taskprocessor/pom.xml b/spring-cloud-task-samples/taskprocessor/pom.xml index c5dd4d23..837baff7 100644 --- a/spring-cloud-task-samples/taskprocessor/pom.xml +++ b/spring-cloud-task-samples/taskprocessor/pom.xml @@ -46,7 +46,7 @@ org.springframework.cloud spring-cloud-starter-stream-rabbit - 1.1.2.RELEASE + 1.2.0.RELEASE compile diff --git a/spring-cloud-task-samples/tasksink/pom.xml b/spring-cloud-task-samples/tasksink/pom.xml index e15b8bc8..c52675b7 100644 --- a/spring-cloud-task-samples/tasksink/pom.xml +++ b/spring-cloud-task-samples/tasksink/pom.xml @@ -39,11 +39,6 @@ org.springframework.boot spring-boot-starter - - org.springframework.cloud - spring-cloud-deployer-local - 1.1.3.RELEASE - org.springframework.cloud spring-cloud-starter-task @@ -51,13 +46,13 @@ org.springframework.cloud spring-cloud-starter-stream-rabbit - 1.1.2.RELEASE + 1.2.0.RELEASE compile org.springframework.cloud spring-cloud-stream-test-support - 1.1.1.RELEASE + 1.2.1.RELEASE test diff --git a/spring-cloud-task-samples/tasksink/src/test/java/io/spring/TaskSinkApplicationTests.java b/spring-cloud-task-samples/tasksink/src/test/java/io/spring/TaskSinkApplicationTests.java index 8e900bb7..2849b0fb 100644 --- a/spring-cloud-task-samples/tasksink/src/test/java/io/spring/TaskSinkApplicationTests.java +++ b/spring-cloud-task-samples/tasksink/src/test/java/io/spring/TaskSinkApplicationTests.java @@ -16,16 +16,18 @@ package io.spring; +import java.io.IOException; import java.util.HashMap; import java.util.Map; -import io.spring.configuration.TaskSinkConfiguration; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.ArgumentCaptor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.cloud.deployer.spi.task.LaunchState; +import org.springframework.cloud.deployer.spi.core.AppDeploymentRequest; +import org.springframework.cloud.deployer.spi.task.TaskLauncher; import org.springframework.cloud.stream.messaging.Sink; import org.springframework.cloud.task.launcher.TaskLaunchRequest; import org.springframework.context.ApplicationContext; @@ -34,6 +36,8 @@ import org.springframework.test.context.junit4.SpringRunner; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.verify; /** * @author Glenn Renfro @@ -49,11 +53,11 @@ public class TaskSinkApplicationTests { private Sink sink; @Test - public void testLaunch() { + public void testLaunch() throws IOException { assertNotNull(this.sink.input()); - TaskSinkConfiguration.TestTaskLauncher testTaskLauncher = - context.getBean(TaskSinkConfiguration.TestTaskLauncher.class); + TaskLauncher testTaskLauncher = + context.getBean(TaskLauncher.class); Map properties = new HashMap(); properties.put("server.port", "0"); @@ -63,6 +67,16 @@ public class TaskSinkApplicationTests { null, null); GenericMessage message = new GenericMessage(request); this.sink.input().send(message); - assertEquals(LaunchState.complete, testTaskLauncher.status("TESTSTATUS").getState()); + + ArgumentCaptor deploymentRequest = ArgumentCaptor.forClass(AppDeploymentRequest.class); + + verify(testTaskLauncher).launch(deploymentRequest.capture()); + + AppDeploymentRequest actualRequest = deploymentRequest.getValue(); + + assertTrue(actualRequest.getCommandlineArguments().isEmpty()); + assertEquals("0", actualRequest.getDefinition().getProperties().get("server.port")); + assertTrue(actualRequest.getResource().toString() + .contains("maven://org.springframework.cloud.task.app:timestamp-task:jar:1.0.1.RELEASE")); } } diff --git a/spring-cloud-task-samples/tasksink/src/test/java/io/spring/configuration/TaskSinkConfiguration.java b/spring-cloud-task-samples/tasksink/src/test/java/io/spring/configuration/TaskSinkConfiguration.java index 3d7f2ea1..38ee8add 100644 --- a/spring-cloud-task-samples/tasksink/src/test/java/io/spring/configuration/TaskSinkConfiguration.java +++ b/spring-cloud-task-samples/tasksink/src/test/java/io/spring/configuration/TaskSinkConfiguration.java @@ -16,13 +16,12 @@ package io.spring.configuration; -import org.springframework.cloud.deployer.spi.core.AppDeploymentRequest; -import org.springframework.cloud.deployer.spi.task.LaunchState; import org.springframework.cloud.deployer.spi.task.TaskLauncher; -import org.springframework.cloud.deployer.spi.task.TaskStatus; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import static org.mockito.Mockito.mock; + /** * @author Glenn Renfro */ @@ -31,38 +30,7 @@ public class TaskSinkConfiguration { @Bean public TaskLauncher taskLauncher() { - return new TestTaskLauncher(); - } - - public class TestTaskLauncher implements TaskLauncher { - - public static final String LAUNCH_ID = "TEST_LAUNCH_ID"; - - private LaunchState state = LaunchState.unknown; - - @Override - public String launch(AppDeploymentRequest request) { - state = LaunchState.complete; - return null; - } - - @Override - public void cancel(String id) { - - } - - @Override - public TaskStatus status(String id) { - String taskLaunchId = LAUNCH_ID; - TaskStatus taskStatus = new TaskStatus(taskLaunchId, state, null); - return taskStatus; - } - - @Override - public void cleanup(String id) {} - - @Override - public void destroy(String appName) {} + return mock(TaskLauncher.class); } }