path should be full

Author: nahsra

framework/codemodder-testutils/src/main/java/io/codemodder/testutils/CodemodTestMixin.java

@@ -83,14 +83,6 @@ private void verifyCodemod(
     Path pathToJavaFile = tmpDir.resolve("Test.java");
     Files.copy(before, pathToJavaFile, StandardCopyOption.REPLACE_EXISTING);
 
-    // Check for any sarif files and build the RuleSarif map
-    List<Path> allSarifs = new ArrayList<>();
-    Files.newDirectoryStream(testResourceDir, "*.sarif")
-        .iterator()
-        .forEachRemaining(allSarifs::add);
-
-    Map<String, List<RuleSarif>> map = SarifParser.create().parseIntoMap(allSarifs, tmpDir);
-
     // rename file if needed
     if (!renameTestFile.isBlank()) {
       Path parent = tmpDir.resolve(renameTestFile).getParent();
@@ -105,6 +97,13 @@ private void verifyCodemod(
     // add the sonar JSON if one exists
     Path sonarJson = testResourceDir.resolve("sonar-issues.json");
 
+    // Check for any sarif files and build the RuleSarif map
+    List<Path> allSarifs = new ArrayList<>();
+    Files.newDirectoryStream(testResourceDir, "*.sarif")
+            .iterator()
+            .forEachRemaining(allSarifs::add);
+    Map<String, List<RuleSarif>> map = SarifParser.create().parseIntoMap(allSarifs, tmpDir);
+
     // run the codemod
     CodemodLoader loader =
         new CodemodLoader(

plugins/codemodder-plugin-appscan/src/main/java/io/codemodder/providers/sarif/appscan/AppScanRuleSarif.java

@@ -58,7 +58,7 @@ public AppScanRuleSarif(
       existingRealPath.ifPresent(
           p ->
               artifactLocationIndices
-                  .computeIfAbsent(repositoryRoot.relativize(p), k -> new HashSet<>())
+                  .computeIfAbsent(p, k -> new HashSet<>())
                   .add(index));
     }
     this.artifactLocationIndices = Map.copyOf(artifactLocationIndices);

plugins/codemodder-plugin-appscan/src/test/java/io/codemodder/providers/sarif/appscan/AppScanRuleSarifFactoryTest.java

@@ -53,12 +53,11 @@ void it_parses_sarif_and_maps_java_locations(@TempDir final Path tmpDir) throws
 
     // get the results for the file path (not the weird HCL thing) and confirm we have the right
     // results
-    Path p = Path.of(expectedPath);
-    List<Result> resultsForPath = ruleSarif.getResultsByLocationPath(p);
+    List<Result> resultsForPath = ruleSarif.getResultsByLocationPath(actualAssignmentedJavaFilePath);
     assertThat(resultsForPath).isNotEmpty();
 
     // get the regions affected by the given file
-    List<Region> regions = ruleSarif.getRegionsFromResultsByRule(p);
+    List<Region> regions = ruleSarif.getRegionsFromResultsByRule(actualAssignmentedJavaFilePath);
 
     // there is an injection in two form parameters in the SQL, so these 2 share the same sink
     assertThat(regions).hasSize(2);