Sequence->Seq

2 files changed, 20 insertions, 20 deletions

diff --git a/test/files/run/colltest1.scala b/test/files/run/colltest1.scala
index ea8ff8e305..efdce00277 100644
--- a/test/files/run/colltest1.scala
+++ b/test/files/run/colltest1.scala
@@ -55,10 +55,10 @@ object Test extends Application {
     secondFive copyToBuffer buf
     assert(buf.result == ten, buf.result)
     assert(ten.toArray.size == 10)
-    assert(ten.toArray.toSequence == ten, ten.toArray.toSequence)
+    assert(ten.toArray.toSeq == ten, ten.toArray.toSeq)
     assert(ten.toIterable == ten)
     assert(ten.toList == ten)
-    assert(ten.toSequence == ten)
+    assert(ten.toSeq == ten)
     assert(ten.toStream == ten)
     assert(ten.toString endsWith "(1, 2, 3, 4, 5, 6, 7, 8, 9, 10)")
     assert(ten.mkString("[", "; ", "]") endsWith "[1; 2; 3; 4; 5; 6; 7; 8; 9; 10]")
@@ -73,7 +73,7 @@ object Test extends Application {
     assert(six sameElements (1 to 6))
   }
 
-  def sequenceTest(empty: Sequence[Int]) {
+  def sequenceTest(empty: Seq[Int]) {
     orderedIterableTest(empty)
     val ten = empty ++ (1 to 10)
     println(ten)
@@ -125,7 +125,7 @@ object Test extends Application {
     assert((ten ++ ten).removeDuplicates == ten)
     assert(ten.patch(3, List(4, 5, 6, 7), 4) == ten)
     assert(ten.patch(0, List(1, 2, 3), 9) == List(1, 2, 3, 10))
-    assert(empty.padTo(10, 7) == Array.fill(10)(7).toSequence)
+    assert(empty.padTo(10, 7) == Array.fill(10)(7).toSeq)
     assert((ten zip ten.indices) == ten.zipWithIndex)
     assert(ten.sortWith(_ < _) == ten)
     assert(ten.sortWith(_ > _) == ten.reverse)
@@ -209,12 +209,12 @@ object Test extends Application {
   orderedIterableTest(Iterable())
   orderedIterableTest(mutable.Iterable())
   orderedIterableTest(immutable.Iterable())
-  sequenceTest(Sequence())
-  sequenceTest(mutable.Sequence())
-  sequenceTest(immutable.Sequence())
-  sequenceTest(LinearSequence())
-//  sequenceTest(mutable.LinearSequence())
-  sequenceTest(immutable.LinearSequence())
+  sequenceTest(Seq())
+  sequenceTest(mutable.Seq())
+  sequenceTest(immutable.Seq())
+  sequenceTest(LinearSeq())
+//  sequenceTest(mutable.LinearSeq())
+  sequenceTest(immutable.LinearSeq())
   sequenceTest(mutable.Vector())
   rangeTest(1 to 10)
 
diff --git a/test/files/run/sequenceComparisons.scala b/test/files/run/sequenceComparisons.scala
index cc1cf3610c..cf1f64d67d 100644
--- a/test/files/run/sequenceComparisons.scala
+++ b/test/files/run/sequenceComparisons.scala
@@ -1,27 +1,27 @@
 import scala.collection.{ mutable, immutable }
-import collection.{ Sequence, Traversable }
+import collection.{ Seq, Traversable }
 
 object Test {
   // TODO:
   //
-  // SequenceProxy
-  // SequenceForwarder
+  // SeqProxy
+  // SeqForwarder
   // the commented out ones in seqMakers
 
-  val seqMakers = List[List[Int] => Sequence[Int]](
+  val seqMakers = List[List[Int] => Seq[Int]](
     // scala.Array(_: _*),
     mutable.ArrayBuffer(_: _*),
     // mutable.ArrayStack(_: _*),
     mutable.Buffer(_: _*),
-    mutable.LinearSequence(_: _*),
+    mutable.LinearSeq(_: _*),
     // null on Nil
     // mutable.LinkedList(_: _*),
     mutable.ListBuffer(_: _*),
     // mutable.PriorityQueue(_: _*),
     // immutable.Queue(_: _*),
     // mutable.Queue(_: _*),
-    immutable.Sequence(_: _*),
-    mutable.Sequence(_: _*),
+    immutable.Seq(_: _*),
+    mutable.Seq(_: _*),
     // immutable.Stack(_: _*),
     // mutable.Stack(_: _*),
     immutable.Vector(_: _*),
@@ -31,12 +31,12 @@ object Test {
   )
 
   abstract class Data[T] {
-    val seq: Sequence[T]
+    val seq: Seq[T]
     private def seqList = seq.toList
     // _1 is inputs which must be true, _2 which must be false
     type Inputs = (List[List[T]], List[List[T]])
     case class Method(
-      f: (Sequence[T], Sequence[T]) => Boolean,
+      f: (Seq[T], Seq[T]) => Boolean,
       inputs: Inputs,
       descr: String
     ) {
@@ -53,7 +53,7 @@ object Test {
     lazy val endsWith = Method(_ endsWith _, endsWithInputs, "%s endsWith %s")
 
     val indexOfSeqInputs: Inputs
-    private def subseqTest(s1: Sequence[T], s2: Sequence[T]) = (s1 indexOfSeq s2) != -1
+    private def subseqTest(s1: Seq[T], s2: Seq[T]) = (s1 indexOfSeq s2) != -1
     lazy val indexOfSeq = Method(subseqTest _, indexOfSeqInputs, "(%s indexOfSeq %s) != -1")
 
     val sameElementsInputs: Inputs