diff --git a/vpro-shared-util/src/test/java/nl/vpro/util/BatchedReceiverSpliteratorTest.java b/vpro-shared-util/src/test/java/nl/vpro/util/BatchedReceiverSpliteratorTest.java index 0ee8067b5..0c30940ba 100644 --- a/vpro-shared-util/src/test/java/nl/vpro/util/BatchedReceiverSpliteratorTest.java +++ b/vpro-shared-util/src/test/java/nl/vpro/util/BatchedReceiverSpliteratorTest.java @@ -4,6 +4,7 @@ import java.util.List; import java.util.concurrent.atomic.AtomicInteger; +import org.assertj.core.api.InstanceOfAssertFactories; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -16,69 +17,68 @@ @Disabled("work in progress") public class BatchedReceiverSpliteratorTest { - - @Test - public void test() { - final List result = new ArrayList<>(); - for (int i = 0; i < 23; i++) { - result.add("a" + i); - } - BatchedReceiverSpliterator i = - BatchedReceiverSpliterator.builder()._build().builder() - .batchGetter((offset, max) -> - result.subList( - Math.min(offset.intValue(), result.size()), - Math.min(offset.intValue() + max, result.size())).iterator()) - .batchSize(6) - .build(); - - assertThat(i).asList().containsExactly(result.toArray(new String[0])); - - } - - - @Test - public void testWithOffset() { - final List result = new ArrayList<>(); - for (int i = 0; i < 23; i++) { - result.add("a" + i); - } - BatchedReceiverSpliterator i = - BatchedReceiverSpliterator.builder() - .batchGetter((offset, max) -> - result.subList( - Math.min(offset.intValue(), result.size()), - Math.min(offset.intValue() + max, result.size())).iterator()) - .batchSize(6) + @Test + public void test() { + final List result = new ArrayList<>(); + for (int i = 0; i < 23; i++) { + result.add("a" + i); + } + BatchedReceiverSpliterator i = + BatchedReceiverSpliterator.builder()._build().builder() + .batchGetter((offset, max) -> + result.subList( + Math.min(offset.intValue(), result.size()), + Math.min(offset.intValue() + max, result.size())).iterator()) + .batchSize(6) + .build(); + + assertThat(i).asList().containsExactly(result.toArray(new String[0])); + + } + + + @Test + public void testWithOffset() { + final List result = new ArrayList<>(); + for (int i = 0; i < 23; i++) { + result.add("a" + i); + } + BatchedReceiverSpliterator i = + BatchedReceiverSpliterator.builder() + .batchGetter((offset, max) -> + result.subList( + Math.min(offset.intValue(), result.size()), + Math.min(offset.intValue() + max, result.size())).iterator()) + .batchSize(6) .offset(10L) - .build(); - - assertThat(i) - .asList().containsExactly(result.subList(10, result.size()).toArray(new String[result.size() -10])); + .build(); - } + assertThat(i) + .asInstanceOf(InstanceOfAssertFactories.LIST) + .containsExactly((Object[]) result.subList(10, result.size()).toArray(new String[result.size() -10])); + } - @Test - public void testWithoutBatch() { - final List result = new ArrayList<>(); - for (int i = 0; i < 23; i++) { - result.add("a" + i); - } - AtomicInteger offset = new AtomicInteger(0); - BatchedReceiverSpliterator i = - BatchedReceiverSpliterator.builder() - .batchGetter(() -> { - int of = offset.getAndAdd(5); - return result.subList( - Math.min(of, result.size()), - Math.min(of + 5, result.size())).iterator(); - }) - .build(); - //assertThat(i).extracting().containsExactly(result.toArray(new String[0])); + @Test + public void testWithoutBatch() { + final List result = new ArrayList<>(); + for (int i = 0; i < 23; i++) { + result.add("a" + i); + } + AtomicInteger offset = new AtomicInteger(0); + BatchedReceiverSpliterator i = + BatchedReceiverSpliterator.builder() + .batchGetter(() -> { + int of = offset.getAndAdd(5); + return result.subList( + Math.min(of, result.size()), + Math.min(of + 5, result.size())).iterator(); + }) + .build(); - } + //assertThat(i).extracting().containsExactly(result.toArray(new String[0])); + } }