beer-song: update test suite to 2.1.0 (#1190)

* beer-song: update test suite to 2.1.0

* beer-song: use `takeDown` as test input instead of `stopVerse`

* beer-song: change all test instance of `verse(x)` to `sing(x, 1)`

* beer-song: make reference method private

exercises/beer-song/.meta/src/reference/java/BeerSong.java

@@ -1,5 +1,5 @@
 class BeerSong {
-    String verse(int number) {
+    private 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";
@@ -12,7 +12,8 @@ class BeerSong {
         }
     }
 
-    String sing(int start, int stop) {
+    String sing(int start, int takeDown) {
+        int stop = start - takeDown + 1;
         StringBuilder songOutput = new StringBuilder();
 
         for (int i=start; i>=stop; i--) {
@@ -23,6 +24,6 @@ class BeerSong {
     }
 
     String singSong() {
-        return sing(99,0);
+        return sing(99, 100);
     }
-}
+}

exercises/beer-song/.meta/version

@@ -0,0 +1 @@
+2.1.0

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

@@ -17,53 +17,61 @@ public class BeerSongTest {
     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.sing(99, 1));
     }
 
     @Ignore("Remove to run test")
     @Test
-    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));
+    public void singLastGenericVerse() {
+        assertEquals("3 bottles of beer on the wall, 3 bottles of beer.\n" +
+                        "Take one down and pass it around, 2 bottles of beer on the wall.\n\n",
+                beerSong.sing(3, 1));
     }
 
     @Ignore("Remove to run test")
     @Test
-    public void singThirdToLastVerse() {
+    public void verseWithTwoBottles() {
         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.sing(2, 1));
     }
 
     @Ignore("Remove to run test")
     @Test
-    public void singPenultimateVerse() {
+    public void verseWithOneBottle() {
         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.sing(1, 1));
     }
 
     @Ignore("Remove to run test")
     @Test
-    public void singLastVerse() {
+    public void verseWithZeroBottles() {
         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.sing(0, 1));
     }
 
     @Ignore("Remove to run test")
     @Test
-    public void singLastFourVerses() {
-        assertEquals("3 bottles of beer on the wall, 3 bottles of beer.\n" +
-                        "Take one down and pass it around, 2 bottles of beer on the wall.\n\n" +
-                        "2 bottles of beer on the wall, 2 bottles of beer.\n" +
+    public void singFirstTwoVerses() {
+        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" +
+                        "98 bottles of beer on the wall, 98 bottles of beer.\n" +
+                        "Take one down and pass it around, 97 bottles of beer on the wall.\n\n",
+                beerSong.sing(99, 2));
+    }
+
+    @Ignore("Remove to run test")
+    @Test
+    public void singLastThreeVerses() {
+        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" +
                         "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" +
                         "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(2, 3));
     }
 
     @Ignore("Remove to run test")