From e8617bcce5f2d84545ea854b35f1f1a8d024ff3c Mon Sep 17 00:00:00 2001
From: Kris De Volder <kdevolder@pivotal.io>
Date: Mon, 26 Jun 2017 12:58:48 -0700
Subject: [PATCH] Detect concflict between random-route and routes

---
 .../manifest/yaml/ManifestYmlSchema.java      |  3 +-
 .../manifest/yaml/ManifestYamlEditorTest.java | 54 +++++++++++++++++--
 2 files changed, 51 insertions(+), 6 deletions(-)

diff --git a/headless-services/manifest-yaml-language-server/src/main/java/org/springframework/ide/vscode/manifest/yaml/ManifestYmlSchema.java b/headless-services/manifest-yaml-language-server/src/main/java/org/springframework/ide/vscode/manifest/yaml/ManifestYmlSchema.java
index 1d6c1cb1f..a662de7fc 100644
--- a/headless-services/manifest-yaml-language-server/src/main/java/org/springframework/ide/vscode/manifest/yaml/ManifestYmlSchema.java
+++ b/headless-services/manifest-yaml-language-server/src/main/java/org/springframework/ide/vscode/manifest/yaml/ManifestYmlSchema.java
@@ -113,7 +113,8 @@ public class ManifestYmlSchema implements YamlSchema {
 		AbstractType application = f.ybean("Application");
 		application.require(this::verify_heatth_check_http_end_point_constraint);
 		application.require(
-				ManifestConstraints.mutuallyExclusive("routes", "domain", "domains", "host", "hosts", "no-hostname"));
+				ManifestConstraints.mutuallyExclusive("routes", "domain", "domains", "host", "hosts", "no-hostname", "random-route"));
+
 		YAtomicType t_path = f.yatomic("Path");
 
 		YAtomicType t_buildpack = f.yatomic("Buildpack");
diff --git a/headless-services/manifest-yaml-language-server/src/test/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlEditorTest.java b/headless-services/manifest-yaml-language-server/src/test/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlEditorTest.java
index cdc536611..91512fa59 100644
--- a/headless-services/manifest-yaml-language-server/src/test/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlEditorTest.java
+++ b/headless-services/manifest-yaml-language-server/src/test/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlEditorTest.java
@@ -583,7 +583,7 @@ public class ManifestYamlEditorTest {
 		editor.assertProblems(
 				"no-hostname|Property cannot co-exist with property 'routes'",
 				"routes|Property cannot co-exist with properties [no-hostname]"
-			);
+		);
 
 		editor = harness.newEditor(
 				"no-hostname: true\n" +
@@ -599,7 +599,7 @@ public class ManifestYamlEditorTest {
 				"no-hostname|Property cannot co-exist with property 'routes'",
 				"no-hostname|Property cannot co-exist with property 'routes'",
 				"routes|Property cannot co-exist with properties [no-hostname]"
-			);
+		);
 
 		editor = harness.newEditor(
 				"no-hostname: true\n" +
@@ -615,7 +615,7 @@ public class ManifestYamlEditorTest {
 				"no-hostname|Property cannot co-exist with property 'routes'",
 				"host|Property cannot co-exist with property 'routes'",
 				"routes|Property cannot co-exist with properties [host, no-hostname]"
-			);
+		);
 
 		editor = harness.newEditor(
 				"no-hostname: true\n" +
@@ -633,8 +633,52 @@ public class ManifestYamlEditorTest {
 				"no-hostname|Property cannot co-exist with property 'routes'",
 				"routes|Property cannot co-exist with properties [no-hostname]",
 				"routes|Property cannot co-exist with properties [no-hostname]"
-			);
-}
+		);
+	}
+
+	@Test public void randomRoutesWithRoutesValidation() throws Exception {
+		Editor editor;
+
+		editor = harness.newEditor(
+				"applications:\n" +
+				"- name: moriarty-app\n" +
+				"  random-route: true\n" +
+				"  routes:\n" +
+				"  - route: tcp.local2.pcfdev.io:61001"
+		);
+		editor.ignoreProblem("UnknownDomainProblem");
+		editor.assertProblems(
+				"random-route|Property cannot co-exist with property 'routes'",
+				"routes|Property cannot co-exist with properties [random-route]"
+		);
+
+		editor = harness.newEditor(
+				"random-route: true\n" +
+				"applications:\n" +
+				"- name: moriarty-app\n" +
+				"  routes:\n" +
+				"  - route: tcp.local2.pcfdev.io:61001"
+		);
+		editor.ignoreProblem("UnknownDomainProblem");
+		editor.assertProblems(
+				"random-route|Property cannot co-exist with property 'routes'",
+				"routes|Property cannot co-exist with properties [random-route]"
+		);
+
+		editor = harness.newEditor(
+				"random-route: true\n" +
+				"applications:\n" +
+				"- name: moriarty-app\n" +
+				"  routes:\n" +
+				"  - route: tcp.local2.pcfdev.io:61001"
+		);
+		editor.ignoreProblem("UnknownDomainProblem");
+		editor.assertProblems(
+				"random-route|Property cannot co-exist with property 'routes'",
+				"routes|Property cannot co-exist with properties [random-route]"
+		);
+
+	}
 
 	@Test public void deprecatedHealthCheckTypeQuickfix() throws Exception {
 		Editor editor = harness.newEditor(