From 5d0c0e79124e8d0e8cec157a06041ab826b21675 Mon Sep 17 00:00:00 2001 From: Julien Lancelot Date: Thu, 13 Mar 2014 09:05:24 +0100 Subject: [PATCH] Add description in issues filters WS show action --- .../main/java/org/sonar/server/issue/filter/IssueFilterWs.java | 1 + .../java/org/sonar/server/issue/filter/IssueFilterWsTest.java | 2 +- .../server/issue/filter/IssueFilterWsTest/show_filter.json | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/sonar-server/src/main/java/org/sonar/server/issue/filter/IssueFilterWs.java b/sonar-server/src/main/java/org/sonar/server/issue/filter/IssueFilterWs.java index be196d45141..16ef8718987 100644 --- a/sonar-server/src/main/java/org/sonar/server/issue/filter/IssueFilterWs.java +++ b/sonar-server/src/main/java/org/sonar/server/issue/filter/IssueFilterWs.java @@ -158,6 +158,7 @@ public class IssueFilterWs implements WebService { return json.beginObject() .prop("id", filter.id()) .prop("name", filter.name()) + .prop("description", filter.description()) .prop("user", filter.user()) .prop("shared", filter.shared()) .prop("query", filter.data()) diff --git a/sonar-server/src/test/java/org/sonar/server/issue/filter/IssueFilterWsTest.java b/sonar-server/src/test/java/org/sonar/server/issue/filter/IssueFilterWsTest.java index 8260c4bdac1..87e1fef48e1 100644 --- a/sonar-server/src/test/java/org/sonar/server/issue/filter/IssueFilterWsTest.java +++ b/sonar-server/src/test/java/org/sonar/server/issue/filter/IssueFilterWsTest.java @@ -105,7 +105,7 @@ public class IssueFilterWsTest { // logged-in user is 'eric' but filter is owned by 'simon' MockUserSession session = MockUserSession.set().setLogin("eric").setUserId(123).setGlobalPermissions("none"); when(service.find(13L, session)).thenReturn( - new DefaultIssueFilter().setId(13L).setName("Blocker issues").setData("severity=BLOCKER").setUser("simon").setShared(true) + new DefaultIssueFilter().setId(13L).setName("Blocker issues").setDescription("All Blocker Issues").setData("severity=BLOCKER").setUser("simon").setShared(true) ); tester.newRequest("show").setParam("id", "13").execute() diff --git a/sonar-server/src/test/resources/org/sonar/server/issue/filter/IssueFilterWsTest/show_filter.json b/sonar-server/src/test/resources/org/sonar/server/issue/filter/IssueFilterWsTest/show_filter.json index dd4ee417148..447e43632f4 100644 --- a/sonar-server/src/test/resources/org/sonar/server/issue/filter/IssueFilterWsTest/show_filter.json +++ b/sonar-server/src/test/resources/org/sonar/server/issue/filter/IssueFilterWsTest/show_filter.json @@ -2,6 +2,7 @@ "filter": { "id": 13, "name": "Blocker issues", + "description": "All Blocker Issues", "shared": true, "query": "severity=BLOCKER", "user": "simon", -- 2.39.5