Aleandro/Progetto-ingegneria-del-software
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix: public access now are private with setter/getter

Browse Source
This commit is contained in:
aleandro
2026-06-09 21:06:51 +02:00
parent 3318801913
commit cbf6cb3c5b
43 changed files with 351 additions and 336 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/it/polimi/ingsw/gc14/Controller/GameControllerTest.java
+15 -15
View File
@@ -34,7 +34,7 @@ class GameControllerTest {
selectedTotem.name()
));
assertEquals(selectedTotem, current.totem);
assertEquals(selectedTotem, current.getTotem());
}
assertEquals(GameStages.SLOT_CHOICE, game.getCurrentState().getGameStage());
@@ -109,9 +109,9 @@ class GameControllerTest {
assertNotNull(second);
assertNotNull(third);
first.buildingCards.add(new BuildingCard(12, 1, 1, 0));
second.buildingCards.add(new BuildingCard(12, 1, 1, 0));
third.buildingCards.add(new BuildingCard(12, 1, 1, 0));
first.getBuildingCards().add(new BuildingCard(12, 1, 1, 0));
second.getBuildingCards().add(new BuildingCard(12, 1, 1, 0));
third.getBuildingCards().add(new BuildingCard(12, 1, 1, 0));
}
private void resolveActionsUntilOptionalCardEffect(Game game, GameController controller) {
@@ -228,9 +228,9 @@ class GameControllerTest {
assertEquals(GameStages.SLOT_CHOICE, game.getCurrentState().getGameStage());
assertNotNull(game.getPlayerByUsername("Giorgio").totem);
assertNotNull(game.getPlayerByUsername("Marco").totem);
assertNotNull(game.getPlayerByUsername("Luca").totem);
assertNotNull(game.getPlayerByUsername("Giorgio").getTotem());
assertNotNull(game.getPlayerByUsername("Marco").getTotem());
assertNotNull(game.getPlayerByUsername("Luca").getTotem());
}
@Test
@@ -391,18 +391,18 @@ class GameControllerTest {
assertTrue(current.removeFood(1));
}
if (current.builders.isEmpty()) {
if (current.getBuilders().isEmpty()) {
assertFalse(controller.drawUpperBuildingCard(current.getUserName(), 0));
}
current.addFood(100);
int foodBefore = current.getFoodValue();
int buildingsBefore = current.buildingCards.size();
int buildingsBefore = current.getBuildingCards().size();
assertTrue(controller.drawUpperBuildingCard(current.getUserName(), 0));
assertTrue(current.getFoodValue() <= foodBefore);
assertEquals(buildingsBefore + 1, current.buildingCards.size());
assertEquals(buildingsBefore + 1, current.getBuildingCards().size());
}
@Test
@@ -522,7 +522,7 @@ class GameControllerTest {
Player optionalPlayer = game.getCurrentState().getCurrentPlayer();
assertNotNull(optionalPlayer);
assertTrue(optionalPlayer.buildingCards.stream()
assertTrue(optionalPlayer.getBuildingCards().stream()
.anyMatch(building -> building.getEffectId() == 12));
List<TribeCard> upperCards = game.getUpperListTribeCards();
@@ -548,7 +548,7 @@ class GameControllerTest {
Player optionalPlayer = game.getCurrentState().getCurrentPlayer();
assertNotNull(optionalPlayer);
assertTrue(optionalPlayer.buildingCards.stream()
assertTrue(optionalPlayer.getBuildingCards().stream()
.anyMatch(building -> building.getEffectId() == 12));
assertFalse(game.getUpperListBuilding().isEmpty());
@@ -556,12 +556,12 @@ class GameControllerTest {
optionalPlayer.addFood(100);
int foodBefore = optionalPlayer.getFoodValue();
int buildingsBefore = optionalPlayer.buildingCards.size();
int buildingsBefore = optionalPlayer.getBuildingCards().size();
assertTrue(controller.drawUpperBuildingCard(optionalPlayer.getUserName(), 0));
assertTrue(optionalPlayer.getFoodValue() <= foodBefore);
assertEquals(buildingsBefore + 1, optionalPlayer.buildingCards.size());
assertEquals(buildingsBefore + 1, optionalPlayer.getBuildingCards().size());
}
@Test
@@ -622,7 +622,7 @@ class GameControllerTest {
Player optionalPlayer = game.getCurrentState().getCurrentPlayer();
assertNotNull(optionalPlayer);
assertTrue(optionalPlayer.buildingCards.stream()
assertTrue(optionalPlayer.getBuildingCards().stream()
.anyMatch(building -> building.getEffectId() == 12));
assertTrue(controller.skipTurn(optionalPlayer.getUserName()));
src/test/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building0Test.java
+24 -24
View File
@@ -86,12 +86,12 @@ class Building0Test {
Hunter h = new Hunter(Era, true);
Inventor i = new Inventor(Era, 1);
Shaman s = new Shaman(Era,1);
p.artists.add(a);
p.builders.add(b);
p.gatherers.add(g);
p.hunters.add(h);
p.inventors.add(i);
p.shamans.add(s);
p.getArtists().add(a);
p.getBuilders().add(b);
p.getGatherers().add(g);
p.getHunters().add(h);
p.getInventors().add(i);
p.getShamans().add(s);
b0.applyEffect(p);
assertEquals(5, p.getFoodValue());
}
@@ -109,12 +109,12 @@ class Building0Test {
Hunter h = new Hunter(Era, true);
Inventor i = new Inventor(Era, 1);
Shaman s = new Shaman(Era,1);
p.artists.add(a);
p.builders.add(b);
p.gatherers.add(g);
p.hunters.add(h);
p.inventors.add(i);
p.shamans.add(s);
p.getArtists().add(a);
p.getBuilders().add(b);
p.getGatherers().add(g);
p.getHunters().add(h);
p.getInventors().add(i);
p.getShamans().add(s);
assertEquals(0, p.getFoodValue());
// Corretta creazione / esecuzione building card
@@ -175,12 +175,12 @@ class Building0Test {
p.addFood(b0.getPrice());
assertTrue(b0.buy(p));
p.artists.add(new Artist(era));
p.builders.add(new Builder(era, 0, 0));
p.gatherers.add(new Gatherer(era));
p.hunters.add(new Hunter(era, true));
p.inventors.add(new Inventor(era, 1));
p.shamans.add(new Shaman(era, 1));
p.getArtists().add(new Artist(era));
p.getBuilders().add(new Builder(era, 0, 0));
p.getGatherers().add(new Gatherer(era));
p.getHunters().add(new Hunter(era, true));
p.getInventors().add(new Inventor(era, 1));
p.getShamans().add(new Shaman(era, 1));
b0.applyEffect(p);
assertEquals(5, p.getFoodValue());
@@ -200,12 +200,12 @@ class Building0Test {
assertTrue(b0.buy(p));
for (int k = 0; k < 2; k++) {
p.artists.add(new Artist(era));
p.builders.add(new Builder(era, 0, 0));
p.gatherers.add(new Gatherer(era));
p.hunters.add(new Hunter(era, true));
p.inventors.add(new Inventor(era, 1));
p.shamans.add(new Shaman(era, 1));
p.getArtists().add(new Artist(era));
p.getBuilders().add(new Builder(era, 0, 0));
p.getGatherers().add(new Gatherer(era));
p.getHunters().add(new Hunter(era, true));
p.getInventors().add(new Inventor(era, 1));
p.getShamans().add(new Shaman(era, 1));
}
b0.applyEffect(p);
src/test/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building10Test.java
+11 -11
View File
@@ -58,12 +58,12 @@ class Building10Test {
int nSet = 2;
for (int i = 0; i < nSet; i++) {
p.artists.add(new Artist(era));
p.builders.add(new Builder(era, 0, 0));
p.gatherers.add(new Gatherer(era));
p.hunters.add(new Hunter(era, true));
p.inventors.add(new Inventor(era, 1));
p.shamans.add(new Shaman(era, 1));
p.getArtists().add(new Artist(era));
p.getBuilders().add(new Builder(era, 0, 0));
p.getGatherers().add(new Gatherer(era));
p.getHunters().add(new Hunter(era, true));
p.getInventors().add(new Inventor(era, 1));
p.getShamans().add(new Shaman(era, 1));
}
b10.applyEffect(p);
@@ -123,11 +123,11 @@ class Building10Test {
int era = 1;
p.artists.add(new Artist(era));
p.builders.add(new Builder(era, 0, 0));
p.gatherers.add(new Gatherer(era));
p.hunters.add(new Hunter(era, true));
p.inventors.add(new Inventor(era, 1));
p.getArtists().add(new Artist(era));
p.getBuilders().add(new Builder(era, 0, 0));
p.getGatherers().add(new Gatherer(era));
p.getHunters().add(new Hunter(era, true));
p.getInventors().add(new Inventor(era, 1));
// Manca lo Shaman, quindi non c'è un set completo.
b10.applyEffect(p);
src/test/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building11Test.java
+3 -3
View File
@@ -68,7 +68,7 @@ class Building11Test {
assertFalse(b1.buy(p1));
p1.artists.add(a1);
p1.getArtists().add(a1);
assertThrows(IllegalArgumentException.class, () -> b1.applyEffect(p1));
@@ -92,8 +92,8 @@ class Building11Test {
p2.addFood(b2.getPrice());
assertTrue(b2.buy(p2));
p2.artists.add(a2);
p2.artists.add(a3);
p2.getArtists().add(a2);
p2.getArtists().add(a3);
b2.applyEffect(p2);
src/test/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building1Test.java
+14 -14
View File
@@ -25,13 +25,13 @@ class Building1Test {
void applyEffect(){
String user = "test";
Player p = new Player(user);
assertTrue(p.buildingCards.isEmpty());
assertTrue(p.inventors.isEmpty());
assertTrue(p.builders.isEmpty());
assertTrue(p.gatherers.isEmpty());
assertTrue(p.shamans.isEmpty());
assertTrue(p.hunters.isEmpty());
assertTrue(p.artists.isEmpty());
assertTrue(p.getBuildingCards().isEmpty());
assertTrue(p.getInventors().isEmpty());
assertTrue(p.getBuilders().isEmpty());
assertTrue(p.getGatherers().isEmpty());
assertTrue(p.getShamans().isEmpty());
assertTrue(p.getHunters().isEmpty());
assertTrue(p.getArtists().isEmpty());
assertEquals(0, p.getFoodValue());
assertEquals(0, p.getPrestigeValue());
assertEquals(user, p.getUserName());
@@ -39,13 +39,13 @@ class Building1Test {
Building1 b0 = new Building1(1,2,3, CharacterType.INVENTOR);
b0.applyEffect(p);
assertTrue(p.buildingCards.isEmpty());
assertTrue(p.inventors.isEmpty());
assertTrue(p.builders.isEmpty());
assertTrue(p.gatherers.isEmpty());
assertTrue(p.shamans.isEmpty());
assertTrue(p.hunters.isEmpty());
assertTrue(p.artists.isEmpty());
assertTrue(p.getBuildingCards().isEmpty());
assertTrue(p.getInventors().isEmpty());
assertTrue(p.getBuilders().isEmpty());
assertTrue(p.getGatherers().isEmpty());
assertTrue(p.getShamans().isEmpty());
assertTrue(p.getHunters().isEmpty());
assertTrue(p.getArtists().isEmpty());
assertEquals(0, p.getFoodValue());
assertEquals(0, p.getPrestigeValue());
assertEquals(user, p.getUserName());
src/test/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building8Test.java
+3 -3
View File
@@ -59,8 +59,8 @@ class Building8Test {
Builder builder1 = new Builder(era, 1, 2);
Builder builder2 = new Builder(era, 1, 3);
p.builders.add(builder1);
p.builders.add(builder2);
p.getBuilders().add(builder1);
p.getBuilders().add(builder2);
b8.applyEffect(p);
@@ -73,7 +73,7 @@ class Building8Test {
Player p = new Player("test");
Building8 b8 = new Building8(1, 1, 1);
Building0 b0 = new Building0(1, 1, 1);
p.buildingCards.add(b0);
p.getBuildingCards().add(b0);
assertThrows(IllegalArgumentException.class, () -> b8.applyEffect(p));
}
src/test/java/it/polimi/ingsw/gc14/Model/Cards/BuildingCardTest.java
+34 -34
View File
@@ -145,8 +145,8 @@ class BuildingCardTest {
assertTrue(bc0.buy(p1));
assertTrue(p1.buildingCards.contains(bc0));
assertEquals(1, p1.buildingCards.size());
assertTrue(p1.getBuildingCards().contains(bc0));
assertEquals(1, p1.getBuildingCards().size());
assertFalse(bc0.buy(p1));
assertFalse(bc0.buy(p2));
@@ -161,7 +161,7 @@ class BuildingCardTest {
Player p = new Player("test");
p.addFood(food);
p.builders.add(new Builder(1, RV, 1));
p.getBuilders().add(new Builder(1, RV, 1));
@@ -174,7 +174,7 @@ class BuildingCardTest {
assertEquals(food, p.getFoodValue());
assertTrue(bc.buy(p));
int discount = p.builders.stream().mapToInt(x -> x.getReductionValue()).sum();
int discount = p.getBuilders().stream().mapToInt(x -> x.getReductionValue()).sum();
assertEquals(food - price + discount, p.getFoodValue());
p.removeFood(p.getFoodValue());
@@ -184,10 +184,10 @@ class BuildingCardTest {
//Testing that to pay == 0
p.removeFood(p.getFoodValue());
p.addFood(food);
p.builders.add(new Builder(1, RV, 1));
p.builders.add(new Builder(1, RV, 1));
p.builders.add(new Builder(1, RV, 1));
p.builders.add(new Builder(1, RV, 1));
p.getBuilders().add(new Builder(1, RV, 1));
p.getBuilders().add(new Builder(1, RV, 1));
p.getBuilders().add(new Builder(1, RV, 1));
p.getBuilders().add(new Builder(1, RV, 1));
for(int ID = 3; ID < 13; ID++){
if(ID == 4 || ID == 8 || ID == 10 || ID == 11){
@@ -206,13 +206,13 @@ class BuildingCardTest {
//Testing that to pay == 0; discount shouldn't go below 0
p.removeFood(p.getFoodValue());
p.addFood(food);
p.builders.add(new Builder(1, RV, 1));
p.builders.add(new Builder(1, RV, 1));
p.builders.add(new Builder(1, RV, 1));
p.builders.add(new Builder(1, RV, 1));
p.builders.add(new Builder(1, RV, 1));
p.builders.add(new Builder(1, RV, 1));
p.builders.add(new Builder(1, RV, 1));
p.getBuilders().add(new Builder(1, RV, 1));
p.getBuilders().add(new Builder(1, RV, 1));
p.getBuilders().add(new Builder(1, RV, 1));
p.getBuilders().add(new Builder(1, RV, 1));
p.getBuilders().add(new Builder(1, RV, 1));
p.getBuilders().add(new Builder(1, RV, 1));
p.getBuilders().add(new Builder(1, RV, 1));
for(int ID = 3; ID < 13; ID++){
if(ID == 4 || ID == 8 || ID == 10 || ID == 11){
@@ -235,7 +235,7 @@ class BuildingCardTest {
Player p2 = new Player("test");
p2.addFood(food);
p2.builders.add(new Builder(1, RV, 1));
p2.getBuilders().add(new Builder(1, RV, 1));
for(int ID = 3; ID < 13; ID++){
if(ID == 4 || ID == 8 || ID == 10 || ID == 11){
@@ -245,7 +245,7 @@ class BuildingCardTest {
assertEquals(food, p2.getFoodValue());
assertTrue(bc.buy(p2));
int discount = p2.builders.stream().mapToInt(x -> x.getReductionValue()).sum();
int discount = p2.getBuilders().stream().mapToInt(x -> x.getReductionValue()).sum();
assertEquals(food, p2.getFoodValue());
p2.removeFood(p2.getFoodValue());
@@ -266,7 +266,7 @@ class BuildingCardTest {
assertEquals(food, p2.getFoodValue());
assertTrue(bc.buy(p2));
int discount = p2.builders.stream().mapToInt(x -> x.getReductionValue()).sum();
int discount = p2.getBuilders().stream().mapToInt(x -> x.getReductionValue()).sum();
assertEquals(food - price + discount, p2.getFoodValue());
p2.removeFood(p2.getFoodValue());
@@ -274,7 +274,7 @@ class BuildingCardTest {
}
//Testing discount with staggered values; discount shouldn't go below 0
p2.builders.add(new Builder(1, RV, 1));
p2.getBuilders().add(new Builder(1, RV, 1));
for(int ID = 3; ID < 13; ID++){
if(ID == 4 || ID == 8 || ID == 10 || ID == 11){
@@ -315,13 +315,13 @@ class BuildingCardTest {
void applyEffect(){
String user = "test";
Player p = new Player(user);
assertTrue(p.buildingCards.isEmpty());
assertTrue(p.inventors.isEmpty());
assertTrue(p.builders.isEmpty());
assertTrue(p.gatherers.isEmpty());
assertTrue(p.shamans.isEmpty());
assertTrue(p.hunters.isEmpty());
assertTrue(p.artists.isEmpty());
assertTrue(p.getBuildingCards().isEmpty());
assertTrue(p.getInventors().isEmpty());
assertTrue(p.getBuilders().isEmpty());
assertTrue(p.getGatherers().isEmpty());
assertTrue(p.getShamans().isEmpty());
assertTrue(p.getHunters().isEmpty());
assertTrue(p.getArtists().isEmpty());
assertEquals(0, p.getFoodValue());
assertEquals(0, p.getPrestigeValue());
assertEquals(user, p.getUserName());
@@ -329,13 +329,13 @@ class BuildingCardTest {
BuildingCard b = new BuildingCard(1,2,3);
b.applyEffect(p);
assertTrue(p.buildingCards.isEmpty());
assertTrue(p.inventors.isEmpty());
assertTrue(p.builders.isEmpty());
assertTrue(p.gatherers.isEmpty());
assertTrue(p.shamans.isEmpty());
assertTrue(p.hunters.isEmpty());
assertTrue(p.artists.isEmpty());
assertTrue(p.getBuildingCards().isEmpty());
assertTrue(p.getInventors().isEmpty());
assertTrue(p.getBuilders().isEmpty());
assertTrue(p.getGatherers().isEmpty());
assertTrue(p.getShamans().isEmpty());
assertTrue(p.getHunters().isEmpty());
assertTrue(p.getArtists().isEmpty());
assertEquals(0, p.getFoodValue());
assertEquals(0, p.getPrestigeValue());
assertEquals(user, p.getUserName());
@@ -420,7 +420,7 @@ class BuildingCardTest {
BuildingCard b = new BuildingCard(2, 1, 5, 1);
assertFalse(b.buy(p));
assertFalse(p.buildingCards.contains(b));
assertFalse(p.getBuildingCards().contains(b));
assertEquals(2, p.getFoodValue());
}
}
src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/ArtistTest.java
+4 -4
View File
@@ -35,14 +35,14 @@ class ArtistTest {
Player p = new Player("test");
Artist a = new Artist(1, 5);
assertEquals(0, p.artists.size());
assertEquals(0, p.getArtists().size());
a.insert(p);
assertEquals(1, p.artists.size());
assertTrue(p.artists.contains(a));
assertEquals(1, p.getArtists().size());
assertTrue(p.getArtists().contains(a));
Artist insertedArtist = p.artists.get(0);
Artist insertedArtist = p.getArtists().get(0);
assertSame(a, insertedArtist);
assertEquals(1, insertedArtist.getEra());
assertEquals(5, insertedArtist.getNMin());
src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/BuilderTest.java
+4 -4
View File
@@ -52,14 +52,14 @@ class BuilderTest {
Player p = new Player("test");
Builder b = new Builder(1, 2, 3, 5);
assertEquals(0, p.builders.size());
assertEquals(0, p.getBuilders().size());
b.insert(p);
assertEquals(1, p.builders.size());
assertTrue(p.builders.contains(b));
assertEquals(1, p.getBuilders().size());
assertTrue(p.getBuilders().contains(b));
Builder insertedBuilder = p.builders.get(0);
Builder insertedBuilder = p.getBuilders().get(0);
assertSame(b, insertedBuilder);
assertEquals(1, insertedBuilder.getEra());
assertEquals(5, insertedBuilder.getNMin());
src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/GathererTest.java
+4 -4
View File
@@ -36,14 +36,14 @@ class GathererTest {
Player p = new Player("test");
Gatherer g = new Gatherer(1, 5);
assertEquals(0, p.gatherers.size());
assertEquals(0, p.getGatherers().size());
g.insert(p);
assertEquals(1, p.gatherers.size());
assertTrue(p.gatherers.contains(g));
assertEquals(1, p.getGatherers().size());
assertTrue(p.getGatherers().contains(g));
Gatherer insertedGatherer = p.gatherers.get(0);
Gatherer insertedGatherer = p.getGatherers().get(0);
assertSame(g, insertedGatherer);
assertEquals(1, insertedGatherer.getEra());
assertEquals(5, insertedGatherer.getNMin());
src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/HunterTest.java
+6 -6
View File
@@ -52,15 +52,15 @@ class HunterTest {
Player p = new Player("test");
Hunter h = new Hunter(1, true, 5);
assertEquals(0, p.hunters.size());
assertEquals(0, p.getHunters().size());
assertEquals(0, p.getFoodValue());
h.insert(p);
assertEquals(1, p.hunters.size());
assertTrue(p.hunters.contains(h));
assertEquals(1, p.getHunters().size());
assertTrue(p.getHunters().contains(h));
Hunter insertedHunter = p.hunters.get(0);
Hunter insertedHunter = p.getHunters().get(0);
assertSame(h, insertedHunter);
assertEquals(1, insertedHunter.getEra());
assertEquals(5, insertedHunter.getNMin());
@@ -81,8 +81,8 @@ class HunterTest {
h.insert(p);
assertEquals(1, p.hunters.size());
assertTrue(p.hunters.contains(h));
assertEquals(1, p.getHunters().size());
assertTrue(p.getHunters().contains(h));
assertEquals(0, p.getFoodValue());
}
src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/InventorTest.java
+4 -4
View File
@@ -53,14 +53,14 @@ class InventorTest {
Player p = new Player("test");
Inventor i = new Inventor(1, 5, 5);
assertEquals(0, p.inventors.size());
assertEquals(0, p.getInventors().size());
i.insert(p);
assertEquals(1, p.inventors.size());
assertTrue(p.inventors.contains(i));
assertEquals(1, p.getInventors().size());
assertTrue(p.getInventors().contains(i));
Inventor insertedInventor = p.inventors.get(0);
Inventor insertedInventor = p.getInventors().get(0);
assertSame(i, insertedInventor);
assertEquals(1, insertedInventor.getEra());
assertEquals(5, insertedInventor.getNMin());
src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/ShamanTest.java
+4 -4
View File
@@ -53,14 +53,14 @@ class ShamanTest {
Player p = new Player("test");
Shaman s = new Shaman(1, 4, 5);
assertEquals(0, p.shamans.size());
assertEquals(0, p.getShamans().size());
s.insert(p);
assertEquals(1, p.shamans.size());
assertTrue(p.shamans.contains(s));
assertEquals(1, p.getShamans().size());
assertTrue(p.getShamans().contains(s));
Shaman insertedShaman = p.shamans.get(0);
Shaman insertedShaman = p.getShamans().get(0);
assertSame(s, insertedShaman);
assertEquals(1, insertedShaman.getEra());
assertEquals(5, insertedShaman.getNMin());
src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/CavePaintingsTest.java
+1 -1
View File
@@ -61,7 +61,7 @@ class CavePaintingsTest {
assertEquals(5, p1.getPrestigeValue());
assertEquals(0, p1.getFoodValue());
p1.artists.clear();
p1.getArtists().clear();
cp3.activateEvent(players);
assertEquals(-5, p1.getPrestigeValue());
assertEquals(0, p1.getFoodValue());
src/test/java/it/polimi/ingsw/gc14/Model/GameTest.java
+49 -49
View File
@@ -32,7 +32,7 @@ class GameTest {
Totems selectedTotem = availableTotems.get(0);
assertTrue(game.totemChoice(current, selectedTotem));
assertEquals(selectedTotem, current.totem);
assertEquals(selectedTotem, current.getTotem());
}
assertEquals(GameStages.SLOT_CHOICE, game.getCurrentState().getGameStage());
@@ -90,7 +90,7 @@ class GameTest {
private void giveOptionalEffectToAllPlayers(Player... players) {
for (Player player : players) {
player.buildingCards.add(new BuildingCard(12, 1, 1, 1));
player.getBuildingCards().add(new BuildingCard(12, 1, 1, 1));
}
}
@@ -330,13 +330,13 @@ class GameTest {
assertEquals(GameStages.SLOT_CHOICE, game.getCurrentState().getGameStage());
assertNotNull(p1.totem);
assertNotNull(p2.totem);
assertNotNull(p3.totem);
assertNotNull(p1.getTotem());
assertNotNull(p2.getTotem());
assertNotNull(p3.getTotem());
assertEquals(
3,
Stream.of(p1.totem, p2.totem, p3.totem).distinct().count()
Stream.of(p1.getTotem(), p2.getTotem(), p3.getTotem()).distinct().count()
);
}
@@ -496,7 +496,7 @@ class GameTest {
assertFalse(game.getUpperListBuilding().isEmpty());
temp_player.builders.clear();
temp_player.getBuilders().clear();
index = 0;
BuildingCard selectedBuilding = game.getUpperListBuilding().get(index);
@@ -527,27 +527,27 @@ class GameTest {
switch (((Character) temp_card).getType()) {
case ARTIST:
assertEquals(nCardsByType.get(((Character) temp_card).getType()) + 1, temp_player.artists.size());
assertEquals(nCardsByType.get(((Character) temp_card).getType()) + 1, temp_player.getArtists().size());
nCardsByType.merge(((Character) temp_card).getType(), 1, Integer::sum);
break;
case INVENTOR:
assertEquals(nCardsByType.get(((Character) temp_card).getType()) + 1, temp_player.inventors.size());
assertEquals(nCardsByType.get(((Character) temp_card).getType()) + 1, temp_player.getInventors().size());
nCardsByType.merge(((Character) temp_card).getType(), 1, Integer::sum);
break;
case HUNTER:
assertEquals(nCardsByType.get(((Character) temp_card).getType()) + 1, temp_player.hunters.size());
assertEquals(nCardsByType.get(((Character) temp_card).getType()) + 1, temp_player.getHunters().size());
nCardsByType.merge(((Character) temp_card).getType(), 1, Integer::sum);
break;
case SHAMAN:
assertEquals(nCardsByType.get(((Character) temp_card).getType()) + 1, temp_player.shamans.size());
assertEquals(nCardsByType.get(((Character) temp_card).getType()) + 1, temp_player.getShamans().size());
nCardsByType.merge(((Character) temp_card).getType(), 1, Integer::sum);
break;
case BUILDER:
assertEquals(nCardsByType.get(((Character) temp_card).getType()) + 1, temp_player.builders.size());
assertEquals(nCardsByType.get(((Character) temp_card).getType()) + 1, temp_player.getBuilders().size());
nCardsByType.merge(((Character) temp_card).getType(), 1, Integer::sum);
break;
case GATHERER:
assertEquals(nCardsByType.get(((Character) temp_card).getType()) + 1, temp_player.gatherers.size());
assertEquals(nCardsByType.get(((Character) temp_card).getType()) + 1, temp_player.getGatherers().size());
nCardsByType.merge(((Character) temp_card).getType(), 1, Integer::sum);
break;
@@ -605,23 +605,23 @@ class GameTest {
assertFalse(game.getUpperListBuilding().isEmpty());
current.builders.clear();
current.getBuilders().clear();
BuildingCard selectedBuilding = game.getUpperListBuilding().get(0);
int expectedCost = selectedBuilding.getPrice();
current.addFood(expectedCost);
int buildingsBefore = current.buildingCards.size();
int buildingsBefore = current.getBuildingCards().size();
int upperBuildingsBefore = game.getUpperListBuilding().size();
int foodBefore = current.getFoodValue();
assertTrue(game.DrawUpperBuildingCardByIndex(current, 0));
assertEquals(buildingsBefore + 1, current.buildingCards.size());
assertEquals(buildingsBefore + 1, current.getBuildingCards().size());
assertEquals(upperBuildingsBefore - 1, game.getUpperListBuilding().size());
assertTrue(current.buildingCards.stream()
assertTrue(current.getBuildingCards().stream()
.anyMatch(building ->
building.getPrice() == selectedBuilding.getPrice()
&& building.getPrestigeValue() == selectedBuilding.getPrestigeValue()
@@ -939,7 +939,7 @@ class GameTest {
List<Player> players = addPlayers(game, 3, "single_optional_");
players.get(0).buildingCards.add(new BuildingCard(12, 1, 1, 1));
players.get(0).getBuildingCards().add(new BuildingCard(12, 1, 1, 1));
int roundBefore = game.getCurrentState().getRound();
@@ -1000,7 +1000,7 @@ class GameTest {
assertTrue(current.removeFood(1));
}
current.builders.clear();
current.getBuilders().clear();
assertEquals(0, current.getFoodValue());
@@ -1032,14 +1032,14 @@ class GameTest {
if (game.getCurrentState().getNLower() > 0
&& !game.getLowerListBuilding().isEmpty()) {
current.builders.clear();
current.getBuilders().clear();
BuildingCard selectedBuilding = game.getLowerListBuilding().get(0);
int expectedCost = selectedBuilding.getPrice();
current.addFood(expectedCost);
int buildingsBefore = current.buildingCards.size();
int buildingsBefore = current.getBuildingCards().size();
int lowerBuildingsBefore = game.getLowerListBuilding().size();
int foodBefore = current.getFoodValue();
@@ -1048,9 +1048,9 @@ class GameTest {
"DrawLowerBuildingCardByIndex should return true when lower building exists, player can draw lower, and player has food."
);
assertEquals(buildingsBefore + 1, current.buildingCards.size());
assertEquals(buildingsBefore + 1, current.getBuildingCards().size());
assertEquals(lowerBuildingsBefore - 1, game.getLowerListBuilding().size());
assertTrue(current.buildingCards.stream()
assertTrue(current.getBuildingCards().stream()
.anyMatch(building ->
building.getPrice() == selectedBuilding.getPrice()
&& building.getPrestigeValue() == selectedBuilding.getPrestigeValue()
@@ -1109,16 +1109,16 @@ class GameTest {
assertTrue(current.removeFood(1));
}
current.builders.clear();
current.getBuilders().clear();
assertEquals(0, current.getFoodValue());
int buildingsBefore = current.buildingCards.size();
int buildingsBefore = current.getBuildingCards().size();
int upperBuildingsBefore = game.getUpperListBuilding().size();
assertFalse(game.DrawUpperBuildingCardByIndex(current, 0));
assertEquals(buildingsBefore, current.buildingCards.size());
assertEquals(buildingsBefore, current.getBuildingCards().size());
assertEquals(upperBuildingsBefore, game.getUpperListBuilding().size());
assertEquals(0, current.getFoodValue());
@@ -1194,14 +1194,14 @@ class GameTest {
}
private void preparePlayerForComparableFinalScoring(Player player) {
player.buildingCards.clear();
player.getBuildingCards().clear();
player.builders.clear();
player.inventors.clear();
player.artists.clear();
player.hunters.clear();
player.shamans.clear();
player.gatherers.clear();
player.getBuilders().clear();
player.getInventors().clear();
player.getArtists().clear();
player.getHunters().clear();
player.getShamans().clear();
player.getGatherers().clear();
while (player.getFoodValue() > 0) {
assertTrue(player.removeFood(1));
@@ -1211,7 +1211,7 @@ class GameTest {
* Keeps the optional effect, but with zero final prestige.
* This preserves the OPT_CARD_E phase while keeping the comparison controlled.
*/
player.buildingCards.add(new BuildingCard(12, 1, 1, 0));
player.getBuildingCards().add(new BuildingCard(12, 1, 1, 0));
}
@Test
@@ -1420,16 +1420,16 @@ class GameTest {
assertTrue(current.removeFood(1));
}
current.builders.clear();
current.getBuilders().clear();
assertEquals(0, current.getFoodValue());
int buildingsBefore = current.buildingCards.size();
int buildingsBefore = current.getBuildingCards().size();
int lowerBuildingsBefore = game.getLowerListBuilding().size();
assertFalse(game.DrawLowerBuildingCardByIndex(current, 0));
assertEquals(buildingsBefore, current.buildingCards.size());
assertEquals(buildingsBefore, current.getBuildingCards().size());
assertEquals(lowerBuildingsBefore, game.getLowerListBuilding().size());
assertEquals(0, current.getFoodValue());
@@ -1623,8 +1623,8 @@ class GameTest {
BuildingCard firstBuilding = new BuildingCard(12, 1, 1, 7);
BuildingCard secondBuilding = new BuildingCard(12, 1, 1, 5);
testedPlayer.buildingCards.add(firstBuilding);
testedPlayer.buildingCards.add(secondBuilding);
testedPlayer.getBuildingCards().add(firstBuilding);
testedPlayer.getBuildingCards().add(secondBuilding);
int prestigeDifferenceBefore =
testedPlayer.getPrestigeValue() - controlPlayer.getPrestigeValue();
@@ -1680,11 +1680,11 @@ class GameTest {
preparePlayerForComparableFinalScoring(testedPlayer);
preparePlayerForComparableFinalScoring(players.get(2));
controlPlayer.builders.add(new Builder(1, 0, 0));
controlPlayer.builders.add(new Builder(1, 0, 0));
controlPlayer.getBuilders().add(new Builder(1, 0, 0));
controlPlayer.getBuilders().add(new Builder(1, 0, 0));
testedPlayer.builders.add(new Builder(1, 0, 4));
testedPlayer.builders.add(new Builder(1, 0, 3));
testedPlayer.getBuilders().add(new Builder(1, 0, 4));
testedPlayer.getBuilders().add(new Builder(1, 0, 3));
int prestigeDifferenceBefore =
testedPlayer.getPrestigeValue() - controlPlayer.getPrestigeValue();
@@ -1736,13 +1736,13 @@ class GameTest {
preparePlayerForComparableFinalScoring(testedPlayer);
preparePlayerForComparableFinalScoring(players.get(2));
controlPlayer.builders.add(new Builder(1, 0, 0));
controlPlayer.builders.add(new Builder(1, 0, 0));
controlPlayer.builders.add(new Builder(1, 0, 0));
controlPlayer.getBuilders().add(new Builder(1, 0, 0));
controlPlayer.getBuilders().add(new Builder(1, 0, 0));
controlPlayer.getBuilders().add(new Builder(1, 0, 0));
testedPlayer.inventors.add(new Inventor(1, 0));
testedPlayer.inventors.add(new Inventor(1, 1));
testedPlayer.inventors.add(new Inventor(1, 1));
testedPlayer.getInventors().add(new Inventor(1, 0));
testedPlayer.getInventors().add(new Inventor(1, 1));
testedPlayer.getInventors().add(new Inventor(1, 1));
int prestigeDifferenceBefore =
testedPlayer.getPrestigeValue() - controlPlayer.getPrestigeValue();
src/test/java/it/polimi/ingsw/gc14/Model/Orders/Order2Test.java
+1 -1
View File
@@ -96,7 +96,7 @@ class Order2Test {
Player firstToAct = order.pull();
order.pull();
firstToAct.buildingCards.add(new BuildingCard(3, 1, 1, 2));
firstToAct.getBuildingCards().add(new BuildingCard(3, 1, 1, 2));
order.push(firstToAct);
src/test/java/it/polimi/ingsw/gc14/Model/Orders/Order3Test.java
+1 -1
View File
@@ -108,7 +108,7 @@ class Order3Test {
order.pull();
order.pull();
firstToAct.buildingCards.add(new BuildingCard(3, 1, 1, 2));
firstToAct.getBuildingCards().add(new BuildingCard(3, 1, 1, 2));
order.push(firstToAct);
src/test/java/it/polimi/ingsw/gc14/Model/Orders/Order4Test.java
+2 -2
View File
@@ -178,7 +178,7 @@ class Order4Test {
order.pull();
order.pull();
firstToAct.buildingCards.add(new BuildingCard(3, 1, 1, 2));
firstToAct.getBuildingCards().add(new BuildingCard(3, 1, 1, 2));
order.push(firstToAct);
@@ -203,7 +203,7 @@ class Order4Test {
order.pull();
order.pull();
secondToAct.buildingCards.add(new BuildingCard(3, 1, 1, 2));
secondToAct.getBuildingCards().add(new BuildingCard(3, 1, 1, 2));
order.push(firstToAct);
order.push(secondToAct);
src/test/java/it/polimi/ingsw/gc14/Model/Orders/Order5Test.java
+2 -2
View File
@@ -238,7 +238,7 @@ class Order5Test {
order.pull();
order.pull();
firstToAct.buildingCards.add(new BuildingCard(3, 1, 1, 2));
firstToAct.getBuildingCards().add(new BuildingCard(3, 1, 1, 2));
order.push(firstToAct);
@@ -266,7 +266,7 @@ class Order5Test {
order.pull();
order.pull();
secondToAct.buildingCards.add(new BuildingCard(3, 1, 1, 2));
secondToAct.getBuildingCards().add(new BuildingCard(3, 1, 1, 2));
order.push(firstToAct);
order.push(secondToAct);
src/test/java/it/polimi/ingsw/gc14/Model/PlayerTest.java
+40 -40
View File
@@ -31,10 +31,10 @@ class PlayerTest {
assertEquals(0, p.getTotCharacters());
int N = 10;
ArrayList<Artist> a = Stream.generate(() -> new Artist(1, 1)).limit(N).collect(Collectors.toCollection(ArrayList::new));
p.artists.addAll(a);
p.getArtists().addAll(a);
assertEquals(N, p.getTotCharacters());
ArrayList<Builder> b = Stream.generate(() -> new Builder(1, 1, 1)).limit(N).collect(Collectors.toCollection(ArrayList::new));
p.builders.addAll(b);
p.getBuilders().addAll(b);
assertEquals(2 * N, p.getTotCharacters());
}
@@ -47,22 +47,22 @@ class PlayerTest {
}
int N = 10;
ArrayList<Artist> a = Stream.generate(() -> new Artist(1, 1)).limit(N).collect(Collectors.toCollection(ArrayList::new));
p.artists.addAll(a);
p.getArtists().addAll(a);
ArrayList<Builder> b = Stream.generate(() -> new Builder(1, 1, 1)).limit(N).collect(Collectors.toCollection(ArrayList::new));
p.builders.addAll(b);
p.getBuilders().addAll(b);
ArrayList<Inventor> i = Stream.generate(() -> new Inventor(1, 1, 1)).limit(N).collect(Collectors.toCollection(ArrayList::new));
p.inventors.addAll(i);
p.getInventors().addAll(i);
ArrayList<Gatherer> g = Stream.generate(() -> new Gatherer(1, 1)).limit(N).collect(Collectors.toCollection(ArrayList::new));
p.gatherers.addAll(g);
p.getGatherers().addAll(g);
ArrayList<Shaman> s = Stream.generate(() -> new Shaman(1, 1)).limit(N).collect(Collectors.toCollection(ArrayList::new));
p.shamans.addAll(s);
p.getShamans().addAll(s);
ArrayList<Hunter> h = Stream.generate(() -> new Hunter(1, true, 1)).limit(N).collect(Collectors.toCollection(ArrayList::new));
p.hunters.addAll(h);
p.getHunters().addAll(h);
assertEquals(N, p.getNType(CharacterType.ARTIST));
assertEquals(N, p.getNType(CharacterType.BUILDER));
@@ -167,13 +167,13 @@ class PlayerTest {
assertEquals(username, p.getUserName());
assertEquals(0, p.getFoodValue());
assertEquals(0, p.getPrestigeValue());
assertTrue(p.inventors.isEmpty());
assertTrue(p.builders.isEmpty());
assertTrue(p.gatherers.isEmpty());
assertTrue(p.shamans.isEmpty());
assertTrue(p.hunters.isEmpty());
assertTrue(p.artists.isEmpty());
assertTrue(p.buildingCards.isEmpty());
assertTrue(p.getInventors().isEmpty());
assertTrue(p.getBuilders().isEmpty());
assertTrue(p.getGatherers().isEmpty());
assertTrue(p.getShamans().isEmpty());
assertTrue(p.getHunters().isEmpty());
assertTrue(p.getArtists().isEmpty());
assertTrue(p.getBuildingCards().isEmpty());
assertTrue(p.getUserName().length() <= 32);
assertTrue(p.getUserName().length() > 0);
@@ -200,26 +200,26 @@ class PlayerTest {
Player p = new Player("test_usr");
p.addPrestige(15);
p.addFood(7);
p.artists.add(new Artist(1));
p.artists.add(new Artist(1));
p.artists.add(new Artist(1));
p.artists.add(new Artist(1));
p.artists.add(new Artist(1));
p.artists.add(new Artist(1));
p.artists.add(new Artist(2));
p.builders.add(new Builder(2, 5, 1));
p.gatherers.add(new Gatherer(1, 3));
p.shamans.add(new Shaman(2, 3, 3));
p.shamans.add(new Shaman(2, 3, 4));
p.inventors.add(new Inventor(3, 1));
p.hunters.add(new Hunter(3, true));
p.hunters.add(new Hunter(2, false));
p.getArtists().add(new Artist(1));
p.getArtists().add(new Artist(1));
p.getArtists().add(new Artist(1));
p.getArtists().add(new Artist(1));
p.getArtists().add(new Artist(1));
p.getArtists().add(new Artist(1));
p.getArtists().add(new Artist(2));
p.getBuilders().add(new Builder(2, 5, 1));
p.getGatherers().add(new Gatherer(1, 3));
p.getShamans().add(new Shaman(2, 3, 3));
p.getShamans().add(new Shaman(2, 3, 4));
p.getInventors().add(new Inventor(3, 1));
p.getHunters().add(new Hunter(3, true));
p.getHunters().add(new Hunter(2, false));
p.buildingCards.add(new BuildingCard(2, 1,2, 5));
p.buildingCards.add(new BuildingCard(2, 2,3, 6));
p.buildingCards.add(new Building1(2, 5, 5, CharacterType.INVENTOR));
p.buildingCards.add(new Building1(2, 5, 5, CharacterType.SHAMAN));
p.buildingCards.add(new Building11(1, 5, 7, CharacterType.ARTIST , 3));
p.getBuildingCards().add(new BuildingCard(2, 1,2, 5));
p.getBuildingCards().add(new BuildingCard(2, 2,3, 6));
p.getBuildingCards().add(new Building1(2, 5, 5, CharacterType.INVENTOR));
p.getBuildingCards().add(new Building1(2, 5, 5, CharacterType.SHAMAN));
p.getBuildingCards().add(new Building11(1, 5, 7, CharacterType.ARTIST , 3));
assertEquals(""+
"╔═════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════╗\n" +
"║ test_usr ║\n" +
@@ -252,42 +252,42 @@ class PlayerTest {
assertTrue(emptyString.contains("BUILDING CARDS:"));
Player onlyArtist = new Player("onlyArtist");
onlyArtist.artists.add(new Artist(1));
onlyArtist.getArtists().add(new Artist(1));
String artistString = onlyArtist.toString();
assertTrue(artistString.contains("Artists:"));
assertTrue(artistString.contains("BUILDING CARDS:"));
Player onlyBuilder = new Player("onlyBuilder");
onlyBuilder.builders.add(new Builder(1, 1, 1));
onlyBuilder.getBuilders().add(new Builder(1, 1, 1));
String builderString = onlyBuilder.toString();
assertTrue(builderString.contains("Builders:"));
assertTrue(builderString.contains("BUILDING CARDS:"));
Player onlyGatherer = new Player("onlyGatherer");
onlyGatherer.gatherers.add(new Gatherer(1, 1));
onlyGatherer.getGatherers().add(new Gatherer(1, 1));
String gathererString = onlyGatherer.toString();
assertTrue(gathererString.contains("Gatherers:"));
assertTrue(gathererString.contains("BUILDING CARDS:"));
Player onlyShaman = new Player("onlyShaman");
onlyShaman.shamans.add(new Shaman(1, 1));
onlyShaman.getShamans().add(new Shaman(1, 1));
String shamanString = onlyShaman.toString();
assertTrue(shamanString.contains("Shamans:"));
assertTrue(shamanString.contains("BUILDING CARDS:"));
Player onlyInventor = new Player("onlyInventor");
onlyInventor.inventors.add(new Inventor(1, 1));
onlyInventor.getInventors().add(new Inventor(1, 1));
String inventorString = onlyInventor.toString();
assertTrue(inventorString.contains("Inventors:"));
assertTrue(inventorString.contains("BUILDING CARDS:"));
Player onlyHunter = new Player("onlyHunter");
onlyHunter.hunters.add(new Hunter(1, true));
onlyHunter.getHunters().add(new Hunter(1, true));
String hunterString = onlyHunter.toString();
assertTrue(hunterString.contains("Hunters:"));