From 07795b9fc3ff3005aef89b7f897745631f2f3a93 Mon Sep 17 00:00:00 2001 From: Teryk Bellahsene Date: Wed, 11 Mar 2015 14:06:08 +0100 Subject: [PATCH] do not send notification when there are no new issues --- .../server/issue/notification/NewIssuesStatistics.java | 3 ++- .../issue/notification/NewIssuesStatisticsTest.java | 8 ++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/notification/NewIssuesStatistics.java b/server/sonar-server/src/main/java/org/sonar/server/issue/notification/NewIssuesStatistics.java index 7e346c918e3..63e97ef066b 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/notification/NewIssuesStatistics.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/notification/NewIssuesStatistics.java @@ -118,7 +118,8 @@ public class NewIssuesStatistics { } public boolean hasIssues() { - return distributions.get(SEVERITY) != null; + Multiset severityStats = distributions.get(SEVERITY); + return severityStats != null && severityStats.size() > 0; } public List> statsForMetric(METRIC metric) { diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/notification/NewIssuesStatisticsTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/notification/NewIssuesStatisticsTest.java index 00ecf99da51..a23f6570126 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/notification/NewIssuesStatisticsTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/notification/NewIssuesStatisticsTest.java @@ -52,6 +52,14 @@ public class NewIssuesStatisticsTest { assertThat(countDistribution(METRIC.TAGS, "owasp")).isEqualTo(3); assertThat(countDistribution(METRIC.TAGS, "wrong-tag")).isEqualTo(0); assertThat(sut.globalStatistics().debt().toMinutes()).isEqualTo(15L); + assertThat(sut.globalStatistics().hasIssues()).isTrue(); + assertThat(sut.hasIssues()).isTrue(); + assertThat(sut.assigneesStatistics().get("maynard").hasIssues()).isTrue(); + } + + @Test + public void do_not_have_issues_when_no_issue_added() throws Exception { + assertThat(sut.globalStatistics().hasIssues()).isFalse(); } private int countDistribution(METRIC metric, String label) { -- 2.39.5