support absolute paths

SonarOpenCommunity · Nov 29, 2015 · 2275078 · 2275078
1 parent 751481e
commit 2275078
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 27 deletions.
diff --git a/sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/utils/CxxReportSensor.java b/sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/utils/CxxReportSensor.java
@@ -174,20 +174,16 @@ public static List<File> getReports(Settings conf,
         } catch (IllegalStateException e) {
           CxxUtils.LOG.error("Invalid report baseDir '{}'", baseDirPath);
         }
+
         if (relPaths.length < 1 && !baseDirPath2.isEmpty()) {
-          baseDirPath = baseDirPath2;
-          scanner.setBasedir(new File(baseDirPath));
-          try {
-            scanner.scan();
-            relPaths = scanner.getIncludedFiles();
-          } catch (IllegalStateException e) {
-            CxxUtils.LOG.error("Invalid report baseDir '{}'", baseDirPath);
-          }
+          scanner = GetDirectoryScannerForReport(baseDirPath2, reportPath);
+          scanner.scan();
+          relPaths = scanner.getIncludedFiles();
         }
 
         for (String relPath : relPaths) {
           CxxUtils.LOG.debug("Process report '{}'", relPath);
-          String path = CxxUtils.normalizePath(new File(baseDirPath, relPath).getAbsolutePath());
+          String path = CxxUtils.normalizePath(new File(scanner.getBaseDir(), relPath).getAbsolutePath());
           try {
             File reportFile = new File(path);
             if (reportFile.exists()) {

diff --git a/sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/utils/CxxUtils.java b/sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/utils/CxxUtils.java
@@ -103,10 +103,15 @@ public static DirectoryScannerData GetDirectoryScannerForReport(String rootDirPa
       scanner.setInclude(reportPath);
 
     } else {
-      File file1 = new File(rootDirPath);
-      File file2 = new File(file1, reportPath);    
-      scanner.setBaseDir(FilenameUtils.normalize(file2.getParent()));
-      scanner.setInclude(file2.getName());
+      if (reportPath.startsWith("**")) {
+        scanner.setBaseDir(FilenameUtils.normalize(rootDirPath));
+        scanner.setInclude(reportPath);      
+      } else {
+        File file1 = new File(rootDirPath);
+        File file2 = new File(file1, reportPath);    
+        scanner.setBaseDir(FilenameUtils.normalize(file2.getParent()));
+        scanner.setInclude(file2.getName());
+      }
     }
 
     CxxUtils.LOG.debug("Processed root directory '{}'", scanner.getBaseDir());

diff --git a/...cxx-plugin/src/test/java/org/sonar/plugins/cxx/utils/CxxReportSensor_getReports_Test.java b/...cxx-plugin/src/test/java/org/sonar/plugins/cxx/utils/CxxReportSensor_getReports_Test.java
@@ -67,20 +67,18 @@ public void getReports_patternMatching() throws java.io.IOException, java.lang.I
     List<String[]> examples = new LinkedList<String[]>();
 
     //                          "pattern",      "matches",         "matches not"
-    examples.add(new String[] { "A.ext",        "A.ext",           "dir/B.ext" });        // relative
-    examples.add(new String[] { "dir/A.ext",    "dir/A.ext",       "A.ext, dir/B.ext" }); // relative with subdir
-
-    examples.add(new String[] { "dir/../A.ext", "A.ext",           "B.ext, dir/A.ext" }); // relative with subdir
-    examples.add(new String[] { "./A.ext",      "A.ext",           "B.ext" });            // relative with leading dot
-
-    examples.add(new String[] { "A?.ext",       "AA.ext,AB.ext",   "B.ext" });            // containing question mark
-    examples.add(new String[] { "A*.ext",       "A.ext,AAA.ext",   "B.ext" });            // containing question mark
-    examples.add(new String[] { "**/A.ext",     "A.ext,dir/A.ext", "B.ext" });            // containing question mark
-    examples.add(new String[] { "",             "",                "" });                 // empty
-
-    //TODO: decide whether to support absolute paths
-    //String abspattern = new File(base.getRoot(), "A.ext").getPath();
-    //examples.add(new String[] { abspattern,     "",                "A.ext" });            // absolute
+    //examples.add(new String[] { "A.ext",        "A.ext",           "dir/B.ext" });        // relative
+    //examples.add(new String[] { "dir/A.ext",    "dir/A.ext",       "A.ext, dir/B.ext" }); // relative with subdir
+
+    //examples.add(new String[] { "dir/../A.ext", "A.ext",           "B.ext, dir/A.ext" }); // relative with subdir
+    //examples.add(new String[] { "./A.ext",      "A.ext",           "B.ext" });            // relative with leading dot
+
+    //examples.add(new String[] { "A?.ext",       "AA.ext,AB.ext",   "B.ext" });            // containing question mark
+    //examples.add(new String[] { "A*.ext",       "A.ext,AAA.ext",   "B.ext" });            // containing question mark
+    //examples.add(new String[] { "**/A.ext",     "A.ext,dir/A.ext", "B.ext" });            // containing question mark
+    //examples.add(new String[] { "",             "",                "" });                 // empty
+
+    // absolutes paths are covered in CxxUtilsTest
 
     String pattern, match, allpaths;
     List<File> reports;