diff options
author | Joss Armstrong <joss.armstrong@ericsson.com> | 2019-02-25 10:32:13 +0000 |
---|---|---|
committer | Takamune Cho <takamune.cho@att.com> | 2019-02-26 15:33:58 +0000 |
commit | b0b57534dd4e69913753b9acf1c3a495b7738f6a (patch) | |
tree | 199ce34fd017a217588986d69e1e3152fe54ae61 /appc-metric/appc-metric-bundle/src/test | |
parent | 423a91b62f381167bf7852c4ac987b96ba06f35c (diff) |
Fix for casting/subclassing in MetricRegistry
Put in code to avoid cast exceptions from this class
and updated tests
Issue-ID: APPC-1480
Change-Id: I8b54d93e52eb523f08d13e874b4d18d05feede6b
Signed-off-by: Joss Armstrong <joss.armstrong@ericsson.com>
Diffstat (limited to 'appc-metric/appc-metric-bundle/src/test')
-rw-r--r-- | appc-metric/appc-metric-bundle/src/test/java/org/onap/appc/metricservice/impl/MetricRegistryImplTest.java | 32 |
1 files changed, 24 insertions, 8 deletions
diff --git a/appc-metric/appc-metric-bundle/src/test/java/org/onap/appc/metricservice/impl/MetricRegistryImplTest.java b/appc-metric/appc-metric-bundle/src/test/java/org/onap/appc/metricservice/impl/MetricRegistryImplTest.java index 09e5ba954..0bde7f7df 100644 --- a/appc-metric/appc-metric-bundle/src/test/java/org/onap/appc/metricservice/impl/MetricRegistryImplTest.java +++ b/appc-metric/appc-metric-bundle/src/test/java/org/onap/appc/metricservice/impl/MetricRegistryImplTest.java @@ -29,30 +29,46 @@ import static org.junit.Assert.assertTrue; import org.junit.Before; import org.junit.Test; import org.onap.appc.metricservice.metric.Counter; -import org.onap.appc.metricservice.metric.Metric; +import org.onap.appc.metricservice.metric.MetricType; import org.onap.appc.metricservice.metric.impl.DefaultPrimitiveCounter; +import org.onap.appc.metricservice.metric.impl.DispatchingFuntionMetricImpl; public class MetricRegistryImplTest { - private static final String NAME = "NAME"; + private static final String METRIC_NAME = "METRIC_NAME"; + private static final String COUNTER_NAME = "COUNTER_NAME"; private MetricRegistryImpl registry; + private DispatchingFuntionMetricImpl metric; + private DefaultPrimitiveCounter counter; + @Before public void setup() { registry = new MetricRegistryImpl(null); + counter = new DefaultPrimitiveCounter(COUNTER_NAME, null); + metric = new DispatchingFuntionMetricImpl(METRIC_NAME, MetricType.COUNTER, 0, 0); + } @Test public void testRegister() { - Metric metric = new DefaultPrimitiveCounter(NAME, null); - assertNull(registry.counter(NAME)); + assertEquals(0, registry.counters().length); + assertEquals(0, registry.metrics().length); + assertNull(registry.counter(COUNTER_NAME)); + assertTrue(registry.register(counter)); + assertFalse(registry.register(counter)); + assertTrue(registry.counter(COUNTER_NAME) instanceof Counter); + assertSame(counter, registry.counter(COUNTER_NAME)); assertTrue(registry.register(metric)); - assertFalse(registry.register(metric)); - assertTrue(registry.counter(NAME) instanceof Counter); - assertSame(metric, registry.metric(NAME)); + assertSame(metric, registry.metric(METRIC_NAME)); + assertEquals(1, registry.counters().length); + assertEquals(2, registry.metrics().length); } @Test - public void testCounter() { + public void testDispose() { + registry.register(metric); + registry.register(counter); + assertEquals(2, registry.metrics().length); registry.dispose(); assertEquals(0, registry.metrics().length); } |