From bc0c7d05c77937ac287c794557bba91e101f2320 Mon Sep 17 00:00:00 2001 From: Jason Zaugg Date: Mon, 5 Nov 2012 17:10:01 +0100 Subject: File naming consistency. --- .../scala/scala/async/run/await0/Await0Spec.scala | 78 ++++++++++++++++++++++ src/test/scala/scala/async/run/await0/await0.scala | 78 ---------------------- 2 files changed, 78 insertions(+), 78 deletions(-) create mode 100644 src/test/scala/scala/async/run/await0/Await0Spec.scala delete mode 100644 src/test/scala/scala/async/run/await0/await0.scala (limited to 'src') diff --git a/src/test/scala/scala/async/run/await0/Await0Spec.scala b/src/test/scala/scala/async/run/await0/Await0Spec.scala new file mode 100644 index 0000000..e7740e0 --- /dev/null +++ b/src/test/scala/scala/async/run/await0/Await0Spec.scala @@ -0,0 +1,78 @@ +package scala.async +package run +package await0 + +/** + * Copyright (C) 2012 Typesafe Inc. + */ + +import language.{reflectiveCalls, postfixOps} + +import scala.concurrent.{Future, ExecutionContext, future, Await} +import scala.concurrent.duration._ +import scala.async.Async.{async, await} +import org.junit.runner.RunWith +import org.junit.runners.JUnit4 +import org.junit.Test + +class Await0Class { + + import ExecutionContext.Implicits.global + + def m1(x: Double): Future[Double] = future { + Thread.sleep(200) + x + 2.0 + } + + def m2(x: Float): Future[Float] = future { + Thread.sleep(200) + x + 2.0f + } + + def m3(x: Char): Future[Char] = future { + Thread.sleep(200) + (x.toInt + 2).toChar + } + + def m4(x: Short): Future[Short] = future { + Thread.sleep(200) + (x + 2).toShort + } + + def m5(x: Byte): Future[Byte] = future { + Thread.sleep(200) + (x + 2).toByte + } + + def m0(y: Int): Future[Double] = async { + val f1 = m1(y.toDouble) + val x1: Double = await(f1) + + val f2 = m2(y.toFloat) + val x2: Float = await(f2) + + val f3 = m3(y.toChar) + val x3: Char = await(f3) + + val f4 = m4(y.toShort) + val x4: Short = await(f4) + + val f5 = m5(y.toByte) + val x5: Byte = await(f5) + + x1 + x2 + 2.0 + } +} + +@RunWith(classOf[JUnit4]) +class Await0Spec { + + @Test + def `An async method support a simple await`() { + val o = new Await0Class + val fut = o.m0(10) + val res = Await.result(fut, 10 seconds) + res mustBe (26.0) + } +} + diff --git a/src/test/scala/scala/async/run/await0/await0.scala b/src/test/scala/scala/async/run/await0/await0.scala deleted file mode 100644 index e7740e0..0000000 --- a/src/test/scala/scala/async/run/await0/await0.scala +++ /dev/null @@ -1,78 +0,0 @@ -package scala.async -package run -package await0 - -/** - * Copyright (C) 2012 Typesafe Inc. - */ - -import language.{reflectiveCalls, postfixOps} - -import scala.concurrent.{Future, ExecutionContext, future, Await} -import scala.concurrent.duration._ -import scala.async.Async.{async, await} -import org.junit.runner.RunWith -import org.junit.runners.JUnit4 -import org.junit.Test - -class Await0Class { - - import ExecutionContext.Implicits.global - - def m1(x: Double): Future[Double] = future { - Thread.sleep(200) - x + 2.0 - } - - def m2(x: Float): Future[Float] = future { - Thread.sleep(200) - x + 2.0f - } - - def m3(x: Char): Future[Char] = future { - Thread.sleep(200) - (x.toInt + 2).toChar - } - - def m4(x: Short): Future[Short] = future { - Thread.sleep(200) - (x + 2).toShort - } - - def m5(x: Byte): Future[Byte] = future { - Thread.sleep(200) - (x + 2).toByte - } - - def m0(y: Int): Future[Double] = async { - val f1 = m1(y.toDouble) - val x1: Double = await(f1) - - val f2 = m2(y.toFloat) - val x2: Float = await(f2) - - val f3 = m3(y.toChar) - val x3: Char = await(f3) - - val f4 = m4(y.toShort) - val x4: Short = await(f4) - - val f5 = m5(y.toByte) - val x5: Byte = await(f5) - - x1 + x2 + 2.0 - } -} - -@RunWith(classOf[JUnit4]) -class Await0Spec { - - @Test - def `An async method support a simple await`() { - val o = new Await0Class - val fut = o.m0(10) - val res = Await.result(fut, 10 seconds) - res mustBe (26.0) - } -} - -- cgit v1.2.3