Improved Mocking to allow use to use the stream().count() method.

cdk · Jan 1, 2022 · d0afb59 · d0afb59
1 parent f1248f8
commit d0afb59
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/base/isomorphism/src/main/java/org/openscience/cdk/isomorphism/Mappings.java b/base/isomorphism/src/main/java/org/openscience/cdk/isomorphism/Mappings.java
@@ -534,12 +534,7 @@ public int[] first() {
      * @return number of matches
      */
     public int count() {
-        // Note: doesn't work when mocked due to forEachRemaining
-        // return (int)stream().count();
-        int count = 0;
-        for (int[] m : iterable)
-            count++;
-        return count;
+        return (int)stream().count();
     }
 
     /**

diff --git a/tool/smarts/src/test/java/org/openscience/cdk/isomorphism/MappingsTest.java b/tool/smarts/src/test/java/org/openscience/cdk/isomorphism/MappingsTest.java
@@ -32,6 +32,7 @@
 
 import java.util.Iterator;
 import java.util.Map;
+import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Predicate;
 
@@ -42,6 +43,7 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.atMost;
+import static org.mockito.Mockito.doCallRealMethod;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -293,7 +295,8 @@ public void count() throws Exception {
         Iterator<int[]> iterator = mock(Iterator.class);
         when(iterable.iterator()).thenReturn(iterator);
         when(iterator.hasNext()).thenReturn(true, true, true, true, true, false);
-        when(iterator.next()).thenReturn(new int[0]);
+        doCallRealMethod().when(iterator)
+                          .forEachRemaining(ArgumentMatchers.any(Consumer.class));
 
         Mappings ms = new Mappings(mock(IAtomContainer.class), mock(IAtomContainer.class), iterable);
         assertThat(ms.count(), is(5));
@@ -306,6 +309,8 @@ public void countUnique() throws Exception {
         Iterator<int[]> iterator = mock(Iterator.class);
         when(iterable.iterator()).thenReturn(iterator);
         when(iterator.hasNext()).thenReturn(true, true, true, true, false);
+        doCallRealMethod().when(iterator)
+                .forEachRemaining(ArgumentMatchers.any(Consumer.class));
 
         int[] p1 = {0, 1, 2};
         int[] p2 = {0, 2, 1};