summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorJosh Suereth <Joshua.Suereth@gmail.com>2012-07-20 09:44:14 -0700
committerJosh Suereth <Joshua.Suereth@gmail.com>2012-07-20 09:44:14 -0700
commit46da0ee29f380ccb455c9c3c2adcf375e0c13ccf (patch)
tree7b160be5bcbfe37247841e732b7571fe5661f8c8 /test
parentd1fd58fceeb607fab091d6c942c5619be57bf227 (diff)
parentddd5f3aa8f080328e98f656fd5f5d2946b5aa77f (diff)
downloadscala-46da0ee29f380ccb455c9c3c2adcf375e0c13ccf.tar.gz
scala-46da0ee29f380ccb455c9c3c2adcf375e0c13ccf.tar.bz2
scala-46da0ee29f380ccb455c9c3c2adcf375e0c13ccf.zip
Merge pull request #956 from phaller/topic/sip14-critical-fix-await
SIP-14 - Fix critical Java compatibility issue in scala.concurrent.Await
Diffstat (limited to 'test')
-rw-r--r--test/files/jvm/scala-concurrent-tck.scala11
1 files changed, 10 insertions, 1 deletions
diff --git a/test/files/jvm/scala-concurrent-tck.scala b/test/files/jvm/scala-concurrent-tck.scala
index 1209b710b0..43d4c9dc71 100644
--- a/test/files/jvm/scala-concurrent-tck.scala
+++ b/test/files/jvm/scala-concurrent-tck.scala
@@ -700,9 +700,18 @@ trait Blocking extends TestBase {
}
}
+ def testFQCNForAwaitAPI(): Unit = once {
+ done =>
+
+ assert(classOf[CanAwait].getName == "scala.concurrent.CanAwait")
+ assert(Await.getClass.getName == "scala.concurrent.Await")
+
+ done()
+ }
+
testAwaitSuccess()
testAwaitFailure()
-
+ testFQCNForAwaitAPI()
}
trait BlockContexts extends TestBase {