From 0ed6da6613136d38ca4bb3fca3f918e4be96dc20 Mon Sep 17 00:00:00 2001 From: Glenn Renfro Date: Fri, 12 Jan 2018 17:30:38 -0500 Subject: [PATCH] Resolves Test Failures for TaskLauncher and Task Start Tests resolves #339 --- .../cloud/task/executionid/TaskStartTests.java | 6 +++--- .../cloud/task/launcher/TaskLauncherSinkTests.java | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/spring-cloud-task-integration-tests/src/test/java/org/springframework/cloud/task/executionid/TaskStartTests.java b/spring-cloud-task-integration-tests/src/test/java/org/springframework/cloud/task/executionid/TaskStartTests.java index 7518ce67..beac5fe4 100644 --- a/spring-cloud-task-integration-tests/src/test/java/org/springframework/cloud/task/executionid/TaskStartTests.java +++ b/spring-cloud-task-integration-tests/src/test/java/org/springframework/cloud/task/executionid/TaskStartTests.java @@ -69,7 +69,7 @@ public class TaskStartTests { + "timestamp-task:jar:1.1.0.RELEASE"; private final static String DATASOURCE_URL; private final static String DATASOURCE_USER_NAME = "SA"; - private final static String DATASOURCE_USER_PASSWORD = ""; + 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"; @@ -211,7 +211,7 @@ public class TaskStartTests { public static class TaskLauncherConfiguration { private static Server defaultServer; - @Bean(destroyMethod = "stop") + @Bean() public Server initH2TCPServer() { Server server = null; try { @@ -224,7 +224,7 @@ public class TaskStartTests { catch (SQLException e) { throw new IllegalStateException(e); } - return server; + return defaultServer; } @Bean 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 7033c594..60e39623 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 @@ -64,10 +64,10 @@ public class TaskLauncherSinkTests { private final static int WAIT_INTERVAL = 500; private final static int MAX_WAIT_TIME = 10000; private final static String URL = "maven://io.spring.cloud:" - + "timestamp-task:jar:1.1.0.RELEASE"; + + "timestamp-task:jar:2.0.0.BUILD-SNAPSHOT"; private final static String DATASOURCE_URL; private final static String DATASOURCE_USER_NAME = "SA"; - private final static String DATASOURCE_USER_PASSWORD = ""; + 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";