Revert "SONAR-4301 Replace issues.severity column type from String to Integer"

This reverts commit 2c2728075a1c142965bf6c018ba94919955f80d8.

32 files changed, 72 insertions, 72 deletions

diff --git a/sonar-core/src/test/java/org/sonar/core/issue/db/IssueDaoTest.java b/sonar-core/src/test/java/org/sonar/core/issue/db/IssueDaoTest.java
index 3c962585f19..cfb30567f21 100644
--- a/sonar-core/src/test/java/org/sonar/core/issue/db/IssueDaoTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/issue/db/IssueDaoTest.java
@@ -51,7 +51,7 @@ public class IssueDaoTest extends AbstractDaoTestCase {
     assertThat(issue.getId()).isEqualTo(100L);
     assertThat(issue.getResourceId()).isEqualTo(401);
     assertThat(issue.getRuleId()).isEqualTo(500);
-    assertThat(issue.getSeverity()).isEqualTo(5);
+    assertThat(issue.getSeverity()).isEqualTo("BLOCKER");
     assertThat(issue.isManualSeverity()).isFalse();
     assertThat(issue.getMessage()).isNull();
     assertThat(issue.getLine()).isEqualTo(200);
@@ -227,9 +227,9 @@ public class IssueDaoTest extends AbstractDaoTestCase {
     IssueQuery query = IssueQuery.builder().sort(IssueQuery.Sort.SEVERITY).asc(true).build();
     List<IssueDto> results = newArrayList(dao.select(query));
     assertThat(results).hasSize(3);
-    assertThat(results.get(0).getSeverityLabel()).isEqualTo("MINOR");
-    assertThat(results.get(1).getSeverityLabel()).isEqualTo("MAJOR");
-    assertThat(results.get(2).getSeverityLabel()).isEqualTo("BLOCKER");
+    assertThat(results.get(0).getSeverity()).isEqualTo("BLOCKER");
+    assertThat(results.get(1).getSeverity()).isEqualTo("MAJOR");
+    assertThat(results.get(2).getSeverity()).isEqualTo("MINOR");
   }
 
   @Test
diff --git a/sonar-core/src/test/java/org/sonar/core/issue/db/IssueDtoTest.java b/sonar-core/src/test/java/org/sonar/core/issue/db/IssueDtoTest.java
index 551dc0926e3..9598b8c796d 100644
--- a/sonar-core/src/test/java/org/sonar/core/issue/db/IssueDtoTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/issue/db/IssueDtoTest.java
@@ -63,7 +63,7 @@ public class IssueDtoTest {
         .setResolution(Issue.RESOLUTION_FALSE_POSITIVE)
         .setEffortToFix(15.0)
         .setLine(6)
-        .setSeverity(5)
+        .setSeverity("BLOCKER")
         .setMessage("message")
         .setManualSeverity(true)
         .setReporter("arthur")
diff --git a/sonar-core/src/test/java/org/sonar/core/issue/db/IssueMapperTest.java b/sonar-core/src/test/java/org/sonar/core/issue/db/IssueMapperTest.java
index 7767c139710..d606a87080d 100644
--- a/sonar-core/src/test/java/org/sonar/core/issue/db/IssueMapperTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/issue/db/IssueMapperTest.java
@@ -46,7 +46,7 @@ public class IssueMapperTest extends AbstractDaoTestCase {
     dto.setEffortToFix(3.14);
     dto.setResolution("FIXED");
     dto.setStatus("RESOLVED");
-    dto.setSeverity(5);
+    dto.setSeverity("BLOCKER");
     dto.setReporter("emmerik");
     dto.setAuthorLogin("morgan");
     dto.setAssignee("karadoc");
@@ -79,7 +79,7 @@ public class IssueMapperTest extends AbstractDaoTestCase {
     dto.setEffortToFix(3.14);
     dto.setResolution("FIXED");
     dto.setStatus("RESOLVED");
-    dto.setSeverity(5);
+    dto.setSeverity("BLOCKER");
     dto.setReporter("emmerik");
     dto.setAuthorLogin("morgan");
     dto.setAssignee("karadoc");
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/ActionPlanStatsDaoTest/should_find_by_project.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/ActionPlanStatsDaoTest/should_find_by_project.xml
index af6e601bb18..f960ecd1b62 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/ActionPlanStatsDaoTest/should_find_by_project.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/ActionPlanStatsDaoTest/should_find_by_project.xml
@@ -8,7 +8,7 @@
       kee="ABCDE"
       resource_id="400"
       rule_id="500"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
@@ -32,7 +32,7 @@
       kee="ABCDF"
       resource_id="400"
       rule_id="500"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
@@ -56,7 +56,7 @@
       kee="ABCDG"
       resource_id="400"
       rule_id="500"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_all.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_all.xml
index fb1aedd7222..3d7bd96af21 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_all.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_all.xml
@@ -6,7 +6,7 @@
       kee="ABCDE-1"
       resource_id="401"
       rule_id="500"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
@@ -30,7 +30,7 @@
       kee="ABCDE-2"
       resource_id="401"
       rule_id="500"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
@@ -56,7 +56,7 @@
       kee="ABCDE-3"
       resource_id="401"
       rule_id="501"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_action_plans.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_action_plans.xml
index de78e71414d..5655372b58e 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_action_plans.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_action_plans.xml
@@ -6,7 +6,7 @@
       resource_id="401"
       rule_id="500"
       action_plan_key="ABC"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
@@ -31,7 +31,7 @@
       resource_id="401"
       rule_id="500"
       action_plan_key="ABC"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
@@ -57,7 +57,7 @@
       resource_id="401"
       rule_id="501"
       action_plan_key="DEF"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_assigned.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_assigned.xml
index 1d3d7943d7e..f25c1c9e8ea 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_assigned.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_assigned.xml
@@ -6,7 +6,7 @@
       kee="ABCDE-1"
       resource_id="401"
       rule_id="500"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
@@ -30,7 +30,7 @@
       kee="ABCDE-2"
       resource_id="401"
       rule_id="500"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
@@ -56,7 +56,7 @@
       kee="ABCDE-3"
       resource_id="401"
       rule_id="501"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_component_root.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_component_root.xml
index 2319088e7f0..34f07c20209 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_component_root.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_component_root.xml
@@ -5,7 +5,7 @@
       kee="100"
       resource_id="401"
       rule_id="500"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
@@ -29,7 +29,7 @@
       kee="101"
       resource_id="402"
       rule_id="501"
-      severity="3"
+      severity="MAJOR"
       manual_severity="[false]"
       message="[null]"
       line="120"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_date_creation.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_date_creation.xml
index c1fddd480d3..9b6f20c96ca 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_date_creation.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_date_creation.xml
@@ -5,7 +5,7 @@
       kee="ABCDE-1"
       resource_id="401"
       rule_id="500"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
@@ -29,7 +29,7 @@
       kee="ABCDE-2"
       resource_id="401"
       rule_id="500"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_ids.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_ids.xml
index d6f85f325c4..3d6ad15c5a0 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_ids.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_ids.xml
@@ -6,7 +6,7 @@
       kee="ABCDE-1"
       resource_id="401"
       rule_id="500"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
@@ -30,7 +30,7 @@
       kee="ABCDE-2"
       resource_id="401"
       rule_id="500"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
@@ -56,7 +56,7 @@
       kee="ABCDE"
       resource_id="401"
       rule_id="501"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_key.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_key.xml
index 88ca9ebd960..d01f5342d87 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_key.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_key.xml
@@ -5,7 +5,7 @@
       kee="ABCDE"
       resource_id="401"
       rule_id="500"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_planned.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_planned.xml
index 9aa1641068b..ded6b072043 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_planned.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_planned.xml
@@ -6,7 +6,7 @@
       resource_id="401"
       rule_id="500"
       action_plan_key="ABC"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
@@ -31,7 +31,7 @@
       resource_id="401"
       rule_id="500"
       action_plan_key="ABC"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
@@ -57,7 +57,7 @@
       resource_id="401"
       rule_id="501"
       action_plan_key="[null]"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_query.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_query.xml
index 557be9b7ba5..816742b954b 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_query.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_query.xml
@@ -5,7 +5,7 @@
       kee="ABCDE"
       resource_id="401"
       rule_id="500"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_resolved.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_resolved.xml
index 886fb14e175..371d3da3f4f 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_resolved.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_resolved.xml
@@ -5,7 +5,7 @@
       kee="ABCDE-1"
       resource_id="401"
       rule_id="500"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
@@ -29,7 +29,7 @@
       kee="ABCDE-2"
       resource_id="401"
       rule_id="500"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
@@ -53,7 +53,7 @@
       kee="ABCDE-3"
       resource_id="401"
       rule_id="501"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_rules.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_rules.xml
index d20560f0811..d2af6661a9e 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_rules.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_rules.xml
@@ -6,7 +6,7 @@
       kee="ABCDE-1"
       resource_id="401"
       rule_id="500"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
@@ -30,7 +30,7 @@
       kee="ABCDE-2"
       resource_id="401"
       rule_id="500"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
@@ -56,7 +56,7 @@
       kee="ABCDE-3"
       resource_id="401"
       rule_id="501"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_issue_and_component_ids.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_issue_and_component_ids.xml
index fb1aedd7222..3d7bd96af21 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_issue_and_component_ids.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_issue_and_component_ids.xml
@@ -6,7 +6,7 @@
       kee="ABCDE-1"
       resource_id="401"
       rule_id="500"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
@@ -30,7 +30,7 @@
       kee="ABCDE-2"
       resource_id="401"
       rule_id="500"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
@@ -56,7 +56,7 @@
       kee="ABCDE-3"
       resource_id="401"
       rule_id="501"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_open_issues.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_open_issues.xml
index 8b3a9f44ca3..12f7036120e 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_open_issues.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_open_issues.xml
@@ -5,7 +5,7 @@
       kee="100"
       resource_id="401"
       rule_id="500"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
@@ -29,7 +29,7 @@
       kee="101"
       resource_id="402"
       rule_id="501"
-      severity="3"
+      severity="MAJOR"
       manual_severity="[false]"
       message="[null]"
       line="120"
@@ -53,7 +53,7 @@
       kee="102"
       resource_id="402"
       rule_id="501"
-      severity="3"
+      severity="MAJOR"
       manual_severity="[false]"
       message="[null]"
       line="120"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result_by_assignee.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result_by_assignee.xml
index 2f902a85565..41a97ef98b8 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result_by_assignee.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result_by_assignee.xml
@@ -6,7 +6,7 @@
       kee="ABCDE-1"
       resource_id="401"
       rule_id="500"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
@@ -30,7 +30,7 @@
       kee="ABCDE-2"
       resource_id="401"
       rule_id="500"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
@@ -56,7 +56,7 @@
       kee="ABCDE-3"
       resource_id="401"
       rule_id="501"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result_by_close_date.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result_by_close_date.xml
index 9339d6e437e..b27051ff207 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result_by_close_date.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result_by_close_date.xml
@@ -6,7 +6,7 @@
       kee="ABCDE-1"
       resource_id="401"
       rule_id="500"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
@@ -30,7 +30,7 @@
       kee="ABCDE-2"
       resource_id="401"
       rule_id="500"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
@@ -56,7 +56,7 @@
       kee="ABCDE-3"
       resource_id="401"
       rule_id="501"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result_by_creation_date.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result_by_creation_date.xml
index b4c6ba44d29..d84b71fa09b 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result_by_creation_date.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result_by_creation_date.xml
@@ -5,7 +5,7 @@
       kee="ABCDE-1"
       resource_id="401"
       rule_id="500"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
@@ -29,7 +29,7 @@
       kee="ABCDE-2"
       resource_id="401"
       rule_id="500"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
@@ -53,7 +53,7 @@
       kee="ABCDE-3"
       resource_id="401"
       rule_id="501"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result_by_severity.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result_by_severity.xml
index e5ffc2e5fda..9dae4080973 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result_by_severity.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result_by_severity.xml
@@ -5,7 +5,7 @@
       kee="ABCDE-1"
       resource_id="401"
       rule_id="500"
-      severity="2"
+      severity="MINOR"
       manual_severity="[false]"
       message="[null]"
       line="200"
@@ -29,7 +29,7 @@
       kee="ABCDE-2"
       resource_id="401"
       rule_id="500"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
@@ -53,7 +53,7 @@
       kee="ABCDE-3"
       resource_id="401"
       rule_id="501"
-      severity="3"
+      severity="MAJOR"
       manual_severity="[false]"
       message="[null]"
       line="200"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result_by_status.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result_by_status.xml
index 4e12d924be8..b510a5c447a 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result_by_status.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result_by_status.xml
@@ -6,7 +6,7 @@
       kee="ABCDE-1"
       resource_id="401"
       rule_id="500"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
@@ -30,7 +30,7 @@
       kee="ABCDE-2"
       resource_id="401"
       rule_id="500"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
@@ -56,7 +56,7 @@
       kee="ABCDE-3"
       resource_id="401"
       rule_id="501"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result_by_update_date.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result_by_update_date.xml
index a74da66a8c8..769bae1454d 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result_by_update_date.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result_by_update_date.xml
@@ -5,7 +5,7 @@
       kee="ABCDE-1"
       resource_id="401"
       rule_id="500"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
@@ -29,7 +29,7 @@
       kee="ABCDE-2"
       resource_id="401"
       rule_id="500"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
@@ -53,7 +53,7 @@
       kee="ABCDE-3"
       resource_id="401"
       rule_id="501"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testInsert-result.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testInsert-result.xml
index e32f7d9f30c..69e5160f962 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testInsert-result.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testInsert-result.xml
@@ -4,7 +4,7 @@
       kee="ABCDE"
       resource_id="123"
       rule_id="200"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="the message"
       line="500"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testUpdate-result.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testUpdate-result.xml
index 7bcccd58b05..57bc88451ea 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testUpdate-result.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testUpdate-result.xml
@@ -23,7 +23,7 @@
       kee="ABCDE"
       resource_id="123"
       rule_id="200"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="the message"
       line="500"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testUpdate.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testUpdate.xml
index 9e13008d3db..06ee1af1b50 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testUpdate.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testUpdate.xml
@@ -23,7 +23,7 @@
       kee="ABCDE"
       resource_id="123"
       rule_id="200"
-      severity="1"
+      severity="INFO"
       manual_severity="[false]"
       message="old"
       line="[null]"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_insert_new_issues-result.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_insert_new_issues-result.xml
index 0a10ae36591..97ca9b21656 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_insert_new_issues-result.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_insert_new_issues-result.xml
@@ -1,5 +1,5 @@
 <dataset>
-  <issues id="1" kee="ABCDE" resolution="OPEN" status="OPEN" severity="5" manual_severity="[false]"
+  <issues id="1" kee="ABCDE" resolution="OPEN" status="OPEN" severity="BLOCKER" manual_severity="[false]"
       assignee="[null]"
       author_login="[null]"
       checksum="[null]"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_update_issues-result.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_update_issues-result.xml
index 17f7def9bf3..862d14f2b75 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_update_issues-result.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_update_issues-result.xml
@@ -3,7 +3,7 @@
           kee="ABCDE"
           resolution="FIXED"
           status="RESOLVED"
-          severity="5"
+          severity="BLOCKER"
           manual_severity="[false]"
           assignee="loic"
           author_login="simon"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_update_issues.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_update_issues.xml
index 709dc7ccf89..4d8e2449c57 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_update_issues.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_update_issues.xml
@@ -3,7 +3,7 @@
           kee="ABCDE"
           resolution="OPEN"
           status="OPEN"
-          severity="5"
+          severity="BLOCKER"
           manual_severity="[false]"
           assignee="loic"
           author_login="simon"
diff --git a/sonar-core/src/test/resources/org/sonar/core/persistence/DryRunDatabaseFactoryTest/should_create_database_with_issues.xml b/sonar-core/src/test/resources/org/sonar/core/persistence/DryRunDatabaseFactoryTest/should_create_database_with_issues.xml
index 3a331c75814..5bf87b320ac 100644
--- a/sonar-core/src/test/resources/org/sonar/core/persistence/DryRunDatabaseFactoryTest/should_create_database_with_issues.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/persistence/DryRunDatabaseFactoryTest/should_create_database_with_issues.xml
@@ -23,7 +23,7 @@
       kee="100"
       resource_id="400"
       rule_id="500"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
@@ -47,7 +47,7 @@
       kee="101"
       resource_id="401"
       rule_id="501"
-      severity="3"
+      severity="MAJOR"
       manual_severity="[false]"
       message="[null]"
       line="120"
diff --git a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeCommandsTest/shouldDeleteResource.xml b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeCommandsTest/shouldDeleteResource.xml
index 22d0be9cb39..e8a31f031de 100644
--- a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeCommandsTest/shouldDeleteResource.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeCommandsTest/shouldDeleteResource.xml
@@ -24,7 +24,7 @@
 
   <review_comments id="1" created_at="[null]" updated_at="[null]" review_id="1" user_id="1223" review_text="abc"/>
 
-  <issues id="1" kee="ABCDE" resource_id="1" status="CLOSED" resolution="[null]" line="200" severity="5"
+  <issues id="1" kee="ABCDE" resource_id="1" status="CLOSED" resolution="[null]" line="200" severity="BLOCKER"
           reporter="perceval" assignee="arthur" rule_id="500"
           manual_severity="[false]"
           message="[null]"
diff --git a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDeleteProject.xml b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDeleteProject.xml
index 887df900278..5c57259dab6 100644
--- a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDeleteProject.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDeleteProject.xml
@@ -31,7 +31,7 @@
 
   <review_comments id="1" created_at="[null]" updated_at="[null]" review_id="2" user_id="1223" review_text="abc"/>
 
-  <issues id="1" kee="ABCDE" resource_id="1" status="CLOSED" resolution="[null]" line="200" severity="5"
+  <issues id="1" kee="ABCDE" resource_id="1" status="CLOSED" resolution="[null]" line="200" severity="BLOCKER"
           reporter="perceval" assignee="arthur" rule_id="500"
           manual_severity="[false]"
           message="[null]"
@@ -43,7 +43,7 @@
           issue_close_date="2013-04-16"
       />
 
-  <issues id="2" kee="ABCDF" resource_id="1" status="CLOSED" resolution="[null]" line="200" severity="5"
+  <issues id="2" kee="ABCDF" resource_id="1" status="CLOSED" resolution="[null]" line="200" severity="BLOCKER"
           reporter="perceval" assignee="arthur" rule_id="500"
           manual_severity="[false]"
           message="[null]"