CodingTests
/
mars-rover-kata
1
0
Fork 0
Code

split a bit the main class 

(cherry picked from commit 44cfcaf3ca)
This commit is contained in:
Xavier Fontanet 2024-06-21 17:41:09 +02:00
parent 65423216aa
commit fd7deec805
4 changed files with 110 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
src/main/java/cat/hack3/codingtests/marsrover/ui/ClientCommandInterface.java
View File

@ -8,62 +8,15 @@ import cat.hack3.codingtests.marsrover.MarsRover;
import java.util.InputMismatchException; import java.util.InputMismatchException;
import java.util.Scanner; import java.util.Scanner;
import static cat.hack3.codingtests.marsrover.ui.UICommons.isNotExitSignal;
import static cat.hack3.codingtests.marsrover.ui.UICommons.output;
public class ClientCommandInterface { public class ClientCommandInterface {
private static MarsRover rover; private static MarsRover rover;
public static final String INTRO = """
░▒▓██████████████▓▒░ ░▒▓██████▓▒░░▒▓███████▓▒░ ░▒▓███████▓▒░ ░▒▓███████▓▒░ ░▒▓██████▓▒░░▒▓█▓▒░░▒▓█▓▒░▒▓████████▓▒░▒▓███████▓▒░
░▒▓█▓▒░░▒▓█▓▒░░▒▓█▓▒░▒▓█▓▒░░▒▓█▓▒░▒▓█▓▒░░▒▓█▓▒░▒▓█▓▒░ ░▒▓█▓▒░░▒▓█▓▒░▒▓█▓▒░░▒▓█▓▒░▒▓█▓▒░░▒▓█▓▒░▒▓█▓▒░ ░▒▓█▓▒░░▒▓█▓▒░
░▒▓█▓▒░░▒▓█▓▒░░▒▓█▓▒░▒▓█▓▒░░▒▓█▓▒░▒▓█▓▒░░▒▓█▓▒░▒▓█▓▒░ ░▒▓█▓▒░░▒▓█▓▒░▒▓█▓▒░░▒▓█▓▒░░▒▓█▓▒▒▓█▓▒░░▒▓█▓▒░ ░▒▓█▓▒░░▒▓█▓▒░
░▒▓█▓▒░░▒▓█▓▒░░▒▓█▓▒░▒▓████████▓▒░▒▓███████▓▒░ ░▒▓██████▓▒░ ░▒▓███████▓▒░░▒▓█▓▒░░▒▓█▓▒░░▒▓█▓▒▒▓█▓▒░░▒▓██████▓▒░ ░▒▓███████▓▒░
░▒▓█▓▒░░▒▓█▓▒░░▒▓█▓▒░▒▓█▓▒░░▒▓█▓▒░▒▓█▓▒░░▒▓█▓▒░ ░▒▓█▓▒░ ░▒▓█▓▒░░▒▓█▓▒░▒▓█▓▒░░▒▓█▓▒░ ░▒▓█▓▓█▓▒░ ░▒▓█▓▒░ ░▒▓█▓▒░░▒▓█▓▒░
░▒▓█▓▒░░▒▓█▓▒░░▒▓█▓▒░▒▓█▓▒░░▒▓█▓▒░▒▓█▓▒░░▒▓█▓▒░ ░▒▓█▓▒░ ░▒▓█▓▒░░▒▓█▓▒░▒▓█▓▒░░▒▓█▓▒░ ░▒▓█▓▓█▓▒░ ░▒▓█▓▒░ ░▒▓█▓▒░░▒▓█▓▒░
░▒▓█▓▒░░▒▓█▓▒░░▒▓█▓▒░▒▓█▓▒░░▒▓█▓▒░▒▓█▓▒░░▒▓█▓▒░▒▓███████▓▒░ ░▒▓█▓▒░░▒▓█▓▒░░▒▓██████▓▒░ ░▒▓██▓▒░ ░▒▓████████▓▒░▒▓█▓▒░░▒▓█▓▒░
Welcome to Mars Rover Command Line Interface!
Please, establish the Mars dimensions. Bear in mind the Mars-Coordinates-Representation is aligned with the following principles:
- Latitude is Y, starts from 1 on the top and goes down incrementally
- Longitude is X, starts from 1 on the left and goes to right incrementally
Here a graphical representation of a 3x3 map
1 2 3
1 1-1 1-2 1-3
2 2-1 2-2 2-3
3 3-1 3-2 3-3
""";
public static final String READY_MESSAGE = """
Fantastic!
A GPS, named MarsMap, has been delivered to Rover, configured with:
- The size information of the planet
- The current location of the Rover in it
He now can start moving along the planet based on your commands
After every movement, he will check the GPS and report back the new position
About rotations, Rover has a build-in accelerometer, which let him know in what direction is pointing out at any moment
That's all for now. Have fun!
_
[ ]
( )
|>|
__/===\\__
//| o=o |\\\\
<] | o=o | [>
\\=====/
/ / | \\ \\
<_________>
(to continue, enter your name)
""";
public static void main(String[] args) { public static void main(String[] args) {
output(INTRO); output(PresentationMessage.INTRO);
try (var reader = new Scanner(System.in)) { try (var reader = new Scanner(System.in)) {
//autoInitialization(); //autoInitialization();
@ -88,11 +41,11 @@ public class ClientCommandInterface {
output("Longitude:"); output("Longitude:");
int longitudeStartingPoint = takeIntegerInput(reader); int longitudeStartingPoint = takeIntegerInput(reader);
Direction startingDirection = retrieveDirection(reader); Direction startingDirection = DirectionRetriever.retrieveDirection(reader);
deployRover(mapHeight, mapWidth, latitudeStartingPoint, longitudeStartingPoint, startingDirection); deployRover(mapHeight, mapWidth, latitudeStartingPoint, longitudeStartingPoint, startingDirection);
output(READY_MESSAGE); output(PresentationMessage.READY_MESSAGE);
reader.next(); //input ignored reader.next(); //input ignored
} }
@ -106,27 +59,6 @@ public class ClientCommandInterface {
} }
} }
private static Direction retrieveDirection(Scanner reader) {
var directionInput = "none";
Direction resolvedDirection;
do {
output("Insert initial rover direction (n = north, e = east, w = west, s = south, q = exit):");
directionInput = reader.next();
resolvedDirection = switch (directionInput) {
case "n" -> Direction.NORTH;
case "e" -> Direction.EAST;
case "w" -> Direction.WEST;
case "s" -> Direction.SOUTH;
default -> null;
};
} while (isNotResolvedDirection(resolvedDirection) && isNotExitSignal(directionInput));
if (isExitSignal(directionInput))
System.exit(0);
return resolvedDirection;
}
private static void deployRover(int mapHeight, int mapWidth, int latitudeStartingPoint, int longitudeStartingPoint, Direction startingDirection) { private static void deployRover(int mapHeight, int mapWidth, int latitudeStartingPoint, int longitudeStartingPoint, Direction startingDirection) {
var startingCoordinates = Coordinates.of(latitudeStartingPoint, longitudeStartingPoint); var startingCoordinates = Coordinates.of(latitudeStartingPoint, longitudeStartingPoint);
var marsMap = new MarsMap(mapHeight, mapWidth, startingCoordinates); var marsMap = new MarsMap(mapHeight, mapWidth, startingCoordinates);
@ -149,18 +81,4 @@ public class ClientCommandInterface {
} while (isNotExitSignal(nextCommand)); } while (isNotExitSignal(nextCommand));
} }
private static boolean isNotResolvedDirection(Direction resolvedDirection) {
return resolvedDirection == null;
}
private static boolean isExitSignal(String nextCommand) {
return "q".equals(nextCommand);
}
private static boolean isNotExitSignal(String nextCommand) {
return !isExitSignal(nextCommand);
}
private static void output(String message) {
System.out.println(message);
}
} }

