diff options
author | Antonio Cunei <antonio.cunei@epfl.ch> | 2011-04-20 12:19:47 +0000 |
---|---|---|
committer | Antonio Cunei <antonio.cunei@epfl.ch> | 2011-04-20 12:19:47 +0000 |
commit | 517acfdd56af4562d3c4f2963f656f2834ca23e2 (patch) | |
tree | 609c95d6aafff786460300162991ce5b31fe8c32 /test/disabled/jvm | |
parent | e5ad9c55f8a7a97aa7c36a057078db2031f468e8 (diff) | |
download | scala-517acfdd56af4562d3c4f2963f656f2834ca23e2.tar.gz scala-517acfdd56af4562d3c4f2963f656f2834ca23e2.tar.bz2 scala-517acfdd56af4562d3c4f2963f656f2834ca23e2.zip |
Fixing an incomplete svnmerge; second, merge ag...
Fixing an incomplete svnmerge; second, merge again from trunk.
Diffstat (limited to 'test/disabled/jvm')
-rw-r--r-- | test/disabled/jvm/JavaInteraction.check | 4 | ||||
-rw-r--r-- | test/disabled/jvm/JavaInteraction.scala | 38 |
2 files changed, 42 insertions, 0 deletions
diff --git a/test/disabled/jvm/JavaInteraction.check b/test/disabled/jvm/JavaInteraction.check new file mode 100644 index 0000000000..fb9d3cdd8c --- /dev/null +++ b/test/disabled/jvm/JavaInteraction.check @@ -0,0 +1,4 @@ +p.x = 5 +p.c = java.awt.Color[r=255,g=0,b=0] +p.getX() = 5.0 +p.getC() = java.awt.Color[r=255,g=0,b=0] diff --git a/test/disabled/jvm/JavaInteraction.scala b/test/disabled/jvm/JavaInteraction.scala new file mode 100644 index 0000000000..26fbc17e58 --- /dev/null +++ b/test/disabled/jvm/JavaInteraction.scala @@ -0,0 +1,38 @@ +//############################################################################ +// Test Java interaction +//############################################################################ + +import java.awt.Color; +import java.awt.Point; + +class ColoredPoint(x: Int, y: Int, c_ : Color) extends Point(x, y) { + val c: Color = c_; + def getC(): Color = c; +} + +object Test { + val expected = """ +p.x = 5 +p.c = java.awt.Color[r=255,g=0,b=0] +p.getX() = 5.0 +p.getC() = java.awt.Color[r=255,g=0,b=0] + """.trim + + def connect() = { + val p = new ColoredPoint(5, 7, Color.RED); + List( + "p.x = " + p.x, + "p.c = " + p.c, + "p.getX() = " + p.getX(), + "p.getC() = " + p.getC() + ).mkString("\n") + } + + // This test would pointlessly fail the whole build anytime the account + // running the test could not connect to the windowing server. The below + // is intended to defend against this outcome. + def main(args: Array[String]): Unit = { + try { Console println connect() } + catch { case _: java.lang.InternalError => Console println expected } + } +} |