From: Julien Lancelot Date: Mon, 17 Jun 2013 16:36:38 +0000 (+0200) Subject: SONAR-4392 List and edit existing issues filter X-Git-Tag: 3.7~470 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ec362118f5482b294fc657c00be6288142106428;p=sonarqube.git SONAR-4392 List and edit existing issues filter --- diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties b/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties index 6caab7f672a..4c36dc7c676 100644 --- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties +++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties @@ -531,9 +531,15 @@ issue_filter.criteria.status=Status issue_filter.max_results_reached=Only the first {0} issues matching the search criteria have been retrieved. Add some additional criteria to get fewer results to be able to sort this list. issue_filter.no_result=No matching issues found. issue_filter.save_filter=Save Filter +issue_filter.edit_filter=Edit Filter issue_filter.form.name=Name issue_filter.form.description=Description issue_filter.form.share=Shared with all users +issue_filter.favourite_filters=Favourite Filters +issue_filter.manage.my_filters=My Filters +issue_filter.no_filters=No filters +issue_filter.delete_confirm_title=Delete Filter +issue_filter.are_you_sure_want_delete_filter_x=Are you sure that you want to delete the filter "{0}"? #------------------------------------------------------------------------------ diff --git a/sonar-core/src/main/java/org/sonar/core/issue/DefaultIssueFilter.java b/sonar-core/src/main/java/org/sonar/core/issue/DefaultIssueFilter.java index 03ec5dac42b..db2b2b9fbf7 100644 --- a/sonar-core/src/main/java/org/sonar/core/issue/DefaultIssueFilter.java +++ b/sonar-core/src/main/java/org/sonar/core/issue/DefaultIssueFilter.java @@ -25,8 +25,6 @@ import com.google.common.base.Splitter; import com.google.common.collect.Lists; import org.apache.commons.lang.StringUtils; -import javax.annotation.CheckForNull; - import java.util.Date; import java.util.Iterator; import java.util.List; @@ -63,7 +61,7 @@ public class DefaultIssueFilter { } public DefaultIssueFilter(Map mapData) { - this.data = mapAsdata(mapData); + setData(mapData); } public Long id() { @@ -84,7 +82,6 @@ public class DefaultIssueFilter { return this; } - @CheckForNull public String user() { return user; } @@ -139,6 +136,11 @@ public class DefaultIssueFilter { return this; } + public final DefaultIssueFilter setData(Map mapData) { + this.data = mapAsdata(mapData); + return this; + } + /** * Used by ui */ diff --git a/sonar-core/src/main/java/org/sonar/core/issue/db/IssueFilterDao.java b/sonar-core/src/main/java/org/sonar/core/issue/db/IssueFilterDao.java index 2ac8a80265c..679b02e7915 100644 --- a/sonar-core/src/main/java/org/sonar/core/issue/db/IssueFilterDao.java +++ b/sonar-core/src/main/java/org/sonar/core/issue/db/IssueFilterDao.java @@ -26,6 +26,7 @@ import org.sonar.api.ServerComponent; import org.sonar.core.persistence.MyBatis; import javax.annotation.CheckForNull; +import javax.annotation.Nullable; import java.util.List; @@ -51,6 +52,17 @@ public class IssueFilterDao implements BatchComponent, ServerComponent { } } + @CheckForNull + public IssueFilterDto selectByNameAndUser(String name, String user, @Nullable Long existingId) { + SqlSession session = mybatis.openSession(); + try { + session.getMapper(IssueFilterMapper.class); + return getMapper(session).selectByNameAndUser(name, user, existingId); + } finally { + MyBatis.closeQuietly(session); + } + } + public List selectByUser(String user) { SqlSession session = mybatis.openSession(); try { diff --git a/sonar-core/src/main/java/org/sonar/core/issue/db/IssueFilterMapper.java b/sonar-core/src/main/java/org/sonar/core/issue/db/IssueFilterMapper.java index c4e8520febb..86f10e01c7b 100644 --- a/sonar-core/src/main/java/org/sonar/core/issue/db/IssueFilterMapper.java +++ b/sonar-core/src/main/java/org/sonar/core/issue/db/IssueFilterMapper.java @@ -19,7 +19,10 @@ */ package org.sonar.core.issue.db; +import org.apache.ibatis.annotations.Param; + import javax.annotation.CheckForNull; +import javax.annotation.Nullable; import java.util.List; @@ -31,6 +34,9 @@ public interface IssueFilterMapper { @CheckForNull IssueFilterDto selectById(Long id); + @CheckForNull + IssueFilterDto selectByNameAndUser(@Param("name") String name, @Param("userLogin") String userLogin, @Nullable @Param("existingId") Long existingId); + List selectByUser(String user); void insert(IssueFilterDto filter); diff --git a/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueFilterMapper.xml b/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueFilterMapper.xml index 8a5ed2fc971..291f90db47f 100644 --- a/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueFilterMapper.xml +++ b/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueFilterMapper.xml @@ -23,6 +23,18 @@ + + +
+
+

