Spring/spring-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix test failures

Browse Source
This commit is contained in:
Kris De Volder
2019-07-24 15:31:23 -07:00
parent 89d79d9067
commit ef63d13226
2 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/yaml/reconcile/ApplicationYamlASTReconciler.java
View File

@@ -155,6 +155,10 @@ public class ApplicationYamlASTReconciler implements YamlASTReconciler {
IndexNavigator subNavAlias = nav.selectSubProperty(key);
match = subNavAlias.getExactMatch();
extension = subNavAlias.getExtensionCandidate();
if (subNav==null) {
//ensure subnav is not null, even if no real matches found.
subNav = subNavAlias;
}
if (match!=null || extension!=null) {
subNav = subNavAlias;
break; //stop at first alias that gives a result.

28
headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/test/ApplicationYamlEditorTest.java
View File

@@ -78,20 +78,6 @@ public class ApplicationYamlEditorTest extends AbstractPropsEditorTest {
Editor editor;
//Also check whether reconciler understands the structure when inside of a 'relaxed' name key
editor = harness.newEditor(
"spring:\n" +
" resources:\n" +
" static_locations: bad\n" +
" devtools:\n" +
" restart:\n" +
" additional_paths: wrong\n"
);
editor.assertProblems(
"bad|boolean", //TODO: fill in proper expected message instead of XXXX
"wrong|boolean" //TODO: fill in proper expected message instead of XXXX
);
// basic check
editor = harness.newEditor(
"spring:\n" +
@@ -102,6 +88,20 @@ public class ApplicationYamlEditorTest extends AbstractPropsEditorTest {
" additional_paths: false\n"
);
editor.assertProblems(/*NONE*/);
//Also check whether reconciler understands the structure when inside of a 'relaxed' name key
editor = harness.newEditor(
"spring:\n" +
" resources:\n" +
" static_locations: bad\n" +
" devtools:\n" +
" restart:\n" +
" additional_paths: wrong\n"
);
editor.assertProblems(
"bad|boolean",
"wrong|boolean"
);
}
@Test public void bug_165724475() throws Exception {