Merge pull request #41 from phaller/ticket/35-synth-object-2

Ticket/35 synth object 2

2 files changed, 6 insertions, 17 deletions

diff --git a/src/test/scala/scala/async/neg/LocalClasses0Spec.scala b/src/test/scala/scala/async/neg/LocalClasses0Spec.scala
index 06a0e71..2569303 100644
--- a/src/test/scala/scala/async/neg/LocalClasses0Spec.scala
+++ b/src/test/scala/scala/async/neg/LocalClasses0Spec.scala
@@ -18,7 +18,7 @@ class LocalClasses0Spec {
 
   @Test
   def `reject a local class`() {
-    expectError("Local class Person illegal within `async` block", "-cp target/scala-2.10/classes -deprecation -Xfatal-warnings") {
+    expectError("Local case class Person illegal within `async` block") {
       """
         | import scala.concurrent.ExecutionContext.Implicits.global
         | import scala.async.Async._
@@ -32,7 +32,7 @@ class LocalClasses0Spec {
 
   @Test
   def `reject a local class 2`() {
-    expectError("Local class Person illegal within `async` block", "-cp target/scala-2.10/classes -deprecation -Xfatal-warnings") {
+    expectError("Local case class Person illegal within `async` block") {
       """
         | import scala.concurrent.{Future, ExecutionContext}
         | import ExecutionContext.Implicits.global
@@ -50,7 +50,7 @@ class LocalClasses0Spec {
 
   @Test
   def `reject a local class 3`() {
-    expectError("Local class Person illegal within `async` block", "-cp target/scala-2.10/classes -deprecation -Xfatal-warnings") {
+    expectError("Local case class Person illegal within `async` block") {
       """
         | import scala.concurrent.{Future, ExecutionContext}
         | import ExecutionContext.Implicits.global
@@ -68,7 +68,7 @@ class LocalClasses0Spec {
 
   @Test
   def `reject a local class with symbols in its name`() {
-    expectError("Local class :: illegal within `async` block", "-cp target/scala-2.10/classes -deprecation -Xfatal-warnings") {
+    expectError("Local case class :: illegal within `async` block") {
       """
         | import scala.concurrent.{Future, ExecutionContext}
         | import ExecutionContext.Implicits.global
@@ -86,7 +86,7 @@ class LocalClasses0Spec {
 
   @Test
   def `reject a nested local class`() {
-    expectError("Local class Person illegal within `async` block", "-cp target/scala-2.10/classes -deprecation -Xfatal-warnings") {
+    expectError("Local case class Person illegal within `async` block") {
       """
         | import scala.concurrent.{Future, ExecutionContext}
         | import ExecutionContext.Implicits.global
@@ -110,7 +110,7 @@ class LocalClasses0Spec {
 
   @Test
   def `reject a local singleton object`() {
-    expectError("Local object Person illegal within `async` block", "-cp target/scala-2.10/classes -deprecation -Xfatal-warnings") {
+    expectError("Local object Person illegal within `async` block") {
       """
         | import scala.concurrent.ExecutionContext.Implicits.global
         | import scala.async.Async._
diff --git a/src/test/scala/scala/async/neg/NakedAwait.scala b/src/test/scala/scala/async/neg/NakedAwait.scala
index f4cfca2..ecc84f9 100644
--- a/src/test/scala/scala/async/neg/NakedAwait.scala
+++ b/src/test/scala/scala/async/neg/NakedAwait.scala
@@ -143,15 +143,4 @@ class NakedAwait {
         |""".stripMargin
     }
   }
-
-  // TODO Anf transform if to have a simple condition.
-  @Test
-  def ifCondition() {
-    expectError("await must not be used under a condition.") {
-      """
-        | import _root_.scala.async.AsyncId._
-        | async { if (await(true)) () }
-        |""".stripMargin
-    }
-  }
 }