ZHAW-IT21b_WIN
/
gruppe06-hufflepuff-projekt3-catan
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' 

# Conflicts:
#	src/ch/zhaw/catan/Siedler.java
This commit is contained in:
Andrin Fassbind 2021-12-10 18:09:03 +01:00
parent fc6eed48e8 6a5b7f2245
commit 71899e8acc
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/misc.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectRootManager" version="2" languageLevel="JDK_X" default="true" project-jdk-name="openjdk-17" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="openjdk-17" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
</project>

2
src/ch/zhaw/catan/SiedlerBoard.java
View File

@ -72,7 +72,7 @@ public class SiedlerBoard extends HexBoard<Config.Land, Settlement, Road, String
*
* @return String of actual board.
*/
public String getTextView() {
public String toString() {
SiedlerBoardTextView view = new SiedlerBoardTextView(this);
for (Map.Entry<Point, Field> field : fields.entrySet()) {
view.setLowerFieldLabel(field.getKey(), field.getValue().getLabel());

4
test/ch/zhaw/catan/SiedlerBoardTest.java
View File

@ -38,7 +38,7 @@ public class SiedlerBoardTest {
@Test
public void testLongestRoadSimple() {
System.out.println(board.getTextView());
System.out.println(board.toString());
assertEquals(Config.Faction.BLUE, board.getLongestRoadFaction(factionList));
assertEquals(6, board.getLongestRoadLength());
@ -47,7 +47,7 @@ public class SiedlerBoardTest {
@Test
public void testLongestRoadWithInterrupt() {
board.setCorner(new Point(4, 10), new Settlement(Config.Faction.RED, new Point(4, 10)));
System.out.println(board.getTextView());
System.out.println(board.toString());
assertEquals(Config.Faction.BLUE, board.getLongestRoadFaction(factionList));
assertEquals(5, board.getLongestRoadLength());

6
test/ch/zhaw/catan/SiedlerGameTest.java
View File

@ -107,7 +107,7 @@ public class SiedlerGameTest {
@DisplayName("Test")
public void TestHandle7() {
SiedlerGame game = startGame();
//todo
}
}
@ -229,7 +229,7 @@ public class SiedlerGameTest {
public void TestGameAfterSetupPhase() {
SiedlerGame game = gameAfterSetupPhase();
System.out.println(game.getBoard().getTextView());
System.out.println(game.getBoard().toString());
throwDiceSeveralTimes(game, 5, 5);
throwDiceSeveralTimes(game, 5, 5);
@ -311,7 +311,7 @@ public class SiedlerGameTest {
game.placeInitialRoad(secondRoad.first, secondRoad.second);
}
System.out.println(game.getBoard().getTextView());
System.out.println(game.getBoard().toString());
return game;
}