Merge pull request Idean#88 from STEAMULO/fixCoverage

Fix coverage with mixed objc swift project

Author: zippy1978

sonar-project.properties

@@ -62,9 +62,9 @@ sonar.sourceEncoding=UTF-8
 # Change it only if you generate the file on your own
 # sonar.swift.lizard.report=sonar-reports/lizard-report.xml
 
-# Cobertura report generated by run-sonar.sh is stored in sonar-reports/coverage.xml
+# Cobertura report generated by run-sonar.sh is stored in sonar-reports/coverage-swift.xml
 # Change it only if you generate the file on your own
-# sonar.swift.coverage.reportPattern=sonar-reports/coverage*.xml
+# sonar.swift.coverage.reportPattern=sonar-reports/coverage-swift*.xml
 
 # OCLint report generated by run-sonar.sh is stored in sonar-reports/oclint.xml
 # Change it only if you generate the file on your own

src/main/java/org/sonar/plugins/swift/coverage/SwiftCoberturaSensor.java

@@ -38,7 +38,7 @@ public final class SwiftCoberturaSensor implements Sensor {
     private static final Logger LOGGER = LoggerFactory.getLogger(SwiftCoberturaSensor.class);
 
     public static final String REPORT_PATTERN_KEY = SwiftPlugin.PROPERTY_PREFIX + ".coverage.reportPattern";
-    public static final String DEFAULT_REPORT_PATTERN = "sonar-reports/coverage*.xml";
+    public static final String DEFAULT_REPORT_PATTERN = "sonar-reports/coverage-swift*.xml";
 
     private final ReportFilesFinder reportFilesFinder;
 

src/main/shell/run-sonar-swift.sh

@@ -261,7 +261,7 @@ if [ "$unittests" = "on" ]; then
 
     # Put default xml files with no tests and no coverage...
     echo "<?xml version='1.0' encoding='UTF-8' standalone='yes'?><testsuites name='AllTestUnits'></testsuites>" > sonar-reports/TEST-report.xml
-    echo "<?xml version='1.0' ?><!DOCTYPE coverage SYSTEM 'http://cobertura.sourceforge.net/xml/coverage-03.dtd'><coverage><sources></sources><packages></packages></coverage>" > sonar-reports/coverage.xml
+    echo "<?xml version='1.0' ?><!DOCTYPE coverage SYSTEM 'http://cobertura.sourceforge.net/xml/coverage-03.dtd'><coverage><sources></sources><packages></packages></coverage>" > sonar-reports/coverage-swift.xml
 
     echo -n 'Running tests'
     buildCmd=(xcodebuild clean build test)
@@ -312,7 +312,7 @@ if [ "$unittests" = "on" ]; then
     echo "${slatherCmd[@]}"
 
     runCommand /dev/stdout "${slatherCmd[@]}"
-    mv sonar-reports/cobertura.xml sonar-reports/coverage.xml
+    mv sonar-reports/cobertura.xml sonar-reports/coverage-swift.xml
 fi
 
 # SwiftLint