From 8dee812b1bb3350dfc125a403126f12fd940f6bd Mon Sep 17 00:00:00 2001 From: Julien Lancelot Date: Wed, 18 Jun 2014 10:29:30 +0200 Subject: [PATCH] Fix display of debt in /api/issues/show --- .../main/java/org/sonar/server/issue/ws/IssueShowAction.java | 2 +- .../main/resources/org/sonar/server/issue/ws/example-show.json | 2 +- .../java/org/sonar/server/issue/ws/IssueShowActionTest.java | 2 +- .../ws/IssueShowActionTest/show_issue_with_technical_debt.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueShowAction.java b/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueShowAction.java index ed3d279b158..8ee532f928a 100644 --- a/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueShowAction.java +++ b/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueShowAction.java @@ -127,7 +127,7 @@ public class IssueShowAction implements RequestHandler { .prop("author", issue.authorLogin()) .prop("actionPlan", actionPlanKey) .prop("actionPlanName", actionPlan != null ? actionPlan.name() : null) - .prop("debt", debt != null ? durations.format(UserSession.get().locale(), debt, Durations.DurationFormat.SHORT) : null) + .prop("debt", debt != null ? durations.encode(debt) : null) .prop("creationDate", DateUtils.formatDateTime(issue.creationDate())) .prop("fCreationDate", formatDate(issue.creationDate())) .prop("updateDate", updateDate != null ? DateUtils.formatDateTime(updateDate) : null) diff --git a/sonar-server/src/main/resources/org/sonar/server/issue/ws/example-show.json b/sonar-server/src/main/resources/org/sonar/server/issue/ws/example-show.json index 4173dca0314..f0a4edc287c 100644 --- a/sonar-server/src/main/resources/org/sonar/server/issue/ws/example-show.json +++ b/sonar-server/src/main/resources/org/sonar/server/issue/ws/example-show.json @@ -8,7 +8,7 @@ "status": "OPEN", "severity": "MAJOR", "author": "Developer 1", - "debt": "2 minutes", + "debt": "2min", "creationDate": "2014-02-14T23:04:29+0100", "fCreationDate": "Feb 14, 2014 11:04 PM", "updateDate": "2014-03-04T23:03:44+0100", diff --git a/sonar-server/src/test/java/org/sonar/server/issue/ws/IssueShowActionTest.java b/sonar-server/src/test/java/org/sonar/server/issue/ws/IssueShowActionTest.java index 35a83cb0ce7..57ff3ea82a4 100644 --- a/sonar-server/src/test/java/org/sonar/server/issue/ws/IssueShowActionTest.java +++ b/sonar-server/src/test/java/org/sonar/server/issue/ws/IssueShowActionTest.java @@ -310,7 +310,7 @@ public class IssueShowActionTest { 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"); MockUserSession.set(); WsTester.TestRequest request = tester.newGetRequest("api/issues", "show").setParam("key", issue.key()); diff --git a/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue_with_technical_debt.json b/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue_with_technical_debt.json index d7cbcc87428..4a42e205d75 100644 --- a/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue_with_technical_debt.json +++ b/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue_with_technical_debt.json @@ -8,7 +8,7 @@ "projectName": "SonarQube", "rule": "squid:AvoidCycle", "ruleName": "Avoid cycle", - "debt": "2 hours 1 minutes", + "debt": "2h1min", "creationDate": "2014-01-22T19:10:03+0100", "fCreationDate": "Jan 22, 2014 10:03 AM", "transitions": [], -- 2.39.5