Fix some Jester complaints.

donkirkby · Aug 9, 2015 · 38fabdb · 38fabdb
1 parent b3d7721
commit 38fabdb
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 5 deletions.
diff --git a/core/src/com/github/donkirkby/vograbulary/Scheduler.java b/core/src/com/github/donkirkby/vograbulary/Scheduler.java
@@ -1,7 +1,13 @@
 package com.github.donkirkby.vograbulary;
 
 public interface Scheduler {
+    /** Schedule a task to repeat.
+     */
     public void scheduleRepeating(Runnable task, int periodMilliseconds);
 
+    /** Cancel a scheduled task.
+     * 
+     * If the task is not scheduled or is null, do nothing.
+     */
     public void cancel(Runnable task);
 }
diff --git a/core/src/com/github/donkirkby/vograbulary/ultraghost/Controller.java b/core/src/com/github/donkirkby/vograbulary/ultraghost/Controller.java
@@ -73,7 +73,7 @@ public void setScheduler(Scheduler scheduler) {
     private class ScoreTask implements Runnable {
         @Override
         public void run() {
-            screen.getMatch().getPuzzle().adjustScore(SCORE_MILLISECONDS / 1000.0f);
+            screen.getMatch().getPuzzle().adjustScore(SCORE_MILLISECONDS / 1000f);
             screen.refreshScore();
         }
     }
@@ -186,9 +186,7 @@ public void solve() {
                     student.prepareResponse();
                 }
             }
-            if (searchTask != null) {
-                scheduler.cancel(searchTask);
-            }
+            scheduler.cancel(searchTask);
         }
         screen.refreshPuzzle();
     }

diff --git a/core/src/com/github/donkirkby/vograbulary/ultraghost/Puzzle.java b/core/src/com/github/donkirkby/vograbulary/ultraghost/Puzzle.java
@@ -146,9 +146,12 @@ public void setHint(String hint) {
      * UKNOWN until a solution and response have been entered.
      */
     public WordResult getResult() {
+        //stopJesting
         if (cachedResult != WordResult.UNKNOWN) {
             return cachedResult;
         }
+        //resumeJesting
+
         if (solution == NOT_SET) {
             return WordResult.UNKNOWN;
         }
@@ -183,7 +186,7 @@ else if (solution == NO_SOLUTION) {
         }
         if (isCompleted()) {
             if (isTimedOut) {
-                if (resultText.length() > 0) {
+                if (resultText.length() != 0) {
                     resultText += "and ";
                 }
                 resultText += "out of time ";

diff --git a/vograbulary-test/src/com/github/donkirkby/vograbulary/ultraghost/ControllerTest.java b/vograbulary-test/src/com/github/donkirkby/vograbulary/ultraghost/ControllerTest.java
@@ -440,6 +440,37 @@ public void adjustScore() {
         assertThat("refresh count", screen.getScoreRefreshCount(), is(loopCount));
     }
 
+    @Test
+    public void adjustScoreRoundToZero() {
+        controller.start();
+        Puzzle puzzle = screen.getPuzzle();
+
+        int seconds = (int) Puzzle.MAX_DELAY;
+        int loopCount = seconds * 1000 / Controller.SCORE_MILLISECONDS - 2;
+        for (int i = 0; i < loopCount; i++) {
+            scoreTask.run();
+        }
+
+        assertThat("score", puzzle.getScore(WordResult.NOT_IMPROVED), is(0));
+    }
+
+    @Test
+    public void adjustScoreOnResponseUntilTimeout() {
+        random.setPuzzles("RPE");
+        controller.start();
+        Puzzle puzzle = screen.getPuzzle();
+
+        puzzle.setSolution("ROPE");
+        controller.solve();
+        int seconds = (int) Puzzle.MAX_DELAY/2;
+        int loopCount = seconds * 1000 / Controller.SCORE_MILLISECONDS;
+        for (int i = 0; i < loopCount; i++) {
+            scoreTask.run();
+        }
+
+        assertThat("score", puzzle.getScore(WordResult.NOT_IMPROVED), is(100));
+    }
+
     @Test
     public void newMatch() {
         controller.start();

diff --git a/vograbulary-test/src/com/github/donkirkby/vograbulary/ultraghost/PuzzleTest.java b/vograbulary-test/src/com/github/donkirkby/vograbulary/ultraghost/PuzzleTest.java
@@ -228,6 +228,17 @@ public void getDisplayAfterSkip() {
         assertThat("display", display, is("skipping -20 of 20"));
     }
 
+    @Test
+    public void getDisplayAfterResponse() {
+        float seconds = 20;
+        puzzle.adjustScore(seconds);
+        puzzle.setSolution("");
+        puzzle.setResponse("PIPE");
+        String display = puzzle.getResultDisplay();
+
+        assertThat("display", display, is("word found (-20 of 20)"));
+    }
+
     @Test
     public void getDisplayAfterInvalidResponse() {
         float seconds = 20;