From 515b13333732775d3ff0ef0e737e940f14334618 Mon Sep 17 00:00:00 2001 From: aboyko Date: Mon, 28 Aug 2023 22:05:27 -0400 Subject: [PATCH] Attempt to fix failing test --- .../boot/java/utils/test/XmlBeansHyperlinkTest.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/utils/test/XmlBeansHyperlinkTest.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/utils/test/XmlBeansHyperlinkTest.java index 170c9aa93..d77b734b2 100644 --- a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/utils/test/XmlBeansHyperlinkTest.java +++ b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/utils/test/XmlBeansHyperlinkTest.java @@ -56,6 +56,7 @@ import com.google.gson.Gson; @DirtiesContext(classMode=ClassMode.AFTER_EACH_TEST_METHOD) public class XmlBeansHyperlinkTest { + private static final int DEFAULT_INDEX_WAIT_TIME = 5; @Autowired private BootLanguageServerHarness harness; @Autowired private SpringSymbolIndex indexer; @Autowired private DefinitionLinkAsserts definitionLinkAsserts; @@ -86,7 +87,7 @@ public class XmlBeansHyperlinkTest { projectObserver.doWithListeners(l -> l.created(project)); CompletableFuture initProject = indexer.waitOperation(); - initProject.get(5, TimeUnit.SECONDS); + initProject.get(DEFAULT_INDEX_WAIT_TIME, TimeUnit.SECONDS); } @Test @@ -140,6 +141,7 @@ public class XmlBeansHyperlinkTest { "\n", UriUtil.toUri(xmlFilePath.toFile()).toString() ); + definitionLinkAsserts.assertLinkTargets(editor, "message", project, editor.rangeOf("", "message"), DefinitionLinkAsserts.method("u.t.r.SuperTestBean", "setMessage", "java.lang.String")); @@ -183,6 +185,8 @@ public class XmlBeansHyperlinkTest { settings.put("boot-java", bootJavaObj); harness.getServer().getWorkspaceService().didChangeConfiguration(new DidChangeConfigurationParams(new Gson().toJsonTree(settings))); + CompletableFuture initProject = indexer.waitOperation(); + initProject.get(DEFAULT_INDEX_WAIT_TIME, TimeUnit.SECONDS); Path xmlFilePath = Paths.get(project.getLocationUri()).resolve("beans.xml"); Editor editor = harness.newEditor(LanguageId.XML, @@ -216,6 +220,8 @@ public class XmlBeansHyperlinkTest { settings.put("boot-java", bootJavaObj); harness.getServer().getWorkspaceService().didChangeConfiguration(new DidChangeConfigurationParams(new Gson().toJsonTree(settings))); + CompletableFuture initProject = indexer.waitOperation(); + initProject.get(DEFAULT_INDEX_WAIT_TIME, TimeUnit.SECONDS); Path xmlFilePath = Paths.get(project.getLocationUri()).resolve("beans.xml"); Editor editor = harness.newEditor(LanguageId.XML, @@ -253,6 +259,8 @@ public class XmlBeansHyperlinkTest { settings.put("boot-java", bootJavaObj); harness.getServer().getWorkspaceService().didChangeConfiguration(new DidChangeConfigurationParams(new Gson().toJsonTree(settings))); + CompletableFuture initProject = indexer.waitOperation(); + initProject.get(DEFAULT_INDEX_WAIT_TIME, TimeUnit.SECONDS); Path xmlFilePath = Paths.get(project.getLocationUri()).resolve("beans.xml"); Editor editor = harness.newEditor(LanguageId.XML, @@ -280,6 +288,8 @@ public class XmlBeansHyperlinkTest { settings.put("boot-java", bootJavaObj); harness.getServer().getWorkspaceService().didChangeConfiguration(new DidChangeConfigurationParams(new Gson().toJsonTree(settings))); + CompletableFuture initProject = indexer.waitOperation(); + initProject.get(DEFAULT_INDEX_WAIT_TIME, TimeUnit.SECONDS); Path xmlFilePath = Paths.get(project.getLocationUri()).resolve("beans.xml"); Editor editor = harness.newEditor(LanguageId.XML,