summaryrefslogtreecommitdiff
path: root/test/files/jvm/inner.scala
diff options
context:
space:
mode:
authormichelou <michelou@epfl.ch>2007-12-05 12:19:00 +0000
committermichelou <michelou@epfl.ch>2007-12-05 12:19:00 +0000
commit0faae9a228e29ba511dd4678f42f93dea21d80a1 (patch)
treef1531f6b52042fafe52a585302a2c2021f8e76e3 /test/files/jvm/inner.scala
parent5ecc4943064100cd1ccb71ecf2832aa4facb3fa3 (diff)
downloadscala-0faae9a228e29ba511dd4678f42f93dea21d80a1.tar.gz
scala-0faae9a228e29ba511dd4678f42f93dea21d80a1.tar.bz2
scala-0faae9a228e29ba511dd4678f42f93dea21d80a1.zip
added accessor test
Diffstat (limited to 'test/files/jvm/inner.scala')
-rw-r--r--test/files/jvm/inner.scala39
1 files changed, 24 insertions, 15 deletions
diff --git a/test/files/jvm/inner.scala b/test/files/jvm/inner.scala
index a8da5164a5..4e990076f2 100644
--- a/test/files/jvm/inner.scala
+++ b/test/files/jvm/inner.scala
@@ -9,8 +9,8 @@ class A {
val abc = "A.abc"
protected class B(x: Int, y: String) {
- Console.println(abc); Console.println(x)
- Console.println(y)
+ println(abc); println(x)
+ println(y)
}
trait Itf {
@@ -27,15 +27,15 @@ class A {
class Impl(a: Int) extends Itf {
def method1(x: Int) = {
- Console.println(x)
- Console.println(a)
+ println(x)
+ println(a)
x + a
}
}
class Impl2 extends Impl(1) with Itf#Itf2 {
def method2 = {
- Console.println(abc)
+ println(abc)
}
}
@@ -45,7 +45,7 @@ class A {
class Outer1(arg1: Int) {
class Outer2(arg2: Int) {
class Outer3(arg3: Int) {
- Console.println("Outer3: " + arg1 + " " + arg2 + " " + arg3);
+ println("Outer3: " + arg1 + " " + arg2 + " " + arg3);
}
}
}
@@ -75,16 +75,15 @@ object Scalatest {
val inp = new BufferedReader(new InputStreamReader(proc.getInputStream))
val errp = new BufferedReader(new InputStreamReader(proc.getErrorStream))
proc.waitFor()
- while (inp.ready) Console.println(inp.readLine())
- while (errp.ready) Console.println(errp.readLine())
+ while (inp.ready) println(inp.readLine())
+ while (errp.ready) println(errp.readLine())
}
}
-
object Test {
- val program = """
-public class tmpJavaInterraction {
-
+ def main(args: Array[String]) {
+ val javaInteraction = """
+public class JavaInteraction {
public static void main(String[] args) {
A a = new A();
A.B b = a.new B(1, "Hello");
@@ -101,9 +100,19 @@ public class tmpJavaInterraction {
}
}
"""
- def main(args: Array[String]) {
- Scalatest.javac(program, "tmpJavaInterraction.java")
- Scalatest.java("tmpJavaInterraction")
+ Scalatest.javac(javaInteraction, "JavaInteraction.java")
+ Scalatest.java("JavaInteraction")
+
+ val accessingScala = """
+public class AccessingScala {
+ public static void main(String[] args) {
+ A a = new A();
+ System.out.println(a.abc());
+ }
+}
+"""
+ Scalatest.javac(accessingScala, "AccessingScala.java")
+ Scalatest.java("AccessingScala")
}
}