diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java index 3592057..8c1565d 100644 --- a/src/main/java/module-info.java +++ b/src/main/java/module-info.java @@ -8,6 +8,7 @@ module it.polimi.ingsw.gc14 { requires com.google.gson; requires java.desktop; requires org.jline.terminal; + requires org.jline.terminal.jansi; requires org.jline.reader; requires org.jline.builtins; diff --git a/src/test/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building11Test.java b/src/test/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building11Test.java index d88a033..52fc4fe 100644 --- a/src/test/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building11Test.java +++ b/src/test/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building11Test.java @@ -132,27 +132,27 @@ class Building11Test { int pm = 5; 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; 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; 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; 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; 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; 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 diff --git a/src/test/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building1Test.java b/src/test/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building1Test.java index c73dce2..9e6583a 100644 --- a/src/test/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building1Test.java +++ b/src/test/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building1Test.java @@ -87,27 +87,27 @@ class Building1Test { CharacterType ct = CharacterType.ARTIST; 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; 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; 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; 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; 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; 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 diff --git a/src/test/java/it/polimi/ingsw/gc14/Model/Cards/BuildingCardTest.java b/src/test/java/it/polimi/ingsw/gc14/Model/Cards/BuildingCardTest.java index b8e4309..5aab676 100644 --- a/src/test/java/it/polimi/ingsw/gc14/Model/Cards/BuildingCardTest.java +++ b/src/test/java/it/polimi/ingsw/gc14/Model/Cards/BuildingCardTest.java @@ -299,14 +299,14 @@ class BuildingCardTest { int prestigeValue = 6; 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++){ if(ID == 4 || ID == 8 || ID == 10 || ID == 11){ continue; } 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()); } } diff --git a/src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/ArtistTest.java b/src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/ArtistTest.java index 2de3db0..19b0ad9 100644 --- a/src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/ArtistTest.java +++ b/src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/ArtistTest.java @@ -11,10 +11,10 @@ class ArtistTest { @Test void testToString() { Artist a = new Artist(1); - String s = a.toString(); + String s = a.toStringPlayer(); assertNotNull(s); - assertTrue(s.isEmpty()); + assertFalse(s.isEmpty()); } @Test diff --git a/src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/BuilderTest.java b/src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/BuilderTest.java index 4322440..7932f92 100644 --- a/src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/BuilderTest.java +++ b/src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/BuilderTest.java @@ -25,11 +25,11 @@ class BuilderTest { @Test void testToString() { Builder b = new Builder(1, 2, 3); - String s = b.toString(); + String s = b.toStringBoard(); assertNotNull(s); assertTrue(s.contains(CharacterType.BUILDER.toString())); - assertEquals(": BUILDER 🔨:" + b.getReductionValue() + " 🏅:" + b.getPrestigeValue(), s); + assertEquals("BUILDER 🔨:" + b.getReductionValue() + " 🏅:" + b.getPrestigeValue(), s); } @Test diff --git a/src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/GathererTest.java b/src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/GathererTest.java index 8eefa65..6457620 100644 --- a/src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/GathererTest.java +++ b/src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/GathererTest.java @@ -11,11 +11,11 @@ class GathererTest { @Test void testToString() { Gatherer g = new Gatherer(1); - String s = g.toString(); + String s = g.toStringPlayer(); assertNotNull(s); assertFalse(s.contains(CharacterType.GATHERER.toString())); - assertTrue(s.isEmpty()); + assertFalse(s.isEmpty()); } @Test diff --git a/src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/HunterTest.java b/src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/HunterTest.java index 822d91f..2a6c2e4 100644 --- a/src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/HunterTest.java +++ b/src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/HunterTest.java @@ -18,10 +18,10 @@ class HunterTest { @Test void testToString() { Hunter h = new Hunter(1, true); - assertTrue(h.toString().contains("🍖")); + assertTrue(h.toStringPlayer().contains("🍖")); Hunter h2 = new Hunter(3, false); - assertFalse(h2.toString().contains("I")); + assertFalse(h2.toStringPlayer().contains("I")); } @Test diff --git a/src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/InventorTest.java b/src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/InventorTest.java index 441c69d..1ac9818 100644 --- a/src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/InventorTest.java +++ b/src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/InventorTest.java @@ -18,7 +18,7 @@ class InventorTest { @Test void testToString() { Inventor i = new Inventor(1, 5); - String s = i.toString(); + String s = i.toStringPlayer(); assertNotNull(s); assertFalse(s.contains(CharacterType.INVENTOR.toString())); diff --git a/src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/ShamanTest.java b/src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/ShamanTest.java index f354898..66cbbdf 100644 --- a/src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/ShamanTest.java +++ b/src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/ShamanTest.java @@ -18,7 +18,7 @@ class ShamanTest { @Test void testToString() { Shaman s = new Shaman(1, 4); - String str = s.toString(); + String str = s.toStringPlayer(); assertNotNull(str); assertFalse(str.contains(CharacterType.SHAMAN.toString())); diff --git a/src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/CavePaintingsTest.java b/src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/CavePaintingsTest.java index 5da2d0e..c4de545 100644 --- a/src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/CavePaintingsTest.java +++ b/src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/CavePaintingsTest.java @@ -141,7 +141,7 @@ class CavePaintingsTest { void toStringTest() { CavePaintings cv1 = new CavePaintings(1, 1,1,1); - assertEquals(" CAVE_PAINTINGS", cv1.toString()); + assertEquals("CAVE_PAINTINGS", cv1.toStringPlayer()); } @Test @@ -153,6 +153,6 @@ class CavePaintingsTest { int NPrestigeMul = 3; 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()); } } \ No newline at end of file diff --git a/src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/HuntTest.java b/src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/HuntTest.java index cc4c476..961c5f9 100644 --- a/src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/HuntTest.java +++ b/src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/HuntTest.java @@ -150,7 +150,7 @@ class HuntTest { void toStringTest() { Hunt h1 = new Hunt(1, 3); - assertEquals(" HUNT", h1.toString()); + assertEquals("HUNT", h1.toStringPlayer()); } @Test @@ -160,6 +160,6 @@ class HuntTest { int prestigeMultiplier = 3; Hunt cv1 = new Hunt(Era, prestigeMultiplier); - assertEquals(": " + cv1.getType() + " 1🍖+" + prestigeMultiplier + "🏅×🏹", cv1.toStringBoard()); + assertEquals(cv1.getType() + " 1🍖+" + prestigeMultiplier + "🏅×🏹", cv1.toStringBoard()); } } \ No newline at end of file diff --git a/src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/ShamanicRitualTest.java b/src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/ShamanicRitualTest.java index 0339912..302ef26 100644 --- a/src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/ShamanicRitualTest.java +++ b/src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/ShamanicRitualTest.java @@ -235,7 +235,7 @@ class ShamanicRitualTest { void toStringTest() { ShamanicRitual sr1 = new ShamanicRitual(1, 5,2); - assertEquals(" SHAMANIC_RITUAL", sr1.toString()); + assertEquals("SHAMANIC_RITUAL", sr1.toStringPlayer()); } @Test @@ -246,6 +246,6 @@ class ShamanicRitualTest { int prestigeToRem = 2; ShamanicRitual cv1 = new ShamanicRitual(Era, prestigeToAdd, prestigeToRem); - assertEquals(": " + cv1.getType() + " 🌟>:" + prestigeToAdd + " 🌟<:" + prestigeToRem, cv1.toStringBoard()); + assertEquals(cv1.getType() + " 🌟>:" + prestigeToAdd + " 🌟<:" + prestigeToRem, cv1.toStringBoard()); } } \ No newline at end of file diff --git a/src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/SustenanceTest.java b/src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/SustenanceTest.java index 053cfdf..ae00f42 100644 --- a/src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/SustenanceTest.java +++ b/src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/SustenanceTest.java @@ -155,7 +155,7 @@ class SustenanceTest { void toStringTest() { Sustenance s1 = new Sustenance(1, 5); - assertEquals(" SUSTENANCE", s1.toString()); + assertEquals("SUSTENANCE", s1.toStringPlayer()); } @Test @@ -165,7 +165,7 @@ class SustenanceTest { int prestigeDebt = 15; Sustenance cv1 = new Sustenance(Era, prestigeDebt); - assertEquals(": " + cv1.getType() + " -1🍖/-" + prestigeDebt + "🏅", cv1.toStringBoard()); + assertEquals(cv1.getType() + " -1🍖/-" + prestigeDebt + "🏅", cv1.toStringBoard()); } }