Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/main/java/org/gitlab4j/api/PagerSpliterator.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package org.gitlab4j.api;

import java.util.Collections;
import java.util.Iterator;
import java.util.Spliterator;
import java.util.function.Consumer;
Expand All @@ -14,11 +15,16 @@ class PagerSpliterator<T> implements Spliterator<T> {
this.pager = pager;
if (pager.hasNext()) {
elements = this.pager.next().iterator();
} else {
elements = Collections.emptyIterator();
}
}

@Override
public boolean tryAdvance(Consumer<? super T> action) {
if (action == null) {
throw new NullPointerException("Action is null");
}
if (elements.hasNext()) {
action.accept(elements.next());
return true;
Expand All @@ -42,6 +48,6 @@ public long estimateSize() {

@Override
public int characteristics() {
return 0;
return SIZED | NONNULL;
}
}
56 changes: 56 additions & 0 deletions src/test/java/org/gitlab4j/api/PagerSpliteratorTest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
package org.gitlab4j.api;

import java.util.Collections;

import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.when;

@RunWith(MockitoJUnitRunner.class)
public class PagerSpliteratorTest {

PagerSpliterator<Integer> pagerSpliterator;

@Mock
Pager pager;

@Before
public void setUp() {
pagerSpliterator = new PagerSpliterator<>(pager);
}

@Test
public void shouldAcceptElementFromSource() {
when(pager.hasNext()).thenReturn(true);
when(pager.next()).thenReturn(Collections.singletonList(1));

boolean success = pagerSpliterator.tryAdvance(System.out::println);

assertTrue(success);
}

@Test
public void shouldDoNotFailOnEmptySource() {
boolean success = pagerSpliterator.tryAdvance(System.out::println);

assertFalse(success);
}

@Test
public void shouldThrowNullPointerExceptionWhenActionIsMissing() {
try {
pagerSpliterator.tryAdvance(null);
Assert.fail("Missing NullPointerException");
} catch (Throwable e) {
assertEquals(NullPointerException.class, e.getClass());
}
}
}