Reorganize some ITs

38 files changed, 88 insertions, 82 deletions

diff --git a/it/it-tests/src/test/java/it/Category1Suite.java b/it/it-tests/src/test/java/it/Category1Suite.java
index 06bd1bb8598..791c7675887 100644
--- a/it/it-tests/src/test/java/it/Category1Suite.java
+++ b/it/it-tests/src/test/java/it/Category1Suite.java
@@ -48,7 +48,15 @@ import it.authorisation.PermissionSearchTest;
 import it.authorisation.ProvisioningPermissionTest;
 import it.authorisation.QualityProfileAdminPermissionTest;
 import it.authorisation.SystemAdminPermissionTest;
+import it.customMeasure.CustomMeasuresTest;
 import it.i18n.I18nTest;
+import it.measure.MeasuresWsTest;
+import it.measure.NewDebtRatioMeasureTest;
+import it.measure.ProjectDrilldownTest;
+import it.measure.ProjectOverviewTest;
+import it.measure.ProjectWidgetsTest;
+import it.measure.TechnicalDebtMeasureVariationTest;
+import it.measureFilter.MeasureFiltersTest;
 import it.measureHistory.DifferentialPeriodsTest;
 import it.measureHistory.HistoryUiTest;
 import it.measureHistory.SincePreviousVersionHistoryTest;
@@ -57,12 +65,6 @@ import it.measureHistory.TimeMachineTest;
 import it.projectAdministration.BackgroundTasksTest;
 import it.projectAdministration.BulkDeletionTest;
 import it.projectAdministration.ProjectAdministrationTest;
-import it.projectServices.AllProjectsTest;
-import it.projectServices.ProjectCodeTest;
-import it.projectServices.ProjectComparisonTest;
-import it.projectServices.ProjectDrilldownTest;
-import it.projectServices.ProjectOverviewTest;
-import it.projectServices.ProjectWidgetsTest;
 import it.qualityGate.QualityGateNotificationTest;
 import it.qualityGate.QualityGateTest;
 import it.qualityGate.QualityGateUiTest;
@@ -70,6 +72,8 @@ import it.settings.PropertySetsTest;
 import it.settings.SettingsTest;
 import it.settings.SubCategoriesTest;
 import it.sourceCode.EncodingTest;
+import it.sourceCode.HighlightingTest;
+import it.sourceCode.ProjectCodeTest;
 import org.junit.ClassRule;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
@@ -85,14 +89,6 @@ import static util.ItUtils.xooPlugin;
   BulkDeletionTest.class,
   ProjectAdministrationTest.class,
   BackgroundTasksTest.class,
-  // project pages
-  ProjectOverviewTest.class,
-  ProjectCodeTest.class,
-  ProjectDrilldownTest.class,
-  ProjectComparisonTest.class,
-  AllProjectsTest.class,
-  ProjectWidgetsTest.class,
-  EncodingTest.class,
   // settings
   PropertySetsTest.class,
   SubCategoriesTest.class,
@@ -111,6 +107,16 @@ import static util.ItUtils.xooPlugin;
   ProvisioningPermissionTest.class,
   QualityProfileAdminPermissionTest.class,
   SystemAdminPermissionTest.class,
+  // custom measure
+  CustomMeasuresTest.class,
+  // measure
+  NewDebtRatioMeasureTest.class,
+  ProjectDrilldownTest.class,
+  ProjectOverviewTest.class,
+  ProjectWidgetsTest.class,
+  MeasureFiltersTest.class,
+  MeasuresWsTest.class,
+  TechnicalDebtMeasureVariationTest.class,
   // measure history
   DifferentialPeriodsTest.class,
   HistoryUiTest.class,
@@ -119,7 +125,12 @@ import static util.ItUtils.xooPlugin;
   TimeMachineTest.class,
   // action plan
   ActionPlanTest.class,
