diff options
author | Paul Phillips <paulp@improving.org> | 2011-01-13 00:08:02 +0000 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2011-01-13 00:08:02 +0000 |
commit | ecc938483824c09e470cebc69b4402ecc14355c2 (patch) | |
tree | 54aaf4f802033925c2666651fe825b5032b4f2e6 /test | |
parent | 8f444e66269e6498080f4cf03f0989a3bc242c2a (diff) | |
download | scala-ecc938483824c09e470cebc69b4402ecc14355c2.tar.gz scala-ecc938483824c09e470cebc69b4402ecc14355c2.tar.bz2 scala-ecc938483824c09e470cebc69b4402ecc14355c2.zip |
Deleted duplicate test which must have been a r...
Deleted duplicate test which must have been a real monkey wrench. No
review.
Diffstat (limited to 'test')
-rw-r--r-- | test/files/jvm/nest/nest.java | 38 | ||||
-rw-r--r-- | test/files/jvm/nest/nest.scala | 21 |
2 files changed, 0 insertions, 59 deletions
diff --git a/test/files/jvm/nest/nest.java b/test/files/jvm/nest/nest.java deleted file mode 100644 index 3f6f0bebbd..0000000000 --- a/test/files/jvm/nest/nest.java +++ /dev/null @@ -1,38 +0,0 @@ -package nestpkg; - - -/** This file is needed for test 'nest.scala'. It should - * be compiled with javac and packaged into lib/nest.jar - */ -public class nest { - public static class best { - public static class rest { - public static rest test = new rest(); - public static int x = 10; - public int inc(int i) { - return i + 1; - } - } - } - - - String name = "Outer name"; - - public class Inn { - int x; - - public Inn(int x) { - this.x = x; - } - - public void doSomething() { - System.out.println("Inn " + name + " x: " + x); - } - } - - protected class ProtInn { - public void doSomething() { - System.out.println("ProtInn " + name); - } - } -} diff --git a/test/files/jvm/nest/nest.scala b/test/files/jvm/nest/nest.scala deleted file mode 100644 index 3ab62484fa..0000000000 --- a/test/files/jvm/nest/nest.scala +++ /dev/null @@ -1,21 +0,0 @@ -//############################################################################ -// Test Scala interaction with Java nested classes and static members. -//############################################################################ - -/** found in nest.jar, compiled from nest.java */ -import nestpkg._; - -object Test extends Application { - val x = nest.best.rest.test - Console.println(x.inc(1)) - - val o = new nest.best; - val r = new nest.best.rest; - Console.println(nest.best.rest.test.inc(2)) - Console.println(nest.best.rest.x) - - print("Instantiating public inner class: ") - val outer = new nest - val inn = new outer.Inn(42) - inn.doSomething -} |