SONAR-3253 Fix possible NPE in org.sonar.api.measures.Measure#setData(String)

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/measures/Measure.java b/sonar-plugin-api/src/main/java/org/sonar/api/measures/Measure.java
index 61497f07af397aa29dc4f7f8c1857f348b138a3c..f5017c7b6255bac635d3a4e87443dc01caa3f906 100644 (file)
--- a/sonar-plugin-api/src/main/java/org/sonar/api/measures/Measure.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/measures/Measure.java
@@ -302,9 +302,6 @@ public class Measure {
    * @return the measure object instance
    */
   public Measure setData(String s) {
-    if (s != null && s.length() >= MAX_TEXT_SIZE && !metric.isDataType()) {
-      throw new IllegalArgumentException("Data is too long for non-data metric : size=" + s.length() + ", max=" + MAX_TEXT_SIZE);
-    }
     this.data = s;
     return this;
   }
@@ -328,7 +325,7 @@ public class Measure {
    * @since 2.7
    */
   public Measure unsetData() {
-    this.data=null;
+    this.data = null;
     return this;
   }
 

diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/measures/MeasureTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/measures/MeasureTest.java
index c6ba9262062f72595f3a69a9566ce0b525e47368..60d1276e4cd855fe77036d02c67d4cf90c90c89b 100644 (file)
--- a/sonar-plugin-api/src/test/java/org/sonar/api/measures/MeasureTest.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/measures/MeasureTest.java
@@ -26,10 +26,24 @@ import org.sonar.api.rules.RulePriority;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.*;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.not;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThat;
 
 public class MeasureTest {
 
+  @Test
+  public void valueCanBeNull() {
+    Measure measure = new Measure("metric_key").setValue(null);
+    assertThat(measure.getValue(), nullValue());
+  }
+
+  @Test(expected = IllegalArgumentException.class)
+  public void valueShouldNotBeNaN() {
+    new Measure("metric_key").setValue(Double.NaN);
+  }
+
   @Test
   public void scaleValue() {
     assertThat(new Measure(CoreMetrics.COVERAGE, 80.666666).getValue(), is(80.7));
@@ -75,15 +89,68 @@ public class MeasureTest {
     assertThat(new Measure(CoreMetrics.COVERAGE, 5.7777777, 3).getValue(), is(5.778));
   }
 
+  /**
+   * Proper definition of equality for measures is important, because used to store them.
+   */
   @Test
   public void equalsAndHashCode() {
-    assertEquals(new Measure(CoreMetrics.COVERAGE, 50.0), new Measure(CoreMetrics.COVERAGE, 50.0));
-    assertEquals(new Measure(CoreMetrics.COVERAGE, 50.0).hashCode(), new Measure(CoreMetrics.COVERAGE, 50.0).hashCode());
-  }
-
-  @Test(expected = IllegalArgumentException.class)
-  public void tooLongDataForNumericMetric() {
-    new Measure(CoreMetrics.COVERAGE, StringUtils.repeat("x", Measure.MAX_TEXT_SIZE + 1));
+    Measure measure1 = new Measure();
+    Measure measure2 = new Measure();
+
+    assertThat(measure1.equals(null), is(false));
+
+    // another class
+    assertThat(measure1.equals(""), is(false));
+
+    // same instance
+    assertThat(measure1.equals(measure1), is(true));
+    assertThat(measure1.hashCode(), equalTo(measure2.hashCode()));
+
+    // same key - null
+    assertThat(measure1.equals(measure2), is(true));
+    assertThat(measure2.equals(measure1), is(true));
+    assertThat(measure1.hashCode(), equalTo(measure2.hashCode()));
+
+    // different keys
+    measure1.setMetric(CoreMetrics.COVERAGE);
+    assertThat(measure1.equals(measure2), is(false));
+    assertThat(measure2.equals(measure1), is(false));
+    assertThat(measure1.hashCode(), not(equalTo(measure2.hashCode())));
+
+    measure2.setMetric(CoreMetrics.LINES);
+    assertThat(measure1.equals(measure2), is(false));
+    assertThat(measure2.equals(measure1), is(false));
+    assertThat(measure1.hashCode(), not(equalTo(measure2.hashCode())));
+
+    // same key
+    measure2.setMetric(CoreMetrics.COVERAGE);
+    assertThat(measure1.equals(measure2), is(true));
+    assertThat(measure2.equals(measure1), is(true));
+    assertThat(measure1.hashCode(), equalTo(measure2.hashCode()));
+
+    // different committer
+    measure1.setCommitter("simon");
+    assertThat(measure1.equals(measure2), is(false));
+    assertThat(measure2.equals(measure1), is(false));
+    assertThat(measure1.hashCode(), not(equalTo(measure2.hashCode())));
+
+    measure2.setCommitter("evgeny");
+    assertThat(measure1.equals(measure2), is(false));
+    assertThat(measure2.equals(measure1), is(false));
+    assertThat(measure1.hashCode(), not(equalTo(measure2.hashCode())));
+
+    // same committer
+    measure2.setCommitter("simon");
+    assertThat(measure1.equals(measure2), is(true));
+    assertThat(measure2.equals(measure1), is(true));
+    assertThat(measure1.hashCode(), equalTo(measure2.hashCode()));
+
+    // value doesn't matter
+    measure1.setValue(1.0);
+    measure2.setValue(2.0);
+    assertThat(measure1.equals(measure2), is(true));
+    assertThat(measure2.equals(measure1), is(true));
+    assertThat(measure1.hashCode(), equalTo(measure2.hashCode()));
   }
 
   @Test
@@ -118,7 +185,7 @@ public class MeasureTest {
   @Test
   public void shouldUnsetData() {
     String data = "1=10;21=456";
-    Measure measure = new Measure(CoreMetrics.CONDITIONS_BY_LINE).setData( data);
+    Measure measure = new Measure(CoreMetrics.CONDITIONS_BY_LINE).setData(data);
     assertThat(measure.hasData(), is(true));
     assertThat(measure.getData(), is(data));