From ffa03bd7809651a132e77fd74f79fc3eb1636e5c Mon Sep 17 00:00:00 2001
From: Julien HENRY <julien.henry@sonarsource.com>
Date: Thu, 16 Oct 2014 09:09:34 +0200
Subject: Fix some quality flaws

---
 .../src/main/java/org/sonar/xoo/lang/CoveragePerTestSensor.java        | 3 +++
 .../src/main/java/org/sonar/xoo/lang/DependencySensor.java             | 3 +++
 .../src/main/java/org/sonar/batch/mediumtest/BatchMediumTester.java    | 3 ++-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/lang/CoveragePerTestSensor.java b/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/lang/CoveragePerTestSensor.java
index 70fe9b78ff7..e16829385c8 100644
--- a/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/lang/CoveragePerTestSensor.java
+++ b/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/lang/CoveragePerTestSensor.java
@@ -75,6 +75,9 @@ public class CoveragePerTestSensor implements Sensor {
       String mainFileRelativePath = split.next();
       FileSystem fs = context.fileSystem();
       InputFile mainFile = fs.inputFile(fs.predicates().hasRelativePath(mainFileRelativePath));
+      if (mainFile == null) {
+        throw new IllegalStateException("Unable to find file " + mainFileRelativePath);
+      }
       List<Integer> coveredLines = new ArrayList<Integer>();
       Iterator<String> lines = Splitter.on(",").split(split.next()).iterator();
       while (lines.hasNext()) {
diff --git a/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/lang/DependencySensor.java b/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/lang/DependencySensor.java
index 929092da866..7ffca61bb62 100644
--- a/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/lang/DependencySensor.java
+++ b/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/lang/DependencySensor.java
@@ -73,6 +73,9 @@ public class DependencySensor implements Sensor {
       String otherFileRelativePath = split.next();
       FileSystem fs = context.fileSystem();
       InputFile otherFile = fs.inputFile(fs.predicates().hasRelativePath(otherFileRelativePath));
+      if (otherFile == null) {
+        throw new IllegalStateException("Unable to find file " + otherFileRelativePath);
+      }
       int weight = Integer.parseInt(split.next());
       context.newDependency()
         .from(file)
diff --git a/sonar-batch/src/main/java/org/sonar/batch/mediumtest/BatchMediumTester.java b/sonar-batch/src/main/java/org/sonar/batch/mediumtest/BatchMediumTester.java
index ab8ff21c33c..2886cfbc28c 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/mediumtest/BatchMediumTester.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/mediumtest/BatchMediumTester.java
@@ -269,7 +269,8 @@ public class BatchMediumTester {
         if (!coveragePerTest.get(testFileKey).containsKey(testName)) {
           coveragePerTest.get(testFileKey).put(testName, new HashMap<String, List<Integer>>());
         }
-        coveragePerTest.get(testFileKey).get(testName).put(entry.key()[2].toString(), entry.value().coveredLines());
+        TestCaseCoverage value = entry.value();
+        coveragePerTest.get(testFileKey).get(testName).put(entry.key()[2].toString(), value != null ? value.coveredLines() : null);
       }
     }
 
-- 
cgit v1.2.3