README.md

@@ -20,20 +20,25 @@ You will then be prompted to select a track file from the selection by entering
 > > 1=down-left <br> 2=down<br> 3=down-right<br> 4=left<br> 5=no acceleration<br> 6=right <br> 7=up-left<br> 8=up<br> 9=up-right<br> it is also possible to leave the game when it is your turn by entering 10
 + Move List Strategy
 > For this strategy a predefined list of moves have to be given, the list may contain all allowed moves like mentioned in User Move Strategy
+> > To create your own Move List strategy it needs to be located in /racetrack/moves and be named as *track_name*-car-*character_of_car*.txt and be a txt file.
 + Path Follow Move Strategy
-> A list of point has to be given to the follow move strategy, the strategy will then calculate the route to cross each point in the given order.
+> A list of points given in a txt file where on each lime a coordinate is placed like (X:24, Y:22) gets used to calculate a path which makes the car cross each point.
+> > To create your own follow move strategy it needs to be located in /racetrack/moves and be named as *track_name*_points.txt and be a txt file.
 + Path Finder Strategy
 > The pathfinder Strategy Calculates a route itself and follows it direction fully automatically.
 
 The shown Track can be interpreted as following:<br>
+'spaces' are part of the raceable track.<br>
 '#' is a Wall<br>
 '>,<,^,v' are finish line components<br>
+'X' is shown if a car crashes at its crash location.<br>
 And every other character represents a car.
-
+> To create your own track it needs to be located inside /racetrack/tracks and be a txt file. 
 ### Determining a winner
 The winner gets determined automatically. <br> The car that first passes the finish line (doing a complete round) is given the win, if all car except one crash the surviving car will be crowned as the winner.<br>The game will inform you of this, and you will have the option to quit the game or play another match.
 
 ## Branching Model
-We choose a simple branching model where all starting features got a branch and where merged into the main branch, some branches who needed unfinished code to be completed where taken from the game branch but merged into the main at the end as well.<br> Since there was just one end product  we abstained from using a development branch and merges where done straight into main.
+We choose a simple branching model where all starting features got a branch and where merged into the main branch, some branches who needed unfinished code to be completed where taken from the game branch but merged into the main at the end as well.<br> Since there was just one end product  we abstained from using a development branch and merges where done straight into main branch.
 
 ## Class Diagramm
+![Classdiagramm of this program](/Klassendiagramm.drawio)

src/main/java/ch/zhaw/pm2/racetrack/Car.java

@@ -3,14 +3,12 @@ package ch.zhaw.pm2.racetrack;
 import ch.zhaw.pm2.racetrack.given.CarSpecification;
 import ch.zhaw.pm2.racetrack.strategy.MoveStrategy;
 
