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

Fix: test and hopefully windows TUI

Browse Source
This commit is contained in:
aleandro
2026-06-14 18:11:05 +02:00
parent f92de16fc4
commit da4c725822
14 changed files with 33 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/module-info.java
+1
View File
@@ -8,6 +8,7 @@ module it.polimi.ingsw.gc14 {
requires com.google.gson; requires com.google.gson;
requires java.desktop; requires java.desktop;
requires org.jline.terminal; requires org.jline.terminal;
requires org.jline.terminal.jansi;
requires org.jline.reader; requires org.jline.reader;
requires org.jline.builtins; requires org.jline.builtins;
src/test/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building11Test.java
+6 -6
View File
@@ -132,27 +132,27 @@ class Building11Test {
int pm = 5; int pm = 5;
Building11 b11 = new Building11(era, price, prestigeValue, ct, pm); Building11 b11 = new Building11(era, price, prestigeValue, ct, pm);
assertEquals(":" + " ID:" + ID + " 🍖:" + price + " 🏅:" + prestigeValue + "+" + ct.toString().substring(0, 3) + "×" + pm, b11.toString()); assertEquals("ID:" + ID + " 🍖:" + price + " 🏅:" + prestigeValue + "+" + ct.toString().substring(0, 3) + "×" + pm, b11.toStringBoard());
ct = CharacterType.BUILDER; ct = CharacterType.BUILDER;
b11 = new Building11(era, price, prestigeValue, ct, pm); b11 = new Building11(era, price, prestigeValue, ct, pm);
assertEquals(":" + " ID:" + ID + " 🍖:" + price + " 🏅:" + prestigeValue + "+" + ct.toString().substring(0, 3) + "×" + pm, b11.toString()); assertEquals("ID:" + ID + " 🍖:" + price + " 🏅:" + prestigeValue + "+" + ct.toString().substring(0, 3) + "×" + pm, b11.toStringBoard());
ct = CharacterType.GATHERER; ct = CharacterType.GATHERER;
b11 = new Building11(era, price, prestigeValue, ct, pm); b11 = new Building11(era, price, prestigeValue, ct, pm);
assertEquals(":" + " ID:" + ID + " 🍖:" + price + " 🏅:" + prestigeValue + "+" + ct.toString().substring(0, 3) + "×" + pm, b11.toString()); assertEquals("ID:" + ID + " 🍖:" + price + " 🏅:" + prestigeValue + "+" + ct.toString().substring(0, 3) + "×" + pm, b11.toStringBoard());
ct = CharacterType.HUNTER; ct = CharacterType.HUNTER;
b11 = new Building11(era, price, prestigeValue, ct, pm); b11 = new Building11(era, price, prestigeValue, ct, pm);
assertEquals(":" + " ID:" + ID + " 🍖:" + price + " 🏅:" + prestigeValue + "+" + ct.toString().substring(0, 3) + "×" + pm, b11.toString()); assertEquals("ID:" + ID + " 🍖:" + price + " 🏅:" + prestigeValue + "+" + ct.toString().substring(0, 3) + "×" + pm, b11.toStringBoard());
ct = CharacterType.INVENTOR; ct = CharacterType.INVENTOR;
b11 = new Building11(era, price, prestigeValue, ct, pm); b11 = new Building11(era, price, prestigeValue, ct, pm);
assertEquals(":" + " ID:" + ID + " 🍖:" + price + " 🏅:" + prestigeValue + "+" + ct.toString().substring(0, 3) + "×" + pm, b11.toString()); assertEquals("ID:" + ID + " 🍖:" + price + " 🏅:" + prestigeValue + "+" + ct.toString().substring(0, 3) + "×" + pm, b11.toStringBoard());
ct = CharacterType.SHAMAN; ct = CharacterType.SHAMAN;
b11 = new Building11(era, price, prestigeValue, ct, pm); b11 = new Building11(era, price, prestigeValue, ct, pm);
assertEquals(":" + " ID:" + ID + " 🍖:" + price + " 🏅:" + prestigeValue + "+" + ct.toString().substring(0, 3) + "×" + pm, b11.toString()); assertEquals("ID:" + ID + " 🍖:" + price + " 🏅:" + prestigeValue + "+" + ct.toString().substring(0, 3) + "×" + pm, b11.toStringBoard());
} }
@Test @Test
src/test/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building1Test.java
+6 -6
View File
@@ -87,27 +87,27 @@ class Building1Test {
CharacterType ct = CharacterType.ARTIST; CharacterType ct = CharacterType.ARTIST;
Building1 b1 = new Building1(era, price, prestigeValue, ct); Building1 b1 = new Building1(era, price, prestigeValue, ct);
assertEquals(":" + " ID:" + ID + " 🍖:" + price + " 🏅:" + prestigeValue + " (Icon:" + ct.toString().substring(0, 3) + ")", b1.toString()); assertEquals("ID:" + ID + " 🍖:" + price + " 🏅:" + prestigeValue + " (Icon:" + ct.toString().substring(0, 3) + ")", b1.toStringBoard());
ct = CharacterType.BUILDER; ct = CharacterType.BUILDER;
b1 = new Building1(era, price, prestigeValue, ct); b1 = new Building1(era, price, prestigeValue, ct);
assertEquals(":" + " ID:" + ID + " 🍖:" + price + " 🏅:" + prestigeValue + " (Icon:" + ct.toString().substring(0, 3) + ")", b1.toString()); assertEquals("ID:" + ID + " 🍖:" + price + " 🏅:" + prestigeValue + " (Icon:" + ct.toString().substring(0, 3) + ")", b1.toStringBoard());
ct = CharacterType.GATHERER; ct = CharacterType.GATHERER;
b1 = new Building1(era, price, prestigeValue, ct); b1 = new Building1(era, price, prestigeValue, ct);
assertEquals(":" + " ID:" + ID + " 🍖:" + price + " 🏅:" + prestigeValue + " (Icon:" + ct.toString().substring(0, 3) + ")", b1.toString()); assertEquals("ID:" + ID + " 🍖:" + price + " 🏅:" + prestigeValue + " (Icon:" + ct.toString().substring(0, 3) + ")", b1.toStringBoard());
ct = CharacterType.HUNTER; ct = CharacterType.HUNTER;
b1 = new Building1(era, price, prestigeValue, ct); b1 = new Building1(era, price, prestigeValue, ct);
assertEquals(":" + " ID:" + ID + " 🍖:" + price + " 🏅:" + prestigeValue + " (Icon:" + ct.toString().substring(0, 3) + ")", b1.toString()); assertEquals("ID:" + ID + " 🍖:" + price + " 🏅:" + prestigeValue + " (Icon:" + ct.toString().substring(0, 3) + ")", b1.toStringBoard());
ct = CharacterType.INVENTOR; ct = CharacterType.INVENTOR;
b1 = new Building1(era, price, prestigeValue, ct); b1 = new Building1(era, price, prestigeValue, ct);
assertEquals(":" + " ID:" + ID + " 🍖:" + price + " 🏅:" + prestigeValue + " (Icon:" + ct.toString().substring(0, 3) + ")", b1.toString()); assertEquals("ID:" + ID + " 🍖:" + price + " 🏅:" + prestigeValue + " (Icon:" + ct.toString().substring(0, 3) + ")", b1.toStringBoard());
ct = CharacterType.SHAMAN; ct = CharacterType.SHAMAN;
b1 = new Building1(era, price, prestigeValue, ct); b1 = new Building1(era, price, prestigeValue, ct);
assertEquals(":" + " ID:" + ID + " 🍖:" + price + " 🏅:" + prestigeValue + " (Icon:" + ct.toString().substring(0, 3) + ")", b1.toString()); assertEquals("ID:" + ID + " 🍖:" + price + " 🏅:" + prestigeValue + " (Icon:" + ct.toString().substring(0, 3) + ")", b1.toStringBoard());
} }
@Test @Test
src/test/java/it/polimi/ingsw/gc14/Model/Cards/BuildingCardTest.java
+2 -2
View File
@@ -299,14 +299,14 @@ class BuildingCardTest {
int prestigeValue = 6; int prestigeValue = 6;
BuildingCard b0 = new BuildingCard(era, price, prestigeValue); BuildingCard b0 = new BuildingCard(era, price, prestigeValue);
assertEquals(":" + " ID:0" + " 🍖:"+ b0.getPrice() + " 🏅:" + b0.getPrestigeValue(), b0.toString()); assertEquals("ID:0" + " 🍖:"+ b0.getPrice() + " 🏅:" + b0.getPrestigeValue(), b0.toStringBoard());
for(int ID = 3; ID < 13; ID++){ for(int ID = 3; ID < 13; ID++){
if(ID == 4 || ID == 8 || ID == 10 || ID == 11){ if(ID == 4 || ID == 8 || ID == 10 || ID == 11){
continue; continue;
} }
BuildingCard b = new BuildingCard(ID, era, price, prestigeValue); BuildingCard b = new BuildingCard(ID, era, price, prestigeValue);
assertEquals(":" + " ID:" + ID + " 🍖:" + b.getPrice() + " 🏅:" + b.getPrestigeValue(), b.toString()); assertEquals("ID:" + ID + " 🍖:" + b.getPrice() + " 🏅:" + b.getPrestigeValue(), b.toStringBoard());
} }
} }
src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/ArtistTest.java
+2 -2
View File
@@ -11,10 +11,10 @@ class ArtistTest {
@Test @Test
void testToString() { void testToString() {
Artist a = new Artist(1); Artist a = new Artist(1);
String s = a.toString(); String s = a.toStringPlayer();
assertNotNull(s); assertNotNull(s);
assertTrue(s.isEmpty()); assertFalse(s.isEmpty());
} }
@Test @Test
src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/BuilderTest.java
+2 -2
View File
@@ -25,11 +25,11 @@ class BuilderTest {
@Test @Test
void testToString() { void testToString() {
Builder b = new Builder(1, 2, 3); Builder b = new Builder(1, 2, 3);
String s = b.toString(); String s = b.toStringBoard();
assertNotNull(s); assertNotNull(s);
assertTrue(s.contains(CharacterType.BUILDER.toString())); assertTrue(s.contains(CharacterType.BUILDER.toString()));
assertEquals(": BUILDER 🔨:" + b.getReductionValue() + " 🏅:" + b.getPrestigeValue(), s); assertEquals("BUILDER 🔨:" + b.getReductionValue() + " 🏅:" + b.getPrestigeValue(), s);
} }
@Test @Test
src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/GathererTest.java
+2 -2
View File
@@ -11,11 +11,11 @@ class GathererTest {
@Test @Test
void testToString() { void testToString() {
Gatherer g = new Gatherer(1); Gatherer g = new Gatherer(1);
String s = g.toString(); String s = g.toStringPlayer();
assertNotNull(s); assertNotNull(s);
assertFalse(s.contains(CharacterType.GATHERER.toString())); assertFalse(s.contains(CharacterType.GATHERER.toString()));
assertTrue(s.isEmpty()); assertFalse(s.isEmpty());
} }
@Test @Test
src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/HunterTest.java
+2 -2
View File
@@ -18,10 +18,10 @@ class HunterTest {
@Test @Test
void testToString() { void testToString() {
Hunter h = new Hunter(1, true); Hunter h = new Hunter(1, true);
assertTrue(h.toString().contains("🍖")); assertTrue(h.toStringPlayer().contains("🍖"));
Hunter h2 = new Hunter(3, false); Hunter h2 = new Hunter(3, false);
assertFalse(h2.toString().contains("I")); assertFalse(h2.toStringPlayer().contains("I"));
} }
@Test @Test
src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/InventorTest.java
+1 -1
View File
@@ -18,7 +18,7 @@ class InventorTest {
@Test @Test
void testToString() { void testToString() {
Inventor i = new Inventor(1, 5); Inventor i = new Inventor(1, 5);
String s = i.toString(); String s = i.toStringPlayer();
assertNotNull(s); assertNotNull(s);
assertFalse(s.contains(CharacterType.INVENTOR.toString())); assertFalse(s.contains(CharacterType.INVENTOR.toString()));
src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/ShamanTest.java
+1 -1
View File
@@ -18,7 +18,7 @@ class ShamanTest {
@Test @Test
void testToString() { void testToString() {
Shaman s = new Shaman(1, 4); Shaman s = new Shaman(1, 4);
String str = s.toString(); String str = s.toStringPlayer();
assertNotNull(str); assertNotNull(str);
assertFalse(str.contains(CharacterType.SHAMAN.toString())); assertFalse(str.contains(CharacterType.SHAMAN.toString()));
src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/CavePaintingsTest.java
+2 -2
View File
@@ -141,7 +141,7 @@ class CavePaintingsTest {
void toStringTest() { void toStringTest() {
CavePaintings cv1 = new CavePaintings(1, 1,1,1); CavePaintings cv1 = new CavePaintings(1, 1,1,1);
assertEquals(" CAVE_PAINTINGS", cv1.toString()); assertEquals("CAVE_PAINTINGS", cv1.toStringPlayer());
} }
@Test @Test
@@ -153,6 +153,6 @@ class CavePaintingsTest {
int NPrestigeMul = 3; int NPrestigeMul = 3;
CavePaintings cv1 = new CavePaintings(Era, NLower,NPrestigeRem,NPrestigeMul); CavePaintings cv1 = new CavePaintings(Era, NLower,NPrestigeRem,NPrestigeMul);
assertEquals(": " + cv1.getType() + " 0-"+(NLower-1)+":"+NPrestigeRem+" "+NLower+"+:"+NPrestigeMul, cv1.toStringBoard()); assertEquals(cv1.getType() + " 0-"+(NLower-1)+":"+NPrestigeRem+" "+NLower+"+:"+NPrestigeMul, cv1.toStringBoard());
} }
} }
src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/HuntTest.java
+2 -2
View File
@@ -150,7 +150,7 @@ class HuntTest {
void toStringTest() { void toStringTest() {
Hunt h1 = new Hunt(1, 3); Hunt h1 = new Hunt(1, 3);
assertEquals(" HUNT", h1.toString()); assertEquals("HUNT", h1.toStringPlayer());
} }
@Test @Test
@@ -160,6 +160,6 @@ class HuntTest {
int prestigeMultiplier = 3; int prestigeMultiplier = 3;
Hunt cv1 = new Hunt(Era, prestigeMultiplier); Hunt cv1 = new Hunt(Era, prestigeMultiplier);
assertEquals(": " + cv1.getType() + " 1🍖+" + prestigeMultiplier + "🏅×🏹", cv1.toStringBoard()); assertEquals(cv1.getType() + " 1🍖+" + prestigeMultiplier + "🏅×🏹", cv1.toStringBoard());
} }
} }
src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/ShamanicRitualTest.java
+2 -2
View File
@@ -235,7 +235,7 @@ class ShamanicRitualTest {
void toStringTest() { void toStringTest() {
ShamanicRitual sr1 = new ShamanicRitual(1, 5,2); ShamanicRitual sr1 = new ShamanicRitual(1, 5,2);
assertEquals(" SHAMANIC_RITUAL", sr1.toString()); assertEquals("SHAMANIC_RITUAL", sr1.toStringPlayer());
} }
@Test @Test
@@ -246,6 +246,6 @@ class ShamanicRitualTest {
int prestigeToRem = 2; int prestigeToRem = 2;
ShamanicRitual cv1 = new ShamanicRitual(Era, prestigeToAdd, prestigeToRem); ShamanicRitual cv1 = new ShamanicRitual(Era, prestigeToAdd, prestigeToRem);
assertEquals(": " + cv1.getType() + " 🌟>:" + prestigeToAdd + " 🌟<:" + prestigeToRem, cv1.toStringBoard()); assertEquals(cv1.getType() + " 🌟>:" + prestigeToAdd + " 🌟<:" + prestigeToRem, cv1.toStringBoard());
} }
} }
src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/SustenanceTest.java
+2 -2
View File
@@ -155,7 +155,7 @@ class SustenanceTest {
void toStringTest() { void toStringTest() {
Sustenance s1 = new Sustenance(1, 5); Sustenance s1 = new Sustenance(1, 5);
assertEquals(" SUSTENANCE", s1.toString()); assertEquals("SUSTENANCE", s1.toStringPlayer());
} }
@Test @Test
@@ -165,7 +165,7 @@ class SustenanceTest {
int prestigeDebt = 15; int prestigeDebt = 15;
Sustenance cv1 = new Sustenance(Era, prestigeDebt); Sustenance cv1 = new Sustenance(Era, prestigeDebt);
assertEquals(": " + cv1.getType() + " -1🍖/-" + prestigeDebt + "🏅", cv1.toStringBoard()); assertEquals(cv1.getType() + " -1🍖/-" + prestigeDebt + "🏅", cv1.toStringBoard());
} }
} }