From ec1f6fbe740e121bbf14d4138663e353144d54a2 Mon Sep 17 00:00:00 2001 From: Jacek Date: Fri, 13 Dec 2019 11:20:52 +0100 Subject: SONAR-12745 Adjust `changes on my issue` email notification for Security Hotspots --- .../ce/task/projectanalysis/notification/NotificationFactory.java | 2 +- .../task/projectanalysis/step/SendIssueNotificationsStepTest.java | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'server/sonar-ce-task-projectanalysis') diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/notification/NotificationFactory.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/notification/NotificationFactory.java index a8af2f653ab..c66877890cb 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/notification/NotificationFactory.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/notification/NotificationFactory.java @@ -111,7 +111,7 @@ public class NotificationFactory { private IssuesChangesNotificationBuilder.Rule getRuleByRuleKey(RuleKey ruleKey) { return ruleRepository.findByKey(ruleKey) - .map(t -> new IssuesChangesNotificationBuilder.Rule(ruleKey, t.getName())) + .map(t -> new IssuesChangesNotificationBuilder.Rule(ruleKey, t.getType(), t.getName())) .orElseThrow(() -> new IllegalStateException("Can not find rule " + ruleKey + " in RuleRepository")); } diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/SendIssueNotificationsStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/SendIssueNotificationsStepTest.java index ab65a1138f1..2c34348cc4f 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/SendIssueNotificationsStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/SendIssueNotificationsStepTest.java @@ -92,6 +92,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; +import static org.sonar.api.rules.RuleType.SECURITY_HOTSPOT; import static org.sonar.ce.task.projectanalysis.component.Component.Type; import static org.sonar.ce.task.projectanalysis.component.ReportComponent.builder; import static org.sonar.ce.task.projectanalysis.step.SendIssueNotificationsStep.NOTIF_TYPES; @@ -133,7 +134,7 @@ public class SendIssueNotificationsStepTest extends BaseStepTest { public DbTester db = DbTester.create(System2.INSTANCE); private final Random random = new Random(); - private final RuleType[] RULE_TYPES_EXCEPT_HOTSPOTS = Stream.of(RuleType.values()).filter(r -> r != RuleType.SECURITY_HOTSPOT).toArray(RuleType[]::new); + private final RuleType[] RULE_TYPES_EXCEPT_HOTSPOTS = Stream.of(RuleType.values()).filter(r -> r != SECURITY_HOTSPOT).toArray(RuleType[]::new); private final RuleType randomRuleType = RULE_TYPES_EXCEPT_HOTSPOTS[random.nextInt(RULE_TYPES_EXCEPT_HOTSPOTS.length)]; @SuppressWarnings("unchecked") private Class> assigneeCacheType = (Class>) (Object) Map.class; @@ -460,7 +461,7 @@ public class SendIssueNotificationsStepTest extends BaseStepTest { .isEmpty(); Tuple[] expected = stream(users).map(user -> tuple(user.getUuid(), user.getUuid(), user.getId(), user.getLogin())).toArray(Tuple[]::new); assertThat(cache.entrySet()) - .extracting(t -> t.getKey(), t -> t.getValue().getUuid(), t -> t.getValue().getId(), t -> t.getValue().getLogin()) + .extracting(Map.Entry::getKey, t -> t.getValue().getUuid(), t -> t.getValue().getId(), t -> t.getValue().getLogin()) .containsOnly(expected); } @@ -488,7 +489,7 @@ public class SendIssueNotificationsStepTest extends BaseStepTest { } @Test - public void dont_send_issues_change_notification_for_hotspot() { + public void do_not_send_new_issues_notifications_for_hotspot() { UserDto user = db.users().insertUser(); ComponentDto project = newPrivateProjectDto(newOrganizationDto()).setDbKey(PROJECT.getDbKey()).setLongName(PROJECT.getName()); ComponentDto file = newFileDto(project).setDbKey(FILE.getDbKey()).setLongName(FILE.getName()); -- cgit v1.2.3