From cdd0ae8339d0aaa0d4525ee0ad38f8cc4ee07552 Mon Sep 17 00:00:00 2001
From: david <david.carballo-iglesias@etu.hes.ge>
Date: Fri, 1 Nov 2019 07:03:26 -0400
Subject: [PATCH] edition de la potence hangman

---
 src/main/java/ch/hepia/hangman/hangman.java | 80 +++++++++++----------
 src/test/java/ch/hepia/hangman/AppTest.java |  6 ++
 2 files changed, 47 insertions(+), 39 deletions(-)

diff --git a/src/main/java/ch/hepia/hangman/hangman.java b/src/main/java/ch/hepia/hangman/hangman.java
index c1e8bdb..20505fd 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 8429ff8..65aeca3 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");
+  }
 }
-- 
GitLab