From cb5a191fe0ec25d7138f1cd8acb5366fac88c1bf Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <marcin.grzejszczak@gmail.com>
Date: Thu, 25 Jun 2020 12:50:43 +0200
Subject: [PATCH] Fixed broken tests

---
 .../GenerateReleaseTrainDocsTests.java        | 26 +++++++------
 train-docs/src/test/resources/test/pom.xml    | 39 +++++++++----------
 2 files changed, 34 insertions(+), 31 deletions(-)

diff --git a/train-docs/src/test/java/org/springframework/cloud/internal/GenerateReleaseTrainDocsTests.java b/train-docs/src/test/java/org/springframework/cloud/internal/GenerateReleaseTrainDocsTests.java
index 1abe59c..da697a3 100644
--- a/train-docs/src/test/java/org/springframework/cloud/internal/GenerateReleaseTrainDocsTests.java
+++ b/train-docs/src/test/java/org/springframework/cloud/internal/GenerateReleaseTrainDocsTests.java
@@ -38,16 +38,19 @@ public class GenerateReleaseTrainDocsTests {
 		List<Project> projects = new GenerateReleaseTrainDocs()
 				.mavenPropertiesToDocsProjects(testPom);
 
-		BDDAssertions.then(projects).extracting("name").containsOnly("spring-cloud-bus",
-				"spring-cloud-build", "spring-cloud-cloudfoundry", "spring-cloud-commons",
-				"spring-cloud-circuitbreaker", "spring-cloud-config",
-				"spring-cloud-consul", "spring-cloud-contract", "spring-cloud-function",
-				"spring-cloud-gateway", "spring-cloud-kubernetes", "spring-cloud-netflix",
-				"spring-cloud-openfeign", "spring-cloud-security", "spring-cloud-sleuth",
-				"spring-cloud-task", "spring-cloud-vault", "spring-cloud-zookeeper",
-				"spring-cloud-cli");
+		BDDAssertions.then(projects).extracting("name").containsOnly(
+				"spring-cloud-foo-bus", "spring-cloud-foo-build",
+				"spring-cloud-foo-cloudfoundry", "spring-cloud-foo-commons",
+				"spring-cloud-foo-circuitbreaker", "spring-cloud-foo-config",
+				"spring-cloud-foo-consul", "spring-cloud-foo-contract",
+				"spring-cloud-foo-function", "spring-cloud-foo-gateway",
+				"spring-cloud-foo-kubernetes", "spring-cloud-foo-netflix",
+				"spring-cloud-foo-openfeign", "spring-cloud-foo-security",
+				"spring-cloud-foo-sleuth", "spring-cloud-foo-task",
+				"spring-cloud-foo-vault", "spring-cloud-foo-zookeeper",
+				"spring-cloud-foo-cli");
 		BDDAssertions.then(projects)
-				.contains(new Project("spring-cloud-bus", "1.2.3-SNAPSHOT"));
+				.contains(new Project("spring-cloud-foo-bus", "2.2.3.BUILD-SNAPSHOT"));
 	}
 
 	@Test
