diff options
author | Jon Bratseth <bratseth@oath.com> | 2018-04-30 15:12:24 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@oath.com> | 2018-04-30 15:12:24 +0200 |
commit | b2ce89c7d12d0b77d7aaf273c8f4c0516ded7bd5 (patch) | |
tree | f37f50633caa356d64ddb7b7e2cc6571661e2394 /metrics | |
parent | 2b18385e21151985edb7a9d0a85daa2332daa4a5 (diff) |
Remove usage of junit.framework
Diffstat (limited to 'metrics')
4 files changed, 69 insertions, 46 deletions
diff --git a/metrics/src/test/java/com/yahoo/metrics/CountMetricTest.java b/metrics/src/test/java/com/yahoo/metrics/CountMetricTest.java index c066814b557..ef802a73c4c 100644 --- a/metrics/src/test/java/com/yahoo/metrics/CountMetricTest.java +++ b/metrics/src/test/java/com/yahoo/metrics/CountMetricTest.java @@ -1,13 +1,16 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.metrics; -import junit.framework.TestCase; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; /** * @author thomasg */ -public class CountMetricTest extends TestCase { +public class CountMetricTest { + @Test public void testCountMetric() { CountMetric m = new CountMetric("test", "tag", "description", null); assertEquals(false, m.used()); @@ -36,7 +39,7 @@ public class CountMetricTest extends TestCase { assertEquals("<test description=\"description\" count=\"96\"/>\n", m2.toXml(0, 2)); assertEquals("<test description=\"description\" count=\"96\" average_change_per_second=\"9.60\"/>\n", m2.toXml(10, 2)); - assertEquals(96.0, m2.getDoubleValue("value")); + assertEquals(96.0, m2.getDoubleValue("value"), 0.00000001); assertEquals(96, m2.getLongValue("value")); } diff --git a/metrics/src/test/java/com/yahoo/metrics/MetricSetTest.java b/metrics/src/test/java/com/yahoo/metrics/MetricSetTest.java index 177a2bbb993..bfe10825f4f 100644 --- a/metrics/src/test/java/com/yahoo/metrics/MetricSetTest.java +++ b/metrics/src/test/java/com/yahoo/metrics/MetricSetTest.java @@ -1,10 +1,15 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.metrics; -import junit.framework.TestCase; +import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; -public class MetricSetTest extends TestCase { +public class MetricSetTest { + + private final double delta = 0.000000001; class TestMetricVisitor extends MetricVisitor { String output = ""; @@ -28,8 +33,8 @@ public class MetricSetTest extends TestCase { } } - public void testNormalUsage() - { + @Test + public void testNormalUsage() { // Set up some metrics to test.. MetricSet set = new SimpleMetricSet("a", "foo", ""); SummedDoubleValueMetric v1 = new SummedDoubleValueMetric("c", "foo", "", set); @@ -111,6 +116,7 @@ public class MetricSetTest extends TestCase { } @SuppressWarnings("rawtypes") + @Test public void testSumInSet() { MetricSet ms_a = new SimpleMetricSet("a", "", "", null); MyTimer timer = new MyTimer(); @@ -151,11 +157,11 @@ public class MetricSetTest extends TestCase { ValueMetric av_2 = (ValueMetric)sms.getMetric("v2"); ValueMetric av_3 = (ValueMetric)sms.getMetric("v3"); - assertEquals(10.0, av_sum.getDoubleValue("total")); - assertEquals(4, av_sum.getLongValue("count")); - assertEquals(4.0, av_1.getDoubleValue("total")); - assertEquals(4.0, av_2.getDoubleValue("total")); - assertEquals(2.0, av_3.getDoubleValue("total")); + assertEquals(10.0, av_sum.getDoubleValue("total"), delta); + assertEquals(4, av_sum.getLongValue("count"), delta); + assertEquals(4.0, av_1.getDoubleValue("total"), delta); + assertEquals(4.0, av_2.getDoubleValue("total"), delta); + assertEquals(2.0, av_3.getDoubleValue("total"), delta); timer.timeNow = 301; manager.takeSnapshots(301); diff --git a/metrics/src/test/java/com/yahoo/metrics/SumMetricTest.java b/metrics/src/test/java/com/yahoo/metrics/SumMetricTest.java index eda3c532c19..008575af574 100644 --- a/metrics/src/test/java/com/yahoo/metrics/SumMetricTest.java +++ b/metrics/src/test/java/com/yahoo/metrics/SumMetricTest.java @@ -1,12 +1,18 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.metrics; -import junit.framework.TestCase; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; /** * @author thomasg */ -public class SumMetricTest extends TestCase { +public class SumMetricTest { + + private final double delta = 0.000000001; + + @Test public void testSummedCountMetric() { MetricSet parent = new SimpleMetricSet("parent", "", ""); SumMetric sum = new SumMetric("foo", "", "foodesc", parent); @@ -33,6 +39,7 @@ public class SumMetricTest extends TestCase { assertEquals(20, sum.getLongValue("value")); } + @Test public void testSummedValueMetric() { MetricSet parent = new SimpleMetricSet("parent", "", ""); SumMetric sum = new SumMetric("foo", "", "foodesc", parent); @@ -60,7 +67,7 @@ public class SumMetricTest extends TestCase { assertEquals(10, sum.getLongValue("max")); } - + @Test public void testAveragedValueMetric() { MetricSet parent = new SimpleMetricSet("parent", "", ""); SumMetric sum = new SumMetric("foo", "", "foodesc", parent); @@ -83,11 +90,12 @@ public class SumMetricTest extends TestCase { assertEquals("<foo description=\"foodesc\" average=\"5.40\" last=\"10.00\" min=\"2.00\" max=\"10.00\" count=\"5\" total=\"27.00\"/>\n", sum.toXml(0,2)); - assertEquals(5.40, sum.getDoubleValue("value")); - assertEquals(2.0, sum.getDoubleValue("min")); - assertEquals(10.0, sum.getDoubleValue("max")); + assertEquals(5.40, sum.getDoubleValue("value"), delta); + assertEquals(2.0, sum.getDoubleValue("min"), delta); + assertEquals(10.0, sum.getDoubleValue("max"), delta); } + @Test public void testMetricSet() { MetricSet parent = new SimpleMetricSet("parent", "", ""); SumMetric sum = new SumMetric("foo", "", "bar", parent); @@ -118,9 +126,8 @@ public class SumMetricTest extends TestCase { } - - public void testRemove() - { + @Test + public void testRemove() { MetricSet parent = new SimpleMetricSet("parent", "", ""); SumMetric sum = new SumMetric("foo", "", "foodesc", parent); @@ -145,6 +152,7 @@ public class SumMetricTest extends TestCase { assertEquals("<foo description=\"foodesc\" average=\"14.50\" last=\"17.00\" min=\"5.00\" max=\"10.00\" count=\"3\" total=\"43.50\"/>\n", sum.toXml(0,2)); } + @Test public void testEmpty() { SumMetric sum = new SumMetric("foo", "", "foodesc", null); assertEquals("<foo description=\"foodesc\"/>\n", sum.toXml(0,2)); diff --git a/metrics/src/test/java/com/yahoo/metrics/ValueMetricTest.java b/metrics/src/test/java/com/yahoo/metrics/ValueMetricTest.java index 1054dacdcbb..40ba70a9749 100644 --- a/metrics/src/test/java/com/yahoo/metrics/ValueMetricTest.java +++ b/metrics/src/test/java/com/yahoo/metrics/ValueMetricTest.java @@ -1,11 +1,16 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.metrics; -import junit.framework.TestCase; +import org.junit.Test; -public class ValueMetricTest extends TestCase { - public void testAveragedDoubleValueMetric() - { +import static org.junit.Assert.assertEquals; + +public class ValueMetricTest { + + private static final double delta = 0.000000001; + + @Test + public void testAveragedDoubleValueMetric() { AveragedDoubleValueMetric m = new AveragedDoubleValueMetric("test", "tag", "description", null); m.addValue(100.0); assertEquals("count=\"1\" min=\"100.00\" max=\"100.00\" last=\"100.00\" total=\"100.00\" average=\"100.00\"", m.toString()); @@ -43,13 +48,13 @@ public class ValueMetricTest extends TestCase { assertEquals("<test description=\"description\" average=\"343.33\" last=\"2000.00\" min=\"40.00\" max=\"2000.00\" count=\"9\" total=\"3090.00\"/>\n", sum.toXml(0, 2)); - assertEquals(80.0, m2.getDoubleValue("value")); - assertEquals(80.0, m2.getDoubleValue("average")); - assertEquals(40.0, m2.getDoubleValue("min")); - assertEquals(100.0, m2.getDoubleValue("max")); - assertEquals(40.0, m2.getDoubleValue("last")); - assertEquals(3.0, m2.getDoubleValue("count")); - assertEquals(240.0, m2.getDoubleValue("total")); + assertEquals(80.0, m2.getDoubleValue("value"), delta); + assertEquals(80.0, m2.getDoubleValue("average"), delta); + assertEquals(40.0, m2.getDoubleValue("min"), delta); + assertEquals(100.0, m2.getDoubleValue("max"), delta); + assertEquals(40.0, m2.getDoubleValue("last"), delta); + assertEquals(3.0, m2.getDoubleValue("count"), delta); + assertEquals(240.0, m2.getDoubleValue("total"), delta); assertEquals(80, m2.getLongValue("value")); assertEquals(80, m2.getLongValue("average")); @@ -60,20 +65,22 @@ public class ValueMetricTest extends TestCase { assertEquals(240, m2.getLongValue("total")); } + @Test public void testDoubleValueMetricNotUpdatedOnNaN() { AveragedDoubleValueMetric m = new AveragedDoubleValueMetric("test", "tag", "description", null); m.addValue(Double.NaN); assertEquals("count=\"0\" min=\"0\" max=\"0\" last=\"0\" total=\"0\" average=\"0.00\"", m.toString()); } + @Test public void testDoubleValueMetricNotUpdatedOnInfinity() { AveragedDoubleValueMetric m = new AveragedDoubleValueMetric("test", "tag", "description", null); m.addValue(Double.POSITIVE_INFINITY); assertEquals("count=\"0\" min=\"0\" max=\"0\" last=\"0\" total=\"0\" average=\"0.00\"", m.toString()); } - public void testSummedDoubleValueMetric() - { + @Test + public void testSummedDoubleValueMetric() { SummedDoubleValueMetric m = new SummedDoubleValueMetric("test", "tag", "description", null); m.addValue(100.0); assertEquals("count=\"1\" min=\"100.00\" max=\"100.00\" last=\"100.00\" total=\"100.00\" average=\"100.00\"", m.toString()); @@ -109,13 +116,13 @@ public class ValueMetricTest extends TestCase { assertEquals("<test description=\"description\" average=\"2313.33\" last=\"2440.00\" min=\"40.00\" max=\"2000.00\" count=\"7\" total=\"16193.33\"/>\n", sum.toXml(0, 2)); - assertEquals(40.0, m2.getDoubleValue("value")); - assertEquals(80.0, m2.getDoubleValue("average")); - assertEquals(40.0, m2.getDoubleValue("min")); - assertEquals(100.0, m2.getDoubleValue("max")); - assertEquals(40.0, m2.getDoubleValue("last")); - assertEquals(3.0, m2.getDoubleValue("count")); - assertEquals(240.0, m2.getDoubleValue("total")); + assertEquals(40.0, m2.getDoubleValue("value"), delta); + assertEquals(80.0, m2.getDoubleValue("average"), delta); + assertEquals(40.0, m2.getDoubleValue("min"), delta); + assertEquals(100.0, m2.getDoubleValue("max"), delta); + assertEquals(40.0, m2.getDoubleValue("last"), delta); + assertEquals(3.0, m2.getDoubleValue("count"), delta); + assertEquals(240.0, m2.getDoubleValue("total"), delta); assertEquals(40, m2.getLongValue("value")); assertEquals(80, m2.getLongValue("average")); @@ -126,12 +133,12 @@ public class ValueMetricTest extends TestCase { assertEquals(240, m2.getLongValue("total")); } - public void testAveragedLongValueMetric() - { + @Test + public void testAveragedLongValueMetric() { AveragedLongValueMetric m = new AveragedLongValueMetric("test", "tag", "description", null); - assertEquals(0l, m.getLongValue("max")); - assertEquals(0l, m.getLongValue("min")); + assertEquals(0L, m.getLongValue("max")); + assertEquals(0L, m.getLongValue("min")); m.addValue((long)100); assertEquals("count=\"1\" min=\"100\" max=\"100\" last=\"100\" total=\"100\" average=\"100.00\"", m.toString()); @@ -178,5 +185,4 @@ public class ValueMetricTest extends TestCase { assertEquals(240, m2.getLongValue("total")); } - } |