fixed filename format for buddy

vshaxe · Jan 17, 2025 · 0dbaf25 · 0dbaf25
1 parent cc73b77
commit 0dbaf25
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/src/HaxeTestController.hx b/src/HaxeTestController.hx
@@ -490,7 +490,7 @@ class HaxeTestController {
 		if (isAttributableCoverageEnabled()) {
 			filteredTestItems = [];
 			for (item in currentTestItems) {
-				final lcovFilename = makeFileName(workspaceFolder.uri.path, Path.join([Data.FOLDER, item.id + ".lcov"]));
+				final lcovFilename = makeFileName(workspaceFolder.uri.path, Path.join([Data.FOLDER, fileNameFormTestId(item.id) + ".lcov"]));
 
 				if (FileSystem.exists(lcovFilename)) {
 					filteredTestItems.push(item);
@@ -536,11 +536,15 @@ class HaxeTestController {
 
 	function loadDetailedCoverageForTest(testRun:TestRun, fileCoverage:FileCoverage, fromTestItem:TestItem,
 			token:CancellationToken):Thenable<Array<FileCoverageDetail>> {
-		var regEx = ~/[^a-zA-Z0-9_.-]/g;
-		final lcovFilename = makeFileName(workspaceFolder.uri.path, Path.join([Data.FOLDER, regEx.replace(fromTestItem.id, "_") + ".lcov"]));
+		final lcovFilename = makeFileName(workspaceFolder.uri.path, Path.join([Data.FOLDER, fileNameFormTestId(fromTestItem.id) + ".lcov"]));
 		return reportDetailedCoverage(lcovFilename, fileCoverage.uri.fsPath);
 	}
 
+	function fileNameFormTestId(id:String):String {
+		var regEx = ~/[^a-zA-Z0-9_.-]/g;
+		return regEx.replace(id, "_");
+	}
+
 	function reportDetailedCoverage(lcovFileName:String, srcFileName:String):Thenable<Array<FileCoverageDetail>> {
 		var details:Array<FileCoverageDetail> = [];
 

diff --git a/test-adapter/_testadapter/buddy/Injector.hx b/test-adapter/_testadapter/buddy/Injector.hx
@@ -20,6 +20,8 @@ import haxe.macro.Context; import haxe.macro.Expr; using haxe.macro.ExprTools; u
 							var suiteId:_testadapter.data.Data.SuiteId = SuiteNameAndPos(testSuite.description, pos.fileName, pos.lineNumber);
 							adapterReporter.addPosition(suiteId, description, pos.fileName, pos.lineNumber - 1);
 
+							// create shallow copies of both before+after arrays
+							// so we don't mess up the data structures outside of our small patch
 							beforeEachStack = beforeEachStack.copy();
 							beforeEachStack.unshift([Sync(_ -> instrument.coverage.Coverage.resetAttributableCoverage())]);
 							afterEachStack = afterEachStack.copy();

diff --git a/test-adapter/_testadapter/data/TestFilter.hx b/test-adapter/_testadapter/data/TestFilter.hx
@@ -98,7 +98,7 @@ class TestFilter {
 	}
 
 	public static function hasFilters(testFilters:TestFilterList):Bool {
-		return (testFilters != null) && ((testFilters.include.length + testFilters.exclude.length > 0));
+		return (testFilters != null) && ((testFilters.include.length + testFilters.exclude.length) > 0);
 	}
 
 	public static function shouldRunTest(testFilters:TestFilterList, className:String, testName:String):Bool {