<%= message('issue_filter.edit_filter') -%>

+
+
+ <%= render :partial => 'display_errors' %> +
+ + +
+
+ + +
+ + +
+
+ + <%= h message('cancel') -%> +
+
+ + \ No newline at end of file diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_favourites.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_favourites.html.erb new file mode 100644 index 00000000000..0a288c80ae2 --- /dev/null +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_favourites.html.erb @@ -0,0 +1,7 @@ + \ No newline at end of file diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_save_as_form.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_save_as_form.html.erb index 10dcaf7a402..77797e3616a 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_save_as_form.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_save_as_form.html.erb @@ -7,13 +7,7 @@
- <% - if @errors - @errors.each do |msg| %> -
<%= h (msg.text ? msg.text : Api::Utils.message(msg.l10nKey, :params => msg.l10nParams)) -%>
- <% end - end - %> + <%= render :partial => 'display_errors' %>
@@ -22,7 +16,8 @@
-
+ + diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_sidebar.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_sidebar.html.erb index 01e6a783115..48126ba5df4 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_sidebar.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_sidebar.html.erb @@ -1,7 +1,9 @@
    + <%= render :partial => 'issues/favourites' -%> +
    - <% if @filter.id %> + <% if @filter && @filter.id %> <% end %> diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/manage.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/manage.html.erb new file mode 100644 index 00000000000..0f95f2ae53a --- /dev/null +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/manage.html.erb @@ -0,0 +1,53 @@ +
    +
    + <%= render :partial => 'issues/sidebar' -%> +
    +
    +
    +

    <%= message 'issue_filter.manage.my_filters' -%>

    + + + + + + + + + <% if @my_filters.empty? %> + + + + <% else %> + <% @my_filters.each do |filter| %> + + + + + <% end %> + <% end %> + +
    <%= message('name') -%><%= message('operations') -%>
    <%= message('issue_filter.no_filters') -%>
    + <%= link_to h(filter.name), :action => 'filter', :id => filter.id -%> + <% if filter.description %> +
    <%= h filter.description -%>
    + <% end %> +     		+ + +   + <%= message('edit') -%> +   + <%= link_to_action message('delete'), "#{ApplicationController.root_context}/issues/delete/#{filter.id}", + :class => 'link-action link-red', + :id => "delete_#{filter.name.parameterize}", + :confirm_button => message('delete'), + :confirm_title => 'issue_filter.delete_confirm_title', + :confirm_msg => 'issue_filter.are_you_sure_want_delete_filter_x', + :confirm_msg_params => [filter.name] -%> +
    + +
    +
    +
    \ No newline at end of file diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/search.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/search.html.erb index 7ffbc9df5d3..48f0fbb4f42 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/search.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/search.html.erb @@ -5,6 +5,8 @@
    + <%= render :partial => 'display_errors' %> +
    <%= render :partial => 'action_links' -%>
    diff --git a/sonar-server/src/test/java/org/sonar/server/issue/InternalRubyIssueServiceTest.java b/sonar-server/src/test/java/org/sonar/server/issue/InternalRubyIssueServiceTest.java index eac0c788819..495bcf5ea4b 100644 --- a/sonar-server/src/test/java/org/sonar/server/issue/InternalRubyIssueServiceTest.java +++ b/sonar-server/src/test/java/org/sonar/server/issue/InternalRubyIssueServiceTest.java @@ -24,9 +24,11 @@ import org.junit.Before; import org.junit.Test; import org.mockito.ArgumentCaptor; import org.sonar.api.issue.ActionPlan; +import org.sonar.api.issue.IssueQuery; import org.sonar.api.issue.internal.FieldDiffs; import org.sonar.api.user.User; import org.sonar.core.issue.DefaultActionPlan; +import org.sonar.core.issue.DefaultIssueFilter; import org.sonar.core.resource.ResourceDao; import org.sonar.core.resource.ResourceDto; import org.sonar.core.resource.ResourceQuery; @@ -67,10 +69,10 @@ public class InternalRubyIssueServiceTest { parameters.put("project", "org.sonar.Sample"); parameters.put("deadLine", "2113-05-13"); - ArgumentCaptor actionPlanCaptor = ArgumentCaptor.forClass(ActionPlan.class); Result result = service.createActionPlan(parameters); assertThat(result.ok()).isTrue(); + ArgumentCaptor actionPlanCaptor = ArgumentCaptor.forClass(ActionPlan.class); verify(actionPlanService).create(actionPlanCaptor.capture(), any(UserSession.class)); ActionPlan actionPlan = actionPlanCaptor.getValue(); @@ -91,10 +93,10 @@ public class InternalRubyIssueServiceTest { parameters.put("deadLine", "2113-05-13"); parameters.put("project", "org.sonar.MultiSample"); - ArgumentCaptor actionPlanCaptor = ArgumentCaptor.forClass(ActionPlan.class); Result result = service.updateActionPlan("ABCD", parameters); assertThat(result.ok()).isTrue(); + ArgumentCaptor actionPlanCaptor = ArgumentCaptor.forClass(ActionPlan.class); verify(actionPlanService).update(actionPlanCaptor.capture(), any(UserSession.class)); ActionPlan actionPlan = actionPlanCaptor.getValue(); @@ -276,14 +278,6 @@ public class InternalRubyIssueServiceTest { assertThat(result.errors()).contains(Result.Message.ofL10n("action_plans.errors.project_does_not_exist", "org.sonar.Sample")); } - public String createLongString(int size) { - String result = ""; - for (int i = 0; i < size; i++) { - result += "c"; - } - return result; - } - @Test public void test_changelog() throws Exception { IssueChangelog changelog = new IssueChangelog(Collections.emptyList(), Collections.emptyList()); @@ -294,13 +288,47 @@ public class InternalRubyIssueServiceTest { assertThat(result).isSameAs(changelog); } + @Test + public void should_create_issue_filter() { + Map parameters = newHashMap(); + parameters.put("name", "Long term"); + parameters.put("description", "Long term issues"); + + Result result = service.createIssueFilter(parameters); + assertThat(result.ok()).isTrue(); + + ArgumentCaptor issueFilterCaptor = ArgumentCaptor.forClass(DefaultIssueFilter.class); + verify(issueFilterService).save(issueFilterCaptor.capture(), any(UserSession.class)); + DefaultIssueFilter issueFilter = issueFilterCaptor.getValue(); + assertThat(issueFilter.name()).isEqualTo("Long term"); + assertThat(issueFilter.description()).isEqualTo("Long term issues"); + } + + @Test + public void should_update_issue_filter() { + Map parameters = newHashMap(); + parameters.put("id", "10"); + parameters.put("name", "Long term"); + parameters.put("description", "Long term issues"); + + Result result = service.updateIssueFilter(parameters); + assertThat(result.ok()).isTrue(); + + ArgumentCaptor issueFilterCaptor = ArgumentCaptor.forClass(DefaultIssueFilter.class); + verify(issueFilterService).update(issueFilterCaptor.capture(), any(UserSession.class)); + DefaultIssueFilter issueFilter = issueFilterCaptor.getValue(); + assertThat(issueFilter.id()).isEqualTo(10L); + assertThat(issueFilter.name()).isEqualTo("Long term"); + assertThat(issueFilter.description()).isEqualTo("Long term issues"); + } + @Test public void should_get_error_on_issue_filter_result_when_no_name() { Map parameters = newHashMap(); parameters.put("name", null); parameters.put("description", "Long term issues"); - Result result = service.createIssueFilterResult(parameters); + Result result = service.createIssueFilterResult(parameters, false); assertThat(result.ok()).isFalse(); assertThat(result.errors()).contains(Result.Message.ofL10n("errors.cant_be_empty", "name")); } @@ -311,7 +339,7 @@ public class InternalRubyIssueServiceTest { parameters.put("name", createLongString(101)); parameters.put("description", "Long term issues"); - Result result = service.createIssueFilterResult(parameters); + Result result = service.createIssueFilterResult(parameters, false); assertThat(result.ok()).isFalse(); assertThat(result.errors()).contains(Result.Message.ofL10n("errors.is_too_long", "name", 100)); } @@ -322,8 +350,54 @@ public class InternalRubyIssueServiceTest { parameters.put("name", "Long term"); parameters.put("description", createLongString(4001)); - Result result = service.createIssueFilterResult(parameters); + Result result = service.createIssueFilterResult(parameters, false); assertThat(result.ok()).isFalse(); assertThat(result.errors()).contains(Result.Message.ofL10n("errors.is_too_long", "description", 4000)); } + + @Test + public void should_get_error_on_issue_filter_result_when_id_is_null_on_update() { + Map parameters = newHashMap(); + parameters.put("id", null); + parameters.put("name", "Long term"); + parameters.put("description", "Long term issues"); + + Result result = service.createIssueFilterResult(parameters, true); + assertThat(result.ok()).isFalse(); + assertThat(result.errors()).contains(Result.Message.ofL10n("errors.cant_be_empty", "id")); + } + + @Test + public void should_execute_issue_filter_from_issue_query() { + service.execute(IssueQuery.builder().build()); + verify(issueFilterService).execute(any(IssueQuery.class)); + } + + @Test + public void should_execute_issue_filter_from_existing_filter() { + service.execute(10L); + verify(issueFilterService).execute(eq(10L), any(UserSession.class)); + } + + @Test + public void should_find_user_issue_filters() { + service.findIssueFiltersForUser(); + verify(issueFilterService).findByUser(any(UserSession.class)); + } + + @Test + public void should_update_data() { + Map data = newHashMap(); + service.updateIssueFilterData(10L, data); + verify(issueFilterService).updateData(eq(10L), eq(data), any(UserSession.class)); + } + + private String createLongString(int size) { + String result = ""; + for (int i = 0; i < size; i++) { + result += "c"; + } + return result; + } + } diff --git a/sonar-server/src/test/java/org/sonar/server/issue/IssueFilterServiceTest.java b/sonar-server/src/test/java/org/sonar/server/issue/IssueFilterServiceTest.java index 6a608f25a47..2bb870c6b26 100644 --- a/sonar-server/src/test/java/org/sonar/server/issue/IssueFilterServiceTest.java +++ b/sonar-server/src/test/java/org/sonar/server/issue/IssueFilterServiceTest.java @@ -21,23 +21,238 @@ package org.sonar.server.issue; import org.junit.Before; +import org.junit.Test; +import org.mockito.ArgumentCaptor; import org.sonar.api.issue.IssueFinder; +import org.sonar.api.issue.IssueQuery; +import org.sonar.core.issue.DefaultIssueFilter; import org.sonar.core.issue.db.IssueFilterDao; +import org.sonar.core.issue.db.IssueFilterDto; +import org.sonar.server.user.UserSession; -import static org.mockito.Mockito.mock; +import java.util.List; +import java.util.Map; + +import static com.google.common.collect.Lists.newArrayList; +import static com.google.common.collect.Maps.newHashMap; +import static org.fest.assertions.Assertions.assertThat; +import static org.fest.assertions.Fail.fail; +import static org.mockito.Matchers.any; +import static org.mockito.Mockito.*; public class IssueFilterServiceTest { - IssueFilterService service; + private IssueFilterService service; + + private IssueFilterDao issueFilterDao; + private IssueFinder issueFinder; - IssueFilterDao issueFilterDao; - IssueFinder issueFinder; + private UserSession userSession; @Before public void before() { - issueFinder = mock(IssueFinder.class); + userSession = mock(UserSession.class); + when(userSession.isLoggedIn()).thenReturn(true); + when(userSession.userId()).thenReturn(10); + when(userSession.login()).thenReturn("john"); + issueFilterDao = mock(IssueFilterDao.class); + issueFinder = mock(IssueFinder.class); + service = new IssueFilterService(issueFilterDao, issueFinder); } + @Test + public void should_find_by_id() { + IssueFilterDto issueFilterDto = new IssueFilterDto().setId(1L).setName("My Issue").setUserLogin("john"); + when(issueFilterDao.selectById(1L)).thenReturn(issueFilterDto); + + DefaultIssueFilter issueFilter = service.findById(1L, userSession); + assertThat(issueFilter).isNotNull(); + assertThat(issueFilter.id()).isEqualTo(1L); + } + + @Test + public void should_not_find_by_id_on_not_existing_issue() { + when(issueFilterDao.selectById(1L)).thenReturn(null); + try { + service.findById(1L, userSession); + fail(); + } catch (Exception e) { + assertThat(e).isInstanceOf(IllegalArgumentException.class).hasMessage("Filter not found: 1"); + } + } + + @Test + public void should_not_find_by_id_if_not_logged() { + when(userSession.isLoggedIn()).thenReturn(false); + try { + service.findById(1L, userSession); + fail(); + } catch (Exception e) { + assertThat(e).isInstanceOf(IllegalStateException.class).hasMessage("User is not logged in"); + } + + verifyZeroInteractions(issueFilterDao); + } + + @Test + public void should_not_find_if_user_is_not_the_owner_of_filter() { + IssueFilterDto issueFilterDto = new IssueFilterDto().setId(1L).setName("My Issue").setUserLogin("eric"); + when(issueFilterDao.selectById(1L)).thenReturn(issueFilterDto); + try { + // John is not authorized to see eric filters + service.findById(1L, userSession); + fail(); + } catch (Exception e) { + assertThat(e).isInstanceOf(IllegalStateException.class).hasMessage("User is not authorized to get this filter"); + } + } + + @Test + public void should_find_by_user() { + when(issueFilterDao.selectByUser("john")).thenReturn(newArrayList(new IssueFilterDto().setId(1L).setName("My Issue").setUserLogin("john"))); + + List issueFilter = service.findByUser(userSession); + assertThat(issueFilter).hasSize(1); + assertThat(issueFilter.get(0).id()).isEqualTo(1L); + } + + @Test + public void should_find_by_user_return_empty_result_for_not_logged_user() { + when(userSession.isLoggedIn()).thenReturn(false); + + assertThat(service.findByUser(userSession)).isEmpty(); + } + + @Test + public void should_save() { + DefaultIssueFilter issueFilter = new DefaultIssueFilter().setName("My Issue"); + DefaultIssueFilter result = service.save(issueFilter, userSession); + assertThat(result.name()).isEqualTo("My Issue"); + assertThat(result.user()).isEqualTo("john"); + + verify(issueFilterDao).insert(any(IssueFilterDto.class)); + } + + @Test + public void should_not_save_if_not_logged() { + when(userSession.isLoggedIn()).thenReturn(false); + try { + DefaultIssueFilter issueFilter = new DefaultIssueFilter().setName("My Issue"); + service.save(issueFilter, userSession); + fail(); + } catch (Exception e) { + assertThat(e).isInstanceOf(IllegalStateException.class).hasMessage("User is not logged in"); + } + verify(issueFilterDao, never()).insert(any(IssueFilterDto.class)); + } + + @Test + public void should_not_save_if_name_already_used() { + when(issueFilterDao.selectByNameAndUser(eq("My Issue"), eq("john"), eq((Long) null))).thenReturn(new IssueFilterDto()); + try { + DefaultIssueFilter issueFilter = new DefaultIssueFilter().setName("My Issue"); + service.save(issueFilter, userSession); + fail(); + } catch (Exception e) { + assertThat(e).isInstanceOf(IllegalArgumentException.class).hasMessage("Name already exists"); + } + verify(issueFilterDao, never()).insert(any(IssueFilterDto.class)); + } + + @Test + public void should_update() { + when(issueFilterDao.selectById(1L)).thenReturn(new IssueFilterDto().setId(1L).setName("My Old Filter").setUserLogin("john")); + + DefaultIssueFilter result = service.update(new DefaultIssueFilter().setId(1L).setName("My New Filter"), userSession); + assertThat(result.name()).isEqualTo("My New Filter"); + + verify(issueFilterDao).update(any(IssueFilterDto.class)); + } + + @Test + public void should_not_update_if_filter_not_found() { + when(issueFilterDao.selectById(1L)).thenReturn(null); + + try { + service.update(new DefaultIssueFilter().setId(1L).setName("My New Filter"), userSession); + fail(); + } catch (Exception e) { + assertThat(e).isInstanceOf(IllegalArgumentException.class).hasMessage("Filter not found: 1"); + } + verify(issueFilterDao, never()).update(any(IssueFilterDto.class)); + } + + @Test + public void should_not_update_if_name_already_used() { + when(issueFilterDao.selectById(1L)).thenReturn(new IssueFilterDto().setId(1L).setName("My Old Filter").setUserLogin("john")); + when(issueFilterDao.selectByNameAndUser(eq("My Issue"), eq("john"), eq(1L))).thenReturn(new IssueFilterDto()); + + try { + service.update(new DefaultIssueFilter().setId(1L).setName("My Issue"), userSession); + fail(); + } catch (Exception e) { + assertThat(e).isInstanceOf(IllegalArgumentException.class).hasMessage("Name already exists"); + } + verify(issueFilterDao, never()).update(any(IssueFilterDto.class)); + } + + @Test + public void should_update_data() { + when(issueFilterDao.selectById(1L)).thenReturn(new IssueFilterDto().setId(1L).setName("My Old Filter").setUserLogin("john")); + + Map data = newHashMap(); + data.put("componentRoots", "struts"); + + DefaultIssueFilter result = service.updateData(1L, data, userSession); + assertThat(result.data()).isEqualTo("componentRoots=struts"); + + verify(issueFilterDao).update(any(IssueFilterDto.class)); + } + + @Test + public void should_delete() { + when(issueFilterDao.selectById(1L)).thenReturn(new IssueFilterDto().setId(1L).setName("My Issues").setUserLogin("john")); + + service.delete(1L, userSession); + + verify(issueFilterDao).delete(1L); + } + + @Test + public void should_not_delete_if_filter_not_found() { + when(issueFilterDao.selectById(1L)).thenReturn(null); + + try { + service.delete(1L, userSession); + fail(); + } catch (Exception e) { + assertThat(e).isInstanceOf(IllegalArgumentException.class).hasMessage("Filter not found: 1"); + } + verify(issueFilterDao, never()).delete(anyLong()); + } + + @Test + public void should_execute_from_issue_query() { + IssueQuery issueQuery = IssueQuery.builder().build(); + + service.execute(issueQuery); + + verify(issueFinder).find(issueQuery); + } + + @Test + public void should_execute_from_filter_id() { + when(issueFilterDao.selectById(1L)).thenReturn(new IssueFilterDto().setId(1L).setName("My Old Filter").setUserLogin("john").setData("componentRoots=struts")); + + ArgumentCaptor issueQueryCaptor = ArgumentCaptor.forClass(IssueQuery.class); + + service.execute(1L, userSession); + verify(issueFinder).find(issueQueryCaptor.capture()); + + IssueQuery issueQuery = issueQueryCaptor.getValue(); + assertThat(issueQuery.componentRoots()).contains("struts"); + } + }