aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorphaller <hallerp@gmail.com>2012-10-30 21:45:38 +0100
committerphaller <hallerp@gmail.com>2012-10-30 21:45:38 +0100
commit6c1b433720725941ce052b0ad5614e29c9fb5846 (patch)
treedbb64922d5f74d44e3e264df7c0a36c2ce02ca86
parentd1ce8c91fff2897a34cc1f046a73f6214607b684 (diff)
downloadscala-async-6c1b433720725941ce052b0ad5614e29c9fb5846.tar.gz
scala-async-6c1b433720725941ce052b0ad5614e29c9fb5846.tar.bz2
scala-async-6c1b433720725941ce052b0ad5614e29c9fb5846.zip
Remove obsolete test files
-rw-r--r--src/async/test/files/run/async-spec/AsyncSpec.scala75
-rw-r--r--src/async/test/files/run/async-spec/MinimalScalaTest.scala104
-rw-r--r--src/async/test/files/run/async-spec/if-else0.scala53
3 files changed, 0 insertions, 232 deletions
diff --git a/src/async/test/files/run/async-spec/AsyncSpec.scala b/src/async/test/files/run/async-spec/AsyncSpec.scala
deleted file mode 100644
index afd4c6c..0000000
--- a/src/async/test/files/run/async-spec/AsyncSpec.scala
+++ /dev/null
@@ -1,75 +0,0 @@
-/**
- * Copyright (C) 2012 Typesafe Inc. <http://www.typesafe.com>
- */
-package scala.async
-
-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 {
-
- AsyncSpec.check()
-
-}
-
-
-class Test1Class {
- import ExecutionContext.Implicits.global
-
- def m1(x: Int): Future[Int] = future {
- Thread.sleep(1000)
- x + 2
- }
-
- def m2(y: Int): Future[Int] = async {
- val f = m1(y)
- val x = await(f)
- x + 2
- }
-
- def m3(y: Int): Future[Int] = async {
- val f1 = m1(y)
- val x1 = await(f1)
- val f2 = m1(y + 2)
- val x2 = await(f2)
- x1 + x2
- }
-
- // currently fails with: error: not found: value f2
-/*
- def m4(y: Int): Future[Int] = async {
- val f1 = m1(y)
- val f2 = m1(y + 2)
- val x1 = await(f1)
- println("between two awaits")
- val x2 = await(f2)
- x1 + x2
- }
-*/
-}
-
-
-object AsyncSpec extends MinimalScalaTest {
-
- "An async method" should {
- "support a simple await" in {
- val o = new Test1Class
- val fut = o.m2(10)
- val res = Await.result(fut, 2 seconds)
- res mustBe(14)
- }
- }
-
- "An async method" should {
- "support several awaits in sequence" in {
- val o = new Test1Class
- val fut = o.m3(10)
- val res = Await.result(fut, 4 seconds)
- res mustBe(26)
- }
- }
-
-}
diff --git a/src/async/test/files/run/async-spec/MinimalScalaTest.scala b/src/async/test/files/run/async-spec/MinimalScalaTest.scala
deleted file mode 100644
index a0f3384..0000000
--- a/src/async/test/files/run/async-spec/MinimalScalaTest.scala
+++ /dev/null
@@ -1,104 +0,0 @@
-package scala.async
-
-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/src/async/test/files/run/async-spec/if-else0.scala b/src/async/test/files/run/async-spec/if-else0.scala
deleted file mode 100644
index de20a65..0000000
--- a/src/async/test/files/run/async-spec/if-else0.scala
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * Copyright (C) 2012 Typesafe Inc. <http://www.typesafe.com>
- */
-package scala.async
-
-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 {
-
- IfElseSpec.check()
-
-}
-*/
-
-class TestIfElseClass {
- import ExecutionContext.Implicits.global
-
- def m1(x: Int): Future[Int] = future {
- Thread.sleep(1000)
- x + 2
- }
-
- def m2(y: Int): Future[Int] = async {
- val f = m1(y)
- var z = 0
- if (y > 0) {
- val x1 = await(f)
- z = x1 + 2
- } else {
- val x2 = await(f)
- z = x2 - 2
- }
- z
- }
-}
-
-
-object IfElseSpec extends MinimalScalaTest {
-
- "An async method" should {
- "support await in a simple if-else expression" in {
- val o = new TestIfElseClass
- val fut = o.m2(10)
- val res = Await.result(fut, 2 seconds)
- res mustBe(14)
- }
- }
-
-}