diff --git a/cli/src/test/scala/com/rockymadden/stringmetric/cli/PackageSpec.scala b/cli/src/test/scala/com/rockymadden/stringmetric/cli/PackageSpec.scala index 44550dc3..9b88d755 100755 --- a/cli/src/test/scala/com/rockymadden/stringmetric/cli/PackageSpec.scala +++ b/cli/src/test/scala/com/rockymadden/stringmetric/cli/PackageSpec.scala @@ -1,6 +1,6 @@ package com.rockymadden.stringmetric.cli -object PackageSpec extends org.specs2.mutable.SpecificationWithJUnit { +object PackageSpec extends org.specs2.mutable.Specification { "OptionMap apply()" should { "return populated Map with single valid double dashed option" in { val opts = OptionMap("--help") diff --git a/cli/src/test/scala/com/rockymadden/stringmetric/cli/phonetic/metaphonealgorithmSpec.scala b/cli/src/test/scala/com/rockymadden/stringmetric/cli/phonetic/metaphonealgorithmSpec.scala index 1b22943d..7c5a5137 100755 --- a/cli/src/test/scala/com/rockymadden/stringmetric/cli/phonetic/metaphonealgorithmSpec.scala +++ b/cli/src/test/scala/com/rockymadden/stringmetric/cli/phonetic/metaphonealgorithmSpec.scala @@ -1,6 +1,6 @@ package com.rockymadden.stringmetric.cli.phonetic -object metaphonealgorithmSpec extends org.specs2.mutable.SpecificationWithJUnit { +object metaphonealgorithmSpec extends org.specs2.mutable.Specification { "metaphonealgorithm main()" should { "print phonetic representation with valid dashless argument" in { val out = new java.io.ByteArrayOutputStream() diff --git a/cli/src/test/scala/com/rockymadden/stringmetric/cli/phonetic/metaphonemetricSpec.scala b/cli/src/test/scala/com/rockymadden/stringmetric/cli/phonetic/metaphonemetricSpec.scala index 51240687..28c27987 100755 --- a/cli/src/test/scala/com/rockymadden/stringmetric/cli/phonetic/metaphonemetricSpec.scala +++ b/cli/src/test/scala/com/rockymadden/stringmetric/cli/phonetic/metaphonemetricSpec.scala @@ -1,6 +1,6 @@ package com.rockymadden.stringmetric.cli.phonetic -object metaphonemetricSpec extends org.specs2.mutable.SpecificationWithJUnit { +object metaphonemetricSpec extends org.specs2.mutable.Specification { "metaphonemetric main()" should { "print if they are a match with valid dashless arguments" in { val out = new java.io.ByteArrayOutputStream() diff --git a/cli/src/test/scala/com/rockymadden/stringmetric/cli/phonetic/nysiisalgorithmSpec.scala b/cli/src/test/scala/com/rockymadden/stringmetric/cli/phonetic/nysiisalgorithmSpec.scala index a331ba11..70c84c88 100755 --- a/cli/src/test/scala/com/rockymadden/stringmetric/cli/phonetic/nysiisalgorithmSpec.scala +++ b/cli/src/test/scala/com/rockymadden/stringmetric/cli/phonetic/nysiisalgorithmSpec.scala @@ -1,6 +1,6 @@ package com.rockymadden.stringmetric.cli.phonetic -object nysiisalgorithmSpec extends org.specs2.mutable.SpecificationWithJUnit { +object nysiisalgorithmSpec extends org.specs2.mutable.Specification { "nysiisalgorithm main()" should { "print phonetic representation with valid dashless argument" in { val out = new java.io.ByteArrayOutputStream() diff --git a/cli/src/test/scala/com/rockymadden/stringmetric/cli/phonetic/nysiismetricSpec.scala b/cli/src/test/scala/com/rockymadden/stringmetric/cli/phonetic/nysiismetricSpec.scala index aaeb4311..b3ffa090 100755 --- a/cli/src/test/scala/com/rockymadden/stringmetric/cli/phonetic/nysiismetricSpec.scala +++ b/cli/src/test/scala/com/rockymadden/stringmetric/cli/phonetic/nysiismetricSpec.scala @@ -1,6 +1,6 @@ package com.rockymadden.stringmetric.cli.phonetic -object nysiismetricSpec extends org.specs2.mutable.SpecificationWithJUnit { +object nysiismetricSpec extends org.specs2.mutable.Specification { "nysiismetric main()" should { "print if they are a match with valid dashless arguments" in { val out = new java.io.ByteArrayOutputStream() diff --git a/cli/src/test/scala/com/rockymadden/stringmetric/cli/phonetic/refinednysiisalgorithmSpec.scala b/cli/src/test/scala/com/rockymadden/stringmetric/cli/phonetic/refinednysiisalgorithmSpec.scala index 9fd65047..cbc23df4 100755 --- a/cli/src/test/scala/com/rockymadden/stringmetric/cli/phonetic/refinednysiisalgorithmSpec.scala +++ b/cli/src/test/scala/com/rockymadden/stringmetric/cli/phonetic/refinednysiisalgorithmSpec.scala @@ -1,6 +1,6 @@ package com.rockymadden.stringmetric.cli.phonetic -object refinednysiisalgorithmSpec extends org.specs2.mutable.SpecificationWithJUnit { +object refinednysiisalgorithmSpec extends org.specs2.mutable.Specification { "refinednysiisalgorithm main()" should { "print phonetic representation with valid dashless argument" in { val out = new java.io.ByteArrayOutputStream() diff --git a/cli/src/test/scala/com/rockymadden/stringmetric/cli/phonetic/refinednysiismetricSpec.scala b/cli/src/test/scala/com/rockymadden/stringmetric/cli/phonetic/refinednysiismetricSpec.scala index 7a82f5e5..3f069596 100755 --- a/cli/src/test/scala/com/rockymadden/stringmetric/cli/phonetic/refinednysiismetricSpec.scala +++ b/cli/src/test/scala/com/rockymadden/stringmetric/cli/phonetic/refinednysiismetricSpec.scala @@ -1,6 +1,6 @@ package com.rockymadden.stringmetric.cli.phonetic -object refinednysiismetricSpec extends org.specs2.mutable.SpecificationWithJUnit { +object refinednysiismetricSpec extends org.specs2.mutable.Specification { "refinednysiismetric main()" should { "print if they are a match with valid dashless arguments" in { val out = new java.io.ByteArrayOutputStream() diff --git a/cli/src/test/scala/com/rockymadden/stringmetric/cli/phonetic/refinedsoundexalgorithmSpec.scala b/cli/src/test/scala/com/rockymadden/stringmetric/cli/phonetic/refinedsoundexalgorithmSpec.scala index 051499bc..4250f084 100755 --- a/cli/src/test/scala/com/rockymadden/stringmetric/cli/phonetic/refinedsoundexalgorithmSpec.scala +++ b/cli/src/test/scala/com/rockymadden/stringmetric/cli/phonetic/refinedsoundexalgorithmSpec.scala @@ -1,6 +1,6 @@ package com.rockymadden.stringmetric.cli.phonetic -object refinedsoundexalgorithmSpec extends org.specs2.mutable.SpecificationWithJUnit { +object refinedsoundexalgorithmSpec extends org.specs2.mutable.Specification { "refinedsoundexalgorithm main()" should { "print phonetic representation with valid dashless argument" in { val out = new java.io.ByteArrayOutputStream() diff --git a/cli/src/test/scala/com/rockymadden/stringmetric/cli/phonetic/refinedsoundexmetricSpec.scala b/cli/src/test/scala/com/rockymadden/stringmetric/cli/phonetic/refinedsoundexmetricSpec.scala index e7c6d2d2..98941237 100755 --- a/cli/src/test/scala/com/rockymadden/stringmetric/cli/phonetic/refinedsoundexmetricSpec.scala +++ b/cli/src/test/scala/com/rockymadden/stringmetric/cli/phonetic/refinedsoundexmetricSpec.scala @@ -1,6 +1,6 @@ package com.rockymadden.stringmetric.cli.phonetic -object refinedsoundexmetricSpec extends org.specs2.mutable.SpecificationWithJUnit { +object refinedsoundexmetricSpec extends org.specs2.mutable.Specification { "refinedsoundexmetric main()" should { "print if they are a match with valid dashless arguments" in { val out = new java.io.ByteArrayOutputStream() diff --git a/cli/src/test/scala/com/rockymadden/stringmetric/cli/phonetic/soundexalgorithmSpec.scala b/cli/src/test/scala/com/rockymadden/stringmetric/cli/phonetic/soundexalgorithmSpec.scala index 13151d33..8be9b64d 100755 --- a/cli/src/test/scala/com/rockymadden/stringmetric/cli/phonetic/soundexalgorithmSpec.scala +++ b/cli/src/test/scala/com/rockymadden/stringmetric/cli/phonetic/soundexalgorithmSpec.scala @@ -1,6 +1,6 @@ package com.rockymadden.stringmetric.cli.phonetic -object soundexalgorithmSpec extends org.specs2.mutable.SpecificationWithJUnit { +object soundexalgorithmSpec extends org.specs2.mutable.Specification { "soundexalgorithm main()" should { "print phonetic representation with valid dashless argument" in { val out = new java.io.ByteArrayOutputStream() diff --git a/cli/src/test/scala/com/rockymadden/stringmetric/cli/phonetic/soundexmetricSpec.scala b/cli/src/test/scala/com/rockymadden/stringmetric/cli/phonetic/soundexmetricSpec.scala index 433bb978..93562635 100755 --- a/cli/src/test/scala/com/rockymadden/stringmetric/cli/phonetic/soundexmetricSpec.scala +++ b/cli/src/test/scala/com/rockymadden/stringmetric/cli/phonetic/soundexmetricSpec.scala @@ -1,6 +1,6 @@ package com.rockymadden.stringmetric.cli.phonetic -object soundexmetricSpec extends org.specs2.mutable.SpecificationWithJUnit { +object soundexmetricSpec extends org.specs2.mutable.Specification { "soundexmetric main()" should { "print if they are a match with valid dashless arguments" in { val out = new java.io.ByteArrayOutputStream() diff --git a/cli/src/test/scala/com/rockymadden/stringmetric/cli/similarity/dicesorensenmetricSpec.scala b/cli/src/test/scala/com/rockymadden/stringmetric/cli/similarity/dicesorensenmetricSpec.scala index 5e0fce26..8ce5b143 100755 --- a/cli/src/test/scala/com/rockymadden/stringmetric/cli/similarity/dicesorensenmetricSpec.scala +++ b/cli/src/test/scala/com/rockymadden/stringmetric/cli/similarity/dicesorensenmetricSpec.scala @@ -1,6 +1,6 @@ package com.rockymadden.stringmetric.cli.similarity -object dicesorensenmetricSpec extends org.specs2.mutable.SpecificationWithJUnit { +object dicesorensenmetricSpec extends org.specs2.mutable.Specification { "dicesorensenmetric main()" should { "print if they are a match with valid dashless arguments" in { val out = new java.io.ByteArrayOutputStream() diff --git a/cli/src/test/scala/com/rockymadden/stringmetric/cli/similarity/hammingmetricSpec.scala b/cli/src/test/scala/com/rockymadden/stringmetric/cli/similarity/hammingmetricSpec.scala index 0f33097b..465555bf 100755 --- a/cli/src/test/scala/com/rockymadden/stringmetric/cli/similarity/hammingmetricSpec.scala +++ b/cli/src/test/scala/com/rockymadden/stringmetric/cli/similarity/hammingmetricSpec.scala @@ -1,6 +1,6 @@ package com.rockymadden.stringmetric.cli.similarity -object hammingmetricSpec extends org.specs2.mutable.SpecificationWithJUnit { +object hammingmetricSpec extends org.specs2.mutable.Specification { "hammingmetric main()" should { "print if they are a match with valid dashless arguments" in { val out = new java.io.ByteArrayOutputStream() diff --git a/cli/src/test/scala/com/rockymadden/stringmetric/cli/similarity/jaccardmetricSpec.scala b/cli/src/test/scala/com/rockymadden/stringmetric/cli/similarity/jaccardmetricSpec.scala index 41bd3903..e9af8e04 100755 --- a/cli/src/test/scala/com/rockymadden/stringmetric/cli/similarity/jaccardmetricSpec.scala +++ b/cli/src/test/scala/com/rockymadden/stringmetric/cli/similarity/jaccardmetricSpec.scala @@ -1,6 +1,6 @@ package com.rockymadden.stringmetric.cli.similarity -object jaccardmetricSpec extends org.specs2.mutable.SpecificationWithJUnit { +object jaccardmetricSpec extends org.specs2.mutable.Specification { "jaccardmetric main()" should { "print if they are a match with valid dashless arguments" in { val out = new java.io.ByteArrayOutputStream() diff --git a/cli/src/test/scala/com/rockymadden/stringmetric/cli/similarity/jarometricSpec.scala b/cli/src/test/scala/com/rockymadden/stringmetric/cli/similarity/jarometricSpec.scala index 6afdf704..2707e770 100755 --- a/cli/src/test/scala/com/rockymadden/stringmetric/cli/similarity/jarometricSpec.scala +++ b/cli/src/test/scala/com/rockymadden/stringmetric/cli/similarity/jarometricSpec.scala @@ -1,6 +1,6 @@ package com.rockymadden.stringmetric.cli.similarity -object jarometricSpec extends org.specs2.mutable.SpecificationWithJUnit { +object jarometricSpec extends org.specs2.mutable.Specification { "jarometric main()" should { "print the distance with valid dashless arguments" in { val out = new java.io.ByteArrayOutputStream() diff --git a/cli/src/test/scala/com/rockymadden/stringmetric/cli/similarity/jarowinklermetricSpec.scala b/cli/src/test/scala/com/rockymadden/stringmetric/cli/similarity/jarowinklermetricSpec.scala index d064e0cd..bc541e84 100755 --- a/cli/src/test/scala/com/rockymadden/stringmetric/cli/similarity/jarowinklermetricSpec.scala +++ b/cli/src/test/scala/com/rockymadden/stringmetric/cli/similarity/jarowinklermetricSpec.scala @@ -1,6 +1,6 @@ package com.rockymadden.stringmetric.cli.similarity -object jarowinklermetricSpec extends org.specs2.mutable.SpecificationWithJUnit { +object jarowinklermetricSpec extends org.specs2.mutable.Specification { "jarowinklermetric main()" should { "print the distance with valid dashless arguments" in { val out = new java.io.ByteArrayOutputStream() diff --git a/cli/src/test/scala/com/rockymadden/stringmetric/cli/similarity/levenshteinmetricSpec.scala b/cli/src/test/scala/com/rockymadden/stringmetric/cli/similarity/levenshteinmetricSpec.scala index f09ad700..34ea6a9f 100755 --- a/cli/src/test/scala/com/rockymadden/stringmetric/cli/similarity/levenshteinmetricSpec.scala +++ b/cli/src/test/scala/com/rockymadden/stringmetric/cli/similarity/levenshteinmetricSpec.scala @@ -1,6 +1,6 @@ package com.rockymadden.stringmetric.cli.similarity -object levenshteinmetricSpec extends org.specs2.mutable.SpecificationWithJUnit { +object levenshteinmetricSpec extends org.specs2.mutable.Specification { "levenshteinmetric main()" should { "print if they are a match with valid dashless arguments" in { val out = new java.io.ByteArrayOutputStream() diff --git a/cli/src/test/scala/com/rockymadden/stringmetric/cli/similarity/ngrammetricSpec.scala b/cli/src/test/scala/com/rockymadden/stringmetric/cli/similarity/ngrammetricSpec.scala index 85966135..9d924d29 100755 --- a/cli/src/test/scala/com/rockymadden/stringmetric/cli/similarity/ngrammetricSpec.scala +++ b/cli/src/test/scala/com/rockymadden/stringmetric/cli/similarity/ngrammetricSpec.scala @@ -1,6 +1,6 @@ package com.rockymadden.stringmetric.cli.similarity -object ngrammetricSpec extends org.specs2.mutable.SpecificationWithJUnit { +object ngrammetricSpec extends org.specs2.mutable.Specification { "ngrammetric main()" should { "print if they are a match with valid dashless arguments and valid n argument" in { val out = new java.io.ByteArrayOutputStream() diff --git a/cli/src/test/scala/com/rockymadden/stringmetric/cli/similarity/overlapmetricSpec.scala b/cli/src/test/scala/com/rockymadden/stringmetric/cli/similarity/overlapmetricSpec.scala index 31e88a95..bb48d13d 100755 --- a/cli/src/test/scala/com/rockymadden/stringmetric/cli/similarity/overlapmetricSpec.scala +++ b/cli/src/test/scala/com/rockymadden/stringmetric/cli/similarity/overlapmetricSpec.scala @@ -1,6 +1,6 @@ package com.rockymadden.stringmetric.cli.similarity -object overlapmetricSpec extends org.specs2.mutable.SpecificationWithJUnit { +object overlapmetricSpec extends org.specs2.mutable.Specification { "overlapmetric main()" should { "print if they are a match with valid dashless arguments" in { val out = new java.io.ByteArrayOutputStream() diff --git a/cli/src/test/scala/com/rockymadden/stringmetric/cli/similarity/ratcliffobershelpmetricSpec.scala b/cli/src/test/scala/com/rockymadden/stringmetric/cli/similarity/ratcliffobershelpmetricSpec.scala index ab0243fd..40085c4c 100755 --- a/cli/src/test/scala/com/rockymadden/stringmetric/cli/similarity/ratcliffobershelpmetricSpec.scala +++ b/cli/src/test/scala/com/rockymadden/stringmetric/cli/similarity/ratcliffobershelpmetricSpec.scala @@ -1,6 +1,6 @@ package com.rockymadden.stringmetric.cli.similarity -object ratcliffobershelpmetricSpec extends org.specs2.mutable.SpecificationWithJUnit { +object ratcliffobershelpmetricSpec extends org.specs2.mutable.Specification { "ratcliffobershelpmetric main()" should { "print if they are a match with valid dashless arguments" in { val out = new java.io.ByteArrayOutputStream() diff --git a/cli/src/test/scala/com/rockymadden/stringmetric/cli/similarity/weightedlevenshteinmetricSpec.scala b/cli/src/test/scala/com/rockymadden/stringmetric/cli/similarity/weightedlevenshteinmetricSpec.scala index 6fa90949..4cc8fc39 100755 --- a/cli/src/test/scala/com/rockymadden/stringmetric/cli/similarity/weightedlevenshteinmetricSpec.scala +++ b/cli/src/test/scala/com/rockymadden/stringmetric/cli/similarity/weightedlevenshteinmetricSpec.scala @@ -1,6 +1,6 @@ package com.rockymadden.stringmetric.cli.similarity -object weightedlevenshteinmetricSpec extends org.specs2.mutable.SpecificationWithJUnit { +object weightedlevenshteinmetricSpec extends org.specs2.mutable.Specification { "weightedlevenshteinmetric main()" should { "print if they are a match with valid dashless arguments and valid weight arguments" in { val out = new java.io.ByteArrayOutputStream() diff --git a/core/src/test/scala/com/rockymadden/stringmetric/AlphabetSpec.scala b/core/src/test/scala/com/rockymadden/stringmetric/AlphabetSpec.scala index 0145aeaf..4007e588 100755 --- a/core/src/test/scala/com/rockymadden/stringmetric/AlphabetSpec.scala +++ b/core/src/test/scala/com/rockymadden/stringmetric/AlphabetSpec.scala @@ -2,7 +2,8 @@ package com.rockymadden.stringmetric import com.rockymadden.stringmetric.Alphabet._ -object AlphabetSpec extends org.specs2.mutable.SpecificationWithJUnit { + +object AlphabetSpec extends org.specs2.mutable.Specification { "AlphabetSet isSuperset()" should { "return false with non-alphabet argument" in { Alpha isSuperset '0' must beFalse diff --git a/core/src/test/scala/com/rockymadden/stringmetric/StringAlgorithmSpec.scala b/core/src/test/scala/com/rockymadden/stringmetric/StringAlgorithmSpec.scala index 6366685e..910790bf 100644 --- a/core/src/test/scala/com/rockymadden/stringmetric/StringAlgorithmSpec.scala +++ b/core/src/test/scala/com/rockymadden/stringmetric/StringAlgorithmSpec.scala @@ -3,7 +3,7 @@ package com.rockymadden.stringmetric import com.rockymadden.stringmetric.phonetic._ import com.rockymadden.stringmetric.transform._ -object StringAlgorithmSpec extends org.specs2.mutable.SpecificationWithJUnit { +object StringAlgorithmSpec extends org.specs2.mutable.Specification { "StringAlgorithm convenience methods" should { "pass through" in { StringAlgorithm.computeWithMetaphone("testone").get must diff --git a/core/src/test/scala/com/rockymadden/stringmetric/StringMetricSpec.scala b/core/src/test/scala/com/rockymadden/stringmetric/StringMetricSpec.scala index fbdc5364..2f3d872b 100644 --- a/core/src/test/scala/com/rockymadden/stringmetric/StringMetricSpec.scala +++ b/core/src/test/scala/com/rockymadden/stringmetric/StringMetricSpec.scala @@ -4,7 +4,7 @@ import com.rockymadden.stringmetric.phonetic._ import com.rockymadden.stringmetric.similarity._ import com.rockymadden.stringmetric.transform._ -object StringMetricSpec extends org.specs2.mutable.SpecificationWithJUnit { +object StringMetricSpec extends org.specs2.mutable.Specification { "StringMetric convenience methods" should { "pass through" in { StringMetric.compareWithDiceSorensen(1)("testone", "testtwo").get must diff --git a/core/src/test/scala/com/rockymadden/stringmetric/StringTokenizerSpec.scala b/core/src/test/scala/com/rockymadden/stringmetric/StringTokenizerSpec.scala index 0a994b73..c66d45d8 100755 --- a/core/src/test/scala/com/rockymadden/stringmetric/StringTokenizerSpec.scala +++ b/core/src/test/scala/com/rockymadden/stringmetric/StringTokenizerSpec.scala @@ -1,6 +1,6 @@ package com.rockymadden.stringmetric -object StringTokenizerSpec extends org.specs2.mutable.SpecificationWithJUnit { +object StringTokenizerSpec extends org.specs2.mutable.Specification { "NGramTokenizer tokenize()" should { "return None with empty argument" in { NGramTokenizer(1).tokenize("").isDefined must beEqualTo(false) diff --git a/core/src/test/scala/com/rockymadden/stringmetric/phonetic/MetaphoneAlgorithmSpec.scala b/core/src/test/scala/com/rockymadden/stringmetric/phonetic/MetaphoneAlgorithmSpec.scala index 5b9f0784..3b6dae30 100755 --- a/core/src/test/scala/com/rockymadden/stringmetric/phonetic/MetaphoneAlgorithmSpec.scala +++ b/core/src/test/scala/com/rockymadden/stringmetric/phonetic/MetaphoneAlgorithmSpec.scala @@ -1,6 +1,6 @@ package com.rockymadden.stringmetric.phonetic -object MetaphoneAlgorithmSpec extends org.specs2.mutable.SpecificationWithJUnit { +object MetaphoneAlgorithmSpec extends org.specs2.mutable.Specification { "MetaphoneAlgorithm compute()" should { "return None with empty argument" in { MetaphoneAlgorithm.compute("").isDefined must beFalse diff --git a/core/src/test/scala/com/rockymadden/stringmetric/phonetic/MetaphoneMetricSpec.scala b/core/src/test/scala/com/rockymadden/stringmetric/phonetic/MetaphoneMetricSpec.scala index aae4cbcc..82b3feaa 100755 --- a/core/src/test/scala/com/rockymadden/stringmetric/phonetic/MetaphoneMetricSpec.scala +++ b/core/src/test/scala/com/rockymadden/stringmetric/phonetic/MetaphoneMetricSpec.scala @@ -1,6 +1,6 @@ package com.rockymadden.stringmetric.phonetic -object MetaphoneMetricSpec extends org.specs2.mutable.SpecificationWithJUnit { +object MetaphoneMetricSpec extends org.specs2.mutable.Specification { "MetaphoneMetric compare()" should { "return None with empty arguments" in { MetaphoneMetric.compare("", "").isDefined must beFalse diff --git a/core/src/test/scala/com/rockymadden/stringmetric/phonetic/NysiisAlgorithmSpec.scala b/core/src/test/scala/com/rockymadden/stringmetric/phonetic/NysiisAlgorithmSpec.scala index 7cb37084..3c79fff5 100755 --- a/core/src/test/scala/com/rockymadden/stringmetric/phonetic/NysiisAlgorithmSpec.scala +++ b/core/src/test/scala/com/rockymadden/stringmetric/phonetic/NysiisAlgorithmSpec.scala @@ -1,6 +1,6 @@ package com.rockymadden.stringmetric.phonetic -object NysiisAlgorithmSpec extends org.specs2.mutable.SpecificationWithJUnit { +object NysiisAlgorithmSpec extends org.specs2.mutable.Specification { "NysiisAlgorithm compute()" should { "return None with empty argument" in { NysiisAlgorithm.compute("").isDefined must beFalse diff --git a/core/src/test/scala/com/rockymadden/stringmetric/phonetic/NysiisMetricSpec.scala b/core/src/test/scala/com/rockymadden/stringmetric/phonetic/NysiisMetricSpec.scala index d65165b3..29e2b366 100755 --- a/core/src/test/scala/com/rockymadden/stringmetric/phonetic/NysiisMetricSpec.scala +++ b/core/src/test/scala/com/rockymadden/stringmetric/phonetic/NysiisMetricSpec.scala @@ -1,6 +1,6 @@ package com.rockymadden.stringmetric.phonetic -object NysiisMetricSpec extends org.specs2.mutable.SpecificationWithJUnit { +object NysiisMetricSpec extends org.specs2.mutable.Specification { "NysiisMetric compare()" should { "return None with empty arguments" in { NysiisMetric.compare("", "").isDefined must beFalse diff --git a/core/src/test/scala/com/rockymadden/stringmetric/phonetic/RefinedNysiisAlgorithmSpec.scala b/core/src/test/scala/com/rockymadden/stringmetric/phonetic/RefinedNysiisAlgorithmSpec.scala index 5b0f46dd..4d3fb013 100755 --- a/core/src/test/scala/com/rockymadden/stringmetric/phonetic/RefinedNysiisAlgorithmSpec.scala +++ b/core/src/test/scala/com/rockymadden/stringmetric/phonetic/RefinedNysiisAlgorithmSpec.scala @@ -1,6 +1,6 @@ package com.rockymadden.stringmetric.phonetic -object RefinedNysiisAlgorithmSpec extends org.specs2.mutable.SpecificationWithJUnit { +object RefinedNysiisAlgorithmSpec extends org.specs2.mutable.Specification { "RefinedNysiisAlgorithm compute()" should { "return None with empty argument" in { RefinedNysiisAlgorithm.compute("").isDefined must beFalse diff --git a/core/src/test/scala/com/rockymadden/stringmetric/phonetic/RefinedNysiisMetricSpec.scala b/core/src/test/scala/com/rockymadden/stringmetric/phonetic/RefinedNysiisMetricSpec.scala index 285d8790..bd546a8f 100755 --- a/core/src/test/scala/com/rockymadden/stringmetric/phonetic/RefinedNysiisMetricSpec.scala +++ b/core/src/test/scala/com/rockymadden/stringmetric/phonetic/RefinedNysiisMetricSpec.scala @@ -1,6 +1,6 @@ package com.rockymadden.stringmetric.phonetic -object RefinedNysiisMetricSpec extends org.specs2.mutable.SpecificationWithJUnit { +object RefinedNysiisMetricSpec extends org.specs2.mutable.Specification { "RefinedNysiisMetric compare()" should { "return None with empty arguments" in { RefinedNysiisMetric.compare("", "").isDefined must beFalse diff --git a/core/src/test/scala/com/rockymadden/stringmetric/phonetic/RefinedSoundexAlgorithmSpec.scala b/core/src/test/scala/com/rockymadden/stringmetric/phonetic/RefinedSoundexAlgorithmSpec.scala index ff756fa4..94bc6456 100755 --- a/core/src/test/scala/com/rockymadden/stringmetric/phonetic/RefinedSoundexAlgorithmSpec.scala +++ b/core/src/test/scala/com/rockymadden/stringmetric/phonetic/RefinedSoundexAlgorithmSpec.scala @@ -1,6 +1,6 @@ package com.rockymadden.stringmetric.phonetic -object RefinedSoundexAlgorithmSpec extends org.specs2.mutable.SpecificationWithJUnit { +object RefinedSoundexAlgorithmSpec extends org.specs2.mutable.Specification { "compute method" should { "return None with empty argument" in { RefinedSoundexAlgorithm.compute("").isDefined must beFalse diff --git a/core/src/test/scala/com/rockymadden/stringmetric/phonetic/RefinedSoundexMetricSpec.scala b/core/src/test/scala/com/rockymadden/stringmetric/phonetic/RefinedSoundexMetricSpec.scala index 82ff3fa0..634bb400 100755 --- a/core/src/test/scala/com/rockymadden/stringmetric/phonetic/RefinedSoundexMetricSpec.scala +++ b/core/src/test/scala/com/rockymadden/stringmetric/phonetic/RefinedSoundexMetricSpec.scala @@ -1,6 +1,6 @@ package com.rockymadden.stringmetric.phonetic -object RefinedSoundexMetricSpec extends org.specs2.mutable.SpecificationWithJUnit { +object RefinedSoundexMetricSpec extends org.specs2.mutable.Specification { "RefinedSoundexMetric compare()" should { "return None with empty arguments" in { RefinedSoundexMetric.compare("", "").isDefined must beFalse diff --git a/core/src/test/scala/com/rockymadden/stringmetric/phonetic/SoundexAlgorithmSpec.scala b/core/src/test/scala/com/rockymadden/stringmetric/phonetic/SoundexAlgorithmSpec.scala index c167f63c..84a44556 100755 --- a/core/src/test/scala/com/rockymadden/stringmetric/phonetic/SoundexAlgorithmSpec.scala +++ b/core/src/test/scala/com/rockymadden/stringmetric/phonetic/SoundexAlgorithmSpec.scala @@ -1,6 +1,6 @@ package com.rockymadden.stringmetric.phonetic -object SoundexAlgorithmSpec extends org.specs2.mutable.SpecificationWithJUnit { +object SoundexAlgorithmSpec extends org.specs2.mutable.Specification { "SoundexAlgorithm compute()" should { "return None with empty argument" in { SoundexAlgorithm.compute("").isDefined must beFalse diff --git a/core/src/test/scala/com/rockymadden/stringmetric/phonetic/SoundexMetricSpec.scala b/core/src/test/scala/com/rockymadden/stringmetric/phonetic/SoundexMetricSpec.scala index 449091d2..00c8589e 100755 --- a/core/src/test/scala/com/rockymadden/stringmetric/phonetic/SoundexMetricSpec.scala +++ b/core/src/test/scala/com/rockymadden/stringmetric/phonetic/SoundexMetricSpec.scala @@ -1,6 +1,6 @@ package com.rockymadden.stringmetric.phonetic -object SoundexMetricSpec extends org.specs2.mutable.SpecificationWithJUnit { +object SoundexMetricSpec extends org.specs2.mutable.Specification { "SoundexMetric compare()" should { "return None with empty arguments" in { SoundexMetric.compare("", "").isDefined must beFalse diff --git a/core/src/test/scala/com/rockymadden/stringmetric/similarity/DiceSorensenMetricSpec.scala b/core/src/test/scala/com/rockymadden/stringmetric/similarity/DiceSorensenMetricSpec.scala index 4912e9ec..b329ace9 100755 --- a/core/src/test/scala/com/rockymadden/stringmetric/similarity/DiceSorensenMetricSpec.scala +++ b/core/src/test/scala/com/rockymadden/stringmetric/similarity/DiceSorensenMetricSpec.scala @@ -1,6 +1,6 @@ package com.rockymadden.stringmetric.similarity -object DiceSorensenMetricSpec extends org.specs2.mutable.SpecificationWithJUnit { +object DiceSorensenMetricSpec extends org.specs2.mutable.Specification { "DiceSorensenMetric compare()" should { "return None with empty arguments" in { DiceSorensenMetric(1).compare("", "").isDefined must beFalse diff --git a/core/src/test/scala/com/rockymadden/stringmetric/similarity/HammingMetricSpec.scala b/core/src/test/scala/com/rockymadden/stringmetric/similarity/HammingMetricSpec.scala index b2831bc2..8f84921b 100755 --- a/core/src/test/scala/com/rockymadden/stringmetric/similarity/HammingMetricSpec.scala +++ b/core/src/test/scala/com/rockymadden/stringmetric/similarity/HammingMetricSpec.scala @@ -1,6 +1,6 @@ package com.rockymadden.stringmetric.similarity -object HammingMetricSpec extends org.specs2.mutable.SpecificationWithJUnit { +object HammingMetricSpec extends org.specs2.mutable.Specification { "HammingMetric compare()" should { "return None with empty arguments" in { HammingMetric.compare("", "").isDefined must beFalse diff --git a/core/src/test/scala/com/rockymadden/stringmetric/similarity/JaccardMetricSpec.scala b/core/src/test/scala/com/rockymadden/stringmetric/similarity/JaccardMetricSpec.scala index 145a1e90..c250b445 100755 --- a/core/src/test/scala/com/rockymadden/stringmetric/similarity/JaccardMetricSpec.scala +++ b/core/src/test/scala/com/rockymadden/stringmetric/similarity/JaccardMetricSpec.scala @@ -1,6 +1,6 @@ package com.rockymadden.stringmetric.similarity -object JaccardMetricSpec extends org.specs2.mutable.SpecificationWithJUnit { +object JaccardMetricSpec extends org.specs2.mutable.Specification { "JaccardMetric compare()" should { "return None with empty arguments" in { JaccardMetric(1).compare("", "").isDefined must beFalse diff --git a/core/src/test/scala/com/rockymadden/stringmetric/similarity/JaroMetricSpec.scala b/core/src/test/scala/com/rockymadden/stringmetric/similarity/JaroMetricSpec.scala index c4450331..4088c805 100755 --- a/core/src/test/scala/com/rockymadden/stringmetric/similarity/JaroMetricSpec.scala +++ b/core/src/test/scala/com/rockymadden/stringmetric/similarity/JaroMetricSpec.scala @@ -1,6 +1,6 @@ package com.rockymadden.stringmetric.similarity -object JaroMetricSpec extends org.specs2.mutable.SpecificationWithJUnit { +object JaroMetricSpec extends org.specs2.mutable.Specification { "JaroMetric compare()" should { "return None with empty arguments" in { JaroMetric.compare("", "").isDefined should beFalse diff --git a/core/src/test/scala/com/rockymadden/stringmetric/similarity/JaroWinklerMetricSpec.scala b/core/src/test/scala/com/rockymadden/stringmetric/similarity/JaroWinklerMetricSpec.scala index 79a4df05..cd511bc8 100755 --- a/core/src/test/scala/com/rockymadden/stringmetric/similarity/JaroWinklerMetricSpec.scala +++ b/core/src/test/scala/com/rockymadden/stringmetric/similarity/JaroWinklerMetricSpec.scala @@ -1,6 +1,6 @@ package com.rockymadden.stringmetric.similarity -object JaroWinklerMetricSpec extends org.specs2.mutable.SpecificationWithJUnit { +object JaroWinklerMetricSpec extends org.specs2.mutable.Specification { "JaroWinklerMetric compare()" should { "return None with empty arguments" in { JaroWinklerMetric.compare("", "").isDefined must beFalse diff --git a/core/src/test/scala/com/rockymadden/stringmetric/similarity/LevenshteinMetricSpec.scala b/core/src/test/scala/com/rockymadden/stringmetric/similarity/LevenshteinMetricSpec.scala index 111d75ff..b4d0622e 100755 --- a/core/src/test/scala/com/rockymadden/stringmetric/similarity/LevenshteinMetricSpec.scala +++ b/core/src/test/scala/com/rockymadden/stringmetric/similarity/LevenshteinMetricSpec.scala @@ -1,6 +1,6 @@ package com.rockymadden.stringmetric.similarity -object LevenshteinMetricSpec extends org.specs2.mutable.SpecificationWithJUnit { +object LevenshteinMetricSpec extends org.specs2.mutable.Specification { "LevenshteinMetric compare()" should { "return None with empty arguments" in { LevenshteinMetric.compare("", "").isDefined must beFalse diff --git a/core/src/test/scala/com/rockymadden/stringmetric/similarity/NGramMetricSpec.scala b/core/src/test/scala/com/rockymadden/stringmetric/similarity/NGramMetricSpec.scala index 501a331b..33ce91e4 100755 --- a/core/src/test/scala/com/rockymadden/stringmetric/similarity/NGramMetricSpec.scala +++ b/core/src/test/scala/com/rockymadden/stringmetric/similarity/NGramMetricSpec.scala @@ -1,6 +1,6 @@ package com.rockymadden.stringmetric.similarity -object NGramMetricSpec extends org.specs2.mutable.SpecificationWithJUnit { +object NGramMetricSpec extends org.specs2.mutable.Specification { "NGramMetric compare()" should { "return None with empty arguments" in { NGramMetric(1).compare("", "").isDefined must beFalse diff --git a/core/src/test/scala/com/rockymadden/stringmetric/similarity/OverlapMetricSpec.scala b/core/src/test/scala/com/rockymadden/stringmetric/similarity/OverlapMetricSpec.scala index ba505920..0fac0827 100755 --- a/core/src/test/scala/com/rockymadden/stringmetric/similarity/OverlapMetricSpec.scala +++ b/core/src/test/scala/com/rockymadden/stringmetric/similarity/OverlapMetricSpec.scala @@ -1,6 +1,6 @@ package com.rockymadden.stringmetric.similarity -object OverlapMetricSpec extends org.specs2.mutable.SpecificationWithJUnit { +object OverlapMetricSpec extends org.specs2.mutable.Specification { "OverlapMetric compare()" should { "return None with empty arguments" in { OverlapMetric(1).compare("", "").isDefined must beFalse diff --git a/core/src/test/scala/com/rockymadden/stringmetric/similarity/RatcliffObershelpMetricSpec.scala b/core/src/test/scala/com/rockymadden/stringmetric/similarity/RatcliffObershelpMetricSpec.scala index 61394ea8..d8b1b89b 100755 --- a/core/src/test/scala/com/rockymadden/stringmetric/similarity/RatcliffObershelpMetricSpec.scala +++ b/core/src/test/scala/com/rockymadden/stringmetric/similarity/RatcliffObershelpMetricSpec.scala @@ -1,6 +1,6 @@ package com.rockymadden.stringmetric.similarity -object RatcliffObershelpMetricSpec extends org.specs2.mutable.SpecificationWithJUnit { +object RatcliffObershelpMetricSpec extends org.specs2.mutable.Specification { "RatcliffObershelpMetric compare()" should { "return None with empty arguments" in { RatcliffObershelpMetric.compare("", "").isDefined must beFalse diff --git a/core/src/test/scala/com/rockymadden/stringmetric/similarity/WeightedLevenshteinMetricSpec.scala b/core/src/test/scala/com/rockymadden/stringmetric/similarity/WeightedLevenshteinMetricSpec.scala index 53c12541..4228eabd 100755 --- a/core/src/test/scala/com/rockymadden/stringmetric/similarity/WeightedLevenshteinMetricSpec.scala +++ b/core/src/test/scala/com/rockymadden/stringmetric/similarity/WeightedLevenshteinMetricSpec.scala @@ -1,6 +1,6 @@ package com.rockymadden.stringmetric.similarity -object WeightedLevenshteinMetricSpec extends org.specs2.mutable.SpecificationWithJUnit { +object WeightedLevenshteinMetricSpec extends org.specs2.mutable.Specification { "WeightedLevenshteinMetric compare()" should { "return None with empty arguments" in { WeightedLevenshteinMetric(10, 0.1, 1).compare("", "").isDefined must beFalse diff --git a/core/src/test/scala/com/rockymadden/stringmetric/transformSpec.scala b/core/src/test/scala/com/rockymadden/stringmetric/transformSpec.scala index 01fa3a33..bf2c2de9 100644 --- a/core/src/test/scala/com/rockymadden/stringmetric/transformSpec.scala +++ b/core/src/test/scala/com/rockymadden/stringmetric/transformSpec.scala @@ -2,7 +2,7 @@ package com.rockymadden.stringmetric import com.rockymadden.stringmetric.transform._ -object transformSpec extends org.specs2.mutable.SpecificationWithJUnit { +object transformSpec extends org.specs2.mutable.Specification { "filterAlpha()" should { "return transformed" in { filterAlpha( diff --git a/project/build.properties b/project/build.properties index 37b489cb..27e88aa1 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.1 +sbt.version=0.13.13 diff --git a/project/build.scala b/project/build.scala index e13649b7..ea3f4ad1 100644 --- a/project/build.scala +++ b/project/build.scala @@ -4,7 +4,7 @@ import Keys._ object CoreBuild extends Build { lazy val root = Project("stringmetric", file("."), settings = Defaults.defaultSettings ++ Seq( - credentials += Credentials(Path.userHome / ".ivy2" / ".credentials"), + //credentials += Credentials(Path.userHome / ".ivy2" / ".credentials"), name := "stringmetric", organization := "com.rockymadden.stringmetric", pomExtra := @@ -29,23 +29,25 @@ object CoreBuild extends Build { publishMavenStyle := true, publishTo := Some("Sonatype" at "https://oss.sonatype.org/service/local/staging/deploy/maven2"), resolvers ++= Seq(DefaultMavenRepository), - scalaVersion := "2.11.1", - crossScalaVersions := Seq("2.11.1", "2.10.4"), + scalaVersion := "2.12.3", + crossScalaVersions := Seq("2.12.3", "2.11.11", "2.10.6"), crossVersion := CrossVersion.binary, - version := "0.27.4" + version := "0.27.5" ) ).aggregate(core, cli) + private val specs2Version = "3.9.4" + lazy val core: Project = Project("core", file("core"), settings = (root.settings: Seq[sbt.Def.Setting[_]]) ++ Seq( - libraryDependencies ++= Seq("org.specs2" %% "specs2" % "2.3.12" % "test"), + libraryDependencies ++= Seq("org.specs2" %% "specs2-core" % specs2Version % "test"), name := "stringmetric-core" ) ) lazy val cli: Project = Project("cli", file("cli"), settings = (root.settings: Seq[sbt.Def.Setting[_]]) ++ Seq( - libraryDependencies ++= Seq("org.specs2" %% "specs2" % "2.3.12" % "test"), + libraryDependencies ++= Seq("org.specs2" %% "specs2-core" % specs2Version % "test"), name := "stringmetric-cli" ) ).dependsOn(core) diff --git a/readme.md b/readme.md index 9c455744..7918c0b6 100755 --- a/readme.md +++ b/readme.md @@ -35,14 +35,14 @@ String metrics and phonetic algorithms for Scala. The library provides facilitie __SBT:__ ```scala -libraryDependencies += "com.rockymadden.stringmetric" %% "stringmetric-core" % "0.27.4" +libraryDependencies += "com.rockymadden.stringmetric" %% "stringmetric-core" % "0.27.5" ``` --- __Gradle:__ ```groovy -compile 'com.rockymadden.stringmetric:stringmetric-core_2.10:0.27.4' +compile 'com.rockymadden.stringmetric:stringmetric-core_2.12:0.27.5' ``` --- @@ -51,7 +51,7 @@ __Maven:__ ```xml com.rockymadden.stringmetric - stringmetric-core_2.10 + stringmetric-core_2.12 0.27.4 ```