-import java.util.Vector;
-
 /**
  * Class representing a car on the racetrack.
  * Uses {@link PositionVector} to store current position on the track grid and current velocity vector.
  * Each car has an identifier character which represents the car on the racetrack board.
  * Also keeps the state, if the car is crashed (not active anymore). The state can not be changed back to uncrashed.
- * The velocity is changed by providing an acelleration vector.
+ * The velocity is changed by providing an acceleration vector.
  * The car is able to calculate the endpoint of its next position and on request moves to it.
  */
 public class Car implements CarSpecification {
@@ -46,6 +44,7 @@ public class Car implements CarSpecification {
 
     /**
      * Constructor for class Car
+     *
      * @param id       unique Car identification
      * @param position initial position of the Car
      */
@@ -83,6 +82,7 @@ public class Car implements CarSpecification {
     public PositionVector getVelocity() {
         return velocity;
     }
+
     /**
      * Set this Car position directly, regardless of current position and velocity.
      * This should only be used by the game controller in rare cases to set the crash or winning position.
@@ -95,8 +95,7 @@ public class Car implements CarSpecification {
     public void setPosition(final PositionVector position) {
         if (position.getX() < 0 || position.getY() < 0) {
             throw new IllegalArgumentException();
-        }
-        else {
+        } else {
             this.position = position;
         }
     }
@@ -126,8 +125,7 @@ public class Car implements CarSpecification {
         if (acceleration.vector.getX() < -1 || acceleration.vector.getX() > 1 ||
             acceleration.vector.getY() < -1 || acceleration.vector.getY() > 1) {
             throw new IllegalArgumentException();
-        }
-        else {
+        } else {
             velocity = new PositionVector(velocity.getX() + acceleration.vector.getX(),
                 velocity.getY() + acceleration.vector.getY());
         }
@@ -161,6 +159,7 @@ public class Car implements CarSpecification {
 
     /**
      * Set move strategy
+     *
      * @param moveStrategy Strategy to be implemented
      */
     public void setMoveStrategy(MoveStrategy moveStrategy) {
@@ -169,6 +168,7 @@ public class Car implements CarSpecification {
 
     /**
      * Get current move strategy
+     *
      * @return MoveStrategy
      */
     public MoveStrategy getMoveStrategy() {

src/main/java/ch/zhaw/pm2/racetrack/InvalidFileFormatException.java

@@ -4,6 +4,7 @@ package ch.zhaw.pm2.racetrack;
  * Class for Exception when invalid Fileformat is used.
  */
 public class InvalidFileFormatException extends Exception {
+    public InvalidFileFormatException(){super();}
     public InvalidFileFormatException(String errorMessage) {
         super(errorMessage);
     }

src/main/java/ch/zhaw/pm2/racetrack/Main.java

@@ -1,12 +1,11 @@
 package ch.zhaw.pm2.racetrack;
 
-import java.io.FileNotFoundException;
 import java.util.ArrayList;
 import java.util.List;
 
 public class Main {
 
-    public static void main(String[] args) throws InvalidTrackFormatException, PositionVectorNotValid {
+    public static void main(String[] args) {
         UserInterface userInterface = new UserInterface("Hello and Welcome to Racetrack by Team02-\"AngryNerds\"");
         while (true) {
             Game game = new Game(userInterface);
@@ -19,8 +18,7 @@ public class Main {
                 String winnerText;
                 if (winner == null) {
                     winnerText = "There was no winner.";
-                }
-                else {
+                } else {
                     winnerText = "The Winner was Car " + winner;
                 }
                 int selectedOption = userInterface.selectOption(winnerText + "\nStart new Game?", optionsNewGame);
@@ -28,8 +26,7 @@ public class Main {
                     userInterface.quit("Thank you and goodbye\npress enter to close the application.");
                     break;
                 }
-            }
-            else {
+            } else {
                 userInterface.quit("The initialisation of the game failed. Press enter to close the application.");
                 break;
             }

src/main/java/ch/zhaw/pm2/racetrack/PositionVector.java

@@ -7,8 +7,8 @@ package ch.zhaw.pm2.racetrack;
  * Created by mach 21.01.2020
  */
 public final class PositionVector {
-    private int x; // horizontal component (position / velocity)
-    private int y; // vertical component (position / velocity)
+    private final int x; // horizontal component (position / velocity)
+    private final int y; // vertical component (position / velocity)
 
     /**
      * Enum representing a direction on the track grid.

src/main/java/ch/zhaw/pm2/racetrack/PositionVectorNotValid.java

@@ -1,9 +0,0 @@
-package ch.zhaw.pm2.racetrack;
-
-public class PositionVectorNotValid extends Throwable {
-    public PositionVectorNotValid(String message) {
-        super(message);
-    }
-
-    public PositionVectorNotValid() {}
-}

src/main/java/ch/zhaw/pm2/racetrack/PositionVectorNotValidException.java

@@ -0,0 +1,9 @@
+package ch.zhaw.pm2.racetrack;
+
+public class PositionVectorNotValidException extends Throwable {
+    public PositionVectorNotValidException(String message) {
+        super(message);
+    }
+
+    public PositionVectorNotValidException() {}
+}

src/main/java/ch/zhaw/pm2/racetrack/Track.java

@@ -3,7 +3,10 @@ package ch.zhaw.pm2.racetrack;
 import ch.zhaw.pm2.racetrack.given.ConfigSpecification;
 import ch.zhaw.pm2.racetrack.given.TrackSpecification;
 
-import java.io.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Scanner;
@@ -57,8 +60,8 @@ import java.util.Scanner;
 public class Track implements TrackSpecification {
 
     public static final char CRASH_INDICATOR = 'X';
-    private List<String> track;
-    private List<Car> cars;
+    private final List<String> track;
+    private final List<Car> cars;
     private final List<PositionVector> finishLine;
     private ConfigSpecification.SpaceType finishTyp;
 
@@ -69,7 +72,7 @@ public class Track implements TrackSpecification {
      * @throws FileNotFoundException       if the given track file could not be found
      * @throws InvalidTrackFormatException if the track file contains invalid data (no tracklines, ...)
      */
-    public Track(File trackFile) throws FileNotFoundException, InvalidTrackFormatException, PositionVectorNotValid {
+    public Track(File trackFile) throws FileNotFoundException, InvalidTrackFormatException {
         track = new ArrayList<>();
         cars = new ArrayList<>();
         finishLine = new ArrayList<>();
@@ -85,13 +88,17 @@ public class Track implements TrackSpecification {
      * @throws FileNotFoundException if the FilePath is invalid.
      */
     private void readFile(File trackFile) throws FileNotFoundException {
-        Scanner scanner = new Scanner(new FileInputStream(trackFile),"UTF-8");
+        Scanner scanner = new Scanner(new FileInputStream(trackFile), StandardCharsets.UTF_8);
         while (scanner.hasNextLine()) {
             track.add(scanner.nextLine());
         }
     }
 
-
+    /**
+     * Goes through the track ArrayList and determines the locations of each cars and initializes them at the location.
+     *
+     * @throws InvalidTrackFormatException is thrown if a car is found more than once inside the track.
+     */
     private void addCars() throws InvalidTrackFormatException {
         ConfigSpecification.SpaceType[] spaceTypes = ConfigSpecification.SpaceType.values();
         List<Character> allSpaceTypesAsChar = new ArrayList<>();
@@ -101,23 +108,26 @@ public class Track implements TrackSpecification {
             allSpaceTypesAsChar.add(spaceType.getValue());
         }
 
-
-        for (int j = 0; j < track.size(); j++) {
-            String line = track.get(j);
-            for (int i = 0; i < line.length(); i++) {
-                char possibleCarChar = line.charAt(i);
+        for (int yPosition = 0; yPosition < track.size(); yPosition++) {
+            String line = track.get(yPosition);
+            for (int xPosition = 0; xPosition < line.length(); xPosition++) {
+                char possibleCarChar = line.charAt(xPosition);
                 if (!allSpaceTypesAsChar.contains(possibleCarChar)) {
                     if (usedSymbolForCar.contains(possibleCarChar)) {
                         throw new InvalidTrackFormatException();
                     }
                     usedSymbolForCar.add(possibleCarChar);
-                    cars.add(new Car(possibleCarChar, new PositionVector(i, j)));
+                    cars.add(new Car(possibleCarChar, new PositionVector(xPosition, yPosition)));
                 }
             }
         }
 
     }
+    //TODO: THIS
 
+    /**
+     * @throws InvalidTrackFormatException
+     */
     private void findFinish() throws InvalidTrackFormatException {
         for (int i = 0; i < track.size(); i++) {
             String line = track.get(i);
@@ -141,6 +151,12 @@ public class Track implements TrackSpecification {
         }
     }
 
+    /**
+     * Method to find the PositionVector of a chosen character
+     *
+     * @param symbol char that we are looking for on the track
+     * @return the PositionVector of the desired char
+     */
     private PositionVector findChar(char symbol) {
         PositionVector vector = null;
         for (int i = 0; i < track.size(); i++) {
@@ -154,37 +170,48 @@ public class Track implements TrackSpecification {
         return vector;
     }
 
+    /**
+     * Method that places a character at a chosen position
+     *
+     * @param positionVector position where char will be placed
+     * @param symbol         char that should be placed at desired position
+     */
     private void drawCharOnTrackIndicator(PositionVector positionVector, char symbol) {
         String line = track.get(positionVector.getY());
         line = line.substring(0, positionVector.getX()) + symbol + line.substring(positionVector.getX() + 1);
         track.remove(positionVector.getY());
         track.add(positionVector.getY(), line);
     }
+    //TODO: check if this method is okay and needed
 
-    private void isPositionVectorOnTrack(PositionVector positionVector) throws PositionVectorNotValid {
+    /**
+     * Determines if a location is valid PositionVector inside the track
+     *
+     * @param positionVector of location that has to be checked
+     * @throws PositionVectorNotValidException if the PositionVector does not lie on the track.
+     */
+    private void isPositionVectorOnTrack(PositionVector positionVector) throws PositionVectorNotValidException {
         try {
             track.get(positionVector.getY()).charAt(positionVector.getX());
         } catch (IndexOutOfBoundsException e) {
-            throw new PositionVectorNotValid();
+            throw new PositionVectorNotValidException();
         }
     }
 
-    /**
-     * @return all Cars
-     */
-    public List<Car> getCars() {
-        return cars;
-    }
 
     /**
-     * @return finishLine
+     * Method that returns the finishline as a List
+     *
+     * @return finishLine List
      */
     public List<PositionVector> getFinishLine() {
         return finishLine;
     }
 
     /**
-     * @return the track
+     * Returns the whole Track as List of Strings
+     *
+     * @return track as List of Strings
      */
     public List<String> getTrack() {
         return track;
@@ -203,7 +230,7 @@ public class Track implements TrackSpecification {
     }
 
     /**
-     * This class does change the Position of the car only in the track.
+     * This Method does change the Position of the car inside the track object.
      *
      * @param carIndex of the current car
      */
@@ -225,12 +252,12 @@ public class Track implements TrackSpecification {
     }
 
     /**
-     * This Method will check if the Car could crash at the specific position
+     * This Method will check if the Car would crash at the specific position
      *
      * @param positionVector the position to check if the car could crash
      * @return true if car would crash. Else false.
      */
-    public boolean willCrashAtPosition(int carIndex, PositionVector positionVector) throws PositionVectorNotValid {
+    public boolean willCrashAtPosition(int carIndex, PositionVector positionVector) throws PositionVectorNotValidException {
         isPositionVectorOnTrack(positionVector); //TODO: remove this line? Or Method?
         char charAtPosition = track.get(positionVector.getY()).charAt(positionVector.getX());
         if (getCarId(carIndex) == charAtPosition) return false;
@@ -247,7 +274,7 @@ public class Track implements TrackSpecification {
      * @param carIndex            representing current Car
      * @param crashPositionVector where the Crash did happen
      */
-    public void carDoesCrash(int carIndex, PositionVector crashPositionVector) throws PositionVectorNotValid{
+    public void carDoesCrash(int carIndex, PositionVector crashPositionVector) throws PositionVectorNotValidException {
         isPositionVectorOnTrack(crashPositionVector); //TODO: remove this line? and Method?
         PositionVector currentCarPosition = getCarPos(carIndex);
         drawCharOnTrackIndicator(new PositionVector(currentCarPosition.getX(), currentCarPosition.getY()), ConfigSpecification.SpaceType.TRACK.getValue());
@@ -414,6 +441,48 @@ public class Track implements TrackSpecification {
         return pathList;
     }
 
+    public int calculateNewWinPoints(PositionVector start, PositionVector finish) {
+        List<PositionVector> path = calculatePointsOnPath(start, finish);
+        for (PositionVector point : path) {
+            if (getSpaceType(point) != null) {
+                switch (getSpaceType(point)) {
+                    case FINISH_UP:
+                        if (start.getY() < finish.getY()) {
+                            return 1;
+                        } else if (start.getY() > finish.getY()) {
+                            return -1;
+                        }
+                        break;
+                    case FINISH_DOWN:
+                        if (start.getY() > finish.getY()) {
+                            return 1;
+                        } else if (start.getY() < finish.getY()) {
+                            return -1;
+                        }
+                        break;
+                    case FINISH_RIGHT:
+                        if (start.getX() < finish.getX()) {
+                            return 1;
+                        } else if (start.getX() > finish.getX()) {
+                            return -1;
+                        }
+                        break;
+                    case FINISH_LEFT:
+                        if (start.getX() > finish.getX()) {
+                            return 1;
+                        } else if (start.getX() < finish.getX()) {
+                            return -1;
+                        }
+                        break;
+                    default:
+                        return 0;
+                }
+
+            }
+        }
+        return 0;
+    }
+
     /**
      * Return a String representation of the track, including the car locations.
      *

src/main/java/ch/zhaw/pm2/racetrack/UserInterface.java

@@ -6,13 +6,20 @@ import org.beryx.textio.TextTerminal;
 
 import java.util.List;
 
+/**
+ * Class representing the Userinterface.
+ * Used to get inputs from users via textio.
+ *
+ * @author Roman Schenk
+ */
 public class UserInterface {
 
     private final TextIO textIO;
     private final TextTerminal<?> textTerminal;
 
     /**
-     * Opens a new Terminal Window and prints the welcome Text
+     * Opens a new Terminal Window and prints the welcome Text.
+     *
      * @param welcomeText The Text which will be printed after the windows is opened.
      */
     public UserInterface(String welcomeText) {
@@ -24,6 +31,7 @@ public class UserInterface {
 
     /**
      * Prints the given Text in textTerminal
+     *
      * @param text The Text which should be printed.
      */
     public void printInformation(String text) {
@@ -31,8 +39,9 @@ public class UserInterface {
     }
 
     /**
-     * asks the user to choose one of the options given.
-     * @param text Text which is printed befor the options are printed. Example: "Select Track file:"
+     * Method which asks the user to choose one of the options given.
+     *
+     * @param text    Text which is printed before the options are printed. Example: "Select Track file:"
      * @param options List with the options which can be selected.
      * @return the list index of the selected option
      */
@@ -45,7 +54,8 @@ public class UserInterface {
     }
 
     /**
-     * gives information which player's turn it is and asks for the direction to accelerate
+     * Gives information which player is at turn and asks for the direction to accelerate or quit the game.
+     *
      * @param playingCarIndex the index of the player
      * @param playingCarID    the ID of the player
      * @return the direction which is selected by the player. If null -> quit game
@@ -70,7 +80,8 @@ public class UserInterface {
     }
 
     /**
-     * returns the the associated direction Object
+     * Method which returns the associated direction Object.
+     *
      * @param number the number which was typed by the user
      * @return the associated direction. If null -> unknown number
      */
@@ -90,7 +101,8 @@ public class UserInterface {
     }
 
     /**
-     * prints the given Track in the terminal
+     * Method to print the given Track in the terminal
+     *
      * @param track the track which should be printed
      */
     public void printTrack(Track track) {
@@ -98,14 +110,12 @@ public class UserInterface {
     }
 
     /**
-     * Method to dispose the Textterminal
-     * @param text OUtput Text
+     * Method to dispose of the Textterminal
+     *
+     * @param text Output Text
      */
     public void quit(String text) {
         textIO.newStringInputReader().withMinLength(0).read(text);
         textTerminal.dispose();
     }
-
-
-
 }

src/main/java/ch/zhaw/pm2/racetrack/given/GameSpecification.java

@@ -1,7 +1,7 @@
 package ch.zhaw.pm2.racetrack.given;
 
 import ch.zhaw.pm2.racetrack.PositionVector;
-import ch.zhaw.pm2.racetrack.PositionVectorNotValid;
+import ch.zhaw.pm2.racetrack.PositionVectorNotValidException;
 
 import java.util.List;
 
@@ -19,11 +19,11 @@ public interface GameSpecification {
 
     int getWinner();
 
-    void doCarTurn(PositionVector.Direction acceleration) throws PositionVectorNotValid;
+    void doCarTurn(PositionVector.Direction acceleration) throws PositionVectorNotValidException;
 
     void switchToNextActiveCar();
 
     List<PositionVector> calculatePath(PositionVector startPosition, PositionVector endPosition);
 
-    boolean willCarCrash(int carIndex, PositionVector position) throws PositionVectorNotValid;
+    boolean willCarCrash(int carIndex, PositionVector position) throws PositionVectorNotValidException;
 }

src/main/java/ch/zhaw/pm2/racetrack/strategy/MoveListStrategy.java

@@ -5,13 +5,14 @@ import ch.zhaw.pm2.racetrack.PositionVector.Direction;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Scanner;
 
 public class MoveListStrategy implements MoveStrategy {
 
-    private List<Direction> moveList;
+    private final List<Direction> moveList;
     private int pointer;
 
     public MoveListStrategy(String path) throws FileNotFoundException{
@@ -21,7 +22,7 @@ public class MoveListStrategy implements MoveStrategy {
     }
 
     private void readFile(File trackFile) throws FileNotFoundException {
-        Scanner scanner = new Scanner(new FileInputStream(trackFile), "UTF-8");
+        Scanner scanner = new Scanner(new FileInputStream(trackFile), StandardCharsets.UTF_8);
         Direction[] directions = Direction.values();
         while (scanner.hasNextLine()) {
             String line = scanner.nextLine();

src/main/java/ch/zhaw/pm2/racetrack/strategy/PathFinderMoveStrategy.java

@@ -86,17 +86,16 @@ public class PathFinderMoveStrategy implements MoveStrategy{
         }
 
         public boolean finished(){
-            for(PositionVector finishPosition : track.getFinishLine()){
-                if(finishPosition.equals(positions.get(positions.size()-1))){
-                    return true; //TODO: check direction
+            if(track.calculateNewWinPoints(positions.get(positions.size()-2), positions.get(positions.size()-1)) == 1){
+                return true;
             }
-            }
-            return false;
+            else return false;
         }
 
         public boolean crashed() {
             try {
-                if(track.willCrashAtPosition(carIndex, positions.get(positions.size()-1))){
+                for(PositionVector point : track.calculatePointsOnPath(positions.get(positions.size()-1), positions.get(positions.size()-2)))
+                if(track.willCrashAtPosition(carIndex, point)){
                     return true;
                 }
             } catch (PositionVectorNotValid e) {

src/main/java/ch/zhaw/pm2/racetrack/strategy/PathFollowerMoveStrategy.java

@@ -6,6 +6,7 @@ import ch.zhaw.pm2.racetrack.PositionVector.Direction;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Scanner;
 
@@ -25,7 +26,7 @@ public class PathFollowerMoveStrategy implements MoveStrategy {
     /**
      * List of all points on the path.
      */
-    private ArrayList<PositionVector> pointList;
+    private final ArrayList<PositionVector> pointList;
     /**
      * The index of the next point on the path.
      */
@@ -51,7 +52,7 @@ public class PathFollowerMoveStrategy implements MoveStrategy {
      * @throws FileNotFoundException If the file with the given path does not exist.
      */
     public void readFile(File trackFile) throws FileNotFoundException {
-        Scanner scanner = new Scanner(new FileInputStream(trackFile), "UTF-8");
+        Scanner scanner = new Scanner(new FileInputStream(trackFile), StandardCharsets.UTF_8);
         while (scanner.hasNextLine()) {
             String line = scanner.nextLine();
             String[] coordinates = line.split("(\\(X:|, Y:|\\))");

src/main/java/ch/zhaw/pm2/racetrack/strategy/UserMoveStrategy.java

@@ -7,9 +7,9 @@ import ch.zhaw.pm2.racetrack.UserInterface;
  * Let the user decide the next move.
  */
 public class UserMoveStrategy implements MoveStrategy {
-    private UserInterface userInterface;
-    private int carIndex;
-    private char carID;
+    private final UserInterface userInterface;
+    private final int carIndex;
+    private final char carID;
 
     public UserMoveStrategy(UserInterface userInterface, int carIndex, char carID) {
         this.userInterface = userInterface;

src/test/java/ch/zhaw/pm2/racetrack/CarTest.java

@@ -101,7 +101,7 @@ class CarTest {
     @Test
     void movement() {
         // add all possible directions in a List
-        List<PositionVector.Direction> directions = Arrays.asList(PositionVector.Direction.values());
+        PositionVector.Direction[] directions = PositionVector.Direction.values();
 
         //position shouldn't be changed because velocity should be 0.
         car.move();

src/test/java/ch/zhaw/pm2/racetrack/GameTest.java

@@ -7,6 +7,7 @@ import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Assertions;
 import java.io.File;
+import java.io.FileNotFoundException;
 import java.util.List;
 import static ch.zhaw.pm2.racetrack.Game.NO_WINNER;
 import static ch.zhaw.pm2.racetrack.PositionVector.Direction.*;
@@ -20,9 +21,9 @@ class GameTest {
     private Game game;
     private Track track;
 
-    private String TRACK_FILE_PATH = ".\\tracks\\challenge.txt";
-    private int CAR_INDEX_ONE = 0;
-    private int CAR_INDEX_TWO = 1;
+    private final String TRACK_FILE_PATH = ".\\tracks\\challenge.txt";
+    private final int CAR_INDEX_ONE = 0;
+    private final int CAR_INDEX_TWO = 1;
 
     /**
      * This nested Class tests if the game gets initiatet correctly
@@ -35,7 +36,12 @@ class GameTest {
         void setup() {
             userInterface = new UserInterface("Test");
             game = new Game(userInterface);
+            try {
                 track = game.selectTrack(new File(TRACK_FILE_PATH));
+            } catch (InvalidTrackFormatException | FileNotFoundException e) {
+                e.printStackTrace();
+                Assertions.fail();
+            }
             game.selectMoveStrategy(track.getCar(CAR_INDEX_ONE), new UserMoveStrategy(new UserInterface("Testing"), CAR_INDEX_ONE, track.getCarId(CAR_INDEX_ONE)));
             game.selectMoveStrategy(track.getCar(CAR_INDEX_TWO), new UserMoveStrategy(new UserInterface("Testing"), CAR_INDEX_TWO, track.getCarId(CAR_INDEX_TWO)));
 
@@ -93,7 +99,12 @@ class GameTest {
         void setup() {
             userInterface = new UserInterface("Test");
             game = new Game(userInterface);
+            try {
                 track = game.selectTrack(new File(TRACK_FILE_PATH));
+            } catch (InvalidTrackFormatException | FileNotFoundException e) {
+                e.printStackTrace();
+                Assertions.fail();
+            }
             game.selectMoveStrategy(track.getCar(CAR_INDEX_ONE), new UserMoveStrategy(new UserInterface("Testing"), CAR_INDEX_ONE, track.getCarId(CAR_INDEX_ONE)));
             game.selectMoveStrategy(track.getCar(CAR_INDEX_TWO), new UserMoveStrategy(new UserInterface("Testing"), CAR_INDEX_TWO, track.getCarId(CAR_INDEX_TWO)));
 
@@ -104,8 +115,8 @@ class GameTest {
             try {
                 game.doCarTurn(RIGHT);
                 Assertions.assertEquals(new PositionVector(1, 0), game.getCarVelocity(0));
-            } catch (PositionVectorNotValid positionVectorNotValid) {
-                positionVectorNotValid.printStackTrace();
+            } catch (PositionVectorNotValidException positionVectorNotValidException) {
+                positionVectorNotValidException.printStackTrace();
             }
         }
 
@@ -114,8 +125,8 @@ class GameTest {
             try {
                 game.doCarTurn(PositionVector.Direction.UP);
                 Assertions.assertTrue(game.onlyOneCarLeft());
-            } catch (PositionVectorNotValid positionVectorNotValid) {
-                positionVectorNotValid.printStackTrace();
+            } catch (PositionVectorNotValidException positionVectorNotValidException) {
+                positionVectorNotValidException.printStackTrace();
             }
         }
     }
@@ -169,23 +180,15 @@ class GameTest {
                 UP_RIGHT,
                 RIGHT,
                 RIGHT}));
-            try {
             game.initPhase();
             Assertions.assertEquals("a",game.gamePhase());
-            } catch (InvalidTrackFormatException | PositionVectorNotValid e) {
-                e.printStackTrace();
-            }
         }
 
         @Test
         void crashA() {
             game = new Game(new interFace("Test",new Integer[]{0,2,2},new PositionVector.Direction[]{UP}));
-            try {
             game.initPhase();
             Assertions.assertEquals("b",game.gamePhase());
-            } catch (InvalidTrackFormatException | PositionVectorNotValid e) {
-                e.printStackTrace();
-            }
         }
 
     }

src/test/java/ch/zhaw/pm2/racetrack/TrackTest.java

@@ -21,10 +21,11 @@ public class TrackTest {
             File file = new File(".\\tracks\\challenge.txt");
             try {
                 trackObj = new Track(file);
-
-            } catch (Exception | PositionVectorNotValid e) {
-                System.err.println("Error in Test compareTrack" + e.getMessage());
+            } catch (FileNotFoundException | InvalidTrackFormatException e) {
+                e.printStackTrace();
+                Assertions.fail();
             }
+
         }
 
         @Test
@@ -79,7 +80,7 @@ public class TrackTest {
                 track.add("##################################################");
                 track.add("##################################################");
                 Assertions.assertLinesMatch(track, trackObj.getTrack());
-            } catch (FileNotFoundException | InvalidTrackFormatException | PositionVectorNotValid e) {
+            } catch (FileNotFoundException | InvalidTrackFormatException e) {
                 e.printStackTrace();
             }
         }
@@ -115,8 +116,8 @@ public class TrackTest {
                 Assertions.assertFalse(trackObj.willCrashAtPosition(0, new PositionVector(7, 22)));
                 //Car will not Crash and is on finishLine
                 Assertions.assertFalse(trackObj.willCrashAtPosition(0, trackObj.getFinishLine().get(0)));
-            } catch (PositionVectorNotValid positionVectorNotValid) {
-                positionVectorNotValid.printStackTrace();
+            } catch (PositionVectorNotValidException positionVectorNotValidException) {
+                positionVectorNotValidException.printStackTrace();
                 Assertions.fail("Test should not throw error");
             }
         }
@@ -126,8 +127,8 @@ public class TrackTest {
         void makeCarCrash() {
             try {
                 trackObj.carDoesCrash(0, new PositionVector(6, 22));
-            } catch (PositionVectorNotValid positionVectorNotValid) {
-                positionVectorNotValid.printStackTrace();
+            } catch (PositionVectorNotValidException positionVectorNotValidException) {
+                positionVectorNotValidException.printStackTrace();
                 Assertions.fail("Test should not throw exception");
             }
             Assertions.assertEquals(Track.CRASH_INDICATOR, trackObj.getTrack().get(22).charAt(6));
@@ -146,7 +147,7 @@ public class TrackTest {
             try {
                 trackObj = new Track(file);
 
-            } catch (Exception | PositionVectorNotValid e) {
+            } catch (InvalidTrackFormatException | FileNotFoundException e) {
                 System.err.println("Error in Test compareTrack" + e.getMessage());
             }
         }
@@ -168,8 +169,8 @@ public class TrackTest {
         @Test
         @DisplayName("Invalid Position Vector used")
         void invalidPositionVector() {
-            Assertions.assertThrows(PositionVectorNotValid.class, () -> trackObj.willCrashAtPosition(0, new PositionVector(100, 200)));
-            Assertions.assertThrows(PositionVectorNotValid.class, () -> trackObj.carDoesCrash(1,new PositionVector(200,100)));
+            Assertions.assertThrows(PositionVectorNotValidException.class, () -> trackObj.willCrashAtPosition(0, new PositionVector(100, 200)));
+            Assertions.assertThrows(PositionVectorNotValidException.class, () -> trackObj.carDoesCrash(1,new PositionVector(200,100)));
         }
 
     }