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

Refactor: removed dead code and standarized to camelCase

Browse Source
This commit is contained in:
aleandro
2026-06-12 18:37:18 +02:00
parent 5a0d201341
commit bc9e4480c0
49 changed files with 187 additions and 352 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/it/polimi/ingsw/gc14/Controller/GameControllerTest.java
+5 -5
View File
@@ -71,7 +71,7 @@ class GameControllerTest {
private int firstNonEventIndex(List<TribeCard> cards) {
for (int i = 0; i < cards.size(); i++) {
if (!cards.get(i).IsEventCard()) {
if (!cards.get(i).isEventCard()) {
return i;
}
}
@@ -82,7 +82,7 @@ class GameControllerTest {
private int firstEventIndexOrMinusOne(List<TribeCard> cards) {
for (int i = 0; i < cards.size(); i++) {
if (cards.get(i).IsEventCard()) {
if (cards.get(i).isEventCard()) {
return i;
}
}
@@ -92,7 +92,7 @@ class GameControllerTest {
private int firstNonEventIndexOrMinusOne(List<TribeCard> cards) {
for (int i = 0; i < cards.size(); i++) {
if (!cards.get(i).IsEventCard()) {
if (!cards.get(i).isEventCard()) {
return i;
}
}
@@ -148,7 +148,7 @@ class GameControllerTest {
}
if (game.getCurrentState().getNUpper() == 0
|| game.getUpperListTribeCards().stream().allMatch(TribeCard::IsEventCard)) {
|| game.getUpperListTribeCards().stream().allMatch(TribeCard::isEventCard)) {
assertTrue(controller.skipTurn(username));
return;
}
@@ -171,7 +171,7 @@ class GameControllerTest {
}
if (game.getCurrentState().getNLower() == 0
|| game.getLowerListTribeCards().stream().allMatch(TribeCard::IsEventCard)) {
|| game.getLowerListTribeCards().stream().allMatch(TribeCard::isEventCard)) {
assertTrue(controller.skipTurn(username));
return;
}
src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/ArtistTest.java
+4 -4
View File
@@ -56,7 +56,7 @@ class ArtistTest {
assertEquals(1, a.getEra());
assertEquals(CharacterType.ARTIST, a.getType());
assertEquals(0, a.getNMin());
assertFalse(a.IsEventCard());
assertFalse(a.isEventCard());
}
@Test
@@ -66,7 +66,7 @@ class ArtistTest {
assertEquals(1, a.getEra());
assertEquals(CharacterType.ARTIST, a.getType());
assertEquals(3, a.getNMin());
assertFalse(a.IsEventCard());
assertFalse(a.isEventCard());
}
@Test
@@ -77,7 +77,7 @@ class ArtistTest {
assertEquals(1, a.getEra());
assertEquals(CharacterType.ARTIST, a.getType());
assertEquals(0, a.getNMin());
assertFalse(a.IsEventCard());
assertFalse(a.isEventCard());
}
@Test
@@ -88,6 +88,6 @@ class ArtistTest {
assertEquals(1, a.getEra());
assertEquals(CharacterType.ARTIST, a.getType());
assertEquals(3, a.getNMin());
assertFalse(a.IsEventCard());
assertFalse(a.isEventCard());
}
}
src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/BuilderTest.java
+4 -4
View File
@@ -77,7 +77,7 @@ class BuilderTest {
assertEquals(2, b.getReductionValue());
assertEquals(3, b.getPrestigeValue());
assertEquals(0, b.getNMin());
assertFalse(b.IsEventCard());
assertFalse(b.isEventCard());
}
@Test
@@ -89,7 +89,7 @@ class BuilderTest {
assertEquals(2, b.getReductionValue());
assertEquals(3, b.getPrestigeValue());
assertEquals(4, b.getNMin());
assertFalse(b.IsEventCard());
assertFalse(b.isEventCard());
assertThrows(IllegalArgumentException.class, () ->
new Builder(1, -1, 3, 4)
@@ -124,7 +124,7 @@ class BuilderTest {
assertEquals(2, b.getReductionValue());
assertEquals(3, b.getPrestigeValue());
assertEquals(0, b.getNMin());
assertFalse(b.IsEventCard());
assertFalse(b.isEventCard());
}
@Test
@@ -137,7 +137,7 @@ class BuilderTest {
assertEquals(2, b.getReductionValue());
assertEquals(3, b.getPrestigeValue());
assertEquals(4, b.getNMin());
assertFalse(b.IsEventCard());
assertFalse(b.isEventCard());
}
@Test
src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/GathererTest.java
+4 -4
View File
@@ -57,7 +57,7 @@ class GathererTest {
assertEquals(1, g.getEra());
assertEquals(CharacterType.GATHERER, g.getType());
assertEquals(0, g.getNMin());
assertFalse(g.IsEventCard());
assertFalse(g.isEventCard());
}
@Test
@@ -67,7 +67,7 @@ class GathererTest {
assertEquals(1, g.getEra());
assertEquals(CharacterType.GATHERER, g.getType());
assertEquals(3, g.getNMin());
assertFalse(g.IsEventCard());
assertFalse(g.isEventCard());
}
@Test
@@ -78,7 +78,7 @@ class GathererTest {
assertEquals(1, g.getEra());
assertEquals(CharacterType.GATHERER, g.getType());
assertEquals(0, g.getNMin());
assertFalse(g.IsEventCard());
assertFalse(g.isEventCard());
}
@Test
@@ -89,6 +89,6 @@ class GathererTest {
assertEquals(1, g.getEra());
assertEquals(CharacterType.GATHERER, g.getType());
assertEquals(3, g.getNMin());
assertFalse(g.IsEventCard());
assertFalse(g.isEventCard());
}
}
src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/HunterTest.java
+4 -4
View File
@@ -114,7 +114,7 @@ class HunterTest {
assertEquals(CharacterType.HUNTER, h.getType());
assertTrue(h.getIcon());
assertEquals(0, h.getNMin());
assertFalse(h.IsEventCard());
assertFalse(h.isEventCard());
}
@Test
@@ -125,7 +125,7 @@ class HunterTest {
assertEquals(CharacterType.HUNTER, h.getType());
assertFalse(h.getIcon());
assertEquals(3, h.getNMin());
assertFalse(h.IsEventCard());
assertFalse(h.isEventCard());
}
@Test
@@ -137,7 +137,7 @@ class HunterTest {
assertEquals(CharacterType.HUNTER, h.getType());
assertTrue(h.getIcon());
assertEquals(0, h.getNMin());
assertFalse(h.IsEventCard());
assertFalse(h.isEventCard());
}
@Test
@@ -149,6 +149,6 @@ class HunterTest {
assertEquals(CharacterType.HUNTER, h.getType());
assertFalse(h.getIcon());
assertEquals(3, h.getNMin());
assertFalse(h.IsEventCard());
assertFalse(h.isEventCard());
}
}
src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/InventorTest.java
+4 -4
View File
@@ -76,7 +76,7 @@ class InventorTest {
assertEquals(CharacterType.INVENTOR, i.getType());
assertEquals(5, i.Icon());
assertEquals(0, i.getNMin());
assertFalse(i.IsEventCard());
assertFalse(i.isEventCard());
}
@Test
@@ -87,7 +87,7 @@ class InventorTest {
assertEquals(CharacterType.INVENTOR, i.getType());
assertEquals(5, i.Icon());
assertEquals(3, i.getNMin());
assertFalse(i.IsEventCard());
assertFalse(i.isEventCard());
}
@Test
@@ -99,7 +99,7 @@ class InventorTest {
assertEquals(CharacterType.INVENTOR, i.getType());
assertEquals(5, i.Icon());
assertEquals(0, i.getNMin());
assertFalse(i.IsEventCard());
assertFalse(i.isEventCard());
}
@Test
@@ -111,7 +111,7 @@ class InventorTest {
assertEquals(CharacterType.INVENTOR, i.getType());
assertEquals(5, i.Icon());
assertEquals(3, i.getNMin());
assertFalse(i.IsEventCard());
assertFalse(i.isEventCard());
}
@Test
src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/ShamanTest.java
+4 -4
View File
@@ -76,7 +76,7 @@ class ShamanTest {
assertEquals(CharacterType.SHAMAN, s.getType());
assertEquals(4, s.getIcon());
assertEquals(0, s.getNMin());
assertFalse(s.IsEventCard());
assertFalse(s.isEventCard());
}
@Test
@@ -87,7 +87,7 @@ class ShamanTest {
assertEquals(CharacterType.SHAMAN, s.getType());
assertEquals(4, s.getIcon());
assertEquals(3, s.getNMin());
assertFalse(s.IsEventCard());
assertFalse(s.isEventCard());
}
@Test
@@ -99,7 +99,7 @@ class ShamanTest {
assertEquals(CharacterType.SHAMAN, s.getType());
assertEquals(4, s.getIcon());
assertEquals(0, s.getNMin());
assertFalse(s.IsEventCard());
assertFalse(s.isEventCard());
}
@Test
@@ -111,6 +111,6 @@ class ShamanTest {
assertEquals(CharacterType.SHAMAN, s.getType());
assertEquals(4, s.getIcon());
assertEquals(3, s.getNMin());
assertFalse(s.IsEventCard());
assertFalse(s.isEventCard());
}
}
src/test/java/it/polimi/ingsw/gc14/Model/GamePackage/BoardTest.java
+2 -2
View File
@@ -103,7 +103,7 @@ class BoardTest {
assertEquals(96 - (numPlayer+4) - (numPlayer+1), bd.getTribeDeckSize()); // Verifica che dal mazzo TribeDeck venga pescato il numero corretto di carte
assertEquals(numPlayer+1, bd.lowerListTribe.size()); // Verifica che la dimensione della lista inferiore sia corretta
assertTrue(bd.lowerListTribe.stream().noneMatch(card -> card.IsEventCard())); // Verifica che non ci siano EventCard dentro alla lista inferiore
assertTrue(bd.lowerListTribe.stream().noneMatch(card -> card.isEventCard())); // Verifica che non ci siano EventCard dentro alla lista inferiore
assertEquals(numPlayer+4, bd.upperListTribe.size()); // Verifica che la dimensione della lista superiore sia corretta
@@ -117,7 +117,7 @@ class BoardTest {
Queue<EventCard> eventQueue = new LinkedList<>();
for (TribeCard card : bd.lowerListTribe) {
if (card.IsEventCard()) {
if (card.isEventCard()) {
eventQueue.add((EventCard) card);
}
}
src/test/java/it/polimi/ingsw/gc14/Model/GameTest.java
+5 -5
View File
@@ -69,7 +69,7 @@ class GameTest {
private int firstNonEventIndex(List<TribeCard> cards) {
for (int i = 0; i < cards.size(); i++) {
if (!cards.get(i).IsEventCard()) {
if (!cards.get(i).isEventCard()) {
return i;
}
}
@@ -80,7 +80,7 @@ class GameTest {
private int firstNonEventIndexOrMinusOne(List<TribeCard> cards) {
for (int i = 0; i < cards.size(); i++) {
if (!cards.get(i).IsEventCard()) {
if (!cards.get(i).isEventCard()) {
return i;
}
}
@@ -117,7 +117,7 @@ class GameTest {
return;
}
if(game.getCurrentState().getNUpper() == 0 || game.getUpperListTribeCards().stream().allMatch(TribeCard::IsEventCard))
if(game.getCurrentState().getNUpper() == 0 || game.getUpperListTribeCards().stream().allMatch(TribeCard::isEventCard))
{
assertTrue(game.skipTurn(current));
return;
@@ -138,7 +138,7 @@ class GameTest {
return;
}
if(game.getCurrentState().getNLower() == 0 || game.getLowerListTribeCards().stream().allMatch(TribeCard::IsEventCard))
if(game.getCurrentState().getNLower() == 0 || game.getLowerListTribeCards().stream().allMatch(TribeCard::isEventCard))
{
assertTrue(game.skipTurn(current));
return;
@@ -675,7 +675,7 @@ class GameTest {
private int firstEventIndexOrMinusOne(List<TribeCard> cards) {
for (int i = 0; i < cards.size(); i++) {
if (cards.get(i).IsEventCard()) {
if (cards.get(i).isEventCard()) {
return i;
}
}