SONAR-4357 Move some classes to Sonar core

20 files changed, 5 insertions, 826 deletions

diff --git a/sonar-server/src/main/java/org/sonar/server/platform/Platform.java b/sonar-server/src/main/java/org/sonar/server/platform/Platform.java
index f5e0e944a44..544d6db80e5 100644
--- a/sonar-server/src/main/java/org/sonar/server/platform/Platform.java
+++ b/sonar-server/src/main/java/org/sonar/server/platform/Platform.java
@@ -59,7 +59,8 @@ import org.sonar.core.resource.DefaultResourcePermissions;
 import org.sonar.core.rule.DefaultRuleFinder;
 import org.sonar.core.source.HtmlSourceDecorator;
 import org.sonar.core.technicaldebt.TechnicalDebtConverter;
-import org.sonar.core.technicaldebt.TechnicalDebtModelFinder;
+import org.sonar.core.technicaldebt.TechnicalDebtManager;
+import org.sonar.core.technicaldebt.TechnicalDebtModelRepository;
 import org.sonar.core.technicaldebt.TechnicalDebtXMLImporter;
 import org.sonar.core.test.TestPlanPerspectiveLoader;
 import org.sonar.core.test.TestablePerspectiveLoader;
@@ -94,7 +95,6 @@ import org.sonar.server.rules.ProfilesConsole;
 import org.sonar.server.rules.RulesConsole;
 import org.sonar.server.startup.*;
 import org.sonar.server.technicaldebt.RubyTechnicalDebtService;
-import org.sonar.server.technicaldebt.TechnicalDebtManager;
 import org.sonar.server.text.MacroInterpreter;
 import org.sonar.server.text.RubyTextService;
 import org.sonar.server.ui.*;
