Fixes bug with NPE when coverage report have multiple source folders …

…(even wrong ones)
kt3k · Oct 25, 2013 · 899ba2a · 899ba2a
1 parent c87265a
commit 899ba2a
Show file tree

Hide file tree

Showing 3 changed files with 475 additions and 3 deletions.
diff --git a/src/main/groovy/org/kt3k/gradle/plugin/coveralls/domain/SourceReportFactory.groovy b/src/main/groovy/org/kt3k/gradle/plugin/coveralls/domain/SourceReportFactory.groovy
@@ -4,7 +4,7 @@ class SourceReportFactory {
 
     public static List<SourceReport> createFromCoberturaXML(File file) {
         Node coverage = new XmlParser().parse(file)
-        String sourceDir = coverage.sources.source.text() + '/'
+        List<String> sourceDirectories = coverage.sources.source*.text()
 
         Map a = [:]
 
@@ -19,8 +19,8 @@ class SourceReportFactory {
 
         List<SourceReport> reports = new ArrayList<SourceReport>()
 
-        a.each { String filename, Map cov ->
-            String source = new File(sourceDir + filename).text
+        a.each { String filename, Map<Integer, Integer> cov ->
+            String source = actualSourceFile(sourceDirectories, filename).text
 
             List r = [null] * source.readLines().size()
             cov.each { Integer line, Integer hits ->
@@ -33,4 +33,8 @@ class SourceReportFactory {
         return reports
 
     }
+
+    private static File actualSourceFile(List<String> sourceDirs, String filename) {
+        sourceDirs.collect { new File(it + '/' + filename) }.find { it.exists() }
+    }
 }