Add missing equals definition on DictionaryWrapper

scala · Jun 20, 2023 · 0b0478a · 0b0478a
1 parent 941a83f
commit 0b0478a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/src/library/scala/collection/convert/JavaCollectionWrappers.scala b/src/library/scala/collection/convert/JavaCollectionWrappers.scala
@@ -552,6 +552,13 @@ private[collection] object JavaCollectionWrappers extends Serializable {
     } catch {
       case ex: ClassCastException => null.asInstanceOf[V]
     }
+
+    override def equals(other: Any): Boolean = other match {
+      case that: DictionaryWrapper[_, _] => this.underlying == that.underlying
+      case _ => false
+    }
+
+    override def hashCode: Int = underlying.hashCode()
   }
 
   @SerialVersionUID(3L)

diff --git a/test/junit/scala/collection/convert/EqualsTest.scala b/test/junit/scala/collection/convert/EqualsTest.scala
@@ -135,9 +135,11 @@ class EqualsTest {
 
     val iterator = Iterator.empty[String]
     assertEquals(iterator.asJava, iterator.asJava)
+    assertEquals(iterator.asJavaEnumeration, iterator.asJavaEnumeration)
 
     val iterable = Iterable.empty[String]
     assertEquals(iterable.asJava, iterable.asJava)
+    assertEquals(iterable.asJavaCollection, iterable.asJavaCollection)
 
     val buffer = mutable.Buffer.empty[String]
     assertEquals(buffer.asJava, buffer.asJava)
@@ -153,6 +155,7 @@ class EqualsTest {
 
     val mutableMap = mutable.Map.empty[String, String]
     assertEquals(mutableMap.asJava, mutableMap.asJava)
+    assertEquals(mutableMap.asJavaDictionary, mutableMap.asJavaDictionary)
 
     val map = Map.empty[String, String]
     assertEquals(map.asJava, map.asJava)