Merge 'measure' and 'testing' categories into one category 'analysis'

29 files changed, 46 insertions, 1797 deletions

diff --git a/it/it-tests/src/test/java/measure/suite/MeasuresTestSuite.java b/it/it-tests/src/test/java/analysis/suite/AnalysisTestSuite.java
index 73d93d5f144..a177c1df196 100644
--- a/it/it-tests/src/test/java/measure/suite/MeasuresTestSuite.java
+++ b/it/it-tests/src/test/java/analysis/suite/AnalysisTestSuite.java
@@ -17,8 +17,15 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package measure.suite;
+package analysis.suite;
 
+import analysis.suite.measure.CustomMeasuresTest;
+import analysis.suite.measure.MeasureFiltersTest;
+import analysis.suite.measure.TimeMachineTest;
+import analysis.suite.testing.CoverageTest;
+import analysis.suite.testing.CoverageTrackingTest;
+import analysis.suite.testing.NewCoverageTest;
+import analysis.suite.testing.TestExecutionTest;
 import com.sonar.orchestrator.Orchestrator;
 import org.junit.ClassRule;
 import org.junit.runner.RunWith;
@@ -26,8 +33,16 @@ import org.junit.runners.Suite;
 import util.ItUtils;
 
 @RunWith(Suite.class)
