From d817beea39b06c0b55fee8fa2b847b30dbe7c8c7 Mon Sep 17 00:00:00 2001
From: Lex Spoon <lex@lexspoon.org>
Date: Sun, 9 Mar 2008 14:58:33 +0000
Subject: Array.zip supports arrays of different lengths.

---
 test/files/run/arrays.check |  2 +-
 test/files/run/arrays.scala | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

(limited to 'test/files/run')

diff --git a/test/files/run/arrays.check b/test/files/run/arrays.check
index 8a0c57deae..a649c9b4f8 100644
--- a/test/files/run/arrays.check
+++ b/test/files/run/arrays.check
@@ -1 +1 @@
-checks: 2300
+checks: 2301
diff --git a/test/files/run/arrays.scala b/test/files/run/arrays.scala
index 5fcc5e6614..927112d851 100644
--- a/test/files/run/arrays.scala
+++ b/test/files/run/arrays.scala
@@ -335,6 +335,14 @@ object Test {
     check(xs(2) == n2, xs(2), n2);
   }
 
+  //##########################################################################
+  // Miscellaneous checks
+  def checkZip(): Unit = {
+    val zipped = Array("a", "b", "c").zip(Array(1, 2))
+    val expected = Array(("a",1), ("b",2))
+    check(zipped sameElements expected, zipped.toList, expected.toList)
+  }
+
   //##########################################################################
   // Arrays
 
@@ -903,6 +911,10 @@ object Test {
 
     //######################################################################
 
+    checkZip()
+
+    //######################################################################
+
     println("checks: " + checks)
 
     //######################################################################
-- 
cgit v1.2.3