Adding test and implementation of 'equals' on hash collision nodes in…

… multi-map. Refers to issue #16.
usethesource · Jun 30, 2017 · 25c0120 · 25c0120
1 parent 649a816
commit 25c0120
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 11 deletions.
diff --git a/capsule-core/pom.xml b/capsule-core/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>io.usethesource</groupId>
     <artifactId>capsule-pom-parent</artifactId>
-    <version>0.3.0</version>
+    <version>0.3.2-SNAPSHOT</version>
   </parent>
 
   <groupId>io.usethesource</groupId>
   <artifactId>capsule</artifactId>
-  <version>0.3.0</version>
+  <version>0.3.2-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <properties>

diff --git a/capsule-core/src/main/java/io/usethesource/capsule/core/PersistentTrieSetMultimap.java b/capsule-core/src/main/java/io/usethesource/capsule/core/PersistentTrieSetMultimap.java
@@ -2640,6 +2640,34 @@ PersistentTrieSet.AbstractSetNode<K> toSetNode(AtomicReference<Thread> mutator)
     // (K[]) collisionContent.stream().map(Map.Entry::getKey).toArray());
     // }
 
+    @Override
+    public boolean equals(final Object other) {
+      if (null == other) {
+        return false;
+      }
+      if (this == other) {
+        return true;
+      }
+      if (getClass() != other.getClass()) {
+        return false;
+      }
+
+      HashCollisionNode<?, ?> that = (HashCollisionNode<?, ?>) other;
+
+      if (hash != that.hash) {
+        return false;
+      }
+
+      if (collisionContent.size() != that.collisionContent.size()) {
+        return false;
+      }
+
+      /*
+       * Linear scan for each payload entry due to arbitrary element order.
+       */
+      return collisionContent.stream().allMatch(that.collisionContent::contains);
+    }
+
     @Override
     byte sizePredicate() {
       return SIZE_MORE_THAN_ONE;

diff --git a/capsule-experimental/pom.xml b/capsule-experimental/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>io.usethesource</groupId>
     <artifactId>capsule-pom-parent</artifactId>
-    <version>0.3.0</version>
+    <version>0.3.2-SNAPSHOT</version>
   </parent>
 
   <groupId>io.usethesource</groupId>
   <artifactId>capsule-experimental</artifactId>
-  <version>0.3.0</version>
+  <version>0.3.2-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <properties>
@@ -20,7 +20,7 @@
     <dependency>
       <groupId>io.usethesource</groupId>
       <artifactId>capsule</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.2-SNAPSHOT</version>
     </dependency>
   </dependencies>
 

diff --git a/capsule-veritas/pom.xml b/capsule-veritas/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>io.usethesource</groupId>
     <artifactId>capsule-pom-parent</artifactId>
-    <version>0.3.0</version>
+    <version>0.3.2-SNAPSHOT</version>
   </parent>
 
   <groupId>io.usethesource</groupId>
   <artifactId>capsule-veritas</artifactId>
-  <version>0.3.0</version>
+  <version>0.3.2-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <properties>
@@ -42,12 +42,12 @@
     <dependency>
       <groupId>io.usethesource</groupId>
       <artifactId>capsule</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.usethesource</groupId>
       <artifactId>capsule-experimental</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.pholser</groupId>

diff --git a/pom.xml b/pom.xml
@@ -4,12 +4,12 @@
 
   <groupId>io.usethesource</groupId>
   <artifactId>capsule-pom-parent</artifactId>
-  <version>0.3.0</version>
+  <version>0.3.2-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <scm>
     <developerConnection>scm:git:https://github.com/usethesource/capsule.git</developerConnection>
-    <tag>v0.3.0</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <modules>