Spiced up the signature test infrastructure a b...

Spiced up the signature test infrastructure a bunch, wrote some more
tests, restored the tests in pending. No review.

6 files changed, 148 insertions, 15 deletions

diff --git a/test/files/run/bug4291.check b/test/files/run/bug4291.check
new file mode 100644
index 0000000000..30bacfac28
--- /dev/null
+++ b/test/files/run/bug4291.check
@@ -0,0 +1,87 @@
+scala.collection.immutable.List
+  (m) public java.lang.Object scala.collection.immutable.List.apply(java.lang.Object) (bridge)
+  (m) public A scala.collection.immutable.List.apply(int) (bridge)
+scala.Option
+  (m) public abstract A scala.Option.get()
+scala.Function1
+  (m) public abstract R scala.Function1.apply(T1)
+scala.collection.Traversable
+  (m) public abstract <B,That> That scala.collection.TraversableLike.map(scala.Function1<A, B>,scala.collection.generic.CanBuildFrom<Repr, B, That>)
+scala.collection.Iterable
+  (m) public abstract <B,That> That scala.collection.TraversableLike.map(scala.Function1<A, B>,scala.collection.generic.CanBuildFrom<Repr, B, That>)
+scala.collection.Seq
+  (m) public abstract <B,That> That scala.collection.TraversableLike.map(scala.Function1<A, B>,scala.collection.generic.CanBuildFrom<Repr, B, That>)
+scala.collection.immutable.Set
+  (m) public abstract <B,That> That scala.collection.TraversableLike.map(scala.Function1<A, B>,scala.collection.generic.CanBuildFrom<Repr, B, That>)
+  (m) public abstract <B,That> That scala.collection.SetLike.map(scala.Function1<A, B>,scala.collection.generic.CanBuildFrom<This, B, That>)
+scala.collection.immutable.Map
+  (m) public abstract <B,That> That scala.collection.TraversableLike.map(scala.Function1<A, B>,scala.collection.generic.CanBuildFrom<Repr, B, That>)
+scala.collection.immutable.Vector
+  (m) public <B,That> That scala.collection.immutable.Vector.map(scala.Function1<A, B>,scala.collection.generic.CanBuildFrom<scala.collection.immutable.Vector<A>, B, That>) (bridge)
+scala.collection.immutable.Range
+  (m) public <B,That> That scala.collection.immutable.Range.map(scala.Function1<java.lang.Object, B>,scala.collection.generic.CanBuildFrom<scala.collection.immutable.IndexedSeq<java.lang.Object>, B, That>) (bridge)
+scala.collection.Traversable
+  (m) public abstract <B,That> That scala.collection.TraversableLike.flatMap(scala.Function1<A, scala.collection.TraversableOnce<B>>,scala.collection.generic.CanBuildFrom<Repr, B, That>)
+scala.collection.Iterable
+  (m) public abstract <B,That> That scala.collection.TraversableLike.flatMap(scala.Function1<A, scala.collection.TraversableOnce<B>>,scala.collection.generic.CanBuildFrom<Repr, B, That>)
+scala.collection.Seq
+  (m) public abstract <B,That> That scala.collection.TraversableLike.flatMap(scala.Function1<A, scala.collection.TraversableOnce<B>>,scala.collection.generic.CanBuildFrom<Repr, B, That>)
+scala.collection.immutable.Set
+  (m) public abstract <B,That> That scala.collection.TraversableLike.flatMap(scala.Function1<A, scala.collection.TraversableOnce<B>>,scala.collection.generic.CanBuildFrom<Repr, B, That>)
+scala.collection.immutable.Map
+  (m) public abstract <B,That> That scala.collection.TraversableLike.flatMap(scala.Function1<A, scala.collection.TraversableOnce<B>>,scala.collection.generic.CanBuildFrom<Repr, B, That>)
+scala.collection.immutable.Vector
+  (m) public <B,That> That scala.collection.immutable.Vector.flatMap(scala.Function1<A, scala.collection.TraversableOnce<B>>,scala.collection.generic.CanBuildFrom<scala.collection.immutable.Vector<A>, B, That>) (bridge)
+scala.collection.immutable.Range
+  (m) public <B,That> That scala.collection.immutable.Range.flatMap(scala.Function1<java.lang.Object, scala.collection.TraversableOnce<B>>,scala.collection.generic.CanBuildFrom<scala.collection.immutable.IndexedSeq<java.lang.Object>, B, That>) (bridge)
+scala.collection.Traversable
+  (m) public abstract Repr scala.collection.TraversableLike.filter(scala.Function1<A, java.lang.Object>)
+scala.collection.Iterable
+  (m) public abstract Repr scala.collection.TraversableLike.filter(scala.Function1<A, java.lang.Object>)
+scala.collection.Seq
+  (m) public abstract Repr scala.collection.TraversableLike.filter(scala.Function1<A, java.lang.Object>)
+scala.collection.immutable.Set
+  (m) public abstract Repr scala.collection.TraversableLike.filter(scala.Function1<A, java.lang.Object>)
+scala.collection.immutable.Map
+  (m) public abstract Repr scala.collection.TraversableLike.filter(scala.Function1<A, java.lang.Object>)
+scala.collection.immutable.Vector
+  (m) public scala.collection.immutable.Vector<A> scala.collection.immutable.Vector.filter(scala.Function1<A, java.lang.Object>) (bridge)
+scala.collection.immutable.Range
+  (m) public scala.collection.immutable.IndexedSeq<java.lang.Object> scala.collection.immutable.Range.filter(scala.Function1<java.lang.Object, java.lang.Object>) (bridge)
+scala.collection.Traversable
+  (m) public abstract A scala.collection.TraversableLike.head()
+  (m) public abstract A scala.collection.generic.GenericTraversableTemplate.head()
+scala.collection.Iterable
+  (m) public abstract A scala.collection.TraversableLike.head()
+  (m) public abstract A scala.collection.generic.GenericTraversableTemplate.head()
+  (m) public abstract A scala.collection.IterableLike.head()
+scala.collection.Seq
+  (m) public abstract A scala.collection.TraversableLike.head()
+  (m) public abstract A scala.collection.generic.GenericTraversableTemplate.head()
+  (m) public abstract A scala.collection.IterableLike.head()
+scala.collection.immutable.Set
+  (m) public abstract A scala.collection.TraversableLike.head()
+  (m) public abstract A scala.collection.generic.GenericTraversableTemplate.head()
+  (m) public abstract A scala.collection.IterableLike.head()
+scala.collection.immutable.Map
+  (m) public abstract A scala.collection.TraversableLike.head()
+  (m) public abstract A scala.collection.generic.GenericTraversableTemplate.head()
+  (m) public abstract A scala.collection.IterableLike.head()
+scala.collection.immutable.Vector
+  (m) public A scala.collection.immutable.Vector.head()
+scala.collection.immutable.Range
+  (m) public java.lang.Object scala.collection.immutable.Range.head() (bridge)
+scala.collection.Traversable
+  (m) public abstract <K> scala.collection.immutable.Map<K, Repr> scala.collection.TraversableLike.groupBy(scala.Function1<A, K>)
+scala.collection.Iterable
+  (m) public abstract <K> scala.collection.immutable.Map<K, Repr> scala.collection.TraversableLike.groupBy(scala.Function1<A, K>)
+scala.collection.Seq
+  (m) public abstract <K> scala.collection.immutable.Map<K, Repr> scala.collection.TraversableLike.groupBy(scala.Function1<A, K>)
+scala.collection.immutable.Set
+  (m) public abstract <K> scala.collection.immutable.Map<K, Repr> scala.collection.TraversableLike.groupBy(scala.Function1<A, K>)
+scala.collection.immutable.Map
+  (m) public abstract <K> scala.collection.immutable.Map<K, Repr> scala.collection.TraversableLike.groupBy(scala.Function1<A, K>)
+scala.collection.immutable.Vector
+  (m) public <K> scala.collection.immutable.Map<K, scala.collection.immutable.Vector<A>> scala.collection.immutable.Vector.groupBy(scala.Function1<A, K>) (bridge)
+scala.collection.immutable.Range
+  (m) public <K> scala.collection.immutable.Map<K, scala.collection.immutable.IndexedSeq<java.lang.Object>> scala.collection.immutable.Range.groupBy(scala.Function1<java.lang.Object, K>) (bridge)
diff --git a/test/files/run/bug4291.scala b/test/files/run/bug4291.scala
new file mode 100644
index 0000000000..a6dd357296
--- /dev/null
+++ b/test/files/run/bug4291.scala
@@ -0,0 +1,17 @@
+import scala.tools.partest._
+
+object Test extends App with SigTest {
+  show[List[_]]("apply")
+  show[Option[_]]("get")
+  show[Function1[_, _]]("apply")
+
+  for (name <- List("map", "flatMap", "filter", "head", "groupBy")) {
+    show[Traversable[_]](name)
+    show[Iterable[_]](name)
+    show[Seq[_]](name)
+    show[Set[_]](name)
+    show[Map[_,_]](name)
+    show[Vector[_]](name)
+    show[Range](name)
+  }
+}
diff --git a/test/files/run/sigtp.check b/test/files/run/sigtp.check
new file mode 100644
index 0000000000..a4d0f55ece
--- /dev/null
+++ b/test/files/run/sigtp.check
@@ -0,0 +1,11 @@
+BugBase
+  (m) public abstract A BugBase.key()
+  (m) public abstract E BugBase.next()
+  (m) public abstract void BugBase.next_$eq(E)
+Bug
+  (m) public Bug<A, B> Bug.foo()
+  (m) public A Bug.key()
+  (m) public Bug<A, B> Bug.next() (bridge)
+  (m) public void Bug.next_$eq(Bug<A, B>) (bridge)
+  (f) private final A Bug.key
+  (f) private java.lang.Object Bug.next
diff --git a/test/files/run/sigtp.scala b/test/files/run/sigtp.scala
new file mode 100644
index 0000000000..cd38184109
--- /dev/null
+++ b/test/files/run/sigtp.scala
@@ -0,0 +1,15 @@
+import scala.tools.partest._
+
+trait BugBase [A, E] {
+  val key: A
+  var next: E = _
+}
+
+final class Bug[A, B](val key: A) extends BugBase[A, Bug[A, B]] {
+  def foo = next
+}
+
+object Test extends App with SigTest {
+  show[BugBase[_, _]]()
+  show[Bug[_, _]]()
+}
diff --git a/test/files/run/t3857.check b/test/files/run/t3857.check
index 45e9fb23a6..520b350ff5 100644
--- a/test/files/run/t3857.check
+++ b/test/files/run/t3857.check
@@ -1,2 +1,11 @@
-private java.util.Set<java.lang.String> ScalaGeneric.s
-private java.util.Set<java.lang.String> ScalaGeneric2.s
+ScalaGeneric
+  (m) public java.util.Set<java.lang.String> ScalaGeneric.s()
+  (m) public void ScalaGeneric.s_$eq(java.util.Set<java.lang.String>)
+  (f) private java.util.Set<java.lang.String> ScalaGeneric.s
+ScalaGeneric2Trait
+  (m) public abstract java.util.Set<java.lang.String> ScalaGeneric2Trait.s()
+  (m) public abstract void ScalaGeneric2Trait.s_$eq(java.util.Set<java.lang.String>)
+ScalaGeneric2
+  (m) public java.util.Set<java.lang.String> ScalaGeneric2.s() (bridge)
+  (m) public void ScalaGeneric2.s_$eq(java.util.Set<java.lang.String>) (bridge)
+  (f) private java.util.Set<java.lang.String> ScalaGeneric2.s
diff --git a/test/files/run/t3857.scala b/test/files/run/t3857.scala
index 0c8dc996ce..b33685d4f2 100644
--- a/test/files/run/t3857.scala
+++ b/test/files/run/t3857.scala
@@ -1,17 +1,11 @@
-class ScalaGeneric { var s: java.util.Set[String] = _ }
+import scala.tools.partest._
 
+class ScalaGeneric { var s: java.util.Set[String] = _ }
 trait ScalaGeneric2Trait { var s: java.util.Set[String] = _ }
-class ScalaGeneric2 extends ScalaGeneric2Trait
-
-object Test extends App {
-  println(classOf[ScalaGeneric].getDeclaredField("s").toGenericString)
-  // java.util.Set<java.lang.String> ScalaGeneric.s
+class ScalaGeneric2 extends ScalaGeneric2Trait { }
 
-  println(classOf[ScalaGeneric2].getDeclaredField("s").toGenericString)
-  // After r24319 this comment was:
-  //   java.util.Set ScalaGeneric2.s -- no signature should be found because it was mixed in.
-  //
-  // Having reverted that with this commit, I note the original comment since
-  // the original signature is also back.
-  //   java.util.Set ScalaGeneric2.s -- should be same as above
+object Test extends App with SigTest {
+  show[ScalaGeneric]()
+  show[ScalaGeneric2Trait]()
+  show[ScalaGeneric2]()
 }