Fixed unit tests

Author: dgant

src/main/java/bwapi/BWClient.java

@@ -93,14 +93,15 @@ public void startGame(BWClientConfiguration configuration) {
                 }
             }
             while (liveGameData.isInGame()) {
-                if (liveGameData.getFrameCount() > 0 || ! configuration.unlimitedFrameZero) {
-                    performanceMetrics.totalFrameDuration.startTiming();
-                }
-                botWrapper.onFrame();
-                performanceMetrics.flushSideEffects.time(() -> getGame().sideEffects.flushTo(liveGameData));
-                performanceMetrics.totalFrameDuration.stopTiming();
+                performanceMetrics.totalFrameDuration.timeIf(
+                    liveGameData.getFrameCount() > 0 || ! configuration.unlimitedFrameZero,
+                    () -> {
+                        botWrapper.onFrame();
+                        performanceMetrics.flushSideEffects.time(() -> getGame().sideEffects.flushTo(liveGameData));
+                    });
                 performanceMetrics.bwapiResponse.time(client::update);
                 if (!client.isConnected()) {
+                    System.out.println("Reconnecting...");
                     client.reconnect();
                 }
             }

src/main/java/bwapi/PerformanceMetric.java

@@ -86,7 +86,6 @@ void record(double value) {
             avgValueExceeding = (avgValueExceeding * samplesExceeding + value) / (samplesExceeding + 1d);
             ++samplesExceeding;
         }
-        System.out.println("Metric: " + name + " (n=" + samples + "): " + value); // TODO: REMOVE
     }
 
     /**

src/test/java/bwapi/GameBuilder.java

@@ -20,12 +20,8 @@ public static Game createGame() throws IOException {
 
     public static Game createGame(String mapName) throws IOException {
         final ByteBuffer buffer = binToBuffer(RESOURCES + mapName + "_frame0_buffer.bin");
-        return createGame(new Client(buffer));
-    }
-
-    public static Game createGame(Client client) {
         final Game game = new Game();
-        game.clientData().setBuffer(client.mapFile());
+        game.clientData().setBuffer(buffer);
         game.init();
         return game;
     }

src/test/java/bwapi/GameTest.java

@@ -89,13 +89,16 @@ public void shouldNotFindNonOverlappingUnits(
 
     @Test
     public void ifReplaySelfAndEnemyShouldBeNull() throws IOException {
-        ByteBuffer buffer = GameBuilder.binToBuffer("src/test/resources/" + "(2)Benzene.scx" + "_frame0_buffer.bin");
+        ByteBuffer buffer = GameBuilder.binToBuffer(GameBuilder.DEFAULT_BUFFER_PATH);
 
-        Client client = new Client(buffer);
         // modify the buffer to fake a replay
-        client.clientData().gameData().setIsReplay(true);
+        ClientData clientData = new ClientData();
+        clientData.setBuffer(buffer);
+        clientData.gameData().setIsReplay(true);
 
-        Game game = GameBuilder.createGame(client);
+        Game game = new Game();
+        game.clientData().setBuffer(buffer);
+        game.init();
 
         assertThat(game.isReplay());
         assertNull(game.self());