From 289212a263b92e44b676f34213ae641b9500a836 Mon Sep 17 00:00:00 2001 From: Rocky Madden Date: Thu, 1 Nov 2012 09:26:29 -0600 Subject: Prefixed with Ascii, as it only handles for ASCII based spaces. --- .../stringmetric/AsciiSpaceStringFilter.scala | 8 ++++++ .../hashtree/stringmetric/SpaceStringFilter.scala | 8 ------ .../stringmetric/AsciiSpaceStringFilterSpec.scala | 32 ++++++++++++++++++++++ .../stringmetric/SpaceStringFilterSpec.scala | 32 ---------------------- 4 files changed, 40 insertions(+), 40 deletions(-) create mode 100755 core/source/core/scala/org/hashtree/stringmetric/AsciiSpaceStringFilter.scala delete mode 100755 core/source/core/scala/org/hashtree/stringmetric/SpaceStringFilter.scala create mode 100755 core/source/test/scala/org/hashtree/stringmetric/AsciiSpaceStringFilterSpec.scala delete mode 100755 core/source/test/scala/org/hashtree/stringmetric/SpaceStringFilterSpec.scala (limited to 'core') diff --git a/core/source/core/scala/org/hashtree/stringmetric/AsciiSpaceStringFilter.scala b/core/source/core/scala/org/hashtree/stringmetric/AsciiSpaceStringFilter.scala new file mode 100755 index 0000000..aaa21a5 --- /dev/null +++ b/core/source/core/scala/org/hashtree/stringmetric/AsciiSpaceStringFilter.scala @@ -0,0 +1,8 @@ +package org.hashtree.stringmetric + +/** A decorator [[org.hashtree.stringmetric.StringFilter]]. Ensures ASCII spaces do not matter. */ +trait AsciiSpaceStringFilter extends StringFilter { + abstract override def filter(charArray: Array[Char]): Array[Char] = super.filter(charArray.filter(_ != ' ')) + + abstract override def filter(string: String): String = super.filter(string.replaceAllLiterally(" ", "")) +} \ No newline at end of file diff --git a/core/source/core/scala/org/hashtree/stringmetric/SpaceStringFilter.scala b/core/source/core/scala/org/hashtree/stringmetric/SpaceStringFilter.scala deleted file mode 100755 index 3c81eef..0000000 --- a/core/source/core/scala/org/hashtree/stringmetric/SpaceStringFilter.scala +++ /dev/null @@ -1,8 +0,0 @@ -package org.hashtree.stringmetric - -/** A decorator [[org.hashtree.stringmetric.StringFilter]]. Ensures spaces do not matter. */ -trait SpaceStringFilter extends StringFilter { - abstract override def filter(charArray: Array[Char]): Array[Char] = super.filter(charArray.filter(_ != ' ')) - - abstract override def filter(string: String): String = super.filter(string.replaceAllLiterally(" ", "")) -} \ No newline at end of file diff --git a/core/source/test/scala/org/hashtree/stringmetric/AsciiSpaceStringFilterSpec.scala b/core/source/test/scala/org/hashtree/stringmetric/AsciiSpaceStringFilterSpec.scala new file mode 100755 index 0000000..2a46bf3 --- /dev/null +++ b/core/source/test/scala/org/hashtree/stringmetric/AsciiSpaceStringFilterSpec.scala @@ -0,0 +1,32 @@ +package org.hashtree.stringmetric + +import org.junit.runner.RunWith +import org.scalatest.junit.JUnitRunner + +@RunWith(classOf[JUnitRunner]) +final class AsciiSpaceStringFilterSpec extends ScalaTest { + private final val Filter = new StringFilterDelegate with AsciiSpaceStringFilter + + "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) + } + } + } + } +} \ No newline at end of file diff --git a/core/source/test/scala/org/hashtree/stringmetric/SpaceStringFilterSpec.scala b/core/source/test/scala/org/hashtree/stringmetric/SpaceStringFilterSpec.scala deleted file mode 100755 index 9396461..0000000 --- a/core/source/test/scala/org/hashtree/stringmetric/SpaceStringFilterSpec.scala +++ /dev/null @@ -1,32 +0,0 @@ -package org.hashtree.stringmetric - -import org.junit.runner.RunWith -import org.scalatest.junit.JUnitRunner - -@RunWith(classOf[JUnitRunner]) -final class SpaceStringFilterSpec extends ScalaTest { - private final val Filter = new StringFilterDelegate with SpaceStringFilter - - "SpaceStringFilter" 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) - } - } - } - } -} \ No newline at end of file -- cgit v1.2.3