Removed console noise caused by bot thread dying (as expected) from exception test

Author: dgant

src/main/java/bwapi/BotWrapper.java

@@ -151,28 +151,41 @@ Throwable getLastBotThrow() {
 
     private Thread createBotThread() {
         return new Thread(() -> {
-            configuration.log("Bot: Thread started");
-            while ( ! gameOver) {
-                configuration.log("Bot: Attempting to handle next frame");
-                frameBuffer.lockSize.lock();
-                try {
-                    while (frameBuffer.empty()) {
-                        configuration.log("Bot: Waiting for next frame");
-                        performanceMetrics.botIdle.startTiming();
-                        frameBuffer.conditionSize.awaitUninterruptibly();
+            try {
+                configuration.log("Bot: Thread started");
+                while (!gameOver) {
+
+                    configuration.log("Bot: Attempting to handle next frame");
+                    frameBuffer.lockSize.lock();
+                    try {
+                        while (frameBuffer.empty()) {
+                            configuration.log("Bot: Waiting for next frame");
+                            performanceMetrics.botIdle.startTiming();
+                            frameBuffer.conditionSize.awaitUninterruptibly();
+                        }
+                        performanceMetrics.botIdle.stopTiming();
+                    } finally {
+                        frameBuffer.lockSize.unlock();
                     }
-                    performanceMetrics.botIdle.stopTiming();
-                } finally {
-                    frameBuffer.lockSize.unlock();
-                }
-                configuration.log("Bot: Peeking next frame");
-                game.clientData().setBuffer(frameBuffer.peek());
-                performanceMetrics.frameBufferSize.record(frameBuffer.framesBuffered() - 1);
-                try {
+
+                    configuration.log("Bot: Peeking next frame");
+                    game.clientData().setBuffer(frameBuffer.peek());
+                    performanceMetrics.frameBufferSize.record(frameBuffer.framesBuffered() - 1);
+
                     configuration.log("Bot: Handling frame #" + game.getFrameCount());
                     handleEvents();
-                } finally {
-                    // In the case where t
+                    frameBuffer.dequeue();
+                }
+            } catch (Throwable throwable) {
+                // Record the throw,
+                // Then allow the thread to terminate silently.
+                // The main thread will look for the stored throw.
+                lastBotThrowLock.lock();
+                lastBotThrow = throwable;
+                lastBotThrowLock.unlock();
+
+                // Awaken any threads waiting on bot progress
+                while (!frameBuffer.empty()) {
                     frameBuffer.dequeue();
                 }
             }
@@ -184,21 +197,14 @@ private void handleEvents() {
         if (gameData.getFrameCount() > 0 || ! configuration.unlimitedFrameZero) {
             performanceMetrics.botResponse.startTiming();
         }
+
         // Populate gameOver before invoking event handlers (in case the bot throws)
         for (int i = 0; i < gameData.getEventCount(); i++) {
             gameOver = gameOver || gameData.getEvents(i).getType() == EventType.MatchEnd;
         }
-        try {
-            for (int i = 0; i < gameData.getEventCount(); i++) {
-                EventHandler.operation(eventListener, game, gameData.getEvents(i));
-            }
-        } catch (Throwable throwable) {
-            lastBotThrowLock.lock();
-            lastBotThrow = throwable;
-            lastBotThrowLock.unlock();
-            throw throwable;
-        } finally {
-            performanceMetrics.botResponse.stopTiming();
+        for (int i = 0; i < gameData.getEventCount(); i++) {
+            EventHandler.operation(eventListener, game, gameData.getEvents(i));
         }
+        performanceMetrics.botResponse.stopTiming();
     }
 }

src/main/java/bwapi/ClientData.java

@@ -4,7 +4,6 @@ class ClientData {
     private WrappedBuffer buffer;
     private GameData gameData;
     ClientData() {
-        System.out.println("new ClientData()"); // TODO: REMOVE!
         gameData = new GameData(0);
     }
     GameData gameData() {

src/main/java/bwapi/Game.java

@@ -142,7 +142,6 @@ private static boolean hasPower(final int x, final int y, final UnitType unitTyp
     Call this method in EventHander::OnMatchStart
     */
     void init() {
-        System.out.println("Game.init()"); // TODO: REMOVE!
         visibleUnits.clear();
 
         final int forceCount = gameData().getForceCount();

src/test/java/bwapi/SynchronizationEnvironment.java

@@ -43,15 +43,15 @@ public class SynchronizationEnvironment {
             return null;
         }).when(client).update();
         doAnswer(answer -> {
-            System.out.println("Test: onStart()");
+            configuration.log("Test: onStart()");
             return null;
         }).when(listener).onStart();
         doAnswer(answer -> {
-            System.out.println("Test: onEnd()");
+            configuration.log("Test: onEnd()");
             return null;
         }).when(listener).onEnd(anyBoolean());
         doAnswer(answer -> {
-            System.out.println("Test: onFrame()");
+            configuration.log("Test: onFrame()");
             if (onFrames.containsKey(liveFrame())) {
                 onFrames.get(liveFrame()).run();
             }
@@ -92,7 +92,7 @@ private int liveFrame() {
 
     private void clientUpdate() {
         client.clientData().gameData().setFrameCount(liveFrame() + 1);
-        System.out.println("Test: clientUpdate() to liveFrame #" + liveFrame());
+        configuration.log("Test: clientUpdate() to liveFrame #" + liveFrame());
         if (liveFrame() == 0) {
             client.clientData().gameData().setIsInGame(true);
             client.clientData().gameData().setEventCount(2);

src/test/java/bwapi/SynchronizationTest.java

@@ -65,13 +65,12 @@ public void async_IfDelay_ThenBuffer() throws InterruptedException {
         SynchronizationEnvironment environment = new SynchronizationEnvironment();
         environment.configuration.async = true;
         environment.configuration.asyncFrameDurationMs = 1;
-        environment.configuration.asyncFrameBufferSize = 3;
-        environment.configuration.logVerbosely = true;
+        environment.configuration.asyncFrameBufferSize = 4;
         environment.onFrame(1, () -> {
-            sleepUnchecked(50);
+            sleepUnchecked(5);
             assertEquals("Bot should be observing an old frame", 1, environment.bwClient.getGame().getFrameCount());
-            assertEquals("Client should be as far ahead as the frame buffer allows", 3, environment.liveGameData().getFrameCount());
-            assertEquals("Bot should be behind the live game", 2, environment.bwClient.framesBehind());
+            assertEquals("Client should be as far ahead as the frame buffer allows", 4, environment.liveGameData().getFrameCount());
+            assertEquals("Bot should be behind the live game", 3, environment.bwClient.framesBehind());
         });
         environment.runGame();
     }