diff --git a/src/main/java/ch/hepia/hangman/hangman.java b/src/main/java/ch/hepia/hangman/hangman.java index c1e8bdb6fa4599892183e15d6b0199e4353699df..20505fdcf77ede5dc0086b5bc1f77f0637ba5ceb 100644 --- a/src/main/java/ch/hepia/hangman/hangman.java +++ b/src/main/java/ch/hepia/hangman/hangman.java @@ -44,94 +44,96 @@ public class hangman /* Affiche l'etat de la potence en fonction du nombre d'essai. */ - public static void showHangman(int essai) + public static String showHangman(int essai) { - System.out.println("----------"); + String pot =""; + pot=pot.concat("----------\n"); switch(essai) { case 1: - System.out.println("|/"); + pot=pot.concat("|/\n"); for(int i=0;i<6;i++) { - System.out.println("|"); + pot=pot.concat("|\n"); } break; case 2: - System.out.println("|/ |"); + pot=pot.concat("|/ |\n"); for(int i=0;i<6;i++) { - System.out.println("|"); + pot=pot.concat("|\n"); } break; case 3 : - System.out.println("|/ |"); - System.out.println("| (_)"); + pot=pot.concat("|/ |\n"); + pot=pot.concat("| (_)\n"); for(int i=0;i<5;i++) { - System.out.println("|"); + pot=pot.concat("|\n"); } break; case 4 : - System.out.println("|/ |"); - System.out.println("| (_)"); - System.out.println("| |"); + pot=pot.concat("|/ |\n"); + pot=pot.concat("| (_)\n"); + pot=pot.concat("| |\n"); for(int i=0;i<4;i++) { - System.out.println("|"); + pot=pot.concat("|\n"); } break; case 5 : - System.out.println("|/ |"); - System.out.println("| (_)"); - System.out.println("| /|"); + pot=pot.concat("|/ |\n"); + pot=pot.concat("| (_)\n"); + pot=pot.concat("| /|\n"); for(int i=0;i<4;i++) { - System.out.println("|"); + pot=pot.concat("|\n"); } break; case 6 : - System.out.println("|/ |"); - System.out.println("| (_)"); - System.out.println("| /|\\"); + pot=pot.concat("|/ |\n"); + pot=pot.concat("| (_)\n"); + pot=pot.concat("| /|\\\n"); for(int i=0;i<4;i++) { - System.out.println("|"); + pot=pot.concat("|"); } break; case 7 : - System.out.println("|/ |"); - System.out.println("| (_)"); - System.out.println("| /|\\"); - System.out.println("| | "); + pot=pot.concat("|/ |\n"); + pot=pot.concat("| (_)\n"); + pot=pot.concat("| /|\\\n"); + pot=pot.concat("| | \n"); for(int i=0;i<3;i++) { - System.out.println("|"); + pot=pot.concat("|"); } break; case 8 : - System.out.println("|/ |"); - System.out.println("| (_)"); - System.out.println("| /|\\"); - System.out.println("| | "); - System.out.println("| / "); + pot=pot.concat("|/ |\n"); + pot=pot.concat("| (_)\n"); + pot=pot.concat("| /|\\\n"); + pot=pot.concat("| | \n"); + pot=pot.concat("| / \n"); for(int i=0;i<2;i++) { - System.out.println("|"); + pot=pot.concat("|"); } break; case 9 : - System.out.println("|/ |"); - System.out.println("| (_)"); - System.out.println("| /|\\"); - System.out.println("| | "); - System.out.println("| / \\"); + pot=pot.concat("|/ |\n"); + pot=pot.concat("| (_)\n"); + pot=pot.concat("| /|\\\n"); + pot=pot.concat("| | \n"); + pot=pot.concat("| / \\\n"); for(int i=0;i<2;i++) { - System.out.println("|"); + pot=pot.concat("|\n"); } break; } - System.out.println(""); + pot=pot.concat(""); + return pot; } } \ No newline at end of file diff --git a/src/test/java/ch/hepia/hangman/AppTest.java b/src/test/java/ch/hepia/hangman/AppTest.java index 8429ff8ae945901d2329a3bb0b75f64b3ffe821e..65aeca39658233f5214f6a481ba0d50ca0635392 100644 --- a/src/test/java/ch/hepia/hangman/AppTest.java +++ b/src/test/java/ch/hepia/hangman/AppTest.java @@ -24,4 +24,10 @@ class HangmanTests hiddenWord=hangman.check(hiddenWord,"david",'d'); assertEquals(hiddenWord,"d___d"); } + @Test + void check_potence() + { + String potence =hangman.showHangman(2); + assertEquals(potence,"----------\n|/ |\n|\n|\n|\n|\n|\n|\n"); + } }