From 46534afa83d627a240b287ad62a07358e5c5e25f Mon Sep 17 00:00:00 2001 From: Rocky Madden Date: Mon, 3 Dec 2012 10:09:38 -0700 Subject: Leverage those purdy implicits. --- .../org/hashtree/stringmetric/cli/OptionMapType.scala | 2 -- .../stringmetric/cli/phonetic/metaphoneAlgorithm.scala | 2 +- .../stringmetric/cli/phonetic/metaphoneMetric.scala | 4 ++-- .../stringmetric/cli/phonetic/nysiisAlgorithm.scala | 2 +- .../stringmetric/cli/phonetic/nysiisMetric.scala | 4 ++-- .../cli/phonetic/refinedNysiisAlgorithm.scala | 2 +- .../stringmetric/cli/phonetic/refinedNysiisMetric.scala | 4 ++-- .../cli/phonetic/refinedSoundexAlgorithm.scala | 2 +- .../stringmetric/cli/phonetic/refinedSoundexMetric.scala | 4 ++-- .../stringmetric/cli/phonetic/soundexAlgorithm.scala | 2 +- .../stringmetric/cli/phonetic/soundexMetric.scala | 4 ++-- .../stringmetric/cli/similarity/diceSorensenMetric.scala | 8 ++++---- .../stringmetric/cli/similarity/hammingMetric.scala | 4 ++-- .../stringmetric/cli/similarity/jaroMetric.scala | 4 ++-- .../stringmetric/cli/similarity/jaroWinklerMetric.scala | 4 ++-- .../stringmetric/cli/similarity/levenshteinMetric.scala | 4 ++-- .../stringmetric/cli/similarity/nGramAlgorithm.scala | 6 +++--- .../stringmetric/cli/similarity/nGramMetric.scala | 8 ++++---- .../cli/similarity/weightedLevenshteinMetric.scala | 16 ++++++++-------- .../hashtree/stringmetric/cli/OptionMapTypeSpec.scala | 16 ---------------- 20 files changed, 42 insertions(+), 60 deletions(-) (limited to 'cli') diff --git a/cli/source/core/scala/org/hashtree/stringmetric/cli/OptionMapType.scala b/cli/source/core/scala/org/hashtree/stringmetric/cli/OptionMapType.scala index c4f76a5..61c5542 100755 --- a/cli/source/core/scala/org/hashtree/stringmetric/cli/OptionMapType.scala +++ b/cli/source/core/scala/org/hashtree/stringmetric/cli/OptionMapType.scala @@ -65,8 +65,6 @@ final case class OptionMapShort(shortString: String) extends OptionMapType[Short } object OptionMapType { - implicit def OptionMapTypeToString[T](optionMapType: OptionMapType[T]): String = optionMapType.get.map(_.toString).get - implicit def OptionMapTypeToOptionT[T](optionMapType: OptionMapType[T]): Option[T] = optionMapType.get implicit def OptionMapTypeToT[T](optionMapType: OptionMapType[T]): T = optionMapType.get.get diff --git a/cli/source/core/scala/org/hashtree/stringmetric/cli/phonetic/metaphoneAlgorithm.scala b/cli/source/core/scala/org/hashtree/stringmetric/cli/phonetic/metaphoneAlgorithm.scala index 6dd2647..09f75c8 100755 --- a/cli/source/core/scala/org/hashtree/stringmetric/cli/phonetic/metaphoneAlgorithm.scala +++ b/cli/source/core/scala/org/hashtree/stringmetric/cli/phonetic/metaphoneAlgorithm.scala @@ -17,7 +17,7 @@ object metaphoneAlgorithm extends Command { help() exit(options) // Execute. - } else if (options.contains('dashless) && (OptionMapArray(options('dashless)): Array[String]).length == 1) { + } else if (options.contains('dashless) && (options('dashless): OptionMapArray).length == 1) { execute(options) exit(options) // Invalid syntax. diff --git a/cli/source/core/scala/org/hashtree/stringmetric/cli/phonetic/metaphoneMetric.scala b/cli/source/core/scala/org/hashtree/stringmetric/cli/phonetic/metaphoneMetric.scala index 581de0e..5ba01c9 100755 --- a/cli/source/core/scala/org/hashtree/stringmetric/cli/phonetic/metaphoneMetric.scala +++ b/cli/source/core/scala/org/hashtree/stringmetric/cli/phonetic/metaphoneMetric.scala @@ -17,7 +17,7 @@ object metaphoneMetric extends Command { help() exit(options) // Execute. - } else if (options.contains('dashless) && (OptionMapArray(options('dashless)): Array[String]).length == 2) { + } else if (options.contains('dashless) && (options('dashless): OptionMapArray).length == 2) { execute(options) exit(options) // Invalid syntax. @@ -42,7 +42,7 @@ object metaphoneMetric extends Command { } override def execute(options: OptionMap): Unit = { - val strings = OptionMapArray(options('dashless)) + val strings: OptionMapArray = options('dashless) println( MetaphoneMetric.compare( diff --git a/cli/source/core/scala/org/hashtree/stringmetric/cli/phonetic/nysiisAlgorithm.scala b/cli/source/core/scala/org/hashtree/stringmetric/cli/phonetic/nysiisAlgorithm.scala index 6d96299..0d07a31 100755 --- a/cli/source/core/scala/org/hashtree/stringmetric/cli/phonetic/nysiisAlgorithm.scala +++ b/cli/source/core/scala/org/hashtree/stringmetric/cli/phonetic/nysiisAlgorithm.scala @@ -17,7 +17,7 @@ object nysiisAlgorithm extends Command { help() exit(options) // Execute. - } else if (options.contains('dashless) && (OptionMapArray(options('dashless)): Array[String]).length == 1) { + } else if (options.contains('dashless) && (options('dashless): OptionMapArray).length == 1) { execute(options) exit(options) // Invalid syntax. diff --git a/cli/source/core/scala/org/hashtree/stringmetric/cli/phonetic/nysiisMetric.scala b/cli/source/core/scala/org/hashtree/stringmetric/cli/phonetic/nysiisMetric.scala index 5ad2fd7..86daa3e 100755 --- a/cli/source/core/scala/org/hashtree/stringmetric/cli/phonetic/nysiisMetric.scala +++ b/cli/source/core/scala/org/hashtree/stringmetric/cli/phonetic/nysiisMetric.scala @@ -17,7 +17,7 @@ object nysiisMetric extends Command { help() exit(options) // Execute. - } else if (options.contains('dashless) && (OptionMapArray(options('dashless)): Array[String]).length == 2) { + } else if (options.contains('dashless) && (options('dashless): OptionMapArray).length == 2) { execute(options) exit(options) // Invalid syntax. @@ -42,7 +42,7 @@ object nysiisMetric extends Command { } override def execute(options: OptionMap): Unit = { - val strings = OptionMapArray(options('dashless)) + val strings: OptionMapArray = options('dashless) println( NysiisMetric.compare( diff --git a/cli/source/core/scala/org/hashtree/stringmetric/cli/phonetic/refinedNysiisAlgorithm.scala b/cli/source/core/scala/org/hashtree/stringmetric/cli/phonetic/refinedNysiisAlgorithm.scala index 8619e16..fda8494 100755 --- a/cli/source/core/scala/org/hashtree/stringmetric/cli/phonetic/refinedNysiisAlgorithm.scala +++ b/cli/source/core/scala/org/hashtree/stringmetric/cli/phonetic/refinedNysiisAlgorithm.scala @@ -17,7 +17,7 @@ object refinedNysiisAlgorithm extends Command { help() exit(options) // Execute. - } else if (options.contains('dashless) && (OptionMapArray(options('dashless)): Array[String]).length == 1) { + } else if (options.contains('dashless) && (options('dashless): OptionMapArray).length == 1) { execute(options) exit(options) // Invalid syntax. diff --git a/cli/source/core/scala/org/hashtree/stringmetric/cli/phonetic/refinedNysiisMetric.scala b/cli/source/core/scala/org/hashtree/stringmetric/cli/phonetic/refinedNysiisMetric.scala index e09208e..da9f17f 100755 --- a/cli/source/core/scala/org/hashtree/stringmetric/cli/phonetic/refinedNysiisMetric.scala +++ b/cli/source/core/scala/org/hashtree/stringmetric/cli/phonetic/refinedNysiisMetric.scala @@ -17,7 +17,7 @@ object refinedNysiisMetric extends Command { help() exit(options) // Execute. - } else if (options.contains('dashless) && (OptionMapArray(options('dashless)): Array[String]).length == 2) { + } else if (options.contains('dashless) && (options('dashless): OptionMapArray).length == 2) { execute(options) exit(options) // Invalid syntax. @@ -42,7 +42,7 @@ object refinedNysiisMetric extends Command { } override def execute(options: OptionMap): Unit = { - val strings = OptionMapArray(options('dashless)) + val strings: OptionMapArray = options('dashless) println( RefinedNysiisMetric.compare( diff --git a/cli/source/core/scala/org/hashtree/stringmetric/cli/phonetic/refinedSoundexAlgorithm.scala b/cli/source/core/scala/org/hashtree/stringmetric/cli/phonetic/refinedSoundexAlgorithm.scala index c28a071..b51d630 100755 --- a/cli/source/core/scala/org/hashtree/stringmetric/cli/phonetic/refinedSoundexAlgorithm.scala +++ b/cli/source/core/scala/org/hashtree/stringmetric/cli/phonetic/refinedSoundexAlgorithm.scala @@ -17,7 +17,7 @@ object refinedSoundexAlgorithm extends Command { help() exit(options) // Execute. - } else if (options.contains('dashless) && (OptionMapArray(options('dashless)): Array[String]).length == 1) { + } else if (options.contains('dashless) && (options('dashless): OptionMapArray).length == 1) { execute(options) exit(options) // Invalid syntax. diff --git a/cli/source/core/scala/org/hashtree/stringmetric/cli/phonetic/refinedSoundexMetric.scala b/cli/source/core/scala/org/hashtree/stringmetric/cli/phonetic/refinedSoundexMetric.scala index 483a0b8..157bbea 100755 --- a/cli/source/core/scala/org/hashtree/stringmetric/cli/phonetic/refinedSoundexMetric.scala +++ b/cli/source/core/scala/org/hashtree/stringmetric/cli/phonetic/refinedSoundexMetric.scala @@ -17,7 +17,7 @@ object refinedSoundexMetric extends Command { help() exit(options) // Execute. - } else if (options.contains('dashless) && (OptionMapArray(options('dashless)): Array[String]).length == 2) { + } else if (options.contains('dashless) && (options('dashless): OptionMapArray).length == 2) { execute(options) exit(options) // Invalid syntax. @@ -42,7 +42,7 @@ object refinedSoundexMetric extends Command { } override def execute(options: OptionMap): Unit = { - val strings = OptionMapArray(options('dashless)) + val strings: OptionMapArray = options('dashless) println( RefinedSoundexMetric.compare( diff --git a/cli/source/core/scala/org/hashtree/stringmetric/cli/phonetic/soundexAlgorithm.scala b/cli/source/core/scala/org/hashtree/stringmetric/cli/phonetic/soundexAlgorithm.scala index 02ef536..99fdd49 100755 --- a/cli/source/core/scala/org/hashtree/stringmetric/cli/phonetic/soundexAlgorithm.scala +++ b/cli/source/core/scala/org/hashtree/stringmetric/cli/phonetic/soundexAlgorithm.scala @@ -17,7 +17,7 @@ object soundexAlgorithm extends Command { help() exit(options) // Execute. - } else if (options.contains('dashless) && (OptionMapArray(options('dashless)): Array[String]).length == 1) { + } else if (options.contains('dashless) && (options('dashless): OptionMapArray).length == 1) { execute(options) exit(options) // Invalid syntax. diff --git a/cli/source/core/scala/org/hashtree/stringmetric/cli/phonetic/soundexMetric.scala b/cli/source/core/scala/org/hashtree/stringmetric/cli/phonetic/soundexMetric.scala index 7f09197..1ce31c0 100755 --- a/cli/source/core/scala/org/hashtree/stringmetric/cli/phonetic/soundexMetric.scala +++ b/cli/source/core/scala/org/hashtree/stringmetric/cli/phonetic/soundexMetric.scala @@ -17,7 +17,7 @@ object soundexMetric extends Command { help() exit(options) // Execute. - } else if (options.contains('dashless) && (OptionMapArray(options('dashless)): Array[String]).length == 2) { + } else if (options.contains('dashless) && (options('dashless): OptionMapArray).length == 2) { execute(options) exit(options) // Invalid syntax. @@ -42,7 +42,7 @@ object soundexMetric extends Command { } override def execute(options: OptionMap): Unit = { - val strings = OptionMapArray(options('dashless)) + val strings: OptionMapArray = options('dashless) println( SoundexMetric.compare( diff --git a/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/diceSorensenMetric.scala b/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/diceSorensenMetric.scala index 57e4f72..685ea16 100755 --- a/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/diceSorensenMetric.scala +++ b/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/diceSorensenMetric.scala @@ -17,8 +17,8 @@ object diceSorensenMetric extends Command { help() exit(options) // Execute. - } else if (options.contains('dashless) && (OptionMapArray(options('dashless)): Array[String]).length == 2 - && options.contains('n) && OptionMapInt(options('n)).isDefined + } else if (options.contains('dashless) && (options('dashless): OptionMapArray).length == 2 + && options.contains('n) && (options('n): OptionMapInt).isDefined ) { execute(options) exit(options) @@ -46,8 +46,8 @@ object diceSorensenMetric extends Command { } override def execute(options: OptionMap): Unit = { - val strings = OptionMapArray(options('dashless)) - val n = OptionMapInt(options('n)) + val strings: OptionMapArray = options('dashless) + val n: OptionMapInt = options('n) println( DiceSorensenMetric.compare( diff --git a/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/hammingMetric.scala b/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/hammingMetric.scala index 6830d56..a325967 100755 --- a/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/hammingMetric.scala +++ b/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/hammingMetric.scala @@ -17,7 +17,7 @@ object hammingMetric extends Command { help() exit(options) // Execute. - } else if (options.contains('dashless) && (OptionMapArray(options('dashless)): Array[String]).length == 2) { + } else if (options.contains('dashless) && (options('dashless): OptionMapArray).length == 2) { execute(options) exit(options) // Invalid syntax. @@ -42,7 +42,7 @@ object hammingMetric extends Command { } override def execute(options: OptionMap): Unit = { - val strings = OptionMapArray(options('dashless)) + val strings: OptionMapArray = options('dashless) println( HammingMetric.compare( diff --git a/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/jaroMetric.scala b/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/jaroMetric.scala index b00ddb6..d8a0076 100755 --- a/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/jaroMetric.scala +++ b/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/jaroMetric.scala @@ -14,7 +14,7 @@ object jaroMetric extends Command { help() exit(options) // Execute. - } else if (options.contains('dashless) && (OptionMapArray(options('dashless)): Array[String]).length == 2) { + } else if (options.contains('dashless) && (options('dashless): OptionMapArray).length == 2) { execute(options) exit(options) // Invalid syntax. @@ -39,7 +39,7 @@ object jaroMetric extends Command { } override def execute(options: OptionMap): Unit = { - val strings = OptionMapArray(options('dashless)) + val strings: OptionMapArray = options('dashless) println( JaroMetric.compare( diff --git a/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/jaroWinklerMetric.scala b/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/jaroWinklerMetric.scala index 0b2896c..39fda04 100755 --- a/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/jaroWinklerMetric.scala +++ b/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/jaroWinklerMetric.scala @@ -17,7 +17,7 @@ object jaroWinklerMetric extends Command { help() exit(options) // Execute. - } else if (options.contains('dashless) && (OptionMapArray(options('dashless)): Array[String]).length == 2) { + } else if (options.contains('dashless) && (options('dashless): OptionMapArray).length == 2) { execute(options) exit(options) // Invalid syntax. @@ -42,7 +42,7 @@ object jaroWinklerMetric extends Command { } override def execute(options: OptionMap): Unit = { - val strings = OptionMapArray(options('dashless)) + val strings: OptionMapArray = options('dashless) println( JaroWinklerMetric.compare( diff --git a/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/levenshteinMetric.scala b/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/levenshteinMetric.scala index a535af8..29de7d9 100755 --- a/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/levenshteinMetric.scala +++ b/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/levenshteinMetric.scala @@ -17,7 +17,7 @@ object levenshteinMetric extends Command { help() exit(options) // Execute. - } else if (options.contains('dashless) && (OptionMapArray(options('dashless)): Array[String]).length == 2) { + } else if (options.contains('dashless) && (options('dashless): OptionMapArray).length == 2) { execute(options) exit(options) // Invalid syntax. @@ -43,7 +43,7 @@ object levenshteinMetric extends Command { } override def execute(options: OptionMap): Unit = { - val strings = OptionMapArray(options('dashless)) + val strings: OptionMapArray = options('dashless) println( LevenshteinMetric.compare( diff --git a/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/nGramAlgorithm.scala b/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/nGramAlgorithm.scala index f696823..72436b0 100755 --- a/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/nGramAlgorithm.scala +++ b/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/nGramAlgorithm.scala @@ -16,8 +16,8 @@ object nGramAlgorithm extends Command { help() exit(options) // Execute. - } else if (options.contains('dashless) && (OptionMapArray(options('dashless)): Array[String]).length == 1 - && options.contains('n) && OptionMapInt(options('n)).isDefined + } else if (options.contains('dashless) && (options('dashless): OptionMapArray).length == 1 + && options.contains('n) && (options('n): OptionMapInt).isDefined ) { execute(options) exit(options) @@ -45,7 +45,7 @@ object nGramAlgorithm extends Command { } override def execute(options: OptionMap): Unit = { - val n = OptionMapInt(options('n)) + val n: OptionMapInt = options('n) println( NGramAlgorithm.compute(options('dashless))(n).map(_.mkString("|")).getOrElse("not computable") diff --git a/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/nGramMetric.scala b/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/nGramMetric.scala index a08a148..1dc7069 100755 --- a/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/nGramMetric.scala +++ b/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/nGramMetric.scala @@ -17,8 +17,8 @@ object nGramMetric extends Command { help() exit(options) // Execute. - } else if (options.contains('dashless) && (OptionMapArray(options('dashless)): Array[String]).length == 2 - && options.contains('n) && OptionMapInt(options('n)).isDefined + } else if (options.contains('dashless) && (options('dashless): OptionMapArray).length == 2 + && options.contains('n) && (options('n): OptionMapInt).isDefined ) { execute(options) exit(options) @@ -46,8 +46,8 @@ object nGramMetric extends Command { } override def execute(options: OptionMap): Unit = { - val strings = OptionMapArray(options('dashless)) - val n = OptionMapInt(options('n)) + val strings: OptionMapArray = options('dashless) + val n: OptionMapInt = options('n) println( NGramMetric.compare( diff --git a/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/weightedLevenshteinMetric.scala b/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/weightedLevenshteinMetric.scala index 0265a72..03f9c6d 100755 --- a/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/weightedLevenshteinMetric.scala +++ b/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/weightedLevenshteinMetric.scala @@ -19,10 +19,10 @@ object weightedLevenshteinMetric extends Command { help() exit(options) // Execute. - } else if (options.contains('dashless) && (OptionMapArray(options('dashless)): Array[String]).length == 2 - && options.contains('deleteWeight) && OptionMapDouble(options('deleteWeight)).isDefined - && options.contains('insertWeight) && OptionMapDouble(options('insertWeight)).isDefined - && options.contains('substituteWeight) && OptionMapDouble(options('substituteWeight)).isDefined + } else if (options.contains('dashless) && (options('dashless): OptionMapArray).length == 2 + && options.contains('deleteWeight) && (options('deleteWeight): OptionMapDouble).isDefined + && options.contains('insertWeight) && (options('insertWeight): OptionMapDouble).isDefined + && options.contains('substituteWeight) && (options('substituteWeight): OptionMapDouble).isDefined ) { execute(options) exit(options) @@ -55,11 +55,11 @@ object weightedLevenshteinMetric extends Command { } override def execute(options: OptionMap): Unit = { - val strings = OptionMapArray(options('dashless)) + val strings: OptionMapArray = options('dashless) val weights = Tuple3[BigDecimal, BigDecimal, BigDecimal]( - OptionMapBigDecimal(options('deleteWeight)), - OptionMapBigDecimal(options('insertWeight)), - OptionMapBigDecimal(options('substituteWeight)) + (options('deleteWeight): OptionMapBigDecimal), + (options('insertWeight): OptionMapBigDecimal), + (options('substituteWeight): OptionMapBigDecimal) ) println( diff --git a/cli/source/test/scala/org/hashtree/stringmetric/cli/OptionMapTypeSpec.scala b/cli/source/test/scala/org/hashtree/stringmetric/cli/OptionMapTypeSpec.scala index b8c0561..148e322 100755 --- a/cli/source/test/scala/org/hashtree/stringmetric/cli/OptionMapTypeSpec.scala +++ b/cli/source/test/scala/org/hashtree/stringmetric/cli/OptionMapTypeSpec.scala @@ -42,8 +42,6 @@ final class OptionMapTypeSpec extends ScalaTest { OptionMapBigDecimal("1").get.get should equal (1: BigDecimal) (OptionMapBigDecimal("1"): BigDecimal) should equal (1: BigDecimal) - - (OptionMapBigDecimal("1"): String) should equal ("1") } } } @@ -64,8 +62,6 @@ final class OptionMapTypeSpec extends ScalaTest { OptionMapBigInt("1").get.get should equal (1: BigInt) (OptionMapBigInt("1"): BigInt) should equal (1: BigInt) - - (OptionMapBigInt("1"): String) should equal ("1") } } } @@ -86,8 +82,6 @@ final class OptionMapTypeSpec extends ScalaTest { OptionMapDouble("1").get.get should equal (1d) (OptionMapDouble("1"): Double) should equal (1d) - - (OptionMapDouble("1"): String) should equal ("1.0") } } } @@ -108,8 +102,6 @@ final class OptionMapTypeSpec extends ScalaTest { OptionMapFloat("1").get.get should equal (1f) (OptionMapFloat("1"): Float) should equal (1f) - - (OptionMapFloat("1"): String) should equal ("1.0") } } } @@ -130,8 +122,6 @@ final class OptionMapTypeSpec extends ScalaTest { OptionMapInt("1").get.get should equal (1) (OptionMapInt("1"): Int) should equal (1) - - (OptionMapInt("1"): String) should equal ("1") } } } @@ -152,8 +142,6 @@ final class OptionMapTypeSpec extends ScalaTest { OptionMapList("1 2 3").get.get should equal (List("1", "2", "3")) (OptionMapList("1 2 3"): List[String]) should equal (List("1", "2", "3")) - - (OptionMapList("1 2 3"): String) should equal ("List(1, 2, 3)") } } } @@ -174,8 +162,6 @@ final class OptionMapTypeSpec extends ScalaTest { OptionMapLong("1").get.get should equal (1l) (OptionMapLong("1"): Long) should equal (1l) - - (OptionMapLong("1"): String) should equal ("1") } } } @@ -196,8 +182,6 @@ final class OptionMapTypeSpec extends ScalaTest { OptionMapShort("1").get.get should equal (1: Short) (OptionMapShort("1"): Short) should equal (1: Short) - - (OptionMapShort("1"): String) should equal ("1") } } } -- cgit v1.2.3