SI-7837 quickSort, along with Ordering[K], may result in stackoverflow because the code uses '==' instead of 'equiv'

== instead of equiv (from Ordering) was used by mistake.  Fixed.

Also created a test to make sure that == is not used by throwing an exception if it is (as suggested by Jason).

1 files changed, 29 insertions, 0 deletions

diff --git a/test/junit/scala/collection/ArraySortingTest.scala b/test/junit/scala/collection/ArraySortingTest.scala
new file mode 100644
index 0000000000..4e54b39ce7
--- /dev/null
+++ b/test/junit/scala/collection/ArraySortingTest.scala
@@ -0,0 +1,29 @@
+package scala.collection.mutable
+
+import org.junit.runner.RunWith
+import org.junit.runners.JUnit4
+import org.junit.Test
+
+/* Tests various maps by making sure they all agree on the same answers. */
+@RunWith(classOf[JUnit4])
+class ArraySortingTest {
+  
+  class CantSortMe(val i: Int) {
+    override def equals(a: Any) = throw new IllegalArgumentException("I cannot be equalled!")
+  }
+  
+  object CanOrder extends Ordering[CantSortMe] {
+    def compare(a: CantSortMe, b: CantSortMe) = a.i compare b.i
+  }
+  
+  // Tests SI-7837
+  @Test
+  def sortByTest() {
+    val test = Array(1,2,3,4,1,3,5,7,1,4,8,1,1,1,1)
+    val cant = test.map(i => new CantSortMe(i))
+    java.util.Arrays.sort(test)
+    scala.util.Sorting.quickSort(cant)(CanOrder)
+    assert( test(6) == 1 )
+    assert( (test,cant).zipped.forall(_ == _.i) )
+  }
+}