From aecf52b9ce3ff090171154526dc8a0c21ad382f7 Mon Sep 17 00:00:00 2001
From: Gavin Li <itsgavin.li@gmail.com>
Date: Tue, 10 Feb 2015 16:20:00 -0500
Subject: [PATCH] Merchant Class update: *Updated the decrementCash method to
 decreaseCash to better fit its use

---
 MerchantRPGCSE2102/src/game/Merchant.java      | 2 +-
 MerchantRPGCSE2102/src/tests/TestMerchant.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/MerchantRPGCSE2102/src/game/Merchant.java b/MerchantRPGCSE2102/src/game/Merchant.java
index 20c22a4..a4f1904 100644
--- 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
index 5d94889..08ed6fe 100644
--- 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());
 	}