Submission for challenge

.gitignore

@@ -3,4 +3,5 @@ HTW/.idea
 HTW/.idea/workspace.xml
 HTW/.DS_Store
 
+fitnesse/FitNesseRoot/**/*.zip
 

HTW/src/htw/game/HuntTheWumpusGame.java

@@ -5,6 +5,7 @@
 
 import java.util.*;
 import java.util.function.Predicate;
+import java.util.stream.Collectors;
 
 public class HuntTheWumpusGame implements HuntTheWumpus {
   private List<Connection> connections = new ArrayList<>();
@@ -41,17 +42,20 @@ private void reportStatus() {
   }
 
   private boolean reportNearby(Predicate<Connection> nearTest) {
-    for (Connection c : connections)
-      if (playerCavern.equals(c.from) && nearTest.test(c))
-        return true;
-    return false;
+    return connectionsOf(playerCavern).stream()
+        .anyMatch(nearTest::test);
   }
 
   private void reportAvailableDirections() {
-    for (Connection c : connections) {
-      if (playerCavern.equals(c.from))
-        messageReceiver.passage(c.direction);
-    }
+    connectionsOf(playerCavern).stream()
+        .map(c -> c.direction)
+        .forEach(messageReceiver::passage);
+  }
+
+  private List<Connection> connectionsOf(String cavern) {
+    return connections.stream()
+        .filter(c -> cavern.equals(c.from))
+        .collect(Collectors.toList());
   }
 
   public void addBatCavern(String cavern) {
@@ -71,26 +75,32 @@ public String getWumpusCavern() {
   }
 
   protected void moveWumpus() {
-    List<String> wumpusChoices = new ArrayList<>();
-    for (Connection c : connections)
-      if (wumpusCavern.equals(c.from))
-        wumpusChoices.add(c.to);
+    String cavern = wumpusCavern;
+
+    List<String> wumpusChoices = connectionsOf(cavern).stream()
+        .map(c -> c.to)
+        .collect(Collectors.toList());
+
     wumpusChoices.add(wumpusCavern);
 
     int nChoices = wumpusChoices.size();
-    int choice = (int) (Math.random() * nChoices);
+    int choice = randomChoice(nChoices);
     wumpusCavern = wumpusChoices.get(choice);
   }
 
   private void randomlyTransportPlayer() {
     Set<String> transportChoices = new HashSet<>(caverns);
     transportChoices.remove(playerCavern);
     int nChoices = transportChoices.size();
-    int choice = (int) (Math.random() * nChoices);
+    int choice = randomChoice(nChoices);
     String[] choices = new String[nChoices];
     playerCavern = transportChoices.toArray(choices)[choice];
   }
 
+  private int randomChoice(int numberOfPossibleChoices) {
+    return (int) (Math.random() * numberOfPossibleChoices);
+  }
+
   public void setQuiver(int arrows) {
     this.quiver = arrows;
   }
@@ -107,7 +117,18 @@ private int zeroIfNull(Integer integer) {
     if (integer == null)
       return 0;
     else
-      return integer.intValue();
+      return integer;
+  }
+
+  public void clearMap() {
+    playerCavern = "NONE";
+    wumpusCavern = "NONE";
+
+    connections.clear();
+    batCaverns.clear();
+    pitCaverns.clear();
+    arrowsIn.clear();
+    caverns.clear();
   }
 
   private class Connection {
@@ -129,10 +150,11 @@ public void connectCavern(String from, String to, Direction direction) {
   }
 
   public String findDestination(String cavern, Direction direction) {
-    for (Connection c : connections)
-      if (c.from.equals(cavern) && c.direction == direction)
-        return c.to;
-    return null;
+    return connections.stream()
+        .filter(c -> c.from.equals(cavern) && c.direction.equals(direction))
+        .map(c -> c.to)
+        .findAny()
+        .orElse(null);
   }
 
   public Command makeRestCommand() {
@@ -242,10 +264,11 @@ private boolean shotSelfInBack() {
       }
 
       private String nextCavern(String cavern, Direction direction) {
-        for (Connection c : connections)
-          if (cavern.equals(c.from) && direction.equals(c.direction))
-            return c.to;
-        return null;
+        return connectionsOf(cavern).stream()
+            .filter(c -> c.direction.equals(direction))
+            .map(c -> c.to)
+            .findAny()
+            .orElse(null);
       }
     }
   }

HTW/test/htw/fixtures/HtwFixture.java

@@ -125,4 +125,16 @@ public int arrowsInQuiver() {
   public int arrowsInCavern(String cavern) {
     return game.getArrowsInCavern(cavern);
   }
+
+  public boolean clearMap() {
+    game.clearMap();
+    return true;
+  }
+
+  public boolean connectNumberedCavernsInOrderGoing(int numberOfCaverns, String direction) {
+    for (int i = 1; i < numberOfCaverns; i++) {
+      game.connectCavern(String.valueOf(i), String.valueOf(i+1), toDirection(direction));
+    }
+    return true;
+  }
 }

fitnesse/FitNesseRoot/HuntTheWumpus/ReleaseOne/HuntingWithArrows/ArrowKillsWumpus/content.txt

@@ -1,8 +1,14 @@
--!|script|
+|scenario|Given Wumpus in Middle and player in cavern|cavern|when shooting|direction|then should kill the Wumpus|
 |Given Cross Map|
-|Given the player is in cavern FarLeft|
+|Given the player is in cavern @cavern|
 |Given the wumpus is in cavern Middle|
 |Given the player has 1 arrow|
-|When the player shoots East|
-|Then there are 0 arrows in cavern FarRight|
+|When the player shoots @direction|
 |Then a|WUMPUS_KILLED|message is given|
+
+!|Given Wumpus in Middle and player in cavern when shooting then should kill the Wumpus|
+|cavern|direction|
+|FarLeft|East|
+|FarRight|West|
+|Top|South|
+|Bottom|North|

fitnesse/FitNesseRoot/HuntTheWumpus/ReleaseOne/HuntingWithArrows/ArrowStopsWhenHittingWumpus/content.txt

@@ -0,0 +1,28 @@
+If the Wumpus stops the arrow, there are no arrows left in farthest cavern
+|scenario|Given Wumpus in Middle and player in cavern|cavern|when shooting|direction|then cavern|farthestCavern|should have no arrows|
+|Given Cross Map|
+|Given the player is in cavern @cavern|
+|Given the wumpus is in cavern Middle|
+|Given the player has 1 arrow|
+|When the player shoots @direction|
+|Then there are 0 arrows in cavern @farthestCavern|
+
+!|Given Wumpus in Middle and player in cavern when shooting then cavern should have no arrows|
+|cavern|direction|farthestCavern|
+|FarLeft|East|FarRight|
+|FarRight|West|FarLeft|
+|Top|South|Bottom|
+|Bottom|North|Top|
+
+
+If the Wumpus stops the arrow, the player is not killed by shooting in circle:
+-!|script|
+|Given cavern A connects to cavern B going East|
+|Given cavern B connects to cavern C going East|
+|Given cavern C connects to cavern D going East|
+|Given cavern D connects to cavern A going East|
+|Given the player has 1 arrow|
+|Given the player is in cavern A|
+|Given the wumpus is in cavern C|
+|When the player shoots East|
+|Then a PLAYER_SHOOTS_SELF_IN_BACK message is not given|

fitnesse/FitNesseRoot/HuntTheWumpus/ReleaseOne/HuntingWithArrows/ArrowStopsWhenHittingWumpus/properties.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<properties>
+<Edit>true</Edit>
+<Files>true</Files>
+<Properties>true</Properties>
+<RecentChanges>true</RecentChanges>
+<Refactor>true</Refactor>
+<Search>true</Search>
+<Test>true</Test>
+<Versions>true</Versions>
+<WhereUsed>true</WhereUsed>
+</properties>

fitnesse/FitNesseRoot/HuntTheWumpus/ReleaseOne/HuntingWithArrows/ArrowTravelAtMost103Caverns/content.txt

@@ -0,0 +1,21 @@
+-!|script|
+|Given Linear Map of size |102|
+|Given the player is in cavern 1|
+|Given the player has 1 arrow|
+|When the player shoots East|
+|Then there is 1 arrow in cavern 102|
+
+-!|script|
+|Given Linear Map of size |103|
+|Given the player is in cavern 1|
+|Given the player has 1 arrow|
+|When the player shoots East|
+|Then there is 1 arrow in cavern 103|
+
+-!|script|
+|Given Linear Map of size |104|
+|Given the player is in cavern 1|
+|Given the player has 1 arrow|
+|When the player shoots East|
+|Then there is 1 arrow in cavern 103|
+|Then there are 0 arrows in cavern 104|

fitnesse/FitNesseRoot/HuntTheWumpus/ReleaseOne/HuntingWithArrows/ArrowTravelAtMost103Caverns/properties.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<properties>
+<Edit>true</Edit>
+<Files>true</Files>
+<Properties>true</Properties>
+<RecentChanges>true</RecentChanges>
+<Refactor>true</Refactor>
+<Search>true</Search>
+<Test>true</Test>
+<Versions>true</Versions>
+<WhereUsed>true</WhereUsed>
+</properties>

fitnesse/FitNesseRoot/HuntTheWumpus/ReleaseOne/HuntingWithArrows/ArrowsAccumulateInFarthestCavern/content.txt

@@ -1,11 +1,20 @@
--!|script|
-|Given Cross Map|
-|Given the player is in cavern FarLeft|
+|scenario|Given player in cavern|cavern|when shooting|direction|then arrows accumulate in|farthestCavern|
+|Given the player is in cavern @cavern|
 |Given the player has 3 arrows|
-|When the player shoots East|
-|Then there is 1 arrow in cavern FarRight|
-|When the player shoots East|
-|Then there are 2 arrows in cavern FarRight|
-|When the player shoots East|
-|Then there are 3 arrows in cavern FarRight|
+|When the player shoots @direction|
+|Then there is 1 arrow in cavern @farthestCavern|
+|When the player shoots @direction|
+|Then there are 2 arrows in cavern @farthestCavern|
+|When the player shoots @direction|
+|Then there are 3 arrows in cavern @farthestCavern|
 |Then the player has no arrows|
+
+-!|script|
+|Given Cross Map|
+
+!|Given player in cavern when shooting then arrows accumulate in|
+|cavern|direction|farthestCavern|
+|FarLeft|East|FarRight|
+|FarRight|West|FarLeft|
+|Top|South|Bottom|
+|Bottom|North|Top|

fitnesse/FitNesseRoot/HuntTheWumpus/ReleaseOne/HuntingWithArrows/PlayerCanNotShootWithoutArrows/content.txt

@@ -1,8 +1,15 @@
+|scenario|Then player can not shoot in |direction|
+|When the player shoots @direction|
+|Then a message|NO_ARROWS|is given|
+
 -|script|
 |Given Cross map|
 |Given the player is in cavern Middle|
 |Given the player has no arrows|
-|When the player shoots East|
-|Then a message|NO_ARROWS|is given|
-'
 
+|Then player can not shoot in|
+|direction|
+|East|
+|West|
+|North|
+|South|

fitnesse/FitNesseRoot/HuntTheWumpus/ReleaseOne/HuntingWithArrows/PlayerKilledByShootingWall/content.txt

@@ -1,6 +1,19 @@
--!|script|
-|Given Cross Map|
-|Given the player is in cavern FarLeft|
+|scenario|Given player in cavern|cavern|when shooting|direction|then shoots the wall|
+|Given the player is in cavern @cavern|
 |Given the player has 1 arrow|
-|When the player shoots North|
+|When the player shoots @direction|
 |Then a|PLAYER_SHOOTS_WALL|message is given|
+
+
+-!|script|
+|Given Cross Map|
+
+|Given player in cavern when shooting then shoots the wall|
+|cavern|direction|
+|FarLeft|North|
+|FarLeft|West|
+|FarLeft|East|
+|FarLeft|West|
+|FarRight|East|
+|Top|North|
+|Bottom|South|

fitnesse/FitNesseRoot/HuntTheWumpus/ScenarioLibrary/content.txt

@@ -110,6 +110,7 @@ Donut Map
 }}}
 
 |scenario|Given Donut Map|
+|clear map|
 |Connect Cavern|1|to|2|going|West|
 |Connect Cavern|2|to|3|going|West|
 |Connect Cavern|3|to|4|going|South|
@@ -136,6 +137,7 @@ Cross Map
 
 }}}
 !|scenario|Given Cross Map|
+|clear map|
 |Connect Cavern|FarLeft|to|Left|going|East|
 |Connect Cavern|Left|to|FarLeft|going|West|
 |Connect Cavern|Left|to|Middle|going|East|
@@ -153,6 +155,15 @@ Cross Map
 |Connect Cavern|Bottom|to|Below|going|North|
 |Connect Cavern|Below|to|Bottom|going|South|
 
+{{{
+Linear Map (of size n)
+
+[1] -> [2] -> ... -> [n]
+
+}}}
 
+|scenario|Given Linear Map of size |n|
+|clear map|
+|connect |@n| numbered caverns in order going |East|