SONAR-7409 Drop the "Drilldown" page and redirect to the "Measures" page

8 files changed, 46 insertions, 71 deletions

diff --git a/it/it-tests/src/test/java/it/Category1Suite.java b/it/it-tests/src/test/java/it/Category1Suite.java
index b0a519ffc7c..cfb7fca2c1a 100644
--- a/it/it-tests/src/test/java/it/Category1Suite.java
+++ b/it/it-tests/src/test/java/it/Category1Suite.java
@@ -33,7 +33,7 @@ import it.customMeasure.CustomMeasuresTest;
 import it.i18n.I18nTest;
 import it.measure.MeasuresWsTest;
 import it.measure.NewDebtRatioMeasureTest;
-import it.measure.ProjectDrilldownTest;
+import it.measure.ProjectMeasuresPageTest;
 import it.measure.ProjectOverviewTest;
 import it.measure.ProjectWidgetsTest;
 import it.measure.TechnicalDebtMeasureVariationTest;
@@ -92,7 +92,7 @@ import static util.ItUtils.xooPlugin;
   CustomMeasuresTest.class,
   // measure
   NewDebtRatioMeasureTest.class,
-  ProjectDrilldownTest.class,
+  ProjectMeasuresPageTest.class,
   ProjectOverviewTest.class,
   ProjectWidgetsTest.class,
   MeasureFiltersTest.class,
