From 3c59af848c37e1530876e95f7321c8757855d030 Mon Sep 17 00:00:00 2001 From: Jakob Odersky Date: Tue, 13 Nov 2018 21:08:51 -0800 Subject: Various enhancements - add select support for takes - add syntax sugar - add support for JS and Native --- shared/src/test/scala/escale/SelectTest.scala | 47 +++++++++++++++++++++++++++ shared/src/test/scala/escale/SimpleTest.scala | 47 +++++++++++++++++++++++++++ shared/src/test/scala/escale/SyntaxTest.scala | 44 +++++++++++++++++++++++++ 3 files changed, 138 insertions(+) create mode 100644 shared/src/test/scala/escale/SelectTest.scala create mode 100644 shared/src/test/scala/escale/SimpleTest.scala create mode 100644 shared/src/test/scala/escale/SyntaxTest.scala (limited to 'shared/src/test/scala') diff --git a/shared/src/test/scala/escale/SelectTest.scala b/shared/src/test/scala/escale/SelectTest.scala new file mode 100644 index 0000000..3d41723 --- /dev/null +++ b/shared/src/test/scala/escale/SelectTest.scala @@ -0,0 +1,47 @@ +package escale + +import utest._ +import scala.async.Async._ +import scala.concurrent.ExecutionContext.Implicits.global +import syntax._ + +object SelectTest extends TestSuite { + val tests = Tests { + "select" - { + val ints = Channel[Int](0) + val strings = Channel[String](0) + val stop = Channel[Unit](0) + val cleaned = Channel[Int](10) + + val p0 = async { + var done = false + do { + (await(Channel.select(ints, strings, stop)): @unchecked) match { + case (`ints`, value: Int) => + cleaned !< value + case (`strings`, value: String) => + cleaned !< value.toInt + case (`stop`, _) => + done = true + } + } while (!done) + "done" + } + + val p1 = async{ + ints !< 2 + } + val p2 = async{ + strings !< "2" + ints !< 1 + } + val p3 = async{ + await(p1) + await(p2) + stop !< () + } + p0 + } + } + +} diff --git a/shared/src/test/scala/escale/SimpleTest.scala b/shared/src/test/scala/escale/SimpleTest.scala new file mode 100644 index 0000000..6f52b06 --- /dev/null +++ b/shared/src/test/scala/escale/SimpleTest.scala @@ -0,0 +1,47 @@ +package escale + +import scala.async.Async.{async, await} +import utest._ +import scala.concurrent.ExecutionContext.Implicits.global + +object SimpleTest extends TestSuite { + val tests = Tests{ + "put and take" - { + val ch = Channel[Int](0) + val p1 = async{ + await(ch.put(1)) + await(ch.put(2)) + await(ch.put(3)) + await(ch.put(4)) + } + async{ + await(ch.take()) + await(ch.take()) + await(ch.take()) + await(ch.take()) + } + p1 + } + "put and take while"- { + val ch = Channel[Int](0) + ch.put(1) + + val p1 = async { + await(ch.put(2)) + await(ch.put(3)) + await(ch.put(4)) + await(ch.put(5)) + } + + val p2 = async { + var sum = 0 + var a = 0 + while ({ a = await(ch.take()); a } < 5) { + sum += a + } + assert(sum == 10) + } + p2 + } + } +} \ No newline at end of file diff --git a/shared/src/test/scala/escale/SyntaxTest.scala b/shared/src/test/scala/escale/SyntaxTest.scala new file mode 100644 index 0000000..fffcbe9 --- /dev/null +++ b/shared/src/test/scala/escale/SyntaxTest.scala @@ -0,0 +1,44 @@ +package escale + +import utest._ +import scala.concurrent.ExecutionContext.Implicits.global +import escale.syntax._ +import scala.concurrent.Future + +object SyntaxTest extends TestSuite { + val tests = Tests { + "!< and !<" - { + val ch1 = chan[Int]() + val ch2 = chan[Int](1) + go { + ch1 !< 1 + ch1 !< 2 + ch1 !< 3 + } + go { + var sum = 0 + sum += !<(ch1) + sum += !<(ch1) + sum += !<(ch1) + ch2 !< 4 + sum += !<(ch2) + assert(sum == 10) + } + } + "select syntax" - { + def run(): Future[String] = go { + val Ch1 = chan[Int]() + val Ch2 = chan[Int]() + + go {/*Thread.sleep(1);*/ Ch1 !< 1} + go {/*Thread.sleep(1);*/ Ch2 !< 1} + + select(Ch1, Ch2) match { + case (Ch1, _) => "ch1 was first" + case (Ch2, _) => "ch2 was first" + } + } + run() + } + } +} -- cgit v1.2.3