Remove Old Gauge and correct exception messages (#1502)

4 files changed, 10 insertions, 10 deletions

diff --git a/api/src/test/java/io/opencensus/metrics/DoubleGaugeTest.java b/api/src/test/java/io/opencensus/metrics/DoubleGaugeTest.java
index 5690bd44..b0cdea7c 100644
--- a/api/src/test/java/io/opencensus/metrics/DoubleGaugeTest.java
+++ b/api/src/test/java/io/opencensus/metrics/DoubleGaugeTest.java
@@ -49,7 +49,7 @@ public class DoubleGaugeTest {
     DoubleGauge doubleGauge =
         DoubleGauge.newNoopDoubleGauge(NAME, DESCRIPTION, UNIT, EMPTY_LABEL_KEYS);
     thrown.expect(NullPointerException.class);
-    thrown.expectMessage("labelValues should not be null.");
+    thrown.expectMessage("labelValues");
     doubleGauge.getOrCreateTimeSeries(null);
   }
 
@@ -58,7 +58,7 @@ public class DoubleGaugeTest {
     List<LabelValue> labelValues = Collections.singletonList(null);
     DoubleGauge doubleGauge = DoubleGauge.newNoopDoubleGauge(NAME, DESCRIPTION, UNIT, LABEL_KEY);
     thrown.expect(NullPointerException.class);
-    thrown.expectMessage("labelValues element should not be null.");
+    thrown.expectMessage("labelValue element should not be null.");
     doubleGauge.getOrCreateTimeSeries(labelValues);
   }
 
@@ -74,7 +74,7 @@ public class DoubleGaugeTest {
   public void noopRemoveTimeSeries_WithNullLabelValues() {
     DoubleGauge doubleGauge = DoubleGauge.newNoopDoubleGauge(NAME, DESCRIPTION, UNIT, LABEL_KEY);
     thrown.expect(NullPointerException.class);
-    thrown.expectMessage("labelValues should not be null.");
+    thrown.expectMessage("labelValues");
     doubleGauge.removeTimeSeries(null);
   }
 
diff --git a/api/src/test/java/io/opencensus/metrics/LongGaugeTest.java b/api/src/test/java/io/opencensus/metrics/LongGaugeTest.java
index 768abe06..eedb287c 100644
--- a/api/src/test/java/io/opencensus/metrics/LongGaugeTest.java
+++ b/api/src/test/java/io/opencensus/metrics/LongGaugeTest.java
@@ -48,7 +48,7 @@ public class LongGaugeTest {
   public void noopGetOrCreateTimeSeries_WithNullLabelValues() {
     LongGauge longGauge = LongGauge.newNoopLongGauge(NAME, DESCRIPTION, UNIT, EMPTY_LABEL_KEYS);
     thrown.expect(NullPointerException.class);
-    thrown.expectMessage("labelValues should not be null.");
+    thrown.expectMessage("labelValues");
     longGauge.getOrCreateTimeSeries(null);
   }
 
@@ -57,7 +57,7 @@ public class LongGaugeTest {
     List<LabelValue> labelValues = Collections.singletonList(null);
     LongGauge longGauge = LongGauge.newNoopLongGauge(NAME, DESCRIPTION, UNIT, LABEL_KEY);
     thrown.expect(NullPointerException.class);
-    thrown.expectMessage("labelValues element should not be null.");
+    thrown.expectMessage("labelValue element should not be null.");
     longGauge.getOrCreateTimeSeries(labelValues);
   }
 
@@ -73,7 +73,7 @@ public class LongGaugeTest {
   public void noopRemoveTimeSeries_WithNullLabelValues() {
     LongGauge longGauge = LongGauge.newNoopLongGauge(NAME, DESCRIPTION, UNIT, LABEL_KEY);
     thrown.expect(NullPointerException.class);
-    thrown.expectMessage("labelValues should not be null.");
+    thrown.expectMessage("labelValues");
     longGauge.removeTimeSeries(null);
   }
 
diff --git a/api/src/test/java/io/opencensus/stats/AggregationDataTest.java b/api/src/test/java/io/opencensus/stats/AggregationDataTest.java
index 60551600..a6d6d1de 100644
--- a/api/src/test/java/io/opencensus/stats/AggregationDataTest.java
+++ b/api/src/test/java/io/opencensus/stats/AggregationDataTest.java
@@ -108,14 +108,14 @@ public class AggregationDataTest {
   @Test
   public void preventNullBucketCountList() {
     thrown.expect(NullPointerException.class);
-    thrown.expectMessage("bucket counts should not be null.");
+    thrown.expectMessage("bucketCounts");
     DistributionData.create(1, 1, 1, 1, 0, null);
   }
 
   @Test
   public void preventNullBucket() {
     thrown.expect(NullPointerException.class);
-    thrown.expectMessage("bucket should not be null.");
+    thrown.expectMessage("bucket");
     DistributionData.create(1, 1, 1, 1, 0, Arrays.asList(0L, 1L, null));
   }
 
@@ -129,7 +129,7 @@ public class AggregationDataTest {
   @Test
   public void preventNullExemplar() {
     thrown.expect(NullPointerException.class);
-    thrown.expectMessage("exemplar should not be null.");
+    thrown.expectMessage("exemplar");
     DistributionData.create(
         1, 1, 1, 1, 0, Arrays.asList(0L, 1L, 1L), Collections.<Exemplar>singletonList(null));
   }
diff --git a/api/src/test/java/io/opencensus/stats/AggregationTest.java b/api/src/test/java/io/opencensus/stats/AggregationTest.java
index c2e6a716..cf337030 100644
--- a/api/src/test/java/io/opencensus/stats/AggregationTest.java
+++ b/api/src/test/java/io/opencensus/stats/AggregationTest.java
@@ -50,7 +50,7 @@ public class AggregationTest {
   @Test
   public void testNullBucketBoundaries() {
     thrown.expect(NullPointerException.class);
-    thrown.expectMessage("bucketBoundaries should not be null.");
+    thrown.expectMessage("bucketBoundaries");
     Distribution.create(null);
   }