Merge pull request #10 from BME-MIT-IET/bdd

Done #5 (BDDs)
BME-MIT-IET · May 21, 2024 · 7e6fedd · 7e6fedd
2 parents 9462c97 + d5df628
commit 7e6fedd
Show file tree

Hide file tree

Showing 104 changed files with 271 additions and 49 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,3 +10,6 @@
 *.out
 *.OUT
 /bin/
+.idea/
+out/production/iet-hf-2024-tizenhat_tonna/palya.txt
+/target
diff --git a/Sivatagi vizhalozatok uzemeltetese a gyakorlatban 2/.idea/.gitignore b/Sivatagi vizhalozatok uzemeltetese a gyakorlatban 2/.idea/.gitignore
diff --git a/Sivatagi vizhalozatok uzemeltetese a gyakorlatban 2/bin/.idea/.gitignore b/Sivatagi vizhalozatok uzemeltetese a gyakorlatban 2/bin/.idea/.gitignore
diff --git a/Sivatagi vizhalozatok uzemeltetese a gyakorlatban 2/src/Controll/Controller.java b/Sivatagi vizhalozatok uzemeltetese a gyakorlatban 2/src/Controll/Controller.java
@@ -240,9 +240,11 @@ public static void Game() throws FileNotFoundException {
     public static void load(String cmd){
         try(Scanner scanner = new Scanner(new File(cmd))) {
             outResults.clear();
-            logger.log(Level.INFO, cmd);
-
-            filePath = cmd;
+            System.out.println(cmd);
+            String rootDirectory = System.getProperty("user.dir");
+            String modifiedPath=cmd.replace("/", File.separator).replace("\\", File.separator);
+            Scanner scanner = new Scanner(new File(rootDirectory+File.separator+"Sivatagi vizhalozatok uzemeltetese a gyakorlatban 2"+ File.separator+modifiedPath));
+            filePath = modifiedPath;
             String separator = "\\";
             String[] tmp=cmd.replaceAll(Pattern.quote(separator), "\\\\").split("\\\\");
             fileName = tmp[tmp.length-1];

diff --git a/Sivatagi vizhalozatok uzemeltetese a gyakorlatban 2/src/test/StepDefs.java b/Sivatagi vizhalozatok uzemeltetese a gyakorlatban 2/src/test/StepDefs.java
@@ -0,0 +1,69 @@
+import Controll.Controller;
+import Fields.Field;
+import Fields.Pipe;
+import Players.Player;
+import io.cucumber.java.en.And;
+import io.cucumber.java.en.Given;
+import io.cucumber.java.en.Then;
+import io.cucumber.java.en.When;
+
+import java.io.FileNotFoundException;
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class StepDefs {
+    private final Map<Integer, Boolean> actionResults = new HashMap<>();
+
+    @Given("A jatek inicializalasra kerult")
+    public void gameInitialized() {
+        Controller.load("src/testpalya.txt");
+
+        try {
+            Controller.Run(); // egyszer fut le, felépíti a pályát, utána a függvényeit kell majd hívni
+        } catch (FileNotFoundException ex) {
+            throw new RuntimeException(ex);
+        }
+        Controller.create();
+        Controller.SetActivePlayer(Controller.getAllPlayers().get(0));
+    }
+
+    @When("{string} mozog {string} re a {int} -s scenarioban")
+    public void movePlayer(String playerName, String toWhere, Integer scenarioNumber) {
+        Player player = (Player) Controller.objectNames.get(playerName);
+        Field field = (Field) Controller.objectNames.get(toWhere);
+        actionResults.put(scenarioNumber, player.move(field));
+    }
+
+    @Then("A művelet sikeresen végrehajtódik a\\(z) {int} -s scenarioban")
+    public void actionSuccessful(int scenarioNumber) {
+        assertTrue(actionResults.get(scenarioNumber));
+    }
+
+    @Then("A művelet végrehatása sikertelen a\\(z) {int} -s scenarioban")
+    public void actionUnsuccessful(int scenarioNumber) {
+        assertFalse(actionResults.get(scenarioNumber));
+    }
+
+    @When("{string} megjavitja a pumpat melyen jelenleg tartozkodik a {int} -s scenarioban")
+    public void megjavitjaAPumpatMelyenJelenlegTartozkodikASScenarioban(String playerName, int scenarioNumber) {
+        Player player = (Player) Controller.objectNames.get(playerName);
+        actionResults.put(scenarioNumber, player.repair());
+    }
+
+    @When("A {string} tonkreteszi az elemet amin jelenleg tartozkodik a {int} -s scenarioban")
+    public void saboteurBreaksField(String playerName, int scenarioNumber) {
+        Player player = (Player) Controller.objectNames.get(playerName);
+        actionResults.put(scenarioNumber, player.breakField());
+    }
+
+    @And("{string} a jelenlegi poziciojan a bemeneti csovet {string} re es kimeneti csovet {string} re csereli a {int} -s scenarioban")
+    public void setCurrentPipeInOut(String playerName, String inPipe, String outPipe, int scenarioNumber) {
+        Player player = (Player) Controller.objectNames.get(playerName);
+        Pipe in = (Pipe) Controller.objectNames.get(inPipe);
+        Pipe out = (Pipe) Controller.objectNames.get(outPipe);
+        actionResults.put(scenarioNumber, player.set(in, out));
+    }
+}
diff --git a/Test/10WaterFlowsFromSpring.in → ...urces/testfiles/10WaterFlowsFromSpring.in b/Test/10WaterFlowsFromSpring.in → ...urces/testfiles/10WaterFlowsFromSpring.in
diff --git a/Test/10WaterFlowsFromSpring.test → ...ces/testfiles/10WaterFlowsFromSpring.test b/Test/10WaterFlowsFromSpring.test → ...ces/testfiles/10WaterFlowsFromSpring.test
diff --git a/Test/11WaterFlowsToCistern.in → ...ources/testfiles/11WaterFlowsToCistern.in b/Test/11WaterFlowsToCistern.in → ...ources/testfiles/11WaterFlowsToCistern.in
diff --git a/Test/11WaterFlowsToCistern.test → ...rces/testfiles/11WaterFlowsToCistern.test b/Test/11WaterFlowsToCistern.test → ...rces/testfiles/11WaterFlowsToCistern.test
diff --git a/Test/12DisconnectPipe.in → ...t/resources/testfiles/12DisconnectPipe.in b/Test/12DisconnectPipe.in → ...t/resources/testfiles/12DisconnectPipe.in
diff --git a/Test/12DisconnectPipe.test → ...resources/testfiles/12DisconnectPipe.test b/Test/12DisconnectPipe.test → ...resources/testfiles/12DisconnectPipe.test
diff --git a/Test/13ConnectPipe.in → ...test/resources/testfiles/13ConnectPipe.in b/Test/13ConnectPipe.in → ...test/resources/testfiles/13ConnectPipe.in
diff --git a/Test/13ConnectPipe.test → ...st/resources/testfiles/13ConnectPipe.test b/Test/13ConnectPipe.test → ...st/resources/testfiles/13ConnectPipe.test
diff --git a/Test/14PickUpPipeFromCistern.in → ...rces/testfiles/14PickUpPipeFromCistern.in b/Test/14PickUpPipeFromCistern.in → ...rces/testfiles/14PickUpPipeFromCistern.in
diff --git a/Test/14PickUpPipeFromCistern.test → ...es/testfiles/14PickUpPipeFromCistern.test b/Test/14PickUpPipeFromCistern.test → ...es/testfiles/14PickUpPipeFromCistern.test
diff --git a/Test/15WorkingPumpPumping.in → ...sources/testfiles/15WorkingPumpPumping.in b/Test/15WorkingPumpPumping.in → ...sources/testfiles/15WorkingPumpPumping.in
diff --git a/Test/15WorkingPumpPumping.test → ...urces/testfiles/15WorkingPumpPumping.test b/Test/15WorkingPumpPumping.test → ...urces/testfiles/15WorkingPumpPumping.test
diff --git a/Test/16BrokenPumpPumping.in → ...esources/testfiles/16BrokenPumpPumping.in b/Test/16BrokenPumpPumping.in → ...esources/testfiles/16BrokenPumpPumping.in
diff --git a/Test/16BrokenPumpPumping.test → ...ources/testfiles/16BrokenPumpPumping.test b/Test/16BrokenPumpPumping.test → ...ources/testfiles/16BrokenPumpPumping.test
diff --git a/Test/17MechanicMoveFromPipeToPump.in → ...testfiles/17MechanicMoveFromPipeToPump.in b/Test/17MechanicMoveFromPipeToPump.in → ...testfiles/17MechanicMoveFromPipeToPump.in
diff --git a/Test/17MechanicMoveFromPipeToPump.test → ...stfiles/17MechanicMoveFromPipeToPump.test b/Test/17MechanicMoveFromPipeToPump.test → ...stfiles/17MechanicMoveFromPipeToPump.test
diff --git a/Test/18MechanicMoveFromPumpToPipe.in → ...testfiles/18MechanicMoveFromPumpToPipe.in b/Test/18MechanicMoveFromPumpToPipe.in → ...testfiles/18MechanicMoveFromPumpToPipe.in
diff --git a/Test/18MechanicMoveFromPumpToPipe.test → ...stfiles/18MechanicMoveFromPumpToPipe.test b/Test/18MechanicMoveFromPumpToPipe.test → ...stfiles/18MechanicMoveFromPumpToPipe.test
diff --git a/Test/19MechanicMoveFromPumpToOccupiedPipe.in → ...s/19MechanicMoveFromPumpToOccupiedPipe.in b/Test/19MechanicMoveFromPumpToOccupiedPipe.in → ...s/19MechanicMoveFromPumpToOccupiedPipe.in
diff --git a/...19MechanicMoveFromPumpToOccupiedPipe.test → ...19MechanicMoveFromPumpToOccupiedPipe.test b/...19MechanicMoveFromPumpToOccupiedPipe.test → ...19MechanicMoveFromPumpToOccupiedPipe.test
diff --git a/Test/1SaboteurBreakPipe.in → ...resources/testfiles/1SaboteurBreakPipe.in b/Test/1SaboteurBreakPipe.in → ...resources/testfiles/1SaboteurBreakPipe.in
diff --git a/Test/1SaboteurBreakPipe.test → ...sources/testfiles/1SaboteurBreakPipe.test b/Test/1SaboteurBreakPipe.test → ...sources/testfiles/1SaboteurBreakPipe.test
diff --git a/Test/20SetPump.in → ...src/test/resources/testfiles/20SetPump.in b/Test/20SetPump.in → ...src/test/resources/testfiles/20SetPump.in
diff --git a/Test/20SetPump.test → ...c/test/resources/testfiles/20SetPump.test b/Test/20SetPump.test → ...c/test/resources/testfiles/20SetPump.test
diff --git a/Test/21SaboteurMoveFromPipeToPump.in → ...testfiles/21SaboteurMoveFromPipeToPump.in b/Test/21SaboteurMoveFromPipeToPump.in → ...testfiles/21SaboteurMoveFromPipeToPump.in
diff --git a/Test/21SaboteurMoveFromPipeToPump.test → ...stfiles/21SaboteurMoveFromPipeToPump.test b/Test/21SaboteurMoveFromPipeToPump.test → ...stfiles/21SaboteurMoveFromPipeToPump.test
diff --git a/Test/22SaboteurMoveFromPumpToPipe.in → ...testfiles/22SaboteurMoveFromPumpToPipe.in b/Test/22SaboteurMoveFromPumpToPipe.in → ...testfiles/22SaboteurMoveFromPumpToPipe.in
diff --git a/Test/22SaboteurMoveFromPumpToPipe.test → ...stfiles/22SaboteurMoveFromPumpToPipe.test b/Test/22SaboteurMoveFromPumpToPipe.test → ...stfiles/22SaboteurMoveFromPumpToPipe.test
diff --git a/Test/23SaboteurMoveFromPumpToOccupiedPipe.in → ...s/23SaboteurMoveFromPumpToOccupiedPipe.in b/Test/23SaboteurMoveFromPumpToOccupiedPipe.in → ...s/23SaboteurMoveFromPumpToOccupiedPipe.in
diff --git a/...23SaboteurMoveFromPumpToOccupiedPipe.test → ...23SaboteurMoveFromPumpToOccupiedPipe.test b/...23SaboteurMoveFromPumpToOccupiedPipe.test → ...23SaboteurMoveFromPumpToOccupiedPipe.test
diff --git a/Test/24WaterFlowsToFullPipe.in → ...urces/testfiles/24WaterFlowsToFullPipe.in b/Test/24WaterFlowsToFullPipe.in → ...urces/testfiles/24WaterFlowsToFullPipe.in
diff --git a/Test/24WaterFlowsToFullPipe.test → ...ces/testfiles/24WaterFlowsToFullPipe.test b/Test/24WaterFlowsToFullPipe.test → ...ces/testfiles/24WaterFlowsToFullPipe.test
diff --git a/Test/25WaterFlowsToEmptyPipe.in → ...rces/testfiles/25WaterFlowsToEmptyPipe.in b/Test/25WaterFlowsToEmptyPipe.in → ...rces/testfiles/25WaterFlowsToEmptyPipe.in
diff --git a/Test/25WaterFlowsToEmptyPipe.test → ...es/testfiles/25WaterFlowsToEmptyPipe.test b/Test/25WaterFlowsToEmptyPipe.test → ...es/testfiles/25WaterFlowsToEmptyPipe.test
diff --git a/Test/26WaterFlowsToBrokenPipe.in → ...ces/testfiles/26WaterFlowsToBrokenPipe.in b/Test/26WaterFlowsToBrokenPipe.in → ...ces/testfiles/26WaterFlowsToBrokenPipe.in
diff --git a/Test/26WaterFlowsToBrokenPipe.test → ...s/testfiles/26WaterFlowsToBrokenPipe.test b/Test/26WaterFlowsToBrokenPipe.test → ...s/testfiles/26WaterFlowsToBrokenPipe.test
diff --git a/Test/27WaterFlowsToDisconnectedPipe.in → ...stfiles/27WaterFlowsToDisconnectedPipe.in b/Test/27WaterFlowsToDisconnectedPipe.in → ...stfiles/27WaterFlowsToDisconnectedPipe.in
diff --git a/Test/27WaterFlowsToDisconnectedPipe.test → ...files/27WaterFlowsToDisconnectedPipe.test b/Test/27WaterFlowsToDisconnectedPipe.test → ...files/27WaterFlowsToDisconnectedPipe.test
diff --git a/Test/28PumpBreaks100Chance.in → ...ources/testfiles/28PumpBreaks100Chance.in b/Test/28PumpBreaks100Chance.in → ...ources/testfiles/28PumpBreaks100Chance.in
diff --git a/Test/28PumpBreaks100Chance.test → ...rces/testfiles/28PumpBreaks100Chance.test b/Test/28PumpBreaks100Chance.test → ...rces/testfiles/28PumpBreaks100Chance.test
diff --git a/Test/29SaboteurGetsPoints.in → ...sources/testfiles/29SaboteurGetsPoints.in b/Test/29SaboteurGetsPoints.in → ...sources/testfiles/29SaboteurGetsPoints.in
diff --git a/Test/29SaboteurGetsPoints.test → ...urces/testfiles/29SaboteurGetsPoints.test b/Test/29SaboteurGetsPoints.test → ...urces/testfiles/29SaboteurGetsPoints.test
diff --git a/Test/2BreakCistern.in → ...test/resources/testfiles/2BreakCistern.in b/Test/2BreakCistern.in → ...test/resources/testfiles/2BreakCistern.in
diff --git a/Test/2BreakCistern.test → ...st/resources/testfiles/2BreakCistern.test b/Test/2BreakCistern.test → ...st/resources/testfiles/2BreakCistern.test
diff --git a/Test/30MechanicGetsPoints.in → ...sources/testfiles/30MechanicGetsPoints.in b/Test/30MechanicGetsPoints.in → ...sources/testfiles/30MechanicGetsPoints.in
diff --git a/Test/30MechanicGetsPoints.test → ...urces/testfiles/30MechanicGetsPoints.test b/Test/30MechanicGetsPoints.test → ...urces/testfiles/30MechanicGetsPoints.test
diff --git a/Test/31MechanicBreakPipe.in → ...esources/testfiles/31MechanicBreakPipe.in b/Test/31MechanicBreakPipe.in → ...esources/testfiles/31MechanicBreakPipe.in
diff --git a/Test/31MechanicBreakPipe.test → ...ources/testfiles/31MechanicBreakPipe.test b/Test/31MechanicBreakPipe.test → ...ources/testfiles/31MechanicBreakPipe.test
diff --git a/Test/32MechanicBreakRepairedPipe.in → .../testfiles/32MechanicBreakRepairedPipe.in b/Test/32MechanicBreakRepairedPipe.in → .../testfiles/32MechanicBreakRepairedPipe.in
diff --git a/Test/32MechanicBreakRepairedPipe.test → ...estfiles/32MechanicBreakRepairedPipe.test b/Test/32MechanicBreakRepairedPipe.test → ...estfiles/32MechanicBreakRepairedPipe.test
diff --git a/Test/33SaboteurBreakRepairedPipe.in → .../testfiles/33SaboteurBreakRepairedPipe.in b/Test/33SaboteurBreakRepairedPipe.in → .../testfiles/33SaboteurBreakRepairedPipe.in
diff --git a/Test/33SaboteurBreakRepairedPipe.test → ...estfiles/33SaboteurBreakRepairedPipe.test b/Test/33SaboteurBreakRepairedPipe.test → ...estfiles/33SaboteurBreakRepairedPipe.test
diff --git a/Test/34MakeDryPipeSlippery.in → ...ources/testfiles/34MakeDryPipeSlippery.in b/Test/34MakeDryPipeSlippery.in → ...ources/testfiles/34MakeDryPipeSlippery.in
diff --git a/Test/34MakeDryPipeSlippery.test → ...rces/testfiles/34MakeDryPipeSlippery.test b/Test/34MakeDryPipeSlippery.test → ...rces/testfiles/34MakeDryPipeSlippery.test
diff --git a/Test/35MakeStickyPipeSlippery.in → ...ces/testfiles/35MakeStickyPipeSlippery.in b/Test/35MakeStickyPipeSlippery.in → ...ces/testfiles/35MakeStickyPipeSlippery.in
diff --git a/Test/35MakeStickyPipeSlippery.test → ...s/testfiles/35MakeStickyPipeSlippery.test b/Test/35MakeStickyPipeSlippery.test → ...s/testfiles/35MakeStickyPipeSlippery.test
diff --git a/...vesFromPumpToSlipperyPipeEndsInSameEnd.in → ...vesFromPumpToSlipperyPipeEndsInSameEnd.in b/...vesFromPumpToSlipperyPipeEndsInSameEnd.in → ...vesFromPumpToSlipperyPipeEndsInSameEnd.in
diff --git a/...sFromPumpToSlipperyPipeEndsInSameEnd.test → ...sFromPumpToSlipperyPipeEndsInSameEnd.test b/...sFromPumpToSlipperyPipeEndsInSameEnd.test → ...sFromPumpToSlipperyPipeEndsInSameEnd.test
diff --git a/...esFromPumpToSlipperyPipeEndsInOtherEnd.in → ...esFromPumpToSlipperyPipeEndsInOtherEnd.in b/...esFromPumpToSlipperyPipeEndsInOtherEnd.in → ...esFromPumpToSlipperyPipeEndsInOtherEnd.in
diff --git a/...FromPumpToSlipperyPipeEndsInOtherEnd.test → ...FromPumpToSlipperyPipeEndsInOtherEnd.test b/...FromPumpToSlipperyPipeEndsInOtherEnd.test → ...FromPumpToSlipperyPipeEndsInOtherEnd.test
diff --git a/Test/38MechanicMovesFromPumpToStickyPipe.in → ...es/38MechanicMovesFromPumpToStickyPipe.in b/Test/38MechanicMovesFromPumpToStickyPipe.in → ...es/38MechanicMovesFromPumpToStickyPipe.in
diff --git a/.../38MechanicMovesFromPumpToStickyPipe.test → .../38MechanicMovesFromPumpToStickyPipe.test b/.../38MechanicMovesFromPumpToStickyPipe.test → .../38MechanicMovesFromPumpToStickyPipe.test
diff --git a/Test/39MechanicMovesFromStickyPipeToPump.in → ...es/39MechanicMovesFromStickyPipeToPump.in b/Test/39MechanicMovesFromStickyPipeToPump.in → ...es/39MechanicMovesFromStickyPipeToPump.in
diff --git a/.../39MechanicMovesFromStickyPipeToPump.test → .../39MechanicMovesFromStickyPipeToPump.test b/.../39MechanicMovesFromStickyPipeToPump.test → .../39MechanicMovesFromStickyPipeToPump.test
diff --git a/Test/3RepairPipe.in → ...c/test/resources/testfiles/3RepairPipe.in b/Test/3RepairPipe.in → ...c/test/resources/testfiles/3RepairPipe.in
diff --git a/Test/3RepairPipe.test → ...test/resources/testfiles/3RepairPipe.test b/Test/3RepairPipe.test → ...test/resources/testfiles/3RepairPipe.test
diff --git a/Test/40MechanicMakePipeSticky.in → ...ces/testfiles/40MechanicMakePipeSticky.in b/Test/40MechanicMakePipeSticky.in → ...ces/testfiles/40MechanicMakePipeSticky.in
diff --git a/Test/40MechanicMakePipeSticky.test → ...s/testfiles/40MechanicMakePipeSticky.test b/Test/40MechanicMakePipeSticky.test → ...s/testfiles/40MechanicMakePipeSticky.test
diff --git a/...vesFromPumpToSlipperyPipeEndsInSameEnd.in → ...vesFromPumpToSlipperyPipeEndsInSameEnd.in b/...vesFromPumpToSlipperyPipeEndsInSameEnd.in → ...vesFromPumpToSlipperyPipeEndsInSameEnd.in
diff --git a/...sFromPumpToSlipperyPipeEndsInSameEnd.test → ...sFromPumpToSlipperyPipeEndsInSameEnd.test b/...sFromPumpToSlipperyPipeEndsInSameEnd.test → ...sFromPumpToSlipperyPipeEndsInSameEnd.test
diff --git a/...esFromPumpToSlipperyPipeEndsInOtherEnd.in → ...esFromPumpToSlipperyPipeEndsInOtherEnd.in b/...esFromPumpToSlipperyPipeEndsInOtherEnd.in → ...esFromPumpToSlipperyPipeEndsInOtherEnd.in
diff --git a/...FromPumpToSlipperyPipeEndsInOtherEnd.test → ...FromPumpToSlipperyPipeEndsInOtherEnd.test b/...FromPumpToSlipperyPipeEndsInOtherEnd.test → ...FromPumpToSlipperyPipeEndsInOtherEnd.test
diff --git a/Test/43SaboteurMovesFromPumpToStickyPipe.in → ...es/43SaboteurMovesFromPumpToStickyPipe.in b/Test/43SaboteurMovesFromPumpToStickyPipe.in → ...es/43SaboteurMovesFromPumpToStickyPipe.in
diff --git a/.../43SaboteurMovesFromPumpToStickyPipe.test → .../43SaboteurMovesFromPumpToStickyPipe.test b/.../43SaboteurMovesFromPumpToStickyPipe.test → .../43SaboteurMovesFromPumpToStickyPipe.test
diff --git a/Test/44SaboteurMovesFromStickyPipeToPump.in → ...es/44SaboteurMovesFromStickyPipeToPump.in b/Test/44SaboteurMovesFromStickyPipeToPump.in → ...es/44SaboteurMovesFromStickyPipeToPump.in
diff --git a/.../44SaboteurMovesFromStickyPipeToPump.test → .../44SaboteurMovesFromStickyPipeToPump.test b/.../44SaboteurMovesFromStickyPipeToPump.test → .../44SaboteurMovesFromStickyPipeToPump.test
diff --git a/Test/45SaboteurMakePipeSticky.in → ...ces/testfiles/45SaboteurMakePipeSticky.in b/Test/45SaboteurMakePipeSticky.in → ...ces/testfiles/45SaboteurMakePipeSticky.in
diff --git a/Test/45SaboteurMakePipeSticky.test → ...s/testfiles/45SaboteurMakePipeSticky.test b/Test/45SaboteurMakePipeSticky.test → ...s/testfiles/45SaboteurMakePipeSticky.test
diff --git a/Test/4RepairPump.in → ...c/test/resources/testfiles/4RepairPump.in b/Test/4RepairPump.in → ...c/test/resources/testfiles/4RepairPump.in
diff --git a/Test/4RepairPump.test → ...test/resources/testfiles/4RepairPump.test b/Test/4RepairPump.test → ...test/resources/testfiles/4RepairPump.test
diff --git a/Test/5RepairCistern.in → ...est/resources/testfiles/5RepairCistern.in b/Test/5RepairCistern.in → ...est/resources/testfiles/5RepairCistern.in
diff --git a/Test/5RepairCistern.test → ...t/resources/testfiles/5RepairCistern.test b/Test/5RepairCistern.test → ...t/resources/testfiles/5RepairCistern.test
diff --git a/Test/6PlacePumpOnPipe.in → ...t/resources/testfiles/6PlacePumpOnPipe.in b/Test/6PlacePumpOnPipe.in → ...t/resources/testfiles/6PlacePumpOnPipe.in
diff --git a/Test/6PlacePumpOnPipe.test → ...resources/testfiles/6PlacePumpOnPipe.test b/Test/6PlacePumpOnPipe.test → ...resources/testfiles/6PlacePumpOnPipe.test
diff --git a/Test/7PlacePumpOnCistern.in → ...esources/testfiles/7PlacePumpOnCistern.in b/Test/7PlacePumpOnCistern.in → ...esources/testfiles/7PlacePumpOnCistern.in
diff --git a/Test/7PlacePumpOnCistern.test → ...ources/testfiles/7PlacePumpOnCistern.test b/Test/7PlacePumpOnCistern.test → ...ources/testfiles/7PlacePumpOnCistern.test
diff --git a/Test/8PickUpPumpFromCistern.in → ...urces/testfiles/8PickUpPumpFromCistern.in b/Test/8PickUpPumpFromCistern.in → ...urces/testfiles/8PickUpPumpFromCistern.in
diff --git a/Test/8PickUpPumpFromCistern.test → ...ces/testfiles/8PickUpPumpFromCistern.test b/Test/8PickUpPumpFromCistern.test → ...ces/testfiles/8PickUpPumpFromCistern.test
diff --git a/Test/9PickUpPumpFromPipe.in → ...esources/testfiles/9PickUpPumpFromPipe.in b/Test/9PickUpPumpFromPipe.in → ...esources/testfiles/9PickUpPumpFromPipe.in
diff --git a/Test/9PickUpPumpFromPipe.test → ...ources/testfiles/9PickUpPumpFromPipe.test b/Test/9PickUpPumpFromPipe.test → ...ources/testfiles/9PickUpPumpFromPipe.test
diff --git a/Test/Alltests.txt → ...src/test/resources/testfiles/Alltests.txt b/Test/Alltests.txt → ...src/test/resources/testfiles/Alltests.txt
diff --git a/Test/template.txt → ...src/test/resources/testfiles/template.txt b/Test/template.txt → ...src/test/resources/testfiles/template.txt
diff --git a/...gi vizhalozatok uzemeltetese a gyakorlatban 2/src/test/resources/vizhalozat_jatek.feature b/...gi vizhalozatok uzemeltetese a gyakorlatban 2/src/test/resources/vizhalozat_jatek.feature
@@ -0,0 +1,32 @@
+Feature: Sivatagi Vízhálózat Játék
+
+  Scenario: Jatekos mozgatasa egy pumparol ures csore
+    Given A jatek inicializalasra kerult
+    When "Mec1" mozog "AC2" re a 1 -s scenarioban
+    Then A művelet sikeresen végrehajtódik a(z) 1 -s scenarioban
+
+  Scenario: Jatekos mozgatasa egy pumparol mar foglalt csore
+    Given A jatek inicializalasra kerult
+    When "Mec1" mozog "AB" re a 2 -s scenarioban
+    Then A művelet végrehatása sikertelen a(z) 2 -s scenarioban
+
+  Scenario: Jatekos mozgatasa egy csorol szomszedos pumpara melyen mar tartozkodik jatekos
+    Given A jatek inicializalasra kerult
+    When "Sab1" mozog "A" re a 3 -s scenarioban
+    Then A művelet sikeresen végrehajtódik a(z) 3 -s scenarioban
+
+  Scenario: Szerelok megjavitjak a meghibasodott pumpat
+    Given A jatek inicializalasra kerult
+    When "Mec1" megjavitja a pumpat melyen jelenleg tartozkodik a 4 -s scenarioban
+    Then A művelet sikeresen végrehajtódik a(z) 4 -s scenarioban
+
+  Scenario: Szabotorok kilyukasztanak egy fontos csovet
+    Given A jatek inicializalasra kerult
+    When A "Sab1" tonkreteszi az elemet amin jelenleg tartozkodik a 5 -s scenarioban
+    Then A művelet sikeresen végrehajtódik a(z) 5 -s scenarioban
+
+  Scenario: Szabotorok beavatkoznak a mukodo pumpakba
+    Given A jatek inicializalasra kerult
+    When "Sab1" mozog "B" re a 6 -s scenarioban
+    And "Sab1" a jelenlegi poziciojan a bemeneti csovet "BS2" re es kimeneti csovet "CB" re csereli a 6 -s scenarioban
+    Then A művelet sikeresen végrehajtódik a(z) 6 -s scenarioban
diff --git a/Sivatagi vizhalozatok uzemeltetese a gyakorlatban 2/src/testpalya.txt b/Sivatagi vizhalozatok uzemeltetese a gyakorlatban 2/src/testpalya.txt
@@ -0,0 +1,23 @@
+cistern cistern2 water:0 draw:100:100
+spring spring2 2000 draw:650:100
+pump A 200 water:20 broken:true draw:200:100
+pump B 200 water:10 draw:500:100
+pump C 200 water:50 draw:575:200
+pipe AC2 100 draw:225:125:125:125
+pipe AB 100 draw:225:125:525:125
+pipe BS2 100 draw:525:125:675:125
+pipe CB 100 draw:600:225:525:125
+connectpipe AC2 A
+connectpipe AC2 cistern2
+connectpipe AB A
+connectpipe AB B
+connectpipe BS2 B
+connectpipe BS2 spring2
+connectpipe CB B
+connectpipe CB C
+setpump A AB AC2
+setpump B BS2 AB
+mechanic Mec1 A
+addplayer A Mec1
+saboteur Sab1 AB
+addplayer AB Sab1
diff --git a/...eltetese a gyakorlatban 2/target/hu.bme.mit.iet.hf.2024.tizenhat_tonna-0.5.0-SNAPSHOT.jar b/...eltetese a gyakorlatban 2/target/hu.bme.mit.iet.hf.2024.tizenhat_tonna-0.5.0-SNAPSHOT.jar
diff --git a/...tban 2/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/...tban 2/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
@@ -0,0 +1,24 @@
+Drawing\Drawable.class
+Fields\ActiveFields\Spring.class
+Controll\ViewGame$2.class
+Fields\ActiveFields\ActiveFields.class
+Drawing\PipeDraw.class
+Players\Saboteur.class
+Drawing\MechanicDraw.class
+Controll\Controller.class
+Fields\Pipe.class
+Controll\ViewGame$1.class
+Drawing\SpringDraw.class
+Controll\ViewGame.class
+Enums\Fluid.class
+Interfaces\Steppable.class
+Drawing\PumpDraw.class
+Drawing\SaboteurDraw.class
+Drawing\CisternDraw.class
+Controll\WaterCounter.class
+Controll\Menu.class
+Fields\ActiveFields\Cistern.class
+Fields\ActiveFields\Pump.class
+Players\Player.class
+Fields\Field.class
+Players\Mechanic.class
diff --git a/...latban 2/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/...latban 2/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
@@ -0,0 +1,22 @@
+H:\Raktar-6\Integra\H�zi feladat\Sivatagi vizhalozatok uzemeltetese a gyakorlatban 2\src\Drawing\Drawable.java
+H:\Raktar-6\Integra\H�zi feladat\Sivatagi vizhalozatok uzemeltetese a gyakorlatban 2\src\Fields\ActiveFields\Spring.java
+H:\Raktar-6\Integra\H�zi feladat\Sivatagi vizhalozatok uzemeltetese a gyakorlatban 2\src\Players\Saboteur.java
+H:\Raktar-6\Integra\H�zi feladat\Sivatagi vizhalozatok uzemeltetese a gyakorlatban 2\src\Enums\Fluid.java
+H:\Raktar-6\Integra\H�zi feladat\Sivatagi vizhalozatok uzemeltetese a gyakorlatban 2\src\Fields\ActiveFields\Pump.java
+H:\Raktar-6\Integra\H�zi feladat\Sivatagi vizhalozatok uzemeltetese a gyakorlatban 2\src\Fields\Pipe.java
+H:\Raktar-6\Integra\H�zi feladat\Sivatagi vizhalozatok uzemeltetese a gyakorlatban 2\src\Drawing\PipeDraw.java
+H:\Raktar-6\Integra\H�zi feladat\Sivatagi vizhalozatok uzemeltetese a gyakorlatban 2\src\Drawing\SaboteurDraw.java
+H:\Raktar-6\Integra\H�zi feladat\Sivatagi vizhalozatok uzemeltetese a gyakorlatban 2\src\Interfaces\Steppable.java
+H:\Raktar-6\Integra\H�zi feladat\Sivatagi vizhalozatok uzemeltetese a gyakorlatban 2\src\Drawing\CisternDraw.java
+H:\Raktar-6\Integra\H�zi feladat\Sivatagi vizhalozatok uzemeltetese a gyakorlatban 2\src\Fields\ActiveFields\ActiveFields.java
+H:\Raktar-6\Integra\H�zi feladat\Sivatagi vizhalozatok uzemeltetese a gyakorlatban 2\src\Players\Mechanic.java
+H:\Raktar-6\Integra\H�zi feladat\Sivatagi vizhalozatok uzemeltetese a gyakorlatban 2\src\Controll\WaterCounter.java
+H:\Raktar-6\Integra\H�zi feladat\Sivatagi vizhalozatok uzemeltetese a gyakorlatban 2\src\Controll\Controller.java
+H:\Raktar-6\Integra\H�zi feladat\Sivatagi vizhalozatok uzemeltetese a gyakorlatban 2\src\Players\Player.java
+H:\Raktar-6\Integra\H�zi feladat\Sivatagi vizhalozatok uzemeltetese a gyakorlatban 2\src\Drawing\PumpDraw.java
+H:\Raktar-6\Integra\H�zi feladat\Sivatagi vizhalozatok uzemeltetese a gyakorlatban 2\src\Fields\Field.java
+H:\Raktar-6\Integra\H�zi feladat\Sivatagi vizhalozatok uzemeltetese a gyakorlatban 2\src\Fields\ActiveFields\Cistern.java
+H:\Raktar-6\Integra\H�zi feladat\Sivatagi vizhalozatok uzemeltetese a gyakorlatban 2\src\Controll\ViewGame.java
+H:\Raktar-6\Integra\H�zi feladat\Sivatagi vizhalozatok uzemeltetese a gyakorlatban 2\src\Controll\Menu.java
+H:\Raktar-6\Integra\H�zi feladat\Sivatagi vizhalozatok uzemeltetese a gyakorlatban 2\src\Drawing\MechanicDraw.java
+H:\Raktar-6\Integra\H�zi feladat\Sivatagi vizhalozatok uzemeltetese a gyakorlatban 2\src\Drawing\SpringDraw.java
diff --git a/doc/BDD.md b/doc/BDD.md
@@ -0,0 +1,32 @@
+# Vízhálózat Játék BDD Dokumentáció
+
+Ez a dokumentáció leírja a "Sivatagi vízhálózat" nevű játék funkcióit és működését BDD (Behavior-Driven Development) forgatókönyvek segítségével.
+
+A BDD tesztek megvalósításához a [Cucumber](https://cucumber.io/) keretrendszert használjuk. Melyhez egy feature file-t és egy step definition osztály-t kell létrehozni a projekt test könyvtárában. 
+Ezt követően a featurefileban megírva bárki számára olvasható formátumban a teszteket és az ezekhez tartozó step definitionöket a Given, When és Then annotationöket használva már futtathatjuk is a teszteket.
+A Step Definition osztályban a tesztekhez tartozó metódusokban kell megvalósítani a tesztek lépéseit a valós programmal.
+
+## Scenariok:
+## 1. A játékosok mozognak a csöveken
+
+### Scenario: Játékos mozgatása egy pumpáról üres csőre.
+A szerelő csapat egyik játékosa az egyik egy pumpáról egy szomszédos csőre lép melyen nem tartózkodik másik játékos. A műveletet sikeresen végrehajtja.
+
+### Scenario: Játékos mozgatása egy pumpáról már foglalt csőre.
+A szerelő csapat egyik játékosa az egyik szerelővel egy pumpáról egy szomszédos csőre lép melyen jelenleg tartózkodik egy másik játékos. A műveletet végrehajtása sikertelen.
+
+### Scenario: Játékos mozgatása egy csőröl szomszédos pumpára melyen már tartózkodik játékos.
+A szerelő csapat egyik játékosa az egyik szerelővel egy csőröl egy szomszédos pumpára lép melyen jelenleg tartózkodik egy másik játékos. A műveletet végrehajtása sikeres.
+
+## 2. Szerelők a Vízhálózat Javítása
+
+### Scenario: Szerelők megjavítják a meghibásodott pumpát
+A játékban egy meghibásodott pumpa van a csőhálózatban. A szerelőknek lehetőségük van megjavítani ezt a pumpát.
+
+## 3. Szabotőrök a Vízhálózat Károsítása
+
+### Scenario: Szabotőrök kilyukasztanak egy fontos csövet
+A csőhálózatban található egy fontos cső, amit a szabotőrök kilyukasztanak. Ennek következtében vízveszteség keletkezik, csökkentve a vízszállítás hatékonyságát.
+
+### Scenario: Szabotőrök beavatkoznak a működő pumpákba
+A szabotőrök módosítják a működő pumpák beállításait, hogy csökkentsék a vízszállítás hatékonyságát a csőhálózatban.
diff --git a/pom.xml b/pom.xml
@@ -1,52 +1,57 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>hu.bme.mit.iet.hf.2024.tizenhat_tonna</groupId>
-	<artifactId>hu.bme.mit.iet.hf.2024.tizenhat_tonna</artifactId>
-	<version>0.5.0-SNAPSHOT</version>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>hu.bme.mit.iet.hf.2024.tizenhat_tonna</groupId>
+    <artifactId>hu.bme.mit.iet.hf.2024.tizenhat_tonna</artifactId>
+    <version>0.5.0-SNAPSHOT</version>
 
-<properties>
-  <sonar.organization>bme-mit-iet-org</sonar.organization>
-  <sonar.host.url>https://sonarcloud.io</sonar.host.url>
-</properties>
+    <properties>
+        <sonar.organization>bme-mit-iet-org</sonar.organization>
+        <sonar.host.url>https://sonarcloud.io</sonar.host.url>
+    </properties>
 
-	<dependencies>
-		<dependency>
-			<groupId>org.junit.jupiter</groupId>
-			<artifactId>junit-jupiter</artifactId>
-			<version>5.8.2</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.mockito</groupId>
-			<artifactId>mockito-core</artifactId>
-			<version>4.4.0</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.jacoco</groupId>
-			<artifactId>jacoco-maven-plugin</artifactId>
-			<version>0.8.7</version>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
+    <dependencies>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>5.8.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <version>4.4.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jacoco</groupId>
+            <artifactId>jacoco-maven-plugin</artifactId>
+            <version>0.8.7</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.cucumber</groupId>
+            <artifactId>cucumber-java</artifactId>
+            <version>7.17.0</version>
+        </dependency>
 
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.10.1</version>
-				<configuration>
-					<release>11</release>
-				</configuration>
-			</plugin>
+    </dependencies>
 
-			<!-- JUnit 5 requires Surefire version 2.22.1 or higher -->
-			<plugin>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<version>2.22.2</version>
-			</plugin>
-		</plugins>
-	</build>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.10.1</version>
+                <configuration>
+                    <release>11</release>
+                </configuration>
+            </plugin>
+
+            <!-- JUnit 5 requires Surefire version 2.22.1 or higher -->
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.22.2</version>
+            </plugin>
+        </plugins>
+    </build>
 </project>
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,3 +10,6 @@ @@
     *.out
     *.OUT
     /bin/
+    .idea/
+    out/production/iet-hf-2024-tizenhat_tonna/palya.txt
+    /target