Adapt test to 2.12.x

Author: felixmulder

tests/neg/t5729.scala

@@ -6,8 +6,8 @@ object Test {
 }
 
 object C {
-  def join(in: Seq[List[_]]): Int = error("TODO")
-  def join[S](in: Seq[List[S]]): String = error("TODO")
+  def join(in: Seq[List[_]]): Int = sys.error("TODO")
+  def join[S](in: Seq[List[S]]): String = sys.error("TODO")
 
   join(Seq[List[Int]]()) // error: ambiguous
   //

tests/run/t6634.check

@@ -4,27 +4,31 @@ String OK.
 Length OK.
 
 Trying lb1 ...
+java.lang.IndexOutOfBoundsException: at 6 deleting 6
 Checking ...
 String OK.
 Length OK.
 
 Trying lb2 ...
+java.lang.IndexOutOfBoundsException: at 99 deleting 6
 Checking ...
 String OK.
 Length OK.
 
 Trying lb3 ...
+java.lang.IndexOutOfBoundsException: at 1 deleting 9
 Checking ...
 String OK.
 Length OK.
 
 Trying lb4 ...
+java.lang.IndexOutOfBoundsException: at -1 deleting 1
 Checking ...
 String OK.
 Length OK.
 
 Trying lb5 ...
-java.lang.IllegalArgumentException: removing negative number (-1) of elements
+java.lang.IllegalArgumentException: removing negative number of elements: -1
 Checking ...
 String OK.
 Length OK.

tests/run/t6634.scala

@@ -1,14 +1,15 @@
 import collection.mutable.ListBuffer
 
-object Test extends dotty.runtime.LegacyApp {
+//object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def newLB = ListBuffer('a, 'b, 'c, 'd, 'e)
 
   val lb0 = newLB
   println("Trying lb0 ...")
   try {
     lb0.remove(5, 0)
   } catch {
-    // Not thrown in 2.10, will be thrown in 2.11
+    // Should not be thrown--nothing is deleted so nothing to do
     case ex: IndexOutOfBoundsException => println(ex)
   }
   checkNotCorrupted(lb0)
@@ -17,8 +18,8 @@ object Test extends dotty.runtime.LegacyApp {
   println("Trying lb1 ...")
   try {
     lb1.remove(6, 6)
-  } catch {
-    // Not thrown in 2.10, will be thrown in 2.11
+ } catch {
+    // Not thrown in 2.11, is thrown in 2.12
     case ex: IndexOutOfBoundsException => println(ex)
   }
   checkNotCorrupted(lb1)
@@ -28,7 +29,7 @@ object Test extends dotty.runtime.LegacyApp {
   try {
     lb2.remove(99, 6)
   } catch {
-    // Not thrown in 2.10, will be thrown in 2.11
+    // Not thrown in 2.11, is thrown in 2.12
     case ex: IndexOutOfBoundsException => println(ex)
   }
   checkNotCorrupted(lb2)
@@ -38,26 +39,27 @@ object Test extends dotty.runtime.LegacyApp {
   try {
     lb3.remove(1, 9)
   } catch {
-    // Not thrown in 2.10, will be thrown in 2.11
-    case ex: IllegalArgumentException => println(ex)
+    // Not thrown in 2.11, is thrown in 2.12
+    case ex: IndexOutOfBoundsException => println(ex)
   }
-  checkNotCorrupted(lb3, "ListBuffer('a)", 1)
+  checkNotCorrupted(lb3)
 
   val lb4 = newLB
   println("Trying lb4 ...")
   try {
     lb4.remove(-1, 1)
   } catch {
-    // Not thrown in 2.10, will be thrown in 2.11
+    // Not thrown in 2.11, is thrown in 2.12
     case ex: IndexOutOfBoundsException => println(ex)
   }
-  checkNotCorrupted(lb4, "ListBuffer('b, 'c, 'd, 'e)", 4)
+  checkNotCorrupted(lb4)
 
   val lb5 = newLB
   println("Trying lb5 ...")
   try {
     lb5.remove(1, -1)
   } catch {
+    // Was thrown prior to 2.12 also
     case ex: IllegalArgumentException => println(ex)
   }
   checkNotCorrupted(lb5)

tests/run/t6827.check

@@ -1,15 +1,15 @@
-start at -5: java.lang.IllegalArgumentException: requirement failed: start -5 out of range 10
-start at -1: java.lang.IllegalArgumentException: requirement failed: start -1 out of range 10
-start at limit: java.lang.IllegalArgumentException: requirement failed: start 10 out of range 10
+start at -5: java.lang.ArrayIndexOutOfBoundsException: -5
+start at -1: java.lang.ArrayIndexOutOfBoundsException: -1
+start at limit: ok
 start at limit-1: ok
 first 10: ok
 read all: ok
 test huge len: ok
 5 from 5: ok
 20 from 5: ok
 test len overflow: ok
-start beyond limit: java.lang.IllegalArgumentException: requirement failed: start 30 out of range 10
+start beyond limit: ok
 read 0: ok
 read -1: ok
-invalid read 0: java.lang.IllegalArgumentException: requirement failed: start 30 out of range 10
-invalid read -1: java.lang.IllegalArgumentException: requirement failed: start 30 out of range 10
+invalid read 0: ok
+invalid read -1: ok

tests/run/t6827.scala

@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val ns = (0 until 20)
   val arr = new Array[Int](10)
 
@@ -29,6 +29,26 @@ object Test extends dotty.runtime.LegacyApp {
   tryit("invalid read 0", 30, 0)
   tryit("invalid read -1", 30, -1)
 
-  // okay, see SI-7128
+  // okay, see scala/bug#7128
   "...".toIterator.copyToArray(new Array[Char](0), 0, 0)
+
+
+  // Bonus test from @som-snytt to check for overflow in
+  // index calculations.
+  def testOverflow(start: Int, len: Int, expected: List[Char]) = {
+    def copyFromIterator = {
+      val arr = Array.fill[Char](3)('-')
+      "abc".toIterator.copyToArray(arr, start, len)
+      arr.toList
+    }
+    def copyFromArray = {
+      val arr = Array.fill[Char](3)('-')
+      "abc".toArray.copyToArray(arr, start, len)
+      arr.toList
+    }
+    assert(copyFromIterator == expected)
+    assert(copyFromArray == expected)
+  }
+  testOverflow(1, Int.MaxValue - 1, "-ab".toList)
+  testOverflow(1, Int.MaxValue, "-ab".toList)
 }