Skip to content

Commit 5a206e7

Browse files
committed
Fix quality flaws
1 parent b5a26e8 commit 5a206e7

4 files changed

Lines changed: 3 additions & 15 deletions

File tree

java-checks/src/main/java/org/sonar/java/checks/CallOuterPrivateMethodCheck.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public void visitMethodInvocation(MethodInvocationTree tree) {
8686
}
8787

8888
private boolean isPrivateMethodOfOuterClass(Symbol symbol) {
89-
return symbol.isPrivate() && symbol.owner() == classSymbol.owner();
89+
return symbol.isPrivate() && symbol.owner().equals(classSymbol.owner());
9090
}
9191

9292
public void checkUsages() {

java-checks/src/test/files/checks/CallOuterPrivateMethodCheck.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ void plop() {
1616
baz();
1717
baz();
1818
baz();
19+
innerFun();
1920
}
21+
private void innerFun() {}
2022
}
2123

2224
}

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
*/
2020
package org.sonar.plugins.jacoco;
2121

22-
import org.sonar.api.batch.DependsUpon;
2322
import org.sonar.api.batch.Sensor;
2423
import org.sonar.api.batch.SensorContext;
2524
import org.sonar.api.batch.fs.FileSystem;
@@ -53,14 +52,6 @@ public JaCoCoSensor(JacocoConfiguration configuration, ResourcePerspectives pers
5352
this.javaClasspath = javaClasspath;
5453
}
5554

56-
/**
57-
* Should be executed after Surefire, which imports details of the tests.
58-
*/
59-
@DependsUpon
60-
public String dependsOnSurefireSensors() {
61-
return "surefire-java";
62-
}
63-
6455
@Override
6556
public void analyse(Project project, SensorContext context) {
6657
new UnitTestsAnalyzer(perspectives).analyse(project, context);

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,11 +95,6 @@ public void testSensorDefinition() {
9595
assertThat(sensor.toString()).isEqualTo("JaCoCoSensor");
9696
}
9797

98-
@Test
99-
public void should_depend_on_surefire() {
100-
assertThat(sensor.dependsOnSurefireSensors()).isEqualTo("surefire-java");
101-
}
102-
10398
@Test
10499
public void should_execute_if_report_exists() {
105100
Project project = mock(Project.class);

0 commit comments

Comments
 (0)