diff options
author | Paul Phillips <paulp@improving.org> | 2011-05-19 20:06:19 +0000 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2011-05-19 20:06:19 +0000 |
commit | 4afa092314487c0095ff9fd5756d05340f6150b0 (patch) | |
tree | d3cf421e67192041f78858fe10735505f4891b3c /test/files/neg | |
parent | 7595671ec3929aa4ac978826521300a900250214 (diff) | |
download | scala-4afa092314487c0095ff9fd5756d05340f6150b0.tar.gz scala-4afa092314487c0095ff9fd5756d05340f6150b0.tar.bz2 scala-4afa092314487c0095ff9fd5756d05340f6150b0.zip |
Removes SUnit (long deprecated!) from the stand...
Removes SUnit (long deprecated!) from the standard library.
the relatively small number of partest tests in Scala's suite that
were still using SUnit now either just use regular asserts, or they
print stuff that partest checks with a .check file. Also fixed some bad
indentation, removed ancient useless-looking commented-out code, etc.
Contributed by Seth Tisue (way to go seth) no review.
Diffstat (limited to 'test/files/neg')
-rw-r--r-- | test/files/neg/bug1183.check | 8 | ||||
-rw-r--r-- | test/files/neg/bug1183.scala | 14 |
2 files changed, 9 insertions, 13 deletions
diff --git a/test/files/neg/bug1183.check b/test/files/neg/bug1183.check index ebbf8aca23..9e20592d08 100644 --- a/test/files/neg/bug1183.check +++ b/test/files/neg/bug1183.check @@ -1,16 +1,16 @@ -bug1183.scala:10: error: name clash: class Foo defines object Baz +bug1183.scala:6: error: name clash: class Foo defines object Baz and its companion object Foo also defines class Baz object Baz ^ -bug1183.scala:11: error: name clash: class Foo defines class Bam +bug1183.scala:7: error: name clash: class Foo defines class Bam and its companion object Foo also defines object Bam class Bam ^ -bug1183.scala:12: error: name clash: class Foo defines object Bar +bug1183.scala:8: error: name clash: class Foo defines object Bar and its companion object Foo also defines class Bar object Bar ^ -bug1183.scala:13: error: name clash: class Foo defines class Bar +bug1183.scala:9: error: name clash: class Foo defines class Bar and its companion object Foo also defines class Bar case class Bar(i:Int) ^ diff --git a/test/files/neg/bug1183.scala b/test/files/neg/bug1183.scala index a845126488..23868ab401 100644 --- a/test/files/neg/bug1183.scala +++ b/test/files/neg/bug1183.scala @@ -1,10 +1,6 @@ -import scala.testing.SUnit._ +// bug 1183 from in the old tracker, not in Trac -object Test extends TestConsoleMain { - - def suite = new TestSuite( - new Test717 - ) +object Test { class Foo(j:Int) { object Baz @@ -14,14 +10,14 @@ object Test extends TestConsoleMain { } - class Test717 extends TestCase("#717 test path of case classes") { + class Test717 { val foo1 = new Foo(1) - override def runTest() = { + def runTest() = { val res = (foo1.Bar(2):Any) match { case foo1.Bar(2) => true // (1) } - assertTrue("ok", res); + require(res) } } |