-@Suite.SuiteClasses({CustomMeasuresTest.class, MeasureFiltersTest.class, TimeMachineTest.class})
-public class MeasuresTestSuite {
+@Suite.SuiteClasses({
+  CustomMeasuresTest.class,
+  MeasureFiltersTest.class,
+  TimeMachineTest.class,
+  CoverageTrackingTest.class,
+  CoverageTest.class,
+  NewCoverageTest.class,
+  TestExecutionTest.class
+})
+public class AnalysisTestSuite {
 
   @ClassRule
   public static final Orchestrator ORCHESTRATOR = Orchestrator.builderEnv()
diff --git a/it/it-tests/src/test/java/measure/suite/CustomMeasuresTest.java b/it/it-tests/src/test/java/analysis/suite/measure/CustomMeasuresTest.java
index 399f2fc05ba..b4dda45aad0 100644
--- a/it/it-tests/src/test/java/measure/suite/CustomMeasuresTest.java
+++ b/it/it-tests/src/test/java/analysis/suite/measure/CustomMeasuresTest.java
@@ -17,8 +17,9 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package measure.suite;
+package analysis.suite.measure;
 
+import analysis.suite.AnalysisTestSuite;
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarRunner;
 import java.util.regex.Matcher;
@@ -37,7 +38,7 @@ public class CustomMeasuresTest {
 
   public static final String PROJECT_KEY = "sample";
   @ClassRule
-  public static Orchestrator orchestrator = MeasuresTestSuite.ORCHESTRATOR;
+  public static Orchestrator orchestrator = AnalysisTestSuite.ORCHESTRATOR;
 
   @Before
   public void deleteProjects() {
diff --git a/it/it-tests/src/test/java/measure/suite/MeasureFiltersTest.java b/it/it-tests/src/test/java/analysis/suite/measure/MeasureFiltersTest.java
index 1162d612c99..c43f7e589e7 100644
--- a/it/it-tests/src/test/java/measure/suite/MeasureFiltersTest.java
+++ b/it/it-tests/src/test/java/analysis/suite/measure/MeasureFiltersTest.java
@@ -17,8 +17,9 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package measure.suite;
+package analysis.suite.measure;
 
+import analysis.suite.AnalysisTestSuite;
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarRunner;
 import com.sonar.orchestrator.selenium.Selenese;
@@ -35,7 +36,7 @@ import static util.ItUtils.projectDir;
 public class MeasureFiltersTest {
 
   @ClassRule
-  public static Orchestrator orchestrator = MeasuresTestSuite.ORCHESTRATOR;
+  public static Orchestrator orchestrator = AnalysisTestSuite.ORCHESTRATOR;
 
   @BeforeClass
   public static void scanStruts() {
diff --git a/it/it-tests/src/test/java/measure/suite/TimeMachineTest.java b/it/it-tests/src/test/java/analysis/suite/measure/TimeMachineTest.java
index 6db9cb99fd7..b1c41912130 100644
--- a/it/it-tests/src/test/java/measure/suite/TimeMachineTest.java
+++ b/it/it-tests/src/test/java/analysis/suite/measure/TimeMachineTest.java
@@ -17,8 +17,9 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package measure.suite;
+package analysis.suite.measure;
 
+import analysis.suite.AnalysisTestSuite;
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.BuildResult;
 import com.sonar.orchestrator.build.SonarRunner;
@@ -41,7 +42,7 @@ public class TimeMachineTest {
   private static final String PROJECT = "sample";
 
   @ClassRule
-  public static Orchestrator orchestrator = MeasuresTestSuite.ORCHESTRATOR;
+  public static Orchestrator orchestrator = AnalysisTestSuite.ORCHESTRATOR;
 
   @BeforeClass
   public static void initialize() {
diff --git a/it/it-tests/src/test/java/testing/suite/CoverageTest.java b/it/it-tests/src/test/java/analysis/suite/testing/CoverageTest.java
index ff3d978b15d..c2932c5ae2e 100644
--- a/it/it-tests/src/test/java/testing/suite/CoverageTest.java
+++ b/it/it-tests/src/test/java/analysis/suite/testing/CoverageTest.java
@@ -3,7 +3,7 @@
  * All rights reserved
  * mailto:contact AT sonarsource DOT com
  */
-package testing.suite;
+package analysis.suite.testing;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarRunner;
@@ -18,13 +18,14 @@ import org.skyscreamer.jsonassert.JSONAssert;
 import org.sonar.wsclient.services.Resource;
 import org.sonar.wsclient.services.ResourceQuery;
 
+import static analysis.suite.AnalysisTestSuite.ORCHESTRATOR;
 import static org.assertj.core.api.Assertions.assertThat;
 import static util.ItUtils.projectDir;
 
 public class CoverageTest {
 
   @ClassRule
-  public static Orchestrator orchestrator = TestingTestSuite.ORCHESTRATOR;
+  public static Orchestrator orchestrator = ORCHESTRATOR;
 
   private static final String[] ALL_COVERAGE_METRICS = new String[] {
     "line_coverage", "lines_to_cover", "uncovered_lines", "branch_coverage", "conditions_to_cover", "uncovered_conditions", "coverage",
@@ -56,7 +57,7 @@ public class CoverageTest {
     assertThat(project.getMeasureValue("overall_coverage")).isNull();
 
     String coverage = orchestrator.getServer().adminWsClient().get("api/sources/lines", "key", "sample-ut-coverage:src/main/xoo/sample/Sample.xoo");
-    JSONAssert.assertEquals(IOUtils.toString(this.getClass().getResourceAsStream("CoverageTest/unit_test_coverage-expected.json"), "UTF-8"), coverage, false);
+    JSONAssert.assertEquals(IOUtils.toString(this.getClass().getResourceAsStream("/testing/suite/CoverageTest/unit_test_coverage-expected.json"), "UTF-8"), coverage, false);
 
     verifyComputeEngineTempDirIsEmpty();
   }
@@ -79,7 +80,7 @@ public class CoverageTest {
     assertThat(project.getMeasureValue("overall_coverage")).isNull();
 
     String coverage = orchestrator.getServer().adminWsClient().get("api/sources/lines", "key", "sample-ut-coverage:src/main/xoo/sample/Sample.xoo");
-    JSONAssert.assertEquals(IOUtils.toString(this.getClass().getResourceAsStream("CoverageTest/unit_test_coverage_no_condition-expected.json"), "UTF-8"), coverage, false);
+    JSONAssert.assertEquals(IOUtils.toString(this.getClass().getResourceAsStream("/testing/suite/CoverageTest/unit_test_coverage_no_condition-expected.json"), "UTF-8"), coverage, false);
 
     verifyComputeEngineTempDirIsEmpty();
   }
@@ -102,7 +103,7 @@ public class CoverageTest {
     assertThat(project.getMeasureValue("overall_coverage")).isNull();
 
     String coverage = orchestrator.getServer().adminWsClient().get("api/sources/lines", "key", "sample-it-coverage:src/main/xoo/sample/Sample.xoo");
-    JSONAssert.assertEquals(IOUtils.toString(this.getClass().getResourceAsStream("CoverageTest/it_coverage-expected.json"), "UTF-8"), coverage, false);
+    JSONAssert.assertEquals(IOUtils.toString(this.getClass().getResourceAsStream("/testing/suite/CoverageTest/it_coverage-expected.json"), "UTF-8"), coverage, false);
 
     verifyComputeEngineTempDirIsEmpty();
   }
@@ -137,7 +138,7 @@ public class CoverageTest {
     assertThat(project.getMeasureValue("overall_coverage")).isEqualTo(62.5);
 
     String coverage = orchestrator.getServer().adminWsClient().get("api/sources/lines", "key", "sample-overall-coverage:src/main/xoo/sample/Sample.xoo");
-    JSONAssert.assertEquals(IOUtils.toString(this.getClass().getResourceAsStream("CoverageTest/ut_and_it_coverage-expected.json"), "UTF-8"), coverage, false);
+    JSONAssert.assertEquals(IOUtils.toString(this.getClass().getResourceAsStream("/testing/suite/CoverageTest/ut_and_it_coverage-expected.json"), "UTF-8"), coverage, false);
 
     verifyComputeEngineTempDirIsEmpty();
   }
diff --git a/it/it-tests/src/test/java/testing/suite/CoverageTrackingTest.java b/it/it-tests/src/test/java/analysis/suite/testing/CoverageTrackingTest.java
index 5af286745a5..5e119d5b1c0 100644
--- a/it/it-tests/src/test/java/testing/suite/CoverageTrackingTest.java
+++ b/it/it-tests/src/test/java/analysis/suite/testing/CoverageTrackingTest.java
@@ -3,7 +3,7 @@
  * All rights reserved
  * mailto:contact AT sonarsource DOT com
  */
-package testing.suite;
+package analysis.suite.testing;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarRunner;
@@ -15,12 +15,13 @@ import org.junit.ClassRule;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
 
+import static analysis.suite.AnalysisTestSuite.ORCHESTRATOR;
 import static util.ItUtils.projectDir;
 
 public class CoverageTrackingTest {
 
   @ClassRule
-  public static Orchestrator orchestrator = TestingTestSuite.ORCHESTRATOR;
+  public static Orchestrator orchestrator = ORCHESTRATOR;
 
   @Before
   public void delete_data() {
@@ -32,11 +33,11 @@ public class CoverageTrackingTest {
     orchestrator.executeBuilds(SonarRunner.create(projectDir("testing/xoo-sample-with-coverage-per-test")));
 
     String tests = orchestrator.getServer().adminWsClient().get("api/tests/list", "testFileKey", "sample-with-tests:src/test/xoo/sample/SampleTest.xoo");
-    JSONAssert.assertEquals(IOUtils.toString(this.getClass().getResourceAsStream("CoverageTrackingTest/tests-expected.json"), "UTF-8"), tests, false);
+    JSONAssert.assertEquals(IOUtils.toString(this.getClass().getResourceAsStream("/testing/suite/CoverageTrackingTest/tests-expected.json"), "UTF-8"), tests, false);
 
     String covered_files = orchestrator.getServer().adminWsClient()
       .get("api/tests/covered_files", "testUuid", extractSuccessfulTestUuid(tests));
-    JSONAssert.assertEquals(IOUtils.toString(this.getClass().getResourceAsStream("CoverageTrackingTest/covered_files-expected.json"), "UTF-8"), covered_files, false);
+    JSONAssert.assertEquals(IOUtils.toString(this.getClass().getResourceAsStream("/testing/suite/CoverageTrackingTest/covered_files-expected.json"), "UTF-8"), covered_files, false);
   }
 
   private String extractSuccessfulTestUuid(String json) {
diff --git a/it/it-tests/src/test/java/testing/suite/NewCoverageTest.java b/it/it-tests/src/test/java/analysis/suite/testing/NewCoverageTest.java
index 786eb8ade4e..fc4427b243b 100644
--- a/it/it-tests/src/test/java/testing/suite/NewCoverageTest.java
+++ b/it/it-tests/src/test/java/analysis/suite/testing/NewCoverageTest.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 testing.suite;
+package analysis.suite.testing;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarRunner;
@@ -28,13 +28,14 @@ import org.junit.Test;
 import org.sonar.wsclient.services.Resource;
 import org.sonar.wsclient.services.ResourceQuery;
 
+import static analysis.suite.AnalysisTestSuite.ORCHESTRATOR;
 import static org.assertj.core.api.Assertions.assertThat;
 import static util.ItUtils.projectDir;
 
 public class NewCoverageTest {
 
   @ClassRule
-  public static Orchestrator orchestrator = TestingTestSuite.ORCHESTRATOR;
+  public static Orchestrator orchestrator = ORCHESTRATOR;
 
   private static final String PROJECT_KEY = "sample-new-coverage";
 
diff --git a/it/it-tests/src/test/java/testing/suite/TestExecutionTest.java b/it/it-tests/src/test/java/analysis/suite/testing/TestExecutionTest.java
index a6ac069fbf9..789988940cd 100644
--- a/it/it-tests/src/test/java/testing/suite/TestExecutionTest.java
+++ b/it/it-tests/src/test/java/analysis/suite/testing/TestExecutionTest.java
@@ -3,7 +3,7 @@
  * All rights reserved
  * mailto:contact AT sonarsource DOT com
  */
-package testing.suite;
+package analysis.suite.testing;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarRunner;
@@ -15,13 +15,14 @@ import org.skyscreamer.jsonassert.JSONAssert;
 import org.sonar.wsclient.services.Resource;
 import org.sonar.wsclient.services.ResourceQuery;
 
+import static analysis.suite.AnalysisTestSuite.ORCHESTRATOR;
 import static org.assertj.core.api.Assertions.assertThat;
 import static util.ItUtils.projectDir;
 
 public class TestExecutionTest {
 
   @ClassRule
-  public static Orchestrator orchestrator = TestingTestSuite.ORCHESTRATOR;
+  public static Orchestrator orchestrator = ORCHESTRATOR;
 
   @Before
   public void delete_data() {
@@ -42,6 +43,6 @@ public class TestExecutionTest {
     assertThat(project.getMeasureIntValue("test_execution_time")).isEqualTo(8);
 
     String json = orchestrator.getServer().adminWsClient().get("api/tests/list", "testFileKey", "sample-with-tests:src/test/xoo/sample/SampleTest.xoo");
-    JSONAssert.assertEquals(IOUtils.toString(this.getClass().getResourceAsStream("TestExecutionTest/expected.json"), "UTF-8"), json, false);
+    JSONAssert.assertEquals(IOUtils.toString(this.getClass().getResourceAsStream("/testing/suite/TestExecutionTest/expected.json"), "UTF-8"), json, false);
   }
 }
diff --git a/it/it-tests/src/test/java/testing/suite/TestingTestSuite.java b/it/it-tests/src/test/java/testing/suite/TestingTestSuite.java
deleted file mode 100644
index 10c8ca4053a..00000000000
--- a/it/it-tests/src/test/java/testing/suite/TestingTestSuite.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (C) 2009-2014 SonarSource SA
- * All rights reserved
- * mailto:contact AT sonarsource DOT com
- */
-package testing.suite;
-
-import com.sonar.orchestrator.Orchestrator;
-import org.junit.ClassRule;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-import util.ItUtils;
-
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
-  CoverageTrackingTest.class,
-  CoverageTest.class,
-  NewCoverageTest.class,
-  TestExecutionTest.class
-})
-public class TestingTestSuite {
-
-  @ClassRule
-  public static final Orchestrator ORCHESTRATOR = Orchestrator.builderEnv()
-    .addPlugin(ItUtils.xooPlugin())
-    .build();
-}
diff --git a/it/it-tests/src/test/resources/measure/measure_filters/copy_measure_filter.html b/it/it-tests/src/test/resources/measure/measure_filters/copy_measure_filter.html
deleted file mode 100644
index 22005c9a9d6..00000000000
--- a/it/it-tests/src/test/resources/measure/measure_filters/copy_measure_filter.html
+++ /dev/null
@@ -1,134 +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>copy_measure_filter</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-    <tbody>
-    <tr>
-	<td>storeEval</td>
-	<td>'list_'+(new Date()).getTime()</td>
-	<td>FILTER_NAME</td>
-</tr>
-<tr>
-	<td>open</td>
-	<td>/sonar/sessions/logout</td>
-	<td></td>
-</tr>
-<tr>
-	<td>open</td>
-	<td>/sonar/sessions/new</td>
-	<td></td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>id=login</td>
-	<td>admin</td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>id=password</td>
-	<td>admin</td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>name=commit</td>
-	<td></td>
-</tr>
-<tr>
-	<td>open</td>
-	<td>/sonar/measures</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForElementPresent</td>
-	<td>name=qualifiers[]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>select</td>
-	<td>name=qualifiers[]</td>
-	<td>Files</td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>class=navigator-filter-submit</td>
-	<td></td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>id=save-as</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForElementPresent</td>
-	<td>save-as-filter-form</td>
-	<td></td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>id=name</td>
-	<td>${FILTER_NAME}</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>id=save-as-submit</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForText</td>
-	<td>filter-title</td>
-	<td>*${FILTER_NAME}*</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>id=copy</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForElementPresent</td>
-	<td>copy-filter-form</td>
-	<td></td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>id=name</td>
-	<td>copy of ${FILTER_NAME}</td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>id=description</td>
-	<td>description of copy</td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>id=copy-submit</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForText</td>
-	<td>filter-title</td>
-	<td>*copy of ${FILTER_NAME}*</td>
-</tr>
-<tr>
-	<td>waitForText</td>
-	<td>filter-description</td>
-	<td>*description of copy*</td>
-</tr>
-<tr>
-	<td>waitForElementPresent</td>
-	<td>name=qualifiers[]</td>
-	<td>Files</td>
-</tr>
-<tr>
-	<td>assertSelectedLabel</td>
-	<td>name=qualifiers[]</td>
-	<td>Files</td>
-</tr>
-</tbody>
-</table>
-</body>
-</html>
diff --git a/it/it-tests/src/test/resources/measure/measure_filters/copy_uniqueness_of_name.html b/it/it-tests/src/test/resources/measure/measure_filters/copy_uniqueness_of_name.html
deleted file mode 100644
index 7f6f914a8a2..00000000000
--- a/it/it-tests/src/test/resources/measure/measure_filters/copy_uniqueness_of_name.html
+++ /dev/null
@@ -1,139 +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>copy_uniqueness_of_name</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-    <tbody>
-    <tr>
-	<td>store</td>
-	<td>javascript{'list_'+(new Date()).getTime()}</td>
-	<td>FILTER_NAME</td>
-</tr>
-<tr>
-	<td>open</td>
-	<td>/sonar/sessions/logout</td>
-	<td></td>
-</tr>
-<tr>
-	<td>open</td>
-	<td>/sonar/sessions/new</td>
-	<td></td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>id=login</td>
-	<td>admin</td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>id=password</td>
-	<td>admin</td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>name=commit</td>
-	<td></td>
-</tr>
-<tr>
-	<td>open</td>
-	<td>/sonar/measures</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForElementPresent</td>
-	<td>name=qualifiers[]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>select</td>
-	<td>name=qualifiers[]</td>
-	<td>Files</td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>class=navigator-filter-submit</td>
-	<td></td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>id=save-as</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForElementPresent</td>
-	<td>save-as-filter-form</td>
-	<td></td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>id=name</td>
-	<td>${FILTER_NAME}</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>id=save-as-submit</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForText</td>
-	<td>filter-title</td>
-	<td>*${FILTER_NAME}*</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>id=copy</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForElementPresent</td>
-	<td>copy-filter-form</td>
-	<td></td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>id=name</td>
-	<td>${FILTER_NAME}</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>id=copy-submit</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForText</td>
-	<td>copy-filter-form</td>
-	<td>*Name already exists*</td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>id=name</td>
-	<td>copy of ${FILTER_NAME}</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>id=copy-submit</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForText</td>
-	<td>filter-title</td>
-	<td>*copy of ${FILTER_NAME}*</td>
-</tr>
-<tr>
-	<td>waitForElementPresent</td>
-	<td>name=qualifiers[]</td>
-	<td>Files</td>
-</tr>
-<tr>
-	<td>assertSelectedLabel</td>
-	<td>name=qualifiers[]</td>
-	<td>Files</td>
-</tr>
-</tbody>
-</table>
-</body>
-</html>
diff --git a/it/it-tests/src/test/resources/measure/measure_filters/empty_filter.html b/it/it-tests/src/test/resources/measure/measure_filters/empty_filter.html
deleted file mode 100644
index 65ebe3575ad..00000000000
--- a/it/it-tests/src/test/resources/measure/measure_filters/empty_filter.html
+++ /dev/null
@@ -1,30 +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>empty_filter</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-    <tbody>
-    <tr>
-        <td>open</td>
-        <td>/sonar/measures/search</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>assertText</td>
-        <td>measures-table</td>
-        <td>*No data*</td>
-    </tr>
-    <tr>
-        <td>assertNotText</td>
-        <td>measures-table</td>
-        <td>*Struts*</td>
-    </tr>
-
-    </tbody>
-</table>
-</body>
-</html>
diff --git a/it/it-tests/src/test/resources/measure/measure_filters/initial_search_form.html b/it/it-tests/src/test/resources/measure/measure_filters/initial_search_form.html
deleted file mode 100644
index 863df6c057a..00000000000
--- a/it/it-tests/src/test/resources/measure/measure_filters/initial_search_form.html
+++ /dev/null
@@ -1,34 +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>initial_search_form</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-    <tbody>
-    <tr>
-        <td>open</td>
-        <td>/sonar/measures</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>waitForElementPresent</td>
-        <td>name=qualifiers[]</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>waitForText</td>
-        <td>class=navigator-filters</td>
-        <td>*More Criteria*</td>
-    </tr>
-    <tr>
-        <td>assertElementNotPresent</td>
-        <td>measures-table</td>
-        <td></td>
-    </tr>
-    </tbody>
-</table>
-</body>
-</html>
diff --git a/it/it-tests/src/test/resources/measure/measure_filters/link_from_main_header.html b/it/it-tests/src/test/resources/measure/measure_filters/link_from_main_header.html
deleted file mode 100644
index c92986d4489..00000000000
--- a/it/it-tests/src/test/resources/measure/measure_filters/link_from_main_header.html
+++ /dev/null
@@ -1,40 +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>link_from_main_header</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-    <tbody>
-    <tr>
-        <td>open</td>
-        <td>/sonar/</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>waitForElementPresent</td>
-        <td>link=Measures</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>clickAndWait</td>
-        <td>link=Measures</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>assertLocation</td>
-        <td>*/measures*</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>assertElementPresent</td>
-        <td>class=navigator-filters</td>
-        <td></td>
-    </tr>
-
-    </tbody>
-</table>
-</body>
-</html>
diff --git a/it/it-tests/src/test/resources/measure/measure_filters/list_change_columns.html b/it/it-tests/src/test/resources/measure/measure_filters/list_change_columns.html
deleted file mode 100644
index b23e78ca1c4..00000000000
--- a/it/it-tests/src/test/resources/measure/measure_filters/list_change_columns.html
+++ /dev/null
@@ -1,84 +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>configure-table-columns</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-    <tbody>
-    <tr>
-        <td>open</td>
-        <td>/sonar/measures</td>
-        <td></td>
-    </tr>
-    <tr>
-      <td>waitForElementPresent</td>
-      <td>name=qualifiers[]</td>
-      <td></td>
-    </tr>
-    <tr>
-        <td>select</td>
-        <td>name=qualifiers[]</td>
-        <td>Files</td>
-    </tr>
-    <tr>
-        <td>clickAndWait</td>
-        <td>class=navigator-filter-submit</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>clickAndWait</td>
-        <td>id=change-display</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>select</td>
-        <td>select-metric</td>
-        <td>Complexity</td>
-    </tr>
-    <tr>
-        <td>clickAndWait</td>
-        <td>id=add-metric</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>assertText</td>
-        <td>measures-table</td>
-        <td>*Name*Cmpx*</td>
-    </tr>
-    <tr>
-        <td>select</td>
-        <td>select-metric</td>
-        <td>Comment lines</td>
-    </tr>
-    <tr>
-        <td>select</td>
-        <td>id=select-period</td>
-        <td>label=since previous analysis</td>
-    </tr>
-    <tr>
-        <td>clickAndWait</td>
-        <td>id=add-metric</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>assertText</td>
-        <td>measures-table</td>
-        <td>*Name*Cmpx*Comment lines*last*</td>
-    </tr>
-    <tr>
-        <td>clickAndWait</td>
-        <td>id=exit-edit</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>assertText</td>
-        <td>measures-table</td>
-        <td>*Name*Cmpx*Comment lines*last*</td>
-    </tr>
-    </tbody>
-</table>
-</body>
-</html>
diff --git a/it/it-tests/src/test/resources/measure/measure_filters/list_delete_column.html b/it/it-tests/src/test/resources/measure/measure_filters/list_delete_column.html
deleted file mode 100644
index 3075d43b47e..00000000000
--- a/it/it-tests/src/test/resources/measure/measure_filters/list_delete_column.html
+++ /dev/null
@@ -1,74 +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>delete_column</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-    <tbody>
-    <tr>
-        <td>open</td>
-        <td>/sonar/measures</td>
-        <td></td>
-    </tr>
-    <tr>
-      <td>waitForElementPresent</td>
-      <td>name=qualifiers[]</td>
-      <td></td>
-    </tr>
-    <tr>
-        <td>select</td>
-        <td>name=qualifiers[]</td>
-        <td>Files</td>
-    </tr>
-    <tr>
-        <td>clickAndWait</td>
-        <td>class=navigator-filter-submit</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>clickAndWait</td>
-        <td>id=change-display</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>assertText</td>
-        <td>measures-table</td>
-        <td>*Name*Last Analysis*LOC*</td>
-    </tr>
-    <tr>
-        <td>click</td>
-        <td>delete-date</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>waitForText</td>
-        <td>measures-table</td>
-        <td>*Name*LOC*</td>
-    </tr>
-    <tr>
-        <td>assertNotText</td>
-        <td>measures-table</td>
-        <td>*Last Analysis*</td>
-    </tr>
-    <tr>
-        <td>clickAndWait</td>
-        <td>id=exit-edit</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>assertText</td>
-        <td>measures-table</td>
-        <td>*Name*LOC*</td>
-    </tr>
-    <tr>
-        <td>assertNotText</td>
-        <td>measures-table</td>
-        <td>*Last Analysis*</td>
-    </tr>
-    </tbody>
-</table>
-</body>
-</html>
diff --git a/it/it-tests/src/test/resources/measure/measure_filters/list_move_columns.html b/it/it-tests/src/test/resources/measure/measure_filters/list_move_columns.html
deleted file mode 100644
index ee78b261c94..00000000000
--- a/it/it-tests/src/test/resources/measure/measure_filters/list_move_columns.html
+++ /dev/null
@@ -1,74 +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>move_columns</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-    <tbody>
-    <tr>
-        <td>open</td>
-        <td>/sonar/measures</td>
-        <td></td>
-    </tr>
-    <tr>
-      <td>waitForElementPresent</td>
-      <td>name=qualifiers[]</td>
-      <td></td>
-    </tr>
-    <tr>
-        <td>select</td>
-        <td>name=qualifiers[]</td>
-        <td>Files</td>
-    </tr>
-    <tr>
-        <td>clickAndWait</td>
-        <td>class=navigator-filter-submit</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>clickAndWait</td>
-        <td>id=change-display</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>assertText</td>
-        <td>measures-table</td>
-        <td>*Name*Last Analysis*LOC*</td>
-    </tr>
-    <tr>
-        <td>click</td>
-        <td>left-date</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>waitForText</td>
-        <td>measures-table</td>
-        <td>*Last Analysis*Name*LOC*</td>
-    </tr>
-    <tr>
-        <td>click</td>
-        <td>right-name</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>waitForText</td>
-        <td>measures-table</td>
-        <td>*Last Analysis*LOC*Name*</td>
-    </tr>
-    <tr>
-        <td>clickAndWait</td>
-        <td>id=exit-edit</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>assertText</td>
-        <td>measures-table</td>
-        <td>*Last Analysis*LOC*Name*</td>
-    </tr>
-    </tbody>
-</table>
-</body>
-</html>
diff --git a/it/it-tests/src/test/resources/measure/measure_filters/list_sort_by_descending_name.html b/it/it-tests/src/test/resources/measure/measure_filters/list_sort_by_descending_name.html
deleted file mode 100644
index 8705a7efee2..00000000000
--- a/it/it-tests/src/test/resources/measure/measure_filters/list_sort_by_descending_name.html
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ SonarQube, open source software quality management tool.
-  ~ Copyright (C) 2008-2014 SonarSource
-  ~ mailto:contact AT sonarsource DOT com
-  ~
-  ~ SonarQube is free software; you can redistribute it and/or
-  ~ modify it under the terms of the GNU Lesser General Public
-  ~ License as published by the Free Software Foundation; either
-  ~ version 3 of the License, or (at your option) any later version.
-  ~
-  ~ SonarQube is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public License
-  ~ along with this program; if not, write to the Free Software Foundation,
-  ~ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-  -->
-
-<!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>list_sort_by_descending_name</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-    <tbody>
-    <tr>
-        <td>open</td>
-        <td>/sonar/measures</td>
-        <td></td>
-    </tr>
-    <tr>
-      <td>waitForElementPresent</td>
-      <td>name=qualifiers[]</td>
-      <td></td>
-    </tr>
-    <tr>
-        <td>select</td>
-        <td>name=qualifiers[]</td>
-        <td>Files</td>
-    </tr>
-    <tr>
-        <td>clickAndWait</td>
-        <td>class=navigator-filter-submit</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>assertElementPresent</td>
-        <td>measures-table</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>clickAndWait</td>
-        <td>link=Name</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>assertText</td>
-        <td>measures-table</td>
-        <td>*b2/HelloB2.xoo*b1/HelloB1.xoo*a2/HelloA2.xoo*a1/HelloA1.xoo*</td>
-    </tr>
-
-    </tbody>
-</table>
-</body>
-</html>
diff --git a/it/it-tests/src/test/resources/measure/measure_filters/list_sort_by_ncloc.html b/it/it-tests/src/test/resources/measure/measure_filters/list_sort_by_ncloc.html
deleted file mode 100644
index 95ef3b0deeb..00000000000
--- a/it/it-tests/src/test/resources/measure/measure_filters/list_sort_by_ncloc.html
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ SonarQube, open source software quality management tool.
-  ~ Copyright (C) 2008-2014 SonarSource
-  ~ mailto:contact AT sonarsource DOT com
-  ~
-  ~ SonarQube is free software; you can redistribute it and/or
-  ~ modify it under the terms of the GNU Lesser General Public
-  ~ License as published by the Free Software Foundation; either
-  ~ version 3 of the License, or (at your option) any later version.
-  ~
-  ~ SonarQube is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public License
-  ~ along with this program; if not, write to the Free Software Foundation,
-  ~ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-  -->
-
-<!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>list_sort_by_ncloc</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-  <tbody>
-  <tr>
-    <td>open</td>
-    <td>/sonar/measures</td>
-    <td></td>
-  </tr>
-  <tr>
-    <td>waitForElementPresent</td>
-    <td>name=qualifiers[]</td>
-    <td></td>
-  </tr>
-  <tr>
-    <td>select</td>
-    <td>name=qualifiers[]</td>
-    <td>Files</td>
-  </tr>
-  <tr>
-    <td>clickAndWait</td>
-    <td>class=navigator-filter-submit</td>
-    <td></td>
-  </tr>
-  <tr>
-    <td>assertElementPresent</td>
-    <td>measures-table</td>
-    <td></td>
-  </tr>
-  <tr>
-    <td>assertText</td>
-    <td>css=#measures-table tfoot</td>
-    <td>*4 results*</td>
-  </tr>
-  <tr>
-    <td>clickAndWait</td>
-    <td>link=LOC</td>
-    <td></td>
-  </tr>
-  <tr>
-    <td>assertText</td>
-    <td>measures-table</td>
-    <td>*a2/HelloA2.xoo*a1/HelloA1.xoo*b1/HelloB1.xoo*b2/HelloB2.xoo*</td>
-  </tr>
-  <tr>
-    <td>assertText</td>
-    <td>css=#measures-table tfoot</td>
-    <td>*4 results*</td>
-  </tr>
-  <tr>
-    <td>clickAndWait</td>
-    <td>link=LOC</td>
-    <td></td>
-  </tr>
-  <tr>
-    <td>assertText</td>
-    <td>css=#measures-table tfoot</td>
-    <td>*4 results*</td>
-  </tr>
-  <tr>
-    <td>assertText</td>
-    <td>measures-table</td>
-    <td>*a1/HelloA1.xoo*b1/HelloB1.xoo*b2/HelloB2.xoo*a2/HelloA2.xoo*</td>
-  </tr>
-  </tbody>
-</table>
-</body>
-</html>
diff --git a/it/it-tests/src/test/resources/measure/measure_filters/list_widget.html b/it/it-tests/src/test/resources/measure/measure_filters/list_widget.html
deleted file mode 100644
index 81695821706..00000000000
--- a/it/it-tests/src/test/resources/measure/measure_filters/list_widget.html
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ SonarQube, open source software quality management tool.
-  ~ Copyright (C) 2008-2014 SonarSource
-  ~ mailto:contact AT sonarsource DOT com
-  ~
-  ~ SonarQube is free software; you can redistribute it and/or
-  ~ modify it under the terms of the GNU Lesser General Public
-  ~ License as published by the Free Software Foundation; either
-  ~ version 3 of the License, or (at your option) any later version.
-  ~
-  ~ SonarQube is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public License
-  ~ along with this program; if not, write to the Free Software Foundation,
-  ~ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-  -->
-
-<!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>list_widget</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-    <tbody>
-    <tr>
-        <td>open</td>
-        <td>/sonar/sessions/logout</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>open</td>
-        <td>/sonar/measures/manage</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>type</td>
-        <td>id=login</td>
-        <td>admin</td>
-    </tr>
-    <tr>
-        <td>type</td>
-        <td>id=password</td>
-        <td>admin</td>
-    </tr>
-    <tr>
-        <td>clickAndWait</td>
-        <td>name=commit</td>
-        <td></td>
-    </tr>
-
-    <tr>
-        <td>clickAndWait</td>
-        <td>xpath=(//table[contains(@id, 'shared-filters')]//a[contains(text(),'Projects')])</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>storeEval</td>
-        <td>window.location.pathname.split('/').last()</td>
-        <td>FILTER_ID</td>
-    </tr>
-    <tr>
-        <td>open</td>
-        <td>/sonar/widget?id=measure_filter_list&amp;filter=${FILTER_ID}</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>assertText</td>
-        <td>block_1</td>
-        <td>*Name*Version*LOC*Last Analysis*</td>
-    </tr>
-    <tr>
-        <td>assertText</td>
-        <td>block_1</td>
-        <td>*Multi-modules Sample*1.0-SNAPSHOT*</td>
-    </tr>
-    <tr>
-        <td>assertNotText</td>
-        <td>block_1</td>
-        <td>*Module A*</td>
-    </tr>
-    </tbody>
-</table>
-</body>
-</html>
diff --git a/it/it-tests/src/test/resources/measure/measure_filters/list_widget_sort.html b/it/it-tests/src/test/resources/measure/measure_filters/list_widget_sort.html
deleted file mode 100644
index 82b5f7e6eea..00000000000
--- a/it/it-tests/src/test/resources/measure/measure_filters/list_widget_sort.html
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ SonarQube, open source software quality management tool.
-  ~ Copyright (C) 2008-2014 SonarSource
-  ~ mailto:contact AT sonarsource DOT com
-  ~
-  ~ SonarQube is free software; you can redistribute it and/or
-  ~ modify it under the terms of the GNU Lesser General Public
-  ~ License as published by the Free Software Foundation; either
-  ~ version 3 of the License, or (at your option) any later version.
-  ~
-  ~ SonarQube is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public License
-  ~ along with this program; if not, write to the Free Software Foundation,
-  ~ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-  -->
-
-<!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>list_widget_sort</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-    <tbody>
-    <tr>
-	<td>storeEval</td>
-	<td>'sort_widget_'+(new Date()).getTime()</td>
-	<td>FILTER_NAME</td>
-</tr>
-<tr>
-	<td>open</td>
-	<td>/sonar/sessions/logout</td>
-	<td></td>
-</tr>
-<tr>
-	<td>open</td>
-	<td>/sonar/sessions/new</td>
-	<td></td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>login</td>
-	<td>admin</td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>password</td>
-	<td>admin</td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>name=commit</td>
-	<td></td>
-</tr>
-<tr>
-	<td>open</td>
-	<td>/sonar/measures</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForText</td>
-	<td>class=navigator-filters</td>
-	<td>*More Criteria*</td>
-</tr>
-<tr>
-	<td>select</td>
-	<td>name=qualifiers[]</td>
-	<td>Files</td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>class=navigator-filter-submit</td>
-	<td></td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>id=save-as</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForElementPresent</td>
-	<td>save-as-filter-form</td>
-	<td></td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>name</td>
-	<td>${FILTER_NAME}</td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>id=save-as-submit</td>
-	<td></td>
-</tr>
-<tr>
-	<td>storeEval</td>
-	<td>window.location.pathname.split('/').last()</td>
-	<td>FILTER_ID</td>
-</tr>
-<tr>
-	<td>open</td>
-	<td>/sonar/widget?id=measure_filter_list&amp;filter=${FILTER_ID}</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>block_1</td>
-	<td>*Name*LOC*</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>block_1</td>
-	<td>*a1/HelloA1.xoo*a2/HelloA2.xoo*b1/HelloB1.xoo*b2/HelloB2.xoo*</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>link=LOC</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForText</td>
-	<td>block_1</td>
-	<td>*a2/HelloA2.xoo*a1/HelloA1.xoo*b1/HelloB1.xoo*b2/HelloB2.xoo*</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>link=LOC</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForText</td>
-	<td>block_1</td>
-	<td>*HelloA1*HelloB1*HelloB2*HelloA2*</td>
-</tr>
-</tbody>
-</table>
-</body>
-</html>
diff --git a/it/it-tests/src/test/resources/measure/measure_filters/list_widget_warning_if_missing_filter.html b/it/it-tests/src/test/resources/measure/measure_filters/list_widget_warning_if_missing_filter.html
deleted file mode 100644
index 4bcd30c0ba4..00000000000
--- a/it/it-tests/src/test/resources/measure/measure_filters/list_widget_warning_if_missing_filter.html
+++ /dev/null
@@ -1,24 +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>list_widget</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-    <tbody>
-    <tr>
-        <td>open</td>
-        <td>/sonar/widget?id=measure_filter_list</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>assertText</td>
-        <td>block_1</td>
-        <td>*This widget is configured to display a measure filter that does not exist anymore.*</td>
-    </tr>
-    </tbody>
-</table>
-</body>
-</html>
diff --git a/it/it-tests/src/test/resources/measure/measure_filters/save_with_special_characters.html b/it/it-tests/src/test/resources/measure/measure_filters/save_with_special_characters.html
deleted file mode 100644
index 19b116782e9..00000000000
--- a/it/it-tests/src/test/resources/measure/measure_filters/save_with_special_characters.html
+++ /dev/null
@@ -1,121 +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>save_with_special_characters</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-
-    <tbody>
-    <tr>
-        <td>open</td>
-        <td>/sonar/sessions/logout</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>open</td>
-        <td>/sonar/sessions/new</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>type</td>
-        <td>login</td>
-        <td>admin</td>
-    </tr>
-    <tr>
-        <td>type</td>
-        <td>password</td>
-        <td>admin</td>
-    </tr>
-    <tr>
-        <td>clickAndWait</td>
-        <td>commit</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>open</td>
-        <td>/sonar/measures</td>
-        <td></td>
-    </tr>
-    <tr>
-      <td>waitForElementPresent</td>
-      <td>name=qualifiers[]</td>
-      <td></td>
-    </tr>
-    <tr>
-        <td>clickAndWait</td>
-        <td>class=navigator-filter-submit</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>click</td>
-        <td>id=save-as</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>waitForElementPresent</td>
-        <td>save-as-filter-form</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>type</td>
-        <td>id=name</td>
-        <td>special $àé'@&quot;</td>
-    </tr>
-    <tr>
-        <td>type</td>
-        <td>id=description</td>
-        <td>description with special characters &quot; ' éà</td>
-    </tr>
-    <tr>
-        <td>clickAndWait</td>
-        <td>id=save-as-submit</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>assertText</td>
-        <td>filter-description</td>
-        <td>*description with special characters &quot; ' éà*</td>
-    </tr>
-    <tr>
-      <td>waitForElementPresent</td>
-      <td>id=manage-favorites</td>
-      <td></td>
-    </tr>
-    <tr>
-        <td>clickAndWait</td>
-        <td>id=manage-favorites</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>assertText</td>
-        <td>my-filters</td>
-        <td>*special $àé'@&quot;*description with special characters &quot; ' éà*</td>
-    </tr>
-    <tr>
-        <td>click</td>
-        <td>id=delete_special-ae</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>waitForElementPresent</td>
-        <td>confirm-submit</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>click</td>
-        <td>id=confirm-submit</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>waitForNotText</td>
-        <td>my-filters</td>
-        <td>*special $àé'@&quot;*</td>
-    </tr>
-    </tbody>
-</table>
-</body>
-</html>
-
diff --git a/it/it-tests/src/test/resources/measure/measure_filters/search-by-key.html b/it/it-tests/src/test/resources/measure/measure_filters/search-by-key.html
deleted file mode 100644
index 50fce19e151..00000000000
--- a/it/it-tests/src/test/resources/measure/measure_filters/search-by-key.html
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ SonarQube, open source software quality management tool.
-  ~ Copyright (C) 2008-2014 SonarSource
-  ~ mailto:contact AT sonarsource DOT com
-  ~
-  ~ SonarQube is free software; you can redistribute it and/or
-  ~ modify it under the terms of the GNU Lesser General Public
-  ~ License as published by the Free Software Foundation; either
-  ~ version 3 of the License, or (at your option) any later version.
-  ~
-  ~ SonarQube is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public License
-  ~ along with this program; if not, write to the Free Software Foundation,
-  ~ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-  -->
-
-<!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>search-by-key</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-  <tbody>
-  <tr>
-    <td>open</td>
-    <td>/sonar/measures</td>
-    <td></td>
-  </tr>
-  <tr>
-    <td>waitForElementPresent</td>
-    <td>name=qualifiers[]</td>
-    <td></td>
-  </tr>
-  <tr>
-    <td>select</td>
-    <td>name=qualifiers[]</td>
-    <td>Projects</td>
-  </tr>
-  <tr>
-    <td>type</td>
-    <td>name=keySearch</td>
-    <td>multi-modules</td>
-  </tr>
-  <tr>
-    <td>clickAndWait</td>
-    <td>class=navigator-filter-submit</td>
-    <td></td>
-  </tr>
-  <tr>
-    <td>assertText</td>
-    <td>measures-table</td>
-    <td>*Sonar :: Integration Tests :: Multi-modules Sample*</td>
-  </tr>
-  <tr>
-    <td>assertText</td>
-    <td>css=#measures-table tfoot</td>
-    <td>*1 results*</td>
-  </tr>
-  </tbody>
-</table>
-</body>
-</html>
diff --git a/it/it-tests/src/test/resources/measure/measure_filters/search-by-name.html b/it/it-tests/src/test/resources/measure/measure_filters/search-by-name.html
deleted file mode 100644
index 2c4fb8c53d3..00000000000
--- a/it/it-tests/src/test/resources/measure/measure_filters/search-by-name.html
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ SonarQube, open source software quality management tool.
-  ~ Copyright (C) 2008-2014 SonarSource
-  ~ mailto:contact AT sonarsource DOT com
-  ~
-  ~ SonarQube is free software; you can redistribute it and/or
-  ~ modify it under the terms of the GNU Lesser General Public
-  ~ License as published by the Free Software Foundation; either
-  ~ version 3 of the License, or (at your option) any later version.
-  ~
-  ~ SonarQube is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public License
-  ~ along with this program; if not, write to the Free Software Foundation,
-  ~ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-  -->
-
-<!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>search-by-name</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-  <tbody>
-  <tr>
-    <td>open</td>
-    <td>/sonar/measures</td>
-    <td></td>
-  </tr>
-  <tr>
-    <td>waitForElementPresent</td>
-    <td>name=qualifiers[]</td>
-    <td></td>
-  </tr>
-  <tr>
-    <td>select</td>
-    <td>name=qualifiers[]</td>
-    <td>Projects</td>
-  </tr>
-  <tr>
-    <td>type</td>
-    <td>name=nameSearch</td>
-    <td>Integration</td>
-  </tr>
-  <tr>
-    <td>clickAndWait</td>
-    <td>class=navigator-filter-submit</td>
-    <td></td>
-  </tr>
-  <tr>
-    <td>assertText</td>
-    <td>measures-table</td>
-    <td>*Sonar :: Integration Tests :: Multi-modules Sample*</td>
-  </tr>
-  <tr>
-    <td>assertText</td>
-    <td>css=#measures-table tfoot</td>
-    <td>*1 results*</td>
-  </tr>
-  </tbody>
-</table>
-</body>
-</html>
diff --git a/it/it-tests/src/test/resources/measure/measure_filters/search_for_files.html b/it/it-tests/src/test/resources/measure/measure_filters/search_for_files.html
deleted file mode 100644
index 4e001a597c9..00000000000
--- a/it/it-tests/src/test/resources/measure/measure_filters/search_for_files.html
+++ /dev/null
@@ -1,49 +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>search_for_files</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-  <tbody>
-  <tr>
-    <td>open</td>
-    <td>/sonar/measures</td>
-    <td></td>
-  </tr>
-  <tr>
-    <td>waitForElementPresent</td>
-    <td>name=qualifiers[]</td>
-    <td></td>
-  </tr>
-  <tr>
-    <td>select</td>
-    <td>name=qualifiers[]</td>
-    <td>Files</td>
-  </tr>
-  <tr>
-    <td>clickAndWait</td>
-    <td>class=navigator-filter-submit</td>
-    <td></td>
-  </tr>
-  <tr>
-    <td>assertText</td>
-    <td>measures-table</td>
-    <td>*a1/HelloA1.xoo*a2/HelloA2.xoo*b1/HelloB1.xoo*b2/HelloB2.xoo*</td>
-  </tr>
-  <tr>
-    <td>assertText</td>
-    <td>css=#measures-table tfoot</td>
-    <td>*4 results*</td>
-  </tr>
-  <tr>
-    <td>assertNotText</td>
-    <td>measures-table</td>
-    <td>*Module A*</td>
-  </tr>
-  </tbody>
-</table>
-</body>
-</html>
diff --git a/it/it-tests/src/test/resources/measure/measure_filters/search_for_projects.html b/it/it-tests/src/test/resources/measure/measure_filters/search_for_projects.html
deleted file mode 100644
index c7c0e83bdb2..00000000000
--- a/it/it-tests/src/test/resources/measure/measure_filters/search_for_projects.html
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ SonarQube, open source software quality management tool.
-  ~ Copyright (C) 2008-2014 SonarSource
-  ~ mailto:contact AT sonarsource DOT com
-  ~
-  ~ SonarQube is free software; you can redistribute it and/or
-  ~ modify it under the terms of the GNU Lesser General Public
-  ~ License as published by the Free Software Foundation; either
-  ~ version 3 of the License, or (at your option) any later version.
-  ~
-  ~ SonarQube is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public License
-  ~ along with this program; if not, write to the Free Software Foundation,
-  ~ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-  -->
-
-<!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>search_for_projects_by_default</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-  <tbody>
-  <tr>
-    <td>open</td>
-    <td>/sonar/measures</td>
-    <td></td>
-  </tr>
-  <tr>
-    <td>waitForElementPresent</td>
-    <td>name=qualifiers[]</td>
-    <td></td>
-  </tr>
-  <tr>
-    <td>select</td>
-    <td>name=qualifiers[]</td>
-    <td>Projects</td>
-  </tr>
-  <tr>
-    <td>clickAndWait</td>
-    <td>class=navigator-filter-submit</td>
-    <td></td>
-  </tr>
-  <tr>
-    <td>assertElementPresent</td>
-    <td>measures-table</td>
-    <td></td>
-  </tr>
-  <tr>
-    <td>assertText</td>
-    <td>measures-table</td>
-    <td>*Sonar :: Integration Tests :: Multi-modules Sample*</td>
-  </tr>
-  </tbody>
-</table>
-</body>
-</html>
diff --git a/it/it-tests/src/test/resources/measure/measure_filters/should-not-share-filter-when-user-have-no-sharing-permissions.html b/it/it-tests/src/test/resources/measure/measure_filters/should-not-share-filter-when-user-have-no-sharing-permissions.html
deleted file mode 100644
index 94f85a0e3c5..00000000000
--- a/it/it-tests/src/test/resources/measure/measure_filters/should-not-share-filter-when-user-have-no-sharing-permissions.html
+++ /dev/null
@@ -1,94 +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_save_issue_filters</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<tbody>
-<tr>
-	<td>storeEval</td>
-	<td>'filter_'+(new Date()).getTime()</td>
-	<td>FILTER_NAME</td>
-</tr>
-<tr>
-    <td>open</td>
-    <td>/sonar/sessions/logout</td>
-	<td></td>
-</tr>
-<tr>
-	<td>open</td>
-	<td>/sonar/sessions/new</td>
-	<td></td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>login</td>
-	<td>user-measures-filter-with-no-share-perm</td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>password</td>
-	<td>password</td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>commit</td>
-	<td></td>
-</tr>
-<tr>
-	<td>open</td>
-	<td>/sonar/measures</td>
-	<td></td>
-</tr>
-<tr>
-  <td>waitForElementPresent</td>
-  <td>name=qualifiers[]</td>
-  <td></td>
-</tr>
-<tr>
-	<td>select</td>
-	<td>name=qualifiers[]</td>
-	<td>Projects</td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>class=navigator-filter-submit</td>
-	<td></td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>id=save-as</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForText</td>
-	<td>save-as-filter-form</td>
-	<td>*Save Filter*</td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>id=name</td>
-	<td>user_${FILTER_NAME}</td>
-</tr>
-<tr>
-  <td>assertNotText</td>
-  <td>save-as-filter-form</td>
-  <td>*Shared with all users*</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>id=save-as-submit</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForText</td>
-	<td>filter-title</td>
-	<td>*user_${FILTER_NAME}*Private*</td>
-</tr>
-</tbody>
-</table>
-</body>
-</html>
diff --git a/it/it-tests/src/test/resources/measure/measure_filters/should-unshare-filter-remove-other-filters-favourite.html b/it/it-tests/src/test/resources/measure/measure_filters/should-unshare-filter-remove-other-filters-favourite.html
deleted file mode 100644
index 8b6fb44c4e5..00000000000
--- a/it/it-tests/src/test/resources/measure/measure_filters/should-unshare-filter-remove-other-filters-favourite.html
+++ /dev/null
@@ -1,249 +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_save_issue_filters</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<tbody>
-<tr>
-	<td>storeEval</td>
-	<td>'filter_'+(new Date()).getTime()</td>
-	<td>FILTER_NAME</td>
-</tr>
-<tr>
-    <td>open</td>
-    <td>/sonar/sessions/logout</td>
-	<td></td>
-</tr>
-<tr>
-	<td>open</td>
-	<td>/sonar/sessions/new</td>
-	<td></td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>login</td>
-	<td>user-measures-filter-with-sharing-perm</td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>password</td>
-	<td>password</td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>commit</td>
-	<td></td>
-</tr>
-<tr>
-	<td>open</td>
-	<td>/sonar/measures</td>
-	<td></td>
-</tr>
-<tr>
-  <td>waitForElementPresent</td>
-  <td>name=qualifiers[]</td>
-  <td></td>
-</tr>
-<tr>
-	<td>select</td>
-	<td>name=qualifiers[]</td>
-	<td>Projects</td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>class=navigator-filter-submit</td>
-	<td></td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>id=save-as</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForText</td>
-	<td>save-as-filter-form</td>
-	<td>*Save Filter*</td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>id=name</td>
-	<td>user_${FILTER_NAME}</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>id=shared</td>
-	<td></td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>id=save-as-submit</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForText</td>
-	<td>filter-title</td>
-	<td>*user_${FILTER_NAME}*Shared with all users*</td>
-</tr>
-<tr>
-    <td>open</td>
-    <td>/sonar/sessions/logout</td>
-	<td></td>
-</tr>
-<tr>
-	<td>open</td>
-	<td>/sonar/sessions/new</td>
-	<td></td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>login</td>
-	<td>admin</td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>password</td>
-	<td>admin</td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>commit</td>
-	<td></td>
-</tr>
-<tr>
-	<td>open</td>
-	<td>/sonar/measures/manage</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForText</td>
-	<td>content</td>
-	<td>*My Measures Filters*</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>shared-filters</td>
-	<td>*user_${FILTER_NAME}*</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>id=star-user_${FILTER_NAME}</td>
-	<td></td>
-</tr>
-<tr>
-    <td>open</td>
-    <td>/sonar/sessions/logout</td>
-	<td></td>
-</tr>
-<tr>
-	<td>open</td>
-	<td>/sonar/sessions/new</td>
-	<td></td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>login</td>
-	<td>user-measures-filter-with-sharing-perm</td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>password</td>
-	<td>password</td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>commit</td>
-	<td></td>
-</tr>
-<tr>
-	<td>open</td>
-	<td>/sonar/measures</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForElementPresent</td>
-	<td>id=manage-favorites</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>id=manage-favorites</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForText</td>
-	<td>my-filters</td>
-	<td>*user_${FILTER_NAME}*</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>id=edit_user_${FILTER_NAME}</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForText</td>
-	<td>edit-filter-form</td>
-	<td>*Edit Filter*</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>shared</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>id=save-submit</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForText</td>
-	<td>filter-title</td>
-	<td>*user_${FILTER_NAME}*Private*</td>
-</tr>
-<tr>
-    <td>open</td>
-    <td>/sonar/sessions/logout</td>
-	<td></td>
-</tr>
-<tr>
-	<td>open</td>
-	<td>/sonar/sessions/new</td>
-	<td></td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>login</td>
-	<td>admin</td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>password</td>
-	<td>admin</td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>commit</td>
-	<td></td>
-</tr>
-<tr>
-	<td>open</td>
-	<td>/sonar/measures/manage</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForText</td>
-	<td>content</td>
-	<td>*My Measures Filters*</td>
-</tr>
-<tr>
-	<td>assertNotText</td>
-	<td>shared-filters</td>
-	<td>*user_${FILTER_NAME}*</td>
-</tr>
-</tbody>
-</table>
-</body>
-</html>