diff options
Diffstat (limited to 'test/files')
-rw-r--r-- | test/files/pos/t7847/A.scala | 5 | ||||
-rw-r--r-- | test/files/pos/t7847/B.java | 10 | ||||
-rw-r--r-- | test/files/run/t7805-repl-i.scala | 2 |
3 files changed, 16 insertions, 1 deletions
diff --git a/test/files/pos/t7847/A.scala b/test/files/pos/t7847/A.scala new file mode 100644 index 0000000000..b6cce6ee79 --- /dev/null +++ b/test/files/pos/t7847/A.scala @@ -0,0 +1,5 @@ +case class Blah(a: Int) + +object Blah { + def apply2(a: Int) = apply(a) +} diff --git a/test/files/pos/t7847/B.java b/test/files/pos/t7847/B.java new file mode 100644 index 0000000000..c214f2dcab --- /dev/null +++ b/test/files/pos/t7847/B.java @@ -0,0 +1,10 @@ +public final class B { + void blah() { + Blah x = Blah.apply2(1); + Blah y = Blah.apply(1); + Blah z = Blah$.MODULE$.apply(1); + + scala.Option un1 = Blah.unapply(null); + scala.Option un2 = Blah$.MODULE$.unapply(null); + } +} diff --git a/test/files/run/t7805-repl-i.scala b/test/files/run/t7805-repl-i.scala index a4061689f0..bb5203951e 100644 --- a/test/files/run/t7805-repl-i.scala +++ b/test/files/run/t7805-repl-i.scala @@ -34,7 +34,7 @@ trait HangingRepl extends ReplTest { import scala.concurrent.duration._ import ExecutionContext.Implicits._ import Resulting._ - def timeout = 15 seconds + def timeout = 120 seconds def hanging[A](a: =>A): A = future(a) resultWithin timeout override def show() = Try(hanging(super.show())) recover { case e => e.printStackTrace() |