@@ -301,7 +301,7 @@ public final class Platform {
 
     // technical debt
     servicesContainer.addSingleton(TechnicalDebtManager.class);
-    servicesContainer.addSingleton(TechnicalDebtModelFinder.class);
+    servicesContainer.addSingleton(TechnicalDebtModelRepository.class);
     servicesContainer.addSingleton(TechnicalDebtXMLImporter.class);
     servicesContainer.addSingleton(TechnicalDebtConverter.class);
     servicesContainer.addSingleton(RubyTechnicalDebtService.class);
diff --git a/sonar-server/src/main/java/org/sonar/server/startup/RegisterTechnicalDebtModel.java b/sonar-server/src/main/java/org/sonar/server/startup/RegisterTechnicalDebtModel.java
index 06e8636ddd9..9c2a280b6a0 100644
--- a/sonar-server/src/main/java/org/sonar/server/startup/RegisterTechnicalDebtModel.java
+++ b/sonar-server/src/main/java/org/sonar/server/startup/RegisterTechnicalDebtModel.java
@@ -24,8 +24,8 @@ import org.slf4j.LoggerFactory;
 import org.sonar.api.rules.RuleFinder;
 import org.sonar.api.utils.TimeProfiler;
 import org.sonar.api.utils.ValidationMessages;
+import org.sonar.core.technicaldebt.TechnicalDebtManager;
 import org.sonar.core.technicaldebt.TechnicalDebtRuleCache;
-import org.sonar.server.technicaldebt.TechnicalDebtManager;
 
 public final class RegisterTechnicalDebtModel {
 
diff --git a/sonar-server/src/main/java/org/sonar/server/technicaldebt/TechnicalDebtManager.java b/sonar-server/src/main/java/org/sonar/server/technicaldebt/TechnicalDebtManager.java
deleted file mode 100644
index 1d9962c635e..00000000000
--- a/sonar-server/src/main/java/org/sonar/server/technicaldebt/TechnicalDebtManager.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * SonarQube, open source software quality management tool.
- * Copyright (C) 2008-2013 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.
- */
-package org.sonar.server.technicaldebt;
-
-import org.apache.commons.io.IOUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.sonar.api.ServerExtension;
-import org.sonar.api.database.DatabaseSession;
-import org.sonar.api.qualitymodel.Characteristic;
-import org.sonar.api.qualitymodel.Model;
-import org.sonar.api.qualitymodel.ModelFinder;
-import org.sonar.api.utils.ValidationMessages;
-import org.sonar.core.technicaldebt.*;
-import org.sonar.jpa.session.DatabaseSessionFactory;
-
-import java.io.Reader;
-import java.util.Collection;
-
-/**
- * TODO test merge properties + property.value + text_value
- */
-
-public class TechnicalDebtManager implements ServerExtension {
-
-  private static final Logger LOG = LoggerFactory.getLogger(TechnicalDebtManager.class);
-
-  private static final int REQUIREMENT_LEVEL = 3;
-
-  private DatabaseSessionFactory sessionFactory;
-  private ModelFinder modelFinder;
-  private TechnicalDebtModelFinder languageModelFinder;
-  private TechnicalDebtXMLImporter importer;
-
-  public TechnicalDebtManager(DatabaseSessionFactory sessionFactory, ModelFinder modelFinder,
-                              TechnicalDebtModelFinder languageModelFinder, TechnicalDebtXMLImporter importer) {
-    this.sessionFactory = sessionFactory;
-    this.modelFinder = modelFinder;
-    this.languageModelFinder = languageModelFinder;
-    this.importer = importer;
-  }
-
-  public Model init(ValidationMessages messages, TechnicalDebtRuleCache rulesCache) {
-    DatabaseSession session = sessionFactory.getSession();
-
-    disableRequirementsOnRemovedRules(rulesCache);
-
-    Model defaultModel = loadModelFromXml(TechnicalDebtModelFinder.DEFAULT_MODEL, messages, rulesCache);
-    Model model = loadOrCreateModelFromDb(defaultModel, messages, rulesCache);
-    loadRequirementsFromPlugins(model, defaultModel, messages, rulesCache);
-
-    session.save(model);
-    session.commit();
-    return model;
-  }
-
-  private Model loadOrCreateModelFromDb(Model defaultModel, ValidationMessages messages, TechnicalDebtRuleCache rulesCache) {
-    Model model = modelFinder.findByName(TechnicalDebtModel.MODEL_NAME);
-    if (model == null) {
-      model = Model.createByName(TechnicalDebtModel.MODEL_NAME);
-      merge(defaultModel, model, defaultModel, messages, rulesCache);
-    }
-    return model;
-  }
-
-  private void merge(Model pluginModel, Model existingModel, Model defaultModel, ValidationMessages messages, TechnicalDebtRuleCache rulesCache) {
-    messages.log(LOG);
-    if (!messages.hasErrors()) {
-      new TechnicalDebtMergeModel(existingModel, defaultModel.getCharacteristics()).mergeWith(pluginModel, messages, rulesCache);
-      messages.log(LOG);
-    }
-  }
-
-  private void loadRequirementsFromPlugins(Model existingModel, Model defaultModel, ValidationMessages messages, TechnicalDebtRuleCache rulesCache) {
-    for (String pluginKey : getContributingPluginListWithoutSqale()) {
-      Model pluginModel = loadModelFromXml(pluginKey, messages, rulesCache);
-      merge(pluginModel, existingModel, defaultModel, messages, rulesCache);
-    }
-  }
-
-  private Model loadModelFromXml(String pluginKey, ValidationMessages messages, TechnicalDebtRuleCache rulesCache) {
-    Reader xmlFileReader = null;
-    try {
-      xmlFileReader = languageModelFinder.createReaderForXMLFile(pluginKey);
-      return importer.importXML(xmlFileReader, messages, rulesCache);
-    } finally {
-      IOUtils.closeQuietly(xmlFileReader);
-    }
-  }
-
-  /**
-   * Disable requirements linked on removed rules
-   */
-  private void disableRequirementsOnRemovedRules(TechnicalDebtRuleCache rulesCache) {
-    Model existingModel = modelFinder.findByName(TechnicalDebtModel.MODEL_NAME);
-    if (existingModel != null) {
-      for (Characteristic requirement : existingModel.getCharacteristicsByDepth(REQUIREMENT_LEVEL)) {
-        if (!rulesCache.exists(requirement.getRule())) {
-          existingModel.removeCharacteristic(requirement);
-        }
-      }
-      sessionFactory.getSession().commit();
-    }
-  }
-
-  private Collection<String> getContributingPluginListWithoutSqale() {
-    return languageModelFinder.getContributingPluginList();
-  }
-
-}
diff --git a/sonar-server/src/test/java/org/sonar/server/startup/RegisterTechnicalDebtModelTest.java b/sonar-server/src/test/java/org/sonar/server/startup/RegisterTechnicalDebtModelTest.java
index 022c3103ab2..ba5ac1cf71b 100644
--- a/sonar-server/src/test/java/org/sonar/server/startup/RegisterTechnicalDebtModelTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/startup/RegisterTechnicalDebtModelTest.java
@@ -22,8 +22,8 @@ package org.sonar.server.startup;
 import org.junit.Test;
 import org.sonar.api.rules.RuleFinder;
 import org.sonar.api.utils.ValidationMessages;
+import org.sonar.core.technicaldebt.TechnicalDebtManager;
 import org.sonar.core.technicaldebt.TechnicalDebtRuleCache;
-import org.sonar.server.technicaldebt.TechnicalDebtManager;
 
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.*;
diff --git a/sonar-server/src/test/java/org/sonar/server/technicaldebt/TechnicalDebtManagerTest.java b/sonar-server/src/test/java/org/sonar/server/technicaldebt/TechnicalDebtManagerTest.java
deleted file mode 100644
index b948e25c0b6..00000000000
--- a/sonar-server/src/test/java/org/sonar/server/technicaldebt/TechnicalDebtManagerTest.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * SonarQube, open source software quality management tool.
- * Copyright (C) 2008-2013 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.
- */
-package org.sonar.server.technicaldebt;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.io.Resources;
-import org.junit.Before;
-import org.junit.Test;
-import org.sonar.api.qualitymodel.Model;
-import org.sonar.api.rules.Rule;
-import org.sonar.api.utils.ValidationMessages;
-import org.sonar.core.qualitymodel.DefaultModelFinder;
-import org.sonar.core.rule.DefaultRuleFinder;
-import org.sonar.core.technicaldebt.TechnicalDebtModelFinder;
-import org.sonar.core.technicaldebt.TechnicalDebtRuleCache;
-import org.sonar.core.technicaldebt.TechnicalDebtXMLImporter;
-import org.sonar.jpa.test.AbstractDbUnitTestCase;
-
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-
-import static org.fest.assertions.Assertions.assertThat;
-import static org.fest.assertions.Fail.fail;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-public class TechnicalDebtManagerTest extends AbstractDbUnitTestCase {
-
-  private TechnicalDebtManager manager;
-  private TechnicalDebtModelFinder technicalDebtModelFinder = mock(TechnicalDebtModelFinder.class);
-
-  @Before
-  public void init() throws Exception {
-    technicalDebtModelFinder = mock(TechnicalDebtModelFinder.class);
-    when(technicalDebtModelFinder.createReaderForXMLFile("technical-debt")).thenReturn(
-      new FileReader(Resources.getResource(TechnicalDebtManagerTest.class, "TechnicalDebtManagerTest/fake-default-model.xml").getPath()));
-
-    manager = new TechnicalDebtManager(getSessionFactory(), new DefaultModelFinder(getSessionFactory()), technicalDebtModelFinder, new TechnicalDebtXMLImporter());
-  }
-
-  @Test
-  public void create_only_default_model_on_first_execution_when_no_plugin() throws Exception {
-    setupData("empty");
-
-    manager.init(ValidationMessages.create(), defaultRuleCache());
-
-    checkTables("create_default_model_on_first_execution", "quality_models", "characteristics", "characteristic_edges");
-  }
-
-  @Test
-  public void create_model_with_requirements_from_plugin_on_first_execution() throws Exception {
-    setupData("empty");
-
-    addPluginModel("java", "fake-java-model.xml");
-
-    TechnicalDebtRuleCache technicalDebtRuleCache = mock(TechnicalDebtRuleCache.class);
-    Rule rule1 = Rule.create("checkstyle", "import", "Regular expression");
-    rule1.setId(1);
-    when(technicalDebtRuleCache.getRule("checkstyle", "import")).thenReturn(rule1);
-    Rule rule2 = Rule.create("checkstyle", "export", "Regular expression");
-    rule2.setId(2);
-    when(technicalDebtRuleCache.getRule("checkstyle", "export")).thenReturn(rule2);
-
-    manager.init(ValidationMessages.create(), technicalDebtRuleCache);
-
-    checkTables("create_model_with_requirements_from_plugin_on_first_execution", "quality_models", "characteristics", "characteristic_edges", "characteristic_properties");
-  }
-
-  @Test
-  public void add_new_requirements_from_plugin() throws Exception {
-    setupData("add_new_requirements_from_plugin");
-
-    addPluginModel("java", "fake-java-model.xml");
-
-    manager.init(ValidationMessages.create(), defaultRuleCache());
-
-    checkTables("add_new_requirements_from_plugin", "quality_models", "characteristics", "characteristic_edges", "characteristic_properties");
-  }
-
-  @Test
-  public void disable_requirements_on_removed_rules() throws Exception {
-    setupData("disable_requirements_on_removed_rules");
-
-    addPluginModel("java", "fake-java-model.xml");
-
-    manager.init(ValidationMessages.create(), defaultRuleCache());
-
-    checkTables("disable_requirements_on_removed_rules", "quality_models", "characteristics", "characteristic_edges", "characteristic_properties");
-  }
-
-  @Test
-  public void fail_when_plugin_defines_characteristics_not_defined_in_default_model() throws Exception {
-    setupData("fail_when_plugin_defines_characteristics_not_defined_in_default_model");
-
-    addPluginModel("java", "fake-java-model-adding-unknown-characteristic.xml");
-
-    try {
-      manager.init(ValidationMessages.create(), defaultRuleCache());
-      fail();
-    } catch (Exception e) {
-      assertThat(e).isInstanceOf(IllegalArgumentException.class);
-    }
-    checkTables("fail_when_plugin_defines_characteristics_not_defined_in_default_model", "quality_models", "characteristics", "characteristic_edges", "characteristic_properties");
-  }
-
-  @Test
-  public void recreate_previously_deleted_characteristic_from_default_model_when_plugin_define_requirements_on_it() throws Exception {
-    setupData("recreate_previously_deleted_characteristic_from_default_model_when_plugin_define_requirements_on_it");
-
-    addPluginModel("java", "fake-java-model.xml");
-
-    manager.init(ValidationMessages.create(), defaultRuleCache());
-
-    checkTables("recreate_previously_deleted_characteristic_from_default_model_when_plugin_define_requirements_on_it", "quality_models", "characteristics", "characteristic_edges", "characteristic_properties");
-  }
-
-  @Test
-  public void provided_plugin_should_not_override_default_characteristics_name() throws FileNotFoundException {
-    Model model = manager.init(ValidationMessages.create(), defaultRuleCache());
-    // Default model values
-    assertThat(model.getCharacteristicByKey("PORTABILITY").getName()).isEqualTo("Portability");
-    assertThat(model.getCharacteristicByKey("COMPILER_RELATED_PORTABILITY").getName()).isEqualTo("Compiler related portability");
-    assertThat(model.getCharacteristicByKey("HARDWARE_RELATED_PORTABILITY").getName()).isEqualTo("Hardware related portability");
-    assertThat(model.getCharacteristicByKey("MAINTAINABILITY").getName()).isEqualTo("Maintainability");
-
-    // Plugin has renamed it, but the value should stay as defined by default model
-    assertThat(model.getCharacteristicByKey("READABILITY").getName()).isEqualTo("Readability");
-  }
-
-  @Test
-  public void no_failure_on_unknown_rule() throws FileNotFoundException {
-    setupData("empty");
-
-    addPluginModel("java", "fake-java-model.xml");
-
-    TechnicalDebtRuleCache technicalDebtRuleCache = mock(TechnicalDebtRuleCache.class);
-    Rule rule1 = Rule.create("checkstyle", "import", "Regular expression");
-    rule1.setId(1);
-    when(technicalDebtRuleCache.getRule("checkstyle", "import")).thenReturn(rule1);
-    Rule rule2 = Rule.create("checkstyle", "export", "Regular expression");
-    rule2.setId(2);
-    when(technicalDebtRuleCache.getRule("checkstyle", "export")).thenReturn(rule2);
-
-    ValidationMessages messages = ValidationMessages.create();
-    manager.init(messages, technicalDebtRuleCache);
-
-    assertThat(messages.getWarnings()).hasSize(1);
-    assertThat(messages.getWarnings().get(0)).isEqualTo("Rule not found: [repository=checkstyle, key=ConstantNameCheck]");
-  }
-
-  private TechnicalDebtRuleCache defaultRuleCache() {
-    return new TechnicalDebtRuleCache(new DefaultRuleFinder(getSessionFactory()));
-  }
-
-  private void addPluginModel(String pluginKey, String xmlFile) throws FileNotFoundException {
-    when(technicalDebtModelFinder.getContributingPluginList()).thenReturn(ImmutableList.of(pluginKey));
-    when(technicalDebtModelFinder.createReaderForXMLFile(pluginKey)).thenReturn(
-      new FileReader(Resources.getResource(TechnicalDebtManagerTest.class, "TechnicalDebtManagerTest/" + xmlFile).getPath()));
-  }
-
-
-}
diff --git a/sonar-server/src/test/resources/org/sonar/server/technicaldebt/TechnicalDebtManagerTest/add_new_requirements_from_plugin-result.xml b/sonar-server/src/test/resources/org/sonar/server/technicaldebt/TechnicalDebtManagerTest/add_new_requirements_from_plugin-result.xml
deleted file mode 100644
index 3d5786f8cbb..00000000000
--- a/sonar-server/src/test/resources/org/sonar/server/technicaldebt/TechnicalDebtManagerTest/add_new_requirements_from_plugin-result.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<dataset>
-  <quality_models id="1" name="TECHNICAL_DEBT"/>
-
-  <characteristics id="1" kee="COMPILER_RELATED_PORTABILITY" name="Compiler related portability" quality_model_id="1" rule_id="[null]" characteristic_order="1" depth="2"
-                   description="[null]" enabled="true"/>
-
-  <!-- Exiting requirement -->
-  <characteristics id="2" kee="[null]" name="[null]" quality_model_id="1" rule_id="1" characteristic_order="6" depth="3"
-                   description="[null]" enabled="true"/>
-
-  <characteristics id="3" kee="PORTABILITY" name="Portability" quality_model_id="1" rule_id="[null]" characteristic_order="2" depth="1" description="[null]" enabled="true"/>
-  <characteristics id="4" kee="HARDWARE_RELATED_PORTABILITY" name="Hardware related portability" quality_model_id="1" rule_id="[null]" characteristic_order="3" depth="2"
-                   description="[null]" enabled="true"/>
-
-  <characteristics id="5" kee="READABILITY" name="Readability" quality_model_id="1" rule_id="[null]" characteristic_order="4" depth="2" description="[null]" enabled="true"/>
-  <characteristics id="6" kee="MAINTAINABILITY" name="Maintainability" quality_model_id="1" rule_id="[null]" characteristic_order="5" depth="1" description="[null]"
-                   enabled="true"/>
-
-  <!-- New requirement -->
-  <characteristics id="7" kee="[null]" name="[null]" quality_model_id="1" rule_id="2" characteristic_order="7" depth="3"
-                   description="[null]" enabled="true"/>
-
-  <characteristic_edges child_id="1" parent_id="3"/>
-  <characteristic_edges child_id="2" parent_id="1"/>
-  <characteristic_edges child_id="4" parent_id="3"/>
-  <characteristic_edges child_id="5" parent_id="6"/>
-  <!-- On new requirement -->
-  <characteristic_edges child_id="7" parent_id="4"/>
-
-  <characteristic_properties id="1" characteristic_id="2" kee="remediationFactor" value="30.0" text_value="mn"/>
-  <characteristic_properties id="2" characteristic_id="2" kee="remediationFunction" value="[null]" text_value="linear"/>
-  <!-- On new requirement -->
-  <characteristic_properties id="3" characteristic_id="7" kee="remediationFactor" value="1.0" text_value="h"/>
-  <characteristic_properties id="4" characteristic_id="7" kee="remediationFunction" value="[null]" text_value="linear"/>
-
-  <rules id="1" plugin_rule_key="import" plugin_config_key="regexp" plugin_name="checkstyle" description="[null]" priority="3" status="READY" cardinality="SINGLE" parent_id="[null]" name="Regular exp"/>
-  <rules id="2" plugin_rule_key="export" plugin_config_key="regexp" plugin_name="checkstyle" description="[null]" priority="3" status="READY" cardinality="SINGLE" parent_id="[null]" name="Regular exp"/>
-
-</dataset>
diff --git a/sonar-server/src/test/resources/org/sonar/server/technicaldebt/TechnicalDebtManagerTest/add_new_requirements_from_plugin.xml b/sonar-server/src/test/resources/org/sonar/server/technicaldebt/TechnicalDebtManagerTest/add_new_requirements_from_plugin.xml
deleted file mode 100644
index ab6a26428fc..00000000000
--- a/sonar-server/src/test/resources/org/sonar/server/technicaldebt/TechnicalDebtManagerTest/add_new_requirements_from_plugin.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<dataset>
-  <quality_models id="1" name="TECHNICAL_DEBT"/>
-
-  <characteristics id="1" kee="COMPILER_RELATED_PORTABILITY" name="Compiler related portability" quality_model_id="1" rule_id="[null]" characteristic_order="1" depth="2"
-                   description="[null]" enabled="true"/>
-
-  <!-- Exiting requirement -->
-  <characteristics id="2" kee="[null]" name="[null]" quality_model_id="1" rule_id="1" characteristic_order="6" depth="3"
-                   description="[null]" enabled="true"/>
-
-  <characteristics id="3" kee="PORTABILITY" name="Portability" quality_model_id="1" rule_id="[null]" characteristic_order="2" depth="1" description="[null]" enabled="true"/>
-  <characteristics id="4" kee="HARDWARE_RELATED_PORTABILITY" name="Hardware related portability" quality_model_id="1" rule_id="[null]" characteristic_order="3" depth="2"
-                   description="[null]" enabled="true"/>
-
-  <characteristics id="5" kee="READABILITY" name="Readability" quality_model_id="1" rule_id="[null]" characteristic_order="4" depth="2" description="[null]" enabled="true"/>
-  <characteristics id="6" kee="MAINTAINABILITY" name="Maintainability" quality_model_id="1" rule_id="[null]" characteristic_order="5" depth="1" description="[null]"
-                   enabled="true"/>
-
-  <characteristic_edges child_id="1" parent_id="3"/>
-  <characteristic_edges child_id="2" parent_id="1"/>
-  <characteristic_edges child_id="4" parent_id="3"/>
-  <characteristic_edges child_id="5" parent_id="6"/>
-
-  <characteristic_properties id="1" characteristic_id="2" kee="remediationFactor" value="30.0" text_value="mn"/>
-  <characteristic_properties id="2" characteristic_id="2" kee="remediationFunction" value="[null]" text_value="linear"/>
-
-  <rules id="1" plugin_rule_key="import" plugin_config_key="regexp" plugin_name="checkstyle" description="[null]" priority="3" status="READY" cardinality="SINGLE" parent_id="[null]" name="Regular exp"/>
-  <rules id="2" plugin_rule_key="export" plugin_config_key="regexp" plugin_name="checkstyle" description="[null]" priority="3" status="READY" cardinality="SINGLE" parent_id="[null]" name="Regular exp"/>
-
-</dataset>
diff --git a/sonar-server/src/test/resources/org/sonar/server/technicaldebt/TechnicalDebtManagerTest/create_default_model_on_first_execution-result.xml b/sonar-server/src/test/resources/org/sonar/server/technicaldebt/TechnicalDebtManagerTest/create_default_model_on_first_execution-result.xml
deleted file mode 100644
index 10ea4bbcc65..00000000000
--- a/sonar-server/src/test/resources/org/sonar/server/technicaldebt/TechnicalDebtManagerTest/create_default_model_on_first_execution-result.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<dataset>
-  <quality_models id="1" name="TECHNICAL_DEBT"/>
-
-  <characteristics id="1" kee="COMPILER_RELATED_PORTABILITY" name="Compiler related portability" quality_model_id="1" rule_id="[null]" characteristic_order="1" depth="2"
-                   description="[null]" enabled="true"/>
-  <characteristics id="2" kee="PORTABILITY" name="Portability" quality_model_id="1" rule_id="[null]" characteristic_order="2" depth="1" description="[null]" enabled="true"/>
-  <characteristics id="3" kee="HARDWARE_RELATED_PORTABILITY" name="Hardware related portability" quality_model_id="1" rule_id="[null]" characteristic_order="3" depth="2"
-                   description="[null]" enabled="true"/>
-  <characteristics id="4" kee="READABILITY" name="Readability" quality_model_id="1" rule_id="[null]" characteristic_order="4" depth="2" description="[null]" enabled="true"/>
-  <characteristics id="5" kee="MAINTAINABILITY" name="Maintainability" quality_model_id="1" rule_id="[null]" characteristic_order="5" depth="1" description="[null]" enabled="true"/>
-
-  <characteristic_edges child_id="1" parent_id="2"/>
-  <characteristic_edges child_id="3" parent_id="2"/>
-  <characteristic_edges child_id="4" parent_id="5"/>
-
-</dataset>
diff --git a/sonar-server/src/test/resources/org/sonar/server/technicaldebt/TechnicalDebtManagerTest/create_model_with_requirements_from_plugin_on_first_execution-result.xml b/sonar-server/src/test/resources/org/sonar/server/technicaldebt/TechnicalDebtManagerTest/create_model_with_requirements_from_plugin_on_first_execution-result.xml
deleted file mode 100644
index 1872525d83a..00000000000
--- a/sonar-server/src/test/resources/org/sonar/server/technicaldebt/TechnicalDebtManagerTest/create_model_with_requirements_from_plugin_on_first_execution-result.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<dataset>
-  <quality_models id="1" name="TECHNICAL_DEBT"/>
-
-  <characteristics id="1" kee="COMPILER_RELATED_PORTABILITY" name="Compiler related portability" quality_model_id="1" rule_id="[null]" characteristic_order="1" depth="2"
-                   description="[null]" enabled="true"/>
-
-  <!-- Requirement provided by plugin -->
-  <characteristics id="2" kee="[null]" name="[null]" quality_model_id="1" rule_id="1" characteristic_order="6" depth="3"
-                   description="[null]" enabled="true"/>
-
-  <characteristics id="3" kee="PORTABILITY" name="Portability" quality_model_id="1" rule_id="[null]" characteristic_order="2" depth="1" description="[null]" enabled="true"/>
-  <characteristics id="4" kee="HARDWARE_RELATED_PORTABILITY" name="Hardware related portability" quality_model_id="1" rule_id="[null]" characteristic_order="3" depth="2"
-                   description="[null]" enabled="true"/>
-
-  <!-- Requirement provided by plugin -->
-  <characteristics id="5" kee="[null]" name="[null]" quality_model_id="1" rule_id="2" characteristic_order="7" depth="3"
-                   description="[null]" enabled="true"/>
-
-  <characteristics id="6" kee="READABILITY" name="Readability" quality_model_id="1" rule_id="[null]" characteristic_order="4" depth="2" description="[null]" enabled="true"/>
-  <characteristics id="7" kee="MAINTAINABILITY" name="Maintainability" quality_model_id="1" rule_id="[null]" characteristic_order="5" depth="1" description="[null]"
-                   enabled="true"/>
-
-  <characteristic_edges child_id="1" parent_id="3"/>
-  <characteristic_edges child_id="2" parent_id="1"/>
-  <characteristic_edges child_id="4" parent_id="3"/>
-  <characteristic_edges child_id="5" parent_id="4"/>
-  <characteristic_edges child_id="6" parent_id="7"/>
-
-  <characteristic_properties id="1" characteristic_id="2" kee="remediationFactor" value="30.0" text_value="mn"/>
-  <characteristic_properties id="2" characteristic_id="2" kee="remediationFunction" value="[null]" text_value="linear"/>
-  <characteristic_properties id="3" characteristic_id="5" kee="remediationFactor" value="1.0" text_value="h"/>
-  <characteristic_properties id="4" characteristic_id="5" kee="remediationFunction" value="[null]" text_value="linear"/>
-
-</dataset>
diff --git a/sonar-server/src/test/resources/org/sonar/server/technicaldebt/TechnicalDebtManagerTest/disable_requirements_on_removed_rules-result.xml b/sonar-server/src/test/resources/org/sonar/server/technicaldebt/TechnicalDebtManagerTest/disable_requirements_on_removed_rules-result.xml
deleted file mode 100644
index 3d387508b11..00000000000
--- a/sonar-server/src/test/resources/org/sonar/server/technicaldebt/TechnicalDebtManagerTest/disable_requirements_on_removed_rules-result.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<dataset>
-  <quality_models id="1" name="TECHNICAL_DEBT"/>
-
-  <characteristics id="1" kee="COMPILER_RELATED_PORTABILITY" name="Compiler related portability" quality_model_id="1" rule_id="[null]" characteristic_order="1" depth="2"
-                   description="[null]" enabled="true"/>
-
-  <!-- Requirement bases on still existing rule not disabled -->
-  <characteristics id="2" kee="[null]" name="[null]" quality_model_id="1" rule_id="1" characteristic_order="6" depth="3"
-                   description="[null]" enabled="true"/>
-
-  <characteristics id="3" kee="PORTABILITY" name="Portability" quality_model_id="1" rule_id="[null]" characteristic_order="2" depth="1" description="[null]" enabled="true"/>
-  <characteristics id="4" kee="HARDWARE_RELATED_PORTABILITY" name="Hardware related portability" quality_model_id="1" rule_id="[null]" characteristic_order="3" depth="2"
-                   description="[null]" enabled="true"/>
-
-  <!-- Disabled requirement bases on removed rule -->
-  <characteristics id="5" kee="[null]" name="[null]" quality_model_id="1" rule_id="2" characteristic_order="7" depth="3"
-                   description="[null]" enabled="false"/>
-
-  <characteristics id="6" kee="READABILITY" name="Readability" quality_model_id="1" rule_id="[null]" characteristic_order="4" depth="2" description="[null]" enabled="true"/>
-  <characteristics id="7" kee="MAINTAINABILITY" name="Maintainability" quality_model_id="1" rule_id="[null]" characteristic_order="5" depth="1" description="[null]"
-                   enabled="true"/>
-
-  <characteristic_edges child_id="1" parent_id="3"/>
-  <!-- Linked on disabled characteristic -->
-  <characteristic_edges child_id="2" parent_id="1"/>
-  <characteristic_edges child_id="4" parent_id="3"/>
-  <characteristic_edges child_id="5" parent_id="4"/>
-  <characteristic_edges child_id="6" parent_id="7"/>
-
-  <characteristic_properties id="1" characteristic_id="2" kee="remediationFactor" value="30.0" text_value="mn"/>
-  <!-- Linked on disabled characteristic -->
-  <characteristic_properties id="2" characteristic_id="2" kee="remediationFunction" value="[null]" text_value="linear"/>
-  <characteristic_properties id="3" characteristic_id="5" kee="remediationFactor" value="1.0" text_value="h"/>
-  <characteristic_properties id="4" characteristic_id="5" kee="remediationFunction" value="[null]" text_value="linear"/>
-
-  <rules id="1" plugin_rule_key="import" plugin_config_key="regexp" plugin_name="checkstyle" description="[null]" priority="3" status="READY" cardinality="SINGLE" parent_id="[null]" name="Regular exp"/>
-  <!-- Removed rule -->
-  <rules id="2" plugin_rule_key="export" plugin_config_key="regexp" plugin_name="checkstyle" description="[null]" priority="3" status="REMOVED" cardinality="SINGLE" parent_id="[null]" name="Regular exp"/>
-
-</dataset>
diff --git a/sonar-server/src/test/resources/org/sonar/server/technicaldebt/TechnicalDebtManagerTest/disable_requirements_on_removed_rules.xml b/sonar-server/src/test/resources/org/sonar/server/technicaldebt/TechnicalDebtManagerTest/disable_requirements_on_removed_rules.xml
deleted file mode 100644
index 344e9e2e0c5..00000000000
--- a/sonar-server/src/test/resources/org/sonar/server/technicaldebt/TechnicalDebtManagerTest/disable_requirements_on_removed_rules.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<dataset>
-  <quality_models id="1" name="TECHNICAL_DEBT"/>
-
-  <characteristics id="1" kee="COMPILER_RELATED_PORTABILITY" name="Compiler related portability" quality_model_id="1" rule_id="[null]" characteristic_order="1" depth="2"
-                   description="[null]" enabled="true"/>
-
-  <!-- Requirement provided by plugin -->
-  <characteristics id="2" kee="[null]" name="[null]" quality_model_id="1" rule_id="1" characteristic_order="6" depth="3"
-                   description="[null]" enabled="true"/>
-
-  <characteristics id="3" kee="PORTABILITY" name="Portability" quality_model_id="1" rule_id="[null]" characteristic_order="2" depth="1" description="[null]" enabled="true"/>
-  <characteristics id="4" kee="HARDWARE_RELATED_PORTABILITY" name="Hardware related portability" quality_model_id="1" rule_id="[null]" characteristic_order="3" depth="2"
-                   description="[null]" enabled="true"/>
-
-  <!-- Requirement provided by plugin on removed rule -->
-  <characteristics id="5" kee="[null]" name="[null]" quality_model_id="1" rule_id="2" characteristic_order="7" depth="3"
-                   description="[null]" enabled="true"/>
-
-  <characteristics id="6" kee="READABILITY" name="Readability" quality_model_id="1" rule_id="[null]" characteristic_order="4" depth="2" description="[null]" enabled="true"/>
-  <characteristics id="7" kee="MAINTAINABILITY" name="Maintainability" quality_model_id="1" rule_id="[null]" characteristic_order="5" depth="1" description="[null]"
-                   enabled="true"/>
-
-  <characteristic_edges child_id="1" parent_id="3"/>
-  <characteristic_edges child_id="2" parent_id="1"/>
-  <characteristic_edges child_id="4" parent_id="3"/>
-  <characteristic_edges child_id="5" parent_id="4"/>
-  <characteristic_edges child_id="6" parent_id="7"/>
-
-  <characteristic_properties id="1" characteristic_id="2" kee="remediationFactor" value="30.0" text_value="mn"/>
-  <characteristic_properties id="2" characteristic_id="2" kee="remediationFunction" value="[null]" text_value="linear"/>
-  <characteristic_properties id="3" characteristic_id="5" kee="remediationFactor" value="1.0" text_value="h"/>
-  <characteristic_properties id="4" characteristic_id="5" kee="remediationFunction" value="[null]" text_value="linear"/>
-
-  <rules id="1" plugin_rule_key="import" plugin_config_key="regexp" plugin_name="checkstyle" description="[null]" priority="3" status="READY" cardinality="SINGLE" parent_id="[null]" name="Regular exp"/>
-  <!-- Removed rule -->
-  <rules id="2" plugin_rule_key="export" plugin_config_key="regexp" plugin_name="checkstyle" description="[null]" priority="3" status="REMOVED" cardinality="SINGLE" parent_id="[null]" name="Regular exp"/>
-
-</dataset>
diff --git a/sonar-server/src/test/resources/org/sonar/server/technicaldebt/TechnicalDebtManagerTest/empty.xml b/sonar-server/src/test/resources/org/sonar/server/technicaldebt/TechnicalDebtManagerTest/empty.xml
deleted file mode 100644
index fb0854fccbe..00000000000
--- a/sonar-server/src/test/resources/org/sonar/server/technicaldebt/TechnicalDebtManagerTest/empty.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<dataset>
-</dataset>
diff --git a/sonar-server/src/test/resources/org/sonar/server/technicaldebt/TechnicalDebtManagerTest/fail_when_plugin_defines_characteristics_not_defined_in_default_model-result.xml b/sonar-server/src/test/resources/org/sonar/server/technicaldebt/TechnicalDebtManagerTest/fail_when_plugin_defines_characteristics_not_defined_in_default_model-result.xml
deleted file mode 100644
index ab6a26428fc..00000000000
--- a/sonar-server/src/test/resources/org/sonar/server/technicaldebt/TechnicalDebtManagerTest/fail_when_plugin_defines_characteristics_not_defined_in_default_model-result.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<dataset>
-  <quality_models id="1" name="TECHNICAL_DEBT"/>
-
-  <characteristics id="1" kee="COMPILER_RELATED_PORTABILITY" name="Compiler related portability" quality_model_id="1" rule_id="[null]" characteristic_order="1" depth="2"
-                   description="[null]" enabled="true"/>
-
-  <!-- Exiting requirement -->
-  <characteristics id="2" kee="[null]" name="[null]" quality_model_id="1" rule_id="1" characteristic_order="6" depth="3"
-                   description="[null]" enabled="true"/>
-
-  <characteristics id="3" kee="PORTABILITY" name="Portability" quality_model_id="1" rule_id="[null]" characteristic_order="2" depth="1" description="[null]" enabled="true"/>
-  <characteristics id="4" kee="HARDWARE_RELATED_PORTABILITY" name="Hardware related portability" quality_model_id="1" rule_id="[null]" characteristic_order="3" depth="2"
-                   description="[null]" enabled="true"/>
-
-  <characteristics id="5" kee="READABILITY" name="Readability" quality_model_id="1" rule_id="[null]" characteristic_order="4" depth="2" description="[null]" enabled="true"/>
-  <characteristics id="6" kee="MAINTAINABILITY" name="Maintainability" quality_model_id="1" rule_id="[null]" characteristic_order="5" depth="1" description="[null]"
-                   enabled="true"/>
-
-  <characteristic_edges child_id="1" parent_id="3"/>
-  <characteristic_edges child_id="2" parent_id="1"/>
-  <characteristic_edges child_id="4" parent_id="3"/>
-  <characteristic_edges child_id="5" parent_id="6"/>
-
-  <characteristic_properties id="1" characteristic_id="2" kee="remediationFactor" value="30.0" text_value="mn"/>
-  <characteristic_properties id="2" characteristic_id="2" kee="remediationFunction" value="[null]" text_value="linear"/>
-
-  <rules id="1" plugin_rule_key="import" plugin_config_key="regexp" plugin_name="checkstyle" description="[null]" priority="3" status="READY" cardinality="SINGLE" parent_id="[null]" name="Regular exp"/>
-  <rules id="2" plugin_rule_key="export" plugin_config_key="regexp" plugin_name="checkstyle" description="[null]" priority="3" status="READY" cardinality="SINGLE" parent_id="[null]" name="Regular exp"/>
-
-</dataset>
diff --git a/sonar-server/src/test/resources/org/sonar/server/technicaldebt/TechnicalDebtManagerTest/fail_when_plugin_defines_characteristics_not_defined_in_default_model.xml b/sonar-server/src/test/resources/org/sonar/server/technicaldebt/TechnicalDebtManagerTest/fail_when_plugin_defines_characteristics_not_defined_in_default_model.xml
deleted file mode 100644
index ab6a26428fc..00000000000
--- a/sonar-server/src/test/resources/org/sonar/server/technicaldebt/TechnicalDebtManagerTest/fail_when_plugin_defines_characteristics_not_defined_in_default_model.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<dataset>
-  <quality_models id="1" name="TECHNICAL_DEBT"/>
-
-  <characteristics id="1" kee="COMPILER_RELATED_PORTABILITY" name="Compiler related portability" quality_model_id="1" rule_id="[null]" characteristic_order="1" depth="2"
-                   description="[null]" enabled="true"/>
-
-  <!-- Exiting requirement -->
-  <characteristics id="2" kee="[null]" name="[null]" quality_model_id="1" rule_id="1" characteristic_order="6" depth="3"
-                   description="[null]" enabled="true"/>
-
-  <characteristics id="3" kee="PORTABILITY" name="Portability" quality_model_id="1" rule_id="[null]" characteristic_order="2" depth="1" description="[null]" enabled="true"/>
-  <characteristics id="4" kee="HARDWARE_RELATED_PORTABILITY" name="Hardware related portability" quality_model_id="1" rule_id="[null]" characteristic_order="3" depth="2"
-                   description="[null]" enabled="true"/>
-
-  <characteristics id="5" kee="READABILITY" name="Readability" quality_model_id="1" rule_id="[null]" characteristic_order="4" depth="2" description="[null]" enabled="true"/>
-  <characteristics id="6" kee="MAINTAINABILITY" name="Maintainability" quality_model_id="1" rule_id="[null]" characteristic_order="5" depth="1" description="[null]"
-                   enabled="true"/>
-
-  <characteristic_edges child_id="1" parent_id="3"/>
-  <characteristic_edges child_id="2" parent_id="1"/>
-  <characteristic_edges child_id="4" parent_id="3"/>
-  <characteristic_edges child_id="5" parent_id="6"/>
-
-  <characteristic_properties id="1" characteristic_id="2" kee="remediationFactor" value="30.0" text_value="mn"/>
-  <characteristic_properties id="2" characteristic_id="2" kee="remediationFunction" value="[null]" text_value="linear"/>
-
-  <rules id="1" plugin_rule_key="import" plugin_config_key="regexp" plugin_name="checkstyle" description="[null]" priority="3" status="READY" cardinality="SINGLE" parent_id="[null]" name="Regular exp"/>
-  <rules id="2" plugin_rule_key="export" plugin_config_key="regexp" plugin_name="checkstyle" description="[null]" priority="3" status="READY" cardinality="SINGLE" parent_id="[null]" name="Regular exp"/>
-
-</dataset>
diff --git a/sonar-server/src/test/resources/org/sonar/server/technicaldebt/TechnicalDebtManagerTest/fake-default-model.xml b/sonar-server/src/test/resources/org/sonar/server/technicaldebt/TechnicalDebtManagerTest/fake-default-model.xml
deleted file mode 100644
index 839e019d906..00000000000
--- a/sonar-server/src/test/resources/org/sonar/server/technicaldebt/TechnicalDebtManagerTest/fake-default-model.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<sqale>
-  <chc>
-    <key>PORTABILITY</key>
-    <name>Portability</name>
-    <chc>
-      <key>COMPILER_RELATED_PORTABILITY</key>
-      <name>Compiler related portability</name>
-    </chc>
-    <chc>
-      <key>HARDWARE_RELATED_PORTABILITY</key>
-      <name>Hardware related portability</name>
-    </chc>
-  </chc>
-  <chc>
-    <chc>
-      <key>MAINTAINABILITY</key>
-      <name>Maintainability</name>
-      <chc>
-        <key>READABILITY</key>
-        <name>Readability</name>
-      </chc>
-    </chc>
-  </chc>
-</sqale>
diff --git a/sonar-server/src/test/resources/org/sonar/server/technicaldebt/TechnicalDebtManagerTest/fake-java-model-adding-unknown-characteristic.xml b/sonar-server/src/test/resources/org/sonar/server/technicaldebt/TechnicalDebtManagerTest/fake-java-model-adding-unknown-characteristic.xml
deleted file mode 100644
index 19a8642bb35..00000000000
--- a/sonar-server/src/test/resources/org/sonar/server/technicaldebt/TechnicalDebtManagerTest/fake-java-model-adding-unknown-characteristic.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<sqale>
-  <chc>
-    <key>PORTABILITY</key>
-    <name>Portability</name>
-    <chc>
-      <key>COMPILER_RELATED_PORTABILITY</key>
-      <name>Compiler related portability</name>
-      <chc>
-        <rule-repo>checkstyle</rule-repo>
-        <rule-key>import</rule-key>
-        <prop>
-          <key>remediationFactor</key>
-          <val>30.0</val>
-          <txt>mn</txt>
-        </prop>
-        <prop>
-          <key>remediationFunction</key>
-          <txt>linear</txt>
-        </prop>
-      </chc>
-    </chc>
-    <chc>
-      <key>HARDWARE_RELATED_PORTABILITY</key>
-      <name>Hardware related portability</name>
-      <chc>
-        <rule-repo>checkstyle</rule-repo>
-        <rule-key>export</rule-key>
-        <prop>
-          <key>remediationFactor</key>
-          <val>1.0</val>
-          <txt>h</txt>
-        </prop>
-        <prop>
-          <key>remediationFunction</key>
-          <txt>linear</txt>
-        </prop>
-      </chc>
-    </chc>
-  </chc>
-  <chc>
-    <key>MAINTAINABILITY</key>
-    <name>Maintainability</name>
-    <chc>
-      <key>READABILITY</key>
-      <!-- Rename default characteristic -->
-      <name>Readability related maintainability</name>
-      <chc>
-        <rule-repo>checkstyle</rule-repo>
-        <rule-key>ConstantNameCheck</rule-key>
-        <prop>
-          <key>remediationFactor</key>
-          <val>10.0</val>
-          <txt>mn</txt>
-        </prop>
-        <prop>
-          <key>remediationFunction</key>
-          <txt>linear</txt>
-        </prop>
-      </chc>
-    </chc>
-    <chc>
-      <!-- New characteristic -->
-      <key>UNDERSTANDABILITY</key>
-      <name>Understandability related maintainability</name>
-      <chc>
-        <rule-repo>checkstyle</rule-repo>
-        <rule-key>JavadocMethodCheck</rule-key>
-        <prop>
-          <key>remediationFactor</key>
-          <val>30.0</val>
-          <txt>mn</txt>
-        </prop>
-        <prop>
-          <key>remediationFunction</key>
-          <txt>linear</txt>
-        </prop>
-      </chc>
-    </chc>
-  </chc>
-</sqale>
diff --git a/sonar-server/src/test/resources/org/sonar/server/technicaldebt/TechnicalDebtManagerTest/fake-java-model.xml b/sonar-server/src/test/resources/org/sonar/server/technicaldebt/TechnicalDebtManagerTest/fake-java-model.xml
deleted file mode 100644
index 46e4a228391..00000000000
--- a/sonar-server/src/test/resources/org/sonar/server/technicaldebt/TechnicalDebtManagerTest/fake-java-model.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<sqale>
-  <chc>
-    <key>PORTABILITY</key>
-    <name>Portability</name>
-    <chc>
-      <key>COMPILER_RELATED_PORTABILITY</key>
-      <name>Compiler related portability</name>
-      <chc>
-        <rule-repo>checkstyle</rule-repo>
-        <rule-key>import</rule-key>
-        <prop>
-          <key>remediationFactor</key>
-          <val>30.0</val>
-          <txt>mn</txt>
-        </prop>
-        <prop>
-          <key>remediationFunction</key>
-          <txt>linear</txt>
-        </prop>
-      </chc>
-    </chc>
-    <chc>
-      <key>HARDWARE_RELATED_PORTABILITY</key>
-      <name>Hardware related portability</name>
-      <chc>
-        <rule-repo>checkstyle</rule-repo>
-        <rule-key>export</rule-key>
-        <prop>
-          <key>remediationFactor</key>
-          <val>1.0</val>
-          <txt>h</txt>
-        </prop>
-        <prop>
-          <key>remediationFunction</key>
-          <txt>linear</txt>
-        </prop>
-      </chc>
-    </chc>
-  </chc>
-  <chc>
-    <key>MAINTAINABILITY</key>
-    <name>Maintainability</name>
-    <chc>
-      <key>READABILITY</key>
-      <!-- Rename default characteristic -->
-      <name>Readability related maintainability</name>
-      <chc>
-        <rule-repo>checkstyle</rule-repo>
-        <rule-key>ConstantNameCheck</rule-key>
-        <prop>
-          <key>remediationFactor</key>
-          <val>10.0</val>
-          <txt>mn</txt>
-        </prop>
-        <prop>
-          <key>remediationFunction</key>
-          <txt>linear</txt>
-        </prop>
-      </chc>
-    </chc>
-  </chc>
-</sqale>
diff --git a/sonar-server/src/test/resources/org/sonar/server/technicaldebt/TechnicalDebtManagerTest/recreate_previously_deleted_characteristic_from_default_model_when_plugin_define_requirements_on_it-result.xml b/sonar-server/src/test/resources/org/sonar/server/technicaldebt/TechnicalDebtManagerTest/recreate_previously_deleted_characteristic_from_default_model_when_plugin_define_requirements_on_it-result.xml
deleted file mode 100644
index 702f49e5275..00000000000
--- a/sonar-server/src/test/resources/org/sonar/server/technicaldebt/TechnicalDebtManagerTest/recreate_previously_deleted_characteristic_from_default_model_when_plugin_define_requirements_on_it-result.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<dataset>
-  <quality_models id="1" name="TECHNICAL_DEBT"/>
-
-  <characteristics id="1" kee="COMPILER_RELATED_PORTABILITY" name="Compiler related portability" quality_model_id="1" rule_id="[null]" characteristic_order="1" depth="2"
-                   description="[null]" enabled="true"/>
-
-  <!-- Exiting requirement -->
-  <characteristics id="2" kee="[null]" name="[null]" quality_model_id="1" rule_id="1" characteristic_order="6" depth="3"
-                   description="[null]" enabled="true"/>
-
-  <characteristics id="3" kee="PORTABILITY" name="Portability" quality_model_id="1" rule_id="[null]" characteristic_order="2" depth="1" description="[null]" enabled="true"/>
-  <!-- Removed characteristic -->
-  <characteristics id="4" kee="HARDWARE_RELATED_PORTABILITY" name="Hardware related portability" quality_model_id="1" rule_id="[null]" characteristic_order="3" depth="2"
-                   description="[null]" enabled="false"/>
-
-  <characteristics id="5" kee="READABILITY" name="Readability" quality_model_id="1" rule_id="[null]" characteristic_order="4" depth="2" description="[null]" enabled="true"/>
-  <characteristics id="6" kee="MAINTAINABILITY" name="Maintainability" quality_model_id="1" rule_id="[null]" characteristic_order="5" depth="1" description="[null]"
-                   enabled="true"/>
-
-  <!-- Characteristic recreated -->
-  <characteristics id="7" kee="HARDWARE_RELATED_PORTABILITY" name="Hardware related portability" quality_model_id="1" rule_id="[null]" characteristic_order="7" depth="2"
-                   description="[null]" enabled="true"/>
-
-  <!-- New requirement -->
-  <characteristics id="8" kee="[null]" name="[null]" quality_model_id="1" rule_id="2" characteristic_order="8" depth="3"
-                   description="[null]" enabled="true"/>
-
-  <characteristic_edges child_id="1" parent_id="3"/>
-  <characteristic_edges child_id="2" parent_id="1"/>
-  <characteristic_edges child_id="4" parent_id="3"/>
-  <characteristic_edges child_id="5" parent_id="6"/>
-  <!-- On recreated characteristic -->
-  <characteristic_edges child_id="7" parent_id="3"/>
-  <!-- On new requirement -->
-  <characteristic_edges child_id="8" parent_id="7"/>
-
-  <characteristic_properties id="1" characteristic_id="2" kee="remediationFactor" value="30.0" text_value="mn"/>
-  <characteristic_properties id="2" characteristic_id="2" kee="remediationFunction" value="[null]" text_value="linear"/>
-  <!-- On new requirement -->
-  <characteristic_properties id="3" characteristic_id="8" kee="remediationFactor" value="1.0" text_value="h"/>
-  <characteristic_properties id="4" characteristic_id="8" kee="remediationFunction" value="[null]" text_value="linear"/>
-
-  <rules id="1" plugin_rule_key="import" plugin_config_key="regexp" plugin_name="checkstyle" description="[null]" priority="3" status="READY" cardinality="SINGLE" parent_id="[null]" name="Regular exp"/>
-  <rules id="2" plugin_rule_key="export" plugin_config_key="regexp" plugin_name="checkstyle" description="[null]" priority="3" status="READY" cardinality="SINGLE" parent_id="[null]" name="Regular exp"/>
-
-</dataset>
diff --git a/sonar-server/src/test/resources/org/sonar/server/technicaldebt/TechnicalDebtManagerTest/recreate_previously_deleted_characteristic_from_default_model_when_plugin_define_requirements_on_it.xml b/sonar-server/src/test/resources/org/sonar/server/technicaldebt/TechnicalDebtManagerTest/recreate_previously_deleted_characteristic_from_default_model_when_plugin_define_requirements_on_it.xml
deleted file mode 100644
index f78df06bd77..00000000000
--- a/sonar-server/src/test/resources/org/sonar/server/technicaldebt/TechnicalDebtManagerTest/recreate_previously_deleted_characteristic_from_default_model_when_plugin_define_requirements_on_it.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<dataset>
-  <quality_models id="1" name="TECHNICAL_DEBT"/>
-
-  <characteristics id="1" kee="COMPILER_RELATED_PORTABILITY" name="Compiler related portability" quality_model_id="1" rule_id="[null]" characteristic_order="1" depth="2"
-                   description="[null]" enabled="true"/>
-
-  <!-- Exiting requirement -->
-  <characteristics id="2" kee="[null]" name="[null]" quality_model_id="1" rule_id="1" characteristic_order="6" depth="3"
-                   description="[null]" enabled="true"/>
-
-  <characteristics id="3" kee="PORTABILITY" name="Portability" quality_model_id="1" rule_id="[null]" characteristic_order="2" depth="1" description="[null]" enabled="true"/>
-  <!-- Removed characteristic -->
-  <characteristics id="4" kee="HARDWARE_RELATED_PORTABILITY" name="Hardware related portability" quality_model_id="1" rule_id="[null]" characteristic_order="3" depth="2"
-                   description="[null]" enabled="false"/>
-
-  <characteristics id="5" kee="READABILITY" name="Readability" quality_model_id="1" rule_id="[null]" characteristic_order="4" depth="2" description="[null]" enabled="true"/>
-  <characteristics id="6" kee="MAINTAINABILITY" name="Maintainability" quality_model_id="1" rule_id="[null]" characteristic_order="5" depth="1" description="[null]"
-                   enabled="true"/>
-
-  <characteristic_edges child_id="1" parent_id="3"/>
-  <characteristic_edges child_id="2" parent_id="1"/>
-  <characteristic_edges child_id="4" parent_id="3"/>
-  <characteristic_edges child_id="5" parent_id="6"/>
-
-  <characteristic_properties id="1" characteristic_id="2" kee="remediationFactor" value="30.0" text_value="mn"/>
-  <characteristic_properties id="2" characteristic_id="2" kee="remediationFunction" value="[null]" text_value="linear"/>
-
-  <rules id="1" plugin_rule_key="import" plugin_config_key="regexp" plugin_name="checkstyle" description="[null]" priority="3" status="READY" cardinality="SINGLE" parent_id="[null]" name="Regular exp"/>
-  <rules id="2" plugin_rule_key="export" plugin_config_key="regexp" plugin_name="checkstyle" description="[null]" priority="3" status="READY" cardinality="SINGLE" parent_id="[null]" name="Regular exp"/>
-
-</dataset>
diff --git a/sonar-server/src/test/resources/org/sonar/server/technicaldebt/TechnicalDebtManagerTest/reset_model.xml b/sonar-server/src/test/resources/org/sonar/server/technicaldebt/TechnicalDebtManagerTest/reset_model.xml
deleted file mode 100644
index ff53f92ff0a..00000000000
--- a/sonar-server/src/test/resources/org/sonar/server/technicaldebt/TechnicalDebtManagerTest/reset_model.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<dataset>
-
-  <quality_models id="1" name="TECHNICAL_DEBT" />
-
-  <characteristics id="1" kee="testability" name="Testability" quality_model_id="1" rule_id="[null]" characteristic_order="1" depth="1" description="[null]" enabled="true" />
-  <characteristics id="2" kee="unit_testability" name="Unit tests" quality_model_id="1" rule_id="[null]" characteristic_order="2" depth="2" description="[null]" enabled="true" />
-  <characteristic_edges child_id="2" parent_id="1"/>
-
-  <rules id="1" plugin_rule_key="import" plugin_config_key="import" plugin_name="checkstyle" description="[null]" priority="3" status="READY" cardinality="SINGLE" parent_id="[null]" name="Regular exp"/>
-  <rules id="2" plugin_rule_key="export" plugin_config_key="export" plugin_name="checkstyle" description="[null]" priority="3" status="READY" cardinality="SINGLE" parent_id="[null]" name="Regular exp"/>
-  <rules id="3" plugin_rule_key="ConstantNameCheck" plugin_config_key="ConstantNameCheck" plugin_name="checkstyle" description="[null]" priority="3" status="READY" cardinality="SINGLE" parent_id="[null]" name="Regular exp"/>
-  <rules id="4" plugin_rule_key="JavadocMethodCheck" plugin_config_key="JavadocMethodCheck" plugin_name="checkstyle" description="[null]" priority="3" status="READY" cardinality="SINGLE" parent_id="[null]" name="Regular exp"/>
-</dataset>