aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorJean-Baptiste Lievremont <jean-baptiste.lievremont@sonarsource.com>2014-03-13 15:33:07 +0100
committerJean-Baptiste Lievremont <jean-baptiste.lievremont@sonarsource.com>2014-03-13 16:16:21 +0100
commit1c2545e146ab0067c928363b62a57d7a206f22b3 (patch)
tree9e7a53e6da56bf899a35ee139b05e85bacca8ce8 /plugins
parent4d75df2feac832421fa6e6b54167e441f1e51836 (diff)
downloadsonarqube-1c2545e146ab0067c928363b62a57d7a206f22b3.tar.gz
sonarqube-1c2545e146ab0067c928363b62a57d7a206f22b3.zip
SONAR-4366 Remove Alert class and related code
Diffstat (limited to 'plugins')
-rw-r--r--plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/GenerateAlertEvents.java7
-rw-r--r--plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/GenerateAlertEventsTest.java17
2 files changed, 4 insertions, 20 deletions
diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/GenerateAlertEvents.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/GenerateAlertEvents.java
index 9fb6f2d732d..4d6a8550dbe 100644
--- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/GenerateAlertEvents.java
+++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/GenerateAlertEvents.java
@@ -36,21 +36,18 @@ import java.util.List;
public class GenerateAlertEvents implements Decorator {
- private final RulesProfile profile;
private final QualityGate qualityGate;
private final TimeMachine timeMachine;
private NotificationManager notificationManager;
- public GenerateAlertEvents(RulesProfile profile, QualityGate qualityGate, TimeMachine timeMachine, NotificationManager notificationManager) {
- this.profile = profile;
+ public GenerateAlertEvents(QualityGate qualityGate, TimeMachine timeMachine, NotificationManager notificationManager) {
this.qualityGate = qualityGate;
this.timeMachine = timeMachine;
this.notificationManager = notificationManager;
}
public boolean shouldExecuteOnProject(Project project) {
- return profile != null && profile.getAlerts() != null && !profile.getAlerts().isEmpty()
- || qualityGate.isEnabled();
+ return qualityGate.isEnabled();
}
@DependsUpon
diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/GenerateAlertEventsTest.java b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/GenerateAlertEventsTest.java
index 76649d6b458..8d6b8a10b22 100644
--- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/GenerateAlertEventsTest.java
+++ b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/GenerateAlertEventsTest.java
@@ -30,8 +30,6 @@ import org.sonar.api.measures.Measure;
import org.sonar.api.measures.Metric;
import org.sonar.api.notifications.Notification;
import org.sonar.api.notifications.NotificationManager;
-import org.sonar.api.profiles.Alert;
-import org.sonar.api.profiles.RulesProfile;
import org.sonar.api.resources.File;
import org.sonar.api.resources.Project;
import org.sonar.api.test.ProjectTestBuilder;
@@ -41,16 +39,12 @@ import java.util.Arrays;
import java.util.Date;
import static org.fest.assertions.Assertions.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Matchers.isNull;
+import static org.mockito.Matchers.*;
import static org.mockito.Mockito.*;
public class GenerateAlertEventsTest {
private GenerateAlertEvents decorator;
private DecoratorContext context;
- private RulesProfile profile;
private QualityGate qualityGate;
private TimeMachine timeMachine;
private NotificationManager notificationManager;
@@ -60,10 +54,9 @@ public class GenerateAlertEventsTest {
public void setup() {
context = mock(DecoratorContext.class);
timeMachine = mock(TimeMachine.class);
- profile = mock(RulesProfile.class);
qualityGate = mock(QualityGate.class);
notificationManager = mock(NotificationManager.class);
- decorator = new GenerateAlertEvents(profile, qualityGate, timeMachine, notificationManager);
+ decorator = new GenerateAlertEvents(qualityGate, timeMachine, notificationManager);
project = new ProjectTestBuilder().build();
}
@@ -84,12 +77,6 @@ public class GenerateAlertEventsTest {
}
@Test
- public void shouldDecorateIfThresholds() {
- when(profile.getAlerts()).thenReturn(Arrays.asList(new Alert()));
- assertThat(decorator.shouldExecuteOnProject(project)).isTrue();
- }
-
- @Test
public void shouldNotDecorateIfNotRootProject() {
decorator.decorate(new File("Foo"), context);
verify(context, never()).createEvent(anyString(), anyString(), anyString(), (Date) isNull());