From 856993f1adbab9a413e2c66b468699257557903f Mon Sep 17 00:00:00 2001 From: Ivan Topolnjak Date: Wed, 14 Jun 2017 15:01:35 +0200 Subject: move filters to util package, expose them from Kamon --- kamon-core/src/test/scala/kamon/metric/GlobPathFilterSpec.scala | 1 + kamon-core/src/test/scala/kamon/metric/RegexPathFilterSpec.scala | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'kamon-core/src/test/scala/kamon') diff --git a/kamon-core/src/test/scala/kamon/metric/GlobPathFilterSpec.scala b/kamon-core/src/test/scala/kamon/metric/GlobPathFilterSpec.scala index cb2a5d5f..c21b1256 100644 --- a/kamon-core/src/test/scala/kamon/metric/GlobPathFilterSpec.scala +++ b/kamon-core/src/test/scala/kamon/metric/GlobPathFilterSpec.scala @@ -17,6 +17,7 @@ package kamon package metric +import kamon.util.GlobPathFilter import org.scalatest.{Matchers, WordSpecLike} class GlobPathFilterSpec extends WordSpecLike with Matchers { diff --git a/kamon-core/src/test/scala/kamon/metric/RegexPathFilterSpec.scala b/kamon-core/src/test/scala/kamon/metric/RegexPathFilterSpec.scala index da095b1b..f742df1d 100644 --- a/kamon-core/src/test/scala/kamon/metric/RegexPathFilterSpec.scala +++ b/kamon-core/src/test/scala/kamon/metric/RegexPathFilterSpec.scala @@ -17,13 +17,14 @@ package kamon package metric +import kamon.util.RegexMatcher import org.scalatest.{Matchers, WordSpecLike} class RegexPathFilterSpec extends WordSpecLike with Matchers { "The RegexPathFilter" should { "match a single expression" in { - val filter = new RegexNameFilter("/user/actor") + val filter = new RegexMatcher("/user/actor") filter.accept("/user/actor") shouldBe true @@ -32,7 +33,7 @@ class RegexPathFilterSpec extends WordSpecLike with Matchers { } "match arbitray expressions ending with wildcard" in { - val filter = new RegexNameFilter("/user/.*") + val filter = new RegexMatcher("/user/.*") filter.accept("/user/actor") shouldBe true filter.accept("/user/otherActor") shouldBe true @@ -46,7 +47,7 @@ class RegexPathFilterSpec extends WordSpecLike with Matchers { } "match numbers" in { - val filter = new RegexNameFilter("/user/actor-\\d") + val filter = new RegexMatcher("/user/actor-\\d") filter.accept("/user/actor-1") shouldBe true filter.accept("/user/actor-2") shouldBe true -- cgit v1.2.3