From 4b2d0377ea506dc5097cbb61243dd9abd29b75ea Mon Sep 17 00:00:00 2001
From: Gavin Li <itsgavin.li@gmail.com>
Date: Mon, 23 Feb 2015 21:11:33 -0500
Subject: [PATCH] Added buildPlayer method to RPGame

---
 MerchantRPGCSE2102/src/controller/RPGame.java     | 11 +++++++++++
 MerchantRPGCSE2102/src/tests/TestTransaction.java |  7 ++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/MerchantRPGCSE2102/src/controller/RPGame.java b/MerchantRPGCSE2102/src/controller/RPGame.java
index 759a0d9..ff84e02 100644
--- a/MerchantRPGCSE2102/src/controller/RPGame.java
+++ b/MerchantRPGCSE2102/src/controller/RPGame.java
@@ -70,6 +70,17 @@ public void buildMerchants()
 		_merchant2 = new Merchant("Merchant 2", 1000, merchantInventoryList2);
 		_merchant3 = new Merchant("Merchant 3", 1000, merchantInventoryList3);
 	}
+	
+	/**
+	 * Generates the player
+	 * @param name					Player name
+	 * @param startingCash			Amount of cash the player starts with
+	 * @param startingInventory		The Player's starting inventory
+	 */
+	public void buildPlayer(String name, int startingCash, ArrayList<String> startingInventory)
+	{
+		_player = new Player(name, startingCash, startingInventory);
+	}
 
 	/**
 	 * This method returns the specified merchant inventory list
diff --git a/MerchantRPGCSE2102/src/tests/TestTransaction.java b/MerchantRPGCSE2102/src/tests/TestTransaction.java
index ff0709f..82dbeca 100644
--- a/MerchantRPGCSE2102/src/tests/TestTransaction.java
+++ b/MerchantRPGCSE2102/src/tests/TestTransaction.java
@@ -1,5 +1,7 @@
 package tests;
 
+import java.util.ArrayList;
+
 import controller.RPGame;
 import junit.framework.TestCase;
 
@@ -12,11 +14,14 @@ public void setup()
 		_rpg = new RPGame();
 		_rpg.inventoryFromFile();
 		_rpg.buildMerchants();
+		ArrayList<String> playerInventory = _rpg.getMerchantInventoryList(1);
+		playerInventory.addAll(_rpg.getMerchantInventoryList(2));
+		playerInventory.addAll(_rpg.getMerchantInventoryList(3));
+		_rpg.buildPlayer("test", 500, playerInventory);
 	}
 	
 	public void testActionSell()
 	{
 		_rpg.createTransaction(_rpg.getPlayer(), _rpg.getMerchant(1));
-		System.out.println("wow");
 	}
 }