summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/files/run/sequenceComparisons.check2
-rw-r--r--test/files/run/sequenceComparisons.scala12
2 files changed, 6 insertions, 8 deletions
diff --git a/test/files/run/sequenceComparisons.check b/test/files/run/sequenceComparisons.check
index bb7669b154..df8e41125d 100644
--- a/test/files/run/sequenceComparisons.check
+++ b/test/files/run/sequenceComparisons.check
@@ -1 +1 @@
-All 3600 tests passed.
+All 4000 tests passed.
diff --git a/test/files/run/sequenceComparisons.scala b/test/files/run/sequenceComparisons.scala
index ee4df8e40e..192002bdd6 100644
--- a/test/files/run/sequenceComparisons.scala
+++ b/test/files/run/sequenceComparisons.scala
@@ -9,6 +9,7 @@ object Test {
// the commented out ones in seqMakers
val seqMakers = List[List[Int] => Sequence[Int]](
+ // scala.Array(_: _*),
mutable.ArrayBuffer(_: _*),
// mutable.ArrayStack(_: _*),
mutable.Buffer(_: _*),
@@ -30,6 +31,7 @@ object Test {
abstract class Data[T] {
val seq: Sequence[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(
@@ -41,6 +43,8 @@ object Test {
def falseList = inputs._2
}
+ lazy val eqeq = Method(_ == _, (List(seqList), List(Nil, seqList drop 1, seqList ::: seqList)), "%s == %s")
+
val startsWithInputs: Inputs
lazy val startsWith = Method(_ startsWith _, startsWithInputs, "%s startsWith %s")
@@ -54,7 +58,7 @@ object Test {
val sameElementsInputs: Inputs
lazy val sameElements = Method(_ sameElements _, sameElementsInputs, "%s sameElements %s")
- def methodList = List(startsWith, endsWith, indexOfSeq, sameElements)
+ def methodList = List(eqeq, startsWith, endsWith, indexOfSeq, sameElements)
}
object test1 extends Data[Int] {
@@ -98,12 +102,6 @@ object Test {
import testData._
val scrut = s1f(seq)
- // for (s <- starters ; val rhs = s2f(s))
- // assertOne(scrut, rhs, scrut startsWith rhs, "%s startsWith %s")
- //
- // for (ns <- nonStarters ; val rhs = s2f(ns))
- // assertOne(scrut, rhs, !(scrut startsWith rhs), "!(%s startsWith %s)")
-
for (Method(f, (trueList, falseList), descr) <- methodList) {
for (s <- trueList; val rhs = s2f(s))
assertOne(scrut, rhs, f(scrut, rhs), descr)