diff options
author | Rocky Madden <git@rockymadden.com> | 2013-03-07 11:05:07 -0700 |
---|---|---|
committer | Rocky Madden <git@rockymadden.com> | 2013-03-07 11:05:07 -0700 |
commit | 315422887d00e333a9f113fc16089c4e8468ca61 (patch) | |
tree | a968acda871b294e9103fd3b96be1959650a8f8b /core/source/test/scala | |
parent | 6f0fb01f454a70468b9db560879dadc46e71e228 (diff) | |
download | stringmetric-315422887d00e333a9f113fc16089c4e8468ca61.tar.gz stringmetric-315422887d00e333a9f113fc16089c4e8468ca61.tar.bz2 stringmetric-315422887d00e333a9f113fc16089c4e8468ca61.zip |
Favored dependency injection.
Diffstat (limited to 'core/source/test/scala')
20 files changed, 39 insertions, 39 deletions
diff --git a/core/source/test/scala/com/rockymadden/stringmetric/FilterDecoratedSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/FilterDecoratedSpec.scala index 1cca109..92f4578 100755 --- a/core/source/test/scala/com/rockymadden/stringmetric/FilterDecoratedSpec.scala +++ b/core/source/test/scala/com/rockymadden/stringmetric/FilterDecoratedSpec.scala @@ -8,7 +8,7 @@ import org.scalatest.junit.JUnitRunner @RunWith(classOf[JUnitRunner]) final class FilterDecoratedSpec extends ScalaTest { - import FilterDecoratedSpec._ + import FilterDecoratedSpec.{ Algorithm, Metric } "Filter decorated metrics" should provide { "compare method" when passed { diff --git a/core/source/test/scala/com/rockymadden/stringmetric/phonetic/MetaphoneAlgorithmSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/phonetic/MetaphoneAlgorithmSpec.scala index 288bd60..6698358 100755 --- a/core/source/test/scala/com/rockymadden/stringmetric/phonetic/MetaphoneAlgorithmSpec.scala +++ b/core/source/test/scala/com/rockymadden/stringmetric/phonetic/MetaphoneAlgorithmSpec.scala @@ -6,7 +6,7 @@ import org.scalatest.junit.JUnitRunner @RunWith(classOf[JUnitRunner]) final class MetaphoneAlgorithmSpec extends ScalaTest { - import MetaphoneAlgorithmSpec._ + import MetaphoneAlgorithmSpec.Algorithm "MetaphoneAlgorithm" should provide { "compute method" when passed { @@ -215,5 +215,5 @@ final class MetaphoneAlgorithmSpec extends ScalaTest { } object MetaphoneAlgorithmSpec { - final private val Algorithm = new MetaphoneAlgorithm + final private val Algorithm = MetaphoneAlgorithm() } diff --git a/core/source/test/scala/com/rockymadden/stringmetric/phonetic/MetaphoneMetricSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/phonetic/MetaphoneMetricSpec.scala index 36382ba..867e49b 100755 --- a/core/source/test/scala/com/rockymadden/stringmetric/phonetic/MetaphoneMetricSpec.scala +++ b/core/source/test/scala/com/rockymadden/stringmetric/phonetic/MetaphoneMetricSpec.scala @@ -6,7 +6,7 @@ import org.scalatest.junit.JUnitRunner @RunWith(classOf[JUnitRunner]) final class MetaphoneMetricSpec extends ScalaTest { - import MetaphoneMetricSpec._ + import MetaphoneMetricSpec.Metric "MetaphoneMetric" should provide { "compare method" when passed { @@ -43,5 +43,5 @@ final class MetaphoneMetricSpec extends ScalaTest { } object MetaphoneMetricSpec { - final private val Metric = new MetaphoneMetric + final private val Metric = MetaphoneMetric() } diff --git a/core/source/test/scala/com/rockymadden/stringmetric/phonetic/NysiisAlgorithmSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/phonetic/NysiisAlgorithmSpec.scala index d6c15a8..69c23d9 100755 --- a/core/source/test/scala/com/rockymadden/stringmetric/phonetic/NysiisAlgorithmSpec.scala +++ b/core/source/test/scala/com/rockymadden/stringmetric/phonetic/NysiisAlgorithmSpec.scala @@ -6,7 +6,7 @@ import org.scalatest.junit.JUnitRunner @RunWith(classOf[JUnitRunner]) final class NysiisAlgorithmSpec extends ScalaTest { - import NysiisAlgorithmSpec._ + import NysiisAlgorithmSpec.Algorithm "NysiisAlgorithm" should provide { "compute method" when passed { @@ -193,5 +193,5 @@ final class NysiisAlgorithmSpec extends ScalaTest { } object NysiisAlgorithmSpec { - final private val Algorithm = new NysiisAlgorithm + final private val Algorithm = NysiisAlgorithm() } diff --git a/core/source/test/scala/com/rockymadden/stringmetric/phonetic/NysiisMetricSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/phonetic/NysiisMetricSpec.scala index a4ad219..92748e6 100755 --- a/core/source/test/scala/com/rockymadden/stringmetric/phonetic/NysiisMetricSpec.scala +++ b/core/source/test/scala/com/rockymadden/stringmetric/phonetic/NysiisMetricSpec.scala @@ -6,7 +6,7 @@ import org.scalatest.junit.JUnitRunner @RunWith(classOf[JUnitRunner]) final class NysiisMetricSpec extends ScalaTest { - import NysiisMetricSpec._ + import NysiisMetricSpec.Metric "NysiisMetric" should provide { "compare method" when passed { @@ -39,5 +39,5 @@ final class NysiisMetricSpec extends ScalaTest { } object NysiisMetricSpec { - final private val Metric = new NysiisMetric + final private val Metric = NysiisMetric() } diff --git a/core/source/test/scala/com/rockymadden/stringmetric/phonetic/RefinedNysiisAlgorithmSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/phonetic/RefinedNysiisAlgorithmSpec.scala index d384149..bb5d99d 100755 --- a/core/source/test/scala/com/rockymadden/stringmetric/phonetic/RefinedNysiisAlgorithmSpec.scala +++ b/core/source/test/scala/com/rockymadden/stringmetric/phonetic/RefinedNysiisAlgorithmSpec.scala @@ -6,7 +6,7 @@ import org.scalatest.junit.JUnitRunner @RunWith(classOf[JUnitRunner]) final class RefinedNysiisAlgorithmSpec extends ScalaTest { - import RefinedNysiisAlgorithmSpec._ + import RefinedNysiisAlgorithmSpec.Algorithm "RefinedNysiisAlgorithm" should provide { "compute method" when passed { @@ -210,5 +210,5 @@ final class RefinedNysiisAlgorithmSpec extends ScalaTest { } object RefinedNysiisAlgorithmSpec { - final private val Algorithm = new RefinedNysiisAlgorithm + final private val Algorithm = RefinedNysiisAlgorithm() } diff --git a/core/source/test/scala/com/rockymadden/stringmetric/phonetic/RefinedNysiisMetricSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/phonetic/RefinedNysiisMetricSpec.scala index 59305b6..14ea64b 100755 --- a/core/source/test/scala/com/rockymadden/stringmetric/phonetic/RefinedNysiisMetricSpec.scala +++ b/core/source/test/scala/com/rockymadden/stringmetric/phonetic/RefinedNysiisMetricSpec.scala @@ -6,7 +6,7 @@ import org.scalatest.junit.JUnitRunner @RunWith(classOf[JUnitRunner]) final class RefinedNysiisMetricSpec extends ScalaTest { - import RefinedNysiisMetricSpec._ + import RefinedNysiisMetricSpec.Metric "RefinedNysiisMetric" should provide { "compare method" when passed { @@ -39,5 +39,5 @@ final class RefinedNysiisMetricSpec extends ScalaTest { } object RefinedNysiisMetricSpec { - final private val Metric = new RefinedNysiisMetric + final private val Metric = RefinedNysiisMetric() } diff --git a/core/source/test/scala/com/rockymadden/stringmetric/phonetic/RefinedSoundexAlgorithmSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/phonetic/RefinedSoundexAlgorithmSpec.scala index e52365c..0c78fe7 100755 --- a/core/source/test/scala/com/rockymadden/stringmetric/phonetic/RefinedSoundexAlgorithmSpec.scala +++ b/core/source/test/scala/com/rockymadden/stringmetric/phonetic/RefinedSoundexAlgorithmSpec.scala @@ -6,7 +6,7 @@ import org.scalatest.junit.JUnitRunner @RunWith(classOf[JUnitRunner]) final class RefinedSoundexAlgorithmSpec extends ScalaTest { - import RefinedSoundexAlgorithmSpec._ + import RefinedSoundexAlgorithmSpec.Algorithm "RefinedSoundexAlgorithm" should provide { "compute method" when passed { @@ -164,5 +164,5 @@ final class RefinedSoundexAlgorithmSpec extends ScalaTest { } object RefinedSoundexAlgorithmSpec { - final private val Algorithm = new RefinedSoundexAlgorithm + final private val Algorithm = RefinedSoundexAlgorithm() } diff --git a/core/source/test/scala/com/rockymadden/stringmetric/phonetic/RefinedSoundexMetricSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/phonetic/RefinedSoundexMetricSpec.scala index dd9bd04..0f3a244 100755 --- a/core/source/test/scala/com/rockymadden/stringmetric/phonetic/RefinedSoundexMetricSpec.scala +++ b/core/source/test/scala/com/rockymadden/stringmetric/phonetic/RefinedSoundexMetricSpec.scala @@ -6,7 +6,7 @@ import org.scalatest.junit.JUnitRunner @RunWith(classOf[JUnitRunner]) final class RefinedSoundexMetricSpec extends ScalaTest { - import RefinedSoundexMetricSpec._ + import RefinedSoundexMetricSpec.Metric "RefinedSoundexMetric" should provide { "compare method" when passed { @@ -39,5 +39,5 @@ final class RefinedSoundexMetricSpec extends ScalaTest { } object RefinedSoundexMetricSpec { - final private val Metric = new RefinedSoundexMetric + final private val Metric = RefinedSoundexMetric() } diff --git a/core/source/test/scala/com/rockymadden/stringmetric/phonetic/SoundexAlgorithmSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/phonetic/SoundexAlgorithmSpec.scala index 6b286e5..8f1be8d 100755 --- a/core/source/test/scala/com/rockymadden/stringmetric/phonetic/SoundexAlgorithmSpec.scala +++ b/core/source/test/scala/com/rockymadden/stringmetric/phonetic/SoundexAlgorithmSpec.scala @@ -6,7 +6,7 @@ import org.scalatest.junit.JUnitRunner @RunWith(classOf[JUnitRunner]) final class SoundexAlgorithmSpec extends ScalaTest { - import SoundexAlgorithmSpec._ + import SoundexAlgorithmSpec.Algorithm "SoundexAlgorithm" should provide { "compute method" when passed { @@ -163,5 +163,5 @@ final class SoundexAlgorithmSpec extends ScalaTest { } object SoundexAlgorithmSpec { - final private val Algorithm = new SoundexAlgorithm + final private val Algorithm = SoundexAlgorithm() } diff --git a/core/source/test/scala/com/rockymadden/stringmetric/phonetic/SoundexMetricSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/phonetic/SoundexMetricSpec.scala index 5758f86..98bb28b 100755 --- a/core/source/test/scala/com/rockymadden/stringmetric/phonetic/SoundexMetricSpec.scala +++ b/core/source/test/scala/com/rockymadden/stringmetric/phonetic/SoundexMetricSpec.scala @@ -6,7 +6,7 @@ import org.scalatest.junit.JUnitRunner @RunWith(classOf[JUnitRunner]) final class SoundexMetricSpec extends ScalaTest { - import SoundexMetricSpec._ + import SoundexMetricSpec.Metric "SoundexMetric" should provide { "compare method" when passed { @@ -39,5 +39,5 @@ final class SoundexMetricSpec extends ScalaTest { } object SoundexMetricSpec { - final private val Metric = new SoundexMetric + final private val Metric = SoundexMetric() } diff --git a/core/source/test/scala/com/rockymadden/stringmetric/similarity/DiceSorensenMetricSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/similarity/DiceSorensenMetricSpec.scala index b05a4fc..fd03889 100755 --- a/core/source/test/scala/com/rockymadden/stringmetric/similarity/DiceSorensenMetricSpec.scala +++ b/core/source/test/scala/com/rockymadden/stringmetric/similarity/DiceSorensenMetricSpec.scala @@ -6,7 +6,7 @@ import org.scalatest.junit.JUnitRunner @RunWith(classOf[JUnitRunner]) final class DiceSorensenMetricSpec extends ScalaTest { - import DiceSorensenMetricSpec._ + import DiceSorensenMetricSpec.Metric "DiceSorensenMetric" should provide { "compare method" when passed { @@ -64,5 +64,5 @@ final class DiceSorensenMetricSpec extends ScalaTest { } object DiceSorensenMetricSpec { - private final val Metric = new DiceSorensenMetric + private final val Metric = DiceSorensenMetric() } diff --git a/core/source/test/scala/com/rockymadden/stringmetric/similarity/HammingMetricSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/similarity/HammingMetricSpec.scala index ede84ad..f363d73 100755 --- a/core/source/test/scala/com/rockymadden/stringmetric/similarity/HammingMetricSpec.scala +++ b/core/source/test/scala/com/rockymadden/stringmetric/similarity/HammingMetricSpec.scala @@ -6,7 +6,7 @@ import org.scalatest.junit.JUnitRunner @RunWith(classOf[JUnitRunner]) final class HammingMetricSpec extends ScalaTest { - import HammingMetricSpec._ + import HammingMetricSpec.Metric "HammingMetric" should provide { "compare method" when passed { @@ -41,5 +41,5 @@ final class HammingMetricSpec extends ScalaTest { } object HammingMetricSpec { - private final val Metric = new HammingMetric + private final val Metric = HammingMetric() } diff --git a/core/source/test/scala/com/rockymadden/stringmetric/similarity/JaroMetricSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/similarity/JaroMetricSpec.scala index 5b99619..692ec9d 100755 --- a/core/source/test/scala/com/rockymadden/stringmetric/similarity/JaroMetricSpec.scala +++ b/core/source/test/scala/com/rockymadden/stringmetric/similarity/JaroMetricSpec.scala @@ -6,7 +6,7 @@ import org.scalatest.junit.JUnitRunner @RunWith(classOf[JUnitRunner]) final class JaroMetricSpec extends ScalaTest { - import JaroMetricSpec._ + import JaroMetricSpec.Metric "JaroMetric" should provide { "compare method" when passed { @@ -55,5 +55,5 @@ final class JaroMetricSpec extends ScalaTest { } object JaroMetricSpec { - private final val Metric = new JaroMetric + private final val Metric = JaroMetric() } diff --git a/core/source/test/scala/com/rockymadden/stringmetric/similarity/JaroWinklerMetricSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/similarity/JaroWinklerMetricSpec.scala index d9fe4b7..6ee44d1 100755 --- a/core/source/test/scala/com/rockymadden/stringmetric/similarity/JaroWinklerMetricSpec.scala +++ b/core/source/test/scala/com/rockymadden/stringmetric/similarity/JaroWinklerMetricSpec.scala @@ -6,7 +6,7 @@ import org.scalatest.junit.JUnitRunner @RunWith(classOf[JUnitRunner]) final class JaroWinklerMetricSpec extends ScalaTest { - import JaroWinklerMetricSpec._ + import JaroWinklerMetricSpec.Metric "JaroWinklerMetric" should provide { "compare method" when passed { @@ -55,5 +55,5 @@ final class JaroWinklerMetricSpec extends ScalaTest { } object JaroWinklerMetricSpec { - private final val Metric = new JaroWinklerMetric + private final val Metric = JaroWinklerMetric() } diff --git a/core/source/test/scala/com/rockymadden/stringmetric/similarity/LevenshteinMetricSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/similarity/LevenshteinMetricSpec.scala index ac45a21..c0a183e 100755 --- a/core/source/test/scala/com/rockymadden/stringmetric/similarity/LevenshteinMetricSpec.scala +++ b/core/source/test/scala/com/rockymadden/stringmetric/similarity/LevenshteinMetricSpec.scala @@ -6,7 +6,7 @@ import org.scalatest.junit.JUnitRunner @RunWith(classOf[JUnitRunner]) final class LevenshteinMetricSpec extends ScalaTest { - import LevenshteinMetricSpec._ + import LevenshteinMetricSpec.Metric "LevenshteinMetric" should provide { "compare method" when passed { @@ -54,5 +54,5 @@ final class LevenshteinMetricSpec extends ScalaTest { } object LevenshteinMetricSpec { - private final val Metric = new LevenshteinMetric + private final val Metric = LevenshteinMetric() } diff --git a/core/source/test/scala/com/rockymadden/stringmetric/similarity/NGramAlgorithmSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/similarity/NGramAlgorithmSpec.scala index ffeefb0..87d2a3d 100755 --- a/core/source/test/scala/com/rockymadden/stringmetric/similarity/NGramAlgorithmSpec.scala +++ b/core/source/test/scala/com/rockymadden/stringmetric/similarity/NGramAlgorithmSpec.scala @@ -6,7 +6,7 @@ import org.scalatest.junit.JUnitRunner @RunWith(classOf[JUnitRunner]) final class NGramAlgorithmSpec extends ScalaTest { - import NGramAlgorithmSpec._ + import NGramAlgorithmSpec.Algorithm "NGramAlgorithm" should provide { "compute method" when passed { @@ -53,5 +53,5 @@ final class NGramAlgorithmSpec extends ScalaTest { } object NGramAlgorithmSpec { - private final val Algorithm = new NGramAlgorithm + private final val Algorithm = NGramAlgorithm() } diff --git a/core/source/test/scala/com/rockymadden/stringmetric/similarity/NGramMetricSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/similarity/NGramMetricSpec.scala index 0f09ab1..20a17c4 100755 --- a/core/source/test/scala/com/rockymadden/stringmetric/similarity/NGramMetricSpec.scala +++ b/core/source/test/scala/com/rockymadden/stringmetric/similarity/NGramMetricSpec.scala @@ -6,7 +6,7 @@ import org.scalatest.junit.JUnitRunner @RunWith(classOf[JUnitRunner]) final class NGramMetricSpec extends ScalaTest { - import NGramMetricSpec._ + import NGramMetricSpec.Metric "NGramMetric" should provide { "compare method" when passed { @@ -64,5 +64,5 @@ final class NGramMetricSpec extends ScalaTest { } object NGramMetricSpec { - private final val Metric = new NGramMetric + private final val Metric = NGramMetric() } diff --git a/core/source/test/scala/com/rockymadden/stringmetric/similarity/RatcliffObershelpMetricSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/similarity/RatcliffObershelpMetricSpec.scala index d6a8d45..445c2b6 100755 --- a/core/source/test/scala/com/rockymadden/stringmetric/similarity/RatcliffObershelpMetricSpec.scala +++ b/core/source/test/scala/com/rockymadden/stringmetric/similarity/RatcliffObershelpMetricSpec.scala @@ -6,7 +6,7 @@ import org.scalatest.junit.JUnitRunner @RunWith(classOf[JUnitRunner]) final class RatcliffObershelpMetricSpec extends ScalaTest { - import RatcliffObershelpMetricSpec._ + import RatcliffObershelpMetricSpec.Metric "RatcliffObershelpMetric" should provide { "compare method" when passed { @@ -44,6 +44,6 @@ final class RatcliffObershelpMetricSpec extends ScalaTest { } object RatcliffObershelpMetricSpec { - private final val Metric = new RatcliffObershelpMetric + private final val Metric = RatcliffObershelpMetric() } 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 5665d7c..c93e652 100755 --- a/core/source/test/scala/com/rockymadden/stringmetric/similarity/WeightedLevenshteinMetricSpec.scala +++ b/core/source/test/scala/com/rockymadden/stringmetric/similarity/WeightedLevenshteinMetricSpec.scala @@ -6,7 +6,7 @@ import org.scalatest.junit.JUnitRunner @RunWith(classOf[JUnitRunner]) final class WeightedLevenshteinMetricSpec extends ScalaTest { - import WeightedLevenshteinMetricSpec._ + import WeightedLevenshteinMetricSpec.{ Metric, Options } "WeightedLevenshteinMetric" should provide { "compare method" when passed { @@ -53,5 +53,5 @@ final class WeightedLevenshteinMetricSpec extends ScalaTest { object WeightedLevenshteinMetricSpec { private final val Options = Tuple3[BigDecimal, BigDecimal, BigDecimal](10, 0.1, 1) - private final val Metric = new WeightedLevenshteinMetric + private final val Metric = WeightedLevenshteinMetric() } |