interim commit - need to fix interactive tests

Signed-off-by: Konstantin Läufer <laufer@cs.luc.edu>

Author: klaeufer

src/main/java/edu/luc/cs/consoleapp/Main.java

@@ -34,7 +34,7 @@ public static void main(final String[] args) {
     }
 
     final var input = new Scanner(System.in).useDelimiter("(?U)[^\\p{Alpha}0-9']+");
-    final var queue = new CircularFifoQueue<>(lastNWords);
+    final var queue = new CircularFifoQueue<String>(lastNWords);
 
     input.forEachRemaining(
         word -> {

src/main/java/edu/luc/cs/consoleapp/MainLeaky.java

@@ -56,7 +56,7 @@ private static class LeakyQueue {
     private final Queue<String> queue;
 
     public LeakyQueue(final int capacity) {
-      queue = new CircularFifoQueue<>(capacity);
+      queue = new CircularFifoQueue<String>(capacity);
     }
 
     private List<Queue<String>> process(final Stream<String> input) {

src/main/java/edu/luc/cs/consoleapp/MainStream.java

@@ -35,7 +35,7 @@ public static void main(final String[] args) {
     }
 
     final var input = new Scanner(System.in).useDelimiter("(?U)[^\\p{Alpha}0-9']+");
-    final var queue = new CircularFifoQueue<>(lastNWords);
+    final var queue = new CircularFifoQueue<String>(lastNWords);
 
     input
         .tokens()

src/main/java/edu/luc/cs/consoleapp/MainTestable.java

@@ -33,16 +33,15 @@ public static void main(final String[] args) {
     }
 
     final var input = new Scanner(System.in).useDelimiter("(?U)[^\\p{Alpha}0-9']+");
-    final var slidingQueue = new SlidingQueue(lastNWords);
-
     // an observer instance that sends updates to the console
     final OutputObserver outputToConsole =
         value -> {
           System.out.println(value);
           // terminate on I/O error such as SIGPIPE
           return !System.out.checkError();
         };
+    final var slidingQueue = new SlidingQueue(lastNWords, input.tokens(), outputToConsole);
 
-    slidingQueue.process(input.tokens(), outputToConsole);
+    slidingQueue.process();
   }
 }

src/main/java/edu/luc/cs/consoleapp/SlidingQueue.java

@@ -9,11 +9,17 @@ class SlidingQueue {
 
   protected final Queue<String> queue;
 
-  public SlidingQueue(final int queueSize) {
+  protected final Stream<String> input;
+
+  protected final OutputObserver output;
+
+  public SlidingQueue(final int queueSize, final Stream<String> input, final OutputObserver output) {
     this.queue = new CircularFifoQueue<>(queueSize);
+    this.input = input;
+    this.output = output;
   }
 
-  public void process(final Stream<String> input, final OutputObserver output) {
+  public void process() {
     input
         .takeWhile(
             word -> {

src/test/java/edu/luc/cs/consoleapp/TestSlidingQueue.java

@@ -14,21 +14,20 @@ public class TestSlidingQueue {
 
   @Test
   public void testSlidingWindowEmpty() {
-    final var sut = new SlidingQueue(3);
     final var input = Stream.<String>empty();
-    // an observer instance that sends updates to a buffer (list) for testing
     final var outputToList = new OutputToList();
-    sut.process(input, outputToList);
+    final var sut = new SlidingQueue(3, input, outputToList);
+    sut.process();
     final var result = outputToList.result;
     assertTrue(result.isEmpty());
   }
 
   @Test
   public void testSlidingWindowNonempty() {
-    final var sut = new SlidingQueue(3);
     final var input = Stream.of("asdf", "qwer", "oiui", "zxcv");
     final var outputToList = new OutputToList();
-    sut.process(input, outputToList);
+    final var sut = new SlidingQueue(3, input, outputToList);
+    sut.process();
     final var result = outputToList.result;
     assertEquals(4, result.size());
     assertEquals(List.of("asdf"), result.get(0));

src/test/java/edu/luc/cs/consoleapp/TestSlidingQueueInteractive.java

@@ -26,7 +26,7 @@ public void testInteractiveBehavior() {
     expectedTrace.add(new InputEvent("zxcv"));
     expectedTrace.add(new OutputEvent("qwer", "oiui", "zxcv"));
     // create and exercise the SUT
-    final var sut = new SlidingQueue(3);
+    final var sut = new SlidingQueue(3, input,);
     final var actualTrace = new Tracing(sut).run(input);
     // make sure the expected and actual traces match
     assertEquals(expectedTrace, actualTrace);