diff options
Diffstat (limited to 'test')
-rw-r--r-- | test/files/run/equality.scala | 2 | ||||
-rw-r--r-- | test/files/run/hashCodeStatics.scala (renamed from test/files/run/hashCodeBoxesRunTime.scala) | 11 | ||||
-rw-r--r-- | test/junit/scala/runtime/ScalaRunTimeTest.scala | 8 |
3 files changed, 6 insertions, 15 deletions
diff --git a/test/files/run/equality.scala b/test/files/run/equality.scala index ff59898821..2af73691d8 100644 --- a/test/files/run/equality.scala +++ b/test/files/run/equality.scala @@ -1,7 +1,7 @@ // a quickly assembled test of equality. Needs work. object Test { - import scala.runtime.ScalaRunTime.hash + def hash(x: Any): Int = x.## // forces upcast to Any def makeFromInt(x: Int) = List( x.toByte, x.toShort, x.toInt, x.toLong, x.toFloat, x.toDouble, BigInt(x), BigDecimal(x) diff --git a/test/files/run/hashCodeBoxesRunTime.scala b/test/files/run/hashCodeStatics.scala index 8ad94c252a..bff62cce18 100644 --- a/test/files/run/hashCodeBoxesRunTime.scala +++ b/test/files/run/hashCodeStatics.scala @@ -1,24 +1,23 @@ -// This only tests direct access to the methods in BoxesRunTime, +// This only tests direct access to the methods in Statics, // not the whole scheme. object Test { import java.{ lang => jl } - import scala.runtime.BoxesRunTime.hashFromNumber - import scala.runtime.ScalaRunTime.{ hash => hashFromAny } + import scala.runtime.Statics.anyHash def allSame[T](xs: List[T]) = assert(xs.distinct.size == 1, "failed: " + xs) def mkNumbers(x: Int): List[Number] = List(x.toByte, x.toShort, x, x.toLong, x.toFloat, x.toDouble) - def testLDF(x: Long) = allSame(List[Number](x, x.toDouble, x.toFloat) map hashFromNumber) + def testLDF(x: Long) = allSame(List[Number](x, x.toDouble, x.toFloat) map anyHash) def main(args: Array[String]): Unit = { List(Byte.MinValue, -1, 0, 1, Byte.MaxValue) foreach { n => - val hashes = mkNumbers(n) map hashFromNumber + val hashes = mkNumbers(n) map anyHash allSame(hashes) if (n >= 0) { - val charCode = hashFromAny(n.toChar: Character) + val charCode = anyHash(n.toChar: Character) assert(charCode == hashes.head) } } diff --git a/test/junit/scala/runtime/ScalaRunTimeTest.scala b/test/junit/scala/runtime/ScalaRunTimeTest.scala index 9efbdd44de..5bfb12610e 100644 --- a/test/junit/scala/runtime/ScalaRunTimeTest.scala +++ b/test/junit/scala/runtime/ScalaRunTimeTest.scala @@ -9,14 +9,6 @@ import org.junit.runners.JUnit4 @RunWith(classOf[JUnit4]) class ScalaRunTimeTest { @Test - def hashConsistentWithStaticsHash(): Unit = { - val problematicValue: Double = -Math.pow(2, 53) + 1 - val scalaRunTimeHash = ScalaRunTime.hash(problematicValue) - val staticsHash = Statics.anyHash(problematicValue) - assertEquals(scalaRunTimeHash, staticsHash) - } - - @Test def testStingOf() { import ScalaRunTime.stringOf import scala.collection._ |