aboutsummaryrefslogtreecommitdiff
path: root/src/test/scala/scala/async/run
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2012-11-05 17:09:04 +0100
committerJason Zaugg <jzaugg@gmail.com>2012-11-05 17:09:04 +0100
commit62674b852dc0fef4cf4b3625939567ee82d6d096 (patch)
tree6a6b34ac8e1a4bedfd62824b5c901c8bca8e356c /src/test/scala/scala/async/run
parent652028b9dc2000b45302757dc9fd0df26ff66805 (diff)
downloadscala-async-62674b852dc0fef4cf4b3625939567ee82d6d096.tar.gz
scala-async-62674b852dc0fef4cf4b3625939567ee82d6d096.tar.bz2
scala-async-62674b852dc0fef4cf4b3625939567ee82d6d096.zip
Move test utils into a package object, rather than base class.
Diffstat (limited to 'src/test/scala/scala/async/run')
-rw-r--r--src/test/scala/scala/async/run/await0/await0.scala2
-rw-r--r--src/test/scala/scala/async/run/block0/AsyncSpec.scala2
-rw-r--r--src/test/scala/scala/async/run/block1/block1.scala2
-rw-r--r--src/test/scala/scala/async/run/ifelse0/IfElse0.scala2
-rw-r--r--src/test/scala/scala/async/run/ifelse1/IfElse1.scala2
-rw-r--r--src/test/scala/scala/async/run/ifelse2/ifelse2.scala2
-rw-r--r--src/test/scala/scala/async/run/ifelse3/IfElse3.scala2
7 files changed, 7 insertions, 7 deletions
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`() {