From dfd540a700286ca16b20e960fc77a3be96de6b3d Mon Sep 17 00:00:00 2001
From: Evgeny Slutsky <slutskiy.i@gmail.com>
Date: Mon, 9 Jan 2017 22:43:41 -0500
Subject: SI-10113 mutable.TreeMap.range does not work added missing overrides
 for TreeMapView

---
 src/library/scala/collection/mutable/TreeMap.scala |  3 ++
 .../scala/collection/mutable/TreeMapTest.scala     | 34 ++++++++++++++++++++++
 .../scala/collection/mutable/TreeSetTest.scala     | 20 +++++++++++++
 3 files changed, 57 insertions(+)
 create mode 100644 test/junit/scala/collection/mutable/TreeMapTest.scala
 create mode 100644 test/junit/scala/collection/mutable/TreeSetTest.scala

diff --git a/src/library/scala/collection/mutable/TreeMap.scala b/src/library/scala/collection/mutable/TreeMap.scala
index dc7d5d750e..14ae7c9c8c 100644
--- a/src/library/scala/collection/mutable/TreeMap.scala
+++ b/src/library/scala/collection/mutable/TreeMap.scala
@@ -180,6 +180,9 @@ sealed class TreeMap[A, B] private (tree: RB.Tree[A, B])(implicit val ordering:
       this
     }
 
+    override def valuesIterator: Iterator[B] = RB.valuesIterator(tree, from, until)
+    override def keysIterator: Iterator[A] = RB.keysIterator(tree, from, until)
+
     override def clone() = super.clone().rangeImpl(from, until)
   }
 }
diff --git a/test/junit/scala/collection/mutable/TreeMapTest.scala b/test/junit/scala/collection/mutable/TreeMapTest.scala
new file mode 100644
index 0000000000..ce79621c6f
--- /dev/null
+++ b/test/junit/scala/collection/mutable/TreeMapTest.scala
@@ -0,0 +1,34 @@
+package scala.collection.mutable
+
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.JUnit4
+
+import scala.collection.mutable
+
+@RunWith(classOf[JUnit4])
+class TreeMapTest {
+
+  @Test
+  def rangeMkString() {
+
+    val map = mutable.TreeMap[String, String]()
+
+    List("a", "b", "c", "d").foreach(v => map.put(v, v))
+
+    val range = map.range("b", "c")
+
+    val valuesRange = range.values
+    val keysRange = range.keys
+
+    assertEquals(1, valuesRange.size)
+    assertEquals(1, keysRange.size)
+
+    assertEquals("b", valuesRange.mkString(","))
+    assertEquals("b", keysRange.mkString(","))
+    assertEquals("b -> b", range.mkString(","))
+
+  }
+
+}
diff --git a/test/junit/scala/collection/mutable/TreeSetTest.scala b/test/junit/scala/collection/mutable/TreeSetTest.scala
new file mode 100644
index 0000000000..50b004befc
--- /dev/null
+++ b/test/junit/scala/collection/mutable/TreeSetTest.scala
@@ -0,0 +1,20 @@
+package scala.collection.mutable
+
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.JUnit4
+
+import scala.collection.mutable
+
+
+@RunWith(classOf[JUnit4])
+class TreeSetTest {
+
+  @Test
+  def rangeMkString() {
+
+    val set = mutable.TreeSet("a", "b", "c", "d")
+    assertEquals("b", set.range("b", "c").mkString(","))
+  }
+}
-- 
cgit v1.2.3