test/integration/goTest: fix populateModulePathCache

And reenable affected tests.

The tests were broken due to a bug in composing the file Uris for
files in a directory from the directory Uri. path.join uses the
platform specific separator (\ on windows). To ensure the correct
encoding, convert the directory Uri to its fsPath, construct the
file path of the file, and convert the file path to Uri.

For #832
For #1788

Change-Id: I3dfc44e04f1683b1b862b339b7257b432c3f2241
Reviewed-on: https://go-review.googlesource.com/c/vscode-go/+/418545
Reviewed-by: Suzy Mueller <[email protected]>
Run-TryBot: Hyang-Ah Hana Kim <[email protected]>
TryBot-Result: kokoro <[email protected]>
Reviewed-by: Hyang-Ah Hana Kim <[email protected]>

Author: hyangah

src/goModules.ts

@@ -48,8 +48,12 @@ export function isModSupported(fileuri?: vscode.Uri, isDir?: boolean): Promise<b
 	return getModFolderPath(fileuri, isDir).then((modPath) => !!modPath);
 }
 
+// packagePathToGoModPathMap is a cache that maps from a file path (of a package directory)
+// to the module root directory path (directory of `go env GOMOD`) if the file belongs to a module.
 export const packagePathToGoModPathMap: { [key: string]: string } = {};
 
+// getModFolderPath returns the module root of the file. '' or undefined value indicates
+// the file is outside of any module or Go module is disabled.
 export async function getModFolderPath(fileuri?: vscode.Uri, isDir?: boolean): Promise<string | undefined> {
 	const pkgUri = isDir ? fileuri : fileuri && vscodeUri.Utils.dirname(fileuri);
 	const pkgPath = pkgUri?.fsPath ?? '';

test/integration/goTest.explore.test.ts

@@ -57,9 +57,6 @@ async function forceResolve(resolver: GoTestResolver, item?: TestItem) {
 
 suite('Go Test Explorer', () => {
 	suite('Document opened', () => {
-		if (affectedByIssue832()) {
-			return;
-		}
 		class DUT extends GoTestExplorer {
 			async _didOpen(doc: TextDocument) {
 				await this.didOpenTextDocument(doc);
@@ -117,9 +114,6 @@ suite('Go Test Explorer', () => {
 	});
 
 	suite('Document edited', async () => {
-		if (affectedByIssue832()) {
-			return;
-		}
 		class DUT extends GoTestExplorer {
 			async _didOpen(doc: TextDocument) {
 				await this.didOpenTextDocument(doc);

test/integration/goTest.resolve.test.ts

@@ -8,7 +8,6 @@ import { GoTestResolver } from '../../src/goTest/resolve';
 import { GoTest, GoTestKind } from '../../src/goTest/utils';
 import { MockTestController, MockTestWorkspace } from '../mocks/MockTest';
 import { getSymbols_Regex, populateModulePathCache } from './goTest.utils';
-import { affectedByIssue832 } from './testutils';
 
 type Files = Record<string, string | { contents: string; language: string }>;
 
@@ -26,9 +25,6 @@ function setup(folders: string[], files: Files) {
 }
 
 suite('Go Test Resolver', () => {
-	if (affectedByIssue832()) {
-		return;
-	}
 	interface TC extends TestCase {
 		item?: ([string, string, GoTestKind] | [string, string, GoTestKind, string])[];
 		expect: string[];

test/integration/goTest.utils.ts

@@ -24,14 +24,14 @@ export function populateModulePathCache(workspace: MockTestWorkspace) {
 	function walk(dir: Uri, modpath?: string) {
 		const dirs: Uri[] = [];
 		for (const [name, type] of workspace.fs.dirs.get(dir.toString()) ?? []) {
-			const uri = dir.with({ path: path.join(dir.path, name) });
+			const uri = Uri.file(path.join(dir.fsPath, name));
 			if (type === FileType.Directory) {
 				dirs.push(uri);
 			} else if (name === 'go.mod') {
-				modpath = dir.path;
+				modpath = dir.fsPath;
 			}
 		}
-		packagePathToGoModPathMap[dir.path] = modpath || '';
+		packagePathToGoModPathMap[dir.fsPath] = modpath || '';
 		for (const dir of dirs) {
 			walk(dir, modpath);
 		}