Skip to content

Commit 0b0478a

Browse files
committed
Add missing equals definition on DictionaryWrapper
1 parent 941a83f commit 0b0478a

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

src/library/scala/collection/convert/JavaCollectionWrappers.scala

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -552,6 +552,13 @@ private[collection] object JavaCollectionWrappers extends Serializable {
552552
} catch {
553553
case ex: ClassCastException => null.asInstanceOf[V]
554554
}
555+
556+
override def equals(other: Any): Boolean = other match {
557+
case that: DictionaryWrapper[_, _] => this.underlying == that.underlying
558+
case _ => false
559+
}
560+
561+
override def hashCode: Int = underlying.hashCode()
555562
}
556563

557564
@SerialVersionUID(3L)

test/junit/scala/collection/convert/EqualsTest.scala

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,11 @@ class EqualsTest {
135135

136136
val iterator = Iterator.empty[String]
137137
assertEquals(iterator.asJava, iterator.asJava)
138+
assertEquals(iterator.asJavaEnumeration, iterator.asJavaEnumeration)
138139

139140
val iterable = Iterable.empty[String]
140141
assertEquals(iterable.asJava, iterable.asJava)
142+
assertEquals(iterable.asJavaCollection, iterable.asJavaCollection)
141143

142144
val buffer = mutable.Buffer.empty[String]
143145
assertEquals(buffer.asJava, buffer.asJava)
@@ -153,6 +155,7 @@ class EqualsTest {
153155

154156
val mutableMap = mutable.Map.empty[String, String]
155157
assertEquals(mutableMap.asJava, mutableMap.asJava)
158+
assertEquals(mutableMap.asJavaDictionary, mutableMap.asJavaDictionary)
156159

157160
val map = Map.empty[String, String]
158161
assertEquals(map.asJava, map.asJava)

0 commit comments

Comments
 (0)