From c8abce640a6f72a35e2759d062ca3d80c7141f75 Mon Sep 17 00:00:00 2001 From: Kris De Volder Date: Tue, 5 Feb 2019 15:06:25 -0800 Subject: [PATCH] Add more testcases for yaml merge-node reconciling --- .../vscode/concourse/ConcourseEditorTest.java | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/headless-services/concourse-language-server/src/test/java/org/springframework/ide/vscode/concourse/ConcourseEditorTest.java b/headless-services/concourse-language-server/src/test/java/org/springframework/ide/vscode/concourse/ConcourseEditorTest.java index 87bd528c7..3dd75ef16 100644 --- a/headless-services/concourse-language-server/src/test/java/org/springframework/ide/vscode/concourse/ConcourseEditorTest.java +++ b/headless-services/concourse-language-server/src/test/java/org/springframework/ide/vscode/concourse/ConcourseEditorTest.java @@ -4944,6 +4944,39 @@ public class ConcourseEditorTest { ); } + @Test + public void reconcileMalformedMergeNode() throws Exception { + Editor editor = harness.newEditor( + "resources:\n" + + "- name: foo\n" + + " type: git\n" + + " source:\n" + + " <<: scalar\n" + ); + editor.assertProblems( + "foo|Unused", + "source|'uri' is required", + "scalar|Expected a mapping or list of mappings" + ); + } + + @Test + public void reconcileMalformedMergeNodeList() throws Exception { + Editor editor = harness.newEditor( + "resources:\n" + + "- name: foo\n" + + " type: git\n" + + " source:\n" + + " <<:\n" + + " - scalar\n" + ); + editor.assertProblems( + "foo|Unused", + "source|'uri' is required", + "scalar|Expected a mapping for merging" + ); + } + @Test public void anchorsAndReferenceSample_1() throws Exception { Editor editor = harness.newEditor(