refactors macro tests

putting in a nutshell, this patch:
  * condenses some macro-XXX-a/b/c/... bundles
  * renames some tests to prepare for other macro flavors
  * introduces some additional tests

2 files changed, 95 insertions, 0 deletions

diff --git a/test/files/neg/macro-invalidimpl/Impls_1.scala b/test/files/neg/macro-invalidimpl/Impls_1.scala
new file mode 100644
index 0000000000..cf78ecc65a
--- /dev/null
+++ b/test/files/neg/macro-invalidimpl/Impls_1.scala
@@ -0,0 +1,40 @@
+import scala.reflect.macros.Context
+
+class Impls1 {
+  def foo(c: Context)(x: c.Expr[Any]) = ???
+}
+
+object Impls2 {
+  def foo(c: Context)(x: c.Expr[Any]) = ???
+}
+
+trait MacroHelpers {
+  object Impls4 {
+    def foo(c: Context)(x: c.Expr[Any]) = x
+  }
+}
+
+object Impls5 {
+  def foo(c: Context)(x: c.Expr[Any]) = ???
+  def foo(c: Context)(x: c.Expr[Any], y: c.Expr[Any]) = ???
+}
+
+object Impls6 {
+  def fooNullary(c: Context) = {
+    import c.universe._
+    val body = Apply(Select(Ident(definitions.PredefModule), TermName("println")), List(Literal(Constant("it works"))))
+    c.Expr[Unit](body)
+  }
+
+  def fooEmpty(c: Context)() = fooNullary(c)
+}
+
+object Impls7 {
+  def foo[U <: Int](c: Context) = ???
+}
+
+package foo {
+  object Impls8 {
+    private[foo] def impl(c: Context) = ???
+  }
+}
\ No newline at end of file
diff --git a/test/files/neg/macro-invalidimpl/Macros_Test_2.scala b/test/files/neg/macro-invalidimpl/Macros_Test_2.scala
new file mode 100644
index 0000000000..8aae9553f5
--- /dev/null
+++ b/test/files/neg/macro-invalidimpl/Macros_Test_2.scala
@@ -0,0 +1,55 @@
+import scala.reflect.macros.Context
+
+object Macros1 {
+  val impls = new Impls1
+  def foo(x: Any) = macro impls.foo
+}
+
+object Macros2 {
+  val impls = Impls2
+  def foo(x: Any) = macro impls.foo
+}
+
+class Macros3 {
+  object Impls3 {
+    def foo(c: Context)(x: c.Expr[Any]) = ???
+  }
+
+  def foo(x: Any) = macro Impls3.foo
+}
+
+class Macros4 extends MacroHelpers {
+  def foo(x: Any) = macro Impls4.foo
+}
+
+object Macros5 {
+  def foo(x: Any) = macro Impls5.foo
+  def foo(x: Any, y: Any) = macro Impls5.foo
+}
+
+object Macros6 {
+  def foo1 = macro Impls6.fooEmpty
+  def bar1() = macro Impls6.fooNullary
+}
+
+object Macros7 {
+  def foo = macro Impls7.foo[String]
+}
+
+object Test extends App {
+  println(Macros1.foo(42))
+  println(Macros2.foo(42))
+  println(new Macros3().foo(42))
+  println(new Macros4().foo(42))
+  println(Macros5.foo(42))
+  println(Macros6.foo1)
+  println(Macros6.bar1)
+  println(Macros6.bar1())
+  println(Macros7.foo)
+}
+
+package foo {
+  object Test extends App {
+    def foo = macro Impls8.impl
+  }
+}
\ No newline at end of file