diff --git a/it/it-tests/src/test/java/it/debt/TechnicalDebtWidgetTest.java b/it/it-tests/src/test/java/it/debt/TechnicalDebtWidgetTest.java
index 973800cb8d2..72b93fdd451 100644
--- a/it/it-tests/src/test/java/it/debt/TechnicalDebtWidgetTest.java
+++ b/it/it-tests/src/test/java/it/debt/TechnicalDebtWidgetTest.java
@@ -73,7 +73,7 @@ public class TechnicalDebtWidgetTest {
     new SeleneseTest(Selenese.builder()
       .setHtmlTestsInClasspath("technical-debt-in-issues-widget",
         "/debt/TechnicalDebtWidgetTest/technical-debt/should-have-correct-values.html",
-        "/debt/TechnicalDebtWidgetTest/technical-debt/should-open-remediationcost-on-drilldown-service.html",
+        "/debt/TechnicalDebtWidgetTest/technical-debt/should-open-remediation-cost-on-measures-service.html",
         "/debt/TechnicalDebtWidgetTest/technical-debt/display-differential-values.html",
         // SONAR-4717
         "/debt/TechnicalDebtWidgetTest/technical-debt/is-in-issues-widget.html"
@@ -88,7 +88,7 @@ public class TechnicalDebtWidgetTest {
     new SeleneseTest(Selenese.builder()
       .setHtmlTestsInClasspath("debt-overview-widget",
         "/debt/TechnicalDebtWidgetTest/debt-overview/should-have-correct-values.html",
-        "/debt/TechnicalDebtWidgetTest/debt-overview/should-open-links-on-drilldown-service.html",
+        "/debt/TechnicalDebtWidgetTest/debt-overview/should-open-links-on-measures-service.html",
         "/debt/TechnicalDebtWidgetTest/debt-overview/display-differential-values.html"
       ).build()).runOn(orchestrator);
   }
diff --git a/it/it-tests/src/test/java/it/measure/ProjectDrilldownTest.java b/it/it-tests/src/test/java/it/measure/ProjectMeasuresPageTest.java
index 60b4db48715..10738476d27 100644
--- a/it/it-tests/src/test/java/it/measure/ProjectDrilldownTest.java
+++ b/it/it-tests/src/test/java/it/measure/ProjectMeasuresPageTest.java
@@ -30,7 +30,7 @@ import util.selenium.SeleneseTest;
 
 import static util.ItUtils.projectDir;
 
-public class ProjectDrilldownTest {
+public class ProjectMeasuresPageTest {
 
   @ClassRule
   public static Orchestrator orchestrator = Category1Suite.ORCHESTRATOR;
@@ -39,15 +39,15 @@ public class ProjectDrilldownTest {
   public static void inspectProject() {
     orchestrator.executeBuild(
       SonarRunner.create(projectDir("shared/xoo-sample"))
-        .setProjectKey("project-drilldown-test-project")
-        .setProjectName("ProjectDrilldownTest Project")
+        .setProjectKey("project-measures-page-test-project")
+        .setProjectName("ProjectMeasuresPageTest Project")
     );
   }
 
   @Test
-  public void should_display_measure_drilldown() {
-    Selenese selenese = Selenese.builder().setHtmlTestsInClasspath("should_display_measure_drilldown",
-      "/measure/ProjectDrilldownTest/should_display_measure_drilldown.html"
+  public void should_display_measures_page() {
+    Selenese selenese = Selenese.builder().setHtmlTestsInClasspath("should_display_measures_page",
+      "/measure/ProjectMeasuresPageTest/should_display_measures_page.html"
     ).build();
     new SeleneseTest(selenese).runOn(orchestrator);
   }
diff --git a/it/it-tests/src/test/resources/debt/TechnicalDebtWidgetTest/debt-overview/should-open-links-on-drilldown-service.html b/it/it-tests/src/test/resources/debt/TechnicalDebtWidgetTest/debt-overview/should-open-links-on-measures-service.html
index 75ab403af05..6c973914330 100644
--- a/it/it-tests/src/test/resources/debt/TechnicalDebtWidgetTest/debt-overview/should-open-links-on-drilldown-service.html
+++ b/it/it-tests/src/test/resources/debt/TechnicalDebtWidgetTest/debt-overview/should-open-links-on-measures-service.html
@@ -8,7 +8,7 @@
 <table cellpadding="1" cellspacing="1" border="1">
     <thead>
     <tr>
-        <td rowspan="1" colspan="3">should-open-links-on-drilldown-service</td>
+        <td rowspan="1" colspan="3">should-open-links-on-measures-service</td>
     </tr>
     </thead>
     <tbody>
@@ -23,7 +23,7 @@
         <td></td>
     </tr>
     <tr>
-        <td>assertText</td>
+        <td>waitForText</td>
         <td>content</td>
         <td>*SQALE Rating*C*</td>
     </tr>
@@ -38,7 +38,7 @@
         <td></td>
     </tr>
     <tr>
-        <td>assertText</td>
+        <td>waitForText</td>
         <td>content</td>
         <td>*Technical Debt Ratio*29.1%*</td>
     </tr>
diff --git a/it/it-tests/src/test/resources/debt/TechnicalDebtWidgetTest/technical-debt/is-in-issues-widget.html b/it/it-tests/src/test/resources/debt/TechnicalDebtWidgetTest/technical-debt/is-in-issues-widget.html
index 81fe0879684..4d6e710e540 100644
--- a/it/it-tests/src/test/resources/debt/TechnicalDebtWidgetTest/technical-debt/is-in-issues-widget.html
+++ b/it/it-tests/src/test/resources/debt/TechnicalDebtWidgetTest/technical-debt/is-in-issues-widget.html
@@ -14,7 +14,7 @@
         <td></td>
     </tr>
     <tr>
-        <td>assertText</td>
+        <td>waitForText</td>
         <td>body</td>
         <td>*Effort*</td>
     </tr>
diff --git a/it/it-tests/src/test/resources/debt/TechnicalDebtWidgetTest/technical-debt/should-open-remediationcost-on-drilldown-service.html b/it/it-tests/src/test/resources/debt/TechnicalDebtWidgetTest/technical-debt/should-open-remediation-cost-on-measures-service.html
index 4c18eb9ef25..039266c60ee 100644
--- a/it/it-tests/src/test/resources/debt/TechnicalDebtWidgetTest/technical-debt/should-open-remediationcost-on-drilldown-service.html
+++ b/it/it-tests/src/test/resources/debt/TechnicalDebtWidgetTest/technical-debt/should-open-remediation-cost-on-measures-service.html
@@ -24,14 +24,14 @@
         <td></td>
     </tr>
     <tr>
-        <td>assertText</td>
+        <td>waitForText</td>
         <td>content</td>
         <td>*Technical Debt*7h 25min*</td>
     </tr>
     <tr>
-        <td>assertText</td>
+        <td>waitForText</td>
         <td>content</td>
-        <td>*Module A*com/sonar/it/samples/modules/a1*HelloA1.xoo*</td>
+        <td>*Module A*</td>
     </tr>
     </tbody>
 </table>
diff --git a/it/it-tests/src/test/resources/measure/ProjectDrilldownTest/should_display_measure_drilldown.html b/it/it-tests/src/test/resources/measure/ProjectDrilldownTest/should_display_measure_drilldown.html
deleted file mode 100644
index ce89d3df2df..00000000000
--- a/it/it-tests/src/test/resources/measure/ProjectDrilldownTest/should_display_measure_drilldown.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head profile="http://selenium-ide.openqa.org/profiles/test-case">
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-    <title>should_display_measure_drilldown</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-    <tbody>
-    <tr>
-	<td>open</td>
-	<td>/drilldown/measures?id=project-drilldown-test-project&amp;metric=ncloc</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForText</td>
-	<td>id=drilldown</td>
-	<td>*Sample.xoo*</td>
-</tr>
-<tr>
-	<td>waitForElementPresent</td>
-	<td>css=a[data-key=&quot;project-drilldown-test-project:src/main/xoo/sample/Sample.xoo&quot;]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForElementPresent</td>
-	<td>css=a.js-drilldown-link.js-ready</td>
-	<td></td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>css=a[data-key=&quot;project-drilldown-test-project:src/main/xoo/sample/Sample.xoo&quot;]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForElementPresent</td>
-	<td>css=.source-viewer</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForText</td>
-	<td>css=.source-viewer</td>
-	<td>*src/main/xoo/sample/*Sample.xoo*</td>
-</tr>
-<tr>
-	<td>waitForText</td>
-	<td>css=.source-viewer</td>
-	<td>*public class Sample {*</td>
-</tr>
-</tbody>
-</table>
-</body>
-</html>
diff --git a/it/it-tests/src/test/resources/measure/ProjectMeasuresPageTest/should_display_measures_page.html b/it/it-tests/src/test/resources/measure/ProjectMeasuresPageTest/should_display_measures_page.html
new file mode 100644
index 00000000000..4e0a1cd0694
--- /dev/null
+++ b/it/it-tests/src/test/resources/measure/ProjectMeasuresPageTest/should_display_measures_page.html
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head profile="http://selenium-ide.openqa.org/profiles/test-case">
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+    <title>should_display_measure_drilldown</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+    <tbody>
+    <tr>
+	<td>open</td>
+	<td>/component_measures/ncloc?id=project-measures-page-test-project</td>
+	<td></td>
+</tr>
+<tr>
+	<td>waitForText</td>
+	<td>content</td>
+	<td>*Lines of code*13*</td>
+</tr>
+<tr>
+	<td>waitForText</td>
+	<td>content</td>
+	<td>*src/main/xoo/sample*</td>
+</tr>
+</tbody>
+</table>
+</body>
+</html>