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.

1 files changed, 37 insertions, 47 deletions

diff --git a/test/files/jvm/stringbuilder.scala b/test/files/jvm/stringbuilder.scala
index c86a8a7713..54951d657b 100644
--- a/test/files/jvm/stringbuilder.scala
+++ b/test/files/jvm/stringbuilder.scala
@@ -1,98 +1,88 @@
-import testing.SUnit._
-
 /** Test the Scala implementation of class <code>scala.StringBuilder</code>.
  *
  *  @author Stephane Micheloud
  */
-object Test extends TestConsoleMain {
-  def suite = new TestSuite(
-    Test1, //ctor, reverse
-    Test2, //append
-    Test3, //insert
-    Test4  //indexOf, lastIndexOf
-  )
+object Test {
+  def main(args: Array[String]) {
+    Test1.run() //ctor, reverse
+    Test2.run() //append
+    Test3.run() //insert
+    Test4.run()  //indexOf, lastIndexOf
+  }
 }
 
-object Test1 extends TestCase("ctor") with Assert {
-  override def enableStackTrace = false
-  override def runTest {
-    val j0 = new java.lang.StringBuilder("abc") // Java 1.5+
+object Test1 {
+  def run() {
+    val j0 = new java.lang.StringBuilder("abc")
     val s0 = new StringBuilder("abc")
-    assertEquals("s0 equals j0", false, s0 equals j0)
-    assertEquals("s0.toString equals j0.toString", true, s0.toString equals j0.toString)
+    println("s0 equals j0 = " + (s0 equals j0))
+    println("s0.toString equals j0.toString = " + (s0.toString equals j0.toString))
 
     val str = """
 Scala is a general purpose programming language designed to express common programming patterns in a concise, elegant, and type-safe way. It smoothly integrates features of object-oriented and functional languages. It is also fully interoperable with Java."""
     val j1 = new java.lang.StringBuilder(100) append str
     val s1 = new java.lang.StringBuilder(100) append str
-    assertEquals("s1.toString equals j1.toString", true, s1.toString equals j1.toString)
+    println("s1.toString equals j1.toString = " + (s1.toString equals j1.toString))
 
     val j2 = j0 reverse
     val s2 = s0 reverse;
-    //println("j2="+j2+", s2="+s2)//debug
-    assertEquals("s2.toString equals j2.toString", true, s2.toString equals j2.toString)
+    println("j2="+j2+", s2="+s2)
+    println("s2.toString equals j2.toString = " + (s2.toString equals j2.toString))
 
     val j3 = j2; j3 setCharAt (0, j3 charAt 2)
     val s3 = s2; s3(0) = s3(2)
-    //println("j3="+j3+", s3="+s3)//debug
-    assertEquals("s3.toString equals j3.toString", true, s3.toString equals j3.toString)
+    println("j3="+j3+", s3="+s3)
+    println("s3.toString equals j3.toString = " + (s3.toString equals j3.toString))
  }
 }
 
-object Test2 extends TestCase("append") with Assert {
-  override def enableStackTrace = false
-  override def runTest {
-    val j0 = new java.lang.StringBuilder("abc") // Java 1.5+
+object Test2 {
+  def run() {
+    val j0 = new java.lang.StringBuilder("abc")
     val s0 = new StringBuilder("abc")
-
     j0 append true append (1.toByte) append 'a' append 9 append -1L append 1.2e-10f append -2.1e+100d
     s0 append true append (1.toByte) append 'a' append 9 append -1L append 1.2e-10f append -2.1e+100d
+    println("s0.toString equals j0.toString = " + (s0.toString equals j0.toString))
 
-    assertEquals("s0.toString equals j0.toString", true, s0.toString equals j0.toString)
-
-    val j1 = new java.lang.StringBuilder // Java 1.5+
+    val j1 = new java.lang.StringBuilder
     val s1 = new StringBuilder
     j1 append "###" append Array('0', '1', '2') append "xyz".subSequence(0, 3)
     s1 append "###" appendAll Array('0', '1', '2') appendAll List('x', 'y', 'z')
-    assertEquals("s1.toString equals j1.toString", true, s1.toString equals j1.toString)
+    println("s1.toString equals j1.toString = "  + (s1.toString equals j1.toString))
  }
 }
 
-object Test3 extends TestCase("insert") with Assert {
-  override def enableStackTrace = false
-  override def runTest {
-    val j0 = new java.lang.StringBuilder("abc") // Java 1.5+
+object Test3 {
+  def run() {
+    val j0 = new java.lang.StringBuilder("abc")
     val s0 = new StringBuilder("abc")
-
     j0 insert (0, true) insert (0, 1.toByte) insert (0, 'a') insert (0, 88.toShort) insert (0, 9) insert (0, -1L)
     s0 insert (0, true) insert (0, 1.toByte) insert (0, 'a') insert (0, 88.toShort) insert (0, 9) insert (0, -1L)
-    //println("j0="+j0+", s0="+s0)//debug
-    assertEquals("s0.toString equals j0.toString", true, s0.toString equals j0.toString)
+    println("j0="+j0+", s0="+s0)
+    println("s0.toString equals j0.toString = " + (s0.toString equals j0.toString))
 
-    val j1 = new java.lang.StringBuilder // Java 1.5+
+    val j1 = new java.lang.StringBuilder
     val s1 = new StringBuilder
     j1 insert (0, "###") insert (0, Array('0', '1', '2')) insert (0, "xyz".subSequence(0, 3))
     s1 insert (0, "###") insertAll (0, Array('0', '1', '2')) insertAll (0, List('x', 'y', 'z'))
-    //println("j1="+j1+", s1="+s1)//debug
-    assertEquals("s1.toString equals j1.toString", true, s1.toString equals j1.toString)
-
+    println("j1="+j1+", s1="+s1)
+    println("s1.toString equals j1.toString = " + (s1.toString equals j1.toString))
   }
 }
 
-object Test4 extends TestCase("indefOf") with Assert {
-  override def enableStackTrace = false
-  override def runTest {
+object Test4 {
+  def run() {
     val j0 = new java.lang.StringBuilder("abc") // Java 1.5+
     val s0 = new StringBuilder("abc")
 
     val j1 = j0 indexOf("c")
     val s1 = s0 indexOf("c")
-    //println("j1="+j1+", s1="+s1)//debug
-    assertEquals("s1 == j1", true, s1 == j1)
+    println("j1="+j1+", s1="+s1)
+    println("s1 == j1 = " + (s1 == j1))
 
     val j2 = j0 append "123abc" lastIndexOf("c")
     val s2 = s0 append "123abc" lastIndexOf("c")
-    //println("j2="+j2+", s2="+s2)//debug
-    assertEquals("s2 == j2", true, s2 == j2)
+    println("j2="+j2+", s2="+s2)
+    println("s2 == j2 = " + (s2 == j2))
  }
 }