Fix tests to survive wellformedness checks

Author: odersky

test/dotc/tests.scala

@@ -105,7 +105,7 @@ class tests extends CompilerTest {
   @Test def neg_typedapply() = compileFile(negDir, "typedapply", xerrors = 4)
   @Test def neg_typedidents() = compileFile(negDir, "typedIdents", xerrors = 2)
   @Test def neg_assignments() = compileFile(negDir, "assignments", xerrors = 3)
-  @Test def neg_typers() = compileFile(negDir, "typers", xerrors = 13)(allowDoubleBindings)
+  @Test def neg_typers() = compileFile(negDir, "typers", xerrors = 14)(allowDoubleBindings)
   @Test def neg_privates() = compileFile(negDir, "privates", xerrors = 2)
   @Test def neg_rootImports = compileFile(negDir, "rootImplicits", xerrors = 2)
   @Test def neg_templateParents() = compileFile(negDir, "templateParents", xerrors = 3)
@@ -135,7 +135,7 @@ class tests extends CompilerTest {
   @Test def neg_badAuxConstr = compileFile(negDir, "badAuxConstr", xerrors = 2)
   @Test def neg_typetest = compileFile(negDir, "typetest", xerrors = 1)
   @Test def neg_t1569_failedAvoid = compileFile(negDir, "t1569-failedAvoid", xerrors = 1)
-  @Test def neg_clashes = compileFile(negDir, "clashes", xerrors = 2)
+  @Test def neg_clashes = compileFile(negDir, "clashes", xerrors = 3)
   @Test def neg_cycles = compileFile(negDir, "cycles", xerrors = 8)
   @Test def neg_boundspropagation = compileFile(negDir, "boundspropagation", xerrors = 5)
   @Test def neg_refinedSubtyping = compileFile(negDir, "refinedSubtyping", xerrors = 2)
@@ -150,7 +150,7 @@ class tests extends CompilerTest {
   @Test def neg_instantiateAbstract = compileFile(negDir, "instantiateAbstract", xerrors = 8)
   @Test def neg_selfInheritance = compileFile(negDir, "selfInheritance", xerrors = 6)
   @Test def neg_selfreq = compileFile(negDir, "selfreq", xerrors = 4)
-  @Test def neg_singletons = compileFile(negDir, "singletons", xerrors = 5)
+  @Test def neg_singletons = compileFile(negDir, "singletons", xerrors = 8)
   @Test def neg_shadowedImplicits = compileFile(negDir, "arrayclone-new", xerrors = 2)
   @Test def neg_traitParamsTyper = compileFile(negDir, "traitParamsTyper", xerrors = 5)
   @Test def neg_traitParamsMixin = compileFile(negDir, "traitParamsMixin", xerrors = 2)

tests/neg/i50-volatile.scala

@@ -1,4 +1,4 @@
-object Test {
+class Test {
   class Base {
     class Inner
   }

tests/neg/singletons.scala

@@ -5,7 +5,7 @@ object Test {
 
   val n: null = null // error: Null is not a legal singleton type
 
-  val sym: 'sym = 'sym // error: Symbol is a legal singleton type
+  val sym: 'sym = 'sym // error: Symbol is not a legal singleton type
 
   val foo: s"abc" = "abc"  // error: not a legal singleton type
 }

tests/neg/typers.scala

@@ -30,7 +30,7 @@ object typers {
   }
 
   type L[X] = scala.collection.immutable.List[X]
-  type M[X, Y] <: scala.collection.immutable.Map[X, Y]
+  type M[X, Y] <: scala.collection.immutable.Map[X, Y] // error: only classes can have declared but undefined members
 
   object hk {
     def f(x: L)  // error: missing type parameter

tests/pos/i566.scala

@@ -1,4 +1,4 @@
-object Test {
+class Test {
   type T = String
   type U
   reflect.classTag[T]

tests/pos/tycons.scala

@@ -16,7 +16,7 @@ abstract class Functor[F <: TypeConstructor] {
   def map[A, B](f: F { type TypeArg <: A }): F { type TypeArg <: B }
 }
 
-implicit object ListFunctor extends Functor[List] {
+object ListFunctor extends Functor[List] {
   override def map[A, B](f: List { type TypeArg <: A }): List { type TypeArg <: B } = ???
 }
 

tests/run/classTags.scala

@@ -1,6 +1,5 @@
-object Test { 
+object Test {
   type T = String
-  type U
 
 /*  val a /* : Class[T]                  */ = classOf[T]                        // [Ljava/lang/String;
   println(a)
@@ -14,7 +13,7 @@ object Test {
   val f /* : ClassTag[Array[T with U]] */ = reflect.classTag[Array[T with U]] // ClassTag(arrayClass(classOf[java.lang.String]))
   println(f)
   val g /* : Class[Meter]              */ = classOf[Meter]                    // [LMeter;
-  println(g) 
+  println(g)
   val h /* : ClassTag[Meter]           */ = reflect.classTag[Meter]           // ClassTag(classOf[Meter])
   println(h)
 */