From 775816d699bd4f02788db5609a87386940e34aff Mon Sep 17 00:00:00 2001 From: Yang Song Date: Mon, 13 Aug 2018 11:36:27 -0700 Subject: Metrics: Implement ExportComponent, make ProducerManager abstract. (#1347) * Metrics: Implement ExportComponent, make ProducerManager abstract. * Metrics: Add impl and impllite. * Resolve two TODOs. * Fix import path, leave a TODO for getMetricRegistry. * Make NoopMetricProducerManager private. Add missing since tag. --- .../metrics/export/MetricProducerManagerTest.java | 40 +++------------------- 1 file changed, 4 insertions(+), 36 deletions(-) (limited to 'api/src/test') diff --git a/api/src/test/java/io/opencensus/metrics/export/MetricProducerManagerTest.java b/api/src/test/java/io/opencensus/metrics/export/MetricProducerManagerTest.java index b79de213..07854927 100644 --- a/api/src/test/java/io/opencensus/metrics/export/MetricProducerManagerTest.java +++ b/api/src/test/java/io/opencensus/metrics/export/MetricProducerManagerTest.java @@ -19,7 +19,6 @@ package io.opencensus.metrics.export; import static com.google.common.truth.Truth.assertThat; import io.opencensus.metrics.MetricProducer; -import java.util.Set; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -32,9 +31,9 @@ import org.mockito.MockitoAnnotations; /** Unit tests for {@link MetricProducerManager}. */ @RunWith(JUnit4.class) public class MetricProducerManagerTest { - private final MetricProducerManager metricProducerManager = new MetricProducerManager(); + private final MetricProducerManager metricProducerManager = + MetricProducerManager.newNoopMetricProducerManager(); @Mock private MetricProducer metricProducer; - @Mock private MetricProducer metricProducerOther; @Rule public final ExpectedException thrown = ExpectedException.none(); @@ -52,34 +51,13 @@ public class MetricProducerManagerTest { @Test public void add() { metricProducerManager.add(metricProducer); - assertThat(metricProducerManager.getAllMetricProducer()).containsExactly(metricProducer); - } - - @Test - public void add_DuplicateElement() { - metricProducerManager.add(metricProducer); - Set metricProducerSet = metricProducerManager.getAllMetricProducer(); - assertThat(metricProducerSet).containsExactly(metricProducer); - metricProducerManager.add(metricProducer); - // Returns the same object. - assertThat(metricProducerManager.getAllMetricProducer()).isSameAs(metricProducerSet); - } - - @Test - public void add_MultipleElements() { - metricProducerManager.add(metricProducer); - Set metricProducerSet = metricProducerManager.getAllMetricProducer(); - assertThat(metricProducerSet).containsExactly(metricProducer); - metricProducerManager.add(metricProducerOther); - // Returns the same object. - assertThat(metricProducerManager.getAllMetricProducer()) - .containsExactly(metricProducer, metricProducerOther); + assertThat(metricProducerManager.getAllMetricProducer()).isEmpty(); } @Test public void addAndRemove() { metricProducerManager.add(metricProducer); - assertThat(metricProducerManager.getAllMetricProducer()).containsExactly(metricProducer); + assertThat(metricProducerManager.getAllMetricProducer()).isEmpty(); metricProducerManager.remove(metricProducer); assertThat(metricProducerManager.getAllMetricProducer()).isEmpty(); } @@ -96,16 +74,6 @@ public class MetricProducerManagerTest { assertThat(metricProducerManager.getAllMetricProducer()).isEmpty(); } - @Test - public void remove_NotPresent() { - metricProducerManager.add(metricProducer); - Set metricProducerSet = metricProducerManager.getAllMetricProducer(); - assertThat(metricProducerSet).containsExactly(metricProducer); - metricProducerManager.remove(metricProducerOther); - // Returns the same object. - assertThat(metricProducerManager.getAllMetricProducer()).isSameAs(metricProducerSet); - } - @Test public void getAllMetricProducer_empty() { assertThat(metricProducerManager.getAllMetricProducer()).isEmpty(); -- cgit v1.2.3