diff options
author | Rocky Madden <git@rockymadden.com> | 2013-03-18 20:03:57 -0600 |
---|---|---|
committer | Rocky Madden <git@rockymadden.com> | 2013-03-18 20:03:57 -0600 |
commit | b237148fee50896d737559ed8e89f78bcc5b94eb (patch) | |
tree | 641812cb9b90eb0031ced895bb15e2ce6b4c416d /core | |
parent | 05af73ab936168ebea891ed2f0120c49e8ec5066 (diff) | |
download | stringmetric-b237148fee50896d737559ed8e89f78bcc5b94eb.tar.gz stringmetric-b237148fee50896d737559ed8e89f78bcc5b94eb.tar.bz2 stringmetric-b237148fee50896d737559ed8e89f78bcc5b94eb.zip |
More consistent naming.
Diffstat (limited to 'core')
-rwxr-xr-x | core/source/core/scala/com/rockymadden/stringmetric/StringFilter.scala | 24 | ||||
-rwxr-xr-x | core/source/core/scala/com/rockymadden/stringmetric/filter/AsciiControlFilter.scala (renamed from core/source/core/scala/com/rockymadden/stringmetric/filter/AsciiControlStringFilter.scala) | 2 | ||||
-rwxr-xr-x | core/source/core/scala/com/rockymadden/stringmetric/filter/AsciiControlOnlyFilter.scala (renamed from core/source/core/scala/com/rockymadden/stringmetric/filter/AsciiControlOnlyStringFilter.scala) | 2 | ||||
-rwxr-xr-x | core/source/core/scala/com/rockymadden/stringmetric/filter/AsciiLetterFilter.scala (renamed from core/source/core/scala/com/rockymadden/stringmetric/filter/AsciiLetterStringFilter.scala) | 2 | ||||
-rwxr-xr-x | core/source/core/scala/com/rockymadden/stringmetric/filter/AsciiLetterNumberFilter.scala (renamed from core/source/core/scala/com/rockymadden/stringmetric/filter/AsciiLetterNumberStringFilter.scala) | 2 | ||||
-rwxr-xr-x | core/source/core/scala/com/rockymadden/stringmetric/filter/AsciiLetterNumberOnlyFilter.scala (renamed from core/source/core/scala/com/rockymadden/stringmetric/filter/AsciiLetterNumberOnlyStringFilter.scala) | 2 | ||||
-rwxr-xr-x | core/source/core/scala/com/rockymadden/stringmetric/filter/AsciiLetterOnlyFilter.scala (renamed from core/source/core/scala/com/rockymadden/stringmetric/filter/AsciiLetterOnlyStringFilter.scala) | 2 | ||||
-rwxr-xr-x | core/source/core/scala/com/rockymadden/stringmetric/filter/AsciiNumberFilter.scala (renamed from core/source/core/scala/com/rockymadden/stringmetric/filter/AsciiNumberStringFilter.scala) | 2 | ||||
-rwxr-xr-x | core/source/core/scala/com/rockymadden/stringmetric/filter/AsciiNumberOnlyFilter.scala (renamed from core/source/core/scala/com/rockymadden/stringmetric/filter/AsciiNumberOnlyStringFilter.scala) | 2 | ||||
-rwxr-xr-x | core/source/core/scala/com/rockymadden/stringmetric/filter/AsciiSpaceFilter.scala (renamed from core/source/core/scala/com/rockymadden/stringmetric/filter/AsciiSpaceStringFilter.scala) | 2 | ||||
-rwxr-xr-x | core/source/core/scala/com/rockymadden/stringmetric/filter/AsciiSymbolFilter.scala (renamed from core/source/core/scala/com/rockymadden/stringmetric/filter/AsciiSymbolStringFilter.scala) | 2 | ||||
-rwxr-xr-x | core/source/core/scala/com/rockymadden/stringmetric/filter/AsciiSymbolOnlyFilter.scala (renamed from core/source/core/scala/com/rockymadden/stringmetric/filter/AsciiSymbolOnlyStringFilter.scala) | 2 | ||||
-rwxr-xr-x | core/source/core/scala/com/rockymadden/stringmetric/filter/IgnoreAsciiLetterCaseFilter.scala (renamed from core/source/core/scala/com/rockymadden/stringmetric/filter/IgnoreAsciiLetterCaseStringFilter.scala) | 2 | ||||
-rwxr-xr-x | core/source/test/scala/com/rockymadden/stringmetric/FilterDecoratedSpec.scala | 6 | ||||
-rwxr-xr-x | core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiControlFilterSpec.scala (renamed from core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiControlStringFilterSpec.scala) | 10 | ||||
-rwxr-xr-x | core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiControlOnlyFilterSpec.scala (renamed from core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiControlOnlyStringFilterSpec.scala) | 10 | ||||
-rwxr-xr-x | core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterFilterSpec.scala (renamed from core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterStringFilterSpec.scala) | 10 | ||||
-rwxr-xr-x | core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterNumberFilterSpec.scala (renamed from core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterNumberStringFilterSpec.scala) | 10 | ||||
-rwxr-xr-x | core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterNumberOnlyFilterSpec.scala (renamed from core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterNumberOnlyStringFilterSpec.scala) | 10 | ||||
-rwxr-xr-x | core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterOnlyFilterSpec.scala (renamed from core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterOnlyStringFilterSpec.scala) | 10 | ||||
-rwxr-xr-x | core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiNumberFilterSpec.scala (renamed from core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiNumberStringFilterSpec.scala) | 10 | ||||
-rwxr-xr-x | core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiNumberOnlyFilterSpec.scala (renamed from core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiNumberOnlyStringFilterSpec.scala) | 10 | ||||
-rwxr-xr-x | core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiSpaceFilterSpec.scala (renamed from core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiSpaceStringFilterSpec.scala) | 10 | ||||
-rwxr-xr-x | core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiSymbolFilterSpec.scala (renamed from core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiSymbolStringFilterSpec.scala) | 10 | ||||
-rwxr-xr-x | core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiSymbolOnlyFilterSpec.scala (renamed from core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiSymbolOnlyStringFilterSpec.scala) | 10 | ||||
-rwxr-xr-x | core/source/test/scala/com/rockymadden/stringmetric/filter/IgnoreAsciiLetterCaseFilterSpec.scala (renamed from core/source/test/scala/com/rockymadden/stringmetric/filter/IgnoreAsciiLetterCaseStringFilterSpec.scala) | 10 |
26 files changed, 87 insertions, 87 deletions
diff --git a/core/source/core/scala/com/rockymadden/stringmetric/StringFilter.scala b/core/source/core/scala/com/rockymadden/stringmetric/StringFilter.scala index c7871ad..1430d34 100755 --- a/core/source/core/scala/com/rockymadden/stringmetric/StringFilter.scala +++ b/core/source/core/scala/com/rockymadden/stringmetric/StringFilter.scala @@ -7,39 +7,39 @@ trait StringFilter extends Filter[String] with StringFilterable { } object StringFilter { - type AsciiControl = com.rockymadden.stringmetric.filter.AsciiControlStringFilter + type AsciiControl = com.rockymadden.stringmetric.filter.AsciiControlFilter lazy val asciiControl = new StringFilterDelegate with AsciiControl - type AsciiControlOnly = com.rockymadden.stringmetric.filter.AsciiControlOnlyStringFilter + type AsciiControlOnly = com.rockymadden.stringmetric.filter.AsciiControlOnlyFilter lazy val asciiControlOnly = new StringFilterDelegate with AsciiControlOnly - type AsciiLetterNumber = com.rockymadden.stringmetric.filter.AsciiLetterNumberStringFilter + type AsciiLetterNumber = com.rockymadden.stringmetric.filter.AsciiLetterNumberFilter lazy val asciiLetterNumber = new StringFilterDelegate with AsciiLetterNumber - type AsciiLetterNumberOnly = com.rockymadden.stringmetric.filter.AsciiLetterNumberOnlyStringFilter + type AsciiLetterNumberOnly = com.rockymadden.stringmetric.filter.AsciiLetterNumberOnlyFilter lazy val asciiLetterNumberOnly = new StringFilterDelegate with AsciiLetterNumberOnly - type AsciiLetter = com.rockymadden.stringmetric.filter.AsciiLetterStringFilter + type AsciiLetter = com.rockymadden.stringmetric.filter.AsciiLetterFilter lazy val asciiLetter = new StringFilterDelegate with AsciiLetter - type AsciiLetterOnly = com.rockymadden.stringmetric.filter.AsciiLetterOnlyStringFilter + type AsciiLetterOnly = com.rockymadden.stringmetric.filter.AsciiLetterOnlyFilter lazy val asciiLetterOnly = new StringFilterDelegate with AsciiLetterOnly - type AsciiNumber = com.rockymadden.stringmetric.filter.AsciiNumberStringFilter + type AsciiNumber = com.rockymadden.stringmetric.filter.AsciiNumberFilter lazy val asciiNumber = new StringFilterDelegate with AsciiNumber - type AsciiNumberOnly = com.rockymadden.stringmetric.filter.AsciiNumberOnlyStringFilter + type AsciiNumberOnly = com.rockymadden.stringmetric.filter.AsciiNumberOnlyFilter lazy val asciiNumberOnly = new StringFilterDelegate with AsciiNumberOnly - type AsciiSpace = com.rockymadden.stringmetric.filter.AsciiSpaceStringFilter + type AsciiSpace = com.rockymadden.stringmetric.filter.AsciiSpaceFilter lazy val asciiSpace = new StringFilterDelegate with AsciiSpace - type AsciiSymbol = com.rockymadden.stringmetric.filter.AsciiSymbolStringFilter + type AsciiSymbol = com.rockymadden.stringmetric.filter.AsciiSymbolFilter lazy val asciiSymbol = new StringFilterDelegate with AsciiSymbol - type AsciiSymbolOnly = com.rockymadden.stringmetric.filter.AsciiSymbolOnlyStringFilter + type AsciiSymbolOnly = com.rockymadden.stringmetric.filter.AsciiSymbolOnlyFilter lazy val asciiSymbolOnly = new StringFilterDelegate with AsciiSymbolOnly - type IgnoreAsciiLetterCase = com.rockymadden.stringmetric.filter.IgnoreAsciiLetterCaseStringFilter + type IgnoreAsciiLetterCase = com.rockymadden.stringmetric.filter.IgnoreAsciiLetterCaseFilter lazy val ignoreAsciiLetterCase = new StringFilterDelegate with IgnoreAsciiLetterCase } diff --git a/core/source/core/scala/com/rockymadden/stringmetric/filter/AsciiControlStringFilter.scala b/core/source/core/scala/com/rockymadden/stringmetric/filter/AsciiControlFilter.scala index b1b59f8..bd45ecf 100755 --- a/core/source/core/scala/com/rockymadden/stringmetric/filter/AsciiControlStringFilter.scala +++ b/core/source/core/scala/com/rockymadden/stringmetric/filter/AsciiControlFilter.scala @@ -3,7 +3,7 @@ package com.rockymadden.stringmetric.filter import com.rockymadden.stringmetric.StringFilter /** Ensures ASCII controls do not matter. */ -trait AsciiControlStringFilter extends StringFilter { +trait AsciiControlFilter extends StringFilter { abstract override def filter(charArray: Array[Char]): Array[Char] = super.filter(charArray.filter(c => !(c <= 31 || c == 127))) diff --git a/core/source/core/scala/com/rockymadden/stringmetric/filter/AsciiControlOnlyStringFilter.scala b/core/source/core/scala/com/rockymadden/stringmetric/filter/AsciiControlOnlyFilter.scala index ed39e1f..c08b686 100755 --- a/core/source/core/scala/com/rockymadden/stringmetric/filter/AsciiControlOnlyStringFilter.scala +++ b/core/source/core/scala/com/rockymadden/stringmetric/filter/AsciiControlOnlyFilter.scala @@ -3,7 +3,7 @@ package com.rockymadden.stringmetric.filter import com.rockymadden.stringmetric.StringFilter /** Ensures only ASCII control characters matter. */ -trait AsciiControlOnlyStringFilter extends StringFilter { +trait AsciiControlOnlyFilter extends StringFilter { abstract override def filter(charArray: Array[Char]): Array[Char] = super.filter(charArray.filter(c => (c <= 31 || c == 127))) diff --git a/core/source/core/scala/com/rockymadden/stringmetric/filter/AsciiLetterStringFilter.scala b/core/source/core/scala/com/rockymadden/stringmetric/filter/AsciiLetterFilter.scala index 08a05ee..24509cb 100755 --- a/core/source/core/scala/com/rockymadden/stringmetric/filter/AsciiLetterStringFilter.scala +++ b/core/source/core/scala/com/rockymadden/stringmetric/filter/AsciiLetterFilter.scala @@ -3,7 +3,7 @@ package com.rockymadden.stringmetric.filter import com.rockymadden.stringmetric.StringFilter /** Ensures ASCII letters do not matter. */ -trait AsciiLetterStringFilter extends StringFilter { +trait AsciiLetterFilter extends StringFilter { abstract override def filter(charArray: Array[Char]): Array[Char] = super.filter(charArray.filter(c => !((c >= 65 && c <= 90 ) || (c >= 97 && c <= 122)))) diff --git a/core/source/core/scala/com/rockymadden/stringmetric/filter/AsciiLetterNumberStringFilter.scala b/core/source/core/scala/com/rockymadden/stringmetric/filter/AsciiLetterNumberFilter.scala index e45d30a..e17c715 100755 --- a/core/source/core/scala/com/rockymadden/stringmetric/filter/AsciiLetterNumberStringFilter.scala +++ b/core/source/core/scala/com/rockymadden/stringmetric/filter/AsciiLetterNumberFilter.scala @@ -3,7 +3,7 @@ package com.rockymadden.stringmetric.filter import com.rockymadden.stringmetric.StringFilter /** Ensures ASCII letters and numbers do not matter. */ -trait AsciiLetterNumberStringFilter extends StringFilter { +trait AsciiLetterNumberFilter extends StringFilter { abstract override def filter(charArray: Array[Char]): Array[Char] = super.filter( charArray.filter(c => diff --git a/core/source/core/scala/com/rockymadden/stringmetric/filter/AsciiLetterNumberOnlyStringFilter.scala b/core/source/core/scala/com/rockymadden/stringmetric/filter/AsciiLetterNumberOnlyFilter.scala index b613442..7cf97ba 100755 --- a/core/source/core/scala/com/rockymadden/stringmetric/filter/AsciiLetterNumberOnlyStringFilter.scala +++ b/core/source/core/scala/com/rockymadden/stringmetric/filter/AsciiLetterNumberOnlyFilter.scala @@ -3,7 +3,7 @@ package com.rockymadden.stringmetric.filter import com.rockymadden.stringmetric.StringFilter /** Ensures only ASCII letters and numbers matter. */ -trait AsciiLetterNumberOnlyStringFilter extends StringFilter { +trait AsciiLetterNumberOnlyFilter extends StringFilter { abstract override def filter(charArray: Array[Char]): Array[Char] = super.filter( charArray.filter(c => diff --git a/core/source/core/scala/com/rockymadden/stringmetric/filter/AsciiLetterOnlyStringFilter.scala b/core/source/core/scala/com/rockymadden/stringmetric/filter/AsciiLetterOnlyFilter.scala index 07422aa..70032d9 100755 --- a/core/source/core/scala/com/rockymadden/stringmetric/filter/AsciiLetterOnlyStringFilter.scala +++ b/core/source/core/scala/com/rockymadden/stringmetric/filter/AsciiLetterOnlyFilter.scala @@ -3,7 +3,7 @@ package com.rockymadden.stringmetric.filter import com.rockymadden.stringmetric.StringFilter /** Ensures only ASCII letters matter. */ -trait AsciiLetterOnlyStringFilter extends StringFilter { +trait AsciiLetterOnlyFilter extends StringFilter { abstract override def filter(charArray: Array[Char]): Array[Char] = super.filter(charArray.filter(c => ((c >= 65 && c <= 90 ) || (c >= 97 && c <= 122)))) diff --git a/core/source/core/scala/com/rockymadden/stringmetric/filter/AsciiNumberStringFilter.scala b/core/source/core/scala/com/rockymadden/stringmetric/filter/AsciiNumberFilter.scala index 860d9d3..42fe77e 100755 --- a/core/source/core/scala/com/rockymadden/stringmetric/filter/AsciiNumberStringFilter.scala +++ b/core/source/core/scala/com/rockymadden/stringmetric/filter/AsciiNumberFilter.scala @@ -3,7 +3,7 @@ package com.rockymadden.stringmetric.filter import com.rockymadden.stringmetric.StringFilter /** Ensures ASCII numbers do not matter. */ -trait AsciiNumberStringFilter extends StringFilter { +trait AsciiNumberFilter extends StringFilter { abstract override def filter(charArray: Array[Char]): Array[Char] = super.filter(charArray.filter(c => !(c >= 48 && c <= 57))) diff --git a/core/source/core/scala/com/rockymadden/stringmetric/filter/AsciiNumberOnlyStringFilter.scala b/core/source/core/scala/com/rockymadden/stringmetric/filter/AsciiNumberOnlyFilter.scala index 1a18645..3f17099 100755 --- a/core/source/core/scala/com/rockymadden/stringmetric/filter/AsciiNumberOnlyStringFilter.scala +++ b/core/source/core/scala/com/rockymadden/stringmetric/filter/AsciiNumberOnlyFilter.scala @@ -3,7 +3,7 @@ package com.rockymadden.stringmetric.filter import com.rockymadden.stringmetric.StringFilter /** Ensures only ASCII numbers matter. */ -trait AsciiNumberOnlyStringFilter extends StringFilter { +trait AsciiNumberOnlyFilter extends StringFilter { abstract override def filter(charArray: Array[Char]): Array[Char] = super.filter(charArray.filter(c => (c >= 48 && c <= 57 ))) diff --git a/core/source/core/scala/com/rockymadden/stringmetric/filter/AsciiSpaceStringFilter.scala b/core/source/core/scala/com/rockymadden/stringmetric/filter/AsciiSpaceFilter.scala index 161b9fe..538107d 100755 --- a/core/source/core/scala/com/rockymadden/stringmetric/filter/AsciiSpaceStringFilter.scala +++ b/core/source/core/scala/com/rockymadden/stringmetric/filter/AsciiSpaceFilter.scala @@ -3,7 +3,7 @@ package com.rockymadden.stringmetric.filter import com.rockymadden.stringmetric.StringFilter /** Ensures ASCII spaces do not matter. */ -trait AsciiSpaceStringFilter extends StringFilter { +trait AsciiSpaceFilter extends StringFilter { abstract override def filter(charArray: Array[Char]): Array[Char] = super.filter(charArray.filter(_ != ' ')) abstract override def filter(string: String): String = filter(string.toCharArray).mkString diff --git a/core/source/core/scala/com/rockymadden/stringmetric/filter/AsciiSymbolStringFilter.scala b/core/source/core/scala/com/rockymadden/stringmetric/filter/AsciiSymbolFilter.scala index 0431f05..7b0c810 100755 --- a/core/source/core/scala/com/rockymadden/stringmetric/filter/AsciiSymbolStringFilter.scala +++ b/core/source/core/scala/com/rockymadden/stringmetric/filter/AsciiSymbolFilter.scala @@ -3,7 +3,7 @@ package com.rockymadden.stringmetric.filter import com.rockymadden.stringmetric.StringFilter /** Ensures ASCII symbols do not matter. */ -trait AsciiSymbolStringFilter extends StringFilter { +trait AsciiSymbolFilter extends StringFilter { abstract override def filter(charArray: Array[Char]): Array[Char] = super.filter( charArray.filter(c => diff --git a/core/source/core/scala/com/rockymadden/stringmetric/filter/AsciiSymbolOnlyStringFilter.scala b/core/source/core/scala/com/rockymadden/stringmetric/filter/AsciiSymbolOnlyFilter.scala index 2876057..5cb5e94 100755 --- a/core/source/core/scala/com/rockymadden/stringmetric/filter/AsciiSymbolOnlyStringFilter.scala +++ b/core/source/core/scala/com/rockymadden/stringmetric/filter/AsciiSymbolOnlyFilter.scala @@ -3,7 +3,7 @@ package com.rockymadden.stringmetric.filter import com.rockymadden.stringmetric.StringFilter /** Ensures only ASCII symbols matter. */ -trait AsciiSymbolOnlyStringFilter extends StringFilter { +trait AsciiSymbolOnlyFilter extends StringFilter { abstract override def filter(charArray: Array[Char]): Array[Char] = super.filter( charArray.filter(c => diff --git a/core/source/core/scala/com/rockymadden/stringmetric/filter/IgnoreAsciiLetterCaseStringFilter.scala b/core/source/core/scala/com/rockymadden/stringmetric/filter/IgnoreAsciiLetterCaseFilter.scala index d186630..54fe66f 100755 --- a/core/source/core/scala/com/rockymadden/stringmetric/filter/IgnoreAsciiLetterCaseStringFilter.scala +++ b/core/source/core/scala/com/rockymadden/stringmetric/filter/IgnoreAsciiLetterCaseFilter.scala @@ -3,7 +3,7 @@ package com.rockymadden.stringmetric.filter import com.rockymadden.stringmetric.StringFilter /** Ensures ASCII letter case-sensitivity does not matter. */ -trait IgnoreAsciiLetterCaseStringFilter extends StringFilter { +trait IgnoreAsciiLetterCaseFilter extends StringFilter { abstract override def filter(charArray: Array[Char]): Array[Char] = super.filter(charArray.map(c => if (c >= 65 && c <= 90) (c + 32).toChar else c)) 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/AsciiControlStringFilterSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiControlFilterSpec.scala index 5c774a0..1cce0c9 100755 --- a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiControlStringFilterSpec.scala +++ b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiControlFilterSpec.scala @@ -5,10 +5,10 @@ import org.junit.runner.RunWith import org.scalatest.junit.JUnitRunner @RunWith(classOf[JUnitRunner]) -final class AsciiControlStringFilterSpec extends ScalaTest { - import AsciiControlStringFilterSpec.Filter +final class AsciiControlFilterSpec extends ScalaTest { + import AsciiControlFilterSpec.Filter - "AsciiControlStringFilter" should provide { + "AsciiControlFilter" should provide { "overloaded filter method" when passed { "String with controls" should returns { "String with controls removed" in { @@ -28,6 +28,6 @@ final class AsciiControlStringFilterSpec extends ScalaTest { } } -object AsciiControlStringFilterSpec { - private final val Filter = new StringFilterDelegate with AsciiControlStringFilter +object AsciiControlFilterSpec { + private final val Filter = new StringFilterDelegate with AsciiControlFilter } diff --git a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiControlOnlyStringFilterSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiControlOnlyFilterSpec.scala index 8d5d1d4..958c8ba 100755 --- a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiControlOnlyStringFilterSpec.scala +++ b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiControlOnlyFilterSpec.scala @@ -5,10 +5,10 @@ import org.junit.runner.RunWith import org.scalatest.junit.JUnitRunner @RunWith(classOf[JUnitRunner]) -final class AsciiControlOnlyStringFilterSpec extends ScalaTest { - import AsciiControlOnlyStringFilterSpec.Filter +final class AsciiControlOnlyFilterSpec extends ScalaTest { + import AsciiControlOnlyFilterSpec.Filter - "AsciiControlOnlyStringFilter" should provide { + "AsciiControlOnlyFilter" should provide { "overloaded filter method" when passed { "String with mixed characters" should returns { "String with non-controls removed" in { @@ -28,6 +28,6 @@ final class AsciiControlOnlyStringFilterSpec extends ScalaTest { } } -object AsciiControlOnlyStringFilterSpec { - private final val Filter = new StringFilterDelegate with AsciiControlOnlyStringFilter +object AsciiControlOnlyFilterSpec { + private final val Filter = new StringFilterDelegate with AsciiControlOnlyFilter } diff --git a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterStringFilterSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterFilterSpec.scala index 5ca7324..d86e7a5 100755 --- a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterStringFilterSpec.scala +++ b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterFilterSpec.scala @@ -5,10 +5,10 @@ import org.junit.runner.RunWith import org.scalatest.junit.JUnitRunner @RunWith(classOf[JUnitRunner]) -final class AsciiLetterStringFilterSpec extends ScalaTest { - import AsciiLetterStringFilterSpec.Filter +final class AsciiLetterFilterSpec extends ScalaTest { + import AsciiLetterFilterSpec.Filter - "AsciiLetterStringFilter" should provide { + "AsciiLetterFilter" should provide { "overloaded filter method" when passed { "String with letters" should returns { "String with letters removed" in { @@ -24,6 +24,6 @@ final class AsciiLetterStringFilterSpec extends ScalaTest { } } -object AsciiLetterStringFilterSpec { - private final val Filter = new StringFilterDelegate with AsciiLetterStringFilter +object AsciiLetterFilterSpec { + private final val Filter = new StringFilterDelegate with AsciiLetterFilter } diff --git a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterNumberStringFilterSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterNumberFilterSpec.scala index 4b548f0..edfdce6 100755 --- a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterNumberStringFilterSpec.scala +++ b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterNumberFilterSpec.scala @@ -5,10 +5,10 @@ import org.junit.runner.RunWith import org.scalatest.junit.JUnitRunner @RunWith(classOf[JUnitRunner]) -final class AsciiLetterNumberStringFilterSpec extends ScalaTest { - import AsciiLetterNumberStringFilterSpec.Filter +final class AsciiLetterNumberFilterSpec extends ScalaTest { + import AsciiLetterNumberFilterSpec.Filter - "AsciiLetterNumberStringFilter" should provide { + "AsciiLetterNumberFilter" should provide { "overloaded filter method" when passed { "String with letters and numbers" should returns { "String with letters and numbers removed" in { @@ -28,6 +28,6 @@ final class AsciiLetterNumberStringFilterSpec extends ScalaTest { } } -object AsciiLetterNumberStringFilterSpec { - private final val Filter = new StringFilterDelegate with AsciiLetterNumberStringFilter +object AsciiLetterNumberFilterSpec { + private final val Filter = new StringFilterDelegate with AsciiLetterNumberFilter } diff --git a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterNumberOnlyStringFilterSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterNumberOnlyFilterSpec.scala index 8e488c5..7998e39 100755 --- a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterNumberOnlyStringFilterSpec.scala +++ b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterNumberOnlyFilterSpec.scala @@ -5,10 +5,10 @@ import org.junit.runner.RunWith import org.scalatest.junit.JUnitRunner @RunWith(classOf[JUnitRunner]) -final class AsciiLetterNumberOnlyStringFilterSpec extends ScalaTest { - import AsciiLetterNumberOnlyStringFilterSpec.Filter +final class AsciiLetterNumberOnlyFilterSpec extends ScalaTest { + import AsciiLetterNumberOnlyFilterSpec.Filter - "AsciiLetterNumberOnlyStringFilter" should provide { + "AsciiLetterNumberOnlyFilter" should provide { "overloaded filter method" when passed { "String with mixed characters" should returns { "String with non-letters and non-numbers removed" in { @@ -30,6 +30,6 @@ final class AsciiLetterNumberOnlyStringFilterSpec extends ScalaTest { } } -object AsciiLetterNumberOnlyStringFilterSpec { - private final val Filter = new StringFilterDelegate with AsciiLetterNumberOnlyStringFilter +object AsciiLetterNumberOnlyFilterSpec { + private final val Filter = new StringFilterDelegate with AsciiLetterNumberOnlyFilter } diff --git a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterOnlyStringFilterSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterOnlyFilterSpec.scala index f33050c..d134792 100755 --- a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterOnlyStringFilterSpec.scala +++ b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterOnlyFilterSpec.scala @@ -5,10 +5,10 @@ import org.junit.runner.RunWith import org.scalatest.junit.JUnitRunner @RunWith(classOf[JUnitRunner]) -final class AsciiLetterOnlyStringFilterSpec extends ScalaTest { - import AsciiLetterOnlyStringFilterSpec.Filter +final class AsciiLetterOnlyFilterSpec extends ScalaTest { + import AsciiLetterOnlyFilterSpec.Filter - "AsciiLetterOnlyStringFilter" should provide { + "AsciiLetterOnlyFilter" should provide { "overloaded filter method" when passed { "String with mixed characters" should returns { "String with non-letters removed" in { @@ -28,6 +28,6 @@ final class AsciiLetterOnlyStringFilterSpec extends ScalaTest { } } -object AsciiLetterOnlyStringFilterSpec { - private final val Filter = new StringFilterDelegate with AsciiLetterOnlyStringFilter +object AsciiLetterOnlyFilterSpec { + private final val Filter = new StringFilterDelegate with AsciiLetterOnlyFilter } diff --git a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiNumberStringFilterSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiNumberFilterSpec.scala index b1ed8a0..7c24d45 100755 --- a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiNumberStringFilterSpec.scala +++ b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiNumberFilterSpec.scala @@ -5,10 +5,10 @@ import org.junit.runner.RunWith import org.scalatest.junit.JUnitRunner @RunWith(classOf[JUnitRunner]) -final class AsciiNumberStringFilterSpec extends ScalaTest { - import AsciiNumberStringFilterSpec.Filter +final class AsciiNumberFilterSpec extends ScalaTest { + import AsciiNumberFilterSpec.Filter - "AsciiNumberStringFilter" should provide { + "AsciiNumberFilter" should provide { "overloaded filter method" when passed { "String with numbers" should returns { "String with numbers removed" in { @@ -28,6 +28,6 @@ final class AsciiNumberStringFilterSpec extends ScalaTest { } } -object AsciiNumberStringFilterSpec { - private final val Filter = new StringFilterDelegate with AsciiNumberStringFilter +object AsciiNumberFilterSpec { + private final val Filter = new StringFilterDelegate with AsciiNumberFilter } diff --git a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiNumberOnlyStringFilterSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiNumberOnlyFilterSpec.scala index 147d9b6..db49d25 100755 --- a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiNumberOnlyStringFilterSpec.scala +++ b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiNumberOnlyFilterSpec.scala @@ -5,10 +5,10 @@ import org.junit.runner.RunWith import org.scalatest.junit.JUnitRunner @RunWith(classOf[JUnitRunner]) -final class AsciiNumberOnlyStringFilterSpec extends ScalaTest { - import AsciiNumberOnlyStringFilterSpec.Filter +final class AsciiNumberOnlyFilterSpec extends ScalaTest { + import AsciiNumberOnlyFilterSpec.Filter - "AsciiNumberOnlyStringFilter" should provide { + "AsciiNumberOnlyFilter" should provide { "overloaded filter method" when passed { "String with mixed characters" should returns { "String with non-numbers removed" in { @@ -28,6 +28,6 @@ final class AsciiNumberOnlyStringFilterSpec extends ScalaTest { } } -object AsciiNumberOnlyStringFilterSpec { - private final val Filter = new StringFilterDelegate with AsciiNumberOnlyStringFilter +object AsciiNumberOnlyFilterSpec { + private final val Filter = new StringFilterDelegate with AsciiNumberOnlyFilter } diff --git a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiSpaceStringFilterSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiSpaceFilterSpec.scala index 6ee45b1..759db3d 100755 --- a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiSpaceStringFilterSpec.scala +++ b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiSpaceFilterSpec.scala @@ -5,10 +5,10 @@ import org.junit.runner.RunWith import org.scalatest.junit.JUnitRunner @RunWith(classOf[JUnitRunner]) -final class AsciiSpaceStringFilterSpec extends ScalaTest { - import AsciiSpaceStringFilterSpec.Filter +final class AsciiSpaceFilterSpec extends ScalaTest { + import AsciiSpaceFilterSpec.Filter - "AsciiSpaceStringFilter" should provide { + "AsciiSpaceFilter" should provide { "overloaded filter method" when passed { "String with spaces" should returns { "String with spaces removed" in { @@ -32,6 +32,6 @@ final class AsciiSpaceStringFilterSpec extends ScalaTest { } } -object AsciiSpaceStringFilterSpec { - private final val Filter = new StringFilterDelegate with AsciiSpaceStringFilter +object AsciiSpaceFilterSpec { + private final val Filter = new StringFilterDelegate with AsciiSpaceFilter } diff --git a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiSymbolStringFilterSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiSymbolFilterSpec.scala index 2e4a0e0..99be533 100755 --- a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiSymbolStringFilterSpec.scala +++ b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiSymbolFilterSpec.scala @@ -5,10 +5,10 @@ import org.junit.runner.RunWith import org.scalatest.junit.JUnitRunner @RunWith(classOf[JUnitRunner]) -final class AsciiSymbolStringFilterSpec extends ScalaTest { - import AsciiSymbolStringFilterSpec.Filter +final class AsciiSymbolFilterSpec extends ScalaTest { + import AsciiSymbolFilterSpec.Filter - "AsciiSymbolStringFilter" should provide { + "AsciiSymbolFilter" should provide { "overloaded filter method" when passed { "String with symbols" should returns { "String with symbols removed" in { @@ -26,6 +26,6 @@ final class AsciiSymbolStringFilterSpec extends ScalaTest { } } -object AsciiSymbolStringFilterSpec { - private final val Filter = new StringFilterDelegate with AsciiSymbolStringFilter +object AsciiSymbolFilterSpec { + private final val Filter = new StringFilterDelegate with AsciiSymbolFilter } diff --git a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiSymbolOnlyStringFilterSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiSymbolOnlyFilterSpec.scala index 8d5c2fb..c6f1899 100755 --- a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiSymbolOnlyStringFilterSpec.scala +++ b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiSymbolOnlyFilterSpec.scala @@ -5,10 +5,10 @@ import org.junit.runner.RunWith import org.scalatest.junit.JUnitRunner @RunWith(classOf[JUnitRunner]) -final class AsciiSymbolOnlyStringFilterSpec extends ScalaTest { - import AsciiSymbolOnlyStringFilterSpec.Filter +final class AsciiSymbolOnlyFilterSpec extends ScalaTest { + import AsciiSymbolOnlyFilterSpec.Filter - "AsciiSymbolOnlyStringFilter" should provide { + "AsciiSymbolOnlyFilter" should provide { "overloaded filter method" when passed { "String with mixed characters" should returns { "String with non-symbols removed" in { @@ -28,6 +28,6 @@ final class AsciiSymbolOnlyStringFilterSpec extends ScalaTest { } } -object AsciiSymbolOnlyStringFilterSpec { - private final val Filter = new StringFilterDelegate with AsciiSymbolOnlyStringFilter +object AsciiSymbolOnlyFilterSpec { + private final val Filter = new StringFilterDelegate with AsciiSymbolOnlyFilter } diff --git a/core/source/test/scala/com/rockymadden/stringmetric/filter/IgnoreAsciiLetterCaseStringFilterSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/filter/IgnoreAsciiLetterCaseFilterSpec.scala index 4defbc2..a04a0ae 100755 --- a/core/source/test/scala/com/rockymadden/stringmetric/filter/IgnoreAsciiLetterCaseStringFilterSpec.scala +++ b/core/source/test/scala/com/rockymadden/stringmetric/filter/IgnoreAsciiLetterCaseFilterSpec.scala @@ -5,10 +5,10 @@ import org.junit.runner.RunWith import org.scalatest.junit.JUnitRunner @RunWith(classOf[JUnitRunner]) -final class IgnoreAsciiLetterCaseStringFilterSpec extends ScalaTest { - import IgnoreAsciiLetterCaseStringFilterSpec.Filter +final class IgnoreAsciiLetterCaseFilterSpec extends ScalaTest { + import IgnoreAsciiLetterCaseFilterSpec.Filter - "IgnoreAsciiLetterCaseStringFilter" should provide { + "IgnoreAsciiLetterCaseFilter" should provide { "overloaded filter method" when passed { "String with mixed case" should returns { "String with the same case" in { @@ -36,6 +36,6 @@ final class IgnoreAsciiLetterCaseStringFilterSpec extends ScalaTest { } } -object IgnoreAsciiLetterCaseStringFilterSpec { - private final val Filter = new StringFilterDelegate with IgnoreAsciiLetterCaseStringFilter +object IgnoreAsciiLetterCaseFilterSpec { + private final val Filter = new StringFilterDelegate with IgnoreAsciiLetterCaseFilter } |