1 files changed, 17 insertions, 106 deletions
diff --git a/src/test/scala/scala/async/neg/LocalClasses0Spec.scala b/src/test/scala/scala/async/neg/LocalClasses0Spec.scala
index 2569303..dcd9bb8 100644
--- a/src/test/scala/scala/async/neg/LocalClasses0Spec.scala
+++ b/src/test/scala/scala/async/neg/LocalClasses0Spec.scala
@@ -5,121 +5,32 @@
 package scala.async
 package neg
 
-/**
- * Copyright (C) 2012 Typesafe Inc. <http://www.typesafe.com>
- */
-
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
 import org.junit.Test
 
 @RunWith(classOf[JUnit4])
 class LocalClasses0Spec {
-
   @Test
-  def `reject a local class`() {
-    expectError("Local case class Person illegal within `async` block") {
-      """
-        | import scala.concurrent.ExecutionContext.Implicits.global
-        | import scala.async.Async._
-        | 
-        | async {
-        |   case class Person(name: String)
-        | }
-      """.stripMargin
-    }
+  def localClassCrashIssue16() {
+    import scala.async.AsyncId.{async, await}
+    async {
+      class B { def f = 1 }
+      await(new B()).f
+    } mustBe 1
   }
 
   @Test
-  def `reject a local class 2`() {
-    expectError("Local case class Person illegal within `async` block") {
-      """
-        | import scala.concurrent.{Future, ExecutionContext}
-        | import ExecutionContext.Implicits.global
-        | import scala.async.Async._
-        | 
-        | async {
-        |   case class Person(name: String)
-        |   val fut = Future { 5 }
-        |   val x = await(fut)
-        |   x
-        | }
-      """.stripMargin
-    }
+  def nestedCaseClassAndModuleAllowed() {
+    import AsyncId.{await, async}
+    async {
+      trait Base { def base = 0}
+      await(0)
+      case class Person(name: String) extends Base
+      val fut = async { "bob" }
+      val x = Person(await(fut))
+      x.base
+      x.name
+    } mustBe "bob"
   }
-
-  @Test
-  def `reject a local class 3`() {
-    expectError("Local case class Person illegal within `async` block") {
-      """
-        | import scala.concurrent.{Future, ExecutionContext}
-        | import ExecutionContext.Implicits.global
-        | import scala.async.Async._
-        | 
-        | async {
-        |   val fut = Future { 5 }
-        |   val x = await(fut)
-        |   case class Person(name: String)
-        |   x
-        | }
-      """.stripMargin
-    }
-  }
-
-  @Test
-  def `reject a local class with symbols in its name`() {
-    expectError("Local case class :: illegal within `async` block") {
-      """
-        | import scala.concurrent.{Future, ExecutionContext}
-        | import ExecutionContext.Implicits.global
-        | import scala.async.Async._
-        | 
-        | async {
-        |   val fut = Future { 5 }
-        |   val x = await(fut)
-        |   case class ::(name: String)
-        |   x
-        | }
-      """.stripMargin
-    }
-  }
-
-  @Test
-  def `reject a nested local class`() {
-    expectError("Local case class Person illegal within `async` block") {
-      """
-        | import scala.concurrent.{Future, ExecutionContext}
-        | import ExecutionContext.Implicits.global
-        | import scala.async.Async._
-        | 
-        | async {
-        |   val fut = Future { 5 }
-        |   val x = 2 + 2
-        |   var y = 0
-        |   if (x > 0) {
-        |     case class Person(name: String)
-        |     y = await(fut)
-        |   } else {
-        |     y = x
-        |   }
-        |   y
-        | }
-      """.stripMargin
-    }
-  }
-
-  @Test
-  def `reject a local singleton object`() {
-    expectError("Local object Person illegal within `async` block") {
-      """
-        | import scala.concurrent.ExecutionContext.Implicits.global
-        | import scala.async.Async._
-        | 
-        | async {
-        |   object Person { val name = "Joe" }
-        | }
-      """.stripMargin
-    }
-  }
-
 }