aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2012-11-09 15:40:23 +0100
committerJason Zaugg <jzaugg@gmail.com>2012-11-09 15:48:51 +0100
commitcce4c3778b3f33885d340d53d1986289788b79b2 (patch)
treeb004266beba8d95112d6c403613cbf15377382ff
parent370be9ea41c582f033a2eeef05157e77a5077144 (diff)
downloadscala-async-cce4c3778b3f33885d340d53d1986289788b79b2.tar.gz
scala-async-cce4c3778b3f33885d340d53d1986289788b79b2.tar.bz2
scala-async-cce4c3778b3f33885d340d53d1986289788b79b2.zip
Remove sleeps from the tests.
-rw-r--r--pending/run/fallback0/fallback0-manual.scala1
-rw-r--r--pending/run/fallback0/fallback0.scala1
-rw-r--r--src/test/scala/scala/async/run/await0/Await0Spec.scala5
-rw-r--r--src/test/scala/scala/async/run/block0/AsyncSpec.scala1
-rw-r--r--src/test/scala/scala/async/run/block1/block1.scala1
-rw-r--r--src/test/scala/scala/async/run/ifelse0/IfElse0.scala1
-rw-r--r--src/test/scala/scala/async/run/ifelse1/IfElse1.scala1
-rw-r--r--src/test/scala/scala/async/run/ifelse2/ifelse2.scala1
-rw-r--r--src/test/scala/scala/async/run/ifelse3/IfElse3.scala1
-rw-r--r--src/test/scala/scala/async/run/match0/Match0.scala1
10 files changed, 0 insertions, 14 deletions
diff --git a/pending/run/fallback0/fallback0-manual.scala b/pending/run/fallback0/fallback0-manual.scala
index 611d09d..9bc570d 100644
--- a/pending/run/fallback0/fallback0-manual.scala
+++ b/pending/run/fallback0/fallback0-manual.scala
@@ -19,7 +19,6 @@ class TestFallback0ManualClass {
import ExecutionContext.Implicits.global
def m1(x: Int): Future[Int] = future {
- Thread.sleep(1000)
x + 2
}
diff --git a/pending/run/fallback0/fallback0.scala b/pending/run/fallback0/fallback0.scala
index 75b0739..fdb5568 100644
--- a/pending/run/fallback0/fallback0.scala
+++ b/pending/run/fallback0/fallback0.scala
@@ -17,7 +17,6 @@ class TestFallback0Class {
import ExecutionContext.Implicits.global
def m1(x: Int): Future[Int] = future {
- Thread.sleep(1000)
x + 2
}
diff --git a/src/test/scala/scala/async/run/await0/Await0Spec.scala b/src/test/scala/scala/async/run/await0/Await0Spec.scala
index e7740e0..50c8fa2 100644
--- a/src/test/scala/scala/async/run/await0/Await0Spec.scala
+++ b/src/test/scala/scala/async/run/await0/Await0Spec.scala
@@ -20,27 +20,22 @@ 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
}
diff --git a/src/test/scala/scala/async/run/block0/AsyncSpec.scala b/src/test/scala/scala/async/run/block0/AsyncSpec.scala
index f56e394..5a7247c 100644
--- a/src/test/scala/scala/async/run/block0/AsyncSpec.scala
+++ b/src/test/scala/scala/async/run/block0/AsyncSpec.scala
@@ -20,7 +20,6 @@ class Test1Class {
import ExecutionContext.Implicits.global
def m1(x: Int): Future[Int] = future {
- Thread.sleep(1000)
x + 2
}
diff --git a/src/test/scala/scala/async/run/block1/block1.scala b/src/test/scala/scala/async/run/block1/block1.scala
index 8f21688..a449805 100644
--- a/src/test/scala/scala/async/run/block1/block1.scala
+++ b/src/test/scala/scala/async/run/block1/block1.scala
@@ -20,7 +20,6 @@ class Test1Class {
import ExecutionContext.Implicits.global
def m1(x: Int): Future[Int] = future {
- Thread.sleep(1000)
x + 2
}
diff --git a/src/test/scala/scala/async/run/ifelse0/IfElse0.scala b/src/test/scala/scala/async/run/ifelse0/IfElse0.scala
index eca3acd..0363a75 100644
--- a/src/test/scala/scala/async/run/ifelse0/IfElse0.scala
+++ b/src/test/scala/scala/async/run/ifelse0/IfElse0.scala
@@ -20,7 +20,6 @@ class TestIfElseClass {
import ExecutionContext.Implicits.global
def m1(x: Int): Future[Int] = future {
- Thread.sleep(1000)
x + 2
}
diff --git a/src/test/scala/scala/async/run/ifelse1/IfElse1.scala b/src/test/scala/scala/async/run/ifelse1/IfElse1.scala
index 128f02a..3ca3a94 100644
--- a/src/test/scala/scala/async/run/ifelse1/IfElse1.scala
+++ b/src/test/scala/scala/async/run/ifelse1/IfElse1.scala
@@ -20,7 +20,6 @@ class TestIfElse1Class {
import ExecutionContext.Implicits.global
def base(x: Int): Future[Int] = future {
- Thread.sleep(1000)
x + 2
}
diff --git a/src/test/scala/scala/async/run/ifelse2/ifelse2.scala b/src/test/scala/scala/async/run/ifelse2/ifelse2.scala
index f894923..84974b6 100644
--- a/src/test/scala/scala/async/run/ifelse2/ifelse2.scala
+++ b/src/test/scala/scala/async/run/ifelse2/ifelse2.scala
@@ -20,7 +20,6 @@ class TestIfElse2Class {
import ExecutionContext.Implicits.global
def base(x: Int): Future[Int] = future {
- Thread.sleep(1000)
x + 2
}
diff --git a/src/test/scala/scala/async/run/ifelse3/IfElse3.scala b/src/test/scala/scala/async/run/ifelse3/IfElse3.scala
index 0c0dbfe..d475a0c 100644
--- a/src/test/scala/scala/async/run/ifelse3/IfElse3.scala
+++ b/src/test/scala/scala/async/run/ifelse3/IfElse3.scala
@@ -20,7 +20,6 @@ class TestIfElse3Class {
import ExecutionContext.Implicits.global
def base(x: Int): Future[Int] = future {
- Thread.sleep(1000)
x + 2
}
diff --git a/src/test/scala/scala/async/run/match0/Match0.scala b/src/test/scala/scala/async/run/match0/Match0.scala
index 3c7e297..6a17e2b 100644
--- a/src/test/scala/scala/async/run/match0/Match0.scala
+++ b/src/test/scala/scala/async/run/match0/Match0.scala
@@ -20,7 +20,6 @@ class TestMatchClass {
import ExecutionContext.Implicits.global
def m1(x: Int): Future[Int] = future {
- Thread.sleep(1000)
x + 2
}