Lots of work on the stateful checking stuff: it's a fair bit nicer now

12 files changed, 257 insertions, 139 deletions

diff --git a/src/test/java/au/id/zancanaro/javacheck/state/queue/MyQueue.java b/src/test/java/au/id/zancanaro/javacheck/state/queue/MyQueue.java
new file mode 100644
index 0000000..a820532
--- /dev/null
+++ b/src/test/java/au/id/zancanaro/javacheck/state/queue/MyQueue.java
@@ -0,0 +1,38 @@
+package au.id.zancanaro.javacheck.state.queue;
+
+import java.util.AbstractQueue;
+import java.util.Iterator;
+import java.util.LinkedList;
+
+public class MyQueue<T> extends AbstractQueue<T> {
+    public final LinkedList<T> list;
+
+    public MyQueue() {
+        this.list = new LinkedList<>();
+    }
+
+    @Override
+    public Iterator<T> iterator() {
+        return list.iterator();
+    }
+
+    @Override
+    public int size() {
+        return list.size();
+    }
+
+    @Override
+    public boolean offer(T t) {
+        return list.offer(t);
+    }
+
+    @Override
+    public T poll() {
+        return list.poll();
+    }
+
+    @Override
+    public T peek() {
+        return list.peek();
+    }
+}
diff --git a/src/test/java/au/id/zancanaro/javacheck/state/queue/PopQueueCommand.java b/src/test/java/au/id/zancanaro/javacheck/state/queue/PopQueueCommand.java
deleted file mode 100644
index f8a018c..0000000
--- a/src/test/java/au/id/zancanaro/javacheck/state/queue/PopQueueCommand.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package au.id.zancanaro.javacheck.state.queue;
-
-import au.id.zancanaro.javacheck.Generator;
-import au.id.zancanaro.javacheck.state.Command;
-import au.id.zancanaro.javacheck.state.CommandValue;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Queue;
-
-import static au.id.zancanaro.javacheck.Generator.pure;
-
-public class PopQueueCommand<T> extends Command<QueueState<T>, PopQueueCommand.ArgsType<T>, T> {
-    @Override
-    public Generator<ArgsType<T>> argsGenerator(QueueState<T> tQueueState) {
-        return pure(tQueueState.getConcreteQueue()).map(x -> new ArgsType<>(x));
-    }
-
-    @Override
-    public boolean preCondition(QueueState<T> state, ArgsType<T> args) {
-        return state != null && !state.getAbstractQueue().isEmpty();
-    }
-
-    @Override
-    public T runCommand(ArgsType<T> args) {
-        return args.queue.get().poll();
-    }
-
-    @Override
-    public QueueState<T> nextState(QueueState<T> state, ArgsType<T> args, CommandValue<T> result) {
-        List<T> newState = new ArrayList<>(state.getAbstractQueue());
-        newState.remove(0);
-        return new QueueState<>(state.getConcreteQueue(), newState);
-    }
-
-    @Override
-    public boolean postCondition(QueueState<T> oldState, QueueState<T> newState, ArgsType<T> args, T result) {
-        return oldState.getAbstractQueue().get(0) == result;
-    }
-
-    @Override
-    public String toString() {
-        return "pop";
-    }
-
-    static class ArgsType<T> {
-        public final CommandValue<Queue<T>> queue;
-
-        public ArgsType(CommandValue<Queue<T>> queue) {
-            this.queue = queue;
-        }
-
-        @Override
-        public String toString() {
-            return "[" + queue + "]";
-        }
-    }
-}
diff --git a/src/test/java/au/id/zancanaro/javacheck/state/queue/PushQueueCommand.java b/src/test/java/au/id/zancanaro/javacheck/state/queue/PushQueueCommand.java
deleted file mode 100644
index b198eb5..0000000
--- a/src/test/java/au/id/zancanaro/javacheck/state/queue/PushQueueCommand.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package au.id.zancanaro.javacheck.state.queue;
-
-import au.id.zancanaro.javacheck.Generator;
-import au.id.zancanaro.javacheck.state.Command;
-import au.id.zancanaro.javacheck.state.CommandValue;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Queue;
-
-public class PushQueueCommand<T> extends Command<QueueState<T>, PushQueueCommand.ArgsType<T>, Void> {
-    public final Generator<T> generator;
-
-    public PushQueueCommand(Generator<T> argGen) {
-        this.generator = argGen;
-    }
-
-    @Override
-    public Generator<ArgsType<T>> argsGenerator(QueueState<T> state) {
-        return generator.map(i -> new ArgsType<>(state.getConcreteQueue(), i));
-    }
-
-    @Override
-    public Void runCommand(ArgsType<T> args) {
-        args.queue.get().offer(args.pushValue);
-        return null;
-    }
-
-    @Override
-    public QueueState<T> nextState(QueueState<T> state, ArgsType<T> args, CommandValue<Void> result) {
-        List<T> newState = new ArrayList<>(state.getAbstractQueue());
-        newState.add(args.pushValue);
-        return new QueueState<>(state.getConcreteQueue(), newState);
-    }
-
-    @Override
-    public boolean preCondition(QueueState<T> state, ArgsType<T> args) {
-        return state != null;
-    }
-
-    @Override
-    public String toString() {
-        return "push";
-    }
-
-    static class ArgsType<T> {
-        public final CommandValue<Queue<T>> queue;
-        public final T pushValue;
-
-        public ArgsType(CommandValue<Queue<T>> queue, T pushValue) {
-            this.queue = queue;
-            this.pushValue = pushValue;
-        }
-
-        @Override
-        public String toString() {
-            return "[" + queue + ", " + pushValue + "]";
-        }
-    }
-}
diff --git a/src/test/java/au/id/zancanaro/javacheck/state/queue/QueueState.java b/src/test/java/au/id/zancanaro/javacheck/state/queue/QueueState.java
index e4f65f8..6cd6cf8 100644
--- a/src/test/java/au/id/zancanaro/javacheck/state/queue/QueueState.java
+++ b/src/test/java/au/id/zancanaro/javacheck/state/queue/QueueState.java
@@ -14,8 +14,12 @@ public class QueueState<T> {
         this.abstractQueue = abstractQueue;
     }
 
