Merchant Class update:

*Updated the decrementCash method to decreaseCash to better fit its use
gal11002 · Feb 10, 2015 · aecf52b · aecf52b
1 parent 6b60f82
commit aecf52b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/MerchantRPGCSE2102/src/game/Merchant.java b/MerchantRPGCSE2102/src/game/Merchant.java
@@ -54,7 +54,7 @@ public void incrementCash(int incrementAmount)
 	}
 
 	//removes the specified amount from the merchant's current cash
-	public int decrementCash(int decrementAmount)
+	public int decreaseCash(int decrementAmount)
 	{
 		//checks if the amount attempting to be removed is
 		//greater than the current amount

diff --git a/MerchantRPGCSE2102/src/tests/TestMerchant.java b/MerchantRPGCSE2102/src/tests/TestMerchant.java
@@ -24,11 +24,11 @@ public void setup()
 	public void testCashSystem() throws Exception
 	{
 		setup();
-		assertEquals(-1, m.decrementCash(101));
+		assertEquals(-1, m.decreaseCash(101));
 		m.incrementCash(100);
 		m.refreshCash();
 		assertEquals(200, m.getCurrentCash());
-		m.decrementCash(120);
+		m.decreaseCash(120);
 		assertEquals(80, m.getCurrentCash());
 	}