Skip to content

Commit 41d61bf

Browse files
JAVASE-11 Remove DivisionByZeroCheck registration from the plugin
1 parent dcadecc commit 41d61bf

File tree

9 files changed

+5
-107
lines changed

9 files changed

+5
-107
lines changed

its/ruling/src/test/java/org/sonar/java/it/JavaRulingTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public class JavaRulingTest {
6262

6363
private static final ImmutableSet<String> SUBSET_OF_ENABLED_RULES = ImmutableSet.of(
6464
"S2095", "S2189", "S2222", "S2583", "S2589", "S2637", "S2689", "S2755", "S3065",
65-
"S3516", "S3518", "S3546", "S3655", "S3824", "S3958", "S3959", "S4165", "S4449", "S6373", "S6374", "S6376", "S6377");
65+
"S3516", "S3546", "S3655", "S3824", "S3958", "S3959", "S4165", "S4449", "S6373", "S6374", "S6376", "S6377");
6666

6767
@ClassRule
6868
public static TemporaryFolder tmpDumpOldFolder = new TemporaryFolder();
@@ -96,7 +96,7 @@ public static void prepare() throws Exception {
9696
List<String> extraNonDefaultRules = List.of("S3546", "S6374");
9797
ProfileGenerator.generate(ORCHESTRATOR, "Sonar Way", ImmutableMap.of(), new HashSet<>(), SUBSET_OF_ENABLED_RULES, result,
9898
extraNonDefaultRules);
99-
assertThat(result).hasSize(22); // ALL symbolic-execution rules
99+
assertThat(result).hasSize(21); // ALL symbolic-execution rules
100100

101101
Path allRulesFolder = Paths.get("src/test/resources");
102102
effectiveDumpOldFolder = tmpDumpOldFolder.getRoot().toPath().toAbsolutePath();

java-symbolic-execution/java-symbolic-execution-plugin/src/main/java/org/sonar/java/se/plugin/JavaSECheckList.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import org.sonar.java.se.checks.ConditionalUnreachableCodeCheck;
2323
import org.sonar.java.se.checks.CustomUnclosedResourcesCheck;
2424
import org.sonar.java.se.checks.DenialOfServiceXMLCheck;
25-
import org.sonar.java.se.checks.DivisionByZeroCheck;
2625
import org.sonar.java.se.checks.InvariantReturnCheck;
2726
import org.sonar.java.se.checks.LocksNotUnlockedCheck;
2827
import org.sonar.java.se.checks.MapComputeIfAbsentOrPresentCheck;
@@ -50,7 +49,6 @@ private JavaSECheckList(){
5049
public static List<Class<? extends SECheck>> getChecks() {
5150
return List.of(
5251
// SEChecks ordered by ExplodedGraphWalker need
53-
DivisionByZeroCheck.class,
5452
UnclosedResourcesCheck.class,
5553
LocksNotUnlockedCheck.class,
5654
NonNullSetToNullCheck.class,

java-symbolic-execution/java-symbolic-execution-plugin/src/main/java/org/sonar/java/se/plugin/RulesList.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ public static List<RuleKey> getSonarWayRuleKeys() {
3636
"S2755",
3737
"S3065",
3838
"S3516",
39-
"S3518",
4039
"S3655",
4140
"S3824",
4241
"S3958",

java-symbolic-execution/java-symbolic-execution-plugin/src/main/resources/org/sonar/l10n/java/rules/javase/S3518.html

Lines changed: 0 additions & 58 deletions
This file was deleted.

java-symbolic-execution/java-symbolic-execution-plugin/src/main/resources/org/sonar/l10n/java/rules/javase/S3518.json

Lines changed: 0 additions & 38 deletions
This file was deleted.

java-symbolic-execution/java-symbolic-execution-plugin/src/main/resources/org/sonar/l10n/java/rules/javase/Sonar_way_profile.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
"S2755",
1212
"S3065",
1313
"S3516",
14-
"S3518",
1514
"S3655",
1615
"S3824",
1716
"S3958",

java-symbolic-execution/java-symbolic-execution-plugin/src/test/java/org/sonar/java/se/plugin/JavaSECheckListTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class JavaSECheckListTest {
2424

2525
@Test
2626
void getChecks() {
27-
assertThat(JavaSECheckList.getChecks()).isNotNull().hasSize(22);
27+
assertThat(JavaSECheckList.getChecks()).isNotNull().hasSize(21);
2828
}
2929

3030
}

java-symbolic-execution/java-symbolic-execution-plugin/src/test/java/org/sonar/java/se/plugin/JavaSECheckRegistrarTest.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,8 @@ class JavaSECheckRegistrarTest {
4444
private static final ActiveRules activeRules = activeRules(getRuleKeysWithRepo());
4545

4646
private static final List<String> rulesNotActiveByDefault = List.of(
47-
"S2259",
4847
"S2583",
4948
"S2589",
50-
"S3518",
5149
"S3546",
5250
"S3655",
5351
"S3959",
@@ -85,7 +83,7 @@ void rules_definition() {
8583
assertThat(repository.name()).isEqualTo("Sonar");
8684
assertThat(repository.language()).isEqualTo("java");
8785
List<RulesDefinition.Rule> rules = repository.rules();
88-
assertThat(rules).hasSize(22);
86+
assertThat(rules).hasSize(21);
8987

9088
var activeByDefault = rules.stream()
9189
.filter(k -> !rulesNotActiveByDefault.contains(k.key()))

java-symbolic-execution/java-symbolic-execution-plugin/src/test/java/org/sonar/java/se/plugin/JavaSEProfileRegistrarTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ void constructor() {
2828
JavaSEProfileRegistrar registrar = new JavaSEProfileRegistrar();
2929
TestProfileRegistrarContext context = new TestProfileRegistrarContext();
3030
registrar.register(context);
31-
assertThat(context.defaultQualityProfileRules).hasSize(20); // 2 are not in the default profile
31+
assertThat(context.defaultQualityProfileRules).hasSize(19);
3232
}
3333

3434
}

0 commit comments

Comments
 (0)