-    public CommandValue<Queue<T>> getConcreteQueue() {
-        return concreteQueue;
+    public QueueState<T> withAbstractQueue(List<T> abstractQueue) {
+        return new QueueState<>(this.concreteQueue, abstractQueue);
+    }
+
+    public Queue<T> getConcreteQueue() {
+        return concreteQueue.get();
     }
 
     public List<T> getAbstractQueue() {
diff --git a/src/test/java/au/id/zancanaro/javacheck/state/queue/QueueTest.java b/src/test/java/au/id/zancanaro/javacheck/state/queue/QueueTest.java
index 083a8ad..9672fca 100644
--- a/src/test/java/au/id/zancanaro/javacheck/state/queue/QueueTest.java
+++ b/src/test/java/au/id/zancanaro/javacheck/state/queue/QueueTest.java
@@ -3,29 +3,33 @@ package au.id.zancanaro.javacheck.state.queue;
 import au.id.zancanaro.javacheck.Generator;
 import au.id.zancanaro.javacheck.annotations.DataSource;
 import au.id.zancanaro.javacheck.annotations.Property;
-import au.id.zancanaro.javacheck.annotations.Seed;
 import au.id.zancanaro.javacheck.junit.Properties;
 import au.id.zancanaro.javacheck.state.*;
+import au.id.zancanaro.javacheck.state.queue.commands.*;
 import org.junit.runner.RunWith;
 
-import java.util.*;
+import java.util.LinkedList;
 
 import static au.id.zancanaro.javacheck.Generator.pure;
+import static au.id.zancanaro.javacheck.Generators.elements;
 import static au.id.zancanaro.javacheck.Generators.integer;
-import static au.id.zancanaro.javacheck.Generators.oneOf;
 import static org.junit.Assert.assertFalse;
 
 @RunWith(Properties.class)
 public class QueueTest {
     @DataSource
     public static Generator<CommandList<QueueState<Integer>>> commandGenerator =
-            new CommandListGenerator<>(state ->
+            new CommandListGenerator<>(null, state ->
                     state == null ?
-                            pure(new NewQueueCommand<>()) :
-                            oneOf(
-                                    pure(new PopQueueCommand<>()),
-                                    pure(new PushQueueCommand<>(integer()))
-                            ));
+                            pure(new New<>()) :
+                            elements(
+                                    new New<>(),
+                                    new Poll<>(),
+                                    new Peek<>(),
+                                    new Offer<>(integer()),
+                                    new Size<>(),
+                                    new Clear<>(),
+                                    new Iterator<>()));
 
     @Property
     public void test(CommandList<QueueState<Integer>> commands) throws Throwable {
diff --git a/src/test/java/au/id/zancanaro/javacheck/state/queue/commands/Clear.java b/src/test/java/au/id/zancanaro/javacheck/state/queue/commands/Clear.java
new file mode 100644
index 0000000..2e88796
--- /dev/null
+++ b/src/test/java/au/id/zancanaro/javacheck/state/queue/commands/Clear.java
@@ -0,0 +1,29 @@
+package au.id.zancanaro.javacheck.state.queue.commands;
+
+import au.id.zancanaro.javacheck.Generator;
+import au.id.zancanaro.javacheck.state.Command;
+import au.id.zancanaro.javacheck.state.CommandValue;
+import au.id.zancanaro.javacheck.state.queue.QueueState;
+
+import java.util.ArrayList;
+import java.util.Queue;
+
+import static org.junit.Assert.assertEquals;
+
+public class Clear<T> extends Command<QueueState<T>, Void, Void> {
+    @Override
+    public boolean preCondition(QueueState<T> state, Void args) {
+        return state != null;
+    }
+
+    @Override
+    public Void runCommand(QueueState<T> state, Void args) {
+        state.getConcreteQueue().clear();
+        return null;
+    }
+
+    @Override
+    public QueueState<T> nextState(QueueState<T> state, Void args, CommandValue<Void> result) {
+        return state.withAbstractQueue(new ArrayList<>());
+    }
+}
diff --git a/src/test/java/au/id/zancanaro/javacheck/state/queue/commands/Iterator.java b/src/test/java/au/id/zancanaro/javacheck/state/queue/commands/Iterator.java
new file mode 100644
index 0000000..361abd6
--- /dev/null
+++ b/src/test/java/au/id/zancanaro/javacheck/state/queue/commands/Iterator.java
@@ -0,0 +1,31 @@
+package au.id.zancanaro.javacheck.state.queue.commands;
+
+import au.id.zancanaro.javacheck.state.Command;
+import au.id.zancanaro.javacheck.state.queue.QueueState;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+
+public class Iterator<T> extends Command<QueueState<T>, Void, java.util.Iterator<T>> {
+    @Override
+    public boolean preCondition(QueueState<T> state, Void args) {
+        return state != null;
+    }
+
+    @Override
+    public java.util.Iterator<T> runCommand(QueueState<T> state, Void args) {
+        return state.getConcreteQueue().iterator();
+    }
+
+    @Override
+    public void postCondition(QueueState<T> oldState, QueueState<T> newState, Void args, java.util.Iterator<T> result) throws Throwable {
+        java.util.Iterator<T> abstractIterator = oldState.getAbstractQueue().iterator();
+        while (abstractIterator.hasNext() && result.hasNext()) {
+            assertEquals(abstractIterator.next(), result.next());
+        }
+        assertFalse("The abstract iterator is 'longer' than the concrete iterator",
+                abstractIterator.hasNext());
+        assertFalse("The concrete iterator is 'longer' than the abstract iterator",
+                result.hasNext());
+    }
+}
diff --git a/src/test/java/au/id/zancanaro/javacheck/state/queue/NewQueueCommand.java b/src/test/java/au/id/zancanaro/javacheck/state/queue/commands/New.java
index d2815dc..114e7ba 100644
--- a/src/test/java/au/id/zancanaro/javacheck/state/queue/NewQueueCommand.java
+++ b/src/test/java/au/id/zancanaro/javacheck/state/queue/commands/New.java
@@ -1,30 +1,27 @@
-package au.id.zancanaro.javacheck.state.queue;
+package au.id.zancanaro.javacheck.state.queue.commands;
 
 import au.id.zancanaro.javacheck.state.Command;
 import au.id.zancanaro.javacheck.state.CommandValue;
+import au.id.zancanaro.javacheck.state.queue.MyQueue;
+import au.id.zancanaro.javacheck.state.queue.QueueState;
+import org.junit.Assume;
 
 import java.util.ArrayList;
-import java.util.LinkedList;
 import java.util.Queue;
 
-public class NewQueueCommand<T> extends Command<QueueState<T>, Void, Queue<T>> {
+public class New<T> extends Command<QueueState<T>, Void, Queue<T>> {
     @Override
     public boolean preCondition(QueueState<T> state, Void args) {
         return state == null;
     }
 
     @Override
-    public Queue<T> runCommand(Void args) {
-        return new LinkedList<>();
+    public Queue<T> runCommand(QueueState<T> state, Void args) {
+        return new MyQueue<>();
     }
 
     @Override
     public QueueState<T> nextState(QueueState<T> state, Void args, CommandValue<Queue<T>> result) {
         return new QueueState<>(result, new ArrayList<>());
     }
-
-    @Override
-    public String toString() {
-        return "new";
-    }
 }
diff --git a/src/test/java/au/id/zancanaro/javacheck/state/queue/commands/Offer.java b/src/test/java/au/id/zancanaro/javacheck/state/queue/commands/Offer.java
new file mode 100644
index 0000000..301efeb
--- /dev/null
+++ b/src/test/java/au/id/zancanaro/javacheck/state/queue/commands/Offer.java
@@ -0,0 +1,41 @@
+package au.id.zancanaro.javacheck.state.queue.commands;
+
+import au.id.zancanaro.javacheck.Generator;
+import au.id.zancanaro.javacheck.state.Command;
+import au.id.zancanaro.javacheck.state.CommandValue;
+import au.id.zancanaro.javacheck.state.queue.QueueState;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Queue;
+
+public class Offer<T> extends Command<QueueState<T>, T, Void> {
+    public final Generator<T> generator;
+
+    public Offer(Generator<T> argGen) {
+        this.generator = argGen;
+    }
+
+    @Override
+    public Generator<T> argsGenerator(QueueState<T> state) {
+        return generator;
+    }
+
+    @Override
+    public boolean preCondition(QueueState<T> state, T args) {
+        return state != null;
+    }
+
+    @Override
+    public Void runCommand(QueueState<T> state, T args) {
+        state.getConcreteQueue().offer(args);
+        return null;
+    }
+
+    @Override
+    public QueueState<T> nextState(QueueState<T> state, T args, CommandValue<Void> result) {
+        List<T> newState = new ArrayList<>(state.getAbstractQueue());
+        newState.add(args);
+        return state.withAbstractQueue(newState);
+    }
+}
diff --git a/src/test/java/au/id/zancanaro/javacheck/state/queue/commands/Peek.java b/src/test/java/au/id/zancanaro/javacheck/state/queue/commands/Peek.java
new file mode 100644
index 0000000..5bb71a9
--- /dev/null
+++ b/src/test/java/au/id/zancanaro/javacheck/state/queue/commands/Peek.java
@@ -0,0 +1,28 @@
+package au.id.zancanaro.javacheck.state.queue.commands;
+
+import au.id.zancanaro.javacheck.Generator;
+import au.id.zancanaro.javacheck.state.Command;
+import au.id.zancanaro.javacheck.state.CommandValue;
+import au.id.zancanaro.javacheck.state.queue.QueueState;
+
+import java.util.Queue;
+
+import static au.id.zancanaro.javacheck.Generator.pure;
+import static org.junit.Assert.assertEquals;
+
+public class Peek<T> extends Command<QueueState<T>, Void, T> {
+    @Override
+    public boolean preCondition(QueueState<T> state, Void args) {
+        return state != null && !state.getAbstractQueue().isEmpty();
+    }
+
+    @Override
+    public T runCommand(QueueState<T> state, Void args) {
+        return state.getConcreteQueue().peek();
+    }
+
+    @Override
+    public void postCondition(QueueState<T> oldState, QueueState<T> newState, Void args, T result) {
+        assertEquals(oldState.getAbstractQueue().get(0), result);
+    }
+}
diff --git a/src/test/java/au/id/zancanaro/javacheck/state/queue/commands/Poll.java b/src/test/java/au/id/zancanaro/javacheck/state/queue/commands/Poll.java
new file mode 100644
index 0000000..b5e0d98
--- /dev/null
+++ b/src/test/java/au/id/zancanaro/javacheck/state/queue/commands/Poll.java
@@ -0,0 +1,37 @@
+package au.id.zancanaro.javacheck.state.queue.commands;
+
+import au.id.zancanaro.javacheck.Generator;
+import au.id.zancanaro.javacheck.state.Command;
+import au.id.zancanaro.javacheck.state.CommandValue;
+import au.id.zancanaro.javacheck.state.queue.QueueState;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Queue;
+
+import static au.id.zancanaro.javacheck.Generator.pure;
+import static org.junit.Assert.assertEquals;
+
+public class Poll<T> extends Command<QueueState<T>, Void, T> {
+    @Override
+    public boolean preCondition(QueueState<T> state, Void args) {
+        return state != null && !state.getAbstractQueue().isEmpty();
+    }
+
+    @Override
+    public T runCommand(QueueState<T> state, Void args) {
+        return state.getConcreteQueue().poll();
+    }
+
+    @Override
+    public QueueState<T> nextState(QueueState<T> state, Void args, CommandValue<T> result) {
+        List<T> newState = new ArrayList<>(state.getAbstractQueue());
+        newState.remove(0);
+        return state.withAbstractQueue(newState);
+    }
+
+    @Override
+    public void postCondition(QueueState<T> oldState, QueueState<T> newState, Void args, T result) {
+        assertEquals(oldState.getAbstractQueue().get(0), result);
+    }
+}
diff --git a/src/test/java/au/id/zancanaro/javacheck/state/queue/commands/Size.java b/src/test/java/au/id/zancanaro/javacheck/state/queue/commands/Size.java
new file mode 100644
index 0000000..ba9d196
--- /dev/null
+++ b/src/test/java/au/id/zancanaro/javacheck/state/queue/commands/Size.java
@@ -0,0 +1,27 @@
+package au.id.zancanaro.javacheck.state.queue.commands;
+
+import au.id.zancanaro.javacheck.Generator;
+import au.id.zancanaro.javacheck.state.Command;
+import au.id.zancanaro.javacheck.state.CommandValue;
+import au.id.zancanaro.javacheck.state.queue.QueueState;
+
+import java.util.Queue;
+
+import static org.junit.Assert.assertEquals;
+
+public class Size<T> extends Command<QueueState<T>, Void, Integer> {
+    @Override
+    public boolean preCondition(QueueState<T> state, Void args) {
+        return state != null;
+    }
+
+    @Override
+    public Integer runCommand(QueueState<T> state, Void args) {
+        return state.getConcreteQueue().size();
+    }
+
+    @Override
+    public void postCondition(QueueState<T> oldState, QueueState<T> newState, Void args, Integer result) throws Throwable {
+        assertEquals((Object) oldState.getAbstractQueue().size(), result);
+    }
+}