nhydock$ff1-battle-system
int lvl
return 2;
int
int getInt(int lvl)
int lvl
return 2;
int
int getEvd(int lvl)
https://github.com/erodozer/FF1-Battle-System/blob/bfded7cf4b2a843dcf577008ca4d2e8b4ac2f467/src%2Factors%2FMockActor.java
https://api.github.com/repos/erodozer/FF1-Battle-System/contents/src%2Factors%2FMockActor.java?ref=bfded7cf4b2a843dcf577008ca4d2e8b4ac2f467
src/actors/MockActor.java
		vit = 10;
		acc = 10;
		itl = 10;
		mag = 10;
		res = 10;
@@ -13,8 +13,9 @@ public MockActor(String n)
 		def = 10;
 		spd = 10;
 		evd = 10;
-		mag = 10;
-		res = 10;
+		vit = 10;
+		acc = 10;
+		itl = 10;
 		loadSprites();
 	}
 
https://github.com/erodozer/FF1-Battle-System/raw/bfded7cf4b2a843dcf577008ca4d2e8b4ac2f467/src%2Factors%2FMockActor.java
8242d576c62ffe1a3b6051aa2a77dc201ac6637f
modified
https://github.com/erodozer/FF1-Battle-System/blob/bfded7cf4b2a843dcf577008ca4d2e8b4ac2f467/src%2Factors%2FTestEnemy.java
https://api.github.com/repos/erodozer/FF1-Battle-System/contents/src%2Factors%2FTestEnemy.java?ref=bfded7cf4b2a843dcf577008ca4d2e8b4ac2f467
src/actors/TestEnemy.java
/**
 * TestEnemy.java
 * @author nhydock
 *	Junit test for enemies
 */
	/**
	 * Tests initializing of an enemy...there's not much else to really test
	 */
		assertEquals(9, a.getInt());
		assertEquals(7, a.getMag());
		assertEquals(9, a.getRes());
@@ -4,8 +4,16 @@
 
 import junit.framework.TestCase;
 
