From 3ecc736b43a6d0e85fd4b4089c3dcad53f8640ec Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Lievremont <jean-baptiste.lievremont@sonarsource.com>
Date: Tue, 15 Jul 2014 11:49:56 +0200
Subject: SONAR-5001 Link description_format column to relational backend

---
 .../java/org/sonar/server/rule/db/RuleDaoTest.java     |  7 +++++++
 .../sonar/server/rule/db/RuleDaoTest/insert-result.xml |  2 +-
 .../server/rule/db/RuleDaoTest/insert_all-result.xml   |  4 ++--
 .../org/sonar/server/rule/db/RuleDaoTest/selectAll.xml |  2 +-
 .../sonar/server/rule/db/RuleDaoTest/selectById.xml    |  4 ++--
 .../server/rule/db/RuleDaoTest/selectNonManual.xml     |  4 ++--
 .../server/rule/db/RuleDaoTest/select_by_name.xml      |  4 ++--
 .../server/rule/db/RuleDaoTest/select_by_rule_key.xml  |  4 ++--
 .../db/RuleDaoTest/select_enables_and_non_manual.xml   |  6 +++---
 .../sonar/server/rule/db/RuleDaoTest/update-result.xml |  6 +++---
 .../org/sonar/server/rule/db/RuleDaoTest/update.xml    |  6 +++---
 ..._issue_with_coeff_to_constant_issue_with_offset.xml |  6 +++---
 ...with_coeff_to_constant_issue_with_offset_result.xml |  6 +++---
 ...copy_requirements_from_characteristics_to_rules.xml | 18 +++++++++---------
 ...quirements_from_characteristics_to_rules_result.xml | 18 +++++++++---------
 .../do_nothing_when_already_executed.xml               | 18 +++++++++---------
 .../do_nothing_when_already_executed_result.xml        | 18 +++++++++---------
 17 files changed, 70 insertions(+), 63 deletions(-)

(limited to 'server/sonar-server')

diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/db/RuleDaoTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/db/RuleDaoTest.java
index 491af760ce9..8412ee5b049 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/rule/db/RuleDaoTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/rule/db/RuleDaoTest.java
@@ -69,6 +69,7 @@ public class RuleDaoTest extends AbstractDaoTestCase {
     assertThat(ruleDto.getId()).isEqualTo(1);
     assertThat(ruleDto.getName()).isEqualTo("Avoid Null");
     assertThat(ruleDto.getDescription()).isEqualTo("Should avoid NULL");
+    assertThat(ruleDto.getDescriptionFormat()).isEqualTo("HTML");
     assertThat(ruleDto.getStatus()).isEqualTo(RuleStatus.READY);
     assertThat(ruleDto.getRepositoryKey()).isEqualTo("checkstyle");
     assertThat(ruleDto.getNoteData()).isEqualTo("Rule note with accents \u00e9\u00e8\u00e0");
@@ -93,6 +94,7 @@ public class RuleDaoTest extends AbstractDaoTestCase {
     assertThat(ruleDto.getId()).isEqualTo(1);
     assertThat(ruleDto.getName()).isEqualTo("Avoid Null");
     assertThat(ruleDto.getDescription()).isEqualTo("Should avoid NULL");
+    assertThat(ruleDto.getDescriptionFormat()).isEqualTo("HTML");
     assertThat(ruleDto.getStatus()).isEqualTo(RuleStatus.READY);
     assertThat(ruleDto.getRepositoryKey()).isEqualTo("checkstyle");
     assertThat(ruleDto.getNoteData()).isEqualTo("Rule note with accents \u00e9\u00e8\u00e0");
@@ -115,6 +117,7 @@ public class RuleDaoTest extends AbstractDaoTestCase {
     assertThat(ruleDto.getId()).isEqualTo(2);
     assertThat(ruleDto.getName()).isEqualTo("Avoid Null");
     assertThat(ruleDto.getDescription()).isEqualTo("Should avoid NULL");
+    assertThat(ruleDto.getDescriptionFormat()).isEqualTo("HTML");
     assertThat(ruleDto.getStatus()).isEqualTo(RuleStatus.READY);
     assertThat(ruleDto.getRepositoryKey()).isEqualTo("checkstyle");
   }
@@ -170,6 +173,7 @@ public class RuleDaoTest extends AbstractDaoTestCase {
       .setRepositoryKey("plugin")
       .setName("new name")
       .setDescription("new description")
+      .setDescriptionFormat("MARKDOWN")
       .setStatus(RuleStatus.DEPRECATED)
       .setConfigKey("NewConfigKey")
       .setSeverity(Severity.INFO)
@@ -210,6 +214,7 @@ public class RuleDaoTest extends AbstractDaoTestCase {
       .setRepositoryKey("plugin")
       .setName("new name")
       .setDescription("new description")
+      .setDescriptionFormat("MARKDOWN")
       .setStatus(RuleStatus.DEPRECATED)
       .setConfigKey("NewConfigKey")
       .setSeverity(Severity.INFO)
@@ -244,6 +249,7 @@ public class RuleDaoTest extends AbstractDaoTestCase {
       .setRepositoryKey("plugin")
       .setName("new name")
       .setDescription("new description")
+      .setDescriptionFormat("HTML")
       .setStatus(RuleStatus.DEPRECATED)
       .setConfigKey("NewConfigKey")
       .setSeverity(Severity.INFO)
@@ -266,6 +272,7 @@ public class RuleDaoTest extends AbstractDaoTestCase {
       .setRepositoryKey("plugin2")
       .setName("new name2")
       .setDescription("new description2")
+      .setDescriptionFormat("MARKDOWN")
       .setStatus(RuleStatus.BETA)
       .setConfigKey("NewConfigKey2")
       .setSeverity(Severity.MAJOR)
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/insert-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/insert-result.xml
index 766dcf93a1b..144ea0906f9 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/insert-result.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/insert-result.xml
@@ -27,7 +27,7 @@
          remediation_function="LINEAR" default_remediation_function="LINEAR_OFFSET"
          remediation_coeff="1h" default_remediation_coeff="5d"
          remediation_offset="5min" default_remediation_offset="10h"
-         effort_to_fix_description="squid.S115.effortToFix"
+         effort_to_fix_description="squid.S115.effortToFix" description_format="MARKDOWN"
       />
 
 </dataset>
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/insert_all-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/insert_all-result.xml
index e687f135fbe..1aa7b053d0d 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/insert_all-result.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/insert_all-result.xml
@@ -27,7 +27,7 @@
          remediation_function="LINEAR" default_remediation_function="LINEAR_OFFSET"
          remediation_coeff="1h" default_remediation_coeff="5d"
          remediation_offset="5min" default_remediation_offset="10h"
-         effort_to_fix_description="squid.S115.effortToFix"
+         effort_to_fix_description="squid.S115.effortToFix" description_format="HTML"
       />
 
   <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="NewRuleKey2" plugin_name="plugin2" name="new name2" description="new description2" status="BETA"
@@ -37,7 +37,7 @@
          remediation_function="LINEAR_OFFSET" default_remediation_function="LINEAR"
          remediation_coeff="5d" default_remediation_coeff="1h"
          remediation_offset="10h" default_remediation_offset="5min"
-         effort_to_fix_description="squid.S115.effortToFix2"
+         effort_to_fix_description="squid.S115.effortToFix2" description_format="MARKDOWN"
       />
 
 </dataset>
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/selectAll.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/selectAll.xml
index 2dbc0f1c3cf..57fc4fecb51 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/selectAll.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/selectAll.xml
@@ -2,7 +2,7 @@
 <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"
-    note_data="Rule note with accents éèà" note_user_login="polop.palap" note_created_at="2013-12-25"
+    note_data="Rule note with accents éèà" note_user_login="polop.palap" note_created_at="2013-12-25" description_format="HTML"
     characteristic_id="100" default_characteristic_id="101"
     remediation_function="linear" default_remediation_function="linear_offset"
     remediation_coeff="1h" default_remediation_coeff="5d"
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/selectById.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/selectById.xml
index ee6c7b8a0b8..0f2d818a01d 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/selectById.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/selectById.xml
@@ -1,6 +1,6 @@
 <dataset>
 
-  <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="AvoidComparison" plugin_name="checkstyle" name="Avoid Comparison" description="Should avoid ==" status="READY"/>
-  <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY"/>
+  <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="AvoidComparison" plugin_name="checkstyle" name="Avoid Comparison" description="Should avoid ==" status="READY" description_format="HTML"/>
+  <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY" description_format="HTML"/>
 
 </dataset>
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/selectNonManual.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/selectNonManual.xml
index 53e9a2dfecc..c69e0d85864 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/selectNonManual.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/selectNonManual.xml
@@ -1,6 +1,6 @@
 <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"/>
-  <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="AvoidNull" plugin_name="manual" name="Manual Rule" description="Should not appear" status="READY"/>
+  <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY" description_format="HTML"/>
+  <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="AvoidNull" plugin_name="manual" name="Manual Rule" description="Should not appear" status="READY" description_format="HTML"/>
 
 </dataset>
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/select_by_name.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/select_by_name.xml
index ee6c7b8a0b8..0f2d818a01d 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/select_by_name.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/select_by_name.xml
@@ -1,6 +1,6 @@
 <dataset>
 
-  <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="AvoidComparison" plugin_name="checkstyle" name="Avoid Comparison" description="Should avoid ==" status="READY"/>
-  <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY"/>
+  <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="AvoidComparison" plugin_name="checkstyle" name="Avoid Comparison" description="Should avoid ==" status="READY" description_format="HTML"/>
+  <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY" description_format="HTML"/>
 
 </dataset>
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/select_by_rule_key.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/select_by_rule_key.xml
index ee6c7b8a0b8..0f2d818a01d 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/select_by_rule_key.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/select_by_rule_key.xml
@@ -1,6 +1,6 @@
 <dataset>
 
-  <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="AvoidComparison" plugin_name="checkstyle" name="Avoid Comparison" description="Should avoid ==" status="READY"/>
-  <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY"/>
+  <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="AvoidComparison" plugin_name="checkstyle" name="Avoid Comparison" description="Should avoid ==" status="READY" description_format="HTML"/>
+  <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY" description_format="HTML"/>
 
 </dataset>
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/select_enables_and_non_manual.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/select_enables_and_non_manual.xml
index 38d6cc5ce02..fe85e591078 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/select_enables_and_non_manual.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/select_enables_and_non_manual.xml
@@ -1,7 +1,7 @@
 <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"
-         note_data="Rule note with accents éèà" note_user_login="polop.palap" note_created_at="2013-12-25"
+         note_data="Rule note with accents éèà" note_user_login="polop.palap" note_created_at="2013-12-25" description_format="HTML"
          characteristic_id="100" default_characteristic_id="101"
          remediation_function="LINEAR" default_remediation_function="LINEAR_OFFSET"
          remediation_coeff="1h" default_remediation_coeff="5d"
@@ -9,7 +9,7 @@
          effort_to_fix_description="squid.S115.effortToFix"/>
 
   <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="AvoidNull" plugin_name="squid" name="Avoid Null" description="Should avoid NULL" status="REMOVED"
-         note_data="[null]" note_user_login="[null]" note_created_at="[null]"
+         note_data="[null]" note_user_login="[null]" note_created_at="[null]" description_format="HTML"
          characteristic_id="[null]" default_characteristic_id="[null]"
          remediation_function="[null]" default_remediation_function="[null]"
          remediation_coeff="[null]" default_remediation_coeff="[null]"
@@ -17,7 +17,7 @@
          effort_to_fix_description="[null]"/>
 
   <rules tags="[null]" system_tags="[null]" id="3" plugin_rule_key="AvoidNull" plugin_name="manual" name="Manual Rule" description="Should not appear" status="READY"
-         note_data="[null]" note_user_login="[null]" note_created_at="[null]"
+         note_data="[null]" note_user_login="[null]" note_created_at="[null]" description_format="HTML"
          characteristic_id="[null]" default_characteristic_id="[null]"
          remediation_function="[null]" default_remediation_function="[null]"
          remediation_coeff="[null]" default_remediation_coeff="[null]"
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/update-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/update-result.xml
index dafb78a0056..ef6433e56f0 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/update-result.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/update-result.xml
@@ -7,15 +7,15 @@
     remediation_function="LINEAR" default_remediation_function="LINEAR_OFFSET"
     remediation_coeff="1h" default_remediation_coeff="5d"
     remediation_offset="5min" default_remediation_offset="10h"
-    effort_to_fix_description="squid.S115.effortToFix"
+    effort_to_fix_description="squid.S115.effortToFix" description_format="MARKDOWN"
   />
 
   <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="Parent1" plugin_name="checkstyle" name="Parent Rule 1" description="Parent Rule 1" status="READY"
     plugin_config_key="Parent1" priority="2" is_template="[false]" language="golo" created_at="1981-10-24 15:20:00" updated_at="[null]" template_id="[null]"
-    note_created_at="[null]" note_data="[null]" note_updated_at="[null]" note_user_login="[null]"/>
+    note_created_at="[null]" note_data="[null]" note_updated_at="[null]" note_user_login="[null]" description_format="HTML"/>
 
   <rules tags="[null]" system_tags="[null]" id="3" plugin_rule_key="Parent2" plugin_name="checkstyle" name="Parent Rule 2" description="Parent Rule 2" status="READY"
     plugin_config_key="Parent2" priority="2" is_template="[false]" language="dart" created_at="1982-12-14 03:15:00" updated_at="[null]" template_id="[null]"
-    note_created_at="[null]" note_data="[null]" note_updated_at="[null]" note_user_login="[null]"/>
+    note_created_at="[null]" note_data="[null]" note_updated_at="[null]" note_user_login="[null]" description_format="HTML"/>
 
 </dataset>
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/update.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/update.xml
index d4979390cdf..e0e99d24549 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/update.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/update.xml
@@ -1,12 +1,12 @@
 <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"
-    plugin_config_key="AvoidNull" priority="2" is_template="[false]" language="golo" created_at="2011-04-25 01:05:00" template_id="2"/>
+    plugin_config_key="AvoidNull" priority="2" is_template="[false]" language="golo" created_at="2011-04-25 01:05:00" template_id="2" description_format="HTML"/>
 
   <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="Parent1" plugin_name="checkstyle" name="Parent Rule 1" description="Parent Rule 1" status="READY"
-    plugin_config_key="Parent1" priority="2" is_template="[false]" language="golo" created_at="1981-10-24 15:20:00" />
+    plugin_config_key="Parent1" priority="2" is_template="[false]" language="golo" created_at="1981-10-24 15:20:00" description_format="HTML"/>
 
   <rules tags="[null]" system_tags="[null]" id="3" plugin_rule_key="Parent2" plugin_name="checkstyle" name="Parent Rule 2" description="Parent Rule 2" status="READY"
-    plugin_config_key="Parent2" priority="2" is_template="[false]" language="dart" created_at="1982-12-14 03:15:00" />
+    plugin_config_key="Parent2" priority="2" is_template="[false]" language="dart" created_at="1982-12-14 03:15:00" description_format="HTML"/>
 
 </dataset>
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/convert_constant_issue_with_coeff_to_constant_issue_with_offset.xml b/server/sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/convert_constant_issue_with_coeff_to_constant_issue_with_offset.xml
index 0dd12e8beed..432fb122d56 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/convert_constant_issue_with_coeff_to_constant_issue_with_offset.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/convert_constant_issue_with_coeff_to_constant_issue_with_offset.xml
@@ -2,7 +2,7 @@
 
   <!-- Constant/issue with coefficient -> Update rule to Constant/issue with offset -->
   <rules id="1" plugin_rule_key="RightCurlyBraceStartLineCheck" plugin_name="squid" name="RightCurlyBraceStartLineCheck" description="Right curly braces should be located at the beginning of lines of code" status="READY"
-         characteristic_id="[null]" default_characteristic_id="10"
+         characteristic_id="[null]" default_characteristic_id="10" description_format="HTML"
          remediation_function="[null]" default_remediation_function="LINEAR"
          remediation_coeff="[null]" default_remediation_coeff="5d"
          remediation_offset="[null]" default_remediation_offset="[null]"
@@ -14,7 +14,7 @@
 
   <!-- Constant/issue with coefficient and offset -> Update rule to Constant/issue with only offset -->
   <rules id="2" plugin_rule_key="HiddenFieldCheck" plugin_name="squid" name="HiddenFieldCheck" description="HiddenFieldCheck" status="READY"
-         characteristic_id="[null]" default_characteristic_id="10"
+         characteristic_id="[null]" default_characteristic_id="10" description_format="HTML"
          remediation_function="[null]" default_remediation_function="LINEAR"
          remediation_coeff="[null]" default_remediation_coeff="5d"
          remediation_offset="[null]" default_remediation_offset="[null]"
@@ -26,7 +26,7 @@
 
   <!-- Constant/issue with coefficient but having same value as default -> No update -->
   <rules id="3" plugin_rule_key="ForLoopCounterChangedCheck" plugin_name="squid" name="ForLoopCounterChangedCheck" description="ForLoopCounterChangedCheck" status="READY"
-         characteristic_id="[null]" default_characteristic_id="10"
+         characteristic_id="[null]" default_characteristic_id="10" description_format="HTML"
          remediation_function="[null]" default_remediation_function="CONSTANT_ISSUE"
          remediation_coeff="[null]" default_remediation_coeff="[null]"
          remediation_offset="[null]" default_remediation_offset="5min"
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/convert_constant_issue_with_coeff_to_constant_issue_with_offset_result.xml b/server/sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/convert_constant_issue_with_coeff_to_constant_issue_with_offset_result.xml
index a1587e6c13c..28ae2d1a96d 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/convert_constant_issue_with_coeff_to_constant_issue_with_offset_result.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/convert_constant_issue_with_coeff_to_constant_issue_with_offset_result.xml
@@ -2,7 +2,7 @@
 
   <!-- Constant/issue with coefficient -> Update rule to Constant/issue with offset -->
   <rules id="1" plugin_rule_key="RightCurlyBraceStartLineCheck" plugin_name="squid" name="RightCurlyBraceStartLineCheck" description="Right curly braces should be located at the beginning of lines of code" status="READY"
-         characteristic_id="10" default_characteristic_id="10"
+         characteristic_id="10" default_characteristic_id="10" description_format="HTML"
          remediation_function="CONSTANT_ISSUE" default_remediation_function="LINEAR"
          remediation_coeff="[null]" default_remediation_coeff="5d"
          remediation_offset="20min" default_remediation_offset="[null]"
@@ -14,7 +14,7 @@
 
   <!-- Constant/issue with coefficient and offset -> Update rule to Constant/issue with only offset -->
   <rules id="2" plugin_rule_key="HiddenFieldCheck" plugin_name="squid" name="HiddenFieldCheck" description="HiddenFieldCheck" status="READY"
-         characteristic_id="10" default_characteristic_id="10"
+         characteristic_id="10" default_characteristic_id="10" description_format="HTML"
          remediation_function="CONSTANT_ISSUE" default_remediation_function="LINEAR"
          remediation_coeff="[null]" default_remediation_coeff="5d"
          remediation_offset="30min" default_remediation_offset="[null]"
@@ -26,7 +26,7 @@
 
   <!-- Constant/issue with coefficient but having same value as default -> No update -->
   <rules id="3" plugin_rule_key="ForLoopCounterChangedCheck" plugin_name="squid" name="ForLoopCounterChangedCheck" description="ForLoopCounterChangedCheck" status="READY"
-         characteristic_id="[null]" default_characteristic_id="10"
+         characteristic_id="[null]" default_characteristic_id="10" description_format="HTML"
          remediation_function="[null]" default_remediation_function="CONSTANT_ISSUE"
          remediation_coeff="[null]" default_remediation_coeff="[null]"
          remediation_offset="[null]" default_remediation_offset="5min"
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/copy_requirements_from_characteristics_to_rules.xml b/server/sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/copy_requirements_from_characteristics_to_rules.xml
index 9641153d3a5..c7bcef60407 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/copy_requirements_from_characteristics_to_rules.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/copy_requirements_from_characteristics_to_rules.xml
@@ -2,7 +2,7 @@
 
   <!-- Rule not linked to a requirement -> Nothing to do -->
   <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="UselessImportCheck" plugin_name="squid" name="UselessImportCheck" description="Useless imports should be removed" status="READY"
-         characteristic_id="[null]" default_characteristic_id="10"
+         characteristic_id="[null]" default_characteristic_id="10" description_format="HTML"
          remediation_function="[null]" default_remediation_function="LINEAR_OFFSET"
          remediation_coeff="[null]" default_remediation_coeff="5d"
          remediation_offset="[null]" default_remediation_offset="10h" updated_at="2014-02-19"
@@ -11,7 +11,7 @@
 
   <!-- Rule linked to a disabled requirement -> Update rule to disable characteristic -->
   <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="LeftCurlyBraceStartLineCheck" plugin_name="squid" name="LeftCurlyBraceStartLineCheck" description="Left curly braces should be located at the beginning of lines of code" status="READY"
-         characteristic_id="[null]" default_characteristic_id="10"
+         characteristic_id="[null]" default_characteristic_id="10" description_format="HTML"
          remediation_function="[null]" default_remediation_function="LINEAR_OFFSET"
          remediation_coeff="[null]" default_remediation_coeff="5d"
          remediation_offset="[null]" default_remediation_offset="10h" updated_at="2014-02-19"
@@ -19,7 +19,7 @@
 
   <!-- Removed rule linked to a disabled requirement -> Do nothing -->
   <rules tags="[null]" system_tags="[null]" id="3" plugin_rule_key="CallToFileDeleteOnExitMethod" plugin_name="squid" name="CallToFileDeleteOnExitMethod" description="CallToFileDeleteOnExitMethod" status="REMOVED"
-         characteristic_id="[null]" default_characteristic_id="10"
+         characteristic_id="[null]" default_characteristic_id="10" description_format="HTML"
          remediation_function="[null]" default_remediation_function="LINEAR_OFFSET"
          remediation_coeff="[null]" default_remediation_coeff="5d"
          remediation_offset="[null]" default_remediation_offset="10h" updated_at="2014-02-19"
@@ -27,7 +27,7 @@
 
   <!-- Rule linked to one enable requirement="[null]" with same value of debt -> Nothing to do -->
   <rules tags="[null]" system_tags="[null]" id="4" plugin_rule_key="ObjectFinalizeOverridenCallsSuperFinalizeCheck" plugin_name="squid" name="ObjectFinalizeOverridenCallsSuperFinalizeCheck" description="super.finalize() should be called at the end of Object.finalize() implementations" status="READY"
-         characteristic_id="[null]" default_characteristic_id="10"
+         characteristic_id="[null]" default_characteristic_id="10" description_format="HTML"
          remediation_function="[null]" default_remediation_function="LINEAR_OFFSET"
          remediation_coeff="[null]" default_remediation_coeff="5min"
          remediation_offset="[null]" default_remediation_offset="10h" updated_at="2014-02-19"
@@ -35,7 +35,7 @@
 
   <!-- Rule linked to one enable requirement="[null]" with different value of debt -> Update rule -->
   <rules tags="[null]" system_tags="[null]" id="5" plugin_rule_key="RightCurlyBraceStartLineCheck" plugin_name="squid" name="RightCurlyBraceStartLineCheck" description="Right curly braces should be located at the beginning of lines of code" status="READY"
-         characteristic_id="[null]" default_characteristic_id="20"
+         characteristic_id="[null]" default_characteristic_id="20" description_format="HTML"
          remediation_function="[null]" default_remediation_function="LINEAR"
          remediation_coeff="[null]" default_remediation_coeff="5d"
          remediation_offset="[null]" default_remediation_offset="[null]" updated_at="2014-02-19"
@@ -43,7 +43,7 @@
 
   <!-- Rule linked to one enable requirement on Constant per issue function (with a coefficient of 0d -> to be replaced by null)="[null]" with different value of debt -> Update rule -->
   <rules tags="[null]" system_tags="[null]" id="6" plugin_rule_key="HiddenFieldCheck" plugin_name="squid" name="HiddenFieldCheck" description="HiddenFieldCheck" status="READY"
-         characteristic_id="[null]" default_characteristic_id="20"
+         characteristic_id="[null]" default_characteristic_id="20" description_format="HTML"
          remediation_function="[null]" default_remediation_function="LINEAR"
          remediation_coeff="[null]" default_remediation_coeff="5d"
          remediation_offset="[null]" default_remediation_offset="[null]" updated_at="2014-02-19"
@@ -51,7 +51,7 @@
 
   <!-- Rule linked to one enable requirement on Linear function (with a coefficient of 0min -> to be replaced by null)="[null]" with different value of debt -> Update rule -->
   <rules tags="[null]" system_tags="[null]" id="7" plugin_rule_key="ForLoopCounterChangedCheck" plugin_name="squid" name="ForLoopCounterChangedCheck" description="ForLoopCounterChangedCheck" status="READY"
-         characteristic_id="[null]" default_characteristic_id="20"
+         characteristic_id="[null]" default_characteristic_id="20" description_format="HTML"
          remediation_function="[null]" default_remediation_function="LINEAR"
          remediation_coeff="[null]" default_remediation_coeff="5d"
          remediation_offset="[null]" default_remediation_offset="[null]" updated_at="2014-02-19"
@@ -59,7 +59,7 @@
 
   <!-- Rule linked to one enable requirement on Linear with offset function (with a offset of 0h -> should be replaced by 0d)="[null]" with different value of debt -> Update rule -->
   <rules tags="[null]" system_tags="[null]" id="8" plugin_rule_key="ClassVariableVisibilityCheck" plugin_name="squid" name="ClassVariableVisibilityCheck" description="ClassVariableVisibilityCheck" status="READY"
-         characteristic_id="[null]" default_characteristic_id="20"
+         characteristic_id="[null]" default_characteristic_id="20" description_format="HTML"
          remediation_function="[null]" default_remediation_function="LINEAR"
          remediation_coeff="[null]" default_remediation_coeff="5d"
          remediation_offset="[null]" default_remediation_offset="[null" updated_at="2014-02-19"
@@ -67,7 +67,7 @@
 
   <!-- Rule linked to one enable requirement on Linear function (with a coefficient of 0d -> should keep 0d)="[null]" with different value of debt -> Update rule -->
   <rules tags="[null]" system_tags="[null]" id="9" plugin_rule_key="SwitchLastCaseIsDefaultCheck" plugin_name="squid" name="SwitchLastCaseIsDefaultCheck" description="SwitchLastCaseIsDefaultCheck" status="READY"
-         characteristic_id="[null]" default_characteristic_id="20"
+         characteristic_id="[null]" default_characteristic_id="20" description_format="HTML"
          remediation_function="[null]" default_remediation_function="LINEAR"
          remediation_coeff="[null]" default_remediation_coeff="5d"
          remediation_offset="[null]" default_remediation_offset="[null]" updated_at="2014-02-19"
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/copy_requirements_from_characteristics_to_rules_result.xml b/server/sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/copy_requirements_from_characteristics_to_rules_result.xml
index c9b877c1d93..6609b875291 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/copy_requirements_from_characteristics_to_rules_result.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/copy_requirements_from_characteristics_to_rules_result.xml
@@ -2,7 +2,7 @@
 
   <!-- Rule not linked to a requirement -> Nothing to do -->
   <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="UselessImportCheck" plugin_name="squid" name="UselessImportCheck" description="Useless imports should be removed" status="READY"
-         characteristic_id="[null]" default_characteristic_id="10"
+         characteristic_id="[null]" default_characteristic_id="10" description_format="HTML"
          remediation_function="[null]" default_remediation_function="LINEAR_OFFSET"
          remediation_coeff="[null]" default_remediation_coeff="5d"
          remediation_offset="[null]" default_remediation_offset="10h" updated_at="2014-02-19"
@@ -11,7 +11,7 @@
 
   <!-- Rule linked to a disabled requirements -> Update rule to disable characteristic -->
   <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="LeftCurlyBraceStartLineCheck" plugin_name="squid" name="LeftCurlyBraceStartLineCheck" description="Left curly braces should be located at the beginning of lines of code" status="READY"
-         characteristic_id="-1" default_characteristic_id="10"
+         characteristic_id="-1" default_characteristic_id="10" description_format="HTML"
          remediation_function="[null]" default_remediation_function="LINEAR_OFFSET"
          remediation_coeff="[null]" default_remediation_coeff="5d"
          remediation_offset="[null]" default_remediation_offset="10h" updated_at="2014-03-13"
@@ -19,7 +19,7 @@
 
   <!-- Removed rule linked to a disabled requirement -> Do nothing -->
   <rules tags="[null]" system_tags="[null]" id="3" plugin_rule_key="CallToFileDeleteOnExitMethod" plugin_name="squid" name="CallToFileDeleteOnExitMethod" description="CallToFileDeleteOnExitMethod" status="REMOVED"
-         characteristic_id="[null]" default_characteristic_id="10"
+         characteristic_id="[null]" default_characteristic_id="10" description_format="HTML"
          remediation_function="[null]" default_remediation_function="LINEAR_OFFSET"
          remediation_coeff="[null]" default_remediation_coeff="5d"
          remediation_offset="[null]" default_remediation_offset="10h" updated_at="2014-02-19"
@@ -27,7 +27,7 @@
 
   <!-- Rule linked to one enable requirement, with same value of debt -> Nothing to do -->
   <rules tags="[null]" system_tags="[null]" id="4" plugin_rule_key="ObjectFinalizeOverridenCallsSuperFinalizeCheck" plugin_name="squid" name="ObjectFinalizeOverridenCallsSuperFinalizeCheck" description="super.finalize() should be called at the end of Object.finalize() implementations" status="READY"
-         characteristic_id="[null]" default_characteristic_id="10"
+         characteristic_id="[null]" default_characteristic_id="10" description_format="HTML"
          remediation_function="[null]" default_remediation_function="LINEAR_OFFSET"
          remediation_coeff="[null]" default_remediation_coeff="5min"
          remediation_offset="[null]" default_remediation_offset="10h" updated_at="2014-02-19"
@@ -35,7 +35,7 @@
 
   <!-- Rule linked to one enable requirement, with different value of debt -> Update rule -->
   <rules tags="[null]" system_tags="[null]" id="5" plugin_rule_key="RightCurlyBraceStartLineCheck" plugin_name="squid" name="RightCurlyBraceStartLineCheck" description="Right curly braces should be located at the beginning of lines of code" status="READY"
-         characteristic_id="10" default_characteristic_id="20"
+         characteristic_id="10" default_characteristic_id="20" description_format="HTML"
          remediation_function="LINEAR_OFFSET" default_remediation_function="LINEAR"
          remediation_coeff="20min" default_remediation_coeff="5d"
          remediation_offset="30h" default_remediation_offset="[null]" updated_at="2014-03-13"
@@ -43,7 +43,7 @@
 
   <!-- Rule linked to one enable requirement on Constant per issue function (with a coefficient of 0d -> to be replaced by null), with different value of debt -> Update rule -->
   <rules tags="[null]" system_tags="[null]" id="6" plugin_rule_key="HiddenFieldCheck" plugin_name="squid" name="HiddenFieldCheck" description="HiddenFieldCheck" status="READY"
-         characteristic_id="10" default_characteristic_id="20"
+         characteristic_id="10" default_characteristic_id="20" description_format="HTML"
          remediation_function="CONSTANT_ISSUE" default_remediation_function="LINEAR"
          remediation_coeff="[null]" default_remediation_coeff="5d"
          remediation_offset="15min" default_remediation_offset="[null]" updated_at="2014-03-13"
@@ -51,7 +51,7 @@
 
   <!-- Rule linked to one enable requirement on Linear function (with a coefficient of 0min -> to be replaced by null), with different value of debt -> Update rule -->
   <rules tags="[null]" system_tags="[null]" id="7" plugin_rule_key="ForLoopCounterChangedCheck" plugin_name="squid" name="ForLoopCounterChangedCheck" description="ForLoopCounterChangedCheck" status="READY"
-         characteristic_id="10" default_characteristic_id="20"
+         characteristic_id="10" default_characteristic_id="20" description_format="HTML"
          remediation_function="LINEAR" default_remediation_function="LINEAR"
          remediation_coeff="0min" default_remediation_coeff="5d"
          remediation_offset="[null]" default_remediation_offset="[null]" updated_at="2014-03-13"
@@ -59,7 +59,7 @@
 
   <!-- Rule linked to one enable requirement on Linear with offset function (with a offset of 0h -> should keep 0h), with different value of debt -> Update rule -->
   <rules tags="[null]" system_tags="[null]" id="8" plugin_rule_key="ClassVariableVisibilityCheck" plugin_name="squid" name="ClassVariableVisibilityCheck" description="ClassVariableVisibilityCheck" status="READY"
-         characteristic_id="10" default_characteristic_id="20"
+         characteristic_id="10" default_characteristic_id="20" description_format="HTML"
          remediation_function="LINEAR_OFFSET" default_remediation_function="LINEAR"
          remediation_coeff="5d" default_remediation_coeff="5d"
          remediation_offset="0h" default_remediation_offset="[null" updated_at="2014-03-13"
@@ -67,7 +67,7 @@
 
   <!-- Rule linked to one enable requirement on Linear function (with a coefficient of 0d -> should keep 0d), with different value of debt -> Update rule -->
   <rules tags="[null]" system_tags="[null]" id="9" plugin_rule_key="SwitchLastCaseIsDefaultCheck" plugin_name="squid" name="SwitchLastCaseIsDefaultCheck" description="SwitchLastCaseIsDefaultCheck" status="READY"
-         characteristic_id="10" default_characteristic_id="20"
+         characteristic_id="10" default_characteristic_id="20" description_format="HTML"
          remediation_function="LINEAR" default_remediation_function="LINEAR"
          remediation_coeff="0d" default_remediation_coeff="5d"
          remediation_offset="[null]" default_remediation_offset="[null]" updated_at="2014-03-13"
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/do_nothing_when_already_executed.xml b/server/sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/do_nothing_when_already_executed.xml
index da4a48c354c..88d70a256dc 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/do_nothing_when_already_executed.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/do_nothing_when_already_executed.xml
@@ -5,7 +5,7 @@
 
   <!-- Rule not linked to a requirement -> Nothing to do -->
   <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="UselessImportCheck" plugin_name="squid" name="UselessImportCheck" description="Useless imports should be removed" status="READY"
-         characteristic_id="[null]" default_characteristic_id="10"
+         characteristic_id="[null]" default_characteristic_id="10" description_format="HTML"
          remediation_function="[null]" default_remediation_function="LINEAR_OFFSET"
          remediation_coeff="[null]" default_remediation_coeff="5d"
          remediation_offset="[null]" default_remediation_offset="10h" updated_at="2014-02-19"
@@ -14,7 +14,7 @@
 
   <!-- Rule linked to a disabled requirement -> Update rule to disable characteristic -->
   <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="LeftCurlyBraceStartLineCheck" plugin_name="squid" name="LeftCurlyBraceStartLineCheck" description="Left curly braces should be located at the beginning of lines of code" status="READY"
-         characteristic_id="[null]" default_characteristic_id="10"
+         characteristic_id="[null]" default_characteristic_id="10" description_format="HTML"
          remediation_function="[null]" default_remediation_function="LINEAR_OFFSET"
          remediation_coeff="[null]" default_remediation_coeff="5d"
          remediation_offset="[null]" default_remediation_offset="10h" updated_at="2014-02-19"
@@ -22,7 +22,7 @@
 
   <!-- Removed rule linked to a disabled requirement -> Do nothing -->
   <rules tags="[null]" system_tags="[null]" id="3" plugin_rule_key="CallToFileDeleteOnExitMethod" plugin_name="squid" name="CallToFileDeleteOnExitMethod" description="CallToFileDeleteOnExitMethod" status="REMOVED"
-         characteristic_id="[null]" default_characteristic_id="10"
+         characteristic_id="[null]" default_characteristic_id="10" description_format="HTML"
          remediation_function="[null]" default_remediation_function="LINEAR_OFFSET"
          remediation_coeff="[null]" default_remediation_coeff="5d"
          remediation_offset="[null]" default_remediation_offset="10h" updated_at="2014-02-19"
@@ -30,7 +30,7 @@
 
   <!-- Rule linked to one enable requirement="[null]" with same value of debt -> Nothing to do -->
   <rules tags="[null]" system_tags="[null]" id="4" plugin_rule_key="ObjectFinalizeOverridenCallsSuperFinalizeCheck" plugin_name="squid" name="ObjectFinalizeOverridenCallsSuperFinalizeCheck" description="super.finalize() should be called at the end of Object.finalize() implementations" status="READY"
-         characteristic_id="[null]" default_characteristic_id="10"
+         characteristic_id="[null]" default_characteristic_id="10" description_format="HTML"
          remediation_function="[null]" default_remediation_function="LINEAR_OFFSET"
          remediation_coeff="[null]" default_remediation_coeff="5min"
          remediation_offset="[null]" default_remediation_offset="10h" updated_at="2014-02-19"
@@ -38,7 +38,7 @@
 
   <!-- Rule linked to one enable requirement="[null]" with different value of debt -> Update rule -->
   <rules tags="[null]" system_tags="[null]" id="5" plugin_rule_key="RightCurlyBraceStartLineCheck" plugin_name="squid" name="RightCurlyBraceStartLineCheck" description="Right curly braces should be located at the beginning of lines of code" status="READY"
-         characteristic_id="[null]" default_characteristic_id="20"
+         characteristic_id="[null]" default_characteristic_id="20" description_format="HTML"
          remediation_function="[null]" default_remediation_function="LINEAR"
          remediation_coeff="[null]" default_remediation_coeff="5d"
          remediation_offset="[null]" default_remediation_offset="[null]" updated_at="2014-02-19"
@@ -46,7 +46,7 @@
 
   <!-- Rule linked to one enable requirement on Constant per issue function (with a coefficient of 0d -> to be replaced by null)="[null]" with different value of debt -> Update rule -->
   <rules tags="[null]" system_tags="[null]" id="6" plugin_rule_key="HiddenFieldCheck" plugin_name="squid" name="HiddenFieldCheck" description="HiddenFieldCheck" status="READY"
-         characteristic_id="[null]" default_characteristic_id="20"
+         characteristic_id="[null]" default_characteristic_id="20" description_format="HTML"
          remediation_function="[null]" default_remediation_function="LINEAR"
          remediation_coeff="[null]" default_remediation_coeff="5d"
          remediation_offset="[null]" default_remediation_offset="[null]" updated_at="2014-02-19"
@@ -54,7 +54,7 @@
 
   <!-- Rule linked to one enable requirement on Linear function (with a coefficient of 0min -> to be replaced by null)="[null]" with different value of debt -> Update rule -->
   <rules tags="[null]" system_tags="[null]" id="7" plugin_rule_key="ForLoopCounterChangedCheck" plugin_name="squid" name="ForLoopCounterChangedCheck" description="ForLoopCounterChangedCheck" status="READY"
-         characteristic_id="[null]" default_characteristic_id="20"
+         characteristic_id="[null]" default_characteristic_id="20" description_format="HTML"
          remediation_function="[null]" default_remediation_function="LINEAR"
          remediation_coeff="[null]" default_remediation_coeff="5d"
          remediation_offset="[null]" default_remediation_offset="[null]" updated_at="2014-02-19"
@@ -62,7 +62,7 @@
 
   <!-- Rule linked to one enable requirement on Linear with offset function (with a offset of 0h -> should be replaced by 0d)="[null]" with different value of debt -> Update rule -->
   <rules tags="[null]" system_tags="[null]" id="8" plugin_rule_key="ClassVariableVisibilityCheck" plugin_name="squid" name="ClassVariableVisibilityCheck" description="ClassVariableVisibilityCheck" status="READY"
-         characteristic_id="[null]" default_characteristic_id="20"
+         characteristic_id="[null]" default_characteristic_id="20" description_format="HTML"
          remediation_function="[null]" default_remediation_function="LINEAR"
          remediation_coeff="[null]" default_remediation_coeff="5d"
          remediation_offset="[null]" default_remediation_offset="[null" updated_at="2014-02-19"
@@ -70,7 +70,7 @@
 
   <!-- Rule linked to one enable requirement on Linear function (with a coefficient of 0d -> should keep 0d)="[null]" with different value of debt -> Update rule -->
   <rules tags="[null]" system_tags="[null]" id="9" plugin_rule_key="SwitchLastCaseIsDefaultCheck" plugin_name="squid" name="SwitchLastCaseIsDefaultCheck" description="SwitchLastCaseIsDefaultCheck" status="READY"
-         characteristic_id="[null]" default_characteristic_id="20"
+         characteristic_id="[null]" default_characteristic_id="20" description_format="HTML"
          remediation_function="[null]" default_remediation_function="LINEAR"
          remediation_coeff="[null]" default_remediation_coeff="5d"
          remediation_offset="[null]" default_remediation_offset="[null]" updated_at="2014-02-19"
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/do_nothing_when_already_executed_result.xml b/server/sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/do_nothing_when_already_executed_result.xml
index dd9318dadd4..2a331302155 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/do_nothing_when_already_executed_result.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/do_nothing_when_already_executed_result.xml
@@ -2,7 +2,7 @@
 
   <!-- Rule not linked to a requirement -> Nothing to do -->
   <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="UselessImportCheck" plugin_name="squid" name="UselessImportCheck" description="Useless imports should be removed" status="READY"
-         characteristic_id="[null]" default_characteristic_id="10"
+         characteristic_id="[null]" default_characteristic_id="10" description_format="HTML"
          remediation_function="[null]" default_remediation_function="LINEAR_OFFSET"
          remediation_coeff="[null]" default_remediation_coeff="5d"
          remediation_offset="[null]" default_remediation_offset="10h" updated_at="2014-02-19"
@@ -11,7 +11,7 @@
 
   <!-- Rule linked to a disabled requirement -> Update rule to disable characteristic -->
   <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="LeftCurlyBraceStartLineCheck" plugin_name="squid" name="LeftCurlyBraceStartLineCheck" description="Left curly braces should be located at the beginning of lines of code" status="READY"
-         characteristic_id="[null]" default_characteristic_id="10"
+         characteristic_id="[null]" default_characteristic_id="10" description_format="HTML"
          remediation_function="[null]" default_remediation_function="LINEAR_OFFSET"
          remediation_coeff="[null]" default_remediation_coeff="5d"
          remediation_offset="[null]" default_remediation_offset="10h" updated_at="2014-02-19"
@@ -19,7 +19,7 @@
 
   <!-- Removed rule linked to a disabled requirement -> Do nothing -->
   <rules tags="[null]" system_tags="[null]" id="3" plugin_rule_key="CallToFileDeleteOnExitMethod" plugin_name="squid" name="CallToFileDeleteOnExitMethod" description="CallToFileDeleteOnExitMethod" status="REMOVED"
-         characteristic_id="[null]" default_characteristic_id="10"
+         characteristic_id="[null]" default_characteristic_id="10" description_format="HTML"
          remediation_function="[null]" default_remediation_function="LINEAR_OFFSET"
          remediation_coeff="[null]" default_remediation_coeff="5d"
          remediation_offset="[null]" default_remediation_offset="10h" updated_at="2014-02-19"
@@ -27,7 +27,7 @@
 
   <!-- Rule linked to one enable requirement="[null]" with same value of debt -> Nothing to do -->
   <rules tags="[null]" system_tags="[null]" id="4" plugin_rule_key="ObjectFinalizeOverridenCallsSuperFinalizeCheck" plugin_name="squid" name="ObjectFinalizeOverridenCallsSuperFinalizeCheck" description="super.finalize() should be called at the end of Object.finalize() implementations" status="READY"
-         characteristic_id="[null]" default_characteristic_id="10"
+         characteristic_id="[null]" default_characteristic_id="10" description_format="HTML"
          remediation_function="[null]" default_remediation_function="LINEAR_OFFSET"
          remediation_coeff="[null]" default_remediation_coeff="5min"
          remediation_offset="[null]" default_remediation_offset="10h" updated_at="2014-02-19"
@@ -35,7 +35,7 @@
 
   <!-- Rule linked to one enable requirement="[null]" with different value of debt -> Update rule -->
   <rules tags="[null]" system_tags="[null]" id="5" plugin_rule_key="RightCurlyBraceStartLineCheck" plugin_name="squid" name="RightCurlyBraceStartLineCheck" description="Right curly braces should be located at the beginning of lines of code" status="READY"
-         characteristic_id="[null]" default_characteristic_id="20"
+         characteristic_id="[null]" default_characteristic_id="20" description_format="HTML"
          remediation_function="[null]" default_remediation_function="LINEAR"
          remediation_coeff="[null]" default_remediation_coeff="5d"
          remediation_offset="[null]" default_remediation_offset="[null]" updated_at="2014-02-19"
@@ -43,7 +43,7 @@
 
   <!-- Rule linked to one enable requirement on Constant per issue function (with a coefficient of 0d -> to be replaced by null)="[null]" with different value of debt -> Update rule -->
   <rules tags="[null]" system_tags="[null]" id="6" plugin_rule_key="HiddenFieldCheck" plugin_name="squid" name="HiddenFieldCheck" description="HiddenFieldCheck" status="READY"
-         characteristic_id="[null]" default_characteristic_id="20"
+         characteristic_id="[null]" default_characteristic_id="20" description_format="HTML"
          remediation_function="[null]" default_remediation_function="LINEAR"
          remediation_coeff="[null]" default_remediation_coeff="5d"
          remediation_offset="[null]" default_remediation_offset="[null]" updated_at="2014-02-19"
@@ -51,7 +51,7 @@
 
   <!-- Rule linked to one enable requirement on Linear function (with a coefficient of 0min -> to be replaced by null)="[null]" with different value of debt -> Update rule -->
   <rules tags="[null]" system_tags="[null]" id="7" plugin_rule_key="ForLoopCounterChangedCheck" plugin_name="squid" name="ForLoopCounterChangedCheck" description="ForLoopCounterChangedCheck" status="READY"
-         characteristic_id="[null]" default_characteristic_id="20"
+         characteristic_id="[null]" default_characteristic_id="20" description_format="HTML"
          remediation_function="[null]" default_remediation_function="LINEAR"
          remediation_coeff="[null]" default_remediation_coeff="5d"
          remediation_offset="[null]" default_remediation_offset="[null]" updated_at="2014-02-19"
@@ -59,7 +59,7 @@
 
   <!-- Rule linked to one enable requirement on Linear with offset function (with a offset of 0h -> should be replaced by 0d)="[null]" with different value of debt -> Update rule -->
   <rules tags="[null]" system_tags="[null]" id="8" plugin_rule_key="ClassVariableVisibilityCheck" plugin_name="squid" name="ClassVariableVisibilityCheck" description="ClassVariableVisibilityCheck" status="READY"
-         characteristic_id="[null]" default_characteristic_id="20"
+         characteristic_id="[null]" default_characteristic_id="20" description_format="HTML"
          remediation_function="[null]" default_remediation_function="LINEAR"
          remediation_coeff="[null]" default_remediation_coeff="5d"
          remediation_offset="[null]" default_remediation_offset="[null" updated_at="2014-02-19"
@@ -67,7 +67,7 @@
 
   <!-- Rule linked to one enable requirement on Linear function (with a coefficient of 0d -> should keep 0d)="[null]" with different value of debt -> Update rule -->
   <rules tags="[null]" system_tags="[null]" id="9" plugin_rule_key="SwitchLastCaseIsDefaultCheck" plugin_name="squid" name="SwitchLastCaseIsDefaultCheck" description="SwitchLastCaseIsDefaultCheck" status="READY"
-         characteristic_id="[null]" default_characteristic_id="20"
+         characteristic_id="[null]" default_characteristic_id="20" description_format="HTML"
          remediation_function="[null]" default_remediation_function="LINEAR"
          remediation_coeff="[null]" default_remediation_coeff="5d"
          remediation_offset="[null]" default_remediation_offset="[null]" updated_at="2014-02-19"
-- 
cgit v1.2.3