diff options
author | Paul Phillips <paulp@improving.org> | 2011-04-14 14:25:46 +0000 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2011-04-14 14:25:46 +0000 |
commit | 09028a4fa5cf66a98080baa26cdadba29314c640 (patch) | |
tree | 161bc16133e945148e45d9ddb4cfcb2b76216134 /test/files | |
parent | 8707c9ecb3dfa8e3706c218ed8c780bbcb0b7217 (diff) | |
download | scala-09028a4fa5cf66a98080baa26cdadba29314c640.tar.gz scala-09028a4fa5cf66a98080baa26cdadba29314c640.tar.bz2 scala-09028a4fa5cf66a98080baa26cdadba29314c640.zip |
Of late the test which fires up the window serv...
Of late the test which fires up the window server, which has already
been the source of undue quantities of inconvenience, has taken to
hanging indefinitely when I run the test suite on a remote machine. Rope
at end, goodbye test, no review.
Diffstat (limited to 'test/files')
-rw-r--r-- | test/files/jvm/JavaInteraction.check | 4 | ||||
-rw-r--r-- | test/files/jvm/JavaInteraction.scala | 38 |
2 files changed, 0 insertions, 42 deletions
diff --git a/test/files/jvm/JavaInteraction.check b/test/files/jvm/JavaInteraction.check deleted file mode 100644 index fb9d3cdd8c..0000000000 --- a/test/files/jvm/JavaInteraction.check +++ /dev/null @@ -1,4 +0,0 @@ -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/files/jvm/JavaInteraction.scala b/test/files/jvm/JavaInteraction.scala deleted file mode 100644 index 26fbc17e58..0000000000 --- a/test/files/jvm/JavaInteraction.scala +++ /dev/null @@ -1,38 +0,0 @@ -//############################################################################ -// 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 } - } -} |