+/**
+ * TestEnemy.java
+ * @author nhydock
+ *	Junit test for enemies
+ */
 public class TestEnemy extends TestCase {
 
+	/**
+	 * Tests initializing of an enemy...there's not much else to really test
+	 */
 	@Test
 	public void testInitalization()
 	{
@@ -17,8 +25,7 @@ public void testInitalization()
 		assertEquals(8, a.getDef());
 		assertEquals(8, a.getSpd());
 		assertEquals(9, a.getEvd());
-		assertEquals(7, a.getMag());
-		assertEquals(9, a.getRes());
+		assertEquals(9, a.getInt());
 		assertEquals(15, a.getExp());
 		assertTrue(a.getAlive());
 	}
https://github.com/erodozer/FF1-Battle-System/raw/bfded7cf4b2a843dcf577008ca4d2e8b4ac2f467/src%2Factors%2FTestEnemy.java
1c314f3672a9a708d41cc00cd375ef79e566d1df
modified
https://github.com/erodozer/FF1-Battle-System/blob/bfded7cf4b2a843dcf577008ca4d2e8b4ac2f467/src%2Factors%2FTestPlayer.java
https://api.github.com/repos/erodozer/FF1-Battle-System/contents/src%2Factors%2FTestPlayer.java?ref=bfded7cf4b2a843dcf577008ca4d2e8b4ac2f467
src/actors/TestPlayer.java
/**
 * TestPlayer.java
 * @author nhydock
 *
 *	JUnit test file for player class
 */
	/**
	 * Test initialization
	 */
		assertEquals(5, a.getHP());
		assertEquals(1, a.getStr());
		assertEquals(1, a.getDef());
		assertEquals(1, a.getSpd());
		assertEquals(1, a.getEvd());
		assertEquals(1, a.getInt());
		assertEquals(1, a.getVit());
		assertEquals(1, a.getAcc());
		assertEquals(Player.STAND, a.getState());
		
	/**
	 * Tests the player to make sure animations are working
	 */
	public void testSpriteFlipping()
	{
		Player a = new Player("Twil");
		
	}
src/actors/TestPlayer.java
Player a = new Player("Twil");
void testSpriteFlipping()
		//All stats should be 1 more than default because players level up
		// to level 1 upon creation
		assertEquals(6, a.getHP());
		assertEquals(2, a.getStr());
		assertEquals(2, a.getDef());
		assertEquals(2, a.getSpd());
		assertEquals(2, a.getEvd());
		assertEquals(2, a.getMag());
		assertEquals(2, a.getRes());
@@ -5,24 +5,42 @@
 import jobs.Fighter;
 import junit.framework.TestCase;
 
+/**
+ * TestPlayer.java
+ * @author nhydock
+ *
+ *	JUnit test file for player class
+ */
 public class TestPlayer extends TestCase {
 
+	/**
+	 * Test initialization
+	 */
 	@Test
 	public void testInitalization()
 	{
 		Player a = new Player("Twil");
 		
-		//All stats should be 1 more than default because players level up
-		// to level 1 upon creation
 		assertEquals("Twil", a.getName());
-		assertEquals(6, a.getHP());
-		assertEquals(2, a.getStr());
-		assertEquals(2, a.getDef());
-		assertEquals(2, a.getSpd());
-		assertEquals(2, a.getEvd());
-		assertEquals(2, a.getMag());
-		assertEquals(2, a.getRes());
+		assertEquals(5, a.getHP());
+		assertEquals(1, a.getStr());
+		assertEquals(1, a.getDef());
+		assertEquals(1, a.getSpd());
+		assertEquals(1, a.getEvd());
+		assertEquals(1, a.getInt());
+		assertEquals(1, a.getVit());
+		assertEquals(1, a.getAcc());
 		assertTrue(a.getAlive());
+		assertEquals(Player.STAND, a.getState());
+		
 	}
 	
+	/**
+	 * Tests the player to make sure animations are working
+	 */
+	public void testSpriteFlipping()
+	{
+		Player a = new Player("Twil");
+		
+	}
 }
https://github.com/erodozer/FF1-Battle-System/raw/bfded7cf4b2a843dcf577008ca4d2e8b4ac2f467/src%2Factors%2FTestPlayer.java
41c87367ea56ead6027f88b397d5ee50e4e0d005
modified
https://github.com/erodozer/FF1-Battle-System/blob/bfded7cf4b2a843dcf577008ca4d2e8b4ac2f467/src%2Fgroups%2FFormationTest.java
https://api.github.com/repos/erodozer/FF1-Battle-System/contents/src%2Fgroups%2FFormationTest.java?ref=bfded7cf4b2a843dcf577008ca4d2e8b4ac2f467
src/groups/FormationTest.java
import actors.Enemy;

		Formation f = new Formation();
		
		assertEquals(0, f.size());
	}
	
	@Test
	public void testAddEnemyByName() {
		Formation f = new Formation();
		
		f.add("Gel");
		assertEquals("Gel", f.get(0).getName());
	}
	
	@Test
	public void testAddEnemyByInstance() {
		Formation f = new Formation();
		Enemy e = new Enemy("Gel");
		f.add(e);
		
		assertEquals(e, f.get(0));
	
src/groups/FormationTest.java
Formation f = new Formation();
		
		f.add("Gel");
		assertEquals("Gel", f.get(0).getName());
void testAddEnemyByName()
		fail("Not yet implemented");
@@ -4,6 +4,8 @@
 
 import org.junit.Test;
 
+import actors.Enemy;
+
 /**
  * FormationTest.java
  * @author Nicholas Hydock 
@@ -16,7 +18,27 @@ public class FormationTest {
 
 	@Test
 	public void test() {
-		fail("Not yet implemented");
+		Formation f = new Formation();
+		
+		assertEquals(0, f.size());
+	}
+	
+	@Test
+	public void testAddEnemyByName() {
+		Formation f = new Formation();
+		
+		f.add("Gel");
+		assertEquals("Gel", f.get(0).getName());
+	}
+	
+	@Test
+	public void testAddEnemyByInstance() {
+		Formation f = new Formation();
+		Enemy e = new Enemy("Gel");
+		f.add(e);
+		
+		assertEquals(e, f.get(0));
 	}
+	
 
 }
https://github.com/erodozer/FF1-Battle-System/raw/bfded7cf4b2a843dcf577008ca4d2e8b4ac2f467/src%2Fgroups%2FFormationTest.java
215c9fda71dc45dbcf6d3ef63d178ac92f0211c3
modified
https://github.com/erodozer/FF1-Battle-System/blob/bfded7cf4b2a843dcf577008ca4d2e8b4ac2f467/src%2Fgroups%2FPartyTest.java
https://api.github.com/repos/erodozer/FF1-Battle-System/contents/src%2Fgroups%2FPartyTest.java?ref=bfded7cf4b2a843dcf577008ca4d2e8b4ac2f467
src/groups/PartyTest.java
import jobs.Job;
		assertEquals("Fighter", ((Job)p.get(0)).getJobName());
		assertEquals("Fighter", p.get(0).getJob());
@@ -13,6 +13,7 @@
 import org.junit.Test;
 
 import actors.Player;
+import jobs.Job;
 
 public class PartyTest extends TestCase{
 
@@ -43,7 +44,7 @@ public void testAddMember()
 		assertEquals(1, p.toArray().length);	
 		
 		assertEquals("APPL", p.get(0).getName());
-		assertEquals("Fighter", p.get(0).getJob());
+		assertEquals("Fighter", ((Job)p.get(0)).getJobName());
 		
 	}
 	
https://github.com/erodozer/FF1-Battle-System/raw/bfded7cf4b2a843dcf577008ca4d2e8b4ac2f467/src%2Fgroups%2FPartyTest.java
a95843e5f68b415c2437d586f51759395080f699
modified
https://github.com/erodozer/FF1-Battle-System/blob/bfded7cf4b2a843dcf577008ca4d2e8b4ac2f467/src%2Fjobs%2FJobTest.java
https://api.github.com/repos/erodozer/FF1-Battle-System/contents/src%2Fjobs%2FJobTest.java?ref=bfded7cf4b2a843dcf577008ca4d2e8b4ac2f467
src/jobs/JobTest.java
		assertEquals(55, j.getEvd());
		assertEquals(7, j.getInt());
		assertEquals(58, j.getEvd());
		assertEquals(9, j.getInt());
		itl = 7;
	
	@Override
	protected int getInt(int lvl) {
		return 2;
	}

int lvl
src/jobs/JobTest.java
return 2;
int getInt(int lvl)
		assertEquals(6, j.getEvd());
		assertEquals(53, j.getRes());
		assertEquals(8, j.getEvd());
		assertEquals(59, j.getRes());
		evd = 6;
		res = 53;

	@Override
	public int getEvd(int lvl) {
		return 2;
	}

	@Override
	public int getRes(int lvl) {
		return 6;
	}

int lvl
src/jobs/JobTest.java
return 2;
int getEvd(int lvl)
int lvl
src/jobs/JobTest.java
return 6;
int getRes(int lvl)
@@ -32,8 +32,8 @@ public void test() {
 		assertEquals(8, j.getStr());
 		assertEquals(34, j.getDef());
 		assertEquals(7, j.getSpd());
-		assertEquals(6, j.getEvd());
-		assertEquals(53, j.getRes());
+		assertEquals(55, j.getEvd());
+		assertEquals(7, j.getInt());
 		assertEquals(15, j.getAcc());
 		assertEquals(12, j.getVit());
 		
@@ -46,8 +46,8 @@ public void test() {
 		assertEquals(11, j.getStr());
 		assertEquals(39, j.getDef());
 		assertEquals(10, j.getSpd());
-		assertEquals(8, j.getEvd());
-		assertEquals(59, j.getRes());
+		assertEquals(58, j.getEvd());
+		assertEquals(9, j.getInt());
 		assertEquals(21, j.getVit());
 		assertEquals(16, j.getAcc());
 	
@@ -73,10 +73,9 @@ public MockJob(Player p)
 		str = 8;
 		def = 34;
 		spd = 7;
-		evd = 6;
-		res = 53;
 		acc = 15;
 		vit = 12;
+		itl = 7;
 	}
 
 	@Override
@@ -93,17 +92,7 @@ public int getDef(int lvl) {
 	public int getSpd(int lvl) {
 		return 3;
 	}
-
-	@Override
-	public int getEvd(int lvl) {
-		return 2;
-	}
-
-	@Override
-	public int getRes(int lvl) {
-		return 6;
-	}
-
+	
 	@Override
 	protected int getAcc(int lvl) {
 		return 1;
@@ -114,4 +103,9 @@ protected int getVit(int lvl) {
 		return (int)(lvl+7);
 	}
 
+	@Override
+	protected int getInt(int lvl) {
+		return 2;
+	}
+
 }
https://github.com/erodozer/FF1-Battle-System/raw/bfded7cf4b2a843dcf577008ca4d2e8b4ac2f467/src%2Fjobs%2FJobTest.java
0fa476eecb967c29e24475cbf476f32a099e2b64
modified
nhydock$ff1-battle-system
int lvl
return 2;
int
int getInt(int lvl)
int lvl
return 2;
int
int getEvd(int lvl)