zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-07-25 20:18:34 +02:00
Code Issues Projects Releases Packages Wiki Activity

Use backported JUnit exceptThrows and assertThrows in metrics library

Browse source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=176584707
This commit is contained in:
jianglai 2017-11-21 17:26:07 -08:00
parent 6eb0d8689d
commit a92cdbe8c3
17 changed files with 325 additions and 226 deletions
Download patch file Download diff file Expand all files Collapse all files

17
javatests/google/registry/monitoring/metrics/EventMetricTest.java
View file

@ -15,6 +15,7 @@
package google.registry.monitoring.metrics;
import static com.google.common.truth.Truth.assertThat;
import static google.registry.monitoring.metrics.JUnitBackports.expectThrows;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableRangeMap;
@ -22,9 +23,7 @@ import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Range;
import org.joda.time.Instant;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
@ -34,9 +33,6 @@ public class EventMetricTest {
private final DistributionFitter distributionFitter = CustomFitter.create(ImmutableSet.of(5.0));
private EventMetric metric;
@Rule public final ExpectedException thrown = ExpectedException.none();
@Before
public void setUp() {
metric =
@ -67,11 +63,12 @@ public class EventMetricTest {
@Test
public void testIncrementBy_wrongLabelValueCount_throwsException() {
thrown.expect(IllegalArgumentException.class);
thrown.expectMessage(
"The count of labelValues must be equal to the underlying Metric's count of labels.");
metric.record(1.0, "blah", "blah");
IllegalArgumentException thrown =
expectThrows(IllegalArgumentException.class, () -> metric.record(1.0, "blah", "blah"));
assertThat(thrown)
.hasMessageThat()
.contains(
"The count of labelValues must be equal to the underlying Metric's count of labels.");
}
@Test