fix: refresh test discovery when source paths change

Author: sudovinay01

src/controller/testController.ts

@@ -41,9 +41,7 @@ export function createTestController(): void {
     testController.createRunProfile('Debug Tests', TestRunProfileKind.Debug, runHandler, true, runnableTag);
     testController.createRunProfile('Run Tests with Coverage', TestRunProfileKind.Coverage, runHandler, true, runnableTag);
 
-    testController.refreshHandler = () => {
-        refreshExplorer();
-    }
+    testController.refreshHandler = () => refreshTestSourcePaths();
 
     startWatchingWorkspace();
 }
@@ -52,6 +50,12 @@ export function creatTestProfile(name: string, kind: TestRunProfileKind): void {
     testController?.createRunProfile(name, kind, runHandler, false, runnableTag);
 }
 
+export async function refreshTestSourcePaths(): Promise<void> {
+    testSourceProvider.clear();
+    await refreshExplorer();
+    await startWatchingWorkspace();
+}
+
 export const loadChildren: (item: TestItem, token?: CancellationToken, force?: boolean) => Promise<void> = instrumentOperation('java.test.explorer.loadChildren', async (_operationId: string, item: TestItem, token?: CancellationToken, force: boolean = false) => {
     if (!item) {
         await loadJavaProjects();
@@ -153,7 +157,7 @@ async function startWatchingWorkspace(): Promise<void> {
         return;
     }
 
-    for (const disposable of watchers) {
+    for (const disposable of watchers.splice(0)) {
         disposable.dispose();
     }
 

src/extension.ts

@@ -2,15 +2,15 @@
 // Licensed under the MIT license.
 
 import * as path from 'path';
-import { commands, DebugConfiguration, Event, Extension, ExtensionContext, extensions, TestItem, TestRunProfileKind, TextDocument, TextDocumentChangeEvent, TextEditor, Uri, window, workspace, WorkspaceFoldersChangeEvent } from 'vscode';
+import { commands, ConfigurationChangeEvent, DebugConfiguration, Event, Extension, ExtensionContext, extensions, TestItem, TestRunProfileKind, TextDocument, TextDocumentChangeEvent, TextEditor, Uri, window, workspace, WorkspaceFoldersChangeEvent } from 'vscode';
 import { dispose as disposeTelemetryWrapper, initializeFromJsonFile, instrumentOperation, instrumentOperationAsVsCodeCommand } from 'vscode-extension-telemetry-wrapper';
 import { navigateToTestOrTarget } from './commands/navigation/navigationCommands';
 import { generateTests } from './commands/generationCommands';
 import { runTestsFromJavaProjectExplorer } from './commands/projectExplorerCommands';
 import { refreshExplorer, refreshProject, runTestsFromTestExplorer } from './commands/testExplorerCommands';
 import { openStackTrace } from './commands/testReportCommands';
 import { Context, ExtensionName, JavaTestRunnerCommands, VSCodeCommands } from './constants';
-import { createTestController, testController, watchers } from './controller/testController';
+import { createTestController, refreshTestSourcePaths, testController, watchers } from './controller/testController';
 import { updateItemForDocument, updateItemForDocumentWithDebounce } from './controller/utils';
 import { IProgressProvider } from './debugger.api';
 import { initExpService } from './experimentationService';
@@ -131,6 +131,11 @@ function registerComponents(context: ExtensionContext): void {
                 await updateItemForDocumentWithDebounce(e.document.uri);
             }
         }),
+        workspace.onDidChangeConfiguration(async (event: ConfigurationChangeEvent) => {
+            if (event.affectsConfiguration('java.test.additionalTestSourcePaths')) {
+                await refreshTestSourcePaths();
+            }
+        }),
         workspace.onDidChangeWorkspaceFolders(async (e: WorkspaceFoldersChangeEvent) => {
             for (const deletedFolder of e.removed) {
                 testSourceProvider.delete(deletedFolder.uri);

test/suite/testController.loadChildren.test.ts

@@ -4,11 +4,13 @@
 import * as assert from 'assert';
 import * as sinon from 'sinon';
 import { CancellationTokenSource, TestController, TestItem, tests, Uri } from 'vscode';
-import { loadChildren } from '../../src/controller/testController';
+import { loadChildren, refreshTestSourcePaths } from '../../src/controller/testController';
 import { dataCache, invalidateResolutionVersion } from '../../src/controller/testItemDataCache';
 import * as controllerUtils from '../../src/controller/utils';
+import * as testExplorerCommands from '../../src/commands/testExplorerCommands';
 import { TestKind, TestLevel } from '../../src/java-test-runner.api';
 import { IJavaTestItem } from '../../src/types';
+import { testSourceProvider } from '../../src/provider/testSourceProvider';
 import { setupTestEnv } from './utils';
 
 function createTestItem(testController: TestController, id: string, testLevel: TestLevel,
@@ -43,6 +45,17 @@ suite('testController - loadChildren', () => {
         testController.dispose();
     });
 
+    test('refreshes test source paths after clearing cached discovery paths', async () => {
+        const clearPathsStub = sinon.stub(testSourceProvider, 'clear');
+        const refreshExplorerStub = sinon.stub(testExplorerCommands, 'refreshExplorer').resolves();
+        const watcherPatternsStub = sinon.stub(testSourceProvider, 'getTestSourcePattern').resolves([]);
+        const additionalPathsStub = sinon.stub(testSourceProvider, 'getAdditionalTestSourcePaths').resolves([]);
+
+        await refreshTestSourcePaths();
+
+        sinon.assert.callOrder(clearPathsStub, refreshExplorerStub, watcherPatternsStub, additionalPathsStub);
+    });
+
     test('should reuse resolved project children until a forced refresh', async () => {
         const project: TestItem = createTestItem(testController, 'project', TestLevel.Project);
         const findTestsStub = sinon.stub(controllerUtils, 'findTestPackagesAndTypes').resolves([]);