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.

1 files changed, 7 insertions, 13 deletions

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]()
 }