From d601b0427d38aaaa3a6d344cab1f7e8530edc1c6 Mon Sep 17 00:00:00 2001 From: Kris De Volder Date: Wed, 12 Apr 2017 16:11:33 -0700 Subject: [PATCH] Fix failing tests --- .../languageserver/util/SimpleLanguageServer.java | 2 +- .../testharness/LanguageServerHarness.java | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SimpleLanguageServer.java b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SimpleLanguageServer.java index d95db5b21..b827f173e 100644 --- a/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SimpleLanguageServer.java +++ b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SimpleLanguageServer.java @@ -64,7 +64,7 @@ public abstract class SimpleLanguageServer implements LanguageServer, LanguageCl private static final Scheduler RECONCILER_SCHEDULER = Schedulers.newSingle("Reconciler"); - private final String EXTENSION_ID; + public final String EXTENSION_ID; private Path workspaceRoot; diff --git a/headless-services/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/LanguageServerHarness.java b/headless-services/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/LanguageServerHarness.java index 302c1055c..88c9a7d17 100644 --- a/headless-services/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/LanguageServerHarness.java +++ b/headless-services/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/LanguageServerHarness.java @@ -439,20 +439,22 @@ public class LanguageServerHarness { ObjectMapper mapper = new ObjectMapper(); public void perform(Command command) throws Exception { - switch (command.getCommand()) { - case "sts.quickfix": + if (getQuickfixCommandId().equals(command.getCommand())) { List args = command.getArguments(); assertEquals(2, args.size()); //Note convert the value to a 'typeless' Object becaus that is more representative on how it will be // received when we get it in a real client/server setting (i.e. parsed from json). Object untypedParams = mapper.convertValue(args.get(1), Object.class); perform(server.quickfixResolve(new QuickfixResolveParams((String)args.get(0), untypedParams)).get()); - return; - default: + } else { throw new IllegalArgumentException("Unknown command: "+command); } } + private String getQuickfixCommandId() { + return "sts.quickfix."+server.EXTENSION_ID; + } + private void perform(WorkspaceEdit workspaceEdit) throws Exception { Assert.isNull("Versioned WorkspaceEdits not supported", workspaceEdit.getDocumentChanges()); for (Entry> entry : workspaceEdit.getChanges().entrySet()) {