From 729e7a91f43c327a9514fa53045842eb3e7db49b Mon Sep 17 00:00:00 2001
From: Rui Gonçalves <ruippeixotog@gmail.com>
Date: Tue, 11 Nov 2014 01:45:22 +0000
Subject: SI-8932 Fix dropRight/takeRight implementations

I looked up at all the overrides of `IterableLike#takeRight` and
`IterableLike#dropRight` and replaced usages of its argument `n` with
`math.max(n, 0)` every time it was being used in an index subtraction.

Fixes [SI-8932](https://issues.scala-lang.org/browse/SI-8932).
---
 .../scala/collection/IndexedSeqOptimizedTest.scala   | 13 +++++++++++++
 .../scala/collection/IterableViewLikeTest.scala      | 20 ++++++++++++++++++++
 .../scala/collection/immutable/TreeMapTest.scala     | 20 ++++++++++++++++++++
 .../scala/collection/immutable/TreeSetTest.scala     | 20 ++++++++++++++++++++
 4 files changed, 73 insertions(+)
 create mode 100644 test/junit/scala/collection/IterableViewLikeTest.scala
 create mode 100644 test/junit/scala/collection/immutable/TreeMapTest.scala
 create mode 100644 test/junit/scala/collection/immutable/TreeSetTest.scala

(limited to 'test')

diff --git a/test/junit/scala/collection/IndexedSeqOptimizedTest.scala b/test/junit/scala/collection/IndexedSeqOptimizedTest.scala
index e5382907af..419e1454cb 100644
--- a/test/junit/scala/collection/IndexedSeqOptimizedTest.scala
+++ b/test/junit/scala/collection/IndexedSeqOptimizedTest.scala
@@ -13,4 +13,17 @@ class IndexedSeqOptimizedTest {
     assertEquals(0, (Array(2): collection.mutable.WrappedArray[Int]).lastIndexWhere(_ => true, 1))
     assertEquals(2, "abc123".lastIndexWhere(_.isLetter, 6))
   }
+
+  @Test
+  def hasCorrectDropAndTakeMethods() {
+    assertEquals("", "abc" take Int.MinValue)
+    assertEquals("", "abc" takeRight Int.MinValue)
+    assertEquals("abc", "abc" drop Int.MinValue)
+    assertEquals("abc", "abc" dropRight Int.MinValue)
+
+    assertArrayEquals(Array.empty[Int], Array(1, 2, 3) take Int.MinValue)
+    assertArrayEquals(Array.empty[Int], Array(1, 2, 3) takeRight Int.MinValue)
+    assertArrayEquals(Array(1, 2, 3), Array(1, 2, 3) drop Int.MinValue)
+    assertArrayEquals(Array(1, 2, 3), Array(1, 2, 3) dropRight Int.MinValue)
+  }
 }
diff --git a/test/junit/scala/collection/IterableViewLikeTest.scala b/test/junit/scala/collection/IterableViewLikeTest.scala
new file mode 100644
index 0000000000..55da02744b
--- /dev/null
+++ b/test/junit/scala/collection/IterableViewLikeTest.scala
@@ -0,0 +1,20 @@
+package scala.collection
+
+import org.junit.Assert._
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.JUnit4
+
+@RunWith(classOf[JUnit4])
+class IterableViewLikeTest {
+
+  @Test
+  def hasCorrectDropAndTakeMethods() {
+    val iter = Iterable(1, 2, 3)
+
+    assertEquals(Iterable.empty[Int], iter.view take Int.MinValue force)
+    assertEquals(Iterable.empty[Int], iter.view takeRight Int.MinValue force)
+    assertEquals(iter, iter.view drop Int.MinValue force)
+    assertEquals(iter, iter.view dropRight Int.MinValue force)
+  }
+}
diff --git a/test/junit/scala/collection/immutable/TreeMapTest.scala b/test/junit/scala/collection/immutable/TreeMapTest.scala
new file mode 100644
index 0000000000..4c21b94b24
--- /dev/null
+++ b/test/junit/scala/collection/immutable/TreeMapTest.scala
@@ -0,0 +1,20 @@
+package scala.collection.immutable
+
+import org.junit.Assert._
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.JUnit4
+
+@RunWith(classOf[JUnit4])
+class TreeMapTest {
+
+  @Test
+  def hasCorrectDropAndTakeMethods() {
+    val tree = TreeMap(1 -> "a", 2 -> "b", 3 -> "c")
+
+    assertEquals(TreeMap.empty[Int, String], tree take Int.MinValue)
+    assertEquals(TreeMap.empty[Int, String], tree takeRight Int.MinValue)
+    assertEquals(tree, tree drop Int.MinValue)
+    assertEquals(tree, tree dropRight Int.MinValue)
+  }
+}
diff --git a/test/junit/scala/collection/immutable/TreeSetTest.scala b/test/junit/scala/collection/immutable/TreeSetTest.scala
new file mode 100644
index 0000000000..8efe1bfeb8
--- /dev/null
+++ b/test/junit/scala/collection/immutable/TreeSetTest.scala
@@ -0,0 +1,20 @@
+package scala.collection.immutable
+
+import org.junit.Assert._
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.JUnit4
+
+@RunWith(classOf[JUnit4])
+class TreeSetTest {
+
+  @Test
+  def hasCorrectDropAndTakeMethods() {
+    val set = TreeSet(1, 2, 3)
+
+    assertEquals(TreeSet.empty[Int], set take Int.MinValue)
+    assertEquals(TreeSet.empty[Int], set takeRight Int.MinValue)
+    assertEquals(set, set drop Int.MinValue)
+    assertEquals(set, set dropRight Int.MinValue)
+  }
+}
-- 
cgit v1.2.3