John Ferguson Scoreboard Lab Done

Answers.MD

@@ -0,0 +1,12 @@
+# John Ferguson
+#Scoreboard Lab
+#2/19/15
+
+>**Question 1:** In terms of the mantra, describe the tests you need to verify the correctness of a non-full SCOREBOARD with more than two entries.  Be specific about how many tests you need.
+
+**Answer 1:** The test we would need for a non full scoreboard is testMultipleScoresNonFull. This would give us a total of three tests.  We need to use the bubble skip.  Make the number from the right go to the left if it's greater than the number to the left of it.
+
+>**Question 2:**  In terms of the mantra, describe the test you need to verify the corrections of a full SCOREBOARD.  Be specific aobut how many tests you need.  HINT: Think carefully about the "bottom" of the SCOREBOARD.
+
+**Answer 2:** The test we would need for a non full scoreboard is testMultipleScoresFull. This would give us a total of four tests.  
+

src/Scoreboard.java

@@ -5,17 +5,43 @@ public class Scoreboard {
   private int maxCount;
 
   public Scoreboard(int maxScoreCount) {
-    scores = new ArrayList<>(maxScoreCount);
+    scores = new ArrayList<Integer>(maxScoreCount);
     maxCount = maxScoreCount;
   }
 
   public void addScore(int score) {
-    scores.add(score);
+    if (!isHighScore(score)) {
+      return;
+    }
+
+    if (scores.size() < maxCount) {
+      scores.add(score);
+    }
+    else {
+     scores.set(scores.size() - 1, score); 
+    }
+
+
+    for (int i = scores.size() - 1; i > 0; i--) {
+    if (scores.get(i) > scores.get(i-1)) {
+      int temp = scores.get(i-1);
+      scores.set((i-1), scores.get(i));
+      scores.set(i, temp);
+    }
+  }
   }
 
   public boolean isHighScore(int score) {
+    if (scores.size() == 0 || scores.size() < maxCount) {
+      return true;
+    }
+    else if (score > scores.get(scores.size() - 1)) {
+      return true;
+    }
+    else {
+      return false;
+    }
 
-    return true;
   }
 
   public int getScore(int position) {

src/ScoreboardTest.java

@@ -4,7 +4,7 @@ public class ScoreboardTest extends TestCase {
   public void testEmptyScoreboard() {
     Scoreboard sb = new Scoreboard(10);
 
-    assertTrue(sb.isHighScore(10));
+    assertEquals(true, sb.isHighScore(10));
     assertEquals(0, sb.getScore(0));
     assertEquals(0, sb.getNumScores());
   }
@@ -14,8 +14,61 @@ public void testOneEntry() {
 
     sb.addScore(50);
 
-    assertTrue(sb.isHighScore(10));
+    assertEquals(true, sb.isHighScore(10));
     assertEquals(50, sb.getScore(0));
     assertEquals(1, sb.getNumScores());
   }
+  public void testSecondScoreBeforeFirst() {
+    Scoreboard sb = new Scoreboard(10);
+
+    sb.addScore(50);
+    sb.addScore(51);
+    assertEquals(true, sb.isHighScore(10));
+    assertEquals(51, sb.getScore(0));
+    assertEquals(50, sb.getScore(1));
+    assertEquals(2, sb.getNumScores());
+
+
+  }
+
+  public void testSecondScoreAfterFirst() {
+    Scoreboard sb = new Scoreboard(10);
+
+    sb.addScore(50);
+    sb.addScore(49);
+    assertEquals(true, sb.isHighScore(10));
+    assertEquals(50, sb.getScore(0));
+    assertEquals(49, sb.getScore(1));
+    assertEquals(2, sb.getNumScores());
+  }
+
+  public void testMultipleScoresNonFull() {
+    Scoreboard sb = new Scoreboard(10);
+
+    sb.addScore(50);
+    sb.addScore(51);
+    sb.addScore(52);
+
+    assertEquals(true, sb.isHighScore(10));
+    assertEquals(52, sb.getScore(0));
+    assertEquals(51, sb.getScore(1));
+    assertEquals(50, sb.getScore(2));
+    assertEquals(3, sb.getNumScores());
+  }
+
+  public void testMultipleScoresFull() {
+    Scoreboard sb = new Scoreboard(3);
+
+    sb.addScore(50);
+    sb.addScore(51);
+    sb.addScore(52);
+    sb.addScore(53);
+
+    assertFalse(sb.isHighScore(10));
+    assertEquals(53, sb.getScore(0));
+    assertEquals(52, sb.getScore(1));
+    assertEquals(51, sb.getScore(2));
+    assertEquals(3, sb.getNumScores());
+
+  }   
 }