From 788ac7502154ca1329773ec869242df21015f5f3 Mon Sep 17 00:00:00 2001
From: Aleksandar Prokopec <axel22@gmail.com>
Date: Wed, 27 Jun 2012 13:34:49 +0200
Subject: Fix SI-5986.

Here we had an issue that RedBlack does not work the same way
for sets - which are not supposed to replace an element if
it is the same (wrt equals) and maps - which should replace
the corresponding values.

Adding an overwrite parameter which decides whether to overwrite
added keys if they are the same in the ordering.

Fix tests.
---
 test/files/run/t5986.check               | 15 +++++++++++++
 test/files/run/t5986.scala               | 36 ++++++++++++++++++++++++++++++++
 test/files/scalacheck/redblacktree.scala |  4 ++--
 3 files changed, 53 insertions(+), 2 deletions(-)
 create mode 100644 test/files/run/t5986.check
 create mode 100644 test/files/run/t5986.scala

(limited to 'test')

diff --git a/test/files/run/t5986.check b/test/files/run/t5986.check
new file mode 100644
index 0000000000..4101770c6d
--- /dev/null
+++ b/test/files/run/t5986.check
@@ -0,0 +1,15 @@
+Foo(bar, 1)
+Foo(bar, 1)
+Foo(bar, 1),Foo(baz, 3),Foo(bazz, 4)
+Foo(bar, 1)
+Foo(bar, 1)
+Foo(bar, 1),Foo(baz, 3),Foo(bazz, 4)
+Foo(bar, 1)
+Foo(bar, 1)
+Foo(bar, 1),Foo(baz, 3),Foo(bazz, 4)
+Foo(bar, 1)
+Foo(bar, 1)
+Foo(bar, 1),Foo(baz, 3),Foo(bazz, 4)
+Foo(bar, 1)
+Foo(bar, 1)
+Foo(bar, 1),Foo(baz, 3),Foo(bazz, 4)
\ No newline at end of file
diff --git a/test/files/run/t5986.scala b/test/files/run/t5986.scala
new file mode 100644
index 0000000000..8cf7086f98
--- /dev/null
+++ b/test/files/run/t5986.scala
@@ -0,0 +1,36 @@
+
+
+
+import scala.collection._
+
+
+
+/** A sorted set should not replace elements when adding
+ *  and the element already exists in the set.
+ */
+object Test {
+  
+  class Foo(val name: String, val n: Int) {
+    override def equals(obj: Any): Boolean = obj match { case other: Foo => name == other.name; case _ => false }
+    override def hashCode = name.##
+    override def toString = "Foo(" + name + ", " + n + ")"
+  }
+  
+  implicit val ordering: Ordering[Foo] = Ordering.fromLessThan[Foo] { (a, b) => a.name.compareTo(b.name) < 0 }
+  
+  def check[S <: Set[Foo]](set: S) {
+    def output(s: Set[Foo]) = println(s.toList.sorted.mkString(","))
+    output(set + new Foo("bar", 2))
+    output(set ++ List(new Foo("bar", 2), new Foo("bar", 3), new Foo("bar", 4)))
+    output(set union Set(new Foo("bar", 2), new Foo("baz", 3), new Foo("bazz", 4)))
+  }
+  
+  def main(args: Array[String]) {
+    check(Set(new Foo("bar", 1)))
+    check(immutable.Set(new Foo("bar", 1)))
+    check(mutable.Set(new Foo("bar", 1)))
+    check(immutable.SortedSet(new Foo("bar", 1)))
+    check(mutable.SortedSet(new Foo("bar", 1)))
+  }
+  
+}
diff --git a/test/files/scalacheck/redblacktree.scala b/test/files/scalacheck/redblacktree.scala
index e4b356c889..e2609fa200 100644
--- a/test/files/scalacheck/redblacktree.scala
+++ b/test/files/scalacheck/redblacktree.scala
@@ -121,7 +121,7 @@ package scala.collection.immutable.redblacktree {
 
     override type ModifyParm = Int
     override def genParm(tree: Tree[String, Int]): Gen[ModifyParm] = choose(0, iterator(tree).size + 1)
-    override def modify(tree: Tree[String, Int], parm: ModifyParm): Tree[String, Int] = update(tree, generateKey(tree, parm), 0)
+    override def modify(tree: Tree[String, Int], parm: ModifyParm): Tree[String, Int] = update(tree, generateKey(tree, parm), 0, true)
 
     def generateKey(tree: Tree[String, Int], parm: ModifyParm): String = nodeAt(tree, parm) match {
       case Some((key, _)) => key.init.mkString + "MN"
@@ -144,7 +144,7 @@ package scala.collection.immutable.redblacktree {
     override type ModifyParm = Int
     override def genParm(tree: Tree[String, Int]): Gen[ModifyParm] = choose(0, iterator(tree).size)
     override def modify(tree: Tree[String, Int], parm: ModifyParm): Tree[String, Int] = nodeAt(tree, parm) map {
-      case (key, _) => update(tree, key, newValue)
+      case (key, _) => update(tree, key, newValue, true)
     } getOrElse tree
 
     property("update modifies values") = forAll(genInput) { case (tree, parm, newTree) =>
-- 
cgit v1.2.3