Fix tests

microsoft · Apr 12, 2023 · 2d6b4dc · 2d6b4dc
1 parent f6c5f4a
commit 2d6b4dc
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/extension.bundle.ts b/extension.bundle.ts
@@ -28,3 +28,6 @@ export { languageServerApiManager } from "./src/languageServerApi/languageServer
 
 // tasks
 export { BuildTaskProvider, categorizePaths, getFinalPaths } from "./src/tasks/build/buildTaskProvider";
+
+// delegate commands
+export { Jdtls } from "./src/java/jdtls";
diff --git a/jdtls.ext/com.microsoft.jdtls.ext.core/src/com/microsoft/jdtls/ext/core/ProjectCommand.java b/jdtls.ext/com.microsoft.jdtls.ext.core/src/com/microsoft/jdtls/ext/core/ProjectCommand.java
@@ -100,7 +100,10 @@ public static List<PackageNode> listProjects(List<Object> arguments, IProgressMo
         IPath workspaceFolderPath = ResourceUtils.canonicalFilePathFromURI(workspaceUri);
 
         IProject[] projects;
-        boolean includeNonJava = (boolean) arguments.get(1);
+        boolean includeNonJava = false;
+        if (arguments.size() > 1) {
+            includeNonJava = (boolean) arguments.get(1);
+        }
         if (includeNonJava) {
             projects = ProjectUtils.getAllProjects();
         } else {

diff --git a/test/maven-suite/projectView.test.ts b/test/maven-suite/projectView.test.ts
@@ -5,8 +5,8 @@ import * as assert from "assert";
 import * as clipboardy from "clipboardy";
 import * as path from "path";
 import * as vscode from "vscode";
-import { Commands, ContainerNode, contextManager, DataNode, DependencyExplorer, FileNode, IMainClassInfo,
-    INodeData, NodeKind, PackageNode, PackageRootNode, PrimaryTypeNode, ProjectNode } from "../../extension.bundle";
+import { Commands, ContainerNode, contextManager, DataNode, DependencyExplorer, FileNode,
+    INodeData, Jdtls, NodeKind, PackageNode, PackageRootNode, PrimaryTypeNode, ProjectNode } from "../../extension.bundle";
 import { fsPath, setupTestEnv, Uris } from "../shared";
 import { sleep } from "../util";
 
@@ -175,8 +175,7 @@ suite("Maven Project View Tests", () => {
     test("Can execute command java.project.list correctly", async function() {
         const workspaceFolders = vscode.workspace.workspaceFolders;
         assert.ok(workspaceFolders, `There should be valid workspace folders`);
-        const projects = await vscode.commands.executeCommand<INodeData[]>(Commands.EXECUTE_WORKSPACE_COMMAND,
-            Commands.JAVA_PROJECT_LIST, workspaceFolders![0].uri.toString());
+        const projects = await Jdtls.getProjects(workspaceFolders![0].uri.toString());
         assert.equal(projects?.length, 1, "project's length should be 1");
         assert.equal(projects![0].name, "my-app", "project should be my-app");
     });
@@ -217,8 +216,7 @@ suite("Maven Project View Tests", () => {
     test("Can execute command java.project.getMainClasses correctly", async function() {
         const workspaceFolders = vscode.workspace.workspaceFolders;
         assert.ok(workspaceFolders, `There should be valid workspace folders`);
-        const mainClasses = await vscode.commands.executeCommand<IMainClassInfo[]>(Commands.EXECUTE_WORKSPACE_COMMAND,
-            Commands.JAVA_PROJECT_GETMAINCLASSES, workspaceFolders![0].uri.toString());
+        const mainClasses = await Jdtls.getMainClasses(workspaceFolders![0].uri.toString());
         assert.equal(mainClasses?.length, 1, "mainClasses' length should be 1");
         assert.equal(mainClasses![0].name, "com.mycompany.app.App", "mainClasses[0]'s name should be com.mycompany.app.App");
     });