@@ -68,8 +71,9 @@ public class GenerateReleaseTrainDocsTests {
 	void should_generate_adocs_from_templates() {
 		File file = new File("target/test-train-docs");
 		FileSystemUtils.deleteRecursively(file);
-		List<Project> projects = Arrays.asList(new Project("spring-cloud-foo", "1.0.0"),
-				new Project("spring-cloud-bar", "2.0.0"),
+		List<Project> projects = Arrays.asList(
+				new Project("spring-cloud-foo-foo", "1.0.0"),
+				new Project("spring-cloud-foo-bar", "2.0.0"),
 				new Project("spring-boot", "3.0.0"),
 				new Project("spring-cloud", "4.0.0"));
 		List<ConfigurationProperty> configurationProperties = Arrays.asList(
diff --git a/train-docs/src/test/resources/test/pom.xml b/train-docs/src/test/resources/test/pom.xml
index fc3f97c..e7c3257 100644
--- a/train-docs/src/test/resources/test/pom.xml
+++ b/train-docs/src/test/resources/test/pom.xml
@@ -15,26 +15,25 @@
 	<packaging>pom</packaging>
 	<properties>
 		<main.basedir>${basedir}/../..</main.basedir>
-		<spring-cloud-bus.version>2.2.3.BUILD-SNAPSHOT</spring-cloud-bus.version>
-		<spring-cloud-build.version>2.3.1.BUILD-SNAPSHOT</spring-cloud-build.version>
-		<spring-cloud-cloudfoundry.version>2.2.3.BUILD-SNAPSHOT</spring-cloud-cloudfoundry.version>
-		<spring-cloud-commons.version>2.2.4.BUILD-SNAPSHOT</spring-cloud-commons.version>
-		<spring-cloud-circuitbreaker.version>1.0.4.BUILD-SNAPSHOT</spring-cloud-circuitbreaker.version>
-		<spring-cloud-config.version>2.2.4.BUILD-SNAPSHOT</spring-cloud-config.version>
-		<spring-cloud-consul.version>2.2.4.BUILD-SNAPSHOT</spring-cloud-consul.version>
-		<spring-cloud-contract.version>2.2.4.BUILD-SNAPSHOT</spring-cloud-contract.version>
-		<spring-cloud-function.version>3.0.8.RELEASE</spring-cloud-function.version>
-		<spring-cloud-gateway.version>2.2.4.BUILD-SNAPSHOT</spring-cloud-gateway.version>
-		<spring-cloud-kubernetes.version>1.1.4.BUILD-SNAPSHOT</spring-cloud-kubernetes.version>
-		<spring-cloud-netflix.version>2.2.4.BUILD-SNAPSHOT</spring-cloud-netflix.version>
-		<spring-cloud-openfeign.version>2.2.4.BUILD-SNAPSHOT</spring-cloud-openfeign.version>
-		<spring-cloud-security.version>2.2.3.BUILD-SNAPSHOT</spring-cloud-security.version>
-		<spring-cloud-sleuth.version>2.2.4.BUILD-SNAPSHOT</spring-cloud-sleuth.version>
-		<spring-cloud-stream.version>Horsham.SR6</spring-cloud-stream.version>
-		<spring-cloud-task.version>2.2.3.RELEASE</spring-cloud-task.version>
-		<spring-cloud-vault.version>2.2.4.BUILD-SNAPSHOT</spring-cloud-vault.version>
-		<spring-cloud-zookeeper.version>2.2.3.BUILD-SNAPSHOT</spring-cloud-zookeeper.version>
-		<spring-cloud-cli.version>2.2.1.RELEASE</spring-cloud-cli.version>
+		<spring-cloud-foo-bus.version>2.2.3.BUILD-SNAPSHOT</spring-cloud-foo-bus.version>
+		<spring-cloud-foo-build.version>2.3.1.BUILD-SNAPSHOT</spring-cloud-foo-build.version>
+		<spring-cloud-foo-cloudfoundry.version>2.2.3.BUILD-SNAPSHOT</spring-cloud-foo-cloudfoundry.version>
+		<spring-cloud-foo-commons.version>2.2.4.BUILD-SNAPSHOT</spring-cloud-foo-commons.version>
+		<spring-cloud-foo-circuitbreaker.version>1.0.4.BUILD-SNAPSHOT</spring-cloud-foo-circuitbreaker.version>
+		<spring-cloud-foo-config.version>2.2.4.BUILD-SNAPSHOT</spring-cloud-foo-config.version>
+		<spring-cloud-foo-consul.version>2.2.4.BUILD-SNAPSHOT</spring-cloud-foo-consul.version>
+		<spring-cloud-foo-contract.version>2.2.4.BUILD-SNAPSHOT</spring-cloud-foo-contract.version>
+		<spring-cloud-foo-function.version>3.0.8.RELEASE</spring-cloud-foo-function.version>
+		<spring-cloud-foo-gateway.version>2.2.4.BUILD-SNAPSHOT</spring-cloud-foo-gateway.version>
+		<spring-cloud-foo-kubernetes.version>1.1.4.BUILD-SNAPSHOT</spring-cloud-foo-kubernetes.version>
+		<spring-cloud-foo-netflix.version>2.2.4.BUILD-SNAPSHOT</spring-cloud-foo-netflix.version>
+		<spring-cloud-foo-openfeign.version>2.2.4.BUILD-SNAPSHOT</spring-cloud-foo-openfeign.version>
+		<spring-cloud-foo-security.version>2.2.3.BUILD-SNAPSHOT</spring-cloud-foo-security.version>
+		<spring-cloud-foo-sleuth.version>2.2.4.BUILD-SNAPSHOT</spring-cloud-foo-sleuth.version>
+		<spring-cloud-foo-task.version>2.2.3.RELEASE</spring-cloud-foo-task.version>
+		<spring-cloud-foo-vault.version>2.2.4.BUILD-SNAPSHOT</spring-cloud-foo-vault.version>
+		<spring-cloud-foo-zookeeper.version>2.2.3.BUILD-SNAPSHOT</spring-cloud-foo-zookeeper.version>
+		<spring-cloud-foo-cli.version>2.2.1.RELEASE</spring-cloud-foo-cli.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>