diff options
author | Paul Phillips <paulp@improving.org> | 2011-03-06 10:07:51 +0000 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2011-03-06 10:07:51 +0000 |
commit | bc9a3475f308e78de193e4072f11e2edb7f7a72b (patch) | |
tree | 5c33f619851c97d015fb3d7daba21fc83483e9c2 /test/disabled/jvm | |
parent | a3d2d3b1ceaa7090a993b4a4f0ea53f4fe343e08 (diff) | |
download | scala-bc9a3475f308e78de193e4072f11e2edb7f7a72b.tar.gz scala-bc9a3475f308e78de193e4072f11e2edb7f7a72b.tar.bz2 scala-bc9a3475f308e78de193e4072f11e2edb7f7a72b.zip |
Re-enabling the disabled signature test along w...
Re-enabling the disabled signature test along with changes which allow
it to pass. Closes #4238 again, no review. (But would anyone like to
expand the signature tests? Great idea, extempore!)
Diffstat (limited to 'test/disabled/jvm')
-rw-r--r-- | test/disabled/jvm/t2585.check | 0 | ||||
-rw-r--r-- | test/disabled/jvm/t2585/Test.java | 16 | ||||
-rw-r--r-- | test/disabled/jvm/t2585/genericouter.scala | 25 |
3 files changed, 0 insertions, 41 deletions
diff --git a/test/disabled/jvm/t2585.check b/test/disabled/jvm/t2585.check deleted file mode 100644 index e69de29bb2..0000000000 --- a/test/disabled/jvm/t2585.check +++ /dev/null diff --git a/test/disabled/jvm/t2585/Test.java b/test/disabled/jvm/t2585/Test.java deleted file mode 100644 index 51fe20d81e..0000000000 --- a/test/disabled/jvm/t2585/Test.java +++ /dev/null @@ -1,16 +0,0 @@ -class J { S s ; } - -public class Test { - public static void main(String[] args) { - final X x = new X(); - final OuterImpl o = new OuterImpl(x); - - final OuterImpl.Inner i1 = o.newInner(); - i1.getT().getI().getT().getI(); // <--- Error: "The method getI() is undefined for the type Object" - - final Outer<X>.Inner i2 = o.newInner(); - i2.getT().getI().getT().getI(); // <--- Error: "The method getI() is undefined for the type Object" - - HashMap<String, String> map = new HashMap<String, String>(); - } -}
\ No newline at end of file diff --git a/test/disabled/jvm/t2585/genericouter.scala b/test/disabled/jvm/t2585/genericouter.scala deleted file mode 100644 index e06aa8101e..0000000000 --- a/test/disabled/jvm/t2585/genericouter.scala +++ /dev/null @@ -1,25 +0,0 @@ -case class S(n:Int) - -trait TraversableLike[+A, +Repr] { - class WithFilter(p: A => Boolean) - def withFilter(p: A => Boolean): WithFilter = new WithFilter(p) -} - -class HashMap[K, +V] extends TraversableLike[(K, V), HashMap[K, V]] - -class Outer[T](val t: T) { - class Inner { - def getT : T = t - } -} - -class OuterImpl(x: X) extends Outer[X](x) { - def newInner = new Inner -} - -class X { - def getI : Outer[X]#Inner = { - val oImpl = new OuterImpl(this) - new oImpl.Inner - } -}
\ No newline at end of file |