Skip to content

Commit f8170fc

Browse files
benzonicobenzonico
committed
Fix quality flaw: Replace deprecated ModuleFileSystem by FileSystem
1 parent 7b82b17 commit f8170fc

7 files changed

Lines changed: 23 additions & 25 deletions

File tree

‎java-jacoco/src/main/java/org/sonar/plugins/jacoco/AbstractAnalyzer.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@
2929
import org.jacoco.core.data.ExecutionData;
3030
import org.jacoco.core.data.ExecutionDataStore;
3131
import org.sonar.api.batch.SensorContext;
32+
import org.sonar.api.batch.fs.FileSystem;
3233
import org.sonar.api.component.ResourcePerspectives;
3334
import org.sonar.api.measures.CoverageMeasuresBuilder;
3435
import org.sonar.api.measures.Measure;
3536
import org.sonar.api.resources.Project;
3637
import org.sonar.api.resources.Resource;
3738
import org.sonar.api.resources.ResourceUtils;
38-
import org.sonar.api.scan.filesystem.ModuleFileSystem;
3939
import org.sonar.api.scan.filesystem.PathResolver;
4040
import org.sonar.api.test.MutableTestCase;
4141
import org.sonar.api.test.MutableTestPlan;
@@ -54,7 +54,7 @@
5454
public abstract class AbstractAnalyzer {
5555

5656
private final ResourcePerspectives perspectives;
57-
private final ModuleFileSystem fileSystem;
57+
private final FileSystem fileSystem;
5858
private final PathResolver pathResolver;
5959
private final JavaResourceLocator javaResourceLocator;
6060
private final boolean readCoveragePerTests;
@@ -63,12 +63,12 @@ public abstract class AbstractAnalyzer {
6363
private JavaClasspath javaClasspath;
6464
private JacocoReportReader jacocoReportReader;
6565

66-
public AbstractAnalyzer(ResourcePerspectives perspectives, ModuleFileSystem fileSystem, PathResolver pathResolver,
66+
public AbstractAnalyzer(ResourcePerspectives perspectives, FileSystem fileSystem, PathResolver pathResolver,
6767
JavaResourceLocator javaResourceLocator, JavaClasspath javaClasspath) {
6868
this(perspectives, fileSystem, pathResolver, javaResourceLocator, javaClasspath, true);
6969
}
7070

71-
public AbstractAnalyzer(ResourcePerspectives perspectives, ModuleFileSystem fileSystem,
71+
public AbstractAnalyzer(ResourcePerspectives perspectives, FileSystem fileSystem,
7272
PathResolver pathResolver, JavaResourceLocator javaResourceLocator, JavaClasspath javaClasspath, boolean readCoveragePerTests) {
7373
this.perspectives = perspectives;
7474
this.fileSystem = fileSystem;

‎java-jacoco/src/main/java/org/sonar/plugins/jacoco/JaCoCoItSensor.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121

2222
import org.sonar.api.batch.Sensor;
2323
import org.sonar.api.batch.SensorContext;
24+
import org.sonar.api.batch.fs.FileSystem;
2425
import org.sonar.api.component.ResourcePerspectives;
2526
import org.sonar.api.measures.CoreMetrics;
2627
import org.sonar.api.measures.Measure;
2728
import org.sonar.api.resources.Project;
2829
import org.sonar.api.resources.Resource;
29-
import org.sonar.api.scan.filesystem.ModuleFileSystem;
3030
import org.sonar.api.scan.filesystem.PathResolver;
3131
import org.sonar.java.JavaClasspath;
3232
import org.sonar.plugins.java.api.JavaResourceLocator;
@@ -37,12 +37,12 @@
3737
public class JaCoCoItSensor implements Sensor {
3838
private final JacocoConfiguration configuration;
3939
private final ResourcePerspectives perspectives;
40-
private final ModuleFileSystem fileSystem;
40+
private final FileSystem fileSystem;
4141
private final PathResolver pathResolver;
4242
private final JavaResourceLocator javaResourceLocator;
4343
private final JavaClasspath javaClasspath;
4444

45-
public JaCoCoItSensor(JacocoConfiguration configuration, ResourcePerspectives perspectives, ModuleFileSystem fileSystem, PathResolver pathResolver,
45+
public JaCoCoItSensor(JacocoConfiguration configuration, ResourcePerspectives perspectives, FileSystem fileSystem, PathResolver pathResolver,
4646
JavaResourceLocator javaResourceLocator, JavaClasspath javaClasspath) {
4747
this.configuration = configuration;
4848
this.perspectives = perspectives;

‎java-jacoco/src/main/java/org/sonar/plugins/jacoco/JaCoCoOverallSensor.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121

2222
import org.sonar.api.batch.Sensor;
2323
import org.sonar.api.batch.SensorContext;
24+
import org.sonar.api.batch.fs.FileSystem;
2425
import org.sonar.api.component.ResourcePerspectives;
2526
import org.sonar.api.measures.CoreMetrics;
2627
import org.sonar.api.measures.Measure;
2728
import org.sonar.api.resources.Project;
2829
import org.sonar.api.resources.Resource;
29-
import org.sonar.api.scan.filesystem.ModuleFileSystem;
3030
import org.sonar.api.scan.filesystem.PathResolver;
3131
import org.sonar.java.JavaClasspath;
3232
import org.sonar.plugins.java.api.JavaResourceLocator;
@@ -40,12 +40,12 @@ public class JaCoCoOverallSensor implements Sensor {
4040

4141
private final JacocoConfiguration configuration;
4242
private final ResourcePerspectives perspectives;
43-
private final ModuleFileSystem fileSystem;
43+
private final FileSystem fileSystem;
4444
private final PathResolver pathResolver;
4545
private final JavaResourceLocator javaResourceLocator;
4646
private final JavaClasspath javaClasspath;
4747

48-
public JaCoCoOverallSensor(JacocoConfiguration configuration, ResourcePerspectives perspectives, ModuleFileSystem fileSystem, PathResolver pathResolver,
48+
public JaCoCoOverallSensor(JacocoConfiguration configuration, ResourcePerspectives perspectives, FileSystem fileSystem, PathResolver pathResolver,
4949
JavaResourceLocator javaResourceLocator, JavaClasspath javaClasspath) {
5050
this.configuration = configuration;
5151
this.perspectives = perspectives;
@@ -72,7 +72,7 @@ public void analyse(Project project, SensorContext context) {
7272
File reportUTs = pathResolver.relativeFile(fileSystem.baseDir(), configuration.getReportPath());
7373
File reportITs = pathResolver.relativeFile(fileSystem.baseDir(), configuration.getItReportPath());
7474

75-
File reportOverall = new File(fileSystem.workingDir(), JACOCO_OVERALL);
75+
File reportOverall = new File(fileSystem.workDir(), JACOCO_OVERALL);
7676
reportOverall.getParentFile().mkdirs();
7777

7878
JaCoCoReportMerger.mergeReports(reportOverall, reportUTs, reportITs);

‎java-jacoco/src/main/java/org/sonar/plugins/jacoco/JaCoCoSensor.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222
import org.sonar.api.batch.DependsUpon;
2323
import org.sonar.api.batch.Sensor;
2424
import org.sonar.api.batch.SensorContext;
25+
import org.sonar.api.batch.fs.FileSystem;
2526
import org.sonar.api.component.ResourcePerspectives;
2627
import org.sonar.api.measures.Measure;
2728
import org.sonar.api.resources.Project;
2829
import org.sonar.api.resources.Resource;
29-
import org.sonar.api.scan.filesystem.ModuleFileSystem;
3030
import org.sonar.api.scan.filesystem.PathResolver;
3131
import org.sonar.java.JavaClasspath;
3232
import org.sonar.plugins.java.api.JavaResourceLocator;
@@ -38,12 +38,12 @@ public class JaCoCoSensor implements Sensor {
3838

3939
private final JacocoConfiguration configuration;
4040
private final ResourcePerspectives perspectives;
41-
private final ModuleFileSystem fileSystem;
41+
private final FileSystem fileSystem;
4242
private final PathResolver pathResolver;
4343
private final JavaResourceLocator javaResourceLocator;
4444
private final JavaClasspath javaClasspath;
4545

46-
public JaCoCoSensor(JacocoConfiguration configuration, ResourcePerspectives perspectives, ModuleFileSystem fileSystem, PathResolver pathResolver,
46+
public JaCoCoSensor(JacocoConfiguration configuration, ResourcePerspectives perspectives, FileSystem fileSystem, PathResolver pathResolver,
4747
JavaResourceLocator javaResourceLocator, JavaClasspath javaClasspath) {
4848
this.configuration = configuration;
4949
this.perspectives = perspectives;

‎java-jacoco/src/test/java/org/sonar/plugins/jacoco/JaCoCoItSensorTest.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,13 @@
2525
import org.junit.BeforeClass;
2626
import org.junit.Test;
2727
import org.sonar.api.batch.SensorContext;
28+
import org.sonar.api.batch.fs.FileSystem;
29+
import org.sonar.api.batch.fs.internal.DefaultFileSystem;
2830
import org.sonar.api.component.ResourcePerspectives;
2931
import org.sonar.api.measures.CoreMetrics;
3032
import org.sonar.api.measures.Measure;
3133
import org.sonar.api.resources.Project;
3234
import org.sonar.api.resources.Resource;
33-
import org.sonar.api.scan.filesystem.ModuleFileSystem;
3435
import org.sonar.api.scan.filesystem.PathResolver;
3536
import org.sonar.api.test.IsMeasure;
3637
import org.sonar.java.JavaClasspath;
@@ -72,7 +73,7 @@ public static void setUpOutputDir() throws IOException {
7273
public void setUp() {
7374
configuration = mock(JacocoConfiguration.class);
7475
ResourcePerspectives perspectives = mock(ResourcePerspectives.class);
75-
ModuleFileSystem fileSystem = mock(ModuleFileSystem.class);
76+
FileSystem fileSystem = new DefaultFileSystem(null);
7677
pathResolver = mock(PathResolver.class);
7778
sensor = new JaCoCoItSensor(configuration, perspectives, fileSystem, pathResolver, javaResourceLocator, javaClasspath);
7879
}

‎java-jacoco/src/test/java/org/sonar/plugins/jacoco/JaCoCoOverallSensorTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@
2424
import org.junit.Before;
2525
import org.junit.Test;
2626
import org.sonar.api.batch.SensorContext;
27+
import org.sonar.api.batch.fs.internal.DefaultFileSystem;
2728
import org.sonar.api.component.ResourcePerspectives;
2829
import org.sonar.api.measures.CoreMetrics;
2930
import org.sonar.api.resources.Project;
3031
import org.sonar.api.resources.Resource;
31-
import org.sonar.api.scan.filesystem.ModuleFileSystem;
3232
import org.sonar.api.scan.filesystem.PathResolver;
3333
import org.sonar.api.test.IsMeasure;
3434
import org.sonar.java.JavaClasspath;
@@ -51,7 +51,7 @@ public class JaCoCoOverallSensorTest {
5151

5252
private JacocoConfiguration configuration;
5353
private SensorContext context;
54-
private ModuleFileSystem fileSystem;
54+
private DefaultFileSystem fileSystem;
5555
private PathResolver pathResolver;
5656
private Project project;
5757
private ResourcePerspectives perspectives;
@@ -65,7 +65,8 @@ public void before() {
6565
when(configuration.shouldExecuteOnProject(true)).thenReturn(true);
6666
when(configuration.shouldExecuteOnProject(false)).thenReturn(false);
6767
context = mock(SensorContext.class);
68-
fileSystem = mock(ModuleFileSystem.class);
68+
fileSystem = new DefaultFileSystem(null);
69+
fileSystem.setWorkDir(new File("target/sonar"));
6970
pathResolver = mock(PathResolver.class);
7071
project = mock(Project.class);
7172
perspectives = mock(ResourcePerspectives.class);
@@ -170,7 +171,6 @@ private Resource analyseReports(String utReport, String itReport) throws IOExcep
170171
when(pathResolver.relativeFile(any(File.class), eq(utReport))).thenReturn(new File(outputDir, utReport));
171172
when(pathResolver.relativeFile(any(File.class), eq(itReport))).thenReturn(new File(outputDir, itReport));
172173
when(pathResolver.relativeFile(any(File.class), eq(new File("target/sonar/jacoco-overall.exec").getAbsolutePath()))).thenReturn(new File("target/sonar/jacoco-overall.exec"));
173-
when(fileSystem.workingDir()).thenReturn(new File("target/sonar"));
174174

175175
sensor.analyse(project, context);
176176
return resource;

‎java-jacoco/src/test/java/org/sonar/plugins/jacoco/JaCoCoSensorTest.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
import org.sonar.api.measures.Measure;
3535
import org.sonar.api.resources.Project;
3636
import org.sonar.api.resources.Resource;
37-
import org.sonar.api.scan.filesystem.ModuleFileSystem;
3837
import org.sonar.api.scan.filesystem.PathResolver;
3938
import org.sonar.api.test.IsMeasure;
4039
import org.sonar.api.test.MutableTestCase;
@@ -82,14 +81,13 @@ public void setUp() throws Exception {
8281
Files.copy(TestUtils.getResource("Hello.class.toCopy"), new File(jacocoExecutionData.getParentFile(), "Hello.class"));
8382

8483
context = mock(SensorContext.class);
85-
ModuleFileSystem fileSystem = mock(ModuleFileSystem.class);
8684
pathResolver = mock(PathResolver.class);
8785
project = mock(Project.class);
8886

8987
configuration = mock(JacocoConfiguration.class);
9088
perspectives = mock(ResourcePerspectives.class);
9189
javaClasspath = mock(JavaClasspath.class);
92-
sensor = new JaCoCoSensor(configuration, perspectives, fileSystem, pathResolver, javaResourceLocator, javaClasspath);
90+
sensor = new JaCoCoSensor(configuration, perspectives, new DefaultFileSystem(new File("")), pathResolver, javaResourceLocator, javaClasspath);
9391
}
9492

9593
@Test
@@ -210,12 +208,11 @@ private void testExecutionDataForLinesCoveredByTest(String path, List<Integer> l
210208

211209
@Test
212210
public void force_coverage_to_zero_when_no_report() {
213-
ModuleFileSystem fs = mock(ModuleFileSystem.class);
214211
Map<String, String> props = ImmutableMap.of(JacocoConfiguration.REPORT_MISSING_FORCE_ZERO, "true", JacocoConfiguration.REPORT_PATH_PROPERTY, "foo");
215212
DefaultFileSystem fileSystem = new DefaultFileSystem(null);
216213
fileSystem.add(new DefaultInputFile("foo").setLanguage("java"));
217214
JacocoConfiguration configuration = new JacocoConfiguration(new Settings().addProperties(props), fileSystem);
218-
JaCoCoSensor sensor_force_coverage = new JaCoCoSensor(configuration, perspectives, fs, pathResolver, javaResourceLocator, javaClasspath);
215+
JaCoCoSensor sensor_force_coverage = new JaCoCoSensor(configuration, perspectives, fileSystem, pathResolver, javaResourceLocator, javaClasspath);
219216
outputDir = TestUtils.getResource("/org/sonar/plugins/jacoco/JaCoCoSensorTest/");
220217
org.sonar.api.resources.File resource = mock(org.sonar.api.resources.File.class);
221218
when(context.getResource(any(Resource.class))).thenReturn(resource);

0 commit comments

Comments
 (0)