Add api.batch.fs.FileSystem to Sensors.

arthepsy · Oct 17, 2014 · 4240ef7 · 4240ef7
1 parent 7bced27
commit 4240ef7
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 8 deletions.
diff --git a/src/main/java/org/sonar/plugins/scala/sensor/AbstractScalaSensor.java b/src/main/java/org/sonar/plugins/scala/sensor/AbstractScalaSensor.java
@@ -20,6 +20,7 @@
 package org.sonar.plugins.scala.sensor;
 
 import org.sonar.api.batch.Sensor;
+import org.sonar.api.batch.fs.FileSystem;
 import org.sonar.api.resources.Project;
 import org.sonar.plugins.scala.language.Scala;
 
@@ -32,8 +33,10 @@
 public abstract class AbstractScalaSensor implements Sensor {
 
   private final Scala scala;
+  protected final FileSystem fileSystem;
 
-  protected AbstractScalaSensor(Scala scala) {
+  protected AbstractScalaSensor(FileSystem fileSystem, Scala scala) {
+    this.fileSystem = fileSystem;
     this.scala = scala;
   }
 

diff --git a/src/main/java/org/sonar/plugins/scala/sensor/BaseMetricsSensor.java b/src/main/java/org/sonar/plugins/scala/sensor/BaseMetricsSensor.java
@@ -28,6 +28,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.sonar.api.batch.SensorContext;
+import org.sonar.api.batch.fs.FileSystem;
 import org.sonar.api.measures.CoreMetrics;
 import org.sonar.api.resources.InputFile;
 import org.sonar.api.resources.Project;
@@ -58,8 +59,8 @@ public class BaseMetricsSensor extends AbstractScalaSensor {
 
   private static final Logger LOGGER = LoggerFactory.getLogger(BaseMetricsSensor.class);
 
-  public BaseMetricsSensor(Scala scala) {
-    super(scala);
+  public BaseMetricsSensor(FileSystem fileSystem, Scala scala) {
+    super(fileSystem, scala);
   }
 
   public void analyse(Project project, SensorContext sensorContext) {

diff --git a/src/main/java/org/sonar/plugins/scala/sensor/ScalaSourceImporterSensor.java b/src/main/java/org/sonar/plugins/scala/sensor/ScalaSourceImporterSensor.java
@@ -25,6 +25,7 @@
 import org.sonar.api.batch.Phase;
 import org.sonar.api.batch.Phase.Name;
 import org.sonar.api.batch.SensorContext;
+import org.sonar.api.batch.fs.FileSystem;
 import org.sonar.api.resources.InputFile;
 import org.sonar.api.resources.Project;
 import org.sonar.api.resources.ProjectFileSystem;
@@ -44,8 +45,8 @@ public class ScalaSourceImporterSensor extends AbstractScalaSensor {
 
   private static final Logger LOGGER = LoggerFactory.getLogger(ScalaSourceImporterSensor.class);
 
-  public ScalaSourceImporterSensor(Scala scala) {
-    super(scala);
+  public ScalaSourceImporterSensor(FileSystem fileSystem, Scala scala) {
+    super(fileSystem, scala);
   }
 
   public void analyse(Project project, SensorContext sensorContext) {

diff --git a/src/test/java/org/sonar/plugins/scala/sensor/AbstractScalaSensorTest.java b/src/test/java/org/sonar/plugins/scala/sensor/AbstractScalaSensorTest.java
@@ -29,6 +29,7 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.sonar.api.batch.SensorContext;
+import org.sonar.api.batch.fs.FileSystem;
 import org.sonar.api.resources.Project;
 import org.sonar.plugins.java.Java;
 import org.sonar.plugins.scala.language.Scala;
@@ -39,7 +40,7 @@ public class AbstractScalaSensorTest {
 
   @Before
   public void setUp() {
-    abstractScalaSensor = new AbstractScalaSensor(Scala.INSTANCE) {
+    abstractScalaSensor = new AbstractScalaSensor(mock(FileSystem.class), Scala.INSTANCE) {
 
       public void analyse(Project project, SensorContext context) {
         // dummy implementation, never called in this test

diff --git a/src/test/java/org/sonar/plugins/scala/sensor/BaseMetricsSensorTest.java b/src/test/java/org/sonar/plugins/scala/sensor/BaseMetricsSensorTest.java
@@ -33,6 +33,7 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.sonar.api.batch.SensorContext;
+import org.sonar.api.batch.fs.FileSystem;
 import org.sonar.api.measures.CoreMetrics;
 import org.sonar.api.measures.Measure;
 import org.sonar.api.measures.Metric;
@@ -54,7 +55,7 @@ public class BaseMetricsSensorTest {
 
   @Before
   public void setUp() {
-    baseMetricsSensor = new BaseMetricsSensor(Scala.INSTANCE);
+    baseMetricsSensor = new BaseMetricsSensor(mock(FileSystem.class), Scala.INSTANCE);
 
     fileSystem = mock(ProjectFileSystem.class);
     when(fileSystem.getSourceCharset()).thenReturn(Charset.defaultCharset());

diff --git a/src/test/java/org/sonar/plugins/scala/sensor/ScalaSourceImporterSensorTest.java b/src/test/java/org/sonar/plugins/scala/sensor/ScalaSourceImporterSensorTest.java
@@ -23,6 +23,7 @@
 import org.junit.Test;
 import org.mockito.InOrder;
 import org.sonar.api.batch.SensorContext;
+import org.sonar.api.batch.fs.FileSystem;
 import org.sonar.api.resources.InputFile;
 import org.sonar.api.resources.InputFileUtils;
 import org.sonar.api.resources.Project;
@@ -51,7 +52,7 @@ public class ScalaSourceImporterSensorTest {
 
   @Before
   public void setUp() {
-    scalaSourceImporter = new ScalaSourceImporterSensor(Scala.INSTANCE);
+    scalaSourceImporter = new ScalaSourceImporterSensor(mock(FileSystem.class), Scala.INSTANCE);
 
     fileSystem = mock(ProjectFileSystem.class);
     when(fileSystem.getSourceCharset()).thenReturn(Charset.defaultCharset());