Base Task Sink Case with Tests works

In process of migrating batch-events to streambridge

BatchEvents Migrated

Integration tests for TaskSink now work

Batch Event Integration Tests updated

Added tests to batch events

Event integration tests added

Updated with the last bit of tests

baseline polishing

Author: cppwfs

pom.xml

@@ -74,11 +74,6 @@
 				<version>${spring-cloud-deployer-local.version}</version>
 				<scope>test</scope>
 			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-stream-test-support-internal</artifactId>
-				<version>${spring-cloud-stream.version}</version>
-			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-starter-stream-rabbit</artifactId>
@@ -89,11 +84,6 @@
 				<artifactId>spring-cloud-stream</artifactId>
 				<version>${spring-cloud-stream.version}</version>
 			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-stream-test-support</artifactId>
-				<version>${spring-cloud-stream.version}</version>
-			</dependency>
 		</dependencies>
 	</dependencyManagement>
 

spring-cloud-task-integration-tests/pom.xml

@@ -41,11 +41,6 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-test-support-internal</artifactId>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-stream-rabbit</artifactId>
@@ -113,6 +108,19 @@
 			<version>${test.ducttape.version}</version>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-stream</artifactId>
+			<version>${spring-cloud-stream.version}</version>
+			<type>test-jar</type>
+			<classifier>test-binder</classifier>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-stream</artifactId>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 	<build>
 		<plugins>

spring-cloud-task-integration-tests/src/test/java/configuration/JobConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2021-2021 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.
@@ -32,6 +32,7 @@
 import org.springframework.batch.item.support.ListItemReader;
 import org.springframework.batch.repeat.RepeatStatus;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -40,6 +41,8 @@
  */
 @Configuration
 @EnableBatchProcessing
+@ConditionalOnProperty(prefix = "spring.cloud.task.test", name = "enable-job-configuration",
+	havingValue = "true")
 public class JobConfiguration {
 
 	private static final int DEFAULT_CHUNK_COUNT = 3;

spring-cloud-task-integration-tests/src/test/java/configuration/JobSkipConfiguration.java

@@ -27,6 +27,7 @@
 import org.springframework.batch.item.ItemProcessor;
 import org.springframework.batch.repeat.RepeatStatus;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -35,6 +36,7 @@
  */
 @Configuration
 @EnableBatchProcessing
+@ConditionalOnProperty(prefix = "spring.cloud.task.test", name = "enable-fail-job-configuration")
 public class JobSkipConfiguration {
 
 	@Autowired

spring-cloud-task-integration-tests/src/test/java/org/springframework/cloud/task/launcher/TaskLauncherSinkTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2021 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.
@@ -36,7 +36,7 @@
 import org.springframework.cloud.deployer.spi.local.LocalDeployerProperties;
 import org.springframework.cloud.deployer.spi.local.LocalTaskLauncher;
 import org.springframework.cloud.deployer.spi.task.TaskLauncher;
-import org.springframework.cloud.stream.messaging.Sink;
+import org.springframework.cloud.stream.function.StreamBridge;
 import org.springframework.cloud.task.launcher.app.TaskLauncherSinkApplication;
 import org.springframework.cloud.task.repository.TaskExecution;
 import org.springframework.cloud.task.repository.TaskExplorer;
@@ -62,15 +62,17 @@
 		classes = { TaskLauncherSinkApplication.class,
 				TaskLauncherSinkTests.TaskLauncherConfiguration.class },
 		properties = {
-				"maven.remote-repositories.repo1.url=https://repo.spring.io/libs-release" })
+			"maven.remote-repositories.repo1.url=https://repo.spring.io/libs-release",
+			"spring.cloud.stream.function.bindings.taskLauncherSink-in-0=input",
+			"spring.cloud.stream.bindings.input.destination=taskLauncherSinkExchange" })
 public class TaskLauncherSinkTests {
 
 	private final static int WAIT_INTERVAL = 500;
 
 	private final static int MAX_WAIT_TIME = 120000;
 
 	private final static String URL = "maven://org.springframework.cloud.task.app:"
-			+ "timestamp-task:2.0.0.RELEASE";
+			+ "timestamp-task:2.1.1.RELEASE";
 
 	private final static String DATASOURCE_URL;
 
@@ -96,7 +98,7 @@ public class TaskLauncherSinkTests {
 	}
 
 	@Autowired
-	private Sink sink;
+	private StreamBridge streamBridge;
 
 	private DataSource dataSource;
 
@@ -185,11 +187,10 @@ private boolean waitForTaskToComplete() throws Exception {
 	}
 
 	private void launchTask(String artifactURL) {
-
 		TaskLaunchRequest request = new TaskLaunchRequest(artifactURL, null,
 				this.properties, null, null);
 		GenericMessage<TaskLaunchRequest> message = new GenericMessage<>(request);
-		this.sink.input().send(message);
+		this.streamBridge.send("taskLauncherSinkExchange", message);
 	}
 
 	@Configuration