diff options
author | Antonio Cunei <antonio.cunei@epfl.ch> | 2011-04-20 12:16:52 +0000 |
---|---|---|
committer | Antonio Cunei <antonio.cunei@epfl.ch> | 2011-04-20 12:16:52 +0000 |
commit | e5ad9c55f8a7a97aa7c36a057078db2031f468e8 (patch) | |
tree | 85ec520f743d57148ca2bd9b5c777832e4281e1e /test/disabled/jvm | |
parent | 7c3ec209bc28f83f008bad4d126293bcbb867113 (diff) | |
download | scala-e5ad9c55f8a7a97aa7c36a057078db2031f468e8.tar.gz scala-e5ad9c55f8a7a97aa7c36a057078db2031f468e8.tar.bz2 scala-e5ad9c55f8a7a97aa7c36a057078db2031f468e8.zip |
Fixing an incomplete svnmerge; first, revert to...
Fixing an incomplete svnmerge; first, revert to r24726.
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, 0 insertions, 42 deletions
diff --git a/test/disabled/jvm/JavaInteraction.check b/test/disabled/jvm/JavaInteraction.check deleted file mode 100644 index fb9d3cdd8c..0000000000 --- a/test/disabled/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/disabled/jvm/JavaInteraction.scala b/test/disabled/jvm/JavaInteraction.scala deleted file mode 100644 index 26fbc17e58..0000000000 --- a/test/disabled/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 } - } -} |