Adds more tests & make CustomStat non static + bug fix in off()

Author: fathzer

pom.xml

@@ -77,6 +77,7 @@
 			        <excludes>
 			            <!-- Exclude the PhysicalCores class from code coverage because it is too tiedly coupled with the runtime environment -->
 			            <exclude>**/PhysicalCores.class</exclude>
+			            <exclude>**/experimental/*</exclude>
 			        </excludes>
 			     </configuration>
 			</plugin>

src/main/java/com/fathzer/games/util/CustomStats.java

@@ -5,97 +5,106 @@
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicLong;
 
-/** A utility class to create custom statistics.
+/** A class to create custom statistics.
  * <br>For instance, you can use the {@link #increment(String)} in a class to count the number of instances created.
  * <br><b>Be aware that doing such a thing can result in an important performance penalty</b>.
- * Remove, or at least, call {@link CustomStats#off()} in production code. 
+ * Remove, or at least, call {@link CustomStats#off()} in production code.
+ * <br><b>Warning:</b> Only {@link #increment(String)} and {@link #increment(String, long)} are thread safe.
  */
-public abstract class CustomStats {
-	private static boolean on = false;
-	private static final Map<String, AtomicLong> MAP = new HashMap<>();
+public class CustomStats {
+	private boolean on;
+	private final Map<String, AtomicLong> map;
 
-	private CustomStats() {
-		// Prevents subclassing
+	public CustomStats() {
+		map = new HashMap<>();
 	}
 
 	/** Enables the statistics.
 	 * <br>Statistics are deactivated by default
 	 * @return The previous activation state
 	 */
-	public static boolean on() {
+	public boolean on() {
 		if (on) {
 			return true;
 		}
-		final boolean old = on;
 		on = true;
-		return old;
+		return false;
 	}
 
 	/** Disables the statistics.
 	 * <br>Statistics are deactivated by default
 	 * @return The previous activation state
 	 */
-	public static boolean off() {
+	public boolean off() {
 		if (!on) {
 			return false;
 		}
-		final boolean old = on;
-		on = true;
-		return old;
+		on = false;
+		return true;
 	}
 
 	/** Checks whether the statistivs are enabled.
 	 * @return true if statistics are enabled
 	 */
-	public static boolean isOn() {
+	public boolean isOn() {
 		return on;
 	}
 
 	/** Increments a statistics counter.
 	 * @param counter The name of the counter to increment
 	 */
-	public static void increment(String counter) {
+	public void increment(String counter) {
 		if (on) {
-			MAP.computeIfAbsent(counter, k->new AtomicLong()).incrementAndGet();
+			map.computeIfAbsent(counter, k->new AtomicLong()).incrementAndGet();
 		}
 	}
-	
+
+	/** Increments a statistics counter.
+	 * @param counter The name of the counter to increment
+	 */
+	public void increment(String counter, long count) {
+		if (on) {
+			map.computeIfAbsent(counter, k->new AtomicLong()).addAndGet(count);
+		}
+	}
+
 	/** Clears all counters.
 	 */
-	public static void clear() {
-		MAP.clear();
+	public void clear() {
+		map.clear();
 	}
 
 	/** Gets a counter.
 	 * @param counter The name of the counter
 	 * @return The counter's value
 	 */
-	public static long get(String counter) {
-		final AtomicLong count = MAP.get(counter);
+	public long get(String counter) {
+		final AtomicLong count = map.get(counter);
 		return count==null ? 0 : count.get();
 	}
 
 	/** Clears a counter.
 	 * @param counter The name of the counter to clear
 	 * @return The counter's value before its removal
 	 */
-	public static long clear(String counter) {
-		final AtomicLong count = MAP.remove(counter);
+	public long clear(String counter) {
+		final AtomicLong count = map.remove(counter);
 		return count==null ? 0 : count.get();
 	}
 
 	/** Gets the set of counter's.
 	 * @return A set of strings.
 	 * <br><b>Warning:</b> Removing or adding counters while iterating on the returned set may throw exceptions.
 	 */
-	public static Set<String> getCounters() {
-		return MAP.keySet();
+	public Set<String> getCounters() {
+		return map.keySet();
 	}
 
 	/** Returns a string representation of the counters.
 	 * @return a String
 	 */
-	public static String asString() {
-		return MAP.toString();
+	@Override
+	public String toString() {
+		return map.toString();
 	}
 }

src/test/java/com/fathzer/games/ai/time/TimeTest.java

@@ -0,0 +1,20 @@
+package com.fathzer.games.ai.time;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import org.junit.jupiter.api.Test;
+
+import com.fathzer.games.clock.CountDownState;
+
+class TimeTest {
+
+	@Test
+	void test() {
+		final BasicTimeManager<Void> tm = new BasicTimeManager<>(x -> 3);
+		assertEquals(500, tm.getMaxTime(null, new CountDownState(999, 1, 0)));
+		assertEquals(600, tm.getMaxTime(null, new CountDownState(600, 0, 1)));
+		
+		assertThrows(IllegalArgumentException.class, () -> new CountDownState(600, 0, -1));
+	}
+
+}

src/test/java/com/fathzer/games/movelibrary/AbstractMoveLibraryTest.java

@@ -27,6 +27,7 @@ static void setUp() {
 	private static class MyMoveLibrary extends AbstractMoveLibrary<String, String, String> {
 		private final String expected;
 		private final List<String> results;
+		private boolean newGameCalled;
 
 		public MyMoveLibrary(String expected, List<String> results) {
 			this.expected = expected;
@@ -51,6 +52,12 @@ protected long getWeight(String move) {
 				return super.getWeight(move);
 			}
 		}
+
+		@Override
+		public void newGame() {
+			newGameCalled = true;
+			super.newGame();
+		}
 	}
 
 	@Test
@@ -76,5 +83,12 @@ void test() throws Exception {
 	    lib.setMoveSelector(lib.weightedMoveSelector());
 	    when(mockedRnd.nextLong(15)).thenReturn(4L);
 	    assertEquals("2", lib.apply("ok").get().getMove());
+	    assertEquals(5, lib.getMoves("ok").size());
+	    assertEquals(1, lib.getMoves("ko").size());
+	    assertTrue(lib.getMoves("unknown").isEmpty());
+	    
+	    lib.newGame();
+	    assertTrue(lib.newGameCalled);
+	    assertTrue(next.newGameCalled);
 	}
 }

src/test/java/com/fathzer/games/util/CustomStatsTest.java

@@ -0,0 +1,52 @@
+package com.fathzer.games.util;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import java.util.Set;
+
+import org.junit.jupiter.api.Test;
+
+class CustomStatsTest {
+
+	@Test
+	void test() {
+		var cs = new CustomStats();
+		assertFalse(cs.isOn());
+		final String key = "x";
+		assertEquals(0, cs.get(key));
+		cs.increment(key);
+		assertEquals(0, cs.get(key));
+		cs.increment(key, 10);
+		assertEquals(0, cs.get(key));
+		
+		assertFalse(cs.on());
+		assertTrue(cs.on());
+		assertTrue(cs.isOn());
+		cs.increment(key);
+		assertEquals(1, cs.get(key));
+		cs.increment(key, 10);
+		assertEquals(11, cs.get(key));
+		
+		cs.increment("y");
+		assertEquals(11, cs.get(key));
+		assertEquals(1, cs.get("y"));
+		
+		assertEquals(Set.of(key, "y"), cs.getCounters());
+
+		cs.clear(key);
+		assertEquals(0, cs.get(key));
+		assertEquals(1, cs.get("y"));
+		cs.increment(key);
+
+		assertTrue(cs.off());
+		assertFalse(cs.off());
+		cs.increment("y");
+		assertEquals(1, cs.get("y"));
+		
+		cs.clear();
+		assertTrue(cs.getCounters().isEmpty());
+		assertEquals(0, cs.get(key));
+		assertEquals(0, cs.get("y"));
+	}
+
+}