Automatic merge from branch-5.5

* origin/branch-5.5:
  Disable EventTest#event_widget() because of false-positives
  SONAR-7427 Remove "effort_to_reach_reliability_rating_a" and "effort_to_reach_security_rating_a" measures
  SONAR-7527 Change metric columns order and layout of provided global dashboard

7 files changed, 18 insertions, 28 deletions

diff --git a/it/it-tests/src/test/java/it/Category1Suite.java b/it/it-tests/src/test/java/it/Category1Suite.java
index db792a9a014..65ff384d431 100644
--- a/it/it-tests/src/test/java/it/Category1Suite.java
+++ b/it/it-tests/src/test/java/it/Category1Suite.java
@@ -46,8 +46,6 @@ import it.projectAdministration.ProjectAdministrationTest;
 import it.qualityGate.QualityGateNotificationTest;
 import it.qualityGate.QualityGateTest;
 import it.qualityGate.QualityGateUiTest;
-import it.qualityModel.NewDebtRatioMeasureTest;
-import it.qualityModel.TechnicalDebtMeasureVariationTest;
 import it.settings.PropertySetsTest;
 import it.settings.SettingsTest;
 import it.settings.SubCategoriesTest;
@@ -90,13 +88,11 @@ import static util.ItUtils.xooPlugin;
   // custom measure
   CustomMeasuresTest.class,
   // measure
-  NewDebtRatioMeasureTest.class,
   ProjectMeasuresPageTest.class,
   ProjectOverviewTest.class,
   ProjectWidgetsTest.class,
   MeasureFiltersTest.class,
   MeasuresWsTest.class,
-  TechnicalDebtMeasureVariationTest.class,
   // measure history
   DifferentialPeriodsTest.class,
   HistoryUiTest.class,
diff --git a/it/it-tests/src/test/java/it/Category2Suite.java b/it/it-tests/src/test/java/it/Category2Suite.java
index b9fe3cd661b..247a001df22 100644
--- a/it/it-tests/src/test/java/it/Category2Suite.java
+++ b/it/it-tests/src/test/java/it/Category2Suite.java
@@ -35,7 +35,11 @@ import it.issue.IssueWorkflowTest;
 import it.issue.NewIssuesMeasureTest;
 import it.qualityModel.MaintainabilityMeasureTest;
 import it.qualityModel.MaintainabilityRatingMeasureTest;
+import it.qualityModel.NewDebtRatioMeasureTest;
+import it.qualityModel.ReliabilityMeasureTest;
+import it.qualityModel.SecurityMeasureTest;
 import it.qualityModel.TechnicalDebtInIssueChangelogTest;
+import it.qualityModel.TechnicalDebtMeasureVariationTest;
 import it.qualityModel.TechnicalDebtTest;
 import it.qualityModel.TechnicalDebtWidgetTest;
 import it.test.CoverageTest;
@@ -71,9 +75,13 @@ import static util.ItUtils.xooPlugin;
   IssueWorkflowTest.class,
   NewIssuesMeasureTest.class,
   // debt
+  MaintainabilityMeasureTest.class,
   MaintainabilityRatingMeasureTest.class,
+  NewDebtRatioMeasureTest.class,
+  ReliabilityMeasureTest.class,
+  SecurityMeasureTest.class,
   TechnicalDebtInIssueChangelogTest.class,
-  MaintainabilityMeasureTest.class,
+  TechnicalDebtMeasureVariationTest.class,
   TechnicalDebtTest.class,
   TechnicalDebtWidgetTest.class
 })
