SONAR-5007 return debt characteristic names in WS responses

6 files changed, 20 insertions, 21 deletions

diff --git a/sonar-server/src/test/java/org/sonar/server/rule/ws/RuleMappingTest.java b/sonar-server/src/test/java/org/sonar/server/rule/ws/RuleMappingTest.java
index 0b0bd2bc162..d809c8582ca 100644
--- a/sonar-server/src/test/java/org/sonar/server/rule/ws/RuleMappingTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/rule/ws/RuleMappingTest.java
@@ -21,6 +21,7 @@ package org.sonar.server.rule.ws;
 
 import org.junit.Test;
 import org.sonar.api.resources.Languages;
+import org.sonar.api.server.debt.DebtModel;
 import org.sonar.api.server.ws.internal.SimpleGetRequest;
 import org.sonar.server.rule.index.RuleNormalizer;
 import org.sonar.server.search.QueryOptions;
@@ -34,10 +35,11 @@ public class RuleMappingTest {
 
   Languages languages = new Languages();
   MacroInterpreter macroInterpreter = mock(MacroInterpreter.class);
+  DebtModel debtModel = mock(DebtModel.class);
 
   @Test
   public void toQueryOptions_load_all_fields() throws Exception {
-    RuleMapping mapping = new RuleMapping(languages, macroInterpreter);
+    RuleMapping mapping = new RuleMapping(languages, macroInterpreter, debtModel);
     SimpleGetRequest request = new SimpleGetRequest();
     request.setParam("p", "1");
     request.setParam("ps", "10");
@@ -48,7 +50,7 @@ public class RuleMappingTest {
 
   @Test
   public void toQueryOptions_load_only_few_simple_fields() throws Exception {
-    RuleMapping mapping = new RuleMapping(languages, macroInterpreter);
+    RuleMapping mapping = new RuleMapping(languages, macroInterpreter, debtModel);
     SimpleGetRequest request = new SimpleGetRequest();
     request.setParam("p", "1");
     request.setParam("ps", "10");
@@ -63,7 +65,7 @@ public class RuleMappingTest {
 
   @Test
   public void toQueryOptions_langName_requires_lang() throws Exception {
-    RuleMapping mapping = new RuleMapping(languages, macroInterpreter);
+    RuleMapping mapping = new RuleMapping(languages, macroInterpreter, debtModel);
     SimpleGetRequest request = new SimpleGetRequest();
     request.setParam("p", "1");
     request.setParam("ps", "10");
@@ -75,7 +77,7 @@ public class RuleMappingTest {
 
   @Test
   public void toQueryOptions_debt_requires_group_of_fields() throws Exception {
-    RuleMapping mapping = new RuleMapping(languages, macroInterpreter);
+    RuleMapping mapping = new RuleMapping(languages, macroInterpreter, debtModel);
     SimpleGetRequest request = new SimpleGetRequest();
     request.setParam("p", "1");
     request.setParam("ps", "10");
@@ -93,7 +95,7 @@ public class RuleMappingTest {
 
   @Test
   public void toQueryOptions_html_note_requires_markdown_note() throws Exception {
-    RuleMapping mapping = new RuleMapping(languages, macroInterpreter);
+    RuleMapping mapping = new RuleMapping(languages, macroInterpreter, debtModel);
     SimpleGetRequest request = new SimpleGetRequest();
     request.setParam("p", "1");
     request.setParam("ps", "10");
@@ -105,7 +107,7 @@ public class RuleMappingTest {
 
   @Test
   public void toQueryOptions_debt_characteristics() throws Exception {
-    RuleMapping mapping = new RuleMapping(languages, macroInterpreter);
+    RuleMapping mapping = new RuleMapping(languages, macroInterpreter, debtModel);
     SimpleGetRequest request = new SimpleGetRequest();
     request.setParam("p", "1");
     request.setParam("ps", "10");
@@ -114,8 +116,6 @@ public class RuleMappingTest {
 
     assertThat(queryOptions.getFieldsToReturn()).containsOnly(
       RuleNormalizer.RuleField.CHARACTERISTIC.field(),
-      RuleNormalizer.RuleField.SUB_CHARACTERISTIC.field(),
-      RuleNormalizer.RuleField.DEFAULT_CHARACTERISTIC.field(),
-      RuleNormalizer.RuleField.DEFAULT_SUB_CHARACTERISTIC.field());
+      RuleNormalizer.RuleField.DEFAULT_CHARACTERISTIC.field());
   }
 }
diff --git a/sonar-server/src/test/java/org/sonar/server/rule/ws/RulesWebServiceMediumTest.java b/sonar-server/src/test/java/org/sonar/server/rule/ws/RulesWebServiceMediumTest.java
index 3534bf24c74..1fadc233225 100644
--- a/sonar-server/src/test/java/org/sonar/server/rule/ws/RulesWebServiceMediumTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/rule/ws/RulesWebServiceMediumTest.java
@@ -179,7 +179,7 @@ public class RulesWebServiceMediumTest {
 
     MockUserSession.set();
     WsTester.TestRequest request = tester.wsTester().newGetRequest(API_ENDPOINT, API_SEARCH_METHOD);
-    request.setParam(SearchOptions.PARAM_FIELDS, "debtRemFn,debtChar");
+    request.setParam(SearchOptions.PARAM_FIELDS, "debtRemFn,debtChar,debtCharName");
     WsTester.Result result = request.execute();
     result.assertJson(this.getClass(), "search_debt_rule.json");
   }
diff --git a/sonar-server/src/test/java/org/sonar/server/rule/ws/ShowActionMediumTest.java b/sonar-server/src/test/java/org/sonar/server/rule/ws/ShowActionMediumTest.java
index a9dcb383451..7e2185547e1 100644
--- a/sonar-server/src/test/java/org/sonar/server/rule/ws/ShowActionMediumTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/rule/ws/ShowActionMediumTest.java
@@ -102,7 +102,7 @@ public class ShowActionMediumTest {
       .setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN)
       .setLogin("me");
 
-    CharacteristicDto characteristicDto = new CharacteristicDto().setKey("API").setName("API").setEnabled(true);
+    CharacteristicDto characteristicDto = new CharacteristicDto().setKey("API").setName("Api").setEnabled(true);
     tester.get(CharacteristicDao.class).insert(characteristicDto, session);
     CharacteristicDto subCharacteristicDto = new CharacteristicDto().setKey("API_ABUSE").setName("API Abuse").setEnabled(true).setParentId(characteristicDto.getId());
     tester.get(CharacteristicDao.class).insert(subCharacteristicDto, session);
@@ -131,7 +131,6 @@ public class ShowActionMediumTest {
       .setParam("key", ruleDto.getKey().toString());
     WsTester.Result response = request.execute();
 
-    System.out.println("response = " + response.outputAsString());
     response.assertJson(getClass(), "show_rule_with_default_debt_infos.json", false);
   }
 
@@ -141,7 +140,7 @@ public class ShowActionMediumTest {
       .setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN)
       .setLogin("me");
 
-    CharacteristicDto characteristicDto = new CharacteristicDto().setKey("API").setName("API").setEnabled(true);
+    CharacteristicDto characteristicDto = new CharacteristicDto().setKey("API").setName("Api").setEnabled(true);
     tester.get(CharacteristicDao.class).insert(characteristicDto, session);
     CharacteristicDto subCharacteristicDto = new CharacteristicDto().setKey("API_ABUSE").setName("API Abuse").setEnabled(true).setParentId(characteristicDto.getId());
     tester.get(CharacteristicDao.class).insert(subCharacteristicDto, session);
@@ -177,12 +176,12 @@ public class ShowActionMediumTest {
       .setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN)
       .setLogin("me");
 
-    CharacteristicDto defaultCharacteristic = new CharacteristicDto().setKey("API").setName("API").setEnabled(true);
+    CharacteristicDto defaultCharacteristic = new CharacteristicDto().setKey("API").setName("Api").setEnabled(true);
     tester.get(CharacteristicDao.class).insert(defaultCharacteristic, session);
     CharacteristicDto defaultSubCharacteristic = new CharacteristicDto().setKey("API_ABUSE").setName("API Abuse").setEnabled(true).setParentId(defaultCharacteristic.getId());
     tester.get(CharacteristicDao.class).insert(defaultSubCharacteristic, session);
 
-    CharacteristicDto characteristic = new CharacteristicDto().setKey("OS").setName("OS").setEnabled(true);
+    CharacteristicDto characteristic = new CharacteristicDto().setKey("OS").setName("Os").setEnabled(true);
     tester.get(CharacteristicDao.class).insert(characteristic, session);
     CharacteristicDto subCharacteristic = new CharacteristicDto().setKey("OS_RELATED_PORTABILITY").setName("Portability").setEnabled(true).setParentId(characteristic.getId());
     tester.get(CharacteristicDao.class).insert(subCharacteristic, session);
diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/show_rule_with_default_and_overridden_debt_infos.json b/sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/show_rule_with_default_and_overridden_debt_infos.json
index 7006001b0a5..2a2240862fa 100644
--- a/sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/show_rule_with_default_and_overridden_debt_infos.json
+++ b/sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/show_rule_with_default_and_overridden_debt_infos.json
@@ -8,9 +8,9 @@
     "status": "BETA",
     "isTemplate": false,
     "debtChar": "OS",
-    "debtCharName": "OS",
+    "debtCharName": "Os",
     "debtSubChar": "OS_RELATED_PORTABILITY",
-    "debtSubCharName": "OS_RELATED_PORTABILITY",
+    "debtSubCharName": "Portability",
     "debtRemFnType": "LINEAR_OFFSET",
     "debtRemFnCoeff": "5d",
     "debtRemFnOffset": "10h",
diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/show_rule_with_default_debt_infos.json b/sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/show_rule_with_default_debt_infos.json
index 61d541adb1c..06381aae193 100644
--- a/sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/show_rule_with_default_debt_infos.json
+++ b/sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/show_rule_with_default_debt_infos.json
@@ -1,9 +1,9 @@
 {
   "rule": {
     "debtChar": "API",
-    "debtCharName": "API",
+    "debtCharName": "Api",
     "debtSubChar": "API_ABUSE",
-    "debtSubCharName": "API_ABUSE",
+    "debtSubCharName": "API Abuse",
     "debtRemFnType": "LINEAR_OFFSET",
     "debtRemFnCoeff": "5d",
     "debtRemFnOffset": "10h",
diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/show_rule_with_overridden_debt_infos.json b/sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/show_rule_with_overridden_debt_infos.json
index da095d9cfc6..7643a75c19e 100644
--- a/sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/show_rule_with_overridden_debt_infos.json
+++ b/sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/show_rule_with_overridden_debt_infos.json
@@ -8,9 +8,9 @@
     "status": "BETA",
     "isTemplate": false,
     "debtChar": "API",
-    "debtCharName": "API",
+    "debtCharName": "Api",
     "debtSubChar": "API_ABUSE",
-    "debtSubCharName": "API_ABUSE",
+    "debtSubCharName": "API Abuse",
     "debtRemFnType": "LINEAR_OFFSET",
     "debtRemFnCoeff": "5d",
     "debtRemFnOffset": "10h",