Improve ViolationsDecoratorTest

diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/ViolationsDecoratorTest.java b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/ViolationsDecoratorTest.java
index eb370afdad9fc07602e35a4ccaa5e9703f03110c..7ea119a24ac57012f86f4567254419e5c57b0b62 100644 (file)
--- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/ViolationsDecoratorTest.java
+++ b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/ViolationsDecoratorTest.java
@@ -115,11 +115,11 @@ public class ViolationsDecoratorTest {
 
     decorator.decorate(resource, context);
 
-    verify(context).saveMeasure(argThat(new IsRuleMeasure(CoreMetrics.VIOLATIONS, null, null, RulePriority.BLOCKER, 0.0)));
-    verify(context).saveMeasure(argThat(new IsRuleMeasure(CoreMetrics.VIOLATIONS, null, null, RulePriority.CRITICAL, 2.0)));
-    verify(context).saveMeasure(argThat(new IsRuleMeasure(CoreMetrics.VIOLATIONS, null, null, RulePriority.MAJOR, 1.0)));
-    verify(context).saveMeasure(argThat(new IsRuleMeasure(CoreMetrics.VIOLATIONS, null, null, RulePriority.MINOR, 1.0)));
-    verify(context).saveMeasure(argThat(new IsRuleMeasure(CoreMetrics.VIOLATIONS, null, null, RulePriority.INFO, 0.0)));
+    verify(context).saveMeasure(argThat(new IsRuleMeasure(CoreMetrics.VIOLATIONS, null, RulePriority.BLOCKER, 0.0)));
+    verify(context).saveMeasure(argThat(new IsRuleMeasure(CoreMetrics.VIOLATIONS, null, RulePriority.CRITICAL, 2.0)));
+    verify(context).saveMeasure(argThat(new IsRuleMeasure(CoreMetrics.VIOLATIONS, null, RulePriority.MAJOR, 1.0)));
+    verify(context).saveMeasure(argThat(new IsRuleMeasure(CoreMetrics.VIOLATIONS, null, RulePriority.MINOR, 1.0)));
+    verify(context).saveMeasure(argThat(new IsRuleMeasure(CoreMetrics.VIOLATIONS, null, RulePriority.INFO, 0.0)));
 
     verify(context).saveMeasure(argThat(new IsMeasure(CoreMetrics.BLOCKER_VIOLATIONS, 0.0)));
     verify(context).saveMeasure(argThat(new IsMeasure(CoreMetrics.CRITICAL_VIOLATIONS, 2.0)));
@@ -128,6 +128,17 @@ public class ViolationsDecoratorTest {
     verify(context).saveMeasure(argThat(new IsMeasure(CoreMetrics.INFO_VIOLATIONS, 0.0)));
   }
 
+  @Test
+  public void ruleViolations() {
+    when(context.getViolations()).thenReturn(createViolations());
+
+    decorator.decorate(resource, context);
+
+    verify(context).saveMeasure(argThat(new IsRuleMeasure(CoreMetrics.VIOLATIONS, ruleA1, RulePriority.CRITICAL, 2.0)));
+    verify(context).saveMeasure(argThat(new IsRuleMeasure(CoreMetrics.VIOLATIONS, ruleA2, RulePriority.MAJOR, 1.0)));
+    verify(context).saveMeasure(argThat(new IsRuleMeasure(CoreMetrics.VIOLATIONS, ruleB1, RulePriority.MINOR, 1.0)));
+  }
+
   private List<Violation> createViolations() {
     List<Violation> violations = new ArrayList<Violation>();
     violations.add(Violation.create(ruleA1, resource).setPriority(RulePriority.CRITICAL));

diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/test/IsRuleMeasure.java b/sonar-plugin-api/src/test/java/org/sonar/api/test/IsRuleMeasure.java
index 14dadb15f87ee8d177c3bc7ed3b7518ad0f9f1f4..364ea4ab3bde01fb8e179fa6cb111b1a2e739cd8 100644 (file)
--- a/sonar-plugin-api/src/test/java/org/sonar/api/test/IsRuleMeasure.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/test/IsRuleMeasure.java
@@ -36,13 +36,23 @@ public class IsRuleMeasure extends BaseMatcher<Measure> {
   private RulePriority priority = null;
   private Double value = null;
 
-  public IsRuleMeasure(Metric metric, Rule rule, Integer category, RulePriority priority, Double value) {
+  public IsRuleMeasure(Metric metric, Rule rule, RulePriority priority, Double value) {
     this.metric = metric;
     this.rule = rule;
     this.priority = priority;
     this.value = value;
   }
 
+  /**
+   * @deprecated since 2.5
+   *             category not used anymore - see http://jira.codehaus.org/browse/SONAR-2007 , so use
+   *             {@link #IsRuleMeasure(Metric, Rule, RulePriority, Double)} instead
+   */
+  @Deprecated
+  public IsRuleMeasure(Metric metric, Rule rule, Integer category, RulePriority priority, Double value) {
+    this(metric, rule, priority, value);
+  }
+
   public boolean matches(Object o) {
     if (!(o instanceof RuleMeasure)) {
       return false;