Merge pull request #5335 from rumoku/SI-9888

SI-9888. Prevent OOM on ParRange. Improve toString.

Author: retronym

src/library/scala/collection/parallel/immutable/ParRange.scala

@@ -107,6 +107,7 @@ self =>
     }
   }
 
+  override def toString = s"Par$range"
 }
 
 object ParRange {

test/files/jvm/serialization-new.check

@@ -268,12 +268,12 @@ x = ParHashSet(1, 2, 3)
 y = ParHashSet(1, 2, 3)
 x equals y: true, y equals x: true
 
-x = ParRange(0, 1, 2, 3, 4)
-y = ParRange(0, 1, 2, 3, 4)
+x = ParRange 0 to 4
+y = ParRange 0 to 4
 x equals y: true, y equals x: true
 
-x = ParRange(0, 1, 2, 3)
-y = ParRange(0, 1, 2, 3)
+x = ParRange 0 until 4
+y = ParRange 0 until 4
 x equals y: true, y equals x: true
 
 x = ParMap(5 -> 1, 10 -> 2)

test/files/jvm/serialization.check

@@ -268,12 +268,12 @@ x = ParHashSet(1, 2, 3)
 y = ParHashSet(1, 2, 3)
 x equals y: true, y equals x: true
 
-x = ParRange(0, 1, 2, 3, 4)
-y = ParRange(0, 1, 2, 3, 4)
+x = ParRange 0 to 4
+y = ParRange 0 to 4
 x equals y: true, y equals x: true
 
-x = ParRange(0, 1, 2, 3)
-y = ParRange(0, 1, 2, 3)
+x = ParRange 0 until 4
+y = ParRange 0 until 4
 x equals y: true, y equals x: true
 
 x = ParMap(5 -> 1, 10 -> 2)

test/junit/scala/collection/parallel/immutable/ParRangeTest.scala

@@ -0,0 +1,15 @@
+package scala.collection.parallel.immutable
+
+import org.junit.runner.RunWith
+import org.junit.runners.JUnit4
+import org.junit.Test
+
+@RunWith(classOf[JUnit4])
+class ParRangeTest {
+
+  @Test
+  def buildParRangeString {
+    assert(ParRange(1, 5, 1, true).toString == "ParRange 1 to 5")
+  }
+
+}