Move Measure ITs to category 4

diff --git a/it/it-tests/src/test/java/it/Category2Suite.java b/it/it-tests/src/test/java/it/Category2Suite.java
index 871f8c1a70297ba139dae3096ba6d10ce63b55af..6183bca5c32c0bfafea91f86b995b92a93eff16e 100644 (file)
--- a/it/it-tests/src/test/java/it/Category2Suite.java
+++ b/it/it-tests/src/test/java/it/Category2Suite.java
@@ -20,7 +20,6 @@
 package it;
 
 import com.sonar.orchestrator.Orchestrator;
-import it.customMeasure.CustomMeasuresTest;
 import it.debt.SqaleRatingMeasureTest;
 import it.debt.TechnicalDebtInIssueChangelogTest;
 import it.debt.TechnicalDebtMeasureTest;
@@ -42,9 +41,6 @@ import it.issue.IssueWorkflowTest;
 import it.issue.ManualIssueRelocationTest;
 import it.issue.ManualIssueTest;
 import it.issue.NewIssuesMeasureTest;
-import it.measure.NewDebtRatioMeasureTest;
-import it.measure.TechnicalDebtMeasureVariationTest;
-import it.measureFilter.MeasureFiltersTest;
 import it.rule.ManualRulesTest;
 import it.test.CoverageTest;
 import it.test.CoverageTrackingTest;
@@ -59,12 +55,6 @@ import static util.ItUtils.xooPlugin;
 
 @RunWith(Suite.class)
 @Suite.SuiteClasses({
-  // custom measure
-  CustomMeasuresTest.class,
-  // measure
-  TechnicalDebtMeasureVariationTest.class,
-  NewDebtRatioMeasureTest.class,
-  MeasureFiltersTest.class,
   // test
   CoverageTrackingTest.class,
   CoverageTest.class,

diff --git a/it/it-tests/src/test/java/it/Category4Suite.java b/it/it-tests/src/test/java/it/Category4Suite.java
index 16c26914b500cadfd22a837ac7501e87b21b9c59..6ecd8a7fd60c57656dbcb65376053b023b24c536 100644 (file)
--- a/it/it-tests/src/test/java/it/Category4Suite.java
+++ b/it/it-tests/src/test/java/it/Category4Suite.java
@@ -24,11 +24,15 @@ import it.analysisExclusion.FileExclusionsTest;
 import it.analysisExclusion.IssueExclusionsTest;
 import it.component.ComponentsWsTest;
 import it.component.ProjectSearchTest;
+import it.customMeasure.CustomMeasuresTest;
 import it.dbCleaner.PurgeTest;
 import it.duplication.CrossProjectDuplicationsOnRemoveFileTest;
 import it.duplication.CrossProjectDuplicationsTest;
 import it.duplication.DuplicationsTest;
 import it.highlighting.HighlightingTest;
+import it.measure.NewDebtRatioMeasureTest;
+import it.measure.TechnicalDebtMeasureVariationTest;
+import it.measureFilter.MeasureFiltersTest;
 import it.projectEvent.EventTest;
 import it.serverSystem.ServerSystemTest;
 import it.user.BaseIdentityProviderTest;
@@ -46,6 +50,12 @@ import static util.ItUtils.xooPlugin;
 
 @RunWith(Suite.class)
 @Suite.SuiteClasses({
+  // custom measure
+  CustomMeasuresTest.class,
+  // measure
+  TechnicalDebtMeasureVariationTest.class,
+  NewDebtRatioMeasureTest.class,
+  MeasureFiltersTest.class,
   // server system
   ServerSystemTest.class,
   // user

diff --git a/it/it-tests/src/test/java/it/customMeasure/CustomMeasuresTest.java b/it/it-tests/src/test/java/it/customMeasure/CustomMeasuresTest.java
index 1aff772327548344469575980006d7356f934c8d..efeb1f238d7bff469d77dedbf43139555b5405e8 100644 (file)
--- a/it/it-tests/src/test/java/it/customMeasure/CustomMeasuresTest.java
+++ b/it/it-tests/src/test/java/it/customMeasure/CustomMeasuresTest.java
@@ -21,7 +21,7 @@ package it.customMeasure;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarRunner;
-import it.Category2Suite;
+import it.Category4Suite;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import org.junit.Before;
@@ -38,7 +38,7 @@ public class CustomMeasuresTest {
 
   public static final String PROJECT_KEY = "sample";
   @ClassRule
-  public static Orchestrator orchestrator = Category2Suite.ORCHESTRATOR;
+  public static Orchestrator orchestrator = Category4Suite.ORCHESTRATOR;
 
   @Before
   public void deleteProjects() {

diff --git a/it/it-tests/src/test/java/it/measure/NewDebtRatioMeasureTest.java b/it/it-tests/src/test/java/it/measure/NewDebtRatioMeasureTest.java
index 6356afeeea22bb2016c580d99984a8b121970a27..21c6fd89c15a6cab49bc358130dc399ed181e7c8 100644 (file)
--- a/it/it-tests/src/test/java/it/measure/NewDebtRatioMeasureTest.java
+++ b/it/it-tests/src/test/java/it/measure/NewDebtRatioMeasureTest.java
@@ -21,7 +21,7 @@ package it.measure;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.locator.FileLocation;
-import it.Category2Suite;
+import it.Category4Suite;
 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 = Category2Suite.ORCHESTRATOR;
+  public static Orchestrator orchestrator = Category4Suite.ORCHESTRATOR;
 
   @BeforeClass
   public static void initPeriods() throws Exception {

diff --git a/it/it-tests/src/test/java/it/measure/TechnicalDebtMeasureVariationTest.java b/it/it-tests/src/test/java/it/measure/TechnicalDebtMeasureVariationTest.java
index eb71b9630fbbeedc779ab9bee44f08b3d77c4d3e..675a88eaf0d01beac5a62e1b5812a24fb6225fd7 100644 (file)
--- a/it/it-tests/src/test/java/it/measure/TechnicalDebtMeasureVariationTest.java
+++ b/it/it-tests/src/test/java/it/measure/TechnicalDebtMeasureVariationTest.java
@@ -21,7 +21,7 @@ package it.measure;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.locator.FileLocation;
-import it.Category2Suite;
+import it.Category4Suite;
 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 = Category2Suite.ORCHESTRATOR;
+  public static Orchestrator orchestrator = Category4Suite.ORCHESTRATOR;
 
   @BeforeClass
   public static void initPeriods() throws Exception {

diff --git a/it/it-tests/src/test/java/it/measureFilter/MeasureFiltersTest.java b/it/it-tests/src/test/java/it/measureFilter/MeasureFiltersTest.java
index 7f77e62ec793c9f3d30e4a6a67bdf8613d0ae1c7..77674ae969edcd5c155c48edec0dc3646320b1f6 100644 (file)
--- a/it/it-tests/src/test/java/it/measureFilter/MeasureFiltersTest.java
+++ b/it/it-tests/src/test/java/it/measureFilter/MeasureFiltersTest.java
@@ -22,7 +22,7 @@ package it.measureFilter;
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarRunner;
 import com.sonar.orchestrator.selenium.Selenese;
-import it.Category2Suite;
+import it.Category4Suite;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
@@ -39,7 +39,7 @@ import static util.ItUtils.projectDir;
 public class MeasureFiltersTest {
 
   @ClassRule
-  public static Orchestrator orchestrator = Category2Suite.ORCHESTRATOR;
+  public static Orchestrator orchestrator = Category4Suite.ORCHESTRATOR;
   public static WsClient adminWsClient;
 
   @BeforeClass