test: add a buffer of one tick to #expectedTimeNeeded (#49)

Author: drolpi

task/src/main/java/org/aero/common/task/count/AbstractCountingRunnable.java

@@ -17,19 +17,18 @@
 package org.aero.common.task.count;
 
 import java.util.concurrent.atomic.AtomicLong;
-import java.util.function.Consumer;
 import java.util.function.Supplier;
 
 @SuppressWarnings("MissingJavadocType")
 public abstract class AbstractCountingRunnable implements CountingRunnable {
 
     protected final Supplier<Boolean> condition;
-    protected final Consumer<Boolean> callback;
+    protected final Runnable callback;
     protected final int step;
     protected final AtomicLong count;
 
     @SuppressWarnings("MissingJavadocMethod")
-    public AbstractCountingRunnable(final int step, final long count, final Supplier<Boolean> condition, final Consumer<Boolean> callback) {
+    public AbstractCountingRunnable(final int step, final long count, final Supplier<Boolean> condition, final Runnable callback) {
         this.step = step;
         this.count = new AtomicLong(count);
         this.condition = condition;
@@ -39,11 +38,10 @@ public AbstractCountingRunnable(final int step, final long count, final Supplier
     @SuppressWarnings("MissingJavadocMethod")
     @Override
     public void run() {
-        final boolean result = this.condition.get();
-        if (result) {
+        if (this.condition.get()) {
             this.count.getAndAdd(this.step);
         }
-        this.callback.accept(result);
+        this.callback.run();
     }
 
     @SuppressWarnings("MissingJavadocMethod")

task/src/main/java/org/aero/common/task/count/CountingRunnable.java

@@ -19,7 +19,6 @@
 import org.aero.common.core.builder.IBuilder;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.function.Consumer;
 import java.util.function.Supplier;
 
 @SuppressWarnings("MissingJavadocType")
@@ -49,7 +48,7 @@ interface Builder extends IBuilder<CountingRunnable> {
         @NotNull Builder condition(Supplier<Boolean> condition);
 
         @SuppressWarnings("MissingJavadocMethod")
-        @NotNull Builder callback(Consumer<Boolean> callback);
+        @NotNull Builder callback(Runnable callback);
 
     }
 }

task/src/main/java/org/aero/common/task/count/CountingRunnableImpl.java

@@ -18,7 +18,6 @@
 
 import org.jetbrains.annotations.NotNull;
 
-import java.util.function.Consumer;
 import java.util.function.Supplier;
 
 @SuppressWarnings("MissingJavadocType")
@@ -33,7 +32,7 @@ static final class BuilderImpl implements CountingRunnable.Builder {
         private int step = 1;
         private long initial = 0;
         private Supplier<Boolean> condition;
-        private Consumer<Boolean> callback;
+        private Runnable callback;
 
         BuilderImpl() {
 
@@ -58,7 +57,7 @@ static final class BuilderImpl implements CountingRunnable.Builder {
         }
 
         @SuppressWarnings("MissingJavadocMethod")
-        public @NotNull CountingRunnableImpl.BuilderImpl callback(final Consumer<Boolean> callback) {
+        public @NotNull CountingRunnableImpl.BuilderImpl callback(final Runnable callback) {
             this.callback = callback;
             return this;
         }

task/src/main/java/org/aero/common/task/counter/CounterImpl.java

@@ -53,12 +53,12 @@ final class CounterImpl implements Counter {
         this.tickHandler = builder.tickHandler;
         this.finishHandler = builder.finishHandler;
         this.cancelHandler = builder.cancelHandler;
-        this.startCount = builder.startCount;
         this.stopCount = builder.stopCount;
         this.tick = builder.tick;
         this.tickUnit = builder.tickUnit;
         this.status = CounterStatus.IDLING;
-        this.step = this.stopCount > this.startCount ? 1 : -1;
+        this.step = this.stopCount > builder.startCount ? 1 : -1;
+        this.startCount = builder.startCount - this.step;
     }
 
     @Override
@@ -203,11 +203,11 @@ private boolean condition() {
         }
 
         this.handleTick();
-        return this.runnable.count() * this.step < this.stopCount * this.step;
+        return true;
     }
 
-    private void tick(final boolean result) {
-        if (result) {
+    private void tick() {
+        if (this.step * (this.step - this.runnable.count() + this.stopCount) > 0) {
             return;
         }
 

task/src/test/java/org/aero/common/task/counter/CounterTest.java

@@ -221,8 +221,8 @@ void testCancelCallback(final Counter.Builder counterBuilder) {
     }
 
     private long expectedTimeNeeded(final Counter counter) {
-        //A buffer of one tick added.
-        return counter.tickUnit().toMillis(this.ticksToFinish(counter) * counter.tickValue());
+        //Adding a buffer of one tick
+        return counter.tickUnit().toMillis((this.ticksToFinish(counter) + 1) * counter.tickValue());
     }
 
     private long ticksToFinish(final Counter counter) {