fix

Author: lukaszcl

tools/flakeguard/reports/codebase_scanner.go

@@ -1,6 +1,7 @@
 package reports
 
 import (
+	"fmt"
 	"go/ast"
 	"go/parser"
 	"go/token"
@@ -16,8 +17,14 @@ type TestFileMap map[string]string
 func ScanTestFiles(rootDir string) (TestFileMap, error) {
 	testFileMap := make(TestFileMap)
 
+	// Ensure rootDir is absolute
+	rootDir, err := filepath.Abs(rootDir)
+	if err != nil {
+		return nil, fmt.Errorf("error normalizing rootDir: %v", err)
+	}
+
 	// Walk through the root directory to find test files
-	err := filepath.Walk(rootDir, func(path string, info os.FileInfo, err error) error {
+	err = filepath.Walk(rootDir, func(path string, info os.FileInfo, err error) error {
 		if err != nil {
 			return err
 		}
@@ -27,11 +34,18 @@ func ScanTestFiles(rootDir string) (TestFileMap, error) {
 			return nil
 		}
 
+		// Normalize path relative to rootDir
+		relPath, err := filepath.Rel(rootDir, path)
+		if err != nil {
+			return fmt.Errorf("error getting relative path for %s: %v", path, err)
+		}
+		relPath = filepath.ToSlash(relPath) // Ensure Unix-style paths
+
 		// Parse the Go file
 		fset := token.NewFileSet()
 		node, err := parser.ParseFile(fset, path, nil, parser.AllErrors)
 		if err != nil {
-			return err
+			return fmt.Errorf("error parsing file %s: %v", path, err)
 		}
 
 		// Traverse the AST to find test or fuzz functions
@@ -43,8 +57,8 @@ func ScanTestFiles(rootDir string) (TestFileMap, error) {
 
 			// Match both "Test" and "Fuzz" prefixes
 			if strings.HasPrefix(funcDecl.Name.Name, "Test") || strings.HasPrefix(funcDecl.Name.Name, "Fuzz") {
-				// Add the function to the map
-				testFileMap[funcDecl.Name.Name] = path
+				// Add the function to the map with relative path
+				testFileMap[funcDecl.Name.Name] = relPath
 			}
 			return true
 		})

tools/flakeguard/reports/path_mapper.go

@@ -1,49 +1,37 @@
 package reports
 
 import (
-	"fmt"
-	"path/filepath"
 	"strings"
 )
 
 // MapTestResultsToPaths maps test results to their corresponding file paths.
 func MapTestResultsToPaths(report *TestReport, rootDir string) error {
 	// Scan the codebase for test functions
-	rootDir, err := filepath.Abs(rootDir)
-	if err != nil {
-		return fmt.Errorf("error normalizing rootDir: %v", err)
-	}
-
 	testFileMap, err := ScanTestFiles(rootDir)
 	if err != nil {
 		return err
 	}
 
-	fmt.Printf("Root Directory: %s\n", rootDir)
-	fmt.Printf("Test File Map: %+v\n", testFileMap)
-
 	// Assign file paths to each test result
 	for i, result := range report.Results {
 		testName := result.TestName
 		var filePath string
 
+		// Handle subtests
 		if strings.Contains(testName, "/") {
-			parentTestName := strings.SplitN(testName, "/", 2)[0]
+			parentTestName := strings.SplitN(testName, "/", 2)[0] // Extract parent test
 			if path, exists := testFileMap[parentTestName]; exists {
 				filePath = path
 			}
 		} else if path, exists := testFileMap[testName]; exists {
+			// Handle normal tests
 			filePath = path
 		}
 
 		if filePath != "" {
-			relFilePath, err := filepath.Rel(rootDir, filePath)
-			if err != nil {
-				return fmt.Errorf("error getting relative path: %v", err)
-			}
-			report.Results[i].TestPath = filepath.ToSlash(relFilePath)
+			report.Results[i].TestPath = filePath
 		} else {
-			fmt.Printf("TestName not mapped: %s\n", testName)
+			// Log or mark tests not found in the codebase
 			report.Results[i].TestPath = "NOT FOUND"
 		}
 	}