From d8e89ae7412f4888406c43f1e4cfe018841632ed Mon Sep 17 00:00:00 2001 From: Rocky Madden Date: Thu, 31 Jan 2013 22:11:28 -0700 Subject: Favored constants over fixtures. --- .../stringmetric/filter/AsciiControlOnlyStringFilterSpec.scala | 8 ++++++-- .../stringmetric/filter/AsciiControlStringFilterSpec.scala | 8 ++++++-- .../stringmetric/filter/AsciiLetterCaseStringFilterSpec.scala | 8 ++++++-- .../filter/AsciiLetterNumberOnlyStringFilterSpec.scala | 8 ++++++-- .../stringmetric/filter/AsciiLetterNumberStringFilterSpec.scala | 8 ++++++-- .../stringmetric/filter/AsciiLetterOnlyStringFilterSpec.scala | 8 ++++++-- .../stringmetric/filter/AsciiLetterStringFilterSpec.scala | 8 ++++++-- .../stringmetric/filter/AsciiNumberOnlyStringFilterSpec.scala | 8 ++++++-- .../stringmetric/filter/AsciiNumberStringFilterSpec.scala | 8 ++++++-- .../stringmetric/filter/AsciiSpaceStringFilterSpec.scala | 8 ++++++-- .../stringmetric/filter/AsciiSymbolOnlyStringFilterSpec.scala | 8 ++++++-- .../stringmetric/filter/AsciiSymbolStringFilterSpec.scala | 8 ++++++-- .../stringmetric/filter/StringFilterDelegateSpec.scala | 8 ++++++-- .../stringmetric/similarity/WeightedLevenshteinMetricSpec.scala | 2 +- 14 files changed, 79 insertions(+), 27 deletions(-) diff --git a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiControlOnlyStringFilterSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiControlOnlyStringFilterSpec.scala index 73b7799..8d5d1d4 100755 --- a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiControlOnlyStringFilterSpec.scala +++ b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiControlOnlyStringFilterSpec.scala @@ -6,7 +6,7 @@ import org.scalatest.junit.JUnitRunner @RunWith(classOf[JUnitRunner]) final class AsciiControlOnlyStringFilterSpec extends ScalaTest { - private[this] val Filter = new StringFilterDelegate with AsciiControlOnlyStringFilter + import AsciiControlOnlyStringFilterSpec.Filter "AsciiControlOnlyStringFilter" should provide { "overloaded filter method" when passed { @@ -26,4 +26,8 @@ final class AsciiControlOnlyStringFilterSpec extends ScalaTest { } } } -} \ No newline at end of file +} + +object AsciiControlOnlyStringFilterSpec { + private final val Filter = new StringFilterDelegate with AsciiControlOnlyStringFilter +} diff --git a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiControlStringFilterSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiControlStringFilterSpec.scala index 55b0428..5c774a0 100755 --- a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiControlStringFilterSpec.scala +++ b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiControlStringFilterSpec.scala @@ -6,7 +6,7 @@ import org.scalatest.junit.JUnitRunner @RunWith(classOf[JUnitRunner]) final class AsciiControlStringFilterSpec extends ScalaTest { - private[this] val Filter = new StringFilterDelegate with AsciiControlStringFilter + import AsciiControlStringFilterSpec.Filter "AsciiControlStringFilter" should provide { "overloaded filter method" when passed { @@ -26,4 +26,8 @@ final class AsciiControlStringFilterSpec extends ScalaTest { } } } -} \ No newline at end of file +} + +object AsciiControlStringFilterSpec { + private final val Filter = new StringFilterDelegate with AsciiControlStringFilter +} diff --git a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterCaseStringFilterSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterCaseStringFilterSpec.scala index 34915fb..bc9659a 100755 --- a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterCaseStringFilterSpec.scala +++ b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterCaseStringFilterSpec.scala @@ -6,7 +6,7 @@ import org.scalatest.junit.JUnitRunner @RunWith(classOf[JUnitRunner]) final class AsciiLetterCaseStringFilterSpec extends ScalaTest { - private[this] val Filter = new StringFilterDelegate with AsciiLetterCaseStringFilter + import AsciiLetterCaseStringFilterSpec.Filter "AsciiLetterCaseStringFilter" should provide { "overloaded filter method" when passed { @@ -34,4 +34,8 @@ final class AsciiLetterCaseStringFilterSpec extends ScalaTest { } } } -} \ No newline at end of file +} + +object AsciiLetterCaseStringFilterSpec { + private final val Filter = new StringFilterDelegate with AsciiLetterCaseStringFilter +} diff --git a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterNumberOnlyStringFilterSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterNumberOnlyStringFilterSpec.scala index e5130a2..8e488c5 100755 --- a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterNumberOnlyStringFilterSpec.scala +++ b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterNumberOnlyStringFilterSpec.scala @@ -6,7 +6,7 @@ import org.scalatest.junit.JUnitRunner @RunWith(classOf[JUnitRunner]) final class AsciiLetterNumberOnlyStringFilterSpec extends ScalaTest { - private[this] val Filter = new StringFilterDelegate with AsciiLetterNumberOnlyStringFilter + import AsciiLetterNumberOnlyStringFilterSpec.Filter "AsciiLetterNumberOnlyStringFilter" should provide { "overloaded filter method" when passed { @@ -28,4 +28,8 @@ final class AsciiLetterNumberOnlyStringFilterSpec extends ScalaTest { } } } -} \ No newline at end of file +} + +object AsciiLetterNumberOnlyStringFilterSpec { + private final val Filter = new StringFilterDelegate with AsciiLetterNumberOnlyStringFilter +} diff --git a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterNumberStringFilterSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterNumberStringFilterSpec.scala index 66c4dc4..4b548f0 100755 --- a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterNumberStringFilterSpec.scala +++ b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterNumberStringFilterSpec.scala @@ -6,7 +6,7 @@ import org.scalatest.junit.JUnitRunner @RunWith(classOf[JUnitRunner]) final class AsciiLetterNumberStringFilterSpec extends ScalaTest { - private[this] val Filter = new StringFilterDelegate with AsciiLetterNumberStringFilter + import AsciiLetterNumberStringFilterSpec.Filter "AsciiLetterNumberStringFilter" should provide { "overloaded filter method" when passed { @@ -26,4 +26,8 @@ final class AsciiLetterNumberStringFilterSpec extends ScalaTest { } } } -} \ No newline at end of file +} + +object AsciiLetterNumberStringFilterSpec { + private final val Filter = new StringFilterDelegate with AsciiLetterNumberStringFilter +} diff --git a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterOnlyStringFilterSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterOnlyStringFilterSpec.scala index 46fe931..f33050c 100755 --- a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterOnlyStringFilterSpec.scala +++ b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterOnlyStringFilterSpec.scala @@ -6,7 +6,7 @@ import org.scalatest.junit.JUnitRunner @RunWith(classOf[JUnitRunner]) final class AsciiLetterOnlyStringFilterSpec extends ScalaTest { - private[this] val Filter = new StringFilterDelegate with AsciiLetterOnlyStringFilter + import AsciiLetterOnlyStringFilterSpec.Filter "AsciiLetterOnlyStringFilter" should provide { "overloaded filter method" when passed { @@ -26,4 +26,8 @@ final class AsciiLetterOnlyStringFilterSpec extends ScalaTest { } } } -} \ No newline at end of file +} + +object AsciiLetterOnlyStringFilterSpec { + private final val Filter = new StringFilterDelegate with AsciiLetterOnlyStringFilter +} diff --git a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterStringFilterSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterStringFilterSpec.scala index d522d72..5ca7324 100755 --- a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterStringFilterSpec.scala +++ b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterStringFilterSpec.scala @@ -6,7 +6,7 @@ import org.scalatest.junit.JUnitRunner @RunWith(classOf[JUnitRunner]) final class AsciiLetterStringFilterSpec extends ScalaTest { - private[this] val Filter = new StringFilterDelegate with AsciiLetterStringFilter + import AsciiLetterStringFilterSpec.Filter "AsciiLetterStringFilter" should provide { "overloaded filter method" when passed { @@ -22,4 +22,8 @@ final class AsciiLetterStringFilterSpec extends ScalaTest { } } } -} \ No newline at end of file +} + +object AsciiLetterStringFilterSpec { + private final val Filter = new StringFilterDelegate with AsciiLetterStringFilter +} diff --git a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiNumberOnlyStringFilterSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiNumberOnlyStringFilterSpec.scala index 994c17d..147d9b6 100755 --- a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiNumberOnlyStringFilterSpec.scala +++ b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiNumberOnlyStringFilterSpec.scala @@ -6,7 +6,7 @@ import org.scalatest.junit.JUnitRunner @RunWith(classOf[JUnitRunner]) final class AsciiNumberOnlyStringFilterSpec extends ScalaTest { - private[this] val Filter = new StringFilterDelegate with AsciiNumberOnlyStringFilter + import AsciiNumberOnlyStringFilterSpec.Filter "AsciiNumberOnlyStringFilter" should provide { "overloaded filter method" when passed { @@ -26,4 +26,8 @@ final class AsciiNumberOnlyStringFilterSpec extends ScalaTest { } } } -} \ No newline at end of file +} + +object AsciiNumberOnlyStringFilterSpec { + private final val Filter = new StringFilterDelegate with AsciiNumberOnlyStringFilter +} diff --git a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiNumberStringFilterSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiNumberStringFilterSpec.scala index 4495d8b..b1ed8a0 100755 --- a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiNumberStringFilterSpec.scala +++ b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiNumberStringFilterSpec.scala @@ -6,7 +6,7 @@ import org.scalatest.junit.JUnitRunner @RunWith(classOf[JUnitRunner]) final class AsciiNumberStringFilterSpec extends ScalaTest { - private[this] val Filter = new StringFilterDelegate with AsciiNumberStringFilter + import AsciiNumberStringFilterSpec.Filter "AsciiNumberStringFilter" should provide { "overloaded filter method" when passed { @@ -26,4 +26,8 @@ final class AsciiNumberStringFilterSpec extends ScalaTest { } } } -} \ No newline at end of file +} + +object AsciiNumberStringFilterSpec { + private final val Filter = new StringFilterDelegate with AsciiNumberStringFilter +} diff --git a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiSpaceStringFilterSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiSpaceStringFilterSpec.scala index 7d532a3..6ee45b1 100755 --- a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiSpaceStringFilterSpec.scala +++ b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiSpaceStringFilterSpec.scala @@ -6,7 +6,7 @@ import org.scalatest.junit.JUnitRunner @RunWith(classOf[JUnitRunner]) final class AsciiSpaceStringFilterSpec extends ScalaTest { - private[this] val Filter = new StringFilterDelegate with AsciiSpaceStringFilter + import AsciiSpaceStringFilterSpec.Filter "AsciiSpaceStringFilter" should provide { "overloaded filter method" when passed { @@ -30,4 +30,8 @@ final class AsciiSpaceStringFilterSpec extends ScalaTest { } } } -} \ No newline at end of file +} + +object AsciiSpaceStringFilterSpec { + private final val Filter = new StringFilterDelegate with AsciiSpaceStringFilter +} diff --git a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiSymbolOnlyStringFilterSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiSymbolOnlyStringFilterSpec.scala index 53f47b1..8d5c2fb 100755 --- a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiSymbolOnlyStringFilterSpec.scala +++ b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiSymbolOnlyStringFilterSpec.scala @@ -6,7 +6,7 @@ import org.scalatest.junit.JUnitRunner @RunWith(classOf[JUnitRunner]) final class AsciiSymbolOnlyStringFilterSpec extends ScalaTest { - private[this] val Filter = new StringFilterDelegate with AsciiSymbolOnlyStringFilter + import AsciiSymbolOnlyStringFilterSpec.Filter "AsciiSymbolOnlyStringFilter" should provide { "overloaded filter method" when passed { @@ -26,4 +26,8 @@ final class AsciiSymbolOnlyStringFilterSpec extends ScalaTest { } } } -} \ No newline at end of file +} + +object AsciiSymbolOnlyStringFilterSpec { + private final val Filter = new StringFilterDelegate with AsciiSymbolOnlyStringFilter +} diff --git a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiSymbolStringFilterSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiSymbolStringFilterSpec.scala index 51ca748..2e4a0e0 100755 --- a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiSymbolStringFilterSpec.scala +++ b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiSymbolStringFilterSpec.scala @@ -6,7 +6,7 @@ import org.scalatest.junit.JUnitRunner @RunWith(classOf[JUnitRunner]) final class AsciiSymbolStringFilterSpec extends ScalaTest { - private[this] val Filter = new StringFilterDelegate with AsciiSymbolStringFilter + import AsciiSymbolStringFilterSpec.Filter "AsciiSymbolStringFilter" should provide { "overloaded filter method" when passed { @@ -24,4 +24,8 @@ final class AsciiSymbolStringFilterSpec extends ScalaTest { } } } -} \ No newline at end of file +} + +object AsciiSymbolStringFilterSpec { + private final val Filter = new StringFilterDelegate with AsciiSymbolStringFilter +} diff --git a/core/source/test/scala/com/rockymadden/stringmetric/filter/StringFilterDelegateSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/filter/StringFilterDelegateSpec.scala index bce7cd8..a1210c0 100755 --- a/core/source/test/scala/com/rockymadden/stringmetric/filter/StringFilterDelegateSpec.scala +++ b/core/source/test/scala/com/rockymadden/stringmetric/filter/StringFilterDelegateSpec.scala @@ -6,7 +6,7 @@ import org.scalatest.junit.JUnitRunner @RunWith(classOf[JUnitRunner]) final class StringFilterDelegateSpec extends ScalaTest { - private[this] val Filter = new StringFilterDelegate + import StringFilterDelegateSpec.Filter "StringFilterDelegate" should provide { "overloaded filter method" when passed { @@ -24,4 +24,8 @@ final class StringFilterDelegateSpec extends ScalaTest { } } } -} \ No newline at end of file +} + +object StringFilterDelegateSpec { + private final val Filter = new StringFilterDelegate +} diff --git a/core/source/test/scala/com/rockymadden/stringmetric/similarity/WeightedLevenshteinMetricSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/similarity/WeightedLevenshteinMetricSpec.scala index cefd80f..d819d48 100755 --- a/core/source/test/scala/com/rockymadden/stringmetric/similarity/WeightedLevenshteinMetricSpec.scala +++ b/core/source/test/scala/com/rockymadden/stringmetric/similarity/WeightedLevenshteinMetricSpec.scala @@ -53,4 +53,4 @@ final class WeightedLevenshteinMetricSpec extends ScalaTest { object WeightedLevenshteinMetricSpec { private final val Options = Tuple3[BigDecimal, BigDecimal, BigDecimal](10, 0.1, 1) -} \ No newline at end of file +} -- cgit v1.2.3