From b237148fee50896d737559ed8e89f78bcc5b94eb Mon Sep 17 00:00:00 2001 From: Rocky Madden Date: Mon, 18 Mar 2013 20:03:57 -0600 Subject: More consistent naming. --- .../stringmetric/FilterDecoratedSpec.scala | 6 ++-- .../filter/AsciiControlFilterSpec.scala | 33 +++++++++++++++++ .../filter/AsciiControlOnlyFilterSpec.scala | 33 +++++++++++++++++ .../filter/AsciiControlOnlyStringFilterSpec.scala | 33 ----------------- .../filter/AsciiControlStringFilterSpec.scala | 33 ----------------- .../filter/AsciiLetterFilterSpec.scala | 29 +++++++++++++++ .../filter/AsciiLetterNumberFilterSpec.scala | 33 +++++++++++++++++ .../filter/AsciiLetterNumberOnlyFilterSpec.scala | 35 ++++++++++++++++++ .../AsciiLetterNumberOnlyStringFilterSpec.scala | 35 ------------------ .../filter/AsciiLetterNumberStringFilterSpec.scala | 33 ----------------- .../filter/AsciiLetterOnlyFilterSpec.scala | 33 +++++++++++++++++ .../filter/AsciiLetterOnlyStringFilterSpec.scala | 33 ----------------- .../filter/AsciiLetterStringFilterSpec.scala | 29 --------------- .../filter/AsciiNumberFilterSpec.scala | 33 +++++++++++++++++ .../filter/AsciiNumberOnlyFilterSpec.scala | 33 +++++++++++++++++ .../filter/AsciiNumberOnlyStringFilterSpec.scala | 33 ----------------- .../filter/AsciiNumberStringFilterSpec.scala | 33 ----------------- .../stringmetric/filter/AsciiSpaceFilterSpec.scala | 37 +++++++++++++++++++ .../filter/AsciiSpaceStringFilterSpec.scala | 37 ------------------- .../filter/AsciiSymbolFilterSpec.scala | 31 ++++++++++++++++ .../filter/AsciiSymbolOnlyFilterSpec.scala | 33 +++++++++++++++++ .../filter/AsciiSymbolOnlyStringFilterSpec.scala | 33 ----------------- .../filter/AsciiSymbolStringFilterSpec.scala | 31 ---------------- .../filter/IgnoreAsciiLetterCaseFilterSpec.scala | 41 ++++++++++++++++++++++ .../IgnoreAsciiLetterCaseStringFilterSpec.scala | 41 ---------------------- 25 files changed, 407 insertions(+), 407 deletions(-) create mode 100755 core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiControlFilterSpec.scala create mode 100755 core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiControlOnlyFilterSpec.scala delete mode 100755 core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiControlOnlyStringFilterSpec.scala delete mode 100755 core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiControlStringFilterSpec.scala create mode 100755 core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterFilterSpec.scala create mode 100755 core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterNumberFilterSpec.scala create mode 100755 core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterNumberOnlyFilterSpec.scala delete mode 100755 core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterNumberOnlyStringFilterSpec.scala delete mode 100755 core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterNumberStringFilterSpec.scala create mode 100755 core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterOnlyFilterSpec.scala delete mode 100755 core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterOnlyStringFilterSpec.scala delete mode 100755 core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterStringFilterSpec.scala create mode 100755 core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiNumberFilterSpec.scala create mode 100755 core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiNumberOnlyFilterSpec.scala delete mode 100755 core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiNumberOnlyStringFilterSpec.scala delete mode 100755 core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiNumberStringFilterSpec.scala create mode 100755 core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiSpaceFilterSpec.scala delete mode 100755 core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiSpaceStringFilterSpec.scala create mode 100755 core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiSymbolFilterSpec.scala create mode 100755 core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiSymbolOnlyFilterSpec.scala delete mode 100755 core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiSymbolOnlyStringFilterSpec.scala delete mode 100755 core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiSymbolStringFilterSpec.scala create mode 100755 core/source/test/scala/com/rockymadden/stringmetric/filter/IgnoreAsciiLetterCaseFilterSpec.scala delete mode 100755 core/source/test/scala/com/rockymadden/stringmetric/filter/IgnoreAsciiLetterCaseStringFilterSpec.scala (limited to 'core/source/test/scala') diff --git a/core/source/test/scala/com/rockymadden/stringmetric/FilterDecoratedSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/FilterDecoratedSpec.scala index 92f4578..c6a210c 100755 --- a/core/source/test/scala/com/rockymadden/stringmetric/FilterDecoratedSpec.scala +++ b/core/source/test/scala/com/rockymadden/stringmetric/FilterDecoratedSpec.scala @@ -1,8 +1,8 @@ package com.rockymadden.stringmetric +import com.rockymadden.stringmetric.filter.AsciiNumberFilter import com.rockymadden.stringmetric.phonetic.MetaphoneAlgorithm import com.rockymadden.stringmetric.similarity.DiceSorensenMetric -import com.rockymadden.stringmetric.filter.AsciiNumberStringFilter import org.junit.runner.RunWith import org.scalatest.junit.JUnitRunner @@ -33,6 +33,6 @@ final class FilterDecoratedSpec extends ScalaTest { } object FilterDecoratedSpec { - private final val Algorithm = new MetaphoneAlgorithm with AsciiNumberStringFilter - private final val Metric = new DiceSorensenMetric with AsciiNumberStringFilter + private final val Algorithm = new MetaphoneAlgorithm with AsciiNumberFilter + private final val Metric = new DiceSorensenMetric with AsciiNumberFilter } diff --git a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiControlFilterSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiControlFilterSpec.scala new file mode 100755 index 0000000..1cce0c9 --- /dev/null +++ b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiControlFilterSpec.scala @@ -0,0 +1,33 @@ +package com.rockymadden.stringmetric.filter + +import com.rockymadden.stringmetric.ScalaTest +import org.junit.runner.RunWith +import org.scalatest.junit.JUnitRunner + +@RunWith(classOf[JUnitRunner]) +final class AsciiControlFilterSpec extends ScalaTest { + import AsciiControlFilterSpec.Filter + + "AsciiControlFilter" should provide { + "overloaded filter method" when passed { + "String with controls" should returns { + "String with controls removed" in { + Filter.filter(" HelloWorld") should equal ("HelloWorld") + Filter.filter("HelloWorld ") should equal ("HelloWorld") + Filter.filter("Hello World") should equal ("HelloWorld") + } + } + "character array with controls" should returns { + "character array with controls removed" in { + Filter.filter(" HelloWorld".toCharArray) should equal ("HelloWorld".toCharArray) + Filter.filter("HelloWorld ".toCharArray) should equal ("HelloWorld".toCharArray) + Filter.filter("Hello World".toCharArray) should equal ("HelloWorld".toCharArray) + } + } + } + } +} + +object AsciiControlFilterSpec { + private final val Filter = new StringFilterDelegate with AsciiControlFilter +} diff --git a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiControlOnlyFilterSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiControlOnlyFilterSpec.scala new file mode 100755 index 0000000..958c8ba --- /dev/null +++ b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiControlOnlyFilterSpec.scala @@ -0,0 +1,33 @@ +package com.rockymadden.stringmetric.filter + +import com.rockymadden.stringmetric.ScalaTest +import org.junit.runner.RunWith +import org.scalatest.junit.JUnitRunner + +@RunWith(classOf[JUnitRunner]) +final class AsciiControlOnlyFilterSpec extends ScalaTest { + import AsciiControlOnlyFilterSpec.Filter + + "AsciiControlOnlyFilter" should provide { + "overloaded filter method" when passed { + "String with mixed characters" should returns { + "String with non-controls removed" in { + Filter.filter("!@#$% ^&*()abc") should equal (" ") + Filter.filter(" ^&*()abc") should equal (" ") + Filter.filter("%^&*()abc ") should equal (" ") + } + } + "character array with mixed characters" should returns { + "character array with non-controls removed" in { + Filter.filter("!@#$% ^&*()abc".toCharArray) should equal (" ".toCharArray) + Filter.filter(" ^&*()abc".toCharArray) should equal (" ".toCharArray) + Filter.filter("%^&*()abc ".toCharArray) should equal (" ".toCharArray) + } + } + } + } +} + +object AsciiControlOnlyFilterSpec { + private final val Filter = new StringFilterDelegate with AsciiControlOnlyFilter +} diff --git a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiControlOnlyStringFilterSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiControlOnlyStringFilterSpec.scala deleted file mode 100755 index 8d5d1d4..0000000 --- a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiControlOnlyStringFilterSpec.scala +++ /dev/null @@ -1,33 +0,0 @@ -package com.rockymadden.stringmetric.filter - -import com.rockymadden.stringmetric.ScalaTest -import org.junit.runner.RunWith -import org.scalatest.junit.JUnitRunner - -@RunWith(classOf[JUnitRunner]) -final class AsciiControlOnlyStringFilterSpec extends ScalaTest { - import AsciiControlOnlyStringFilterSpec.Filter - - "AsciiControlOnlyStringFilter" should provide { - "overloaded filter method" when passed { - "String with mixed characters" should returns { - "String with non-controls removed" in { - Filter.filter("!@#$% ^&*()abc") should equal (" ") - Filter.filter(" ^&*()abc") should equal (" ") - Filter.filter("%^&*()abc ") should equal (" ") - } - } - "character array with mixed characters" should returns { - "character array with non-controls removed" in { - Filter.filter("!@#$% ^&*()abc".toCharArray) should equal (" ".toCharArray) - Filter.filter(" ^&*()abc".toCharArray) should equal (" ".toCharArray) - Filter.filter("%^&*()abc ".toCharArray) should equal (" ".toCharArray) - } - } - } - } -} - -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 deleted file mode 100755 index 5c774a0..0000000 --- a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiControlStringFilterSpec.scala +++ /dev/null @@ -1,33 +0,0 @@ -package com.rockymadden.stringmetric.filter - -import com.rockymadden.stringmetric.ScalaTest -import org.junit.runner.RunWith -import org.scalatest.junit.JUnitRunner - -@RunWith(classOf[JUnitRunner]) -final class AsciiControlStringFilterSpec extends ScalaTest { - import AsciiControlStringFilterSpec.Filter - - "AsciiControlStringFilter" should provide { - "overloaded filter method" when passed { - "String with controls" should returns { - "String with controls removed" in { - Filter.filter(" HelloWorld") should equal ("HelloWorld") - Filter.filter("HelloWorld ") should equal ("HelloWorld") - Filter.filter("Hello World") should equal ("HelloWorld") - } - } - "character array with controls" should returns { - "character array with controls removed" in { - Filter.filter(" HelloWorld".toCharArray) should equal ("HelloWorld".toCharArray) - Filter.filter("HelloWorld ".toCharArray) should equal ("HelloWorld".toCharArray) - Filter.filter("Hello World".toCharArray) should equal ("HelloWorld".toCharArray) - } - } - } - } -} - -object AsciiControlStringFilterSpec { - private final val Filter = new StringFilterDelegate with AsciiControlStringFilter -} diff --git a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterFilterSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterFilterSpec.scala new file mode 100755 index 0000000..d86e7a5 --- /dev/null +++ b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterFilterSpec.scala @@ -0,0 +1,29 @@ +package com.rockymadden.stringmetric.filter + +import com.rockymadden.stringmetric.ScalaTest +import org.junit.runner.RunWith +import org.scalatest.junit.JUnitRunner + +@RunWith(classOf[JUnitRunner]) +final class AsciiLetterFilterSpec extends ScalaTest { + import AsciiLetterFilterSpec.Filter + + "AsciiLetterFilter" should provide { + "overloaded filter method" when passed { + "String with letters" should returns { + "String with letters removed" in { + Filter.filter(" Hello123World!") should equal (" 123!") + } + } + "character array with letters" should returns { + "character array with letters removed" in { + Filter.filter(" Hello123World!".toCharArray) should equal (" 123!".toCharArray) + } + } + } + } +} + +object AsciiLetterFilterSpec { + private final val Filter = new StringFilterDelegate with AsciiLetterFilter +} diff --git a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterNumberFilterSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterNumberFilterSpec.scala new file mode 100755 index 0000000..edfdce6 --- /dev/null +++ b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterNumberFilterSpec.scala @@ -0,0 +1,33 @@ +package com.rockymadden.stringmetric.filter + +import com.rockymadden.stringmetric.ScalaTest +import org.junit.runner.RunWith +import org.scalatest.junit.JUnitRunner + +@RunWith(classOf[JUnitRunner]) +final class AsciiLetterNumberFilterSpec extends ScalaTest { + import AsciiLetterNumberFilterSpec.Filter + + "AsciiLetterNumberFilter" should provide { + "overloaded filter method" when passed { + "String with letters and numbers" should returns { + "String with letters and numbers removed" in { + Filter.filter(" Hello123World!") should equal (" !") + Filter.filter("Hello123 !World") should equal (" !") + Filter.filter("!Hello123World ") should equal ("! ") + } + } + "character array with letters and numbers" should returns { + "character array with letters and numbers removed" in { + Filter.filter(" Hello123World!".toCharArray) should equal (" !".toCharArray) + Filter.filter("Hello123 !World".toCharArray) should equal (" !".toCharArray) + Filter.filter("!Hello123World ".toCharArray) should equal ("! ".toCharArray) + } + } + } + } +} + +object AsciiLetterNumberFilterSpec { + private final val Filter = new StringFilterDelegate with AsciiLetterNumberFilter +} diff --git a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterNumberOnlyFilterSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterNumberOnlyFilterSpec.scala new file mode 100755 index 0000000..7998e39 --- /dev/null +++ b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterNumberOnlyFilterSpec.scala @@ -0,0 +1,35 @@ +package com.rockymadden.stringmetric.filter + +import com.rockymadden.stringmetric.ScalaTest +import org.junit.runner.RunWith +import org.scalatest.junit.JUnitRunner + +@RunWith(classOf[JUnitRunner]) +final class AsciiLetterNumberOnlyFilterSpec extends ScalaTest { + import AsciiLetterNumberOnlyFilterSpec.Filter + + "AsciiLetterNumberOnlyFilter" should provide { + "overloaded filter method" when passed { + "String with mixed characters" should returns { + "String with non-letters and non-numbers removed" in { + Filter.filter("!@#$%^&*()abc") should equal ("abc") + Filter.filter("!@#$%^&*()abc123") should equal ("abc123") + Filter.filter("abc123!@#$%^&*()") should equal ("abc123") + Filter.filter("!@#$%abc123^&*()") should equal ("abc123") + } + } + "character array with mixed characters" should returns { + "character array with non-letters and non-numbers removed" in { + Filter.filter("!@#$%^&*()abc".toCharArray) should equal ("abc".toCharArray) + Filter.filter("!@#$%^&*()abc123".toCharArray) should equal ("abc123".toCharArray) + Filter.filter("abc123!@#$%^&*()".toCharArray) should equal ("abc123".toCharArray) + Filter.filter("!@#$%abc123^&*()".toCharArray) should equal ("abc123".toCharArray) + } + } + } + } +} + +object AsciiLetterNumberOnlyFilterSpec { + private final val Filter = new StringFilterDelegate with AsciiLetterNumberOnlyFilter +} diff --git a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterNumberOnlyStringFilterSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterNumberOnlyStringFilterSpec.scala deleted file mode 100755 index 8e488c5..0000000 --- a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterNumberOnlyStringFilterSpec.scala +++ /dev/null @@ -1,35 +0,0 @@ -package com.rockymadden.stringmetric.filter - -import com.rockymadden.stringmetric.ScalaTest -import org.junit.runner.RunWith -import org.scalatest.junit.JUnitRunner - -@RunWith(classOf[JUnitRunner]) -final class AsciiLetterNumberOnlyStringFilterSpec extends ScalaTest { - import AsciiLetterNumberOnlyStringFilterSpec.Filter - - "AsciiLetterNumberOnlyStringFilter" should provide { - "overloaded filter method" when passed { - "String with mixed characters" should returns { - "String with non-letters and non-numbers removed" in { - Filter.filter("!@#$%^&*()abc") should equal ("abc") - Filter.filter("!@#$%^&*()abc123") should equal ("abc123") - Filter.filter("abc123!@#$%^&*()") should equal ("abc123") - Filter.filter("!@#$%abc123^&*()") should equal ("abc123") - } - } - "character array with mixed characters" should returns { - "character array with non-letters and non-numbers removed" in { - Filter.filter("!@#$%^&*()abc".toCharArray) should equal ("abc".toCharArray) - Filter.filter("!@#$%^&*()abc123".toCharArray) should equal ("abc123".toCharArray) - Filter.filter("abc123!@#$%^&*()".toCharArray) should equal ("abc123".toCharArray) - Filter.filter("!@#$%abc123^&*()".toCharArray) should equal ("abc123".toCharArray) - } - } - } - } -} - -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 deleted file mode 100755 index 4b548f0..0000000 --- a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterNumberStringFilterSpec.scala +++ /dev/null @@ -1,33 +0,0 @@ -package com.rockymadden.stringmetric.filter - -import com.rockymadden.stringmetric.ScalaTest -import org.junit.runner.RunWith -import org.scalatest.junit.JUnitRunner - -@RunWith(classOf[JUnitRunner]) -final class AsciiLetterNumberStringFilterSpec extends ScalaTest { - import AsciiLetterNumberStringFilterSpec.Filter - - "AsciiLetterNumberStringFilter" should provide { - "overloaded filter method" when passed { - "String with letters and numbers" should returns { - "String with letters and numbers removed" in { - Filter.filter(" Hello123World!") should equal (" !") - Filter.filter("Hello123 !World") should equal (" !") - Filter.filter("!Hello123World ") should equal ("! ") - } - } - "character array with letters and numbers" should returns { - "character array with letters and numbers removed" in { - Filter.filter(" Hello123World!".toCharArray) should equal (" !".toCharArray) - Filter.filter("Hello123 !World".toCharArray) should equal (" !".toCharArray) - Filter.filter("!Hello123World ".toCharArray) should equal ("! ".toCharArray) - } - } - } - } -} - -object AsciiLetterNumberStringFilterSpec { - private final val Filter = new StringFilterDelegate with AsciiLetterNumberStringFilter -} diff --git a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterOnlyFilterSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterOnlyFilterSpec.scala new file mode 100755 index 0000000..d134792 --- /dev/null +++ b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterOnlyFilterSpec.scala @@ -0,0 +1,33 @@ +package com.rockymadden.stringmetric.filter + +import com.rockymadden.stringmetric.ScalaTest +import org.junit.runner.RunWith +import org.scalatest.junit.JUnitRunner + +@RunWith(classOf[JUnitRunner]) +final class AsciiLetterOnlyFilterSpec extends ScalaTest { + import AsciiLetterOnlyFilterSpec.Filter + + "AsciiLetterOnlyFilter" should provide { + "overloaded filter method" when passed { + "String with mixed characters" should returns { + "String with non-letters removed" in { + Filter.filter("!@#$%^&*()abc") should equal ("abc") + Filter.filter("!@#$%^&*()abc123") should equal ("abc") + Filter.filter("abc!@#$%^&*()123") should equal ("abc") + } + } + "character array with mixed characters" should returns { + "character array with non-letters removed" in { + Filter.filter("!@#$%^&*()abc".toCharArray) should equal ("abc".toCharArray) + Filter.filter("!@#$%^&*()abc123".toCharArray) should equal ("abc".toCharArray) + Filter.filter("abc!@#$%^&*()123".toCharArray) should equal ("abc".toCharArray) + } + } + } + } +} + +object AsciiLetterOnlyFilterSpec { + private final val Filter = new StringFilterDelegate with AsciiLetterOnlyFilter +} diff --git a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterOnlyStringFilterSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterOnlyStringFilterSpec.scala deleted file mode 100755 index f33050c..0000000 --- a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterOnlyStringFilterSpec.scala +++ /dev/null @@ -1,33 +0,0 @@ -package com.rockymadden.stringmetric.filter - -import com.rockymadden.stringmetric.ScalaTest -import org.junit.runner.RunWith -import org.scalatest.junit.JUnitRunner - -@RunWith(classOf[JUnitRunner]) -final class AsciiLetterOnlyStringFilterSpec extends ScalaTest { - import AsciiLetterOnlyStringFilterSpec.Filter - - "AsciiLetterOnlyStringFilter" should provide { - "overloaded filter method" when passed { - "String with mixed characters" should returns { - "String with non-letters removed" in { - Filter.filter("!@#$%^&*()abc") should equal ("abc") - Filter.filter("!@#$%^&*()abc123") should equal ("abc") - Filter.filter("abc!@#$%^&*()123") should equal ("abc") - } - } - "character array with mixed characters" should returns { - "character array with non-letters removed" in { - Filter.filter("!@#$%^&*()abc".toCharArray) should equal ("abc".toCharArray) - Filter.filter("!@#$%^&*()abc123".toCharArray) should equal ("abc".toCharArray) - Filter.filter("abc!@#$%^&*()123".toCharArray) should equal ("abc".toCharArray) - } - } - } - } -} - -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 deleted file mode 100755 index 5ca7324..0000000 --- a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterStringFilterSpec.scala +++ /dev/null @@ -1,29 +0,0 @@ -package com.rockymadden.stringmetric.filter - -import com.rockymadden.stringmetric.ScalaTest -import org.junit.runner.RunWith -import org.scalatest.junit.JUnitRunner - -@RunWith(classOf[JUnitRunner]) -final class AsciiLetterStringFilterSpec extends ScalaTest { - import AsciiLetterStringFilterSpec.Filter - - "AsciiLetterStringFilter" should provide { - "overloaded filter method" when passed { - "String with letters" should returns { - "String with letters removed" in { - Filter.filter(" Hello123World!") should equal (" 123!") - } - } - "character array with letters" should returns { - "character array with letters removed" in { - Filter.filter(" Hello123World!".toCharArray) should equal (" 123!".toCharArray) - } - } - } - } -} - -object AsciiLetterStringFilterSpec { - private final val Filter = new StringFilterDelegate with AsciiLetterStringFilter -} diff --git a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiNumberFilterSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiNumberFilterSpec.scala new file mode 100755 index 0000000..7c24d45 --- /dev/null +++ b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiNumberFilterSpec.scala @@ -0,0 +1,33 @@ +package com.rockymadden.stringmetric.filter + +import com.rockymadden.stringmetric.ScalaTest +import org.junit.runner.RunWith +import org.scalatest.junit.JUnitRunner + +@RunWith(classOf[JUnitRunner]) +final class AsciiNumberFilterSpec extends ScalaTest { + import AsciiNumberFilterSpec.Filter + + "AsciiNumberFilter" should provide { + "overloaded filter method" when passed { + "String with numbers" should returns { + "String with numbers removed" in { + Filter.filter(" Hello123World!") should equal (" HelloWorld!") + Filter.filter("123 HelloWorld!") should equal (" HelloWorld!") + Filter.filter(" HelloWorld!123") should equal (" HelloWorld!") + } + } + "character array with numbers" should returns { + "character array with numbers removed" in { + Filter.filter(" Hello123World!".toCharArray) should equal (" HelloWorld!".toCharArray) + Filter.filter("123 HelloWorld!".toCharArray) should equal (" HelloWorld!".toCharArray) + Filter.filter(" HelloWorld!123".toCharArray) should equal (" HelloWorld!".toCharArray) + } + } + } + } +} + +object AsciiNumberFilterSpec { + private final val Filter = new StringFilterDelegate with AsciiNumberFilter +} diff --git a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiNumberOnlyFilterSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiNumberOnlyFilterSpec.scala new file mode 100755 index 0000000..db49d25 --- /dev/null +++ b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiNumberOnlyFilterSpec.scala @@ -0,0 +1,33 @@ +package com.rockymadden.stringmetric.filter + +import com.rockymadden.stringmetric.ScalaTest +import org.junit.runner.RunWith +import org.scalatest.junit.JUnitRunner + +@RunWith(classOf[JUnitRunner]) +final class AsciiNumberOnlyFilterSpec extends ScalaTest { + import AsciiNumberOnlyFilterSpec.Filter + + "AsciiNumberOnlyFilter" should provide { + "overloaded filter method" when passed { + "String with mixed characters" should returns { + "String with non-numbers removed" in { + Filter.filter("!@#$%^&*()abc123") should equal ("123") + Filter.filter("123!@#$%^&*()abc") should equal ("123") + Filter.filter("!@#$%^123&*()abc") should equal ("123") + } + } + "character array with mixed characters" should returns { + "character array with non-numbers removed" in { + Filter.filter("!@#$%^&*()abc123".toCharArray) should equal ("123".toCharArray) + Filter.filter("123!@#$%^&*()abc".toCharArray) should equal ("123".toCharArray) + Filter.filter("!@#$%^123&*()abc".toCharArray) should equal ("123".toCharArray) + } + } + } + } +} + +object AsciiNumberOnlyFilterSpec { + private final val Filter = new StringFilterDelegate with AsciiNumberOnlyFilter +} diff --git a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiNumberOnlyStringFilterSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiNumberOnlyStringFilterSpec.scala deleted file mode 100755 index 147d9b6..0000000 --- a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiNumberOnlyStringFilterSpec.scala +++ /dev/null @@ -1,33 +0,0 @@ -package com.rockymadden.stringmetric.filter - -import com.rockymadden.stringmetric.ScalaTest -import org.junit.runner.RunWith -import org.scalatest.junit.JUnitRunner - -@RunWith(classOf[JUnitRunner]) -final class AsciiNumberOnlyStringFilterSpec extends ScalaTest { - import AsciiNumberOnlyStringFilterSpec.Filter - - "AsciiNumberOnlyStringFilter" should provide { - "overloaded filter method" when passed { - "String with mixed characters" should returns { - "String with non-numbers removed" in { - Filter.filter("!@#$%^&*()abc123") should equal ("123") - Filter.filter("123!@#$%^&*()abc") should equal ("123") - Filter.filter("!@#$%^123&*()abc") should equal ("123") - } - } - "character array with mixed characters" should returns { - "character array with non-numbers removed" in { - Filter.filter("!@#$%^&*()abc123".toCharArray) should equal ("123".toCharArray) - Filter.filter("123!@#$%^&*()abc".toCharArray) should equal ("123".toCharArray) - Filter.filter("!@#$%^123&*()abc".toCharArray) should equal ("123".toCharArray) - } - } - } - } -} - -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 deleted file mode 100755 index b1ed8a0..0000000 --- a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiNumberStringFilterSpec.scala +++ /dev/null @@ -1,33 +0,0 @@ -package com.rockymadden.stringmetric.filter - -import com.rockymadden.stringmetric.ScalaTest -import org.junit.runner.RunWith -import org.scalatest.junit.JUnitRunner - -@RunWith(classOf[JUnitRunner]) -final class AsciiNumberStringFilterSpec extends ScalaTest { - import AsciiNumberStringFilterSpec.Filter - - "AsciiNumberStringFilter" should provide { - "overloaded filter method" when passed { - "String with numbers" should returns { - "String with numbers removed" in { - Filter.filter(" Hello123World!") should equal (" HelloWorld!") - Filter.filter("123 HelloWorld!") should equal (" HelloWorld!") - Filter.filter(" HelloWorld!123") should equal (" HelloWorld!") - } - } - "character array with numbers" should returns { - "character array with numbers removed" in { - Filter.filter(" Hello123World!".toCharArray) should equal (" HelloWorld!".toCharArray) - Filter.filter("123 HelloWorld!".toCharArray) should equal (" HelloWorld!".toCharArray) - Filter.filter(" HelloWorld!123".toCharArray) should equal (" HelloWorld!".toCharArray) - } - } - } - } -} - -object AsciiNumberStringFilterSpec { - private final val Filter = new StringFilterDelegate with AsciiNumberStringFilter -} diff --git a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiSpaceFilterSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiSpaceFilterSpec.scala new file mode 100755 index 0000000..759db3d --- /dev/null +++ b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiSpaceFilterSpec.scala @@ -0,0 +1,37 @@ +package com.rockymadden.stringmetric.filter + +import com.rockymadden.stringmetric.ScalaTest +import org.junit.runner.RunWith +import org.scalatest.junit.JUnitRunner + +@RunWith(classOf[JUnitRunner]) +final class AsciiSpaceFilterSpec extends ScalaTest { + import AsciiSpaceFilterSpec.Filter + + "AsciiSpaceFilter" should provide { + "overloaded filter method" when passed { + "String with spaces" should returns { + "String with spaces removed" in { + Filter.filter("HelloWorld") should equal ("HelloWorld") + Filter.filter(" HelloWorld ") should equal ("HelloWorld") + Filter.filter("Hello World") should equal ("HelloWorld") + Filter.filter("H e l l o W o r l d") should equal ("HelloWorld") + Filter.filter("H e l l o W o r l d") should equal ("HelloWorld") + } + } + "character array with spaces" should returns { + "character array with spaces removed" in { + Filter.filter("HelloWorld".toCharArray) should equal ("HelloWorld".toCharArray) + Filter.filter(" HelloWorld ".toCharArray) should equal ("HelloWorld".toCharArray) + Filter.filter("Hello World".toCharArray) should equal ("HelloWorld".toCharArray) + Filter.filter("H e l l o W o r l d".toCharArray) should equal ("HelloWorld".toCharArray) + Filter.filter("H e l l o W o r l d".toCharArray) should equal ("HelloWorld".toCharArray) + } + } + } + } +} + +object AsciiSpaceFilterSpec { + private final val Filter = new StringFilterDelegate with AsciiSpaceFilter +} diff --git a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiSpaceStringFilterSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiSpaceStringFilterSpec.scala deleted file mode 100755 index 6ee45b1..0000000 --- a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiSpaceStringFilterSpec.scala +++ /dev/null @@ -1,37 +0,0 @@ -package com.rockymadden.stringmetric.filter - -import com.rockymadden.stringmetric.ScalaTest -import org.junit.runner.RunWith -import org.scalatest.junit.JUnitRunner - -@RunWith(classOf[JUnitRunner]) -final class AsciiSpaceStringFilterSpec extends ScalaTest { - import AsciiSpaceStringFilterSpec.Filter - - "AsciiSpaceStringFilter" should provide { - "overloaded filter method" when passed { - "String with spaces" should returns { - "String with spaces removed" in { - Filter.filter("HelloWorld") should equal ("HelloWorld") - Filter.filter(" HelloWorld ") should equal ("HelloWorld") - Filter.filter("Hello World") should equal ("HelloWorld") - Filter.filter("H e l l o W o r l d") should equal ("HelloWorld") - Filter.filter("H e l l o W o r l d") should equal ("HelloWorld") - } - } - "character array with spaces" should returns { - "character array with spaces removed" in { - Filter.filter("HelloWorld".toCharArray) should equal ("HelloWorld".toCharArray) - Filter.filter(" HelloWorld ".toCharArray) should equal ("HelloWorld".toCharArray) - Filter.filter("Hello World".toCharArray) should equal ("HelloWorld".toCharArray) - Filter.filter("H e l l o W o r l d".toCharArray) should equal ("HelloWorld".toCharArray) - Filter.filter("H e l l o W o r l d".toCharArray) should equal ("HelloWorld".toCharArray) - } - } - } - } -} - -object AsciiSpaceStringFilterSpec { - private final val Filter = new StringFilterDelegate with AsciiSpaceStringFilter -} diff --git a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiSymbolFilterSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiSymbolFilterSpec.scala new file mode 100755 index 0000000..99be533 --- /dev/null +++ b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiSymbolFilterSpec.scala @@ -0,0 +1,31 @@ +package com.rockymadden.stringmetric.filter + +import com.rockymadden.stringmetric.ScalaTest +import org.junit.runner.RunWith +import org.scalatest.junit.JUnitRunner + +@RunWith(classOf[JUnitRunner]) +final class AsciiSymbolFilterSpec extends ScalaTest { + import AsciiSymbolFilterSpec.Filter + + "AsciiSymbolFilter" should provide { + "overloaded filter method" when passed { + "String with symbols" should returns { + "String with symbols removed" in { + Filter.filter("[HelloWorld]") should equal ("HelloWorld") + Filter.filter("Hello!World") should equal ("HelloWorld") + } + } + "character array with symbols" should returns { + "character array with symbols removed" in { + Filter.filter("[HelloWorld]".toCharArray) should equal ("HelloWorld".toCharArray) + Filter.filter("Hello!World".toCharArray) should equal ("HelloWorld".toCharArray) + } + } + } + } +} + +object AsciiSymbolFilterSpec { + private final val Filter = new StringFilterDelegate with AsciiSymbolFilter +} diff --git a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiSymbolOnlyFilterSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiSymbolOnlyFilterSpec.scala new file mode 100755 index 0000000..c6f1899 --- /dev/null +++ b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiSymbolOnlyFilterSpec.scala @@ -0,0 +1,33 @@ +package com.rockymadden.stringmetric.filter + +import com.rockymadden.stringmetric.ScalaTest +import org.junit.runner.RunWith +import org.scalatest.junit.JUnitRunner + +@RunWith(classOf[JUnitRunner]) +final class AsciiSymbolOnlyFilterSpec extends ScalaTest { + import AsciiSymbolOnlyFilterSpec.Filter + + "AsciiSymbolOnlyFilter" should provide { + "overloaded filter method" when passed { + "String with mixed characters" should returns { + "String with non-symbols removed" in { + Filter.filter("!@#$%^&*()abc123") should equal ("!@#$%^&*()") + Filter.filter("abc123!@#$%^&*()") should equal ("!@#$%^&*()") + Filter.filter("!@#$%abc123^&*()") should equal ("!@#$%^&*()") + } + } + "character array with mixed characters" should returns { + "character array with non-symbols removed" in { + Filter.filter("!@#$%^&*()abc123".toCharArray) should equal ("!@#$%^&*()".toCharArray) + Filter.filter("abc123!@#$%^&*()".toCharArray) should equal ("!@#$%^&*()".toCharArray) + Filter.filter("!@#$%abc123^&*()".toCharArray) should equal ("!@#$%^&*()".toCharArray) + } + } + } + } +} + +object AsciiSymbolOnlyFilterSpec { + private final val Filter = new StringFilterDelegate with AsciiSymbolOnlyFilter +} diff --git a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiSymbolOnlyStringFilterSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiSymbolOnlyStringFilterSpec.scala deleted file mode 100755 index 8d5c2fb..0000000 --- a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiSymbolOnlyStringFilterSpec.scala +++ /dev/null @@ -1,33 +0,0 @@ -package com.rockymadden.stringmetric.filter - -import com.rockymadden.stringmetric.ScalaTest -import org.junit.runner.RunWith -import org.scalatest.junit.JUnitRunner - -@RunWith(classOf[JUnitRunner]) -final class AsciiSymbolOnlyStringFilterSpec extends ScalaTest { - import AsciiSymbolOnlyStringFilterSpec.Filter - - "AsciiSymbolOnlyStringFilter" should provide { - "overloaded filter method" when passed { - "String with mixed characters" should returns { - "String with non-symbols removed" in { - Filter.filter("!@#$%^&*()abc123") should equal ("!@#$%^&*()") - Filter.filter("abc123!@#$%^&*()") should equal ("!@#$%^&*()") - Filter.filter("!@#$%abc123^&*()") should equal ("!@#$%^&*()") - } - } - "character array with mixed characters" should returns { - "character array with non-symbols removed" in { - Filter.filter("!@#$%^&*()abc123".toCharArray) should equal ("!@#$%^&*()".toCharArray) - Filter.filter("abc123!@#$%^&*()".toCharArray) should equal ("!@#$%^&*()".toCharArray) - Filter.filter("!@#$%abc123^&*()".toCharArray) should equal ("!@#$%^&*()".toCharArray) - } - } - } - } -} - -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 deleted file mode 100755 index 2e4a0e0..0000000 --- a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiSymbolStringFilterSpec.scala +++ /dev/null @@ -1,31 +0,0 @@ -package com.rockymadden.stringmetric.filter - -import com.rockymadden.stringmetric.ScalaTest -import org.junit.runner.RunWith -import org.scalatest.junit.JUnitRunner - -@RunWith(classOf[JUnitRunner]) -final class AsciiSymbolStringFilterSpec extends ScalaTest { - import AsciiSymbolStringFilterSpec.Filter - - "AsciiSymbolStringFilter" should provide { - "overloaded filter method" when passed { - "String with symbols" should returns { - "String with symbols removed" in { - Filter.filter("[HelloWorld]") should equal ("HelloWorld") - Filter.filter("Hello!World") should equal ("HelloWorld") - } - } - "character array with symbols" should returns { - "character array with symbols removed" in { - Filter.filter("[HelloWorld]".toCharArray) should equal ("HelloWorld".toCharArray) - Filter.filter("Hello!World".toCharArray) should equal ("HelloWorld".toCharArray) - } - } - } - } -} - -object AsciiSymbolStringFilterSpec { - private final val Filter = new StringFilterDelegate with AsciiSymbolStringFilter -} diff --git a/core/source/test/scala/com/rockymadden/stringmetric/filter/IgnoreAsciiLetterCaseFilterSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/filter/IgnoreAsciiLetterCaseFilterSpec.scala new file mode 100755 index 0000000..a04a0ae --- /dev/null +++ b/core/source/test/scala/com/rockymadden/stringmetric/filter/IgnoreAsciiLetterCaseFilterSpec.scala @@ -0,0 +1,41 @@ +package com.rockymadden.stringmetric.filter + +import com.rockymadden.stringmetric.ScalaTest +import org.junit.runner.RunWith +import org.scalatest.junit.JUnitRunner + +@RunWith(classOf[JUnitRunner]) +final class IgnoreAsciiLetterCaseFilterSpec extends ScalaTest { + import IgnoreAsciiLetterCaseFilterSpec.Filter + + "IgnoreAsciiLetterCaseFilter" should provide { + "overloaded filter method" when passed { + "String with mixed case" should returns { + "String with the same case" in { + Filter.filter("HelloWorld") should (equal ("helloworld") or equal ("HELLOWORLD")) + Filter.filter("Hello World") should (equal ("hello world") or equal ("HELLO WORLD")) + Filter.filter("H e l l o W o r l d") should + (equal ("h e l l o w o r l d") or equal ("H E L L O W O R L D")) + Filter.filter("H e l l o W o r l d") should + (equal ("h e l l o w o r l d") or equal ("H E L L O W O R L D")) + } + } + "character array with mixed case" should returns { + "character array with the same case" in { + Filter.filter("HelloWorld".toCharArray) should + (equal ("helloworld".toCharArray) or equal ("HELLOWORLD".toCharArray)) + Filter.filter("Hello World".toCharArray) should + (equal ("hello world".toCharArray) or equal ("HELLO WORLD".toCharArray)) + Filter.filter("H e l l o W o r l d".toCharArray) should + (equal ("h e l l o w o r l d".toCharArray) or equal ("H E L L O W O R L D".toCharArray)) + Filter.filter("H e l l o W o r l d".toCharArray) should + (equal ("h e l l o w o r l d".toCharArray) or equal ("H E L L O W O R L D".toCharArray)) + } + } + } + } +} + +object IgnoreAsciiLetterCaseFilterSpec { + private final val Filter = new StringFilterDelegate with IgnoreAsciiLetterCaseFilter +} diff --git a/core/source/test/scala/com/rockymadden/stringmetric/filter/IgnoreAsciiLetterCaseStringFilterSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/filter/IgnoreAsciiLetterCaseStringFilterSpec.scala deleted file mode 100755 index 4defbc2..0000000 --- a/core/source/test/scala/com/rockymadden/stringmetric/filter/IgnoreAsciiLetterCaseStringFilterSpec.scala +++ /dev/null @@ -1,41 +0,0 @@ -package com.rockymadden.stringmetric.filter - -import com.rockymadden.stringmetric.ScalaTest -import org.junit.runner.RunWith -import org.scalatest.junit.JUnitRunner - -@RunWith(classOf[JUnitRunner]) -final class IgnoreAsciiLetterCaseStringFilterSpec extends ScalaTest { - import IgnoreAsciiLetterCaseStringFilterSpec.Filter - - "IgnoreAsciiLetterCaseStringFilter" should provide { - "overloaded filter method" when passed { - "String with mixed case" should returns { - "String with the same case" in { - Filter.filter("HelloWorld") should (equal ("helloworld") or equal ("HELLOWORLD")) - Filter.filter("Hello World") should (equal ("hello world") or equal ("HELLO WORLD")) - Filter.filter("H e l l o W o r l d") should - (equal ("h e l l o w o r l d") or equal ("H E L L O W O R L D")) - Filter.filter("H e l l o W o r l d") should - (equal ("h e l l o w o r l d") or equal ("H E L L O W O R L D")) - } - } - "character array with mixed case" should returns { - "character array with the same case" in { - Filter.filter("HelloWorld".toCharArray) should - (equal ("helloworld".toCharArray) or equal ("HELLOWORLD".toCharArray)) - Filter.filter("Hello World".toCharArray) should - (equal ("hello world".toCharArray) or equal ("HELLO WORLD".toCharArray)) - Filter.filter("H e l l o W o r l d".toCharArray) should - (equal ("h e l l o w o r l d".toCharArray) or equal ("H E L L O W O R L D".toCharArray)) - Filter.filter("H e l l o W o r l d".toCharArray) should - (equal ("h e l l o w o r l d".toCharArray) or equal ("H E L L O W O R L D".toCharArray)) - } - } - } - } -} - -object IgnoreAsciiLetterCaseStringFilterSpec { - private final val Filter = new StringFilterDelegate with IgnoreAsciiLetterCaseStringFilter -} -- cgit v1.2.3