From 87539bd0bcce6662119afac6361617100b40c44e Mon Sep 17 00:00:00 2001 From: Julien Lancelot Date: Wed, 28 May 2014 16:27:14 +0200 Subject: [PATCH] SONAR-5341 Fix display of debt --- .../main/java/org/sonar/server/issue/ws/IssueSearchAction.java | 2 +- .../java/org/sonar/server/issue/ws/IssueSearchActionTest.java | 2 +- .../server/issue/ws/IssueSearchActionTest/issues_with_debt.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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 027011d96b6..6f45ce044e5 100644 --- 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 97739e29dcb..cec14605e2c 100644 --- 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 e5054e61d64..967f0624cca 100644 --- 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" } ], -- 2.39.5