diff options
author | Adriaan Moors <adriaan@lightbend.com> | 2016-04-27 17:32:10 -0700 |
---|---|---|
committer | Adriaan Moors <adriaan@lightbend.com> | 2016-04-27 17:32:10 -0700 |
commit | 11dac0ff47d6b7527c069c2b7afa0924767c8960 (patch) | |
tree | b9cd0f64ce0e3ef7a84148e84e088a9bd5df8c9a /test/junit | |
parent | 93f209dd65d5c05fc2cb61916a850940499c9261 (diff) | |
parent | ee3f4fe55740b27ecc0325b00452e62005d1759a (diff) | |
download | scala-11dac0ff47d6b7527c069c2b7afa0924767c8960.tar.gz scala-11dac0ff47d6b7527c069c2b7afa0924767c8960.tar.bz2 scala-11dac0ff47d6b7527c069c2b7afa0924767c8960.zip |
Merge pull request #5094 from lrytz/classOfUnit
Fix erasure for classOf[Unit], don't erase to classOf[BoxedUnit]
Diffstat (limited to 'test/junit')
-rw-r--r-- | test/junit/scala/issues/RunTest.scala | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/test/junit/scala/issues/RunTest.scala b/test/junit/scala/issues/RunTest.scala index 781f2ef343..0605947e63 100644 --- a/test/junit/scala/issues/RunTest.scala +++ b/test/junit/scala/issues/RunTest.scala @@ -147,4 +147,16 @@ class RunTest extends ClearAfterClass { assertEquals(run[String](definitions("Object") + runCode), "hi" * 9) assertEquals(run[String](definitions("String") + runCode), "hi" * 9) // bridge method for clone generated } + + @Test + def classOfUnitConstant(): Unit = { + val code = + """abstract class A { def f: Class[_] } + |class C extends A { final val f = classOf[Unit] } + |val c = new C + |(c.f, (c: A).f) + """.stripMargin + val u = Void.TYPE + assertEquals(run[(Class[_], Class[_])](code), (u, u)) + } } |