Add test and correct logic, trueBits needs to be set again.

johnmay · johnmay · commit 065380ca5118 · 2019-01-10T13:11:32.000Z
diff --git a/base/standard/src/main/java/org/openscience/cdk/fingerprint/IntArrayFingerprint.java b/base/standard/src/main/java/org/openscience/cdk/fingerprint/IntArrayFingerprint.java
@@ -169,16 +169,16 @@ public void set(int index, boolean value) {
             int[] tmp = new int[trueBits.length - 1];
             System.arraycopy(trueBits, 0, tmp, 0, i);
             System.arraycopy(trueBits, i + 1, tmp, i, trueBits.length - i - 1);
+            trueBits = tmp;
         }
         // bit at index is set to false and shall be set to true
         else if (i < 0 && value) {
             int[] tmp = new int[trueBits.length + 1];
             System.arraycopy(trueBits, 0, tmp, 0, trueBits.length);
             tmp[tmp.length - 1] = index;
             trueBits = tmp;
+            Arrays.sort(trueBits);
         }
-        //rest of possible ops are no-ops
-        Arrays.sort(trueBits);
     }
 
     @Override
@@ -203,7 +203,8 @@ public boolean equals(Object obj) {
         if (obj == null) return false;
         if (getClass() != obj.getClass()) return false;
         IntArrayFingerprint other = (IntArrayFingerprint) obj;
-        return Arrays.equals(trueBits, other.trueBits);
+        if (!Arrays.equals(trueBits, other.trueBits)) return false;
+        return true;
     }
 
     @Override
diff --git a/descriptor/fingerprint/src/test/java/org/openscience/cdk/fingerprint/IntArrayFingerprintTest.java b/descriptor/fingerprint/src/test/java/org/openscience/cdk/fingerprint/IntArrayFingerprintTest.java
@@ -22,10 +22,33 @@
  */
 package org.openscience.cdk.fingerprint;
 
+import org.junit.Assert;
+import org.junit.Test;
+
+import static org.hamcrest.CoreMatchers.is;
+
 public class IntArrayFingerprintTest extends AbstractBitFingerprintTest {
 
     public IntArrayFingerprintTest() throws Exception {
         super(IntArrayFingerprint.class);
     }
 
+    @Test
+    public void testSetBit() {
+        IntArrayFingerprint fp = new IntArrayFingerprint();
+        fp.set(1, true);
+        fp.set(55, true);
+        fp.set(219, true);
+        fp.set(3, true);
+        fp.set(24, true);
+        Assert.assertThat(new int[]{1, 3, 24, 55, 219},
+                          is(fp.getSetbits()));
+        fp.set(24, false);
+        Assert.assertThat(new int[]{1, 3, 55, 219},
+                          is(fp.getSetbits()));
+        fp.set(26, true);
+        Assert.assertThat(new int[]{1, 3, 26, 55, 219},
+                          is(fp.getSetbits()));
+    }
+
 }
