clean batch unused test resources

80 files changed, 0 insertions, 1566 deletions

diff --git a/sonar-batch/src/test/resources/org/sonar/batch/DefaultTimeMachineTest/loadMeasuresFromDate.xml b/sonar-batch/src/test/resources/org/sonar/batch/DefaultTimeMachineTest/loadMeasuresFromDate.xml
deleted file mode 100644
index a66341b5366..00000000000
--- a/sonar-batch/src/test/resources/org/sonar/batch/DefaultTimeMachineTest/loadMeasuresFromDate.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<dataset>
-  <metrics delete_historical_data="[null]" id="1" NAME="ncloc" VAL_TYPE="INT" DESCRIPTION="[null]"  domain="[null]" short_name=""
-           enabled="true" worst_value="[null]" optimized_best_value="[null]" best_value="[null]" direction="0" hidden="false"/>
-  <metrics delete_historical_data="[null]" id="2" NAME="coverage" VAL_TYPE="INT" DESCRIPTION="[null]"  domain="[null]" short_name=""
-           enabled="true" worst_value="[null]" optimized_best_value="[null]" best_value="[null]" direction="0" hidden="false"/>
-
-  <projects long_name="[null]" id="1" scope="PRJ" kee="group:artifact" qualifier="TRK" name="my project"
-            root_id="[null]"
-            description="[null]" enabled="true"  language="java" copy_resource_id="[null]" person_id="[null]"/>
-  <projects long_name="[null]" id="2" scope="DIR" kee="group:artifact:org.sonar" qualifier="PAC" name="org.sonar"
-            root_id="2"
-            description="[null]" enabled="true"  language="java" copy_resource_id="[null]" person_id="[null]"/>
-
-
-  <!-- Project : 3 snapshots -->
-  <snapshots purge_status="[null]" period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" id="1" created_at="1230159600000" build_date="1230159600000" version="1.0" project_id="1" scope="PRJ" qualifier="TRK"
-             root_project_id="[null]" root_snapshot_id="[null]" parent_snapshot_id="[null]" STATUS="P" ISLAST="false"
-             path=""
-             depth="0"/>
-  <snapshots purge_status="[null]" period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" id="2" created_at="1235566680000" build_date="1235566680000" version="2.0" project_id="1" scope="PRJ" qualifier="TRK"
-             root_project_id="[null]" root_snapshot_id="[null]" parent_snapshot_id="[null]" STATUS="P" ISLAST="false"
-             path=""
-             depth="0"/>
-  <snapshots purge_status="[null]" period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" id="3" created_at="1235656800000" build_date="1235656800000" version="[null]" project_id="1" scope="PRJ" qualifier="TRK"
-             root_project_id="[null]" root_snapshot_id="[null]" parent_snapshot_id="[null]" STATUS="P" ISLAST="true"
-             path="" depth="0"/>
-
-  <!-- unprocessed snapshot -->
-  <snapshots purge_status="[null]" period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" id="4" created_at="1235829600000" build_date="1235829600000" version="[null]" project_id="1" scope="PRJ" qualifier="TRK"
-             root_project_id="[null]" root_snapshot_id="[null]" parent_snapshot_id="[null]" STATUS="U" ISLAST="false"
-             path="" depth="0"/>
-
-  <!-- first snapshot measures -->
-  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"
-                    rule_priority="[null]"
-                    alert_text="[null]" id="1" VALUE="200" METRIC_ID="1" SNAPSHOT_ID="1" RULES_CATEGORY_ID="[null]"
-                    RULE_ID="[null]" text_value="[null]" tendency="[null]" measure_date="[null]" project_id="[null]"
-                    alert_status="[null]" description="[null]"/>
-  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"
-                    rule_priority="[null]"
-                    alert_text="[null]" id="2" VALUE="80" METRIC_ID="2" SNAPSHOT_ID="1" RULES_CATEGORY_ID="[null]"
-                    RULE_ID="[null]" text_value="[null]" tendency="[null]" measure_date="[null]" project_id="[null]"
-                    alert_status="[null]" description="[null]"/>
-
-  <!-- second snapshot measures -->
-  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"
-                    rule_priority="[null]"
-                    alert_text="[null]" id="3" VALUE="230" METRIC_ID="1" SNAPSHOT_ID="2" RULES_CATEGORY_ID="[null]"
-                    RULE_ID="[null]" text_value="[null]" tendency="[null]" measure_date="[null]" project_id="[null]"
-                    alert_status="[null]" description="[null]"/>
-  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"
-                    rule_priority="[null]"
-                    alert_text="[null]" id="4" VALUE="85" METRIC_ID="2" SNAPSHOT_ID="2" RULES_CATEGORY_ID="[null]"
-                    RULE_ID="[null]" text_value="[null]" tendency="[null]" measure_date="[null]" project_id="[null]"
-                    alert_status="[null]" description="[null]"/>
-
-
-  <!-- third snapshot measures : no coverage -->
-  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"
-                    rule_priority="[null]"
-                    alert_text="[null]" id="5" VALUE="180" METRIC_ID="1" SNAPSHOT_ID="3" RULES_CATEGORY_ID="[null]"
-                    RULE_ID="[null]" text_value="[null]" tendency="[null]" measure_date="[null]" project_id="[null]"
-                    alert_status="[null]" description="[null]"/>
-
-</dataset>
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/ProjectConfiguratorTest/MavenPluginsConfiguratorTest/pom.xml b/sonar-batch/src/test/resources/org/sonar/batch/ProjectConfiguratorTest/MavenPluginsConfiguratorTest/pom.xml
deleted file mode 100644
index 2f95da16602..00000000000
--- a/sonar-batch/src/test/resources/org/sonar/batch/ProjectConfiguratorTest/MavenPluginsConfiguratorTest/pom.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>mygroup</groupId>
-  <artifactId>myartifact</artifactId>
-  <packaging>jar</packaging>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>2.2</version>
-        <configuration>
-          <outputFileFormat>html</outputFileFormat>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>
\ No newline at end of file
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/ProjectConfiguratorTest/fail_if_not_latest_analysis.xml b/sonar-batch/src/test/resources/org/sonar/batch/ProjectConfiguratorTest/fail_if_not_latest_analysis.xml
deleted file mode 100644
index 27d0ef4bac0..00000000000
--- a/sonar-batch/src/test/resources/org/sonar/batch/ProjectConfiguratorTest/fail_if_not_latest_analysis.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<dataset>
-
-  <projects long_name="[null]" id="5" scope="PRJ" qualifier="TRK" kee="my:key"
-            name="My project" root_id="[null]"
-            description="[null]"
-            enabled="true" language="java" copy_resource_id="[null]" person_id="[null]"/>
-
-  <snapshots purge_status="[null]" period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="30" scope="PRJ" qualifier="TRK" created_at="1288616280000" build_date="1288616280000" version="[null]"
-             project_id="5" parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="false"
-             path="[null]"/>
-
-  <snapshots purge_status="[null]" period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="50" scope="PRJ" qualifier="TRK" created_at="1291294680000" build_date="1291294680000" version="[null]"
-             project_id="5" parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"
-             path="[null]"/>
-</dataset>
\ No newline at end of file
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/ProjectConfiguratorTest/set_analysis_date_on_latest_analysis.xml b/sonar-batch/src/test/resources/org/sonar/batch/ProjectConfiguratorTest/set_analysis_date_on_latest_analysis.xml
deleted file mode 100644
index 06e7901251a..00000000000
--- a/sonar-batch/src/test/resources/org/sonar/batch/ProjectConfiguratorTest/set_analysis_date_on_latest_analysis.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<dataset>
-
-  <projects long_name="[null]" id="5" scope="PRJ" qualifier="TRK" kee="my:key"
-            name="My project" root_id="[null]"
-            description="[null]"
-            enabled="true" language="java" copy_resource_id="[null]" person_id="[null]"/>
-
-  <snapshots purge_status="[null]" period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="30" scope="PRJ" qualifier="TRK" created_at="1225544280000" build_date="1225544280000" version="[null]"
-             project_id="5" parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="false"
-             path="[null]"/>
-
-  <snapshots purge_status="[null]" period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="50" scope="PRJ" qualifier="TRK" created_at="1228222680000" build_date="1228222680000" version="[null]"
-             project_id="5" parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"
-             path="[null]"/>
-</dataset>
\ No newline at end of file
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/ProjectConfiguratorTest/set_analysis_date_on_latest_analysis_if_never_analysed.xml b/sonar-batch/src/test/resources/org/sonar/batch/ProjectConfiguratorTest/set_analysis_date_on_latest_analysis_if_never_analysed.xml
deleted file mode 100644
index 4879a225eec..00000000000
--- a/sonar-batch/src/test/resources/org/sonar/batch/ProjectConfiguratorTest/set_analysis_date_on_latest_analysis_if_never_analysed.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<dataset>
-
-  <!-- other project -->
-  <projects long_name="[null]" id="5" scope="PRJ" qualifier="TRK" kee="other:key"
-            name="My project" root_id="[null]"
-            description="[null]"
-            enabled="true" language="java" copy_resource_id="[null]" person_id="[null]"/>
-
-  <snapshots purge_status="[null]" period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="50" scope="PRJ" qualifier="TRK" created_at="1228222680000" build_date="1228222680000" version="[null]"
-             project_id="5" parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"
-             path="[null]"/>
-</dataset>
\ No newline at end of file
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/ProjectTreeTest/keyIncludesBranch/pom.xml b/sonar-batch/src/test/resources/org/sonar/batch/ProjectTreeTest/keyIncludesBranch/pom.xml
deleted file mode 100644
index 98ea71c1d09..00000000000
--- a/sonar-batch/src/test/resources/org/sonar/batch/ProjectTreeTest/keyIncludesBranch/pom.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.test</groupId>
-  <artifactId>project</artifactId>
-  <version>0.1-SNAPSHOT</version>
-  <packaging>pom</packaging>
-  <name>Project</name>
-  <properties>
-    <sonar.branch>BRANCH-1.X</sonar.branch>
-  </properties>
-</project>
\ No newline at end of file
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/ProjectTreeTest/singleProjectHasNoModules/pom.xml b/sonar-batch/src/test/resources/org/sonar/batch/ProjectTreeTest/singleProjectHasNoModules/pom.xml
deleted file mode 100644
index ffd40530c5d..00000000000
--- a/sonar-batch/src/test/resources/org/sonar/batch/ProjectTreeTest/singleProjectHasNoModules/pom.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.test</groupId>
-  <artifactId>parent</artifactId>
-  <version>0.1-SNAPSHOT</version>
-  <packaging>pom</packaging>
-</project>
\ No newline at end of file
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/bootstrap/BatchPluginRepositoryTest/checkstyle-ext.xml b/sonar-batch/src/test/resources/org/sonar/batch/bootstrap/BatchPluginRepositoryTest/checkstyle-ext.xml
deleted file mode 100644
index 75a263db3c3..00000000000
--- a/sonar-batch/src/test/resources/org/sonar/batch/bootstrap/BatchPluginRepositoryTest/checkstyle-ext.xml
+++ /dev/null
@@ -1 +0,0 @@
-<fake/>
\ No newline at end of file
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/bootstrap/BatchPluginRepositoryTest/sonar-checkstyle-extensions-plugin-0.1-SNAPSHOT.jar b/sonar-batch/src/test/resources/org/sonar/batch/bootstrap/BatchPluginRepositoryTest/sonar-checkstyle-extensions-plugin-0.1-SNAPSHOT.jar
deleted file mode 100644
index 4ae5393cee5..00000000000
--- a/sonar-batch/src/test/resources/org/sonar/batch/bootstrap/BatchPluginRepositoryTest/sonar-checkstyle-extensions-plugin-0.1-SNAPSHOT.jar
+++ /dev/null
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/bootstrap/BatchPluginRepositoryTest/sonar-checkstyle-plugin-2.8.jar b/sonar-batch/src/test/resources/org/sonar/batch/bootstrap/BatchPluginRepositoryTest/sonar-checkstyle-plugin-2.8.jar
deleted file mode 100644
index f937399bec5..00000000000
--- a/sonar-batch/src/test/resources/org/sonar/batch/bootstrap/BatchPluginRepositoryTest/sonar-checkstyle-plugin-2.8.jar
+++ /dev/null
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/components/PastMeasuresLoaderTest/shared.xml b/sonar-batch/src/test/resources/org/sonar/batch/components/PastMeasuresLoaderTest/shared.xml
deleted file mode 100644
index eb661e9f02b..00000000000
--- a/sonar-batch/src/test/resources/org/sonar/batch/components/PastMeasuresLoaderTest/shared.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<dataset>
-
-  <metrics delete_historical_data="[null]" id="1" name="ncloc" VAL_TYPE="INT" DESCRIPTION="[null]"  domain="[null]" short_name=""
-           enabled="true" worst_value="[null]" optimized_best_value="[null]" best_value="[null]" direction="0" hidden="false"/>
-  <metrics delete_historical_data="[null]" id="2" name="coverage" VAL_TYPE="INT" DESCRIPTION="[null]"  domain="[null]" short_name=""
-           enabled="true" worst_value="0" optimized_best_value="true" best_value="100" direction="1" hidden="false"/>
-
-
-  <rules tags="[null]" system_tags="[null]" id="30" name="Check Header" plugin_rule_key="com.puppycrawl.tools.checkstyle.checks.header.HeaderCheck"
-         plugin_config_key="Checker/Treewalker/HeaderCheck" plugin_name="checkstyle" description="[null]" priority="4" status="READY"
-         is_template="[false]" template_id="[null]"/>
-
-  <rules tags="[null]" system_tags="[null]" id="31" name="Equals Avoid Null" plugin_rule_key="com.puppycrawl.tools.checkstyle.checks.coding.EqualsAvoidNullCheck"
-         plugin_config_key="Checker/TreeWalker/EqualsAvoidNull" plugin_name="checkstyle" description="[null]" priority="4" status="READY"
-         is_template="[false]" template_id="[null]"/>
-
-  <!-- project -->
-  <projects long_name="[null]" id="1" scope="PRJ" qualifier="TRK" kee="project" name="project"
-            root_id="[null]"
-            description="[null]"
-            enabled="true" language="java" copy_resource_id="[null]" person_id="[null]"/>
-
-  <!-- package -->
-  <projects long_name="[null]" id="2" scope="DIR" qualifier="PAC" kee="project:org.foo" name="org.foo"
-            root_id="1"
-            description="[null]"
-            enabled="true" language="java" copy_resource_id="[null]" person_id="[null]"/>
-
-  <!-- file -->
-  <projects long_name="org.foo.Bar" id="3" scope="FIL" qualifier="CLA" kee="project:org.foo.Bar"
-            name="Bar" root_id="[null]"
-            description="[null]"
-            enabled="true" language="java" copy_resource_id="[null]" person_id="[null]"/>
-
-
-  <!-- snapshots -->
-  <snapshots purge_status="[null]" period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" id="1000" project_id="1" parent_snapshot_id="[null]" root_project_id="1" root_snapshot_id="[null]"
-             scope="PRJ" qualifier="TRK" created_at="1225544280000" build_date="1225544280000" version="[null]" path=""
-             status="P" islast="false" depth="0" />
-
-  <snapshots purge_status="[null]" period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" id="1001" project_id="2" parent_snapshot_id="1000" root_project_id="1" root_snapshot_id="1000"
-             scope="DIR" qualifier="PAC" created_at="1225544280000" build_date="1225544280000" version="[null]" path="1000."
-             status="P" islast="false" depth="1" />
-
-  <snapshots purge_status="[null]" period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" id="1002" project_id="3" parent_snapshot_id="1001" root_project_id="1" root_snapshot_id="1000"
-             scope="FIL" qualifier="CLA" created_at="1225544280000" build_date="1225544280000" version="[null]" path="1000.1001."
-             status="P" islast="false" depth="2" />
-
-
-  <!-- project measures -->
-  <project_measures id="1" VALUE="60" METRIC_ID="1" SNAPSHOT_ID="1000" alert_text="[null]" RULES_CATEGORY_ID="[null]"
-                    RULE_ID="[null]" text_value="[null]" tendency="[null]" measure_date="[null]" project_id="[null]"
-                    alert_status="[null]" description="[null]" rule_priority="[null]" characteristic_id="[null]" url="[null]"
-                    variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"/>
-
-  <project_measures id="2" VALUE="80" METRIC_ID="2" SNAPSHOT_ID="1000" alert_text="[null]" RULES_CATEGORY_ID="[null]"
-                    RULE_ID="[null]" text_value="[null]" tendency="[null]" measure_date="[null]" project_id="[null]"
-                    alert_status="[null]" description="[null]" rule_priority="[null]" characteristic_id="[null]" url="[null]"
-                    variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"/>
-
-  <!-- package measures -->
-  <project_measures id="3" VALUE="20" METRIC_ID="1" SNAPSHOT_ID="1001" alert_text="[null]" RULES_CATEGORY_ID="[null]"
-                    RULE_ID="[null]" text_value="[null]" tendency="[null]" measure_date="[null]" project_id="[null]"
-                    alert_status="[null]" description="[null]" rule_priority="[null]" characteristic_id="[null]" url="[null]"
-                    variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"/>
-
-  <project_measures id="4" VALUE="70" METRIC_ID="2" SNAPSHOT_ID="1001" alert_text="[null]" RULES_CATEGORY_ID="[null]"
-                    RULE_ID="[null]" text_value="[null]" tendency="[null]" measure_date="[null]" project_id="[null]"
-                    alert_status="[null]" description="[null]" rule_priority="[null]" characteristic_id="[null]" url="[null]"
-                    variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"/>
-
-  <!-- file measures -->
-  <project_measures id="5" VALUE="5" METRIC_ID="1" SNAPSHOT_ID="1002" alert_text="[null]" RULES_CATEGORY_ID="[null]"
-                    RULE_ID="[null]" text_value="[null]" tendency="[null]" measure_date="[null]" project_id="[null]"
-                    alert_status="[null]" description="[null]" rule_priority="[null]" characteristic_id="[null]" url="[null]"
-                    variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"/>
-
-  <project_measures id="6" VALUE="60" METRIC_ID="2" SNAPSHOT_ID="1002" alert_text="[null]" RULES_CATEGORY_ID="[null]"
-                    RULE_ID="[null]" text_value="[null]" tendency="[null]" measure_date="[null]" project_id="[null]"
-                    alert_status="[null]" description="[null]" rule_priority="[null]" characteristic_id="[null]" url="[null]"
-                    variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"/>
-</dataset>
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/components/TimeMachineConfigurationTest/shared.xml b/sonar-batch/src/test/resources/org/sonar/batch/components/TimeMachineConfigurationTest/shared.xml
deleted file mode 100644
index c7713445479..00000000000
--- a/sonar-batch/src/test/resources/org/sonar/batch/components/TimeMachineConfigurationTest/shared.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<dataset>
-
-  <!-- Project -->
-  <snapshots id="1010" purge_status="[null]" period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]"
-             project_id="1" parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]"
-             scope="PRJ" qualifier="TRK" created_at="1227790680000" build_date="1227790680000" version="1.2-SNAPSHOT" path=""
-             status="U" islast="false" depth="0" />
-
-  <!-- Module -->
-  <snapshots id="1011" purge_status="[null]" period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]"
-             project_id="2" parent_snapshot_id="1010" root_project_id="1" root_snapshot_id="1010"
-             scope="PRJ" qualifier="BRC" created_at="1227790680000" build_date="1227790680000" version="1.2-SNAPSHOT" path=""
-             status="U" islast="false" depth="0" />
-
-</dataset>
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/compute/ManualMeasureDecoratorTest/testCopyManualMeasures.xml b/sonar-batch/src/test/resources/org/sonar/batch/compute/ManualMeasureDecoratorTest/testCopyManualMeasures.xml
deleted file mode 100644
index 02eacbbd46d..00000000000
--- a/sonar-batch/src/test/resources/org/sonar/batch/compute/ManualMeasureDecoratorTest/testCopyManualMeasures.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<dataset>
-  <metrics delete_historical_data="[null]" id="1" NAME="ncloc" VAL_TYPE="INT" DESCRIPTION="[null]"  domain="[null]" short_name=""
-           enabled="true" worst_value="[null]" optimized_best_value="[null]" best_value="[null]" direction="0" hidden="false"/>
-  <metrics delete_historical_data="[null]" id="2" NAME="review_note" VAL_TYPE="INT" DESCRIPTION="[null]"  domain="[null]" short_name=""
-           enabled="true" worst_value="[null]" optimized_best_value="[null]" best_value="[null]" direction="0" hidden="false"/>
-
-
-  <manual_measures id="1" metric_id="2"  component_uuid="ABCD" value="3.14" text_value="pi" created_at="[null]" updated_at="[null]" description="this is pi" user_login="me"/>
-  <manual_measures id="2" metric_id="2"  component_uuid="EFGH" value="6" text_value="six" created_at="[null]" updated_at="[null]" description="this is six" user_login="me"/>
-
-</dataset>
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/compute/ProjectLinksSensorTest/shouldDeleteMissingLinks.xml b/sonar-batch/src/test/resources/org/sonar/batch/compute/ProjectLinksSensorTest/shouldDeleteMissingLinks.xml
deleted file mode 100644
index 836bb4630e9..00000000000
--- a/sonar-batch/src/test/resources/org/sonar/batch/compute/ProjectLinksSensorTest/shouldDeleteMissingLinks.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.codehaus.sonar</groupId>
-  <artifactId>sonar</artifactId>
-  <packaging>pom</packaging>
-  <version>1.8-SNAPSHOT</version>
-
-</project>
\ No newline at end of file
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/compute/ProjectLinksSensorTest/shouldSaveLinks.xml b/sonar-batch/src/test/resources/org/sonar/batch/compute/ProjectLinksSensorTest/shouldSaveLinks.xml
deleted file mode 100644
index 204af70a615..00000000000
--- a/sonar-batch/src/test/resources/org/sonar/batch/compute/ProjectLinksSensorTest/shouldSaveLinks.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.codehaus.sonar</groupId>
-  <artifactId>sonar</artifactId>
-  <packaging>pom</packaging>
-  <version>1.8-SNAPSHOT</version>
-  <url>http://sonar.codehaus.org</url>
-
-  <organization>
-    <name>SonarSource SA</name>
-    <url>http://www.sonarsource.com</url>
-  </organization>
-  <inceptionYear>2009</inceptionYear>
-
-  <issueManagement>
-    <system>jira</system>
-    <url>http://jira.sonarsource.com/browse/SONAR</url>
-  </issueManagement>
-
-  <mailingLists>
-    <mailingList>
-      <name>Sonar users mailing list</name>
-      <subscribe>http://xircles.codehaus.org/projects/sonar/lists</subscribe>
-      <unsubscribe>http://xircles.codehaus.org/projects/sonar/lists</unsubscribe>
-      <post>user@sonar.codehaus.org</post>
-      <archive>http://www.nabble.com/Sonar-f30151.html</archive>
-    </mailingList>
-  </mailingLists>
-
-  <scm>
-    <connection>scm:svn:http://svn.codehaus.org/sonar/trunk</connection>
-    <developerConnection>scm:svn:https://svn.codehaus.org/sonar/trunk</developerConnection>
-    <url>http://svn.sonar.codehaus.org</url>
-  </scm>
-
-  <ciManagement>
-    <system>bamboo</system>
-    <url>http://bamboo.ci.codehaus.org/browse/SONAR/</url>
-  </ciManagement>
-
-  <licenses>
-    <license>
-      <name>GNU Lesser General Public License (LGPL), v.3</name>
-      <url>http://www.gnu.org/licenses/lgpl.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-
-</project>
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/compute/ViolationPersisterDecoratorTest/shared.xml b/sonar-batch/src/test/resources/org/sonar/batch/compute/ViolationPersisterDecoratorTest/shared.xml
deleted file mode 100644
index 519ce8d5157..00000000000
--- a/sonar-batch/src/test/resources/org/sonar/batch/compute/ViolationPersisterDecoratorTest/shared.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<dataset>
-
-  <rules tags="[null]" system_tags="[null]" id="30" name="Check Header" plugin_rule_key="com.puppycrawl.tools.checkstyle.checks.header.HeaderCheck"
-         plugin_config_key="Checker/Treewalker/HeaderCheck" plugin_name="checkstyle" description="[null]" priority="4" status="READY"
-         is_template="[false]" template_id="[null]"/>
-
-  <rules tags="[null]" system_tags="[null]" id="31" name="Equals Avoid Null" plugin_rule_key="com.puppycrawl.tools.checkstyle.checks.coding.EqualsAvoidNullCheck"
-         plugin_config_key="Checker/TreeWalker/EqualsAvoidNull" plugin_name="checkstyle" description="[null]" priority="4" status="READY"
-         is_template="[false]" template_id="[null]"/>
-
-  <projects id="200" scope="FIL" qualifier="CLA" kee="project:org.foo.Bar" root_id="[null]"
-            name="Bar" long_name="org.foo.Bar" description="[null]"
-            enabled="true" language="java" copy_resource_id="[null]" person_id="[null]" />
-
-  <snapshots purge_status="[null]" period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]"
-             period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]"
-             id="1000" project_id="200" parent_snapshot_id="[null]" root_project_id="100" root_snapshot_id="[null]"
-             scope="FIL" qualifier="CLA" created_at="1225544280000" build_date="1225544280000" version="[null]" path=""
-             status="U" islast="false" depth="3"/>
-
-</dataset>
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/compute/ViolationPersisterDecoratorTest/shouldCopyPermanentIdFromReferenceViolation-result.xml b/sonar-batch/src/test/resources/org/sonar/batch/compute/ViolationPersisterDecoratorTest/shouldCopyPermanentIdFromReferenceViolation-result.xml
deleted file mode 100644
index 061041849aa..00000000000
--- a/sonar-batch/src/test/resources/org/sonar/batch/compute/ViolationPersisterDecoratorTest/shouldCopyPermanentIdFromReferenceViolation-result.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<dataset>
-
-  <rules tags="[null]" system_tags="[null]" id="30" name="Check Header" plugin_rule_key="com.puppycrawl.tools.checkstyle.checks.header.HeaderCheck"
-         plugin_config_key="Checker/Treewalker/HeaderCheck" plugin_name="checkstyle" description="[null]" priority="4" status="READY"
-         is_template="[false]" template_id="[null]"/>
-
-  <rules tags="[null]" system_tags="[null]" id="31" name="Equals Avoid Null" plugin_rule_key="com.puppycrawl.tools.checkstyle.checks.coding.EqualsAvoidNullCheck"
-         plugin_config_key="Checker/TreeWalker/EqualsAvoidNull" plugin_name="checkstyle" description="[null]" priority="4" status="READY"
-         is_template="[false]" template_id="[null]"/>
-
-  <projects id="200" scope="FIL" qualifier="CLA" kee="project:org.foo.Bar" root_id="[null]"
-            name="Bar" long_name="org.foo.Bar" description="[null]"
-            enabled="true" language="java" copy_resource_id="[null]" person_id="[null]" />
-
-  <snapshots purge_status="[null]" period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]"
-             period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" id="1000" project_id="200"
-             parent_snapshot_id="[null]" root_project_id="100" root_snapshot_id="[null]"
-             scope="FIL" qualifier="CLA" created_at="1225544280000" build_date="1225544280000" version="[null]" path=""
-             status="U" islast="false" depth="3"/>
-
-</dataset>
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/compute/ViolationPersisterDecoratorTest/shouldSaveViolations-result.xml b/sonar-batch/src/test/resources/org/sonar/batch/compute/ViolationPersisterDecoratorTest/shouldSaveViolations-result.xml
deleted file mode 100644
index f1bbc0bda6f..00000000000
--- a/sonar-batch/src/test/resources/org/sonar/batch/compute/ViolationPersisterDecoratorTest/shouldSaveViolations-result.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<dataset>
-  <rules tags="[null]" system_tags="[null]" id="30" name="Check Header" plugin_rule_key="com.puppycrawl.tools.checkstyle.checks.header.HeaderCheck"
-         plugin_config_key="Checker/Treewalker/HeaderCheck" plugin_name="checkstyle" description="[null]" priority="4" status="READY"
-         is_template="[false]" template_id="[null]"/>
-
-  <rules tags="[null]" system_tags="[null]" id="31" name="Equals Avoid Null" plugin_rule_key="com.puppycrawl.tools.checkstyle.checks.coding.EqualsAvoidNullCheck"
-         plugin_config_key="Checker/TreeWalker/EqualsAvoidNull" plugin_name="checkstyle" description="[null]" priority="4" status="READY"
-         is_template="[false]" template_id="[null]"/>
-
-  <projects id="200" scope="FIL" qualifier="CLA" kee="project:org.foo.Bar" root_id="[null]"
-            name="Bar" long_name="org.foo.Bar" description="[null]"
-            enabled="true" language="java" copy_resource_id="[null]" person_id="[null]" />
-
-  <snapshots purge_status="[null]" period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]"
-             period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" id="1000" project_id="200"
-             parent_snapshot_id="[null]" root_project_id="100" root_snapshot_id="[null]"
-             scope="FIL" qualifier="CLA" created_at="1225544280000" build_date="1225544280000" version="[null]" path=""
-             status="U" islast="false" depth="3"/>
-
-</dataset>
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/compute/ViolationTrackingTest/example1-v1.txt b/sonar-batch/src/test/resources/org/sonar/batch/compute/ViolationTrackingTest/example1-v1.txt
deleted file mode 100644
index 1920333ddb6..00000000000
--- a/sonar-batch/src/test/resources/org/sonar/batch/compute/ViolationTrackingTest/example1-v1.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-package example1;
-
-public class Toto {
-
-    public void doSomething() {
-        // doSomething
-        }
-
-    public void doSomethingElse() {
-        // doSomethingElse
-        }
-}
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/compute/ViolationTrackingTest/example1-v2.txt b/sonar-batch/src/test/resources/org/sonar/batch/compute/ViolationTrackingTest/example1-v2.txt
deleted file mode 100644
index 231532452b2..00000000000
--- a/sonar-batch/src/test/resources/org/sonar/batch/compute/ViolationTrackingTest/example1-v2.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-package example1;
-
-public class Toto {
-
-    public Toto(){}
-
-    public void doSomethingNew() {
-        // doSomethingNew
-        }
-
-    public void doSomethingElseNew() {
-        // doSomethingElseNew
-        }
-
-    public void doSomething() {
-        // doSomething
-        }
-
-    public void doSomethingElse() {
-        // doSomethingElse
-        }
-}
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/compute/ViolationTrackingTest/example2-v1.txt b/sonar-batch/src/test/resources/org/sonar/batch/compute/ViolationTrackingTest/example2-v1.txt
deleted file mode 100644
index a920afe459b..00000000000
--- a/sonar-batch/src/test/resources/org/sonar/batch/compute/ViolationTrackingTest/example2-v1.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-package example2;
-
-public class Toto {
-  void method1() {
-    System.out.println("toto");
-  }
-}
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/compute/ViolationTrackingTest/example2-v2.txt b/sonar-batch/src/test/resources/org/sonar/batch/compute/ViolationTrackingTest/example2-v2.txt
deleted file mode 100644
index c5c8250cf65..00000000000
--- a/sonar-batch/src/test/resources/org/sonar/batch/compute/ViolationTrackingTest/example2-v2.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-package example2;
-
-public class Toto {
-
-  void method2() {
-    System.out.println("toto");
-  }
-
-  void method1() {
-    System.out.println("toto");
-  }
-
-  void method3() {
-    System.out.println("toto");
-  }
-}
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/design/DsmSerializerTest/dsm.json b/sonar-batch/src/test/resources/org/sonar/batch/design/DsmSerializerTest/dsm.json
deleted file mode 100644
index 57996b089e7..00000000000
--- a/sonar-batch/src/test/resources/org/sonar/batch/design/DsmSerializerTest/dsm.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"i":8,"n":"src/org/bar","q":"DIR","v":[{},{"i":30,"w":1}]},{"i":7,"n":"src/org/foo","q":"DIR","v":[{},{}]}]
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/index/ResourceKeyMigrationTest/shouldMigrateResourceKeys-result.xml b/sonar-batch/src/test/resources/org/sonar/batch/index/ResourceKeyMigrationTest/shouldMigrateResourceKeys-result.xml
deleted file mode 100644
index d1df83734d6..00000000000
--- a/sonar-batch/src/test/resources/org/sonar/batch/index/ResourceKeyMigrationTest/shouldMigrateResourceKeys-result.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<dataset>
-
-  <!-- other project already migrated -->
-  <projects id="1000" scope="PRJ" qualifier="TRK" kee="my:key" root_id="[null]" uuid="ABCD" project_uuid="ABCD" module_uuid="[null]" module_uuid_path="[null]"
-            name="Other project" long_name="Other" description="[null]"
-            enabled="true" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" deprecated_kee="my:key" />
-
-  <!-- Root project not migrated -->
-  <projects id="1001" scope="PRJ" qualifier="TRK" kee="root" root_id="[null]" uuid="BCDE" project_uuid="BCDE" module_uuid="[null]" module_uuid_path="[null]"
-            name="Root" long_name="Root" description="[null]"
-            enabled="true" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" deprecated_kee="[null]" />
-
-  <!-- PHP module -->
-  <projects id="1002" scope="PRJ" qualifier="BRC" kee="a" root_id="1001" uuid="CDEF" project_uuid="BCDE" module_uuid="[null]" module_uuid_path="BCDE"
-            name="A" long_name="A" description="[null]"
-            enabled="true" language="php" copy_resource_id="[null]" person_id="[null]" path="[null]" deprecated_kee="[null]" />
-
-  <!-- Java module -->
-  <projects id="1003" scope="PRJ" qualifier="BRC" kee="b" root_id="1001" uuid="DEFG" project_uuid="BCDE" module_uuid="[null]" module_uuid_path="BCDE"
-            name="B" long_name="B" description="[null]"
-            enabled="true" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" deprecated_kee="[null]" />
-
-  <!-- Java resources -->
-  <projects id="1004" scope="DIR" qualifier="DIR" kee="b:src/main/java/org/foo" root_id="1003" uuid="EFGH" project_uuid="BCDE" module_uuid="DEFG" module_uuid_path="BCDE.DEFG"
-            name="org/foo" long_name="org/foo" description="[null]"
-            enabled="true" language="[null]" copy_resource_id="[null]" person_id="[null]" path="[null]" deprecated_kee="b:org/foo" />
-
-  <projects id="1005" scope="FIL" qualifier="CLA" kee="b:src/main/java/org/foo/Bar.java" root_id="1003"  uuid="GHIJ" project_uuid="BCDE" module_uuid="DEFG" module_uuid_path="BCDE.DEFG"
-            name="Bar" long_name="org.foo.Bar" description="[null]"
-            enabled="true" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" deprecated_kee="b:org.foo.Bar" />
-
-  <projects id="1006" scope="FIL" qualifier="UTS" kee="b:src/test/java/org/foo/BarTest.java" root_id="1003"  uuid="HIJK" project_uuid="BCDE" module_uuid="DEFG" module_uuid_path="BCDE.DEFG"
-            name="BarTest" long_name="org.foo.BarTest" description="[null]"
-            enabled="true" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" deprecated_kee="b:org.foo.BarTest" />
-
-  <projects id="1007" scope="DIR" qualifier="DIR" kee="b:src/main/java" root_id="1003" uuid="IJKL" project_uuid="BCDE" module_uuid="DEFG" module_uuid_path="BCDE.DEFG"
-          name="[root]" long_name="[root]" description="[null]"
-          enabled="true" language="[null]" copy_resource_id="[null]" person_id="[null]" path="[null]" deprecated_kee="b:[root]" />
-
-  <projects id="1008" scope="FIL" qualifier="CLA" kee="b:src/main/java/RootBar.java" root_id="1003" uuid="JKLM" project_uuid="BCDE" module_uuid="DEFG" module_uuid_path="BCDE.DEFG"
-            name="RootBar" long_name="RootBar" description="[null]"
-            enabled="true" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" deprecated_kee="b:[default].RootBar" />
-
-  <!-- Disabled Java resources -->
-  <projects id="1009" scope="DIR" qualifier="DIR" kee="b:src/main/java/org/foo_renamed_by_resource_key_migration" root_id="1003"  uuid="KLMN" project_uuid="BCDE" module_uuid="DEFG" module_uuid_path="BCDE.DEFG"
-            name="src/main/java/org/foo" long_name="src/main/java/org/foo" description="[null]"
-            enabled="false" language="[null]" copy_resource_id="[null]" person_id="[null]" path="[null]" deprecated_kee="[null]" />
-
-  <projects id="1010" scope="FIL" qualifier="CLA" kee="b:src.main.java.org.foo.Bar" root_id="1003" uuid="LMNO" project_uuid="BCDE" module_uuid="DEFG" module_uuid_path="BCDE.DEFG"
-            name="Bar" long_name="src.main.java.org.foo.Bar" description="[null]"
-            enabled="false" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" deprecated_kee="[null]" />
-            
-  <!-- PHP resources -->
-  <projects id="1020" scope="DIR" qualifier="DIR" kee="a:org/foo" root_id="1002" uuid="MNOP" project_uuid="BCDE" module_uuid="CDEF" module_uuid_path="BCDE.CDEF"
-            name="org/foo" long_name="org/foo" description="[null]"
-            enabled="true" language="[null]" copy_resource_id="[null]" person_id="[null]" path="[null]" deprecated_kee="a:org/foo" />
-
-  <projects id="1021" scope="FIL" qualifier="FIL" kee="a:org/foo/Bar.php" root_id="1002" uuid="NOPQ" project_uuid="BCDE" module_uuid="CDEF" module_uuid_path="BCDE.CDEF"
-            name="Bar.php" long_name="Bar.php" description="[null]"
-            enabled="true" language="php" copy_resource_id="[null]" person_id="[null]" path="[null]" deprecated_kee="a:org/foo/Bar.php" />
-            
-  <projects id="1022" scope="FIL" qualifier="UTS" kee="a:test/org/foo/BarTest.php" root_id="1002" uuid="OPQR" project_uuid="BCDE" module_uuid="CDEF" module_uuid_path="BCDE.CDEF"
-            name="BarTest.php" long_name="BarTest.php" description="[null]"
-            enabled="true" language="php" copy_resource_id="[null]" person_id="[null]" path="[null]" deprecated_kee="a:org/foo/BarTest.php" />
-
-  <projects id="1023" scope="DIR" qualifier="DIR" kee="a:/" root_id="1002" uuid="PQRS" project_uuid="BCDE" module_uuid="CDEF" module_uuid_path="BCDE.CDEF"
-          name="[root]" long_name="[root]" description="[null]"
-          enabled="true" language="[null]" copy_resource_id="[null]" person_id="[null]" path="[null]" deprecated_kee="a:[root]" />
-
-  <projects id="1024" scope="FIL" qualifier="FIL" kee="a:RootBar.php" root_id="1002" uuid="QRST" project_uuid="BCDE" module_uuid="CDEF" module_uuid_path="BCDE.CDEF"
-            name="RootBar.php" long_name="RootBar.php" description="[null]"
-            enabled="true" language="php" copy_resource_id="[null]" person_id="[null]" path="[null]" deprecated_kee="a:RootBar.php" />
-
-  <!-- Disabled PHP resources -->
-  <projects id="1025" scope="DIR" qualifier="DIR" kee="a:test/org/foo" root_id="1002" uuid="RSTU" project_uuid="BCDE" module_uuid="CDEF" module_uuid_path="BCDE.CDEF"
-            name="test/org/foo" long_name="test/org/foo" description="[null]"
-            enabled="false" language="[null]" copy_resource_id="[null]" person_id="[null]" path="[null]" deprecated_kee="[null]" />
-            
-  <projects id="1026" scope="FIL" qualifier="UTS" kee="a:test/org/foo/BarTest.php_renamed_by_resource_key_migration" root_id="1002" uuid="STUV" project_uuid="BCDE" module_uuid="CDEF" module_uuid_path="BCDE.CDEF"
-            name="BarTest.php" long_name="BarTest.php" description="[null]"
-            enabled="false" language="php" copy_resource_id="[null]" person_id="[null]" path="[null]" deprecated_kee="[null]" />
-
-</dataset>
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/index/ResourceKeyMigrationTest/shouldMigrateResourceKeys.xml b/sonar-batch/src/test/resources/org/sonar/batch/index/ResourceKeyMigrationTest/shouldMigrateResourceKeys.xml
deleted file mode 100644
index 0b735e8b234..00000000000
--- a/sonar-batch/src/test/resources/org/sonar/batch/index/ResourceKeyMigrationTest/shouldMigrateResourceKeys.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<dataset>
-
-  <!-- other project already migrated -->
-  <projects id="1000" scope="PRJ" qualifier="TRK" kee="my:key" root_id="[null]" uuid="ABCD" project_uuid="ABCD" module_uuid="[null]" module_uuid_path="[null]"
-            name="Other project" long_name="Other" description="[null]"
-            enabled="true" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" deprecated_kee="my:key" />
-
-  <!-- Root project not migrated -->
-  <projects id="1001" scope="PRJ" qualifier="TRK" kee="root" root_id="[null]" uuid="BCDE" project_uuid="BCDE" module_uuid="[null]" module_uuid_path="[null]"
-            name="Root" long_name="Root" description="[null]"
-            enabled="true" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" deprecated_kee="[null]" />
-
-  <!-- PHP module -->
-  <projects id="1002" scope="PRJ" qualifier="BRC" kee="a" root_id="1001" uuid="CDEF" project_uuid="BCDE" module_uuid="[null]" module_uuid_path="BCDE"
-            name="A" long_name="A" description="[null]"
-            enabled="true" language="php" copy_resource_id="[null]" person_id="[null]" path="[null]" deprecated_kee="[null]" />
-
-  <!-- Java module -->
-  <projects id="1003" scope="PRJ" qualifier="BRC" kee="b" root_id="1001" uuid="DEFG" project_uuid="BCDE" module_uuid="[null]" module_uuid_path="BCDE"
-            name="B" long_name="B" description="[null]"
-            enabled="true" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" deprecated_kee="[null]" />
-
-  <!-- Java resources -->
-  
-  <projects id="1004" scope="DIR" qualifier="DIR" kee="b:org/foo" root_id="1003" uuid="EFGH" project_uuid="BCDE" module_uuid="DEFG" module_uuid_path="BCDE.DEFG"
-            name="org/foo" long_name="org/foo" description="[null]"
-            enabled="true" language="[null]" copy_resource_id="[null]" person_id="[null]" path="[null]" deprecated_kee="[null]" />
-
-  <projects id="1005" scope="FIL" qualifier="CLA" kee="b:org.foo.Bar" root_id="1003" uuid="GHIJ" project_uuid="BCDE" module_uuid="DEFG" module_uuid_path="BCDE.DEFG"
-            name="Bar" long_name="org.foo.Bar" description="[null]"
-            enabled="true" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" deprecated_kee="[null]" />
-
-  <projects id="1006" scope="FIL" qualifier="UTS" kee="b:org.foo.BarTest" root_id="1003" uuid="HIJK" project_uuid="BCDE" module_uuid="DEFG" module_uuid_path="BCDE.DEFG"
-            name="BarTest" long_name="org.foo.BarTest" description="[null]"
-            enabled="true" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" deprecated_kee="[null]" />
-
-  <projects id="1007" scope="DIR" qualifier="DIR" kee="b:[root]" root_id="1003" uuid="IJKL" project_uuid="BCDE" module_uuid="DEFG" module_uuid_path="BCDE.DEFG"
-          name="[root]" long_name="[root]" description="[null]"
-          enabled="true" language="[null]" copy_resource_id="[null]" person_id="[null]" path="[null]" deprecated_kee="[null]" />
-
-  <projects id="1008" scope="FIL" qualifier="CLA" kee="b:[default].RootBar" root_id="1003" uuid="JKLM" project_uuid="BCDE" module_uuid="DEFG" module_uuid_path="BCDE.DEFG"
-            name="RootBar" long_name="RootBar" description="[null]"
-            enabled="true" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" deprecated_kee="[null]" />
-
-  <!-- Disabled Java resources -->
-  <projects id="1009" scope="DIR" qualifier="DIR" kee="b:src/main/java/org/foo" root_id="1003" uuid="KLMN" project_uuid="BCDE" module_uuid="DEFG" module_uuid_path="BCDE.DEFG"
-            name="src/main/java/org/foo" long_name="src/main/java/org/foo" description="[null]"
-            enabled="false" language="[null]" copy_resource_id="[null]" person_id="[null]" path="[null]" deprecated_kee="[null]" />
-
-  <projects id="1010" scope="FIL" qualifier="CLA" kee="b:src.main.java.org.foo.Bar" root_id="1003" uuid="LMNO" project_uuid="BCDE" module_uuid="DEFG" module_uuid_path="BCDE.DEFG"
-            name="Bar" long_name="src.main.java.org.foo.Bar" description="[null]"
-            enabled="false" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" deprecated_kee="[null]" />
-            
-  <!-- PHP resources -->
-  <projects id="1020" scope="DIR" qualifier="DIR" kee="a:org/foo" root_id="1002" uuid="MNOP" project_uuid="BCDE" module_uuid="CDEF" module_uuid_path="BCDE.CDEF"
-            name="org/foo" long_name="org/foo" description="[null]"
-            enabled="true" language="[null]" copy_resource_id="[null]" person_id="[null]" path="[null]" deprecated_kee="[null]" />
-
-  <projects id="1021" scope="FIL" qualifier="FIL" kee="a:org/foo/Bar.php" root_id="1002" uuid="NOPQ" project_uuid="BCDE" module_uuid="CDEF" module_uuid_path="BCDE.CDEF"
-            name="Bar.php" long_name="Bar.php" description="[null]"
-            enabled="true" language="php" copy_resource_id="[null]" person_id="[null]" path="[null]" deprecated_kee="[null]" />
-
-  <projects id="1022" scope="FIL" qualifier="UTS" kee="a:org/foo/BarTest.php" root_id="1002" uuid="OPQR" project_uuid="BCDE" module_uuid="CDEF" module_uuid_path="BCDE.CDEF"
-            name="BarTest.php" long_name="BarTest.php" description="[null]"
-            enabled="true" language="php" copy_resource_id="[null]" person_id="[null]" path="[null]" deprecated_kee="[null]" />
-            
-  <projects id="1023" scope="DIR" qualifier="DIR" kee="a:[root]" root_id="1002" uuid="PQRS" project_uuid="BCDE" module_uuid="CDEF" module_uuid_path="BCDE.CDEF"
-          name="[root]" long_name="[root]" description="[null]"
-          enabled="true" language="[null]" copy_resource_id="[null]" person_id="[null]" path="[null]" deprecated_kee="[null]" />
-
-  <projects id="1024" scope="FIL" qualifier="FIL" kee="a:RootBar.php" root_id="1002" uuid="QRST" project_uuid="BCDE" module_uuid="CDEF" module_uuid_path="BCDE.CDEF"
-            name="RootBar.php" long_name="RootBar.php" description="[null]"
-            enabled="true" language="php" copy_resource_id="[null]" person_id="[null]" path="[null]" deprecated_kee="[null]" />
-
-  <!-- Disabled PHP resources -->
-  <projects id="1025" scope="DIR" qualifier="DIR" kee="a:test/org/foo" root_id="1002" uuid="RSTU" project_uuid="BCDE" module_uuid="CDEF" module_uuid_path="BCDE.CDEF"
-            name="test/org/foo" long_name="test/org/foo" description="[null]"
-            enabled="false" language="[null]" copy_resource_id="[null]" person_id="[null]" path="[null]" deprecated_kee="[null]" />
-            
-  <projects id="1026" scope="FIL" qualifier="UTS" kee="a:test/org/foo/BarTest.php" root_id="1002" uuid="STUV" project_uuid="BCDE" module_uuid="CDEF" module_uuid_path="BCDE.CDEF"
-            name="BarTest.php" long_name="BarTest.php" description="[null]"
-            enabled="false" language="php" copy_resource_id="[null]" person_id="[null]" path="[null]" deprecated_kee="[null]" />
-</dataset>
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/index/ResourcePersisterTest/shared.xml b/sonar-batch/src/test/resources/org/sonar/batch/index/ResourcePersisterTest/shared.xml
deleted file mode 100644
index e79ffc1178e..00000000000
--- a/sonar-batch/src/test/resources/org/sonar/batch/index/ResourcePersisterTest/shared.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<dataset>
-
-  <!-- other project -->
-  <projects id="1000" scope="PRJ" qualifier="TRK" kee="my:key" root_id="[null]" uuid="ABCD" project_uuid="ABCD" module_uuid="[null]" module_uuid_path="[null]"
-            name="Other project" long_name="Other" description="[null]"
-            enabled="true" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" path="[null]" deprecated_kee="my:key"/>
-
-  <snapshots purge_status="[null]" period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" id="3000" project_id="1000" parent_snapshot_id="[null]" root_project_id="1000" root_snapshot_id="[null]"
-             scope="PRJ" qualifier="TRK" created_at="1225544280000" build_date="1225544280000" version="[null]" path=""
-             status="P" islast="false" depth="0" />
-
-</dataset>
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/index/ResourcePersisterTest/shouldRemoveRootIndexIfResourceIsProject-result.xml b/sonar-batch/src/test/resources/org/sonar/batch/index/ResourcePersisterTest/shouldRemoveRootIndexIfResourceIsProject-result.xml
deleted file mode 100644
index 65b53bf24b0..00000000000
--- a/sonar-batch/src/test/resources/org/sonar/batch/index/ResourcePersisterTest/shouldRemoveRootIndexIfResourceIsProject-result.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<dataset>
-
-  <projects id="1001" scope="PRJ" qualifier="TRK" kee="foo" root_id="[null]" uuid="BCDE" project_uuid="BCDE" module_uuid="[null]" module_uuid_path=".BCDE."
-            name="Foo" long_name="Foo" description="some description"
-            enabled="true" language="[null]" copy_resource_id="[null]" person_id="[null]" created_at="[null]" path="[null]" deprecated_kee="foo"/>
-
-  <!-- old snapshot -->
-  <snapshots purge_status="[null]" period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" id="3001" project_id="1001" parent_snapshot_id="[null]" root_project_id="1001" root_snapshot_id="[null]"
-             scope="PRJ" qualifier="TRK" created_at="1293058800000" build_date="1293058800000" version="[null]" path=""
-             status="U" islast="false" depth="0" />
-
-  <!-- new snapshot -->
-  <snapshots purge_status="[null]" period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" id="3002" project_id="1001" parent_snapshot_id="[null]" root_project_id="1001" root_snapshot_id="[null]"
-             scope="PRJ" qualifier="TRK" created_at="1293231600000" build_date="1293231600000" version="[null]" path=""
-             status="U" islast="false" depth="0" />
-
-</dataset>
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/index/ResourcePersisterTest/shouldRemoveRootIndexIfResourceIsProject.xml b/sonar-batch/src/test/resources/org/sonar/batch/index/ResourcePersisterTest/shouldRemoveRootIndexIfResourceIsProject.xml
deleted file mode 100644
index a7daee3a2ea..00000000000
--- a/sonar-batch/src/test/resources/org/sonar/batch/index/ResourcePersisterTest/shouldRemoveRootIndexIfResourceIsProject.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<dataset>
-
-  <!-- This project has a root_id which should be set to NULL (SONAR-1700) -->
-  <projects id="1001" scope="PRJ" qualifier="TRK" kee="foo" root_id="12345" uuid="BCDE" project_uuid="BCDE" module_uuid="[null]" module_uuid_path=".BCDE."
-            name="name" long_name="long name" description="description"
-            enabled="true" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" path="[null]" deprecated_kee="foo"/>
-
-  <snapshots purge_status="[null]" period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" id="3001" project_id="1001" parent_snapshot_id="[null]" root_project_id="1001" root_snapshot_id="[null]"
-             scope="PRJ" qualifier="TRK" created_at="1293058800000" build_date="1293058800000" version="[null]" path=""
-             status="U" islast="false" depth="0" />
-
-</dataset>
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/index/ResourcePersisterTest/shouldSaveCopyProject-result.xml b/sonar-batch/src/test/resources/org/sonar/batch/index/ResourcePersisterTest/shouldSaveCopyProject-result.xml
deleted file mode 100644
index 3142a88d3f3..00000000000
--- a/sonar-batch/src/test/resources/org/sonar/batch/index/ResourcePersisterTest/shouldSaveCopyProject-result.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<dataset>
-
-  <!-- other project -->
-  <projects id="1000" scope="PRJ" qualifier="TRK" kee="my:key" root_id="[null]" uuid="ABCD" project_uuid="ABCD" module_uuid="[null]" module_uuid_path="[null]"
-            name="Other project" long_name="Other" description="[null]"
-            enabled="true" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" deprecated_kee="my:key" />
-
-  <snapshots purge_status="[null]" period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" id="3000" project_id="1000" parent_snapshot_id="[null]" root_project_id="1000" root_snapshot_id="[null]"
-             scope="PRJ" qualifier="TRK" created_at="1225544280000" build_date="1225544280000" version="[null]" path=""
-             status="P" islast="false" depth="0" />
-
-
-  <!-- new project -->
-  <projects id="1001" scope="PRJ" qualifier="TRK" kee="foo" root_id="[null]" uuid="[null]" project_uuid="[null]" module_uuid="[null]" module_uuid_path="[null]"
-            name="Foo" long_name="Foo" description="some description"
-            enabled="true" language="[null]" copy_resource_id="10" person_id="[null]" path="[null]" deprecated_kee="foo" />
-
-  <snapshots purge_status="[null]" period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" id="3001" project_id="1001" parent_snapshot_id="[null]" root_project_id="1001" root_snapshot_id="[null]"
-             scope="PRJ" qualifier="TRK" created_at="1293231600000" build_date="1293231600000" version="[null]" path=""
-             status="U" islast="false" depth="0" />
-
-</dataset>
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/index/ResourcePersisterTest/shouldSaveNewDirectory-result.xml b/sonar-batch/src/test/resources/org/sonar/batch/index/ResourcePersisterTest/shouldSaveNewDirectory-result.xml
deleted file mode 100644
index 509c84c797e..00000000000
--- a/sonar-batch/src/test/resources/org/sonar/batch/index/ResourcePersisterTest/shouldSaveNewDirectory-result.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<dataset>
-
-  <!-- other project -->
-  <projects id="1000" scope="PRJ" qualifier="TRK" kee="my:key" root_id="[null]" uuid="ABCD" project_uuid="ABCD" module_uuid="[null]" module_uuid_path="[null]"
-            name="Other project" long_name="Other" description="[null]"
-            enabled="true" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" deprecated_kee="my:key" />
-
-  <snapshots purge_status="[null]" period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" id="3000" project_id="1000" parent_snapshot_id="[null]" root_project_id="1000" root_snapshot_id="[null]"
-             scope="PRJ" qualifier="TRK" created_at="1225544280000" build_date="1225544280000" version="[null]" path=""
-             status="P" islast="false" depth="0"/>
-
-
-  <projects id="1001" scope="PRJ" qualifier="TRK" kee="foo" root_id="[null]" uuid="[null]" project_uuid="[null]" module_uuid="[null]" module_uuid_path="[null]"
-            name="Foo" long_name="Foo" description="some description"
-            enabled="true" language="[null]" copy_resource_id="[null]" person_id="[null]" path="[null]" deprecated_kee="foo" />
-
-  <!-- new dir -->
-  <projects id="1002" scope="DIR" qualifier="DIR" kee="foo:src/main/java/org/foo" root_id="1001" uuid="[null]" project_uuid="[null]" module_uuid="[null]" module_uuid_path="[null]"
-            name="src/main/java/org/foo" long_name="src/main/java/org/foo" description="[null]"
-            enabled="true" language="[null]" copy_resource_id="[null]" person_id="[null]" path="src/main/java/org/foo" deprecated_kee="[null]" />
-
-  <snapshots purge_status="[null]" period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" id="3001" project_id="1001" parent_snapshot_id="[null]" root_project_id="1001" root_snapshot_id="[null]"
-             scope="PRJ" qualifier="TRK" created_at="1293231600000" build_date="1293231600000" version="[null]" path=""
-             status="U" islast="false" depth="0"/>
-
-  <snapshots purge_status="[null]" period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" id="3002" project_id="1002" parent_snapshot_id="3001" root_project_id="1001" root_snapshot_id="3001"
-             scope="DIR" qualifier="DIR" created_at="1293231600000" build_date="1293231600000" version="[null]" path="3001."
-             status="U" islast="false" depth="1"/>
-
-</dataset>
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/index/ResourcePersisterTest/shouldSaveNewMultiModulesProject-result.xml b/sonar-batch/src/test/resources/org/sonar/batch/index/ResourcePersisterTest/shouldSaveNewMultiModulesProject-result.xml
deleted file mode 100644
index e168b6bc85d..00000000000
--- a/sonar-batch/src/test/resources/org/sonar/batch/index/ResourcePersisterTest/shouldSaveNewMultiModulesProject-result.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<dataset>
-
-  <!-- other project -->
-  <projects id="1000" scope="PRJ" qualifier="TRK" kee="my:key" root_id="[null]" uuid="ABCD" project_uuid="ABCD" module_uuid="[null]" module_uuid_path="[null]"
-            name="Other project" long_name="Other" description="[null]"
-            enabled="true" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" deprecated_kee="my:key" />
-
-  <snapshots purge_status="[null]" period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" id="3000" project_id="1000" parent_snapshot_id="[null]" root_project_id="1000" root_snapshot_id="[null]"
-             scope="PRJ" qualifier="TRK" created_at="1225544280000" build_date="1225544280000" version="[null]" path=""
-             status="P" islast="false" depth="0" />
-
-  <!-- new project -->
-  <projects id="1001" scope="PRJ" qualifier="TRK" kee="root" root_id="[null]" uuid="[null]" project_uuid="[null]" module_uuid="[null]" module_uuid_path="[null]"
-            name="Root" long_name="Root" description="[null]"
-            enabled="true" language="[null]" copy_resource_id="[null]" person_id="[null]" path="[null]" deprecated_kee="root" />
-
-  <projects id="1002" scope="PRJ" qualifier="BRC" kee="a" root_id="1001" uuid="[null]" project_uuid="[null]" module_uuid="[null]" module_uuid_path="[null]"
-            name="A" long_name="A" description="[null]"
-            enabled="true" language="[null]" copy_resource_id="[null]" person_id="[null]" path="moduleA" deprecated_kee="a" />
-
-  <projects id="1003" scope="PRJ" qualifier="BRC" kee="b" root_id="1001" uuid="[null]" project_uuid="[null]" module_uuid="[null]" module_uuid_path="[null]"
-            name="B" long_name="B" description="[null]"
-            enabled="true" language="[null]" copy_resource_id="[null]" person_id="[null]" path="moduleB" deprecated_kee="b" />
-
-  <projects id="1004" scope="PRJ" qualifier="BRC" kee="b1" root_id="1001" uuid="[null]" project_uuid="[null]" module_uuid="[null]" module_uuid_path="[null]"
-            name="B1" long_name="B1" description="[null]"
-            enabled="true" language="[null]" copy_resource_id="[null]" person_id="[null]" path="moduleB1" deprecated_kee="b1" />
-
-  <projects id="1005" scope="DIR" qualifier="DIR" kee="b1:src/main/java/org" root_id="1004"
-            name="src/main/java/org" long_name="src/main/java/org" description="[null]"
-            enabled="true" language="[null]" copy_resource_id="[null]" person_id="[null]" path="src/main/java/org" deprecated_kee="[null]" />
-
-  <projects id="1006" scope="FIL" qualifier="FIL" kee="b1:src/main/java/org/Foo.java" root_id="1004"
-            name="Foo.java" long_name="src/main/java/org/Foo.java" description="[null]"
-            enabled="true" language="[null]" copy_resource_id="[null]" person_id="[null]" path="src/main/java/org/Foo.java" deprecated_kee="[null]" />
-
-  <snapshots purge_status="[null]" period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" id="3001" project_id="1001" root_project_id="1001" parent_snapshot_id="[null]"  root_snapshot_id="[null]"
-             scope="PRJ" qualifier="TRK" created_at="1293231600000" build_date="1293231600000" version="[null]" path=""
-             status="U" islast="false" depth="0" />
-
-  <snapshots purge_status="[null]" period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" id="3002" project_id="1002" root_project_id="1001" parent_snapshot_id="3001" root_snapshot_id="3001"
-             scope="PRJ" qualifier="BRC" created_at="1293231600000" build_date="1293231600000" version="[null]" path="3001."
-             status="U" islast="false" depth="1" />
-
-  <snapshots purge_status="[null]" period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" id="3003" project_id="1003" root_project_id="1001" parent_snapshot_id="3001" root_snapshot_id="3001"
-             scope="PRJ" qualifier="BRC" created_at="1293231600000" build_date="1293231600000" version="[null]" path="3001."
-             status="U" islast="false" depth="1" />
-
-  <snapshots purge_status="[null]" period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" id="3004" project_id="1004" root_project_id="1001" parent_snapshot_id="3003" root_snapshot_id="3001"
-             scope="PRJ" qualifier="BRC" created_at="1293231600000" build_date="1293231600000" version="[null]" path="3001.3003."
-             status="U" islast="false" depth="2" />
-
-  <snapshots purge_status="[null]" period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" id="3005" project_id="1005" root_project_id="1001" parent_snapshot_id="3004" root_snapshot_id="3001"
-             scope="DIR" qualifier="DIR" created_at="1293231600000" build_date="1293231600000" version="[null]" path="3001.3003.3004."
-             status="U" islast="false" depth="3" />
-             
-  <snapshots purge_status="[null]" period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" id="3006" project_id="1006" root_project_id="1001" parent_snapshot_id="3005" root_snapshot_id="3001"
-             scope="FIL" qualifier="FIL" created_at="1293231600000" build_date="1293231600000" version="[null]" path="3001.3003.3004.3005."
-             status="U" islast="false" depth="4" />
-
-</dataset>
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/index/ResourcePersisterTest/shouldSaveNewMultiModulesProjectUsingIndex-result.xml b/sonar-batch/src/test/resources/org/sonar/batch/index/ResourcePersisterTest/shouldSaveNewMultiModulesProjectUsingIndex-result.xml
deleted file mode 100644
index 9fa0dd09762..00000000000
--- a/sonar-batch/src/test/resources/org/sonar/batch/index/ResourcePersisterTest/shouldSaveNewMultiModulesProjectUsingIndex-result.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<dataset>
-
-  <!-- other project -->
-  <projects id="1000" scope="PRJ" qualifier="TRK" kee="my:key" root_id="[null]" uuid="ABCD" project_uuid="ABCD" module_uuid="[null]" module_uuid_path="[null]"
-            name="Other project" long_name="Other" description="[null]"
-            enabled="true" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" deprecated_kee="my:key" />
-
-  <snapshots purge_status="[null]" period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" id="3000" project_id="1000" parent_snapshot_id="[null]" root_project_id="1000" root_snapshot_id="[null]"
-             scope="PRJ" qualifier="TRK" created_at="1225544280000" build_date="1225544280000" version="[null]" path=""
-             status="P" islast="false" depth="0" />
-
-  <!-- new project -->
-  <projects id="1001" scope="PRJ" qualifier="TRK" kee="root" root_id="[null]" uuid="[null]" project_uuid="[null]" module_uuid="[null]" module_uuid_path="[null]"
-            name="Root" long_name="Root" description="[null]"
-            enabled="true" language="[null]" copy_resource_id="[null]" person_id="[null]" path="[null]" deprecated_kee="root" />
-
-  <projects id="1002" scope="PRJ" qualifier="BRC" kee="a" root_id="1001" uuid="[null]" project_uuid="[null]" module_uuid="[null]" module_uuid_path="[null]"
-            name="A" long_name="A" description="[null]"
-            enabled="true" language="[null]" copy_resource_id="[null]" person_id="[null]" path="moduleA" deprecated_kee="a" />
-
-  <projects id="1003" scope="PRJ" qualifier="BRC" kee="b" root_id="1001" uuid="[null]" project_uuid="[null]" module_uuid="[null]" module_uuid_path="[null]"
-            name="B" long_name="B" description="[null]"
-            enabled="true" language="[null]" copy_resource_id="[null]" person_id="[null]" path="moduleB" deprecated_kee="b" />
-
-  <projects id="1004" scope="PRJ" qualifier="BRC" kee="b1" root_id="1001" uuid="[null]" project_uuid="[null]" module_uuid="[null]" module_uuid_path="[null]"
-            name="B1" long_name="B1" description="[null]"
-            enabled="true" language="[null]" copy_resource_id="[null]" person_id="[null]" path="moduleB1" deprecated_kee="b1" />
-
-  <projects id="1005" scope="DIR" qualifier="DIR" kee="b1:src/main/java/org" root_id="1004"
-            name="src/main/java/org" long_name="src/main/java/org" description="[null]"
-            enabled="true" language="[null]" copy_resource_id="[null]" person_id="[null]" path="src/main/java/org" deprecated_kee="[null]" />
-
-  <projects id="1006" scope="FIL" qualifier="FIL" kee="b1:src/main/java/org/Foo.java" root_id="1004"
-            name="Foo.java" long_name="src/main/java/org/Foo.java" description="[null]"
-            enabled="true" language="[null]" copy_resource_id="[null]" person_id="[null]" path="src/main/java/org/Foo.java" deprecated_kee="[null]" />
-
-  <snapshots purge_status="[null]" period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" id="3001" project_id="1001" root_project_id="1001" parent_snapshot_id="[null]"  root_snapshot_id="[null]"
-             scope="PRJ" qualifier="TRK" created_at="1293231600000" build_date="1293231600000" version="[null]" path=""
-             status="U" islast="false" depth="0" />
-
-  <snapshots purge_status="[null]" period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" id="3002" project_id="1002" root_project_id="1001" parent_snapshot_id="3001" root_snapshot_id="3001"
-             scope="PRJ" qualifier="BRC" created_at="1293231600000" build_date="1293231600000" version="[null]" path="3001."
-             status="U" islast="false" depth="1" />
-
-  <snapshots purge_status="[null]" period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" id="3003" project_id="1003" root_project_id="1001" parent_snapshot_id="3001" root_snapshot_id="3001"
-             scope="PRJ" qualifier="BRC" created_at="1293231600000" build_date="1293231600000" version="[null]" path="3001."
-             status="U" islast="false" depth="1" />
-
-  <snapshots purge_status="[null]" period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" id="3004" project_id="1004" root_project_id="1001" parent_snapshot_id="3003" root_snapshot_id="3001"
-             scope="PRJ" qualifier="BRC" created_at="1293231600000" build_date="1293231600000" version="[null]" path="3001.3003."
-             status="U" islast="false" depth="2" />
-
-  <snapshots purge_status="[null]" period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" id="3005" project_id="1005" root_project_id="1001" parent_snapshot_id="3004" root_snapshot_id="3001"
-             scope="DIR" qualifier="DIR" created_at="1293231600000" build_date="1293231600000" version="[null]" path="3001.3003.3004."
-             status="U" islast="false" depth="3" />
-             
-  <snapshots purge_status="[null]" period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" id="3006" project_id="1006" root_project_id="1001" parent_snapshot_id="3005" root_snapshot_id="3001"
-             scope="FIL" qualifier="FIL" created_at="1293231600000" build_date="1293231600000" version="[null]" path="3001.3003.3004.3005."
-             status="U" islast="false" depth="4" />
-             
-</dataset>
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/index/ResourcePersisterTest/shouldSaveNewProject-result.xml b/sonar-batch/src/test/resources/org/sonar/batch/index/ResourcePersisterTest/shouldSaveNewProject-result.xml
deleted file mode 100644
index 2f047d09640..00000000000
--- a/sonar-batch/src/test/resources/org/sonar/batch/index/ResourcePersisterTest/shouldSaveNewProject-result.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<dataset>
-
-  <!-- other project -->
-  <projects id="1000" scope="PRJ" qualifier="TRK" kee="my:key" root_id="[null]" uuid="ABCD" project_uuid="ABCD" module_uuid="[null]" module_uuid_path="[null]"
-            name="Other project" long_name="Other" description="[null]"
-            enabled="true" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" deprecated_kee="my:key"/>
-
-  <snapshots purge_status="[null]" period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" id="3000" project_id="1000" parent_snapshot_id="[null]" root_project_id="1000" root_snapshot_id="[null]"
-             scope="PRJ" qualifier="TRK" created_at="1225544280000" build_date="1225544280000" version="[null]" path=""
-             status="P" islast="false" depth="0" />
-
-
-  <!-- new project -->
-  <projects id="1001" scope="PRJ" qualifier="TRK" kee="foo" root_id="[null]" uuid="[null]" project_uuid="[null]" module_uuid="[null]" module_uuid_path="[null]"
-            name="Foo" long_name="Foo" description="some description"
-            enabled="true" language="[null]" copy_resource_id="[null]" person_id="[null]" path="[null]" deprecated_kee="foo" />
-
-  <snapshots purge_status="[null]" period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" id="3001" project_id="1001" parent_snapshot_id="[null]" root_project_id="1001" root_snapshot_id="[null]"
-             scope="PRJ" qualifier="TRK" created_at="1293231600000" build_date="1293231600000" version="[null]" path=""
-             status="U" islast="false" depth="0" />
-
-</dataset>
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/index/ResourcePersisterTest/shouldUpdateExistingResource-result.xml b/sonar-batch/src/test/resources/org/sonar/batch/index/ResourcePersisterTest/shouldUpdateExistingResource-result.xml
deleted file mode 100644
index c3d031d246e..00000000000
--- a/sonar-batch/src/test/resources/org/sonar/batch/index/ResourcePersisterTest/shouldUpdateExistingResource-result.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<dataset>
-
-  <projects id="1001" scope="PRJ" qualifier="TRK" kee="foo" root_id="[null]" uuid="BCDE" project_uuid="BCDE" module_uuid="[null]" module_uuid_path=".BCDE."
-            name="new name" long_name="new name" description="new description"
-            enabled="true" language="[null]" copy_resource_id="[null]" person_id="[null]" path="[null]" deprecated_kee="foo" />
-
-  <!-- old snapshot -->
-  <snapshots purge_status="[null]" period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" id="3001" project_id="1001" parent_snapshot_id="[null]" root_project_id="1001" root_snapshot_id="[null]"
-             scope="PRJ" qualifier="TRK" created_at="1293058800000" build_date="1293058800000" version="[null]" path=""
-             status="U" islast="false" depth="0" />
-
-  <!-- new snapshot -->
-  <snapshots purge_status="[null]" period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" id="3002" project_id="1001" parent_snapshot_id="[null]" root_project_id="1001" root_snapshot_id="[null]"
-             scope="PRJ" qualifier="TRK" created_at="1293231600000" build_date="1293231600000" version="[null]" path=""
-             status="U" islast="false" depth="0" />
-
-</dataset>
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/index/ResourcePersisterTest/shouldUpdateExistingResource.xml b/sonar-batch/src/test/resources/org/sonar/batch/index/ResourcePersisterTest/shouldUpdateExistingResource.xml
deleted file mode 100644
index 859be16f7fd..00000000000
--- a/sonar-batch/src/test/resources/org/sonar/batch/index/ResourcePersisterTest/shouldUpdateExistingResource.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<dataset>
-
-  <projects id="1001" scope="PRJ" qualifier="TRK" kee="foo" root_id="[null]" uuid="BCDE" project_uuid="BCDE" module_uuid="[null]" module_uuid_path="[null]"
-            name="old name" long_name="old name" description="old description"
-            enabled="true" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" />
-
-  <snapshots purge_status="[null]" period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" id="3001" project_id="1001" parent_snapshot_id="[null]" root_project_id="1001" root_snapshot_id="[null]"
-             scope="PRJ" qualifier="TRK" created_at="1293058800000" build_date="1293058800000" version="[null]" path=""
-             status="U" islast="false" depth="0" />
-
-</dataset>
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/index/SourcePersisterTest/file_sources_missing_src_hash.xml b/sonar-batch/src/test/resources/org/sonar/batch/index/SourcePersisterTest/file_sources_missing_src_hash.xml
deleted file mode 100644
index 9fac445981b..00000000000
--- a/sonar-batch/src/test/resources/org/sonar/batch/index/SourcePersisterTest/file_sources_missing_src_hash.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<dataset>
-  <file_sources id="101" project_uuid="projectUuid" file_uuid="uuidsame"
-                binary_data="[null]"
-                line_hashes="8d7b3d6b83c0a517eac07e1aac94b773&#10;9a0364b9e99bb480dd25e1f0284c8555"
-                data_hash="0263047cd758c68c27683625f072f010"
-                src_hash="[null]"
-                created_at="1412952242000" updated_at="1412952242000" data_type="SOURCE" />
-
-</dataset>
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/index/SourcePersisterTest/shared.xml b/sonar-batch/src/test/resources/org/sonar/batch/index/SourcePersisterTest/shared.xml
deleted file mode 100644
index dd27702d8b1..00000000000
--- a/sonar-batch/src/test/resources/org/sonar/batch/index/SourcePersisterTest/shared.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<dataset>
-  <file_sources id="1" project_uuid="PROJECT_UUID" file_uuid="FILE_UUID"
-                binary_data="[null]"
-                line_hashes="8d7b3d6b83c0a517eac07e1aac94b773&#10;9a0364b9e99bb480dd25e1f0284c8555"
-                data_hash="0263047cd758c68c27683625f072f010"
-                src_hash="123456"
-                created_at="1412952242000" updated_at="1412952242000" data_type="SOURCE" />
-
-</dataset>
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/index/SourcePersisterTest/testPersistDontTouchUnchanged-result.xml b/sonar-batch/src/test/resources/org/sonar/batch/index/SourcePersisterTest/testPersistDontTouchUnchanged-result.xml
deleted file mode 100644
index b5e2373c682..00000000000
--- a/sonar-batch/src/test/resources/org/sonar/batch/index/SourcePersisterTest/testPersistDontTouchUnchanged-result.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<dataset>
-
-  <file_sources id="101" project_uuid="projectUuid" file_uuid="uuidsame"
-                binary_data="[null]"
-                line_hashes="8d7b3d6b83c0a517eac07e1aac94b773&#10;9a0364b9e99bb480dd25e1f0284c8555"
-                data_hash="0263047cd758c68c27683625f072f010"
-                src_hash="123456"
-                created_at="1412952242000" updated_at="1412952242000" data_type="SOURCE" />
-
-</dataset>
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/index/SourcePersisterTest/testPersistEmptyFile-result.xml b/sonar-batch/src/test/resources/org/sonar/batch/index/SourcePersisterTest/testPersistEmptyFile-result.xml
deleted file mode 100644
index 6516bd139ca..00000000000
--- a/sonar-batch/src/test/resources/org/sonar/batch/index/SourcePersisterTest/testPersistEmptyFile-result.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<dataset>
-  <file_sources id="101" project_uuid="projectUuid" file_uuid="uuidsame"
-                binary_data="[null]"
-                line_hashes="8d7b3d6b83c0a517eac07e1aac94b773&#10;9a0364b9e99bb480dd25e1f0284c8555"
-                data_hash="0263047cd758c68c27683625f072f010"
-                src_hash="123456"
-                created_at="1412952242000" updated_at="1412952242000" data_type="SOURCE" />
-
-  <file_sources id="102" project_uuid="projectUuid" file_uuid="uuidempty" binary_data="[null]"
-                line_hashes="[null]"
-                src_hash="abcd"
-                data_hash="0" created_at="1414597442000" updated_at="1414597442000" data_type="SOURCE" />
-</dataset>
-
-
-
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/issue/ScanIssueStorageTest/should_fail_to_load_component_id_if_unknown_component.xml b/sonar-batch/src/test/resources/org/sonar/batch/issue/ScanIssueStorageTest/should_fail_to_load_component_id_if_unknown_component.xml
deleted file mode 100644
index 5ed00ba028b..00000000000
--- a/sonar-batch/src/test/resources/org/sonar/batch/issue/ScanIssueStorageTest/should_fail_to_load_component_id_if_unknown_component.xml
+++ /dev/null
@@ -1 +0,0 @@
-<dataset></dataset>
\ No newline at end of file
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/issue/ScanIssueStorageTest/should_insert_new_issues-result.xml b/sonar-batch/src/test/resources/org/sonar/batch/issue/ScanIssueStorageTest/should_insert_new_issues-result.xml
deleted file mode 100644
index badb286c2e1..00000000000
--- a/sonar-batch/src/test/resources/org/sonar/batch/issue/ScanIssueStorageTest/should_insert_new_issues-result.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<dataset>
-  <issues id="1" kee="ABCDE" resolution="OPEN" status="OPEN" severity="BLOCKER" manual_severity="[false]"
-      assignee="[null]"
-      author_login="[null]"
-      checksum="[null]"
-      effort_to_fix="[null]"
-      technical_debt="10"
-      message="[null]"
-      line="5000"
-      component_id="100"
-      root_component_id="10"
-      rule_id="200"
-      created_at="[null]"
-      updated_at="[null]"
-      reporter="emmerik"
-      issue_attributes="foo=bar"
-      tags="[null]"
-      action_plan_key="[null]"
-      issue_creation_date="1368828000000"
-      issue_update_date="1368828000000"
-      issue_close_date="1368828000000"
-      />
-
-  <issue_changes id="1" kee="FGHIJ" issue_key="ABCDE" change_type="comment" user_login="emmerik" change_data="the comment"
-                 created_at="[null]" updated_at="[null]" issue_change_creation_date="[null]" />
-
-</dataset>
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/issue/ScanIssueStorageTest/should_insert_new_issues.xml b/sonar-batch/src/test/resources/org/sonar/batch/issue/ScanIssueStorageTest/should_insert_new_issues.xml
deleted file mode 100644
index 02899f1459d..00000000000
--- a/sonar-batch/src/test/resources/org/sonar/batch/issue/ScanIssueStorageTest/should_insert_new_issues.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<dataset>
-  <projects id="10" scope="PRJ" qualifier="TRK" kee="struts" name="Struts" uuid="ABCD"/>
-  <projects id="100" scope="FIL" qualifier="CLA" kee="struts:Action" name="Action" uuid="BCDE"/>
-</dataset>
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/issue/ScanIssueStorageTest/should_load_component_id_from_db.xml b/sonar-batch/src/test/resources/org/sonar/batch/issue/ScanIssueStorageTest/should_load_component_id_from_db.xml
deleted file mode 100644
index 99098d271cc..00000000000
--- a/sonar-batch/src/test/resources/org/sonar/batch/issue/ScanIssueStorageTest/should_load_component_id_from_db.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<dataset>
-  <projects id="123" kee="struts:Action.java" uuid="ABCD"/>
-</dataset>
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/issue/ScanIssueStorageTest/should_resolve_conflicts_on_updates-result.xml b/sonar-batch/src/test/resources/org/sonar/batch/issue/ScanIssueStorageTest/should_resolve_conflicts_on_updates-result.xml
deleted file mode 100644
index ef1122b47c6..00000000000
--- a/sonar-batch/src/test/resources/org/sonar/batch/issue/ScanIssueStorageTest/should_resolve_conflicts_on_updates-result.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<dataset>
-  <rules tags="[null]" system_tags="[null]" id="200" name="Avoid Cycles" plugin_rule_key="AvoidCycles"
-         plugin_config_key="[null]" plugin_name="squid"/>
-
-  <projects id="10" scope="PRJ" qualifier="TRK" kee="struts" name="Struts" uuid="ABCD"/>
-  <projects id="100" scope="FIL" qualifier="CLA" kee="struts:Action" name="Action" uuid="BCDE"/>
-
-  <issues id="1"
-          kee="ABCDE"
-          resolution="FIXED"
-          status="RESOLVED"
-          severity="BLOCKER"
-          manual_severity="[false]"
-          assignee="winner"
-          author_login="[null]"
-          checksum="FFFFF"
-          effort_to_fix="[null]"
-          technical_debt="[null]"
-          message="[null]"
-          line="444"
-          component_id="100"
-          root_component_id="10"
-          rule_id="200"
-          reporter="[null]"
-          issue_attributes="JIRA=http://jira.com"
-          tags="[null]"
-          action_plan_key="[null]"
-          created_at="1400000000000"
-          updated_at="1400000000000"
-          issue_creation_date="1115848800000"
-          issue_update_date="1368828000000"
-          issue_close_date="[null]"
-    />
-</dataset>
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/issue/ScanIssueStorageTest/should_resolve_conflicts_on_updates.xml b/sonar-batch/src/test/resources/org/sonar/batch/issue/ScanIssueStorageTest/should_resolve_conflicts_on_updates.xml
deleted file mode 100644
index 773cc50e1ae..00000000000
--- a/sonar-batch/src/test/resources/org/sonar/batch/issue/ScanIssueStorageTest/should_resolve_conflicts_on_updates.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<dataset>
-
-  <rules tags="[null]" system_tags="[null]" id="200" name="Avoid Cycles" plugin_rule_key="AvoidCycles"
-         plugin_config_key="[null]" plugin_name="squid" />
-
-  <projects id="10" scope="PRJ" qualifier="TRK" kee="struts" name="Struts" uuid="ABCD"/>
-  <projects id="100" scope="FIL" qualifier="CLA" kee="struts:Action" name="Action" uuid="BCDE"/>
-
-  <issues id="1"
-          kee="ABCDE"
-          assignee="winner"
-          resolution="FIXED"
-          status="RESOLVED"
-          severity="MAJOR"
-          manual_severity="[false]"
-          author_login="[null]"
-          checksum="FFFFF"
-          effort_to_fix="[null]"
-          technical_debt="[null]"
-          message="[null]"
-          line="1"
-          component_id="100"
-          root_component_id="10"
-          rule_id="200"
-          reporter="[null]"
-          issue_attributes=""
-          action_plan_key="[null]"
-          created_at="1400000000000"
-          updated_at="1500000000000"
-          issue_creation_date="1115848800000"
-          issue_update_date="1368828000000"
-          issue_close_date="[null]"
-    />
-</dataset>
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/issue/ScanIssueStorageTest/should_update_issues-result.xml b/sonar-batch/src/test/resources/org/sonar/batch/issue/ScanIssueStorageTest/should_update_issues-result.xml
deleted file mode 100644
index 5e2490d198d..00000000000
--- a/sonar-batch/src/test/resources/org/sonar/batch/issue/ScanIssueStorageTest/should_update_issues-result.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<dataset>
-  <issues id="1"
-          kee="ABCDE"
-          resolution="FIXED"
-          status="RESOLVED"
-          severity="BLOCKER"
-          manual_severity="[false]"
-          assignee="loic"
-          author_login="simon"
-          checksum="FFFFF"
-          effort_to_fix="[null]"
-          technical_debt="10"
-          message="[null]"
-          line="5000"
-          component_id="100"
-          root_component_id="10"
-          rule_id="200"
-          created_at="1400000000000"
-          updated_at="1400000000000"
-          reporter="emmerik"
-          issue_attributes="foo=bar"
-          tags="[null]"
-          action_plan_key="[null]"
-          issue_creation_date="1368828000000"
-          issue_update_date="1368828000000"
-          issue_close_date="1368828000000"
-    />
-
-  <issue_changes id="1" kee="FGHIJ" issue_key="ABCDE" change_type="comment" user_login="emmerik"
-                 change_data="the comment" created_at="[null]" updated_at="[null]" issue_change_creation_date="[null]"/>
-  <issue_changes id="2" kee="[null]" issue_key="ABCDE" change_type="diff" user_login="emmerik"
-                 change_data="severity=INFO|BLOCKER" created_at="[null]" updated_at="[null]" issue_change_creation_date="[null]"/>
-</dataset>
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/issue/ScanIssueStorageTest/should_update_issues.xml b/sonar-batch/src/test/resources/org/sonar/batch/issue/ScanIssueStorageTest/should_update_issues.xml
deleted file mode 100644
index afa28e09811..00000000000
--- a/sonar-batch/src/test/resources/org/sonar/batch/issue/ScanIssueStorageTest/should_update_issues.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<dataset>
-
-  <projects id="10" scope="PRJ" qualifier="TRK" kee="struts" name="Struts" uuid="ABCD"/>
-  <projects id="100" scope="FIL" qualifier="CLA" kee="struts:Action" name="Action" uuid="BCDE"/>
-
-  <issues id="1"
-          kee="ABCDE"
-          resolution="OPEN"
-          status="OPEN"
-          severity="BLOCKER"
-          manual_severity="[false]"
-          assignee="loic"
-          author_login="simon"
-          checksum="FFFFF"
-          effort_to_fix="[null]"
-          technical_debt="[null]"
-          message="[null]"
-          line="3000"
-          component_id="100"
-          root_component_id="10"
-          rule_id="200"
-          created_at="1400000000000"
-          updated_at="1400000000000"
-          reporter="emmerik"
-          issue_attributes="foo=bar"
-          action_plan_key="[null]"
-          issue_creation_date="1262300400000"
-          issue_update_date="1265065200000"
-          issue_close_date="[null]"
-    />
-</dataset>
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/issue/tracking/IssueTrackingTest/example1-v1.txt b/sonar-batch/src/test/resources/org/sonar/batch/issue/tracking/IssueTrackingTest/example1-v1.txt
deleted file mode 100644
index 1920333ddb6..00000000000
--- a/sonar-batch/src/test/resources/org/sonar/batch/issue/tracking/IssueTrackingTest/example1-v1.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-package example1;
-
-public class Toto {
-
-    public void doSomething() {
-        // doSomething
-        }
-
-    public void doSomethingElse() {
-        // doSomethingElse
-        }
-}
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/issue/tracking/IssueTrackingTest/example1-v2.txt b/sonar-batch/src/test/resources/org/sonar/batch/issue/tracking/IssueTrackingTest/example1-v2.txt
deleted file mode 100644
index 231532452b2..00000000000
--- a/sonar-batch/src/test/resources/org/sonar/batch/issue/tracking/IssueTrackingTest/example1-v2.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-package example1;
-
-public class Toto {
-
-    public Toto(){}
-
-    public void doSomethingNew() {
-        // doSomethingNew
-        }
-
-    public void doSomethingElseNew() {
-        // doSomethingElseNew
-        }
-
-    public void doSomething() {
-        // doSomething
-        }
-
-    public void doSomethingElse() {
-        // doSomethingElse
-        }
-}
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/issue/tracking/IssueTrackingTest/example2-v1.txt b/sonar-batch/src/test/resources/org/sonar/batch/issue/tracking/IssueTrackingTest/example2-v1.txt
deleted file mode 100644
index a920afe459b..00000000000
--- a/sonar-batch/src/test/resources/org/sonar/batch/issue/tracking/IssueTrackingTest/example2-v1.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-package example2;
-
-public class Toto {
-  void method1() {
-    System.out.println("toto");
-  }
-}
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/issue/tracking/IssueTrackingTest/example2-v2.txt b/sonar-batch/src/test/resources/org/sonar/batch/issue/tracking/IssueTrackingTest/example2-v2.txt
deleted file mode 100644
index c5c8250cf65..00000000000
--- a/sonar-batch/src/test/resources/org/sonar/batch/issue/tracking/IssueTrackingTest/example2-v2.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-package example2;
-
-public class Toto {
-
-  void method2() {
-    System.out.println("toto");
-  }
-
-  void method1() {
-    System.out.println("toto");
-  }
-
-  void method3() {
-    System.out.println("toto");
-  }
-}
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/issue/tracking/IssueTrackingTest/example3-v1.txt b/sonar-batch/src/test/resources/org/sonar/batch/issue/tracking/IssueTrackingTest/example3-v1.txt
deleted file mode 100644
index facdcbc008c..00000000000
--- a/sonar-batch/src/test/resources/org/sonar/batch/issue/tracking/IssueTrackingTest/example3-v1.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-package sample;
-
-public class Sample {
-	
-	public Sample(int i) {
-		int j = i+1; // violation: unused local variable
-	}
-
-	public boolean avoidUtilityClass() {
-		return true;
-	}
-
-	private String myMethod() { // violation : unused private method
-		return "hello";
-	}
-}
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/issue/tracking/IssueTrackingTest/example3-v2.txt b/sonar-batch/src/test/resources/org/sonar/batch/issue/tracking/IssueTrackingTest/example3-v2.txt
deleted file mode 100644
index 91db843fc4d..00000000000
--- a/sonar-batch/src/test/resources/org/sonar/batch/issue/tracking/IssueTrackingTest/example3-v2.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-package sample;
-
-public class Sample {
-
-	public Sample(int i) {
-		int j = i+1; // still the same violation: unused local variable
-	}
-	
-	public boolean avoidUtilityClass() {
-		return true;
-	}
-	
-	private String myMethod() { // violation "unused private method" is fixed because it's called in newViolation
-		return "hello";
-	}
-
-  public void newViolation() {
-    String msg = myMethod(); // new violation : msg is an unused variable
-  }
-}
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/maven/MavenProjectConverterTest/mavenProjectFileNameNotEqualsToPomXml/module/pom.xml b/sonar-batch/src/test/resources/org/sonar/batch/maven/MavenProjectConverterTest/mavenProjectFileNameNotEqualsToPomXml/module/pom.xml
deleted file mode 100644
index 7b49562c2e0..00000000000
--- a/sonar-batch/src/test/resources/org/sonar/batch/maven/MavenProjectConverterTest/mavenProjectFileNameNotEqualsToPomXml/module/pom.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.test</groupId>
-    <artifactId>parent</artifactId>
-    <version>0.1-SNAPSHOT</version>
-  </parent>
-  <artifactId>module</artifactId>
-  <packaging>jar</packaging>
-</project>
\ No newline at end of file
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/maven/MavenProjectConverterTest/mavenProjectFileNameNotEqualsToPomXml/module/pom_having_different_name.xml b/sonar-batch/src/test/resources/org/sonar/batch/maven/MavenProjectConverterTest/mavenProjectFileNameNotEqualsToPomXml/module/pom_having_different_name.xml
deleted file mode 100644
index 7b49562c2e0..00000000000
--- a/sonar-batch/src/test/resources/org/sonar/batch/maven/MavenProjectConverterTest/mavenProjectFileNameNotEqualsToPomXml/module/pom_having_different_name.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.test</groupId>
-    <artifactId>parent</artifactId>
-    <version>0.1-SNAPSHOT</version>
-  </parent>
-  <artifactId>module</artifactId>
-  <packaging>jar</packaging>
-</project>
\ No newline at end of file
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/maven/MavenProjectConverterTest/mavenProjectFileNameNotEqualsToPomXml/pom.xml b/sonar-batch/src/test/resources/org/sonar/batch/maven/MavenProjectConverterTest/mavenProjectFileNameNotEqualsToPomXml/pom.xml
deleted file mode 100644
index 9d2244eb148..00000000000
--- a/sonar-batch/src/test/resources/org/sonar/batch/maven/MavenProjectConverterTest/mavenProjectFileNameNotEqualsToPomXml/pom.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.test</groupId>
-  <artifactId>parent</artifactId>
-  <version>0.1-SNAPSHOT</version>
-  <packaging>pom</packaging>
-  <modules>
-    <module>module</module>
-  </modules>
-</project>
\ No newline at end of file
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/maven/MavenProjectConverterTest/moduleNameDifferentThanArtifactId/path1/pom.xml b/sonar-batch/src/test/resources/org/sonar/batch/maven/MavenProjectConverterTest/moduleNameDifferentThanArtifactId/path1/pom.xml
deleted file mode 100644
index 470f2d1f6e5..00000000000
--- a/sonar-batch/src/test/resources/org/sonar/batch/maven/MavenProjectConverterTest/moduleNameDifferentThanArtifactId/path1/pom.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.test</groupId>
-    <artifactId>parent</artifactId>
-    <version>0.1-SNAPSHOT</version>
-  </parent>
-  <artifactId>module1</artifactId>
-  <packaging>jar</packaging>
-</project>
\ No newline at end of file
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/maven/MavenProjectConverterTest/moduleNameDifferentThanArtifactId/path2/pom.xml b/sonar-batch/src/test/resources/org/sonar/batch/maven/MavenProjectConverterTest/moduleNameDifferentThanArtifactId/path2/pom.xml
deleted file mode 100644
index 88101678e0f..00000000000
--- a/sonar-batch/src/test/resources/org/sonar/batch/maven/MavenProjectConverterTest/moduleNameDifferentThanArtifactId/path2/pom.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.test</groupId>
-    <artifactId>parent</artifactId>
-    <version>0.1-SNAPSHOT</version>
-  </parent>
-  <artifactId>module2</artifactId>
-  <packaging>jar</packaging>
-</project>
\ No newline at end of file
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/maven/MavenProjectConverterTest/moduleNameDifferentThanArtifactId/pom.xml b/sonar-batch/src/test/resources/org/sonar/batch/maven/MavenProjectConverterTest/moduleNameDifferentThanArtifactId/pom.xml
deleted file mode 100644
index afd92c0dbee..00000000000
--- a/sonar-batch/src/test/resources/org/sonar/batch/maven/MavenProjectConverterTest/moduleNameDifferentThanArtifactId/pom.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.test</groupId>
-  <artifactId>parent</artifactId>
-  <version>0.1-SNAPSHOT</version>
-  <packaging>pom</packaging>
-  <modules>
-    <module>path1</module>
-    <module>path2</module>
-  </modules>
-</project>
\ No newline at end of file
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/maven/MavenProjectConverterTest/moduleNameShouldEqualArtifactId/module1/pom.xml b/sonar-batch/src/test/resources/org/sonar/batch/maven/MavenProjectConverterTest/moduleNameShouldEqualArtifactId/module1/pom.xml
deleted file mode 100644
index 470f2d1f6e5..00000000000
--- a/sonar-batch/src/test/resources/org/sonar/batch/maven/MavenProjectConverterTest/moduleNameShouldEqualArtifactId/module1/pom.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.test</groupId>
-    <artifactId>parent</artifactId>
-    <version>0.1-SNAPSHOT</version>
-  </parent>
-  <artifactId>module1</artifactId>
-  <packaging>jar</packaging>
-</project>
\ No newline at end of file
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/maven/MavenProjectConverterTest/moduleNameShouldEqualArtifactId/module2/pom.xml b/sonar-batch/src/test/resources/org/sonar/batch/maven/MavenProjectConverterTest/moduleNameShouldEqualArtifactId/module2/pom.xml
deleted file mode 100644
index 88101678e0f..00000000000
--- a/sonar-batch/src/test/resources/org/sonar/batch/maven/MavenProjectConverterTest/moduleNameShouldEqualArtifactId/module2/pom.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.test</groupId>
-    <artifactId>parent</artifactId>
-    <version>0.1-SNAPSHOT</version>
-  </parent>
-  <artifactId>module2</artifactId>
-  <packaging>jar</packaging>
-</project>
\ No newline at end of file
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/maven/MavenProjectConverterTest/moduleNameShouldEqualArtifactId/pom.xml b/sonar-batch/src/test/resources/org/sonar/batch/maven/MavenProjectConverterTest/moduleNameShouldEqualArtifactId/pom.xml
deleted file mode 100644
index cc73a43ec08..00000000000
--- a/sonar-batch/src/test/resources/org/sonar/batch/maven/MavenProjectConverterTest/moduleNameShouldEqualArtifactId/pom.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.test</groupId>
-  <artifactId>parent</artifactId>
-  <version>0.1-SNAPSHOT</version>
-  <packaging>pom</packaging>
-  <modules>
-    <module>module1</module>
-    <module>module2</module>
-  </modules>
-</project>
\ No newline at end of file
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/maven/MavenProjectConverterTest/projectWithLinks/pom.xml b/sonar-batch/src/test/resources/org/sonar/batch/maven/MavenProjectConverterTest/projectWithLinks/pom.xml
deleted file mode 100644
index 460e8967e5c..00000000000
--- a/sonar-batch/src/test/resources/org/sonar/batch/maven/MavenProjectConverterTest/projectWithLinks/pom.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.test</groupId>
-  <artifactId>parent</artifactId>
-  <version>0.1-SNAPSHOT</version>
-  <packaging>pom</packaging>
-  <url>http://home.com</url>
-  <ciManagement>
-    <url>http://ci.com</url>
-  </ciManagement>
-  <issueManagement>
-    <url>http://issues.com</url>
-  </issueManagement>
-  <scm>
-    <url>http://sources.com</url>
-    <developerConnection>http://sources-dev.com</developerConnection>
-  </scm>
-</project>
\ No newline at end of file
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/maven/MavenProjectConverterTest/projectWithLinksAndProperties/pom.xml b/sonar-batch/src/test/resources/org/sonar/batch/maven/MavenProjectConverterTest/projectWithLinksAndProperties/pom.xml
deleted file mode 100644
index 5b024e5c4a7..00000000000
--- a/sonar-batch/src/test/resources/org/sonar/batch/maven/MavenProjectConverterTest/projectWithLinksAndProperties/pom.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.test</groupId>
-  <artifactId>parent</artifactId>
-  <version>0.1-SNAPSHOT</version>
-  <packaging>pom</packaging>
-  <url>http://home.com</url>
-  <ciManagement>
-    <url>http://ci.com</url>
-  </ciManagement>
-  <issueManagement>
-    <url>http://issues.com</url>
-  </issueManagement>
-  <scm>
-    <url>http://sources.com</url>
-    <developerConnection>http://sources-dev.com</developerConnection>
-  </scm>
-
-
-
-  <properties>
-    <sonar.links.homepage>http://home.com-OVERRIDEN-BY-PROPS</sonar.links.homepage>
-    <sonar.links.scm>http://sources.com-OVERRIDEN-BY-PROPS</sonar.links.scm>
-  </properties>
-
-
-</project>
\ No newline at end of file
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/maven/MavenProjectConverterTest/singleProjectWithoutModules/pom.xml b/sonar-batch/src/test/resources/org/sonar/batch/maven/MavenProjectConverterTest/singleProjectWithoutModules/pom.xml
deleted file mode 100644
index ffd40530c5d..00000000000
--- a/sonar-batch/src/test/resources/org/sonar/batch/maven/MavenProjectConverterTest/singleProjectWithoutModules/pom.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.test</groupId>
-  <artifactId>parent</artifactId>
-  <version>0.1-SNAPSHOT</version>
-  <packaging>pom</packaging>
-</project>
\ No newline at end of file
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/maven/MavenProjectConverterTest/sourceEncoding/pom.xml b/sonar-batch/src/test/resources/org/sonar/batch/maven/MavenProjectConverterTest/sourceEncoding/pom.xml
deleted file mode 100644
index 01bf73cfa9e..00000000000
--- a/sonar-batch/src/test/resources/org/sonar/batch/maven/MavenProjectConverterTest/sourceEncoding/pom.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.test</groupId>
-  <artifactId>parent</artifactId>
-  <version>0.1-SNAPSHOT</version>
-  <packaging>pom</packaging>
-  <url>http://home.com</url>
-  <properties>
-    <project.build.sourceEncoding>Shift_JIS</project.build.sourceEncoding>
-  </properties>
-</project>
\ No newline at end of file
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/rule/ActiveRulesProviderTest/shared.xml b/sonar-batch/src/test/resources/org/sonar/batch/rule/ActiveRulesProviderTest/shared.xml
deleted file mode 100644
index cb6d9256e2e..00000000000
--- a/sonar-batch/src/test/resources/org/sonar/batch/rule/ActiveRulesProviderTest/shared.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<dataset>
-
-  <rules_profiles id="1" name="Java One" language="java" parent_kee="[null]" kee="java-one" is_default="[false]"/>
-
-  <rules_profiles id="2" name="Java Two" language="java" parent_kee="[null]" kee="java-two" is_default="[false]"/>
-
-  <rules_profiles id="3" name="Php One" language="php" parent_kee="[null]" kee="php-one" is_default="[false]"/>
-
-  <rules_profiles id="4" name="Cobol One" language="cbl" parent_kee="[null]" kee="cobol-one" is_default="[false]"/>
-
-  <!-- java -->
-  <active_rules created_at="[null]" updated_at="[null]" id="1" profile_id="2" rule_id="10" failure_level="0" inheritance="[null]"/>
-
-  <active_rule_parameters id="1" active_rule_id="1" rules_parameter_id="1" rules_parameter_key="max" value="20"/>
-  <active_rule_parameters id="2" active_rule_id="1" rules_parameter_id="2" rules_parameter_key="format" value="html"/>
-
-  <!-- php -->
-  <active_rules created_at="[null]" updated_at="[null]" id="2" profile_id="3" rule_id="100" failure_level="4" inheritance="[null]"/>
-</dataset>
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/rule/RulesProviderTest/build_rules_with_default_and_overridden_debt_definitions.xml b/sonar-batch/src/test/resources/org/sonar/batch/rule/RulesProviderTest/build_rules_with_default_and_overridden_debt_definitions.xml
deleted file mode 100644
index c0d5fae6d18..00000000000
--- a/sonar-batch/src/test/resources/org/sonar/batch/rule/RulesProviderTest/build_rules_with_default_and_overridden_debt_definitions.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<dataset>
-
-  <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY" priority="1"
-         characteristic_id="103" default_characteristic_id="101"
-         remediation_function="LINEAR" default_remediation_function="LINEAR_OFFSET"
-         remediation_coeff="2h" default_remediation_coeff="5d"
-         remediation_offset="[null]" default_remediation_offset="10h"/>
-
-</dataset>
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/rule/RulesProviderTest/build_rules_with_default_characteristic_and_disable_characteristic.xml b/sonar-batch/src/test/resources/org/sonar/batch/rule/RulesProviderTest/build_rules_with_default_characteristic_and_disable_characteristic.xml
deleted file mode 100644
index 87d3d9bc215..00000000000
--- a/sonar-batch/src/test/resources/org/sonar/batch/rule/RulesProviderTest/build_rules_with_default_characteristic_and_disable_characteristic.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<dataset>
-
-  <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY" priority="1"
-         characteristic_id="-1" default_characteristic_id="103"
-         remediation_function="[null]" default_remediation_function="LINEAR"
-         remediation_coeff="[null]" default_remediation_coeff="2h"
-         remediation_offset="[null]" default_remediation_offset="[null]"/>
-
-</dataset>
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/rule/RulesProviderTest/build_rules_with_default_characteristic_and_overridden_function.xml b/sonar-batch/src/test/resources/org/sonar/batch/rule/RulesProviderTest/build_rules_with_default_characteristic_and_overridden_function.xml
deleted file mode 100644
index 60f9e72e2b3..00000000000
--- a/sonar-batch/src/test/resources/org/sonar/batch/rule/RulesProviderTest/build_rules_with_default_characteristic_and_overridden_function.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<dataset>
-
-  <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY" priority="1"
-         characteristic_id="[null]" default_characteristic_id="103"
-         remediation_function="LINEAR" default_remediation_function="[null]"
-         remediation_coeff="2h" default_remediation_coeff="[null]"
-         remediation_offset="[null]" default_remediation_offset="[null]"/>
-
-</dataset>
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/rule/RulesProviderTest/build_rules_with_default_debt_definitions.xml b/sonar-batch/src/test/resources/org/sonar/batch/rule/RulesProviderTest/build_rules_with_default_debt_definitions.xml
deleted file mode 100644
index 13ae30d6985..00000000000
--- a/sonar-batch/src/test/resources/org/sonar/batch/rule/RulesProviderTest/build_rules_with_default_debt_definitions.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<!--
-  ~ 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.
-  -->
-
-<dataset>
-
-  <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY" priority="1"
-         characteristic_id="[null]" default_characteristic_id="101"
-         remediation_function="[null]" default_remediation_function="LINEAR_OFFSET"
-         remediation_coeff="[null]" default_remediation_coeff="5d"
-         remediation_offset="[null]" default_remediation_offset="10h"/>
-
-</dataset>
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/rule/RulesProviderTest/build_rules_with_disable_characteristic.xml b/sonar-batch/src/test/resources/org/sonar/batch/rule/RulesProviderTest/build_rules_with_disable_characteristic.xml
deleted file mode 100644
index 474785cc9b9..00000000000
--- a/sonar-batch/src/test/resources/org/sonar/batch/rule/RulesProviderTest/build_rules_with_disable_characteristic.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<dataset>
-
-  <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY" priority="1"
-         characteristic_id="-1" default_characteristic_id="[null]"
-         remediation_function="[null]" default_remediation_function="[null]"
-         remediation_coeff="[null]" default_remediation_coeff="[null]"
-         remediation_offset="[null]" default_remediation_offset="[null]"/>
-
-</dataset>
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/rule/RulesProviderTest/build_rules_with_overridden_characteristic_and_default_function.xml b/sonar-batch/src/test/resources/org/sonar/batch/rule/RulesProviderTest/build_rules_with_overridden_characteristic_and_default_function.xml
deleted file mode 100644
index 0e31dc4ef98..00000000000
--- a/sonar-batch/src/test/resources/org/sonar/batch/rule/RulesProviderTest/build_rules_with_overridden_characteristic_and_default_function.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<dataset>
-
-  <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY" priority="1"
-         characteristic_id="103" default_characteristic_id="[null]"
-         remediation_function="[null]" default_remediation_function="LINEAR"
-         remediation_coeff="[null]" default_remediation_coeff="2h"
-         remediation_offset="[null]" default_remediation_offset="[null]"/>
-
-</dataset>
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/rule/RulesProviderTest/build_rules_with_overridden_debt_definitions.xml b/sonar-batch/src/test/resources/org/sonar/batch/rule/RulesProviderTest/build_rules_with_overridden_debt_definitions.xml
deleted file mode 100644
index 2181f4db1f8..00000000000
--- a/sonar-batch/src/test/resources/org/sonar/batch/rule/RulesProviderTest/build_rules_with_overridden_debt_definitions.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<!--
-  ~ 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.
-  -->
-
-<dataset>
-
-  <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY" priority="1"
-         characteristic_id="103" default_characteristic_id="[null]"
-         remediation_function="LINEAR" default_remediation_function="[null]"
-         remediation_coeff="2h" default_remediation_coeff="[null]"
-         remediation_offset="[null]" default_remediation_offset="[null]"/>
-
-</dataset>
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/rule/RulesProviderTest/fail_if_characteristic_not_found.xml b/sonar-batch/src/test/resources/org/sonar/batch/rule/RulesProviderTest/fail_if_characteristic_not_found.xml
deleted file mode 100644
index c304332b5c3..00000000000
--- a/sonar-batch/src/test/resources/org/sonar/batch/rule/RulesProviderTest/fail_if_characteristic_not_found.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<!--
-  ~ 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.
-  -->
-
-<dataset>
-
-  <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY" priority="1"
-         characteristic_id="[null]" default_characteristic_id="999"
-         remediation_function="[null]" default_remediation_function="LINEAR_OFFSET"
-         remediation_coeff="[null]" default_remediation_coeff="5d"
-         remediation_offset="[null]" default_remediation_offset="10h"/>
-
-</dataset>
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/rule/RulesProviderTest/fail_if_no_function.xml b/sonar-batch/src/test/resources/org/sonar/batch/rule/RulesProviderTest/fail_if_no_function.xml
deleted file mode 100644
index 82db0e3e956..00000000000
--- a/sonar-batch/src/test/resources/org/sonar/batch/rule/RulesProviderTest/fail_if_no_function.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<!--
-  ~ 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.
-  -->
-
-<dataset>
-
-  <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY" priority="1"
-         characteristic_id="[null]" default_characteristic_id="101"
-         remediation_function="[null]" default_remediation_function="[null]"
-         remediation_coeff="[null]" default_remediation_coeff="5d"
-         remediation_offset="[null]" default_remediation_offset="10h"/>
-
-</dataset>
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/rule/RulesProviderTest/shared.xml b/sonar-batch/src/test/resources/org/sonar/batch/rule/RulesProviderTest/shared.xml
deleted file mode 100644
index 9d8884a2f4b..00000000000
--- a/sonar-batch/src/test/resources/org/sonar/batch/rule/RulesProviderTest/shared.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<!--
-  ~ 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.
-  -->
-
-<dataset>
-
-  <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY" priority="1"
-         characteristic_id="[null]" default_characteristic_id="101"
-         remediation_function="[null]" default_remediation_function="LINEAR_OFFSET"
-         remediation_coeff="[null]" default_remediation_coeff="5d"
-         remediation_offset="[null]" default_remediation_offset="10h"/>
-
-  <rules_parameters id="1" rule_id="1" name="myParameter" param_type="plop" default_value="plouf" description="My Parameter"/>
-
-</dataset>
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/scan/maven/MavenPluginsConfiguratorTest/pom.xml b/sonar-batch/src/test/resources/org/sonar/batch/scan/maven/MavenPluginsConfiguratorTest/pom.xml
deleted file mode 100644
index 2f95da16602..00000000000
--- a/sonar-batch/src/test/resources/org/sonar/batch/scan/maven/MavenPluginsConfiguratorTest/pom.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>mygroup</groupId>
-  <artifactId>myartifact</artifactId>
-  <packaging>jar</packaging>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>2.2</version>
-        <configuration>
-          <outputFileFormat>html</outputFileFormat>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>
\ No newline at end of file
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/scan/report/JsonReportTest/report-without-resolved-issues.json b/sonar-batch/src/test/resources/org/sonar/batch/scan/report/JSONReportTest/report-without-resolved-issues.json
index b5af45efe6c..b5af45efe6c 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/scan/report/JsonReportTest/report-without-resolved-issues.json
+++ b/sonar-batch/src/test/resources/org/sonar/batch/scan/report/JSONReportTest/report-without-resolved-issues.json
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/scan/report/JsonReportTest/report.json b/sonar-batch/src/test/resources/org/sonar/batch/scan/report/JSONReportTest/report.json
index 91c1e3a3eac..91c1e3a3eac 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/scan/report/JsonReportTest/report.json
+++ b/sonar-batch/src/test/resources/org/sonar/batch/scan/report/JSONReportTest/report.json