minor refactor in MetricLookupSpec

1 files changed, 11 insertions, 26 deletions

diff --git a/kamon-core-tests/src/test/scala/kamon/metric/MetricLookupSpec.scala b/kamon-core-tests/src/test/scala/kamon/metric/MetricLookupSpec.scala
index bcf703bd..4df2397b 100644
--- a/kamon-core-tests/src/test/scala/kamon/metric/MetricLookupSpec.scala
+++ b/kamon-core-tests/src/test/scala/kamon/metric/MetricLookupSpec.scala
@@ -53,53 +53,38 @@ class MetricLookupSpec extends WordSpec with Matchers {
       "always return the same histogram for a set of tags" in {
         val histogramOne = Kamon.histogram("histogram-lookup").refine("tag" -> "value")
         val histogramTwo = Kamon.histogram("histogram-lookup").refine("tag" -> "value")
+        val histogramThree = Kamon.histogram("histogram-lookup").refine(javaMap("tag", "value"))
+
         histogramOne shouldBe theSameInstanceAs(histogramTwo)
+        histogramOne shouldBe theSameInstanceAs(histogramThree)
       }
 
       "always return the same counter for a set of tags" in {
         val counterOne = Kamon.counter("counter-lookup").refine("tag" -> "value")
         val counterTwo = Kamon.counter("counter-lookup").refine("tag" -> "value")
+        val counterThree = Kamon.counter("counter-lookup").refine(javaMap("tag", "value"))
+
         counterOne shouldBe theSameInstanceAs(counterTwo)
+        counterOne shouldBe theSameInstanceAs(counterThree)
       }
 
       "always return the same gauge for a set of tags" in {
         val gaugeOne = Kamon.gauge("gauge-lookup").refine("tag" -> "value")
         val gaugeTwo = Kamon.gauge("gauge-lookup").refine("tag" -> "value")
+        val gaugeThree = Kamon.gauge("gauge-lookup").refine(javaMap("tag", "value"))
+
         gaugeOne shouldBe theSameInstanceAs(gaugeTwo)
+        gaugeOne shouldBe theSameInstanceAs(gaugeThree)
       }
 
       "always return the same min-max-counter for a set of tags" in {
         val minMaxCounterOne = Kamon.minMaxCounter("min-max-counter-lookup").refine("tag" -> "value")
         val minMaxCounterTwo = Kamon.minMaxCounter("min-max-counter-lookup").refine("tag" -> "value")
-        minMaxCounterOne shouldBe theSameInstanceAs(minMaxCounterTwo)
-      }
-    }
-
-    "refine a metric with java tags and" should {
-      "always return the same histogram for a set of tags" in {
-        val histogramOne = Kamon.histogram("histogram-lookup").refine(javaMap("tag", "value"))
-        val histogramTwo = Kamon.histogram("histogram-lookup").refine(javaMap("tag", "value"))
-        histogramOne shouldBe theSameInstanceAs(histogramTwo)
-      }
+        val minMaxCounterThree = Kamon.minMaxCounter("min-max-counter-lookup").refine(javaMap("tag", "value"))
 
-      "always return the same counter for a set of tags" in {
-        val counterOne = Kamon.counter("counter-lookup").refine(javaMap("tag", "value"))
-        val counterTwo = Kamon.counter("counter-lookup").refine(javaMap("tag", "value"))
-        counterOne shouldBe theSameInstanceAs(counterTwo)
-      }
-
-      "always return the same gauge for a set of tags" in {
-        val gaugeOne = Kamon.gauge("gauge-lookup").refine(javaMap("tag", "value"))
-        val gaugeTwo = Kamon.gauge("gauge-lookup").refine(javaMap("tag", "value"))
-        gaugeOne shouldBe theSameInstanceAs(gaugeTwo)
-      }
-
-      "always return the same min-max-counter for a set of tags" in {
-        val minMaxCounterOne = Kamon.minMaxCounter("min-max-counter-lookup").refine(javaMap("tag", "value"))
-        val minMaxCounterTwo = Kamon.minMaxCounter("min-max-counter-lookup").refine(javaMap("tag", "value"))
         minMaxCounterOne shouldBe theSameInstanceAs(minMaxCounterTwo)
+        minMaxCounterOne shouldBe theSameInstanceAs(minMaxCounterThree)
       }
     }
   }
-
 }