diff options
-rw-r--r-- | src/test/scala/scala/async/TestLatch.scala | 36 | ||||
-rw-r--r-- | src/test/scala/scala/async/TestUtils.scala (renamed from src/test/scala/scala/async/MinimalScalaTest.scala) | 43 | ||||
-rw-r--r-- | src/test/scala/scala/async/neg/SampleNegSpec.scala | 2 | ||||
-rw-r--r-- | src/test/scala/scala/async/package.scala | 5 | ||||
-rw-r--r-- | src/test/scala/scala/async/run/await0/await0.scala | 2 | ||||
-rw-r--r-- | src/test/scala/scala/async/run/block0/AsyncSpec.scala | 2 | ||||
-rw-r--r-- | src/test/scala/scala/async/run/block1/block1.scala | 2 | ||||
-rw-r--r-- | src/test/scala/scala/async/run/ifelse0/IfElse0.scala | 2 | ||||
-rw-r--r-- | src/test/scala/scala/async/run/ifelse1/IfElse1.scala | 2 | ||||
-rw-r--r-- | src/test/scala/scala/async/run/ifelse2/ifelse2.scala | 2 | ||||
-rw-r--r-- | src/test/scala/scala/async/run/ifelse3/IfElse3.scala | 2 |
11 files changed, 50 insertions, 50 deletions
diff --git a/src/test/scala/scala/async/TestLatch.scala b/src/test/scala/scala/async/TestLatch.scala new file mode 100644 index 0000000..676ea63 --- /dev/null +++ b/src/test/scala/scala/async/TestLatch.scala @@ -0,0 +1,36 @@ +package scala.async + +import concurrent.{CanAwait, Awaitable} +import concurrent.duration.Duration +import java.util.concurrent.{TimeoutException, CountDownLatch, TimeUnit} + +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(s"Timeout of ${(atMost.toString)}.") + this + } + + @throws(classOf[Exception]) + def result(atMost: Duration)(implicit permit: CanAwait): Unit = { + ready(atMost) + } +} diff --git a/src/test/scala/scala/async/MinimalScalaTest.scala b/src/test/scala/scala/async/TestUtils.scala index af5b04e..f4def22 100644 --- a/src/test/scala/scala/async/MinimalScalaTest.scala +++ b/src/test/scala/scala/async/TestUtils.scala @@ -14,15 +14,7 @@ import org.junit.runner.RunWith import org.junit.runners.JUnit4 -trait Output { - val buffer = new StringBuilder - - def bufferPrintln(a: Any): Unit = buffer.synchronized { - buffer.append(a.toString + "\n") - } -} - -trait MinimalScalaTest extends Output { +trait TestUtils { implicit class objectops(obj: Any) { def mustBe(other: Any) = assert(obj == other, obj + " is not " + other) @@ -44,36 +36,3 @@ trait MinimalScalaTest extends Output { } } } - - -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(s"Timeout of ${(atMost.toString)}.") - this - } - - @throws(classOf[Exception]) - def result(atMost: Duration)(implicit permit: CanAwait): Unit = { - ready(atMost) - } - -} diff --git a/src/test/scala/scala/async/neg/SampleNegSpec.scala b/src/test/scala/scala/async/neg/SampleNegSpec.scala index c26caa9..00daf44 100644 --- a/src/test/scala/scala/async/neg/SampleNegSpec.scala +++ b/src/test/scala/scala/async/neg/SampleNegSpec.scala @@ -8,7 +8,7 @@ import org.junit.Test import tools.reflect.ToolBoxError @RunWith(classOf[JUnit4]) -class SampleNegSpec extends MinimalScalaTest { +class SampleNegSpec { val f = new File("/Users/jason/code/scala-async/test/files/run/await0") @Test diff --git a/src/test/scala/scala/async/package.scala b/src/test/scala/scala/async/package.scala new file mode 100644 index 0000000..32e8be4 --- /dev/null +++ b/src/test/scala/scala/async/package.scala @@ -0,0 +1,5 @@ +package scala + +package object async extends TestUtils { + +} diff --git a/src/test/scala/scala/async/run/await0/await0.scala b/src/test/scala/scala/async/run/await0/await0.scala index 9fa8dd6..e7740e0 100644 --- a/src/test/scala/scala/async/run/await0/await0.scala +++ b/src/test/scala/scala/async/run/await0/await0.scala @@ -65,7 +65,7 @@ class Await0Class { } @RunWith(classOf[JUnit4]) -class Await0Spec extends MinimalScalaTest { +class Await0Spec { @Test def `An async method support a simple await`() { diff --git a/src/test/scala/scala/async/run/block0/AsyncSpec.scala b/src/test/scala/scala/async/run/block0/AsyncSpec.scala index 230d73a..f56e394 100644 --- a/src/test/scala/scala/async/run/block0/AsyncSpec.scala +++ b/src/test/scala/scala/async/run/block0/AsyncSpec.scala @@ -41,7 +41,7 @@ class Test1Class { @RunWith(classOf[JUnit4]) -class AsyncSpec extends MinimalScalaTest { +class AsyncSpec { @Test def `simple await`() { diff --git a/src/test/scala/scala/async/run/block1/block1.scala b/src/test/scala/scala/async/run/block1/block1.scala index caa0f18..8f21688 100644 --- a/src/test/scala/scala/async/run/block1/block1.scala +++ b/src/test/scala/scala/async/run/block1/block1.scala @@ -35,7 +35,7 @@ class Test1Class { } @RunWith(classOf[JUnit4]) -class Block1Spec extends MinimalScalaTest { +class Block1Spec { @Test def `support a simple await`() { val o = new Test1Class diff --git a/src/test/scala/scala/async/run/ifelse0/IfElse0.scala b/src/test/scala/scala/async/run/ifelse0/IfElse0.scala index d58f1ec..eca3acd 100644 --- a/src/test/scala/scala/async/run/ifelse0/IfElse0.scala +++ b/src/test/scala/scala/async/run/ifelse0/IfElse0.scala @@ -40,7 +40,7 @@ class TestIfElseClass { @RunWith(classOf[JUnit4]) -class IfElseSpec extends MinimalScalaTest { +class IfElseSpec { @Test def `support await in a simple if-else expression`() { val o = new TestIfElseClass diff --git a/src/test/scala/scala/async/run/ifelse1/IfElse1.scala b/src/test/scala/scala/async/run/ifelse1/IfElse1.scala index 66909af..128f02a 100644 --- a/src/test/scala/scala/async/run/ifelse1/IfElse1.scala +++ b/src/test/scala/scala/async/run/ifelse1/IfElse1.scala @@ -93,7 +93,7 @@ class TestIfElse1Class { } @RunWith(classOf[JUnit4]) -class IfElse1Spec extends MinimalScalaTest { +class IfElse1Spec { @Test def `await in a nested if-else expression`() { diff --git a/src/test/scala/scala/async/run/ifelse2/ifelse2.scala b/src/test/scala/scala/async/run/ifelse2/ifelse2.scala index 39a17f1..f894923 100644 --- a/src/test/scala/scala/async/run/ifelse2/ifelse2.scala +++ b/src/test/scala/scala/async/run/ifelse2/ifelse2.scala @@ -39,7 +39,7 @@ class TestIfElse2Class { } @RunWith(classOf[JUnit4]) -class IfElse2Spec extends MinimalScalaTest { +class IfElse2Spec { @Test def `variables of the same name in different blocks`() { diff --git a/src/test/scala/scala/async/run/ifelse3/IfElse3.scala b/src/test/scala/scala/async/run/ifelse3/IfElse3.scala index 4b66f4d..0c0dbfe 100644 --- a/src/test/scala/scala/async/run/ifelse3/IfElse3.scala +++ b/src/test/scala/scala/async/run/ifelse3/IfElse3.scala @@ -42,7 +42,7 @@ class TestIfElse3Class { @RunWith(classOf[JUnit4]) -class IfElse3Spec extends MinimalScalaTest { +class IfElse3Spec { @Test def `variables of the same name in different blocks`() { |