go-counting: use provided enumeration instead of Strings (#1461)

* go-counting: use provided enumeration instead of Strings

Use of enumeration should be consistent across the test suite.

* update example solution to match new test expectations

* fix return type

exercises/go-counting/.meta/src/reference/java/GoCounting.java

@@ -126,23 +126,17 @@ class GoCounting {
 		return territory;
 	}
 	
-	HashMap<String, Set<Point>> getTerritories() {
-		HashMap<String, Set<Point>> territories = new HashMap<String, Set<Point>>();
+	HashMap<Player, Set<Point>> getTerritories() {
+		HashMap<Player, Set<Point>> territories = new HashMap<Player, Set<Point>>();
 		
-		territories.put("WHITE", new HashSet<Point>());
-		territories.put("BLACK", new HashSet<Point>());
-		territories.put("NONE", new HashSet<Point>());
+		territories.put(Player.WHITE, new HashSet<Point>());
+		territories.put(Player.BLACK, new HashSet<Point>());
+		territories.put(Player.NONE, new HashSet<Point>());
 		
 		for (int i = 0; i < board[0].length; i++) {
 			for (int j = 0; j < board.length; j++) {
 				if (board[j][i] == Player.NONE) {
-					if (getTerritoryOwner(j, i) == Player.NONE) {
-						territories.get("NONE").add(new Point(j, i));
-					} else if (getTerritoryOwner(j, i) == Player.BLACK) {
-						territories.get("BLACK").add(new Point(j, i));
-					} else {
-						territories.get("WHITE").add(new Point(j, i));
-					}
+					territories.get(getTerritoryOwner(j, i)).add(new Point(j, i));
 				}
 			}
 		}

exercises/go-counting/src/test/java/GoCountingTest.java

@@ -121,15 +121,15 @@ public class GoCountingTest {
 	public void oneTerritoryIsWholeBoardTest() {
 		GoCounting gocounting = new GoCounting(" ");
 		
-		HashMap<String, Set<Point>> territories = new HashMap<>();
+		HashMap<Player, Set<Point>> territories = new HashMap<>();
 		Set<Point> blackTerritory = new HashSet<>();
 		Set<Point> whiteTerritory = new HashSet<>();
 		Set<Point> noneTerritory = new HashSet<>();
 		noneTerritory.add(new Point(0, 0));
 		
-		territories.put("BLACK", blackTerritory);
-		territories.put("WHITE", whiteTerritory);
-		territories.put("NONE", noneTerritory);
+		territories.put(Player.BLACK, blackTerritory);
+		territories.put(Player.WHITE, whiteTerritory);
+		territories.put(Player.NONE, noneTerritory);
 		
 		assertEquals(territories, gocounting.getTerritories());
 	}
@@ -149,10 +149,10 @@ public class GoCountingTest {
 		
 		Set<Point> noneTerritory = new HashSet<>();
 		
-		HashMap<String, Set<Point>> territories = new HashMap<>();
-		territories.put("BLACK", blackTerritory);
-		territories.put("WHITE", whiteTerritory);
-		territories.put("NONE", noneTerritory);
+		HashMap<Player, Set<Point>> territories = new HashMap<>();
+		territories.put(Player.BLACK, blackTerritory);
+		territories.put(Player.WHITE, whiteTerritory);
+		territories.put(Player.NONE, noneTerritory);
 		
 		assertEquals(territories, gocounting.getTerritories());
 	}
@@ -162,16 +162,16 @@ public class GoCountingTest {
 	public void twoRegionRectangularBoardTest() {
 		GoCounting gocounting = new GoCounting(" B ");
 		
-		HashMap<String, Set<Point>> territories = new HashMap<>();
+		HashMap<Player, Set<Point>> territories = new HashMap<>();
 		Set<Point> blackTerritory = new HashSet<>();
 		blackTerritory.add(new Point(0, 0));
 		blackTerritory.add(new Point(2, 0));
 		Set<Point> whiteTerritory = new HashSet<>();
 		Set<Point> noneTerritory = new HashSet<>();
 		
-		territories.put("BLACK", blackTerritory);
-		territories.put("WHITE", whiteTerritory);
-		territories.put("NONE", noneTerritory);
+		territories.put(Player.BLACK, blackTerritory);
+		territories.put(Player.WHITE, whiteTerritory);
+		territories.put(Player.NONE, noneTerritory);
 		
 		assertEquals(territories, gocounting.getTerritories());
 	}