From af2e9f53fe30f9005157df6070fab2a582fa4769 Mon Sep 17 00:00:00 2001 From: Antonio Cunei Date: Fri, 29 Aug 2008 13:50:04 +0000 Subject: disable inner.scala test. --- test/files/jvm/inner.scala | 126 ------------------------------------------- test/pending/jvm/inner.scala | 126 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 126 insertions(+), 126 deletions(-) delete mode 100644 test/files/jvm/inner.scala create mode 100644 test/pending/jvm/inner.scala (limited to 'test') diff --git a/test/files/jvm/inner.scala b/test/files/jvm/inner.scala deleted file mode 100644 index 4ad1f1e215..0000000000 --- a/test/files/jvm/inner.scala +++ /dev/null @@ -1,126 +0,0 @@ -//############################################################################ -// Test Java interaction with scala inner classes -//############################################################################ -// $Id$ - -import java.io.{BufferedReader, File, FileWriter, InputStreamReader} - -class A { - val abc = "A.abc" - - protected class B(x: Int, y: String) { - println(abc); println(x) - println(y) - } - - trait Itf { - def method1(x: Int): Int - - trait Itf2 extends Itf { - def method2: Unit - } - } - - trait PlainTrait { - def method1(x: Int): Int - } - - class Impl(a: Int) extends Itf { - def method1(x: Int) = { - println(x) - println(a) - x + a - } - } - - class Impl2 extends Impl(1) with Itf#Itf2 { - def method2 = { - println(abc) - } - } - - def newImpl: Itf = new Impl(1) - def newImpl2: Itf#Itf2 = new Impl2 - - class Outer1(arg1: Int) { - class Outer2(arg2: Int) { - class Outer3(arg3: Int) { - println("Outer3: " + arg1 + " " + arg2 + " " + arg3); - } - } - } -} - -object Scalatest { - private val outputdir = System.getProperty("scalatest.output", "inner-jvm.obj") - private val scalalib = System.getProperty("scalatest.lib", "") - private val classpath = outputdir + File.pathSeparator + scalalib - private val javabin = { - val jhome = new File(System.getProperty("java.home")) - if (jhome.getName == "jre") - new File(jhome.getParent, "bin").getAbsolutePath - else - new File(jhome, "bin").getAbsolutePath - } - private val javacmd = javabin + File.separator + "java" - private val javac = javabin + File.separator + "javac" - - def javac(src: String, fname: String) { - val tmpfilename = outputdir + File.separator + fname - val tmpfile = new FileWriter(tmpfilename) - tmpfile.write(src) - tmpfile.close - exec(javac + " -d " + outputdir + " -classpath " + classpath + " " + tmpfilename) - } - - def java(cname: String) = - exec(javacmd + " -cp " + classpath + " " + cname) - - /** Execute cmd, wait for the process to end and pipe it's output to stdout */ - private def exec(cmd: String) { - val proc = Runtime.getRuntime().exec(cmd) - val inp = new BufferedReader(new InputStreamReader(proc.getInputStream)) - val errp = new BufferedReader(new InputStreamReader(proc.getErrorStream)) - proc.waitFor() - while (inp.ready) println(inp.readLine()) - while (errp.ready) println(errp.readLine()) - } -} - -object Test { - 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"); - - A.Itf itf = a.newImpl(); - itf.method1(1); - - A.Itf.Itf2 itf2 = a.newImpl2(); - itf2.method2(); - - A.Outer1 o1 = a.new Outer1(1); - A.Outer1.Outer2 o2 = o1.new Outer2(2); - A.Outer1.Outer2.Outer3 or = o2.new Outer3(3); - } -} -""" - 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") - } -} - -//############################################################################ diff --git a/test/pending/jvm/inner.scala b/test/pending/jvm/inner.scala new file mode 100644 index 0000000000..4ad1f1e215 --- /dev/null +++ b/test/pending/jvm/inner.scala @@ -0,0 +1,126 @@ +//############################################################################ +// Test Java interaction with scala inner classes +//############################################################################ +// $Id$ + +import java.io.{BufferedReader, File, FileWriter, InputStreamReader} + +class A { + val abc = "A.abc" + + protected class B(x: Int, y: String) { + println(abc); println(x) + println(y) + } + + trait Itf { + def method1(x: Int): Int + + trait Itf2 extends Itf { + def method2: Unit + } + } + + trait PlainTrait { + def method1(x: Int): Int + } + + class Impl(a: Int) extends Itf { + def method1(x: Int) = { + println(x) + println(a) + x + a + } + } + + class Impl2 extends Impl(1) with Itf#Itf2 { + def method2 = { + println(abc) + } + } + + def newImpl: Itf = new Impl(1) + def newImpl2: Itf#Itf2 = new Impl2 + + class Outer1(arg1: Int) { + class Outer2(arg2: Int) { + class Outer3(arg3: Int) { + println("Outer3: " + arg1 + " " + arg2 + " " + arg3); + } + } + } +} + +object Scalatest { + private val outputdir = System.getProperty("scalatest.output", "inner-jvm.obj") + private val scalalib = System.getProperty("scalatest.lib", "") + private val classpath = outputdir + File.pathSeparator + scalalib + private val javabin = { + val jhome = new File(System.getProperty("java.home")) + if (jhome.getName == "jre") + new File(jhome.getParent, "bin").getAbsolutePath + else + new File(jhome, "bin").getAbsolutePath + } + private val javacmd = javabin + File.separator + "java" + private val javac = javabin + File.separator + "javac" + + def javac(src: String, fname: String) { + val tmpfilename = outputdir + File.separator + fname + val tmpfile = new FileWriter(tmpfilename) + tmpfile.write(src) + tmpfile.close + exec(javac + " -d " + outputdir + " -classpath " + classpath + " " + tmpfilename) + } + + def java(cname: String) = + exec(javacmd + " -cp " + classpath + " " + cname) + + /** Execute cmd, wait for the process to end and pipe it's output to stdout */ + private def exec(cmd: String) { + val proc = Runtime.getRuntime().exec(cmd) + val inp = new BufferedReader(new InputStreamReader(proc.getInputStream)) + val errp = new BufferedReader(new InputStreamReader(proc.getErrorStream)) + proc.waitFor() + while (inp.ready) println(inp.readLine()) + while (errp.ready) println(errp.readLine()) + } +} + +object Test { + 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"); + + A.Itf itf = a.newImpl(); + itf.method1(1); + + A.Itf.Itf2 itf2 = a.newImpl2(); + itf2.method2(); + + A.Outer1 o1 = a.new Outer1(1); + A.Outer1.Outer2 o2 = o1.new Outer2(2); + A.Outer1.Outer2.Outer3 or = o2.new Outer3(3); + } +} +""" + 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") + } +} + +//############################################################################ -- cgit v1.2.3