-  ActionPlanUiTest.class
+  ActionPlanUiTest.class,
+  // source code
+  EncodingTest.class,
+  HighlightingTest.class,
+  ProjectCodeTest.class
+
 })
 public class Category1Suite {
 
diff --git a/it/it-tests/src/test/java/it/Category4Suite.java b/it/it-tests/src/test/java/it/Category4Suite.java
index dbe3f376edb..5dfc77d90a4 100644
--- a/it/it-tests/src/test/java/it/Category4Suite.java
+++ b/it/it-tests/src/test/java/it/Category4Suite.java
@@ -25,15 +25,12 @@ import it.analysisExclusion.IssueExclusionsTest;
 import it.component.ComponentsWsTest;
 import it.component.ProjectSearchTest;
 import it.componentDashboard.DashboardTest;
-import it.customMeasure.CustomMeasuresTest;
+import it.componentSearch.AllProjectsTest;
 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.projectComparison.ProjectComparisonTest;
 import it.projectEvent.EventTest;
 import it.serverSystem.ServerSystemTest;
 import it.user.BaseIdentityProviderTest;
@@ -51,12 +48,6 @@ 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
@@ -81,9 +72,12 @@ import static util.ItUtils.xooPlugin;
   PurgeTest.class,
   // project event
   EventTest.class,
-  // highlighting
-  HighlightingTest.class,
-  DashboardTest.class
+  // component dashboard
+  DashboardTest.class,
+  // project comparison
+  ProjectComparisonTest.class,
+  // component search
+  AllProjectsTest.class
 })
 public class Category4Suite {
 
diff --git a/it/it-tests/src/test/java/it/projectServices/AllProjectsTest.java b/it/it-tests/src/test/java/it/componentSearch/AllProjectsTest.java
index 57af7d162af..b3f6bd3651f 100644
--- a/it/it-tests/src/test/java/it/projectServices/AllProjectsTest.java
+++ b/it/it-tests/src/test/java/it/componentSearch/AllProjectsTest.java
@@ -17,12 +17,12 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.projectServices;
+package it.componentSearch;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarRunner;
 import com.sonar.orchestrator.selenium.Selenese;
-import it.Category1Suite;
+import it.Category4Suite;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Test;
@@ -33,7 +33,7 @@ import static util.ItUtils.projectDir;
 public class AllProjectsTest {
 
   @ClassRule
-  public static Orchestrator orchestrator = Category1Suite.ORCHESTRATOR;
+  public static Orchestrator orchestrator = Category4Suite.ORCHESTRATOR;
 
   @BeforeClass
   public static void inspectProject() {
@@ -47,7 +47,7 @@ public class AllProjectsTest {
   @Test
   public void test_all_projects_page() {
     Selenese selenese = Selenese.builder().setHtmlTestsInClasspath("test_all_projects_page",
-      "/projectServices/AllProjectsTest/test_all_projects_page.html"
+      "/componentSearch/AllProjectsTest/test_all_projects_page.html"
     ).build();
     new SeleneseTest(selenese).runOn(orchestrator);
   }
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 efeb1f238d7..5aa1c2d8296 100644
--- 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.Category4Suite;
+import it.Category1Suite;
 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 = Category4Suite.ORCHESTRATOR;
+  public static Orchestrator orchestrator = Category1Suite.ORCHESTRATOR;
 
   @Before
   public void deleteProjects() {
diff --git a/it/it-tests/src/test/java/it/measure/MeasuresWsTest.java b/it/it-tests/src/test/java/it/measure/MeasuresWsTest.java
index 8a0ab35148c..42f513aa795 100644
--- a/it/it-tests/src/test/java/it/measure/MeasuresWsTest.java
+++ b/it/it-tests/src/test/java/it/measure/MeasuresWsTest.java
@@ -21,7 +21,7 @@ package it.measure;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarRunner;
-import it.Category4Suite;
+import it.Category1Suite;
 import java.util.List;
 import org.junit.AfterClass;
 import org.junit.Before;
@@ -44,7 +44,7 @@ import static util.ItUtils.setServerProperty;
 
 public class MeasuresWsTest {
   @ClassRule
-  public static final Orchestrator orchestrator = Category4Suite.ORCHESTRATOR;
+  public static final Orchestrator orchestrator = Category1Suite.ORCHESTRATOR;
   private static final String FILE_KEY = "sample:src/main/xoo/sample/Sample.xoo";
   WsClient wsClient;
 
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 21c6fd89c15..d6198be3e97 100644
--- 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.Category4Suite;
+import it.Category1Suite;
 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 = Category4Suite.ORCHESTRATOR;
+  public static Orchestrator orchestrator = Category1Suite.ORCHESTRATOR;
 
   @BeforeClass
   public static void initPeriods() throws Exception {
diff --git a/it/it-tests/src/test/java/it/projectServices/ProjectDrilldownTest.java b/it/it-tests/src/test/java/it/measure/ProjectDrilldownTest.java
index 9a37eb4aac8..60b4db48715 100644
--- a/it/it-tests/src/test/java/it/projectServices/ProjectDrilldownTest.java
+++ b/it/it-tests/src/test/java/it/measure/ProjectDrilldownTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.projectServices;
+package it.measure;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarRunner;
@@ -26,13 +26,8 @@ import it.Category1Suite;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Test;
-import org.sonar.wsclient.Sonar;
-import org.sonar.wsclient.services.Resource;
-import org.sonar.wsclient.services.ResourceQuery;
 import util.selenium.SeleneseTest;
 
-import java.util.List;
-
 import static util.ItUtils.projectDir;
 
 public class ProjectDrilldownTest {
@@ -52,7 +47,7 @@ public class ProjectDrilldownTest {
   @Test
   public void should_display_measure_drilldown() {
     Selenese selenese = Selenese.builder().setHtmlTestsInClasspath("should_display_measure_drilldown",
-      "/projectServices/ProjectDrilldownTest/should_display_measure_drilldown.html"
+      "/measure/ProjectDrilldownTest/should_display_measure_drilldown.html"
     ).build();
     new SeleneseTest(selenese).runOn(orchestrator);
   }
diff --git a/it/it-tests/src/test/java/it/projectServices/ProjectOverviewTest.java b/it/it-tests/src/test/java/it/measure/ProjectOverviewTest.java
index c079be46c25..069fd101e24 100644
--- a/it/it-tests/src/test/java/it/projectServices/ProjectOverviewTest.java
+++ b/it/it-tests/src/test/java/it/measure/ProjectOverviewTest.java
@@ -17,12 +17,13 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.projectServices;
+package it.measure;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarRunner;
 import com.sonar.orchestrator.selenium.Selenese;
 import it.Category1Suite;
+import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Test;
 import util.selenium.SeleneseTest;
@@ -34,12 +35,17 @@ public class ProjectOverviewTest {
   @ClassRule
   public static Orchestrator orchestrator = Category1Suite.ORCHESTRATOR;
 
+  @Before
+  public void resetData() throws Exception {
+    orchestrator.resetData();
+  }
+
   @Test
   public void test_project_overview_after_first_analysis() throws Exception {
     executeBuild("shared/xoo-sample", "project-for-overview", "Project For Overview");
 
     Selenese selenese = Selenese.builder().setHtmlTestsInClasspath("test_project_overview_after_first_analysis",
-      "/projectServices/ProjectOverviewTest/test_project_overview_after_first_analysis.html"
+      "/measure/ProjectOverviewTest/test_project_overview_after_first_analysis.html"
     ).build();
     new SeleneseTest(selenese).runOn(orchestrator);
   }
@@ -49,7 +55,7 @@ public class ProjectOverviewTest {
     executeBuild("testing/xoo-sample-ut-coverage", "project-for-overview-ut-coverage", "Project For Overview UT");
 
     Selenese selenese = Selenese.builder().setHtmlTestsInClasspath("test_ut_coverage_on_project_overview",
-      "/projectServices/ProjectOverviewTest/test_ut_coverage_on_project_overview.html"
+      "/measure/ProjectOverviewTest/test_ut_coverage_on_project_overview.html"
     ).build();
     new SeleneseTest(selenese).runOn(orchestrator);
   }
@@ -59,7 +65,7 @@ public class ProjectOverviewTest {
     executeBuild("testing/xoo-sample-it-coverage", "project-for-overview-it-coverage", "Project For Overview IT");
 
     Selenese selenese = Selenese.builder().setHtmlTestsInClasspath("test_it_coverage_onfi_project_overview",
-      "/projectServices/ProjectOverviewTest/test_it_coverage_on_project_overview.html"
+      "/measure/ProjectOverviewTest/test_it_coverage_on_project_overview.html"
     ).build();
     new SeleneseTest(selenese).runOn(orchestrator);
   }
@@ -69,7 +75,7 @@ public class ProjectOverviewTest {
     executeBuild("testing/xoo-sample-overall-coverage", "project-for-overview-overall-coverage", "Project For Overview Overall");
 
     Selenese selenese = Selenese.builder().setHtmlTestsInClasspath("test_overall_coverage_on_project_overview",
-      "/projectServices/ProjectOverviewTest/test_overall_coverage_on_project_overview.html"
+      "/measure/ProjectOverviewTest/test_overall_coverage_on_project_overview.html"
     ).build();
     new SeleneseTest(selenese).runOn(orchestrator);
   }
@@ -77,7 +83,7 @@ public class ProjectOverviewTest {
   @Test
   public void should_display_a_nice_error_when_requesting_unknown_project() {
     Selenese selenese = Selenese.builder().setHtmlTestsInClasspath("should_display_a_nice_error_when_requesting_unknown_project",
-      "/projectServices/ProjectOverviewTest/should-display-nice-error-on-unknown-project.html").build();
+      "/measure/ProjectOverviewTest/should-display-nice-error-on-unknown-project.html").build();
     orchestrator.executeSelenese(selenese);
   }
 
diff --git a/it/it-tests/src/test/java/it/projectServices/ProjectWidgetsTest.java b/it/it-tests/src/test/java/it/measure/ProjectWidgetsTest.java
index c3012367b9f..d5c2bdff52c 100644
--- a/it/it-tests/src/test/java/it/projectServices/ProjectWidgetsTest.java
+++ b/it/it-tests/src/test/java/it/measure/ProjectWidgetsTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.projectServices;
+package it.measure;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarRunner;
@@ -49,8 +49,8 @@ public class ProjectWidgetsTest {
   @Test
   public void hotspots() {
     Selenese selenese = Selenese.builder().setHtmlTestsInClasspath("hotspots",
-      "/projectServices/ProjectWidgetsTest/hotspots/hotspot-metric-widget.html",
-      "/projectServices/ProjectWidgetsTest/hotspots/hide-if-no-measures.html"
+      "/measure/ProjectWidgetsTest/hotspots/hotspot-metric-widget.html",
+      "/measure/ProjectWidgetsTest/hotspots/hide-if-no-measures.html"
     ).build();
     new SeleneseTest(selenese).runOn(orchestrator);
   }
@@ -58,7 +58,7 @@ public class ProjectWidgetsTest {
   @Test
   public void complexity() {
     Selenese selenese = Selenese.builder().setHtmlTestsInClasspath("complexity",
-      "/projectServices/ProjectWidgetsTest/complexity/complexity-widget.html"
+      "/measure/ProjectWidgetsTest/complexity/complexity-widget.html"
     ).build();
     new SeleneseTest(selenese).runOn(orchestrator);
   }
@@ -71,7 +71,7 @@ public class ProjectWidgetsTest {
     orchestrator.getServer().adminWsClient().qualityGateClient().selectProject(qualityGateId, projectId);
 
     Selenese selenese = Selenese.builder().setHtmlTestsInClasspath("description",
-      "/projectServices/ProjectWidgetsTest/description/description-widget.html"
+      "/measure/ProjectWidgetsTest/description/description-widget.html"
     ).build();
     new SeleneseTest(selenese).runOn(orchestrator);
   }
@@ -80,7 +80,7 @@ public class ProjectWidgetsTest {
   @Ignore
   public void custom_measures() {
     Selenese selenese = Selenese.builder().setHtmlTestsInClasspath("custom_measures",
-      "/projectServices/ProjectWidgetsTest/custom_measures/should-exclude-new-metrics.html"
+      "/measure/ProjectWidgetsTest/custom_measures/should-exclude-new-metrics.html"
     ).build();
     new SeleneseTest(selenese).runOn(orchestrator);
   }
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 675a88eaf0d..f5369071e94 100644
--- 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.Category4Suite;
+import it.Category1Suite;
 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 = Category4Suite.ORCHESTRATOR;
+  public static Orchestrator orchestrator = Category1Suite.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 77674ae969e..01b09402103 100644
--- 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.Category4Suite;
+import it.Category1Suite;
 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 = Category4Suite.ORCHESTRATOR;
+  public static Orchestrator orchestrator = Category1Suite.ORCHESTRATOR;
   public static WsClient adminWsClient;
 
   @BeforeClass
diff --git a/it/it-tests/src/test/java/it/projectServices/ProjectComparisonTest.java b/it/it-tests/src/test/java/it/projectComparison/ProjectComparisonTest.java
index f0696412bf7..b06d762b80b 100644
--- a/it/it-tests/src/test/java/it/projectServices/ProjectComparisonTest.java
+++ b/it/it-tests/src/test/java/it/projectComparison/ProjectComparisonTest.java
@@ -17,12 +17,12 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.projectServices;
+package it.projectComparison;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarRunner;
 import com.sonar.orchestrator.selenium.Selenese;
-import it.Category1Suite;
+import it.Category4Suite;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Ignore;
@@ -34,7 +34,7 @@ import static util.ItUtils.projectDir;
 public class ProjectComparisonTest {
 
   @ClassRule
-  public static Orchestrator orchestrator = Category1Suite.ORCHESTRATOR;
+  public static Orchestrator orchestrator = Category4Suite.ORCHESTRATOR;
 
   @BeforeClass
   public static void inspectProject() {
@@ -49,12 +49,12 @@ public class ProjectComparisonTest {
   @Ignore("need to find a way to type into invisible input fields")
   public void test_project_comparison_service() {
     Selenese selenese = Selenese.builder().setHtmlTestsInClasspath("test_project_comparison_service",
-      "/projectServices/ProjectComparisonTest/should-display-basic-set-of-metrics.html",
-      "/projectServices/ProjectComparisonTest/should-add-projects.html",
-      "/projectServices/ProjectComparisonTest/should-move-and-remove-projects.html",
-      "/projectServices/ProjectComparisonTest/should-add-metrics.html",
-      "/projectServices/ProjectComparisonTest/should-not-add-differential-metrics.html",
-      "/projectServices/ProjectComparisonTest/should-move-and-remove-metrics.html"
+      "/projectComparison/ProjectComparisonTest/should-display-basic-set-of-metrics.html",
+      "/projectComparison/ProjectComparisonTest/should-add-projects.html",
+      "/projectComparison/ProjectComparisonTest/should-move-and-remove-projects.html",
+      "/projectComparison/ProjectComparisonTest/should-add-metrics.html",
+      "/projectComparison/ProjectComparisonTest/should-not-add-differential-metrics.html",
+      "/projectComparison/ProjectComparisonTest/should-move-and-remove-metrics.html"
     ).build();
     new SeleneseTest(selenese).runOn(orchestrator);
   }
diff --git a/it/it-tests/src/test/java/it/highlighting/HighlightingTest.java b/it/it-tests/src/test/java/it/sourceCode/HighlightingTest.java
index 41dc60b3b08..44eef089527 100644
--- a/it/it-tests/src/test/java/it/highlighting/HighlightingTest.java
+++ b/it/it-tests/src/test/java/it/sourceCode/HighlightingTest.java
@@ -17,11 +17,11 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.highlighting;
+package it.sourceCode;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.selenium.Selenese;
-import it.Category4Suite;
+import it.Category1Suite;
 import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Test;
@@ -31,7 +31,7 @@ import static util.ItUtils.runProjectAnalysis;
 public class HighlightingTest {
 
   @ClassRule
-  public static Orchestrator orchestrator = Category4Suite.ORCHESTRATOR;
+  public static Orchestrator orchestrator = Category1Suite.ORCHESTRATOR;
 
   @Before
   public void deleteData() {
@@ -44,9 +44,9 @@ public class HighlightingTest {
 
     Selenese selenese = Selenese.builder().setHtmlTestsInClasspath("highlight_source_code_and_symbols_usage",
       // SONAR-3893 & SONAR-4247
-      "/highlighting/HighlightingTest/syntax-highlighting.html",
+      "/sourceCode/HighlightingTest/syntax-highlighting.html",
       // SONAR-4249 & SONAR-4250
-      "/highlighting/HighlightingTest/symbol-usages-highlighting.html"
+      "/sourceCode/HighlightingTest/symbol-usages-highlighting.html"
       ).build();
     orchestrator.executeSelenese(selenese);
   }
@@ -57,14 +57,14 @@ public class HighlightingTest {
     runProjectAnalysis(orchestrator, "highlighting/xoo-sample-with-highlighting-v1");
 
     Selenese selenese = Selenese.builder().setHtmlTestsInClasspath("syntax-highlighting-v1",
-      "/highlighting/HighlightingTest/syntax-highlighting-v1.html").build();
+      "/sourceCode/HighlightingTest/syntax-highlighting-v1.html").build();
     orchestrator.executeSelenese(selenese);
 
     runProjectAnalysis(orchestrator, "highlighting/xoo-sample-with-highlighting-v2");
 
     selenese = Selenese.builder().setHtmlTestsInClasspath("syntax-highlighting-v2",
-      "/highlighting/HighlightingTest/syntax-highlighting-v2.html",
-      "/highlighting/HighlightingTest/symbol-usages-highlighting.html").build();
+      "/sourceCode/HighlightingTest/syntax-highlighting-v2.html",
+      "/sourceCode/HighlightingTest/symbol-usages-highlighting.html").build();
     orchestrator.executeSelenese(selenese);
   }
 }
diff --git a/it/it-tests/src/test/java/it/projectServices/ProjectCodeTest.java b/it/it-tests/src/test/java/it/sourceCode/ProjectCodeTest.java
index 56c62273cd2..bd794bf6682 100644
--- a/it/it-tests/src/test/java/it/projectServices/ProjectCodeTest.java
+++ b/it/it-tests/src/test/java/it/sourceCode/ProjectCodeTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.projectServices;
+package it.sourceCode;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarRunner;
@@ -39,7 +39,7 @@ public class ProjectCodeTest {
     executeBuild("shared/xoo-sample", "project-for-code", "Project For Code");
 
     Selenese selenese = Selenese.builder().setHtmlTestsInClasspath("test_project_code_page",
-      "/projectServices/ProjectCodeTest/test_project_code_page.html"
+      "/sourceCode/ProjectCodeTest/test_project_code_page.html"
     ).build();
     new SeleneseTest(selenese).runOn(orchestrator);
   }
@@ -49,7 +49,7 @@ public class ProjectCodeTest {
     executeBuild("shared/xoo-sample-with-root-dir", "project-for-code-root-dir", "Project For Code");
 
     Selenese selenese = Selenese.builder().setHtmlTestsInClasspath("code_page_should_expand_root_dir",
-      "/projectServices/ProjectCodeTest/code_page_should_expand_root_dir.html"
+      "/sourceCode/ProjectCodeTest/code_page_should_expand_root_dir.html"
     ).build();
     new SeleneseTest(selenese).runOn(orchestrator);
   }
diff --git a/it/it-tests/src/test/resources/projectServices/AllProjectsTest/test_all_projects_page.html b/it/it-tests/src/test/resources/componentSearch/AllProjectsTest/test_all_projects_page.html
index 551ede118ed..551ede118ed 100644
--- a/it/it-tests/src/test/resources/projectServices/AllProjectsTest/test_all_projects_page.html
+++ b/it/it-tests/src/test/resources/componentSearch/AllProjectsTest/test_all_projects_page.html
diff --git a/it/it-tests/src/test/resources/projectServices/ProjectDrilldownTest/should_display_measure_drilldown.html b/it/it-tests/src/test/resources/measure/ProjectDrilldownTest/should_display_measure_drilldown.html
index ce89d3df2df..ce89d3df2df 100644
--- a/it/it-tests/src/test/resources/projectServices/ProjectDrilldownTest/should_display_measure_drilldown.html
+++ b/it/it-tests/src/test/resources/measure/ProjectDrilldownTest/should_display_measure_drilldown.html
diff --git a/it/it-tests/src/test/resources/projectServices/ProjectOverviewTest/should-display-nice-error-on-unknown-project.html b/it/it-tests/src/test/resources/measure/ProjectOverviewTest/should-display-nice-error-on-unknown-project.html
index 3cbf2bf44fa..3cbf2bf44fa 100644
--- a/it/it-tests/src/test/resources/projectServices/ProjectOverviewTest/should-display-nice-error-on-unknown-project.html
+++ b/it/it-tests/src/test/resources/measure/ProjectOverviewTest/should-display-nice-error-on-unknown-project.html
diff --git a/it/it-tests/src/test/resources/projectServices/ProjectOverviewTest/test_it_coverage_on_project_overview.html b/it/it-tests/src/test/resources/measure/ProjectOverviewTest/test_it_coverage_on_project_overview.html
index 09d5b93211e..09d5b93211e 100644
--- a/it/it-tests/src/test/resources/projectServices/ProjectOverviewTest/test_it_coverage_on_project_overview.html
+++ b/it/it-tests/src/test/resources/measure/ProjectOverviewTest/test_it_coverage_on_project_overview.html
diff --git a/it/it-tests/src/test/resources/projectServices/ProjectOverviewTest/test_overall_coverage_on_project_overview.html b/it/it-tests/src/test/resources/measure/ProjectOverviewTest/test_overall_coverage_on_project_overview.html
index 8ef8b08e055..8ef8b08e055 100644
--- a/it/it-tests/src/test/resources/projectServices/ProjectOverviewTest/test_overall_coverage_on_project_overview.html
+++ b/it/it-tests/src/test/resources/measure/ProjectOverviewTest/test_overall_coverage_on_project_overview.html
diff --git a/it/it-tests/src/test/resources/projectServices/ProjectOverviewTest/test_project_overview_after_first_analysis.html b/it/it-tests/src/test/resources/measure/ProjectOverviewTest/test_project_overview_after_first_analysis.html
index 57852d8531a..57852d8531a 100644
--- a/it/it-tests/src/test/resources/projectServices/ProjectOverviewTest/test_project_overview_after_first_analysis.html
+++ b/it/it-tests/src/test/resources/measure/ProjectOverviewTest/test_project_overview_after_first_analysis.html
diff --git a/it/it-tests/src/test/resources/projectServices/ProjectOverviewTest/test_ut_coverage_on_project_overview.html b/it/it-tests/src/test/resources/measure/ProjectOverviewTest/test_ut_coverage_on_project_overview.html
index 158ddb02de3..158ddb02de3 100644
--- a/it/it-tests/src/test/resources/projectServices/ProjectOverviewTest/test_ut_coverage_on_project_overview.html
+++ b/it/it-tests/src/test/resources/measure/ProjectOverviewTest/test_ut_coverage_on_project_overview.html
diff --git a/it/it-tests/src/test/resources/projectServices/ProjectWidgetsTest/complexity/complexity-widget.html b/it/it-tests/src/test/resources/measure/ProjectWidgetsTest/complexity/complexity-widget.html
index e29192aa467..e29192aa467 100644
--- a/it/it-tests/src/test/resources/projectServices/ProjectWidgetsTest/complexity/complexity-widget.html
+++ b/it/it-tests/src/test/resources/measure/ProjectWidgetsTest/complexity/complexity-widget.html
diff --git a/it/it-tests/src/test/resources/projectServices/ProjectWidgetsTest/custom_measures/should-exclude-new-metrics.html b/it/it-tests/src/test/resources/measure/ProjectWidgetsTest/custom_measures/should-exclude-new-metrics.html
index 1f059bb1017..1f059bb1017 100644
--- a/it/it-tests/src/test/resources/projectServices/ProjectWidgetsTest/custom_measures/should-exclude-new-metrics.html
+++ b/it/it-tests/src/test/resources/measure/ProjectWidgetsTest/custom_measures/should-exclude-new-metrics.html
diff --git a/it/it-tests/src/test/resources/projectServices/ProjectWidgetsTest/description/description-widget.html b/it/it-tests/src/test/resources/measure/ProjectWidgetsTest/description/description-widget.html
index a3f2b8fdcb6..a3f2b8fdcb6 100644
--- a/it/it-tests/src/test/resources/projectServices/ProjectWidgetsTest/description/description-widget.html
+++ b/it/it-tests/src/test/resources/measure/ProjectWidgetsTest/description/description-widget.html
diff --git a/it/it-tests/src/test/resources/projectServices/ProjectWidgetsTest/hotspots/hide-if-no-measures.html b/it/it-tests/src/test/resources/measure/ProjectWidgetsTest/hotspots/hide-if-no-measures.html
index 53abb62658a..53abb62658a 100644
--- a/it/it-tests/src/test/resources/projectServices/ProjectWidgetsTest/hotspots/hide-if-no-measures.html
+++ b/it/it-tests/src/test/resources/measure/ProjectWidgetsTest/hotspots/hide-if-no-measures.html
diff --git a/it/it-tests/src/test/resources/projectServices/ProjectWidgetsTest/hotspots/hotspot-metric-widget.html b/it/it-tests/src/test/resources/measure/ProjectWidgetsTest/hotspots/hotspot-metric-widget.html
index 9d2358b703a..9d2358b703a 100644
--- a/it/it-tests/src/test/resources/projectServices/ProjectWidgetsTest/hotspots/hotspot-metric-widget.html
+++ b/it/it-tests/src/test/resources/measure/ProjectWidgetsTest/hotspots/hotspot-metric-widget.html
diff --git a/it/it-tests/src/test/resources/projectServices/ProjectComparisonTest/should-add-metrics.html b/it/it-tests/src/test/resources/projectComparison/ProjectComparisonTest/should-add-metrics.html
index 7ed09d6219a..7ed09d6219a 100644
--- a/it/it-tests/src/test/resources/projectServices/ProjectComparisonTest/should-add-metrics.html
+++ b/it/it-tests/src/test/resources/projectComparison/ProjectComparisonTest/should-add-metrics.html
diff --git a/it/it-tests/src/test/resources/projectServices/ProjectComparisonTest/should-add-projects.html b/it/it-tests/src/test/resources/projectComparison/ProjectComparisonTest/should-add-projects.html
index 18c882331ad..18c882331ad 100644
--- a/it/it-tests/src/test/resources/projectServices/ProjectComparisonTest/should-add-projects.html
+++ b/it/it-tests/src/test/resources/projectComparison/ProjectComparisonTest/should-add-projects.html
diff --git a/it/it-tests/src/test/resources/projectServices/ProjectComparisonTest/should-display-basic-set-of-metrics.html b/it/it-tests/src/test/resources/projectComparison/ProjectComparisonTest/should-display-basic-set-of-metrics.html
index 491a99caee0..491a99caee0 100644
--- a/it/it-tests/src/test/resources/projectServices/ProjectComparisonTest/should-display-basic-set-of-metrics.html
+++ b/it/it-tests/src/test/resources/projectComparison/ProjectComparisonTest/should-display-basic-set-of-metrics.html
diff --git a/it/it-tests/src/test/resources/projectServices/ProjectComparisonTest/should-move-and-remove-metrics.html b/it/it-tests/src/test/resources/projectComparison/ProjectComparisonTest/should-move-and-remove-metrics.html
index c4ae78e748d..c4ae78e748d 100644
--- a/it/it-tests/src/test/resources/projectServices/ProjectComparisonTest/should-move-and-remove-metrics.html
+++ b/it/it-tests/src/test/resources/projectComparison/ProjectComparisonTest/should-move-and-remove-metrics.html
diff --git a/it/it-tests/src/test/resources/projectServices/ProjectComparisonTest/should-move-and-remove-projects.html b/it/it-tests/src/test/resources/projectComparison/ProjectComparisonTest/should-move-and-remove-projects.html
index f7d71dbfd2f..f7d71dbfd2f 100644
--- a/it/it-tests/src/test/resources/projectServices/ProjectComparisonTest/should-move-and-remove-projects.html
+++ b/it/it-tests/src/test/resources/projectComparison/ProjectComparisonTest/should-move-and-remove-projects.html
diff --git a/it/it-tests/src/test/resources/projectServices/ProjectComparisonTest/should-not-add-differential-metrics.html b/it/it-tests/src/test/resources/projectComparison/ProjectComparisonTest/should-not-add-differential-metrics.html
index a47a119367c..a47a119367c 100644
--- a/it/it-tests/src/test/resources/projectServices/ProjectComparisonTest/should-not-add-differential-metrics.html
+++ b/it/it-tests/src/test/resources/projectComparison/ProjectComparisonTest/should-not-add-differential-metrics.html
diff --git a/it/it-tests/src/test/resources/highlighting/HighlightingTest/symbol-usages-highlighting.html b/it/it-tests/src/test/resources/sourceCode/HighlightingTest/symbol-usages-highlighting.html
index 42e1fc154f2..42e1fc154f2 100644
--- a/it/it-tests/src/test/resources/highlighting/HighlightingTest/symbol-usages-highlighting.html
+++ b/it/it-tests/src/test/resources/sourceCode/HighlightingTest/symbol-usages-highlighting.html
diff --git a/it/it-tests/src/test/resources/highlighting/HighlightingTest/syntax-highlighting-v1.html b/it/it-tests/src/test/resources/sourceCode/HighlightingTest/syntax-highlighting-v1.html
index 368c3bdf58e..368c3bdf58e 100644
--- a/it/it-tests/src/test/resources/highlighting/HighlightingTest/syntax-highlighting-v1.html
+++ b/it/it-tests/src/test/resources/sourceCode/HighlightingTest/syntax-highlighting-v1.html
diff --git a/it/it-tests/src/test/resources/highlighting/HighlightingTest/syntax-highlighting-v2.html b/it/it-tests/src/test/resources/sourceCode/HighlightingTest/syntax-highlighting-v2.html
index 57c535a10d3..57c535a10d3 100644
--- a/it/it-tests/src/test/resources/highlighting/HighlightingTest/syntax-highlighting-v2.html
+++ b/it/it-tests/src/test/resources/sourceCode/HighlightingTest/syntax-highlighting-v2.html
diff --git a/it/it-tests/src/test/resources/highlighting/HighlightingTest/syntax-highlighting.html b/it/it-tests/src/test/resources/sourceCode/HighlightingTest/syntax-highlighting.html
index 24d0ac63903..24d0ac63903 100644
--- a/it/it-tests/src/test/resources/highlighting/HighlightingTest/syntax-highlighting.html
+++ b/it/it-tests/src/test/resources/sourceCode/HighlightingTest/syntax-highlighting.html
diff --git a/it/it-tests/src/test/resources/projectServices/ProjectCodeTest/code_page_should_expand_root_dir.html b/it/it-tests/src/test/resources/sourceCode/ProjectCodeTest/code_page_should_expand_root_dir.html
index 4cc72851fb5..4cc72851fb5 100644
--- a/it/it-tests/src/test/resources/projectServices/ProjectCodeTest/code_page_should_expand_root_dir.html
+++ b/it/it-tests/src/test/resources/sourceCode/ProjectCodeTest/code_page_should_expand_root_dir.html
diff --git a/it/it-tests/src/test/resources/projectServices/ProjectCodeTest/test_project_code_page.html b/it/it-tests/src/test/resources/sourceCode/ProjectCodeTest/test_project_code_page.html
index 9c6b163fa44..9c6b163fa44 100644
--- a/it/it-tests/src/test/resources/projectServices/ProjectCodeTest/test_project_code_page.html
+++ b/it/it-tests/src/test/resources/sourceCode/ProjectCodeTest/test_project_code_page.html