aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2013-08-15 18:22:34 +0200
committerJason Zaugg <jzaugg@gmail.com>2013-08-15 18:22:34 +0200
commit4ddf4fad87de6470fd4c04c25384817e97ffe135 (patch)
tree5c55d5b7610930f96e4485e30d72311f3dfb2044
parentb79c9ad864a27aea620254c3eade6d38adcf38f2 (diff)
downloadscala-async-4ddf4fad87de6470fd4c04c25384817e97ffe135.tar.gz
scala-async-4ddf4fad87de6470fd4c04c25384817e97ffe135.tar.bz2
scala-async-4ddf4fad87de6470fd4c04c25384817e97ffe135.zip
Remove @RunWith annotations from test cases.
These are are at odds with the junit-interface SBT test framework under SBT 0.13.+, and appear to be superfluous.
-rw-r--r--src/test/scala/scala/async/TreeInterrogation.scala3
-rw-r--r--src/test/scala/scala/async/neg/LocalClasses0Spec.scala3
-rw-r--r--src/test/scala/scala/async/neg/NakedAwait.scala3
-rw-r--r--src/test/scala/scala/async/neg/SampleNegSpec.scala3
-rw-r--r--src/test/scala/scala/async/run/anf/AnfTransformSpec.scala3
-rw-r--r--src/test/scala/scala/async/run/await0/Await0Spec.scala3
-rw-r--r--src/test/scala/scala/async/run/block0/AsyncSpec.scala3
-rw-r--r--src/test/scala/scala/async/run/block1/block1.scala3
-rw-r--r--src/test/scala/scala/async/run/cps/CPSSpec.scala3
-rw-r--r--src/test/scala/scala/async/run/exceptions/ExceptionsSpec.scala3
-rw-r--r--src/test/scala/scala/async/run/futures/FutureSpec.scala3
-rw-r--r--src/test/scala/scala/async/run/hygiene/Hygiene.scala3
-rw-r--r--src/test/scala/scala/async/run/ifelse0/IfElse0.scala3
-rw-r--r--src/test/scala/scala/async/run/ifelse0/WhileSpec.scala3
-rw-r--r--src/test/scala/scala/async/run/ifelse1/IfElse1.scala3
-rw-r--r--src/test/scala/scala/async/run/ifelse2/ifelse2.scala3
-rw-r--r--src/test/scala/scala/async/run/ifelse3/IfElse3.scala3
-rw-r--r--src/test/scala/scala/async/run/match0/Match0.scala3
-rw-r--r--src/test/scala/scala/async/run/nesteddef/NestedDef.scala3
-rw-r--r--src/test/scala/scala/async/run/noawait/NoAwaitSpec.scala3
-rw-r--r--src/test/scala/scala/async/run/toughtype/ToughType.scala3
21 files changed, 0 insertions, 63 deletions
diff --git a/src/test/scala/scala/async/TreeInterrogation.scala b/src/test/scala/scala/async/TreeInterrogation.scala
index 770c0f9..b62f723 100644
--- a/src/test/scala/scala/async/TreeInterrogation.scala
+++ b/src/test/scala/scala/async/TreeInterrogation.scala
@@ -4,14 +4,11 @@
package scala.async
-import org.junit.runner.RunWith
-import org.junit.runners.JUnit4
import org.junit.Test
import scala.async.internal.AsyncId
import AsyncId._
import tools.reflect.ToolBox
-@RunWith(classOf[JUnit4])
class TreeInterrogation {
@Test
def `a minimal set of vals are lifted to vars`() {
diff --git a/src/test/scala/scala/async/neg/LocalClasses0Spec.scala b/src/test/scala/scala/async/neg/LocalClasses0Spec.scala
index 6ebc9ca..ae346a2 100644
--- a/src/test/scala/scala/async/neg/LocalClasses0Spec.scala
+++ b/src/test/scala/scala/async/neg/LocalClasses0Spec.scala
@@ -5,12 +5,9 @@
package scala.async
package neg
-import org.junit.runner.RunWith
-import org.junit.runners.JUnit4
import org.junit.Test
import scala.async.internal.AsyncId
-@RunWith(classOf[JUnit4])
class LocalClasses0Spec {
@Test
def localClassCrashIssue16() {
diff --git a/src/test/scala/scala/async/neg/NakedAwait.scala b/src/test/scala/scala/async/neg/NakedAwait.scala
index ba388c5..deac069 100644
--- a/src/test/scala/scala/async/neg/NakedAwait.scala
+++ b/src/test/scala/scala/async/neg/NakedAwait.scala
@@ -5,11 +5,8 @@
package scala.async
package neg
-import org.junit.runner.RunWith
-import org.junit.runners.JUnit4
import org.junit.Test
-@RunWith(classOf[JUnit4])
class NakedAwait {
@Test
def `await only allowed in async neg`() {
diff --git a/src/test/scala/scala/async/neg/SampleNegSpec.scala b/src/test/scala/scala/async/neg/SampleNegSpec.scala
index 76f9c3e..e57dae9 100644
--- a/src/test/scala/scala/async/neg/SampleNegSpec.scala
+++ b/src/test/scala/scala/async/neg/SampleNegSpec.scala
@@ -5,11 +5,8 @@
package scala.async
package neg
-import org.junit.runner.RunWith
-import org.junit.runners.JUnit4
import org.junit.Test
-@RunWith(classOf[JUnit4])
class SampleNegSpec {
@Test
def `missing symbol`() {
diff --git a/src/test/scala/scala/async/run/anf/AnfTransformSpec.scala b/src/test/scala/scala/async/run/anf/AnfTransformSpec.scala
index c8cec28..728f33b 100644
--- a/src/test/scala/scala/async/run/anf/AnfTransformSpec.scala
+++ b/src/test/scala/scala/async/run/anf/AnfTransformSpec.scala
@@ -11,8 +11,6 @@ import scala.concurrent.{Future, ExecutionContext, future, Await}
import scala.concurrent.duration._
import scala.async.Async.{async, await}
import org.junit.Test
-import org.junit.runner.RunWith
-import org.junit.runners.JUnit4
import scala.async.internal.AsyncId
@@ -70,7 +68,6 @@ object State {
@volatile var result: Int = 0
}
-@RunWith(classOf[JUnit4])
class AnfTransformSpec {
@Test
diff --git a/src/test/scala/scala/async/run/await0/Await0Spec.scala b/src/test/scala/scala/async/run/await0/Await0Spec.scala
index 111602a..2adaa09 100644
--- a/src/test/scala/scala/async/run/await0/Await0Spec.scala
+++ b/src/test/scala/scala/async/run/await0/Await0Spec.scala
@@ -15,8 +15,6 @@ 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 {
@@ -63,7 +61,6 @@ class Await0Class {
}
}
-@RunWith(classOf[JUnit4])
class Await0Spec {
@Test
diff --git a/src/test/scala/scala/async/run/block0/AsyncSpec.scala b/src/test/scala/scala/async/run/block0/AsyncSpec.scala
index 5f38086..677cce8 100644
--- a/src/test/scala/scala/async/run/block0/AsyncSpec.scala
+++ b/src/test/scala/scala/async/run/block0/AsyncSpec.scala
@@ -11,8 +11,6 @@ import scala.concurrent.{Future, ExecutionContext, future, Await}
import scala.concurrent.duration._
import scala.async.Async.{async, await}
import org.junit.Test
-import org.junit.runner.RunWith
-import org.junit.runners.JUnit4
class Test1Class {
@@ -39,7 +37,6 @@ class Test1Class {
}
-@RunWith(classOf[JUnit4])
class AsyncSpec {
@Test
diff --git a/src/test/scala/scala/async/run/block1/block1.scala b/src/test/scala/scala/async/run/block1/block1.scala
index bf9b56f..f42b073 100644
--- a/src/test/scala/scala/async/run/block1/block1.scala
+++ b/src/test/scala/scala/async/run/block1/block1.scala
@@ -11,8 +11,6 @@ import scala.concurrent.{Future, ExecutionContext, future, Await}
import scala.concurrent.duration._
import scala.async.Async.{async, await}
import org.junit.Test
-import org.junit.runner.RunWith
-import org.junit.runners.JUnit4
class Test1Class {
@@ -32,7 +30,6 @@ class Test1Class {
}
}
-@RunWith(classOf[JUnit4])
class Block1Spec {
@Test def `support a simple await`() {
diff --git a/src/test/scala/scala/async/run/cps/CPSSpec.scala b/src/test/scala/scala/async/run/cps/CPSSpec.scala
index b56c6ad..9476b22 100644
--- a/src/test/scala/scala/async/run/cps/CPSSpec.scala
+++ b/src/test/scala/scala/async/run/cps/CPSSpec.scala
@@ -11,11 +11,8 @@ import scala.concurrent.duration._
import scala.async.continuations.CPSBasedAsync._
import scala.util.continuations._
-import org.junit.runner.RunWith
-import org.junit.runners.JUnit4
import org.junit.Test
-@RunWith(classOf[JUnit4])
class CPSSpec {
import ExecutionContext.Implicits.global
diff --git a/src/test/scala/scala/async/run/exceptions/ExceptionsSpec.scala b/src/test/scala/scala/async/run/exceptions/ExceptionsSpec.scala
index 733ea01..b417dd6 100644
--- a/src/test/scala/scala/async/run/exceptions/ExceptionsSpec.scala
+++ b/src/test/scala/scala/async/run/exceptions/ExceptionsSpec.scala
@@ -14,10 +14,7 @@ import scala.concurrent.duration._
import scala.reflect.ClassTag
import org.junit.Test
-import org.junit.runner.RunWith
-import org.junit.runners.JUnit4
-@RunWith(classOf[JUnit4])
class ExceptionsSpec {
@Test
diff --git a/src/test/scala/scala/async/run/futures/FutureSpec.scala b/src/test/scala/scala/async/run/futures/FutureSpec.scala
index 01c8620..491b43f 100644
--- a/src/test/scala/scala/async/run/futures/FutureSpec.scala
+++ b/src/test/scala/scala/async/run/futures/FutureSpec.scala
@@ -18,10 +18,7 @@ import scala.util.{Try,Success,Failure}
import scala.async.Async.{async, await}
import org.junit.Test
-import org.junit.runner.RunWith
-import org.junit.runners.JUnit4
-@RunWith(classOf[JUnit4])
class FutureSpec {
/* some utils */
diff --git a/src/test/scala/scala/async/run/hygiene/Hygiene.scala b/src/test/scala/scala/async/run/hygiene/Hygiene.scala
index 8081ee7..f11d21e 100644
--- a/src/test/scala/scala/async/run/hygiene/Hygiene.scala
+++ b/src/test/scala/scala/async/run/hygiene/Hygiene.scala
@@ -7,11 +7,8 @@ package run
package hygiene
import org.junit.Test
-import org.junit.runner.RunWith
-import org.junit.runners.JUnit4
import scala.async.internal.AsyncId
-@RunWith(classOf[JUnit4])
class HygieneSpec {
import AsyncId.{async, await}
diff --git a/src/test/scala/scala/async/run/ifelse0/IfElse0.scala b/src/test/scala/scala/async/run/ifelse0/IfElse0.scala
index fc438a1..4a86d82 100644
--- a/src/test/scala/scala/async/run/ifelse0/IfElse0.scala
+++ b/src/test/scala/scala/async/run/ifelse0/IfElse0.scala
@@ -10,8 +10,6 @@ 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
import scala.async.internal.AsyncId
@@ -39,7 +37,6 @@ class TestIfElseClass {
}
-@RunWith(classOf[JUnit4])
class IfElseSpec {
@Test def `support await in a simple if-else expression`() {
diff --git a/src/test/scala/scala/async/run/ifelse0/WhileSpec.scala b/src/test/scala/scala/async/run/ifelse0/WhileSpec.scala
index b8d88fb..666c373 100644
--- a/src/test/scala/scala/async/run/ifelse0/WhileSpec.scala
+++ b/src/test/scala/scala/async/run/ifelse0/WhileSpec.scala
@@ -6,12 +6,9 @@ package scala.async
package run
package ifelse0
-import org.junit.runner.RunWith
-import org.junit.runners.JUnit4
import org.junit.Test
import scala.async.internal.AsyncId
-@RunWith(classOf[JUnit4])
class WhileSpec {
@Test
diff --git a/src/test/scala/scala/async/run/ifelse1/IfElse1.scala b/src/test/scala/scala/async/run/ifelse1/IfElse1.scala
index b567ee6..41b81a4 100644
--- a/src/test/scala/scala/async/run/ifelse1/IfElse1.scala
+++ b/src/test/scala/scala/async/run/ifelse1/IfElse1.scala
@@ -10,8 +10,6 @@ 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
@@ -91,7 +89,6 @@ class TestIfElse1Class {
}
}
-@RunWith(classOf[JUnit4])
class IfElse1Spec {
@Test
diff --git a/src/test/scala/scala/async/run/ifelse2/ifelse2.scala b/src/test/scala/scala/async/run/ifelse2/ifelse2.scala
index 92a76e4..3fc4d3b 100644
--- a/src/test/scala/scala/async/run/ifelse2/ifelse2.scala
+++ b/src/test/scala/scala/async/run/ifelse2/ifelse2.scala
@@ -10,8 +10,6 @@ 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
@@ -37,7 +35,6 @@ class TestIfElse2Class {
}
}
-@RunWith(classOf[JUnit4])
class IfElse2Spec {
@Test
diff --git a/src/test/scala/scala/async/run/ifelse3/IfElse3.scala b/src/test/scala/scala/async/run/ifelse3/IfElse3.scala
index 8a2ab13..8e6e1bb 100644
--- a/src/test/scala/scala/async/run/ifelse3/IfElse3.scala
+++ b/src/test/scala/scala/async/run/ifelse3/IfElse3.scala
@@ -10,8 +10,6 @@ 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
@@ -40,7 +38,6 @@ class TestIfElse3Class {
}
-@RunWith(classOf[JUnit4])
class IfElse3Spec {
@Test
diff --git a/src/test/scala/scala/async/run/match0/Match0.scala b/src/test/scala/scala/async/run/match0/Match0.scala
index 7c392ab..418275e 100644
--- a/src/test/scala/scala/async/run/match0/Match0.scala
+++ b/src/test/scala/scala/async/run/match0/Match0.scala
@@ -10,8 +10,6 @@ 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
import scala.async.internal.AsyncId
@@ -54,7 +52,6 @@ class TestMatchClass {
}
-@RunWith(classOf[JUnit4])
class MatchSpec {
@Test def `support await in a simple match expression`() {
diff --git a/src/test/scala/scala/async/run/nesteddef/NestedDef.scala b/src/test/scala/scala/async/run/nesteddef/NestedDef.scala
index 409f70a..69e741d 100644
--- a/src/test/scala/scala/async/run/nesteddef/NestedDef.scala
+++ b/src/test/scala/scala/async/run/nesteddef/NestedDef.scala
@@ -2,12 +2,9 @@ package scala.async
package run
package nesteddef
-import org.junit.runner.RunWith
-import org.junit.runners.JUnit4
import org.junit.Test
import scala.async.internal.AsyncId
-@RunWith(classOf[JUnit4])
class NestedDef {
@Test
diff --git a/src/test/scala/scala/async/run/noawait/NoAwaitSpec.scala b/src/test/scala/scala/async/run/noawait/NoAwaitSpec.scala
index ba9c9be..0adb506 100644
--- a/src/test/scala/scala/async/run/noawait/NoAwaitSpec.scala
+++ b/src/test/scala/scala/async/run/noawait/NoAwaitSpec.scala
@@ -9,10 +9,7 @@ package noawait
import scala.async.internal.AsyncId
import AsyncId._
import org.junit.Test
-import org.junit.runner.RunWith
-import org.junit.runners.JUnit4
-@RunWith(classOf[JUnit4])
class NoAwaitSpec {
@Test
def `async block without await`() {
diff --git a/src/test/scala/scala/async/run/toughtype/ToughType.scala b/src/test/scala/scala/async/run/toughtype/ToughType.scala
index ec2278f..202a288 100644
--- a/src/test/scala/scala/async/run/toughtype/ToughType.scala
+++ b/src/test/scala/scala/async/run/toughtype/ToughType.scala
@@ -11,8 +11,6 @@ import scala.concurrent._
import scala.concurrent.duration._
import scala.async.Async._
import org.junit.Test
-import org.junit.runner.RunWith
-import org.junit.runners.JUnit4
import scala.async.internal.AsyncId
@@ -29,7 +27,6 @@ object ToughTypeObject {
}
}
-@RunWith(classOf[JUnit4])
class ToughTypeSpec {
@Test def `propogates tough types`() {