From 01e1d5902bfbe9b1f2398f07a34cd0cca0469429 Mon Sep 17 00:00:00 2001
From: Sean McDirmid <sean.mcdirmid@gmail.com>
Date: Tue, 22 May 2007 10:18:54 +0000
Subject: Updated tests to reflect new range behavior.

---
 test/files/run/iterators.scala  | 13 ++++++++++---
 test/files/run/richs-msil.check |  4 ++--
 test/files/run/richs.check      |  4 ++--
 test/files/run/richs.scala      |  1 +
 4 files changed, 15 insertions(+), 7 deletions(-)

(limited to 'test/files')

diff --git a/test/files/run/iterators.scala b/test/files/run/iterators.scala
index 0e5981b5ce..435018ca7b 100644
--- a/test/files/run/iterators.scala
+++ b/test/files/run/iterators.scala
@@ -15,9 +15,16 @@ object Test {
 
   def check_range: Int = {
     val xs1 = Iterator.range(0, 10,  2) toList;
-    val xs2 = Iterator.range(0, 10, -2) toList;
+    val xs2 = try {
+      val r = Iterator.range(0, 10, -2) toList;
+      throw new Error("" + r)
+    } catch {
+    case e : IllegalArgumentException => Nil
+    }
     val xs3 = Iterator.range(10, 0, -2) toList;
-    val xs4 = Iterator.range(10, 0,  2) toList;
+    val xs4 =
+      Iterator.range(10, 0, 2) toList;
+
     val xs5 = Iterator.range(0, 10, 11) toList;
     xs1.length + xs2.length + xs3.length + xs4.length + xs5.length
   }
@@ -88,7 +95,7 @@ object Test {
 
   def main(args: Array[String]) {
     check_success("check_from",     check_from,     -1)
-    check_success("check_range",    check_range,    11)
+    check_success("check_range",    check_range,    16)
     check_success("check_range2",   check_range2,   26)
     check_success("check_range3",   check_range3,    3)
     check_success("check_take",     check_take,     10)
diff --git a/test/files/run/richs-msil.check b/test/files/run/richs-msil.check
index e628ad3998..940ea360d4 100644
--- a/test/files/run/richs-msil.check
+++ b/test/files/run/richs-msil.check
@@ -10,8 +10,8 @@ RichIntTest:
 11
 12
 13
-0
-0
+12
+13
 
 RichStringTest1:
 s1: abc
diff --git a/test/files/run/richs.check b/test/files/run/richs.check
index 80b2ef3ef2..562f52f054 100644
--- a/test/files/run/richs.check
+++ b/test/files/run/richs.check
@@ -10,8 +10,8 @@ RichIntTest:
 11
 12
 13
-0
-0
+12
+13
 
 RichStringTest1:
 s1: abc
diff --git a/test/files/run/richs.scala b/test/files/run/richs.scala
index 4df7bc3bf3..629fca58be 100644
--- a/test/files/run/richs.scala
+++ b/test/files/run/richs.scala
@@ -12,6 +12,7 @@ trait RichTest {
     cn.substring(0, cn.length-1)
   }
   def length[A](it: Iterator[A]) = it.toList length
+  def length[A](it: Iterable[A]) = it.toList length
   def run: Unit
 }
 object RichCharTest1 extends RichTest {
-- 
cgit v1.2.3