34
src/main/java/cat/hack3/codingtests/marsrover/ui/DirectionRetriever.java Normal file
View File

@ -0,0 +1,34 @@
package cat.hack3.codingtests.marsrover.ui;
import cat.hack3.codingtests.marsrover.Direction;
import java.util.Scanner;
import static cat.hack3.codingtests.marsrover.ui.UICommons.*;
public class DirectionRetriever {
static Direction retrieveDirection(Scanner reader) {
var directionInput = "none";
Direction resolvedDirection;
do {
output("Insert initial rover direction (n = north, e = east, w = west, s = south, q = exit):");
directionInput = reader.next();
resolvedDirection = switch (directionInput) {
case "n" -> Direction.NORTH;
case "e" -> Direction.EAST;
case "w" -> Direction.WEST;
case "s" -> Direction.SOUTH;
default -> null;
};
} while (isNotResolvedDirection(resolvedDirection) && isNotExitSignal(directionInput));
if (isExitSignal(directionInput))
System.exit(0);
return resolvedDirection;
}
private static boolean isNotResolvedDirection(Direction resolvedDirection) {
return resolvedDirection == null;
}
}

52
src/main/java/cat/hack3/codingtests/marsrover/ui/PresentationMessage.java Normal file
View File

@ -0,0 +1,52 @@
package cat.hack3.codingtests.marsrover.ui;
public interface PresentationMessage {
String INTRO = """
░▒▓██████████████▓▒░ ░▒▓██████▓▒░░▒▓███████▓▒░ ░▒▓███████▓▒░ ░▒▓███████▓▒░ ░▒▓██████▓▒░░▒▓█▓▒░░▒▓█▓▒░▒▓████████▓▒░▒▓███████▓▒░
░▒▓█▓▒░░▒▓█▓▒░░▒▓█▓▒░▒▓█▓▒░░▒▓█▓▒░▒▓█▓▒░░▒▓█▓▒░▒▓█▓▒░ ░▒▓█▓▒░░▒▓█▓▒░▒▓█▓▒░░▒▓█▓▒░▒▓█▓▒░░▒▓█▓▒░▒▓█▓▒░ ░▒▓█▓▒░░▒▓█▓▒░
░▒▓█▓▒░░▒▓█▓▒░░▒▓█▓▒░▒▓█▓▒░░▒▓█▓▒░▒▓█▓▒░░▒▓█▓▒░▒▓█▓▒░ ░▒▓█▓▒░░▒▓█▓▒░▒▓█▓▒░░▒▓█▓▒░░▒▓█▓▒▒▓█▓▒░░▒▓█▓▒░ ░▒▓█▓▒░░▒▓█▓▒░
░▒▓█▓▒░░▒▓█▓▒░░▒▓█▓▒░▒▓████████▓▒░▒▓███████▓▒░ ░▒▓██████▓▒░ ░▒▓███████▓▒░░▒▓█▓▒░░▒▓█▓▒░░▒▓█▓▒▒▓█▓▒░░▒▓██████▓▒░ ░▒▓███████▓▒░
░▒▓█▓▒░░▒▓█▓▒░░▒▓█▓▒░▒▓█▓▒░░▒▓█▓▒░▒▓█▓▒░░▒▓█▓▒░ ░▒▓█▓▒░ ░▒▓█▓▒░░▒▓█▓▒░▒▓█▓▒░░▒▓█▓▒░ ░▒▓█▓▓█▓▒░ ░▒▓█▓▒░ ░▒▓█▓▒░░▒▓█▓▒░
░▒▓█▓▒░░▒▓█▓▒░░▒▓█▓▒░▒▓█▓▒░░▒▓█▓▒░▒▓█▓▒░░▒▓█▓▒░ ░▒▓█▓▒░ ░▒▓█▓▒░░▒▓█▓▒░▒▓█▓▒░░▒▓█▓▒░ ░▒▓█▓▓█▓▒░ ░▒▓█▓▒░ ░▒▓█▓▒░░▒▓█▓▒░
░▒▓█▓▒░░▒▓█▓▒░░▒▓█▓▒░▒▓█▓▒░░▒▓█▓▒░▒▓█▓▒░░▒▓█▓▒░▒▓███████▓▒░ ░▒▓█▓▒░░▒▓█▓▒░░▒▓██████▓▒░ ░▒▓██▓▒░ ░▒▓████████▓▒░▒▓█▓▒░░▒▓█▓▒░
Welcome to Mars Rover Command Line Interface!
Please, establish the Mars dimensions. Bear in mind the Mars-Coordinates-Representation is aligned with the following principles:
- Latitude is Y, starts from 1 on the top and goes down incrementally
- Longitude is X, starts from 1 on the left and goes to right incrementally
Here a graphical representation of a 3x3 map
1 2 3
1 1-1 1-2 1-3
2 2-1 2-2 2-3
3 3-1 3-2 3-3
""";
String READY_MESSAGE = """
Fantastic!
A GPS, named MarsMap, has been delivered to Rover, configured with:
- The size information of the planet
- The current location of the Rover in it
He now can start moving along the planet based on your commands
After every movement, he will check the GPS and report back the new position
About rotations, Rover has a build-in accelerometer, which let him know in what direction is pointing out at any moment
That's all for now. Have fun!
_
[ ]
( )
|>|
__/===\\__
//| o=o |\\\\
<] | o=o | [>
\\=====/
/ / | \\ \\
<_________>
(to continue, enter your name)
""";
}

18
src/main/java/cat/hack3/codingtests/marsrover/ui/UICommons.java Normal file
View File

@ -0,0 +1,18 @@
package cat.hack3.codingtests.marsrover.ui;
public class UICommons {
public static final String QUIT_COMMAND_TEXT = "q";
static boolean isExitSignal(String nextCommand) {
return QUIT_COMMAND_TEXT.equals(nextCommand);
}
static boolean isNotExitSignal(String nextCommand) {
return !isExitSignal(nextCommand);
}
static void output(String message) {
System.out.println(message);
}
}