Fixing an incomplete svnmerge; first, revert to...

Fixing an incomplete svnmerge; first, revert to r24726.

20 files changed, 475 insertions, 63 deletions

diff --git a/test/files/jvm/JavaInteraction.check b/test/files/jvm/JavaInteraction.check
new file mode 100644
index 0000000000..fb9d3cdd8c
--- /dev/null
+++ b/test/files/jvm/JavaInteraction.check
@@ -0,0 +1,4 @@
+p.x = 5
+p.c = java.awt.Color[r=255,g=0,b=0]
+p.getX() = 5.0
+p.getC() = java.awt.Color[r=255,g=0,b=0]
diff --git a/test/files/jvm/JavaInteraction.scala b/test/files/jvm/JavaInteraction.scala
new file mode 100644
index 0000000000..26fbc17e58
--- /dev/null
+++ b/test/files/jvm/JavaInteraction.scala
@@ -0,0 +1,38 @@
+//############################################################################
+// Test Java interaction
+//############################################################################
+
+import java.awt.Color;
+import java.awt.Point;
+
+class ColoredPoint(x: Int, y: Int, c_ : Color) extends Point(x, y) {
+  val c: Color = c_;
+  def getC(): Color = c;
+}
+
+object Test {
+  val expected = """
+p.x = 5
+p.c = java.awt.Color[r=255,g=0,b=0]
+p.getX() = 5.0
+p.getC() = java.awt.Color[r=255,g=0,b=0]
+  """.trim
+
+  def connect() = {
+    val p = new ColoredPoint(5, 7, Color.RED);
+    List(
+      "p.x = " + p.x,
+      "p.c = " + p.c,
+      "p.getX() = " + p.getX(),
+      "p.getC() = " + p.getC()
+    ).mkString("\n")
+  }
+
+  // This test would pointlessly fail the whole build anytime the account
+  // running the test could not connect to the windowing server.  The below
+  // is intended to defend against this outcome.
+  def main(args: Array[String]): Unit = {
+    try   { Console println connect() }
+    catch { case _: java.lang.InternalError => Console println expected }
+  }
+}
diff --git a/test/files/jvm/ticket4283/AbstractFoo.java b/test/files/jvm/ticket4283/AbstractFoo.java
deleted file mode 100644
index 74f3827fe3..0000000000
--- a/test/files/jvm/ticket4283/AbstractFoo.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package test;
-
-/* package private */ class AbstractFoo {
-  public int t;
-}
diff --git a/test/files/jvm/ticket4283/ScalaBipp.scala b/test/files/jvm/ticket4283/ScalaBipp.scala
deleted file mode 100644
index 36dea9f4de..0000000000
--- a/test/files/jvm/ticket4283/ScalaBipp.scala
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-class ScalaBipp extends AbstractFoo {
-  def make: Option[ScalaBipp] = Option(this)
-}
diff --git a/test/files/jvm/ticket4283/Test.scala b/test/files/jvm/ticket4283/Test.scala
deleted file mode 100644
index 9bbfaab928..0000000000
--- a/test/files/jvm/ticket4283/Test.scala
+++ /dev/null
@@ -1,4 +0,0 @@
-
-object Test extends App {
-  val x = (new test.ScalaBipp).make.get.t // java.lang.IllegalAccessError: tried to access class test.AbstractFoo from class other.IllegalAccess$
-}
diff --git a/test/files/neg/t3115.scala b/test/files/neg/t3115.scala
index 3888085593..4aeeb4063e 100755
--- a/test/files/neg/t3115.scala
+++ b/test/files/neg/t3115.scala
@@ -1,5 +1,5 @@
 object sc {
-  @deprecated("", "2.8.0") object Math
+  @deprecated("") object Math
 }
 
 object Test {
diff --git a/test/files/neg/t3774.check b/test/files/neg/t3774.check
index ea35c50541..59c63c4ee8 100644
--- a/test/files/neg/t3774.check
+++ b/test/files/neg/t3774.check
@@ -1,6 +1,6 @@
 t3774.scala:4: error: overloaded method value ++ with alternatives:
-  [B1 >: List[Int]](xs: scala.collection.GenTraversableOnce[((Int, Int), B1)])scala.collection.immutable.Map[(Int, Int),B1] <and>
-  [B >: ((Int, Int), List[Int]),That](that: scala.collection.GenTraversableOnce[B])(implicit bf: scala.collection.generic.CanBuildFrom[scala.collection.immutable.Map[(Int, Int),List[Int]],B,That])That
+  [B1 >: List[Int]](xs: scala.collection.TraversableOnce[((Int, Int), B1)])scala.collection.immutable.Map[(Int, Int),B1] <and>
+  [B >: ((Int, Int), List[Int]),That](that: scala.collection.TraversableOnce[B])(implicit bf: scala.collection.generic.CanBuildFrom[scala.collection.immutable.Map[(Int, Int),List[Int]],B,That])That
  cannot be applied to (scala.collection.immutable.IndexedSeq[((Int, Int), scala.collection.immutable.Range.Inclusive)])
   Map[(Int,Int),List[Int]]() ++ (for(x <- 0 to 1 ; y <- 0 to 1) yield {(x,y)-> (0 to 1)})
                              ^
diff --git a/test/files/pos/spec-List.scala b/test/files/pos/spec-List.scala
index 04ab7d1543..e3055f3051 100644
--- a/test/files/pos/spec-List.scala
+++ b/test/files/pos/spec-List.scala
@@ -144,7 +144,7 @@ sealed trait List[@specialized +A] extends LinearSeq[A]
   /** Create a new list which contains all elements of this list
    *  followed by all elements of Traversable `that'
    */
-  override def ++[B >: A, That](xs: GenTraversableOnce[B])(implicit bf: CanBuildFrom[List[A], B, That]): That = {
+  override def ++[B >: A, That](xs: TraversableOnce[B])(implicit bf: CanBuildFrom[List[A], B, That]): That = {
     val b = bf(this)
     if (b.isInstanceOf[ListBuffer[_]]) (this ::: xs.toList).asInstanceOf[That]
     else super.++(xs)
diff --git a/test/files/pos/t2799.scala b/test/files/pos/t2799.scala
index 7710cce26c..fe93c0e301 100644
--- a/test/files/pos/t2799.scala
+++ b/test/files/pos/t2799.scala
@@ -1 +1 @@
-@deprecated("hi mom", "") case class Bob ()
+@deprecated("hi mom") case class Bob ()
diff --git a/test/files/pos/t4402/A.scala b/test/files/pos/t4402/A.scala
deleted file mode 100644
index f43f0865f0..0000000000
--- a/test/files/pos/t4402/A.scala
+++ /dev/null
@@ -1,3 +0,0 @@
-package ohmy
-
-class A extends other.Bar
diff --git a/test/files/pos/t4402/Bar.java b/test/files/pos/t4402/Bar.java
deleted file mode 100644
index edc00a5fd1..0000000000
--- a/test/files/pos/t4402/Bar.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package other;
-
-public class Bar extends test.Foo {
-  void createMeSth(test.Foo.Inner aaa) {
-    aaa.hello();
-  }
-}
diff --git a/test/files/pos/t4402/Foo.java b/test/files/pos/t4402/Foo.java
deleted file mode 100644
index 585a5e0a2c..0000000000
--- a/test/files/pos/t4402/Foo.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package test;
-
-public abstract class Foo {
-  protected interface Inner {
-    public void hello();
-  }
-}
-
diff --git a/test/files/presentation/simple-tests.check b/test/files/presentation/simple-tests.check
new file mode 100644
index 0000000000..b90dfce77c
--- /dev/null
+++ b/test/files/presentation/simple-tests.check
@@ -0,0 +1,390 @@
+reload: Tester.scala
+askTypeCompletion at Tester.scala(16,25)
+
+================================================================================
+[response] aksTypeCompletion at (16,25)
+retreived 75 members
+TypeMember(method !=,(x$1: AnyRef)Boolean,true,true,<none>)
+TypeMember(method !=,(x$1: Any)Boolean,true,true,<none>)
+TypeMember(method ==,(x$1: AnyRef)Boolean,true,true,<none>)
+TypeMember(method ==,(x$1: Any)Boolean,true,true,<none>)
+TypeMember(method >,(that: Tester.this.settings.Setting)Boolean,true,true,<none>)
+TypeMember(method >=,(that: Tester.this.settings.Setting)Boolean,true,true,<none>)
+TypeMember(method ##,()Int,true,true,<none>)
+TypeMember(method <,(that: Tester.this.settings.Setting)Boolean,true,true,<none>)
+TypeMember(method <=,(that: Tester.this.settings.Setting)Boolean,true,true,<none>)
+TypeMember(method ->,[B](y: B)(Tester.this.settings.BooleanSetting, B),true,false,method any2ArrowAssoc)
+TypeMember(method +,(other: String)java.lang.String,true,false,method any2stringadd)
+TypeMember(method →,[B](y: B)(Tester.this.settings.BooleanSetting, B),true,false,method any2ArrowAssoc)
+TypeMember(constructor BooleanSetting,(name: String,descr: String)Tester.this.settings.BooleanSetting,true,false,<none>)
+TypeMember(constructor Object,()java.lang.Object,true,true,<none>)
+TypeMember(constructor StringAdd,(self: Any)scala.runtime.StringAdd,true,false,method any2stringadd)
+TypeMember(constructor ArrowAssoc,(x: Tester.this.settings.BooleanSetting)ArrowAssoc[Tester.this.settings.BooleanSetting],true,false,method any2ArrowAssoc)
+TypeMember(type T,Tester.this.settings.verbose.T,true,false,<none>)
+TypeMember(variable _abbreviations,List[String],false,true,<none>)
+TypeMember(variable _helpSyntax,String,false,true,<none>)
+TypeMember(variable _postSetHook,(Tester.this.settings.verbose.type) => Unit,false,true,<none>)
+TypeMember(method abbreviations,=> List[String],true,true,<none>)
+TypeMember(method asInstanceOf,[T0]=> T0,true,true,<none>)
+TypeMember(method choices,=> List[String],true,true,<none>)
+TypeMember(method clone,()java.lang.Object,false,true,<none>)
+TypeMember(method compare,(that: Tester.this.settings.Setting)Int,true,true,<none>)
+TypeMember(method compareTo,(that: Tester.this.settings.Setting)Int,true,true,<none>)
+TypeMember(method dependencies,=> List[(Tester.this.settings.Setting, String)],true,true,<none>)
+TypeMember(variable dependency,Option[(Tester.this.settings.Setting, String)],false,true,<none>)
+TypeMember(method dependsOn,(s: Tester.this.settings.Setting,value: String)Tester.this.settings.verbose.type,true,true,<none>)
+TypeMember(value descr,String,false,false,<none>)
+TypeMember(method ensuring,(cond: (Tester.this.settings.BooleanSetting) => Boolean,msg: => Any)Tester.this.settings.BooleanSetting,true,false,method any2Ensuring)
+TypeMember(method ensuring,(cond: (Tester.this.settings.BooleanSetting) => Boolean)Tester.this.settings.BooleanSetting,true,false,method any2Ensuring)
+TypeMember(method ensuring,(cond: Boolean,msg: => Any)Tester.this.settings.BooleanSetting,true,false,method any2Ensuring)
+TypeMember(method ensuring,(cond: Boolean)Tester.this.settings.BooleanSetting,true,false,method any2Ensuring)
+TypeMember(method eq,(x$1: AnyRef)Boolean,true,true,<none>)
+TypeMember(method equals,(that: Any)Boolean,true,true,<none>)
+TypeMember(method errorAndValue,[T](msg: String,x: T)T,true,true,<none>)
+TypeMember(method finalize,()Unit,false,true,<none>)
+TypeMember(method formatted,(fmtstr: String)String,true,false,method any2stringadd)
+TypeMember(method hashCode,()Int,true,true,<none>)
+TypeMember(value helpDescription,String,false,true,<none>)
+TypeMember(method helpSyntax,=> String,true,true,<none>)
+TypeMember(method isAdvanced,=> Boolean,true,true,<none>)
+TypeMember(method isDefault,=> Boolean,true,true,<none>)
+TypeMember(method isForDebug,=> Boolean,true,true,<none>)
+TypeMember(method isInstanceOf,[T0]=> Boolean,true,true,<none>)
+TypeMember(method isInternalOnly,=> Boolean,true,true,<none>)
+TypeMember(method isPrivate,=> Boolean,true,true,<none>)
+TypeMember(method isStandard,=> Boolean,true,true,<none>)
+TypeMember(value name,String,false,false,<none>)
+TypeMember(method ne,(x$1: AnyRef)Boolean,true,true,<none>)
+TypeMember(method notify,()Unit,true,true,<none>)
+TypeMember(method notifyAll,()Unit,true,true,<none>)
+TypeMember(method postSetHook,()Unit,true,true,<none>)
+TypeMember(method respondsTo,(label: String)Boolean,true,true,<none>)
+TypeMember(value self,Any,false,false,method any2stringadd)
+TypeMember(variable setByUser,Boolean,false,true,<none>)
+TypeMember(method synchronized,[T0](x$1: T0)T0,true,true,<none>)
+TypeMember(method toString,()String,true,true,<none>)
+TypeMember(method tryToSet,(args: List[String])Some[List[String]],true,false,<none>)
+TypeMember(method tryToSetColon,(args: List[String])Option[Tester.this.settings.ResultOfTryToSet],true,true,<none>)
+TypeMember(method tryToSetFromPropertyValue,(s: String)Unit,true,false,<none>)
+TypeMember(method tryToSetProperty,(args: List[String])Option[Tester.this.settings.ResultOfTryToSet],true,true,<none>)
+TypeMember(method unparse,=> List[String],true,false,<none>)
+TypeMember(variable v,Boolean,false,false,<none>)
+TypeMember(method value,=> Tester.this.settings.verbose.T,true,true,<none>)
+TypeMember(method value_=,(arg: Tester.this.settings.verbose.T)Unit,true,true,<none>)
+TypeMember(method wait,()Unit,true,true,<none>)
+TypeMember(method wait,(x$1: Long,x$2: Int)Unit,true,true,<none>)
+TypeMember(method wait,(x$1: Long)Unit,true,true,<none>)
+TypeMember(method withAbbreviation,(s: String)Tester.this.settings.verbose.type,true,true,<none>)
+TypeMember(method withHelpSyntax,(s: String)Tester.this.settings.verbose.type,true,true,<none>)
+TypeMember(method withPostSetHook,(f: (Tester.this.settings.verbose.type) => Unit)Tester.this.settings.verbose.type,true,true,<none>)
+TypeMember(value x,Tester.this.settings.BooleanSetting,false,false,method any2ArrowAssoc)
+askTypeCompletion at Tester.scala(23,24)
+
+================================================================================
+[response] aksTypeCompletion at (23,24)
+retreived 46 members
+TypeMember(method !=,(x$1: AnyRef)Boolean,true,true,<none>)
+TypeMember(method !=,(x$1: Any)Boolean,true,true,<none>)
+TypeMember(method ==,(x$1: AnyRef)Boolean,true,true,<none>)
+TypeMember(method ==,(x$1: Any)Boolean,true,true,<none>)
+TypeMember(method ##,()Int,true,true,<none>)
+TypeMember(method ->,[B](y: B)(scala.tools.nsc.interactive.Response[U], B),true,false,method any2ArrowAssoc)
+TypeMember(method +,(other: String)java.lang.String,true,false,method any2stringadd)
+TypeMember(method →,[B](y: B)(scala.tools.nsc.interactive.Response[U], B),true,false,method any2ArrowAssoc)
+TypeMember(constructor Response,()scala.tools.nsc.interactive.Response[U],true,false,<none>)
+TypeMember(constructor StringAdd,(self: Any)scala.runtime.StringAdd,true,false,method any2stringadd)
+TypeMember(constructor ArrowAssoc,(x: scala.tools.nsc.interactive.Response[U])ArrowAssoc[scala.tools.nsc.interactive.Response[U]],true,false,method any2ArrowAssoc)
+TypeMember(method asInstanceOf,[T0]=> T0,true,true,<none>)
+TypeMember(method cancel,()Unit,true,false,<none>)
+TypeMember(variable cancelled,Boolean,false,false,<none>)
+TypeMember(method clear,()Unit,true,false,<none>)
+TypeMember(method clone,()java.lang.Object,false,true,<none>)
+TypeMember(variable complete,Boolean,false,false,<none>)
+TypeMember(variable data,Option[Either[U,Throwable]],false,false,<none>)
+TypeMember(method ensuring,(cond: (scala.tools.nsc.interactive.Response[U]) => Boolean,msg: => Any)scala.tools.nsc.interactive.Response[U],true,false,method any2Ensuring)
+TypeMember(method ensuring,(cond: (scala.tools.nsc.interactive.Response[U]) => Boolean)scala.tools.nsc.interactive.Response[U],true,false,method any2Ensuring)
+TypeMember(method ensuring,(cond: Boolean,msg: => Any)scala.tools.nsc.interactive.Response[U],true,false,method any2Ensuring)
+TypeMember(method ensuring,(cond: Boolean)scala.tools.nsc.interactive.Response[U],true,false,method any2Ensuring)
+TypeMember(method eq,(x$1: AnyRef)Boolean,true,true,<none>)
+TypeMember(method equals,(x$1: Any)Boolean,true,true,<none>)
+TypeMember(method finalize,()Unit,false,true,<none>)
+TypeMember(method formatted,(fmtstr: String)String,true,false,method any2stringadd)
+TypeMember(method get,(timeout: Long)Option[Either[U,Throwable]],true,false,<none>)
+TypeMember(method get,=> Either[U,Throwable],true,false,<none>)
+TypeMember(method hashCode,()Int,true,true,<none>)
+TypeMember(method isCancelled,=> Boolean,true,false,<none>)
+TypeMember(method isComplete,=> Boolean,true,false,<none>)
+TypeMember(method isInstanceOf,[T0]=> Boolean,true,true,<none>)
+TypeMember(method ne,(x$1: AnyRef)Boolean,true,true,<none>)
+TypeMember(method notify,()Unit,true,true,<none>)
+TypeMember(method notifyAll,()Unit,true,true,<none>)
+TypeMember(method raise,(exc: Throwable)Unit,true,false,<none>)
+TypeMember(value self,Any,false,false,method any2stringadd)
+TypeMember(method set,(x: U)Unit,true,false,<none>)
+TypeMember(method setProvisionally,(x: U)Unit,true,false,<none>)
+TypeMember(method synchronized,[T0](x$1: T0)T0,true,true,<none>)
+TypeMember(method toString,()java.lang.String,true,true,<none>)
+TypeMember(method wait,()Unit,true,true,<none>)
+TypeMember(method wait,(x$1: Long,x$2: Int)Unit,true,true,<none>)
+TypeMember(method wait,(x$1: Long)Unit,true,true,<none>)
+TypeMember(value x,scala.tools.nsc.interactive.Response[U],false,false,method any2ArrowAssoc)
+askTypeCompletion at Tester.scala(27,23)
+
+================================================================================
+[response] aksTypeCompletion at (27,23)
+retreived 196 members
+TypeMember(method !=,(x$1: AnyRef)Boolean,true,true,<none>)
+TypeMember(method !=,(x$1: Any)Boolean,true,true,<none>)
+TypeMember(method ==,(x$1: AnyRef)Boolean,true,true,<none>)
+TypeMember(method ==,(x$1: Any)Boolean,true,true,<none>)
+TypeMember(method ##,()Int,true,true,<none>)
+TypeMember(method ->,[B](y: B)(scala.tools.nsc.Settings, B),true,false,method any2ArrowAssoc)
+TypeMember(method +,(other: String)java.lang.String,true,false,method any2stringadd)
+TypeMember(method →,[B](y: B)(scala.tools.nsc.Settings, B),true,false,method any2ArrowAssoc)
+TypeMember(constructor Settings,()scala.tools.nsc.Settings,true,false,<none>)
+TypeMember(constructor Settings,(errorFn: (String) => Unit)scala.tools.nsc.Settings,true,false,<none>)
+TypeMember(constructor StringAdd,(self: Any)scala.runtime.StringAdd,true,false,method any2stringadd)
+TypeMember(constructor ArrowAssoc,(x: scala.tools.nsc.Settings)ArrowAssoc[scala.tools.nsc.Settings],true,false,method any2ArrowAssoc)
+TypeMember(trait AbsSetting,Tester.this.settings.AbsSetting,true,true,<none>)
+TypeMember(trait AbsSettingValue,Tester.this.settings.AbsSettingValue,true,true,<none>)
+TypeMember(class BooleanSetting,Tester.this.settings.BooleanSetting,true,true,<none>)
+TypeMember(method BooleanSetting,(name: String,descr: String)Tester.this.settings.BooleanSetting,true,true,<none>)
+TypeMember(class ChoiceSetting,Tester.this.settings.ChoiceSetting,true,true,<none>)
+TypeMember(method ChoiceSetting,(name: String,helpArg: String,descr: String,choices: List[String],default: String)Tester.this.settings.ChoiceSetting,true,true,<none>)
+TypeMember(class IntSetting,Tester.this.settings.IntSetting,true,true,<none>)
+TypeMember(method IntSetting,(name: String,descr: String,default: Int,range: Option[(Int, Int)],parser: (String) => Option[Int])Tester.this.settings.IntSetting,true,true,<none>)
+TypeMember(trait InternalSetting,Tester.this.settings.InternalSetting,true,true,<none>)
+TypeMember(class MultiStringSetting,Tester.this.settings.MultiStringSetting,true,true,<none>)
+TypeMember(method MultiStringSetting,(name: String,arg: String,descr: String)Tester.this.settings.MultiStringSetting,true,true,<none>)
+TypeMember(class OutputDirs,Tester.this.settings.OutputDirs,true,true,<none>)
+TypeMember(class OutputSetting,Tester.this.settings.OutputSetting,true,true,<none>)
+TypeMember(method OutputSetting,(outputDirs: Tester.this.settings.OutputDirs,default: String)Tester.this.settings.OutputSetting,true,true,<none>)
+TypeMember(class PathSetting,Tester.this.settings.PathSetting,true,true,<none>)
+TypeMember(method PathSetting,(name: String,descr: String,default: String)Tester.this.settings.PathSetting,true,true,<none>)
+TypeMember(class PhasesSetting,Tester.this.settings.PhasesSetting,true,true,<none>)
+TypeMember(method PhasesSetting,(name: String,descr: String)Tester.this.settings.PhasesSetting,true,true,<none>)
+TypeMember(type ResultOfTryToSet,Tester.this.settings.ResultOfTryToSet,true,true,<none>)
+TypeMember(class Setting,Tester.this.settings.Setting,true,true,<none>)
+TypeMember(class SettingGroup,Tester.this.settings.SettingGroup,true,true,<none>)
+TypeMember(lazy value SettingOrdering,Ordering[Tester.this.settings.Setting],false,true,<none>)
+TypeMember(trait SettingValue,Tester.this.settings.SettingValue,true,true,<none>)
+TypeMember(method StringSetting,(name: String,arg: String,descr: String,default: String)Tester.this.settings.StringSetting,true,true,<none>)
+TypeMember(class StringSetting,Tester.this.settings.StringSetting,true,true,<none>)
+TypeMember(method XO,=> Tester.this.settings.BooleanSetting,true,true,<none>)
+TypeMember(value Xchecknull,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value Xcloselim,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value Xdce,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value Xexperimental,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value Xhelp,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value Xlinearizer,Tester.this.settings.ChoiceSetting,false,true,<none>)
+TypeMember(value XlogImplicits,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value Xmigration28,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value Xnojline,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value Xprint,Tester.this.settings.PhasesSetting,false,true,<none>)
+TypeMember(value Xprintpos,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value Xshowcls,Tester.this.settings.StringSetting,false,true,<none>)
+TypeMember(value Xshowobj,Tester.this.settings.StringSetting,false,true,<none>)
+TypeMember(value Xshowtrees,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value Xwarnfatal,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value Xwarninit,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value Ybuilderdebug,Tester.this.settings.ChoiceSetting,false,true,<none>)
+TypeMember(value Ybuildmanagerdebug,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value Ycompacttrees,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value Ycompletion,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value YdepMethTpes,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value Yhelp,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value Yidedebug,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value Ylogcp,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value YmethodInfer,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value Ymurmur,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value Ynogenericsig,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value Ynosqueeze,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value Ynotnull,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value Ypmatdebug,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value Ypmatnaive,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value YpresentationDebug,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value YpresentationLog,Tester.this.settings.StringSetting,false,true,<none>)
+TypeMember(value YpresentationReplay,Tester.this.settings.StringSetting,false,true,<none>)
+TypeMember(value YpresentationVerbose,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value Yprofile,Tester.this.settings.PhasesSetting,false,true,<none>)
+TypeMember(value YprofileClass,Tester.this.settings.StringSetting,false,true,<none>)
+TypeMember(value YprofileMem,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value Yrangepos,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value Yrecursion,Tester.this.settings.IntSetting,false,true,<none>)
+TypeMember(value Yrepldebug,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value YrichExes,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value Yshow,Tester.this.settings.PhasesSetting,false,true,<none>)
+TypeMember(value Ystatistics,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value Ytyperdebug,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value Yverifysigs,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value YvirtClasses,Boolean,false,true,<none>)
+TypeMember(value Ywarndeadcode,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(method add,[T <: Tester.this.settings.Setting](s: T)T,false,true,<none>)
+TypeMember(lazy value allSettings,scala.collection.mutable.HashSet[Tester.this.settings.Setting],false,true,<none>)
+TypeMember(value argfiles,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(method asInstanceOf,[T0]=> T0,true,true,<none>)
+TypeMember(value assemextdirs,Tester.this.settings.StringSetting,false,true,<none>)
+TypeMember(value assemname,Tester.this.settings.StringSetting,false,true,<none>)
+TypeMember(value assemrefs,Tester.this.settings.StringSetting,false,true,<none>)
+TypeMember(value bootclasspath,Tester.this.settings.PathSetting,false,true,<none>)
+TypeMember(value browse,Tester.this.settings.PhasesSetting,false,true,<none>)
+TypeMember(value check,Tester.this.settings.PhasesSetting,false,true,<none>)
+TypeMember(method checkDependencies,=> Boolean,true,true,<none>)
+TypeMember(value checkInit,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value classpath,Tester.this.settings.PathSetting,false,true,<none>)
+TypeMember(method clone,()java.lang.Object,false,true,<none>)
+TypeMember(method copy,()scala.tools.nsc.Settings,true,true,<none>)
+TypeMember(value d,Tester.this.settings.OutputSetting,false,true,<none>)
+TypeMember(value debug,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(method debuginfo,=> Tester.this.settings.ChoiceSetting,true,true,<none>)
+TypeMember(method dependenciesFile,=> Tester.this.settings.StringSetting,true,true,<none>)
+TypeMember(value dependencyfile,Tester.this.settings.StringSetting,false,true,<none>)
+TypeMember(value deprecation,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(method disable,(s: Tester.this.settings.Setting)scala.collection.mutable.HashSet[Tester.this.settings.Setting],true,true,<none>)
+TypeMember(value disable,Tester.this.settings.MultiStringSetting,false,true,<none>)
+TypeMember(value elidebelow,Tester.this.settings.IntSetting,false,true,<none>)
+TypeMember(method embeddedDefaults,(loader: java.lang.ClassLoader)Unit,true,true,<none>)
+TypeMember(method embeddedDefaults,[T](implicit evidence$1: Manifest[T])Unit,true,true,<none>)
+TypeMember(value encoding,Tester.this.settings.StringSetting,false,true,<none>)
+TypeMember(method ensuring,(cond: (scala.tools.nsc.Settings) => Boolean,msg: => Any)scala.tools.nsc.Settings,true,false,method any2Ensuring)
+TypeMember(method ensuring,(cond: (scala.tools.nsc.Settings) => Boolean)scala.tools.nsc.Settings,true,false,method any2Ensuring)
+TypeMember(method ensuring,(cond: Boolean,msg: => Any)scala.tools.nsc.Settings,true,false,method any2Ensuring)
+TypeMember(method ensuring,(cond: Boolean)scala.tools.nsc.Settings,true,false,method any2Ensuring)
+TypeMember(method eq,(x$1: AnyRef)Boolean,true,true,<none>)
+TypeMember(method equals,(that: Any)Boolean,true,true,<none>)
+TypeMember(value errorFn,(String) => Unit,false,false,<none>)
+TypeMember(value explaintypes,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(variable explicitParentLoader,Option[java.lang.ClassLoader],false,true,<none>)
+TypeMember(value extdirs,Tester.this.settings.PathSetting,false,true,<none>)
+TypeMember(method finalize,()Unit,false,true,<none>)
+TypeMember(method formatted,(fmtstr: String)String,true,false,method any2stringadd)
+TypeMember(value fscShutdown,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value future,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value g,Tester.this.settings.ChoiceSetting,false,true,<none>)
+TypeMember(value genPhaseGraph,Tester.this.settings.StringSetting,false,true,<none>)
+TypeMember(method getClasspath,(id: String,loader: java.lang.ClassLoader)Option[String],false,true,<none>)
+TypeMember(method hashCode,()Int,true,true,<none>)
+TypeMember(value help,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value inline,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(method isInstanceOf,[T0]=> Boolean,true,true,<none>)
+TypeMember(value javabootclasspath,Tester.this.settings.PathSetting,false,true,<none>)
+TypeMember(value javaextdirs,Tester.this.settings.PathSetting,false,true,<none>)
+TypeMember(value log,Tester.this.settings.PhasesSetting,false,true,<none>)
+TypeMember(method lookupSetting,(cmd: String)Option[Tester.this.settings.Setting],true,true,<none>)
+TypeMember(value make,Tester.this.settings.ChoiceSetting,false,true,<none>)
+TypeMember(method ne,(x$1: AnyRef)Boolean,true,true,<none>)
+TypeMember(value noCompletion,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value noForwarders,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value noSelfCheck,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value noassertions,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value noimports,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value nospecialization,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(method notify,()Unit,true,true,<none>)
+TypeMember(method notifyAll,()Unit,true,true,<none>)
+TypeMember(value nouescape,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value nowarn,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(method nowarnings,=> Tester.this.settings.BooleanSetting,true,true,<none>)
+TypeMember(value optimise,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(method outdir,=> Tester.this.settings.OutputSetting,true,true,<none>)
+TypeMember(lazy value outputDirs,Tester.this.settings.OutputDirs,false,true,<none>)
+TypeMember(method parseParams,(args: List[String])List[String],false,true,<none>)
+TypeMember(value plugin,Tester.this.settings.MultiStringSetting,false,true,<none>)
+TypeMember(value pluginOptions,Tester.this.settings.MultiStringSetting,false,true,<none>)
+TypeMember(value pluginsDir,Tester.this.settings.StringSetting,false,true,<none>)
+TypeMember(value print,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(method printLate,=> Tester.this.settings.BooleanSetting,true,true,<none>)
+TypeMember(value printtypes,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(method processArgumentString,(params: String)(Boolean, List[String]),true,true,<none>)
+TypeMember(method processArguments,(arguments: List[String],processAll: Boolean)(Boolean, List[String]),true,true,<none>)
+TypeMember(value prompt,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(method recreateArgs,=> List[String],true,true,<none>)
+TypeMember(value refinementMethodDispatch,Tester.this.settings.ChoiceSetting,false,true,<none>)
+TypeMember(value require,Tester.this.settings.MultiStringSetting,false,true,<none>)
+TypeMember(value resident,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value script,Tester.this.settings.StringSetting,false,true,<none>)
+TypeMember(value self,Any,false,false,method any2stringadd)
+TypeMember(value selfInAnnots,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value showPhases,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value showPlugins,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value skip,Tester.this.settings.PhasesSetting,false,true,<none>)
+TypeMember(value sourceReader,Tester.this.settings.StringSetting,false,true,<none>)
+TypeMember(value sourcedir,Tester.this.settings.StringSetting,false,true,<none>)
+TypeMember(value sourcepath,Tester.this.settings.PathSetting,false,true,<none>)
+TypeMember(method splitParams,(line: String)List[String],true,true,<none>)
+TypeMember(value stop,Tester.this.settings.PhasesSetting,false,true,<none>)
+TypeMember(method synchronized,[T0](x$1: T0)T0,true,true,<none>)
+TypeMember(value target,Tester.this.settings.ChoiceSetting,false,true,<none>)
+TypeMember(method toConciseString,=> String,true,true,<none>)
+TypeMember(method toString,()String,true,true,<none>)
+TypeMember(value unchecked,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value uniqid,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value usejavacp,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(method userSetSettings,=> scala.collection.Set[Tester.this.settings.Setting],true,true,<none>)
+TypeMember(value verbose,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value version,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(method visibleSettings,=> scala.collection.Set[Tester.this.settings.Setting],true,true,<none>)
+TypeMember(method wait,()Unit,true,true,<none>)
+TypeMember(method wait,(x$1: Long,x$2: Int)Unit,true,true,<none>)
+TypeMember(method wait,(x$1: Long)Unit,true,true,<none>)
+TypeMember(value writeICode,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value x,scala.tools.nsc.Settings,false,false,method any2ArrowAssoc)
+askTypeCompletion at Tester.scala(105,29)
+
+================================================================================
+[response] aksTypeCompletion at (105,29)
+retreived 50 members
+TypeMember(method !=,(x$1: AnyRef)Boolean,true,true,<none>)
+TypeMember(method !=,(x$1: Any)Boolean,true,true,<none>)
+TypeMember(method ==,(x$1: AnyRef)Boolean,true,true,<none>)
+TypeMember(method ==,(x$1: Any)Boolean,true,true,<none>)
+TypeMember(method ##,()Int,true,true,<none>)
+TypeMember(method ->,[B](y: B)(scala.tools.nsc.util.SourceFile, B),true,false,method any2ArrowAssoc)
+TypeMember(method +,(other: String)java.lang.String,true,false,method any2stringadd)
+TypeMember(method →,[B](y: B)(scala.tools.nsc.util.SourceFile, B),true,false,method any2ArrowAssoc)
+TypeMember(constructor SourceFile,()scala.tools.nsc.util.SourceFile,true,false,<none>)
+TypeMember(constructor StringAdd,(self: Any)scala.runtime.StringAdd,true,false,method any2stringadd)
+TypeMember(constructor ArrowAssoc,(x: scala.tools.nsc.util.SourceFile)ArrowAssoc[scala.tools.nsc.util.SourceFile],true,false,method any2ArrowAssoc)
+TypeMember(method asInstanceOf,[T0]=> T0,true,true,<none>)
+TypeMember(method beginsWith,(offset: Int,text: String)Boolean,true,false,<none>)
+TypeMember(method clone,()java.lang.Object,false,true,<none>)
+TypeMember(method content,=> Array[Char],true,false,<none>)
+TypeMember(method dbg,(offset: Int)java.lang.String,true,false,<none>)
+TypeMember(method ensuring,(cond: (scala.tools.nsc.util.SourceFile) => Boolean,msg: => Any)scala.tools.nsc.util.SourceFile,true,false,method any2Ensuring)
+TypeMember(method ensuring,(cond: (scala.tools.nsc.util.SourceFile) => Boolean)scala.tools.nsc.util.SourceFile,true,false,method any2Ensuring)
+TypeMember(method ensuring,(cond: Boolean,msg: => Any)scala.tools.nsc.util.SourceFile,true,false,method any2Ensuring)
+TypeMember(method ensuring,(cond: Boolean)scala.tools.nsc.util.SourceFile,true,false,method any2Ensuring)
+TypeMember(method eq,(x$1: AnyRef)Boolean,true,true,<none>)
+TypeMember(method equals,(x$1: Any)Boolean,true,true,<none>)
+TypeMember(method file,=> scala.tools.nsc.io.AbstractFile,true,false,<none>)
+TypeMember(method finalize,()Unit,false,true,<none>)
+TypeMember(method formatted,(fmtstr: String)String,true,false,method any2stringadd)
+TypeMember(method hashCode,()Int,true,true,<none>)
+TypeMember(method identifier,(pos: scala.tools.nsc.util.Position,compiler: scala.tools.nsc.Global)Option[String],true,false,<none>)
+TypeMember(method isInstanceOf,[T0]=> Boolean,true,true,<none>)
+TypeMember(method isLineBreak,(idx: Int)Boolean,true,false,<none>)
+TypeMember(method isSelfContained,=> Boolean,true,false,<none>)
+TypeMember(method length,=> Int,true,false,<none>)
+TypeMember(method lineToOffset,(index: Int)Int,true,false,<none>)
+TypeMember(method lineToString,(index: Int)String,true,false,<none>)
+TypeMember(method ne,(x$1: AnyRef)Boolean,true,true,<none>)
+TypeMember(method notify,()Unit,true,true,<none>)
+TypeMember(method notifyAll,()Unit,true,true,<none>)
+TypeMember(method offsetToLine,(offset: Int)Int,true,false,<none>)
+TypeMember(method path,=> String,true,false,<none>)
+TypeMember(method position,(line: Int,column: Int)scala.tools.nsc.util.Position,true,false,<none>)
+TypeMember(method position,(offset: Int)scala.tools.nsc.util.Position,true,false,<none>)
+TypeMember(method positionInUltimateSource,(position: scala.tools.nsc.util.Position)scala.tools.nsc.util.Position,true,false,<none>)
+TypeMember(value self,Any,false,false,method any2stringadd)
+TypeMember(method skipWhitespace,(offset: Int)Int,true,false,<none>)
+TypeMember(method synchronized,[T0](x$1: T0)T0,true,true,<none>)
+TypeMember(method toString,()String,true,false,<none>)
+TypeMember(method wait,()Unit,true,true,<none>)
+TypeMember(method wait,(x$1: Long,x$2: Int)Unit,true,true,<none>)
+TypeMember(method wait,(x$1: Long)Unit,true,true,<none>)
+TypeMember(value x,scala.tools.nsc.util.SourceFile,false,false,method any2ArrowAssoc)
+askTypeAt at Tester.scala(18,13)
+[response] askTypeAt at (18,13)
+val limit: Long = java.this.lang.System.currentTimeMillis().+(Tester.this.randomDelayMillis)
+askTypeAt at Tester.scala(19,11)
+[response] askTypeAt at (19,11)
+val res: scala.tools.nsc.interactive.Response[U] = new scala.tools.nsc.interactive.Response[U]()
diff --git a/test/files/presentation/simple-tests.javaopts b/test/files/presentation/simple-tests.javaopts
new file mode 100644
index 0000000000..4af888f9c2
--- /dev/null
+++ b/test/files/presentation/simple-tests.javaopts
@@ -0,0 +1 @@
+-Dfile.encoding=UTF-8
\ No newline at end of file
diff --git a/test/files/presentation/simple-tests.opts b/test/files/presentation/simple-tests.opts
new file mode 100644
index 0000000000..8529bbf1a0
--- /dev/null
+++ b/test/files/presentation/simple-tests.opts
@@ -0,0 +1,18 @@
+# This file contains command line options that are passed to the presentation compiler
+# Lines starting with # are stripped, and you can split arguments on several lines.
+
+# The -bootclasspath option is treated specially by the test framework: if it's not specified
+# in this file, the presentation compiler will pick up the scala-library/compiler that's on the
+# java classpath used to run this test (usually build/pack)
+
+# Any option can be passed this way, like presentation debug
+# -Ypresentation-debug 
+
+# the classpath is relative to the current working directory. That means it depends where you're
+# running partest from. Run it from the root scala checkout for these files to resolve correctly
+# (by default when running 'ant test', or 'test/partest'). Paths use Unix separators, the test
+# framework translates them to the platform dependent representation.
+-bootclasspath lib/scala-compiler.jar:lib/scala-library.jar:lib/fjbg.jar
+
+# the following line would test using the quick compiler
+# -bootclasspath build/quick/classes/compiler:build/quick/classes/library:lib/fjbg.jar
diff --git a/test/files/run/pc-conversions.scala b/test/files/run/pc-conversions.scala
index 6be0f99355..3121d82944 100644
--- a/test/files/run/pc-conversions.scala
+++ b/test/files/run/pc-conversions.scala
@@ -7,7 +7,7 @@ import collection._
 object Test {
 
   def main(args: Array[String]) {
-    testConversions
+    // disabled
   }
 
   def testConversions {
@@ -49,18 +49,13 @@ object Test {
     assertToPar(parallel.immutable.ParHashSet(1 -> 3))
 
     assertToParWoMap(immutable.Range(1, 10, 2))
-
-    // seq and par again conversions)
-    assertSeqPar(parallel.mutable.ParArray(1, 2, 3))
   }
 
-  def assertSeqPar[T](pc: parallel.ParIterable[T]) = pc.seq.par == pc
-
   def assertSeq[T](pc: parallel.ParIterable[T]) = assert(pc.seq == pc)
 
-  def assertPar[T, P <: Parallel](xs: GenIterable[T]) = assert(xs == xs.par)
+  def assertPar[T, P <: Parallel](xs: Iterable[T]) = assert(xs == xs.par)
 
-  def assertToPar[K, V](xs: GenTraversable[(K, V)]) {
+  def assertToPar[K, V](xs: Traversable[(K, V)]) {
     xs match {
       case _: Seq[_] =>
         assert(xs.toIterable.par == xs)
@@ -78,7 +73,7 @@ object Test {
     assert(xs.par.toMap == xs.toMap)
   }
 
-  def assertToParWoMap[T](xs: GenSeq[T]) {
+  def assertToParWoMap[T](xs: Seq[T]) {
     assert(xs.toIterable.par == xs.toIterable)
     assert(xs.par.toIterable == xs.toIterable)
 
diff --git a/test/files/run/t4459.scala b/test/files/run/t4459.scala
deleted file mode 100644
index 6e1b871cbe..0000000000
--- a/test/files/run/t4459.scala
+++ /dev/null
@@ -1,12 +0,0 @@
-import collection._
-
-object Test {
-  def main(args: Array[String]) {
-    for (i <- 0 until 2000) {
-      foo((0 until 10000).toSeq.par)
-    }
-  }
-
-  def foo(arg: GenSeq[_]): String = arg.map(x => x).mkString(",")
-}
-
diff --git a/test/files/scalacheck/HashTrieSplit.scala b/test/files/scalacheck/HashTrieSplit.scala
index e959a3d535..6b20efe12b 100644
--- a/test/files/scalacheck/HashTrieSplit.scala
+++ b/test/files/scalacheck/HashTrieSplit.scala
@@ -23,8 +23,8 @@ object Test {
     // println("created trie")
     for (n <- 0 until (sz - 1)) {
       // println("---------> n = " + n)
-      val pit = ht.splitter
-      val pit2 = ht.splitter
+      val pit = ht.parallelIterator
+      val pit2 = ht.parallelIterator
       var i = 0
       while (i < n) {
         pit.next
diff --git a/test/files/scalacheck/parallel-collections/ParallelIterableCheck.scala b/test/files/scalacheck/parallel-collections/ParallelIterableCheck.scala
index ac3493e56c..744d22f05c 100644
--- a/test/files/scalacheck/parallel-collections/ParallelIterableCheck.scala
+++ b/test/files/scalacheck/parallel-collections/ParallelIterableCheck.scala
@@ -71,11 +71,11 @@ abstract class ParallelIterableCheck[T](collName: String) extends Properties(col
     (inst, fromTraversable(inst), modif)
   }
 
-  def areEqual(t1: GenTraversable[T], t2: GenTraversable[T]) = if (hasStrictOrder) {
+  def areEqual(t1: Traversable[T], t2: Traversable[T]) = if (hasStrictOrder) {
     t1 == t2 && t2 == t1
   } else (t1, t2) match { // it is slightly delicate what `equal` means if the order is not strict
-    case (m1: GenMap[_, _], m2: GenMap[_, _]) => m1 == m2 && m2 == m1
-    case (i1: GenIterable[_], i2: GenIterable[_]) =>
+    case (m1: Map[_, _], m2: Map[_, _]) => m1 == m2 && m2 == m1
+    case (i1: Iterable[_], i2: Iterable[_]) =>
       val i1s = i1.toSet
       val i2s = i2.toSet
       i1s == i2s && i2s == i1s
diff --git a/test/files/scalacheck/parallel-collections/pc.scala b/test/files/scalacheck/parallel-collections/pc.scala
index 103b5e2993..4be7b0ec4d 100644
--- a/test/files/scalacheck/parallel-collections/pc.scala
+++ b/test/files/scalacheck/parallel-collections/pc.scala
@@ -30,6 +30,16 @@ class ParCollProperties extends Properties("Parallel collections") {
 
   // parallel vectors
   include(immutable.IntParallelVectorCheck)
+
+  /*   Views   */
+
+  // parallel array views
+
+  // parallel immutable hash map views
+
+  // parallel mutable hash map views
+
+  // parallel vector views
 }