SONAR-5341 Fix display of debt

diff --git a/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueSearchAction.java b/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueSearchAction.java
index 027011d96b69c5e39e91a9912a3a86f095d8ee8e..6f45ce044e5424dbccb0ec62bfaaf3c0a498956a 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueSearchAction.java
+++ b/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueSearchAction.java
@@ -211,7 +211,7 @@ public class IssueSearchAction implements RequestHandler {
         .prop("severity", issue.severity())
         .prop("message", issue.message())
         .prop("line", issue.line())
-        .prop("debt", debt != null ? durations.format(UserSession.get().locale(), debt, Durations.DurationFormat.SHORT) : null)
+        .prop("debt", debt != null ? durations.encode(debt) : null)
         .prop("reporter", issue.reporter())
         .prop("assignee", issue.assignee())
         .prop("author", issue.authorLogin())

diff --git a/sonar-server/src/test/java/org/sonar/server/issue/ws/IssueSearchActionTest.java b/sonar-server/src/test/java/org/sonar/server/issue/ws/IssueSearchActionTest.java
index 97739e29dcb588a88e3fe84d0e6acbb547321474..cec14605e2c1bbb06576d4277ebc27adc7363c32 100644 (file)
--- a/sonar-server/src/test/java/org/sonar/server/issue/ws/IssueSearchActionTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/issue/ws/IssueSearchActionTest.java
@@ -154,7 +154,7 @@ public class IssueSearchActionTest {
     Issue issue = createStandardIssue().setDebt(debt);
     issues.add(issue);
 
-    when(durations.format(any(Locale.class), eq(debt), eq(Durations.DurationFormat.SHORT))).thenReturn("2 hours 1 minutes");
+    when(durations.encode(debt)).thenReturn("2h1min");
 
     WsTester.TestRequest request = tester.newGetRequest("api/issues", "search");
     request.execute().assertJson(getClass(), "issues_with_debt.json");

diff --git a/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueSearchActionTest/issues_with_debt.json b/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueSearchActionTest/issues_with_debt.json
index e5054e61d64be0a1e623741898959062b62a88e2..967f0624cca9b3d11b23f0822bf19d18b03a1d2c 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueSearchActionTest/issues_with_debt.json
+++ b/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueSearchActionTest/issues_with_debt.json
@@ -13,7 +13,7 @@
       "component": "sample:src/main/xoo/sample/Sample.xoo",
       "project": "sample",
       "rule": "squid:AvoidCycle",
-      "debt": "2 hours 1 minutes",
+      "debt": "2h1min",
       "creationDate": "2014-01-22T19:10:03+0100"
     }
   ],