Merge pull request #404 from vasouv/beerSong-instance-methods

Beer song instance methods

exercises/beer-song/src/example/java/BeerSong.java

@@ -1,8 +1,6 @@
 public class BeerSong {
-    public static String verse(int number)
-    {
-        switch (number)
-        {
+    public String verse(int number) {
+        switch (number) {
             case 0:
                 return "No more bottles of beer on the wall, no more bottles of beer.\nGo to the store and buy some more, 99 bottles of beer on the wall.\n\n";
             case 1:
@@ -14,8 +12,7 @@ public class BeerSong {
         }
     }
 
-    public static String sing(int start, int stop)
-    {
+    public String sing(int start, int stop) {
         StringBuilder songOutput = new StringBuilder();
 
         for (int i=start; i>=stop; i--) {
@@ -25,7 +22,7 @@ public class BeerSong {
         return songOutput.toString();
     }
 
-    public static String singSong() {
+    public String singSong() {
         return sing(99,0);
     }
 }

exercises/beer-song/src/test/java/BeerSongTest.java

@@ -1,15 +1,23 @@
 import org.junit.Test;
 import org.junit.Ignore;
+import org.junit.Before;
 
 import static org.junit.Assert.assertEquals;
 
 public class BeerSongTest {
 
+    private BeerSong beerSong;
+
+    @Before
+    public void setup(){
+        beerSong = new BeerSong();
+    }
+
     @Test
     public void singFirstVerse() {
         assertEquals("99 bottles of beer on the wall, 99 bottles of beer.\n" +
                         "Take one down and pass it around, 98 bottles of beer on the wall.\n\n",
-                BeerSong.verse(99));
+                beerSong.verse(99));
     }
 
     @Ignore
@@ -17,7 +25,7 @@ public class BeerSongTest {
     public void singMiddleVerse() {
         assertEquals("44 bottles of beer on the wall, 44 bottles of beer.\n" +
                         "Take one down and pass it around, 43 bottles of beer on the wall.\n\n",
-                BeerSong.verse(44));
+                beerSong.verse(44));
     }
 
     @Ignore
@@ -25,7 +33,7 @@ public class BeerSongTest {
     public void singThirdToLastVerse() {
         assertEquals("2 bottles of beer on the wall, 2 bottles of beer.\n" +
                         "Take one down and pass it around, 1 bottle of beer on the wall.\n\n",
-                BeerSong.verse(2));
+                beerSong.verse(2));
     }
 
     @Ignore
@@ -33,7 +41,7 @@ public class BeerSongTest {
     public void singPenultimateVerse() {
         assertEquals("1 bottle of beer on the wall, 1 bottle of beer.\n" +
                         "Take it down and pass it around, no more bottles of beer on the wall.\n\n",
-                BeerSong.verse(1));
+                beerSong.verse(1));
     }
 
     @Ignore
@@ -41,7 +49,7 @@ public class BeerSongTest {
     public void singLastVerse() {
         assertEquals("No more bottles of beer on the wall, no more bottles of beer.\n" +
                         "Go to the store and buy some more, 99 bottles of beer on the wall.\n\n",
-                BeerSong.verse(0));
+                beerSong.verse(0));
     }
 
     @Ignore
@@ -55,7 +63,7 @@ public class BeerSongTest {
                         "Take it down and pass it around, no more bottles of beer on the wall.\n\n" +
                         "No more bottles of beer on the wall, no more bottles of beer.\n" +
                         "Go to the store and buy some more, 99 bottles of beer on the wall.\n\n",
-                BeerSong.sing(3,0));
+                beerSong.sing(3,0));
     }
 
     @Ignore
@@ -161,7 +169,7 @@ public class BeerSongTest {
                         "2 bottles of beer on the wall, 2 bottles of beer.\nTake one down and pass it around, 1 bottle of beer on the wall.\n\n" +
                         "1 bottle of beer on the wall, 1 bottle of beer.\nTake it down and pass it around, no more bottles of beer on the wall.\n\n" +
                         "No more bottles of beer on the wall, no more bottles of beer.\nGo to the store and buy some more, 99 bottles of beer on the wall.\n\n",
-                BeerSong.singSong());
+                beerSong.singSong());
     }
 
 }