SONAR-14794 Optimize ITs: Reorganize test suites to reuse orchestrators more often

diff --git a/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/rule/OneExternalIssuePerLineSensor.java b/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/rule/OneExternalIssuePerLineSensor.java
index 375c2d88b7a65c3b1045f0363399f71e07923a0f..877335273ceae8b6dee4a34c0ee5fc5577ac42b7 100644 (file)
--- a/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/rule/OneExternalIssuePerLineSensor.java
+++ b/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/rule/OneExternalIssuePerLineSensor.java
@@ -34,7 +34,7 @@ public class OneExternalIssuePerLineSensor implements Sensor {
   public static final String RULE_ID = "OneExternalIssuePerLine";
   public static final String ENGINE_ID = "XooEngine";
   public static final String SEVERITY = "MAJOR";
-  public static final Long EFFORT = 10l;
+  public static final Long EFFORT = 10L;
   public static final RuleType TYPE = RuleType.BUG;
   public static final String ACTIVATE = "sonar.oneExternalIssuePerLine.activate";
   public static final String REGISTER_AD_HOC_RULE = "sonar.oneExternalIssuePerLine.adhocRule";

diff --git a/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/rule/OnePredefinedRuleExternalIssuePerLineSensor.java b/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/rule/OnePredefinedRuleExternalIssuePerLineSensor.java
index 378c0298f2657e51d5452fab2fadb521611a89e4..dc39871cd2c8895eea1223683204715074bee259 100644 (file)
--- a/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/rule/OnePredefinedRuleExternalIssuePerLineSensor.java
+++ b/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/rule/OnePredefinedRuleExternalIssuePerLineSensor.java
@@ -35,7 +35,7 @@ public class OnePredefinedRuleExternalIssuePerLineSensor implements Sensor {
   public static final String RULE_ID = "OnePredefinedRuleExternalIssuePerLine";
   public static final String ENGINE_ID = "XooEngine";
   public static final String SEVERITY = "MAJOR";
-  public static final Long EFFORT = 10l;
+  public static final Long EFFORT = 10L;
   public static final RuleType TYPE = RuleType.BUG;
   public static final String ACTIVATE = "sonar.onePredefinedRuleExternalIssuePerLine.activate";
   private static final String NAME = "One External Issue Per Line With A Predefined Rule";

diff --git a/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/rule/RandomAccessSensor.java b/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/rule/RandomAccessSensor.java
index 5fdf2c157705e33ec8b27aef2104a45c1faca693..5f7d69775606bd1dad2e8841d07e66fc9affc06e 100644 (file)
--- a/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/rule/RandomAccessSensor.java
+++ b/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/rule/RandomAccessSensor.java
@@ -44,7 +44,7 @@ public class RandomAccessSensor implements Sensor {
       .name("One Issue Per File with Random Access")
       .onlyOnLanguages(Xoo.KEY)
       .createIssuesForRuleRepositories(XooRulesDefinition.XOO_REPOSITORY)
-      .requireProperty(SONAR_XOO_RANDOM_ACCESS_ISSUE_PATHS);
+      .onlyWhenConfiguration(c -> c.get(SONAR_XOO_RANDOM_ACCESS_ISSUE_PATHS).isPresent());
   }
 
   @Override

diff --git a/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/rule/SaveDataTwiceSensor.java b/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/rule/SaveDataTwiceSensor.java
index 39e90072deea286edc3fc3a7e71f5c0d6f8adf38..bb1e63454059b366a6ee7d451ac8623a147f7e54 100644 (file)
--- a/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/rule/SaveDataTwiceSensor.java
+++ b/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/rule/SaveDataTwiceSensor.java
@@ -36,7 +36,7 @@ public class SaveDataTwiceSensor implements Sensor {
   @Override
   public void describe(SensorDescriptor descriptor) {
     descriptor.name("SaveDataTwice IT Sensor ")
-      .requireProperty("sonar.it.savedatatwice");
+      .onlyWhenConfiguration(c -> c.getBoolean("sonar.it.savedatatwice").orElse(false));
   }
 
   @Override