From 57a5012514cf691fddf184cc85967e39cdc540b6 Mon Sep 17 00:00:00 2001
From: Jason Zaugg <jzaugg@gmail.com>
Date: Mon, 5 Nov 2012 16:20:48 +0100
Subject: Improve test infrastructure

 - Convert tests to use JUnit
 - For the 'run' tests, just use plain-old-test-cases
 - Add a sample 'neg' test to use ToolBoxes to compile code snippets on the fly.
---
 test/files/run/if-else2/MinimalScalaTest.scala | 102 -------------------------
 test/files/run/if-else2/if-else2.scala         |  50 ------------
 2 files changed, 152 deletions(-)
 delete mode 100644 test/files/run/if-else2/MinimalScalaTest.scala
 delete mode 100644 test/files/run/if-else2/if-else2.scala

(limited to 'test/files/run/if-else2')

diff --git a/test/files/run/if-else2/MinimalScalaTest.scala b/test/files/run/if-else2/MinimalScalaTest.scala
deleted file mode 100644
index 91de1fc..0000000
--- a/test/files/run/if-else2/MinimalScalaTest.scala
+++ /dev/null
@@ -1,102 +0,0 @@
-import language.reflectiveCalls
-import language.postfixOps
-import language.implicitConversions
-
-import scala.reflect.{ ClassTag, classTag }
-
-import scala.collection.mutable
-import scala.concurrent.{ Future, Awaitable, CanAwait }
-import java.util.concurrent.{ TimeoutException, CountDownLatch, TimeUnit }
-import scala.concurrent.duration.Duration
-
-
-
-trait Output {
-  val buffer = new StringBuilder
-  
-  def bufferPrintln(a: Any): Unit = buffer.synchronized {
-    buffer.append(a.toString + "\n")
-  }
-}
-
-
-trait MinimalScalaTest extends Output {
-  
-  val throwables = mutable.ArrayBuffer[Throwable]()
-  
-  def check() {
-    if (throwables.nonEmpty) println(buffer.toString)
-  }
-  
-  implicit def stringops(s: String) = new {
-    
-    def should[U](snippets: =>U): U = {
-      bufferPrintln(s + " should:")
-      snippets
-    }
-    
-    def in[U](snippet: =>U): Unit = {
-      try {
-        bufferPrintln("- " + s)
-        snippet
-        bufferPrintln("[OK] Test passed.")
-      } catch {
-        case e: Throwable =>
-          bufferPrintln("[FAILED] " + e)
-          bufferPrintln(e.getStackTrace().mkString("\n"))
-          throwables += e
-      }
-    }
-    
-  }
-  
-  implicit def objectops(obj: Any) = new {
-    
-    def mustBe(other: Any) = assert(obj == other, obj + " is not " + other)
-    def mustEqual(other: Any) = mustBe(other)
-    
-  }
-  
-  def intercept[T <: Throwable: ClassTag](body: =>Any): T = {
-    try {
-      body
-      throw new Exception("Exception of type %s was not thrown".format(classTag[T]))
-    } catch {
-      case t: Throwable =>
-        if (classTag[T].runtimeClass != t.getClass) throw t
-        else t.asInstanceOf[T]
-    }
-  }
-  
-  def checkType[T: ClassTag, S](in: Future[T], refclasstag: ClassTag[S]): Boolean = classTag[T] == refclasstag
-}
-
-
-object TestLatch {
-  val DefaultTimeout = Duration(5, TimeUnit.SECONDS)
-
-  def apply(count: Int = 1) = new TestLatch(count)
-}
-
-
-class TestLatch(count: Int = 1) extends Awaitable[Unit] {
-  private var latch = new CountDownLatch(count)
-  
-  def countDown() = latch.countDown()
-  def isOpen: Boolean = latch.getCount == 0
-  def open() = while (!isOpen) countDown()
-  def reset() = latch = new CountDownLatch(count)
-  
-  @throws(classOf[TimeoutException])
-  def ready(atMost: Duration)(implicit permit: CanAwait) = {
-    val opened = latch.await(atMost.toNanos, TimeUnit.NANOSECONDS)
-    if (!opened) throw new TimeoutException("Timeout of %s." format (atMost.toString))
-    this
-  }
-  
-  @throws(classOf[Exception])
-  def result(atMost: Duration)(implicit permit: CanAwait): Unit = {
-    ready(atMost)
-  }
-  
-}
diff --git a/test/files/run/if-else2/if-else2.scala b/test/files/run/if-else2/if-else2.scala
deleted file mode 100644
index 262308c..0000000
--- a/test/files/run/if-else2/if-else2.scala
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * Copyright (C) 2012 Typesafe Inc. <http://www.typesafe.com>
- */
-
-import language.{ reflectiveCalls, postfixOps }
-import scala.concurrent.{ Future, ExecutionContext, future, Await }
-import scala.concurrent.duration._
-import scala.async.Async.{ async, await }
-
-object Test extends App {
-
-  IfElse2Spec.check()
-
-}
-
-class TestIfElse2Class {
-  import ExecutionContext.Implicits.global
-  
-  def base(x: Int): Future[Int] = future {
-    Thread.sleep(1000)
-    x + 2
-  }
-  
-  def m(y: Int): Future[Int] = async {
-    val f = base(y)
-    var z = 0
-    if (y > 0) {
-      val x = await(f)
-      z = x + 2
-    } else {
-      val x = await(f)
-      z = x - 2
-    }
-    z
-  }
-}
-
-
-object IfElse2Spec extends MinimalScalaTest {
-
-  "An async method" should {
-    "allow variables of the same name in different blocks" in {
-      val o = new TestIfElse2Class
-      val fut = o.m(10)
-      val res = Await.result(fut, 2 seconds)
-      res mustBe(14)
-    }
-  }
-
-}
-- 
cgit v1.2.3