diff options
| author | Iulian Dragos <jaguarul@gmail.com> | 2009-11-26 16:59:47 +0000 |
|---|---|---|
| committer | Iulian Dragos <jaguarul@gmail.com> | 2009-11-26 16:59:47 +0000 |
| commit | 100112a580271b7408f11d06c187d6168f866160 (patch) | |
| tree | f6fc5e9ab599364595fa7a18c6dfa8c4b3a01ec4 /test | |
| parent | 207b303157385b210e78c76c2d6f95dbe45cddb2 (diff) | |
| download | scala-100112a580271b7408f11d06c187d6168f866160.tar.gz scala-100112a580271b7408f11d06c187d6168f866160.tar.bz2 scala-100112a580271b7408f11d06c187d6168f866160.zip | |
Fixed test cases to the new method names (index...
Fixed test cases to the new method names (indexOfSeq -> indexOfSlice).
See r19892
Diffstat (limited to 'test')
| -rw-r--r-- | test/files/run/colltest1.scala | 2 | ||||
| -rw-r--r-- | test/files/run/sequenceComparisons.scala | 2 | ||||
| -rw-r--r-- | test/files/run/t1323.scala | 36 |
3 files changed, 20 insertions, 20 deletions
diff --git a/test/files/run/colltest1.scala b/test/files/run/colltest1.scala index 081522d3f6..9a3942e928 100644 --- a/test/files/run/colltest1.scala +++ b/test/files/run/colltest1.scala @@ -112,7 +112,7 @@ object Test extends Application { assert(ten.startsWith(List(3, 4), 2)) assert(ten.endsWith(List(9, 10))) assert(ten.endsWith(List())) - assert(ten.indexOfSeq(List(3, 4, 5)) == 2, ten.indexOfSeq(List(3, 4, 5))) + assert(ten.indexOfSlice(List(3, 4, 5)) == 2, ten.indexOfSlice(List(3, 4, 5))) assert(ten contains 1) assert(ten contains 10) assert(!(ten contains 0)) diff --git a/test/files/run/sequenceComparisons.scala b/test/files/run/sequenceComparisons.scala index 30192096db..4f110eddce 100644 --- a/test/files/run/sequenceComparisons.scala +++ b/test/files/run/sequenceComparisons.scala @@ -53,7 +53,7 @@ object Test { lazy val endsWith = Method(_ endsWith _, endsWithInputs, "%s endsWith %s") val indexOfSeqInputs: Inputs - private def subseqTest(s1: Seq[T], s2: Seq[T]) = (s1 indexOfSeq s2) != -1 + private def subseqTest(s1: Seq[T], s2: Seq[T]) = (s1 indexOfSlice s2) != -1 lazy val indexOfSeq = Method(subseqTest _, indexOfSeqInputs, "(%s indexOfSeq %s) != -1") val sameElementsInputs: Inputs diff --git a/test/files/run/t1323.scala b/test/files/run/t1323.scala index d84239a12c..89676c888b 100644 --- a/test/files/run/t1323.scala +++ b/test/files/run/t1323.scala @@ -1,25 +1,25 @@ object Test extends Application { - println(" 1:" + List(1,2,3,4).indexOfSeq(List(0,1))) // -1 - println(" 2:" + List(1,2,3,4).indexOfSeq(List(1,2))) // 0 - println(" 3:" + List(1,2,3,4).indexOfSeq(List(2,3))) // 1 - println(" 4:" + List(1,2,3,4).indexOfSeq(List(3,4))) // 2 - println(" 5:" + List(1,2,3,4).indexOfSeq(List(4,5))) // -1 - println(" 6:" + List(1,2,3,4).indexOfSeq(List(2,4))) // -1 - println(" 7:" + List(1,2,3,4).indexOfSeq(List(4,3))) // -1 - println(" 8:" + List(1,2,3,4).indexOfSeq(List(1,3))) // -1 - println(" 9:" + List(1,2,3,4).indexOfSeq(List(1,3))) // -1 - println("10:" + List(1,2,3,4).indexOfSeq(List(1,2,3,4))) // 0 - println("11:" + List(1,2,3,4).indexOfSeq(List(4,3,2,1))) // -1 - println("12:" + List(1,2,3,4).indexOfSeq(List(1,2,3,4,5))) // -1 - println("13:" + List(1,2,3,4).indexOfSeq(List(5,4,3,2,1))) // -1 - println("14:" + List(1,2,3,4).indexOfSeq(List())) // 0 - println("15:" + List().indexOfSeq(List())) // 0 - println("16:" + List().indexOfSeq(List(1,2,3,4))) // -1 + println(" 1:" + List(1,2,3,4).indexOfSlice(List(0,1))) // -1 + println(" 2:" + List(1,2,3,4).indexOfSlice(List(1,2))) // 0 + println(" 3:" + List(1,2,3,4).indexOfSlice(List(2,3))) // 1 + println(" 4:" + List(1,2,3,4).indexOfSlice(List(3,4))) // 2 + println(" 5:" + List(1,2,3,4).indexOfSlice(List(4,5))) // -1 + println(" 6:" + List(1,2,3,4).indexOfSlice(List(2,4))) // -1 + println(" 7:" + List(1,2,3,4).indexOfSlice(List(4,3))) // -1 + println(" 8:" + List(1,2,3,4).indexOfSlice(List(1,3))) // -1 + println(" 9:" + List(1,2,3,4).indexOfSlice(List(1,3))) // -1 + println("10:" + List(1,2,3,4).indexOfSlice(List(1,2,3,4))) // 0 + println("11:" + List(1,2,3,4).indexOfSlice(List(4,3,2,1))) // -1 + println("12:" + List(1,2,3,4).indexOfSlice(List(1,2,3,4,5))) // -1 + println("13:" + List(1,2,3,4).indexOfSlice(List(5,4,3,2,1))) // -1 + println("14:" + List(1,2,3,4).indexOfSlice(List())) // 0 + println("15:" + List().indexOfSlice(List())) // 0 + println("16:" + List().indexOfSlice(List(1,2,3,4))) // -1 // Do some testing with infinite sequences def from(n: Int): Stream[Int] = Stream.cons(n, from(n + 1)) - println("17:" + List(1,2,3,4).indexOfSeq(from(1))) // -1 - println("18:" + from(1).indexOfSeq(List(4,5,6))) // 3 + println("17:" + List(1,2,3,4).indexOfSlice(from(1))) // -1 + println("18:" + from(1).indexOfSlice(List(4,5,6))) // 3 } |