diff --git a/it/it-tests/src/test/java/it/dbCleaner/PurgeTest.java b/it/it-tests/src/test/java/it/dbCleaner/PurgeTest.java
index 2aaa892d144..38b7c016c2f 100644
--- a/it/it-tests/src/test/java/it/dbCleaner/PurgeTest.java
+++ b/it/it-tests/src/test/java/it/dbCleaner/PurgeTest.java
@@ -76,9 +76,9 @@ public class PurgeTest {
     collector.checkThat("Wrong number of files", count("projects where qualifier in ('FIL')"), equalTo(4));
     collector.checkThat("Wrong number of unit test files", count("projects where qualifier in ('UTS')"), equalTo(0));
 
-    int measuresOnTrk = 46;
-    int measuresOnBrc = 228;
-    int measuresOnDir = 145;
+    int measuresOnTrk = 44;
+    int measuresOnBrc = 216;
+    int measuresOnDir = 137;
     int measuresOnFil = 69;
 
     // count measures 
@@ -105,8 +105,8 @@ public class PurgeTest {
     // must be a different date, else a single snapshot is kept per day
     scan(PROJECT_SAMPLE_PATH, DateFormatUtils.ISO_DATE_FORMAT.format(today));
 
-    int newMeasuresOnTrk = 56;
-    int newMeasuresOnBrc = 292;
+    int newMeasuresOnTrk = 54;
+    int newMeasuresOnBrc = 280;
     int newMeasuresOnDir = 44;
     int newMeasuresOnFil = 0;
 
diff --git a/it/it-tests/src/test/java/it/qualityModel/NewDebtRatioMeasureTest.java b/it/it-tests/src/test/java/it/qualityModel/NewDebtRatioMeasureTest.java
index 01bb6359be0..ae4f6a9e7e7 100644
--- a/it/it-tests/src/test/java/it/qualityModel/NewDebtRatioMeasureTest.java
+++ b/it/it-tests/src/test/java/it/qualityModel/NewDebtRatioMeasureTest.java
@@ -21,7 +21,7 @@ package it.qualityModel;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.locator.FileLocation;
-import it.Category1Suite;
+import it.Category2Suite;
 import java.util.List;
 import javax.annotation.Nullable;
 import org.junit.AfterClass;
@@ -46,7 +46,7 @@ public class NewDebtRatioMeasureTest {
   private static final String NEW_DEBT_RATIO_METRIC_KEY = "new_sqale_debt_ratio";
 
   @ClassRule
-  public static Orchestrator orchestrator = Category1Suite.ORCHESTRATOR;
+  public static Orchestrator orchestrator = Category2Suite.ORCHESTRATOR;
 
   @BeforeClass
   public static void initPeriods() throws Exception {
diff --git a/it/it-tests/src/test/java/it/qualityModel/ReliabilityMeasureTest.java b/it/it-tests/src/test/java/it/qualityModel/ReliabilityMeasureTest.java
index c04376cc9c0..a54cc223583 100644
--- a/it/it-tests/src/test/java/it/qualityModel/ReliabilityMeasureTest.java
+++ b/it/it-tests/src/test/java/it/qualityModel/ReliabilityMeasureTest.java
@@ -45,7 +45,6 @@ public class ReliabilityMeasureTest {
   private static final String BUGS_METRIC = "bugs";
   private static final String RELIABILITY_REMEDIATION_EFFORT_METRIC = "reliability_remediation_effort";
   private static final String RELIABILITY_RATING_METRIC = "reliability_rating";
-  private static final String EFFORT_TO_REACH_RELIABILITY_RATING_A_METRIC = "effort_to_reach_reliability_rating_a";
 
   @ClassRule
   public static Orchestrator orchestrator = Category2Suite.ORCHESTRATOR;
@@ -66,27 +65,22 @@ public class ReliabilityMeasureTest {
     assertThat(getMeasure(PROJECT, BUGS_METRIC).getIntValue()).isEqualTo(61);
     assertThat(getMeasure(PROJECT, RELIABILITY_REMEDIATION_EFFORT_METRIC).getIntValue()).isEqualTo(305);
     assertThat(getMeasure(PROJECT, RELIABILITY_RATING_METRIC).getData()).isEqualTo("D");
-    assertThat(getMeasure(PROJECT, EFFORT_TO_REACH_RELIABILITY_RATING_A_METRIC).getIntValue()).isEqualTo(305);
 
     assertThat(getMeasure(MODULE, BUGS_METRIC).getIntValue()).isEqualTo(37);
     assertThat(getMeasure(MODULE, RELIABILITY_REMEDIATION_EFFORT_METRIC).getIntValue()).isEqualTo(185);
     assertThat(getMeasure(MODULE, RELIABILITY_RATING_METRIC).getData()).isEqualTo("D");
-    assertThat(getMeasure(MODULE, EFFORT_TO_REACH_RELIABILITY_RATING_A_METRIC).getIntValue()).isEqualTo(185);
 
     assertThat(getMeasure(SUB_MODULE, BUGS_METRIC).getIntValue()).isEqualTo(16);
     assertThat(getMeasure(SUB_MODULE, RELIABILITY_REMEDIATION_EFFORT_METRIC).getIntValue()).isEqualTo(80);
     assertThat(getMeasure(SUB_MODULE, RELIABILITY_RATING_METRIC).getData()).isEqualTo("D");
-    assertThat(getMeasure(SUB_MODULE, EFFORT_TO_REACH_RELIABILITY_RATING_A_METRIC).getIntValue()).isEqualTo(80);
 
     assertThat(getMeasure(DIRECTORY, BUGS_METRIC).getIntValue()).isEqualTo(16);
     assertThat(getMeasure(DIRECTORY, RELIABILITY_REMEDIATION_EFFORT_METRIC).getIntValue()).isEqualTo(80);
     assertThat(getMeasure(DIRECTORY, RELIABILITY_RATING_METRIC).getData()).isEqualTo("D");
-    assertThat(getMeasure(DIRECTORY, EFFORT_TO_REACH_RELIABILITY_RATING_A_METRIC).getIntValue()).isEqualTo(80);
 
     assertThat(getMeasure(FILE, BUGS_METRIC).getIntValue()).isEqualTo(16);
     assertThat(getMeasure(FILE, RELIABILITY_REMEDIATION_EFFORT_METRIC).getIntValue()).isEqualTo(80);
     assertThat(getMeasure(FILE, RELIABILITY_RATING_METRIC).getData()).isEqualTo("D");
-    assertThat(getMeasure(FILE, EFFORT_TO_REACH_RELIABILITY_RATING_A_METRIC).getIntValue()).isEqualTo(80);
   }
 
   @Test
@@ -98,7 +92,6 @@ public class ReliabilityMeasureTest {
     assertThat(getMeasure(PROJECT, BUGS_METRIC).getIntValue()).isEqualTo(0);
     assertThat(getMeasure(PROJECT, RELIABILITY_REMEDIATION_EFFORT_METRIC).getIntValue()).isEqualTo(0);
     assertThat(getMeasure(PROJECT, RELIABILITY_RATING_METRIC).getData()).isEqualTo("A");
-    assertThat(getMeasure(PROJECT, EFFORT_TO_REACH_RELIABILITY_RATING_A_METRIC).getIntValue()).isEqualTo(0);
   }
 
   @CheckForNull
diff --git a/it/it-tests/src/test/java/it/qualityModel/SecurityMeasureTest.java b/it/it-tests/src/test/java/it/qualityModel/SecurityMeasureTest.java
index 4aeda0ae762..6caf217bd47 100644
--- a/it/it-tests/src/test/java/it/qualityModel/SecurityMeasureTest.java
+++ b/it/it-tests/src/test/java/it/qualityModel/SecurityMeasureTest.java
@@ -45,7 +45,6 @@ public class SecurityMeasureTest {
   private static final String VULNERABILITIES_METRIC = "vulnerabilities";
   private static final String SECURITY_REMEDIATION_EFFORT_METRIC = "security_remediation_effort";
   private static final String SECURITY_RATING_METRIC = "security_rating";
-  private static final String EFFORT_TO_REACH_SECURITY_RATING_A_METRIC = "effort_to_reach_security_rating_a";
 
   @ClassRule
   public static Orchestrator orchestrator = Category2Suite.ORCHESTRATOR;
@@ -66,27 +65,22 @@ public class SecurityMeasureTest {
     assertThat(getMeasure(PROJECT, VULNERABILITIES_METRIC).getIntValue()).isEqualTo(4);
     assertThat(getMeasure(PROJECT, SECURITY_REMEDIATION_EFFORT_METRIC).getIntValue()).isEqualTo(340);
     assertThat(getMeasure(PROJECT, SECURITY_RATING_METRIC).getData()).isEqualTo("E");
-    assertThat(getMeasure(PROJECT, EFFORT_TO_REACH_SECURITY_RATING_A_METRIC).getIntValue()).isEqualTo(340);
 
     assertThat(getMeasure(MODULE, VULNERABILITIES_METRIC).getIntValue()).isEqualTo(2);
     assertThat(getMeasure(MODULE, SECURITY_REMEDIATION_EFFORT_METRIC).getIntValue()).isEqualTo(170);
     assertThat(getMeasure(MODULE, SECURITY_RATING_METRIC).getData()).isEqualTo("E");
-    assertThat(getMeasure(MODULE, EFFORT_TO_REACH_SECURITY_RATING_A_METRIC).getIntValue()).isEqualTo(170);
 
     assertThat(getMeasure(SUB_MODULE, VULNERABILITIES_METRIC).getIntValue()).isEqualTo(1);
     assertThat(getMeasure(SUB_MODULE, SECURITY_REMEDIATION_EFFORT_METRIC).getIntValue()).isEqualTo(85);
     assertThat(getMeasure(SUB_MODULE, SECURITY_RATING_METRIC).getData()).isEqualTo("E");
-    assertThat(getMeasure(SUB_MODULE, EFFORT_TO_REACH_SECURITY_RATING_A_METRIC).getIntValue()).isEqualTo(85);
 
     assertThat(getMeasure(DIRECTORY, VULNERABILITIES_METRIC).getIntValue()).isEqualTo(0);
     assertThat(getMeasure(DIRECTORY, SECURITY_REMEDIATION_EFFORT_METRIC).getIntValue()).isEqualTo(0);
     assertThat(getMeasure(DIRECTORY, SECURITY_RATING_METRIC).getData()).isEqualTo("A");
-    assertThat(getMeasure(DIRECTORY, EFFORT_TO_REACH_SECURITY_RATING_A_METRIC).getIntValue()).isEqualTo(0);
 
     assertThat(getMeasure(FILE, VULNERABILITIES_METRIC)).isNull();
     assertThat(getMeasure(FILE, SECURITY_REMEDIATION_EFFORT_METRIC)).isNull();
     assertThat(getMeasure(FILE, SECURITY_RATING_METRIC).getData()).isEqualTo("A");
-    assertThat(getMeasure(FILE, EFFORT_TO_REACH_SECURITY_RATING_A_METRIC)).isNull();
   }
 
   @Test
@@ -98,7 +92,6 @@ public class SecurityMeasureTest {
     assertThat(getMeasure(PROJECT, VULNERABILITIES_METRIC).getIntValue()).isEqualTo(0);
     assertThat(getMeasure(PROJECT, SECURITY_REMEDIATION_EFFORT_METRIC).getIntValue()).isEqualTo(0);
     assertThat(getMeasure(PROJECT, SECURITY_RATING_METRIC).getData()).isEqualTo("A");
-    assertThat(getMeasure(PROJECT, EFFORT_TO_REACH_SECURITY_RATING_A_METRIC).getIntValue()).isEqualTo(0);
   }
 
   @CheckForNull
diff --git a/it/it-tests/src/test/java/it/qualityModel/TechnicalDebtMeasureVariationTest.java b/it/it-tests/src/test/java/it/qualityModel/TechnicalDebtMeasureVariationTest.java
index 12b52584144..5980edcfa97 100644
--- a/it/it-tests/src/test/java/it/qualityModel/TechnicalDebtMeasureVariationTest.java
+++ b/it/it-tests/src/test/java/it/qualityModel/TechnicalDebtMeasureVariationTest.java
@@ -21,7 +21,7 @@ package it.qualityModel;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.locator.FileLocation;
-import it.Category1Suite;
+import it.Category2Suite;
 import java.util.List;
 import org.junit.AfterClass;
 import org.junit.Before;
@@ -42,7 +42,7 @@ import static util.ItUtils.setServerProperty;
 public class TechnicalDebtMeasureVariationTest {
 
   @ClassRule
-  public static Orchestrator orchestrator = Category1Suite.ORCHESTRATOR;
+  public static Orchestrator orchestrator = Category2Suite.ORCHESTRATOR;
 
   @BeforeClass
   public static void initPeriods() throws Exception {