refactoring out unused methods and public method, moving together

scoobycoder · scoobycoder · commit 35ab2826e9c3 · 2014-04-06T20:19:53.000-04:00
diff --git a/src/vending/VendingMachine.java b/src/vending/VendingMachine.java
@@ -29,6 +29,7 @@ public void update() {
 	}
 
 	public ArrayList<String> returnCoins() {
+		setCoinReturnAmount(currentAmount);
 		returnSlotCoins.addAll(coinList);
 		coinList.removeAll(coinList);
 		setCurrentAmount(0.00);
@@ -94,16 +95,13 @@ private void updateDisplay() {
 	private void updateChangeAmount() {
 		if (currentAmount >= 1.25) {
 			setCurrentAmount(currentAmount - 1.25);
-			coinList.remove(0);
-			coinList.remove(1);
-			coinList.remove(2);
 		}
 	}
 
 	private void setCoinReturnAmount(Double coinReturnAmount) {
 		this.coinReturnAmount = coinReturnAmount;
 	}	
-
+	
 	private void coinAdded(String coin, double coinAmount) {
 		coinList.add(coin);
 		coinCalc.insertCoin(coinAmount);
diff --git a/test/vending/VendingMachineTests.java b/test/vending/VendingMachineTests.java
@@ -5,7 +5,6 @@
 import java.util.ArrayList;
 
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 
 public class VendingMachineTests {
@@ -218,7 +217,7 @@ public void machineShouldMakeChangeIfTooMuchMoneyPaidForSoda() {
 		vendingMachine.sodaButton();
 		vendingMachine.returnCoins();
 
-		assertEquals((Double) QUARTER, vendingMachine.getReturnSlotCoins());
+		assertEquals((Double) QUARTER, vendingMachine.getCoinReturnAmount());
 	}
 
 	private void insertDollarInQuarters() {

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ public void update() {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`public ArrayList<String> returnCoins() {`
	`32`	`+ setCoinReturnAmount(currentAmount);`
`32`	`33`	`returnSlotCoins.addAll(coinList);`
`33`	`34`	`coinList.removeAll(coinList);`
`34`	`35`	`setCurrentAmount(0.00);`
`@@ -94,16 +95,13 @@ private void updateDisplay() {`
`94`	`95`	`private void updateChangeAmount() {`
`95`	`96`	`if (currentAmount >= 1.25) {`
`96`	`97`	`setCurrentAmount(currentAmount - 1.25);`
`97`		`- coinList.remove(0);`
`98`		`- coinList.remove(1);`
`99`		`- coinList.remove(2);`
`100`	`98`	`}`
`101`	`99`	`}`
`102`	`100`
`103`	`101`	`private void setCoinReturnAmount(Double coinReturnAmount) {`
`104`	`102`	`this.coinReturnAmount = coinReturnAmount;`
`105`	`103`	`}`
`106`		`-`
	`104`	`+`
`107`	`105`	`private void coinAdded(String coin, double coinAmount) {`
`108`	`106`	`coinList.add(coin);`
`109`	`107`	`coinCalc.insertCoin(coinAmount);`