Skip to content

Commit f59a1e6

Browse files
scoobycoderscoobycoder
committed
changed public methods to private, renamed other methods
1 parent ac7405a commit f59a1e6

File tree

2 files changed

+39
-54
lines changed

2 files changed

+39
-54
lines changed

‎src/vending/VendingMachine.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -93,15 +93,7 @@ public Double getCoinReturnAmount() {
9393
public void setCoinReturnAmount(Double coinReturnAmount) {
9494
this.coinReturnAmount = coinReturnAmount;
9595
}
96-
97-
public Double getCurrentAmount() {
98-
return currentAmount;
99-
}
100-
101-
public void setCurrentAmount(Double currentAmount) {
102-
this.currentAmount = currentAmount;
103-
}
104-
96+
10597
public ArrayList<String> getReturnSlotCoins() {
10698
return returnSlotCoins;
10799
}
@@ -110,7 +102,7 @@ public void setReturnSlotCoins(ArrayList<String> returnSlotCoins) {
110102
this.returnSlotCoins = returnSlotCoins;
111103
}
112104

113-
public String getDisplay() {
105+
public String display() {
114106
return display;
115107
}
116108

@@ -125,5 +117,13 @@ public ArrayList<String> getItemBinList() {
125117
public void setItemBinList(ArrayList<String> itemBinList) {
126118
this.itemBinList = itemBinList;
127119
}
120+
121+
private void setCurrentAmount(Double currentAmount) {
122+
this.currentAmount = currentAmount;
123+
}
124+
125+
private Double getCurrentAmount() {
126+
return currentAmount;
127+
}
128128

129129
}

‎test/vending/VendingMachineTests.java

Lines changed: 29 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -23,52 +23,47 @@ public void setUp() {
2323
@Test
2424
public void shouldAcceptQuarter() {
2525
insertQuarter();
26-
vendingMachine.calculateCurrentAmount();
26+
vendingMachine.update();
2727

28-
assertEquals((Double) 0.25, vendingMachine.getCurrentAmount());
28+
assertEquals("$0.25", vendingMachine.display());
2929
}
3030

3131
@Test
3232
public void shouldResetCurrentAmountEqualToZeroWhenReturnCoinsIsPressed() {
33-
vendingMachine.setCurrentAmount(0.25);
34-
vendingMachine.calculateCurrentAmount();
33+
insertQuarter();
34+
vendingMachine.update();
3535

3636
vendingMachine.returnCoins();
3737

38-
assertEquals((Double) 0.0, vendingMachine.getCurrentAmount());
38+
assertEquals("$0.25", vendingMachine.display());
3939
}
4040

4141
@Test
4242
public void shouldNotAcceptPenny() {
4343
insertQuarter();
4444
insertPenny();
45-
vendingMachine.calculateCurrentAmount();
45+
vendingMachine.update();
4646

47-
assertEquals((Double) 0.25, vendingMachine.getCurrentAmount());
48-
assertEquals((Double) 0.01, vendingMachine.getCoinReturnAmount());
47+
assertEquals("$0.25", vendingMachine.display());
48+
assertEquals((Double) PENNY, vendingMachine.getCoinReturnAmount());
4949
}
5050

5151
@Test
5252
public void shouldAcceptNickel() {
5353
insertNickle();
54-
vendingMachine.calculateCurrentAmount();
54+
vendingMachine.update();
5555

56-
assertEquals((Double) 0.05, vendingMachine.getCurrentAmount());
56+
assertEquals("$0.05", vendingMachine.display());
5757
}
5858

59-
60-
6159
@Test
6260
public void shouldAcceptDime() {
6361
insertDime();
64-
vendingMachine.calculateCurrentAmount();
65-
vendingMachine.updateDisplay();
62+
vendingMachine.update();
6663

67-
assertEquals((Double) 0.10, vendingMachine.getCurrentAmount());
64+
assertEquals("$0.10", vendingMachine.display());
6865
}
6966

70-
71-
7267
@Test
7368
public void pressingCoinReturnShouldReturnExactCoinsInserted() {
7469
insertFiftyCentsInQuarters();
@@ -78,7 +73,7 @@ public void pressingCoinReturnShouldReturnExactCoinsInserted() {
7873
expectedCoinList.add("Quarter");
7974
expectedCoinList.add("Quarter");
8075
expectedCoinList.add("Nickle");
81-
vendingMachine.calculateCurrentAmount();
76+
vendingMachine.update();
8277

8378
assertEquals(expectedCoinList, vendingMachine.returnCoins());
8479
}
@@ -106,29 +101,26 @@ public void currentAmountShouldContinueToSumAllChangePutInMachine() {
106101
insertQuarter();
107102
insertQuarter();
108103
insertNickle();
109-
vendingMachine.calculateCurrentAmount();
104+
vendingMachine.update();
110105

111-
assertEquals((Double) 0.55, vendingMachine.getCurrentAmount());
106+
assertEquals("$0.55", vendingMachine.display());
112107
}
113108

114109
@Test
115110
public void displayShouldShowAmountOfCurrencyInsertedIntoMachine() {
116111
insertDollarInQuarters();
117-
118112
insertQuarter();
119-
vendingMachine.calculateCurrentAmount();
120-
vendingMachine.updateDisplay();
113+
vendingMachine.update();
121114

122-
insertNickle();
123115

124-
assertEquals("$1.25", vendingMachine.getDisplay());
116+
assertEquals("$1.25", vendingMachine.display());
125117
}
126118

127119
@Test
128120
public void itemBinShouldHoldSodaWhenSodaButtonIsPressed() {
129121
insertDollarInQuarters();
130122
insertFiftyCentsInQuarters();
131-
vendingMachine.calculateCurrentAmount();
123+
vendingMachine.update();
132124

133125
ArrayList<String> expectedItemBinList = new ArrayList<String>();
134126
expectedItemBinList.add("Soda");
@@ -141,19 +133,17 @@ public void itemBinShouldHoldSodaWhenSodaButtonIsPressed() {
141133
@Test
142134
public void vendingMachineShouldNotVendSodaIfChangeIsInsufficent() {
143135
insertDollarInQuarters();
144-
vendingMachine.calculateCurrentAmount();
145-
146-
ArrayList<String> expectedItemBinList = new ArrayList<String>();
136+
vendingMachine.update();
147137

148138
vendingMachine.sodaButton();
149139

150-
assertEquals(expectedItemBinList, vendingMachine.getItemBinList());
140+
assertEquals(new ArrayList<String>(), vendingMachine.getItemBinList());
151141
}
152142

153143
@Test
154144
public void itemBinShouldHoldChipsWhenChipsButtonIsPressed() {
155145
insertDollarInQuarters();
156-
vendingMachine.calculateCurrentAmount();
146+
vendingMachine.update();
157147

158148
ArrayList<String> expectedItemBinList = new ArrayList<String>();
159149
expectedItemBinList.add("Chips");
@@ -166,19 +156,17 @@ public void itemBinShouldHoldChipsWhenChipsButtonIsPressed() {
166156
@Test
167157
public void vendingMachineShouldNotVendChipsIfChangeIsInsufficent() {
168158
insertFiftyCentsInQuarters();
169-
vendingMachine.calculateCurrentAmount();
170-
171-
ArrayList<String> expectedItemBinList = new ArrayList<String>();
159+
vendingMachine.update();
172160

173161
vendingMachine.chipsButton();
174162

175-
assertEquals(expectedItemBinList, vendingMachine.getItemBinList());
163+
assertEquals(new ArrayList<String>(), vendingMachine.getItemBinList());
176164
}
177165

178166
@Test
179167
public void itemBinShouldHoldCandyWhenCandyButtonIsPressed() {
180168
insertFiftyCentsInQuarters();
181-
vendingMachine.calculateCurrentAmount();
169+
vendingMachine.update();
182170

183171
ArrayList<String> expectedItemBinList = new ArrayList<String>();
184172
expectedItemBinList.add("Candy");
@@ -190,16 +178,13 @@ public void itemBinShouldHoldCandyWhenCandyButtonIsPressed() {
190178

191179
@Test
192180
public void vendingMachineShouldNotVendCandyIfChangeIsInsufficent() {
193-
VendingMachine vendingMachine = new VendingMachine();
194181
insertQuarter();
195182
insertNickle();
196-
vendingMachine.calculateCurrentAmount();
197-
198-
ArrayList<String> expectedItemBinList = new ArrayList<String>();
183+
vendingMachine.update();
199184

200185
vendingMachine.candyButton();
201186

202-
assertEquals(expectedItemBinList, vendingMachine.getItemBinList());
187+
assertEquals(new ArrayList<String>(), vendingMachine.getItemBinList());
203188
}
204189

205190
@Test
@@ -208,7 +193,7 @@ public void itemBinShouldHoldCandySodaChipsIfAllArePressed() {
208193
insertDollarInQuarters();
209194
insertDollarInQuarters();
210195
insertQuarter();
211-
vendingMachine.calculateCurrentAmount();
196+
vendingMachine.update();
212197

213198
ArrayList<String> expectedItemBinList = new ArrayList<String>();
214199
expectedItemBinList.add("Candy");
@@ -227,12 +212,12 @@ public void itemBinShouldHoldCandySodaChipsIfAllArePressed() {
227212
public void machineShouldMakeChangeIfTooMuchMoneyPaidForSoda() {
228213
insertDollarInQuarters();
229214
insertFiftyCentsInQuarters();
230-
vendingMachine.calculateCurrentAmount();
215+
vendingMachine.update();
231216

232217
vendingMachine.sodaButton();
233218
vendingMachine.returnCoins();
234219

235-
assertEquals((Double) 0.25, vendingMachine.getCoinReturnAmount());
220+
assertEquals((Double) QUARTER, vendingMachine.getCoinReturnAmount());
236221
}
237222

238223
private void insertDollarInQuarters() {

0 commit comments

Comments
 (0)