Merge remote-tracking branch 'sbonner1/master'

Conflicts:
	ZombieProjectModelClasses/src/zombieProject/shared/Game.java

Author: aschin

ZombieProjectModelClasses/JUnitTests/zombieProject/GameTester.java

@@ -0,0 +1,61 @@
+package zombieProject;
+
+import static org.junit.Assert.*;
+
+import java.util.ArrayList;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import zombieProject.shared.Game;
+import zombieProject.shared.Spawned;
+
+public class GameTester {
+
+	Game game;
+	
+	@Before
+	public void setUp() throws Exception {
+		game = new Game();
+	}
+
+	
+	@Test
+	public void testGetPlayer(){
+		assertEquals(game.getPlayer(), game.getPlayer());
+	}
+	@Test
+	public void testGetZombie(){
+		assertEquals(game.getZombie(0), game.getZombie(0));
+	}
+	@Test
+	public void testNewZombie(){
+		game.newZombie();
+		assertEquals(game.getZombie(0), game.getZombie(0));
+		int count = game.listSize();
+		game.removeZ(0);
+		count -= 1;
+		assertEquals(count, game.listSize());
+	}
+	@Test
+	public void testGetSpawned(){
+		game.newSpawn();
+		assertEquals(game.getSpawned(0), game.getSpawned(0));
+		game.newSpawn();
+		int count = game.spawnSize();
+		game.removeS(0);
+		count -= 1;
+		assertEquals(count, game.spawnSize());
+	}
+	@Test
+	public void testZombieListSize(){
+		int count = game.listSize();
+		assertEquals(count, game.listSize());
+	}
+	@Test
+	public void testSpawnSize(){
+		int count = game.spawnSize();
+		assertEquals(count, game.spawnSize());
+	}
+	
+}

ZombieProjectModelClasses/JUnitTests/zombieProject/ObstacleTest.java

@@ -9,11 +9,12 @@
 
 public class ObstacleTest {
 
-	Obstacle obstacle;
+	Obstacle obstacle, obstacle2;
 
 	@Before
 	public void setUp() throws Exception {
 		obstacle = new Obstacle(10, 10, 50, 20);
+		obstacle2 = new Obstacle(10, 10, 10);
 	}
 
 	@Test

ZombieProjectModelClasses/JUnitTests/zombieProject/PlayerTest.java

@@ -17,64 +17,85 @@ protected void setUp() throws Exception {
 		p1 = new Player(0,0);
 		p2 = new Player(128, 256);
 		m = new Map();
+		
 	}
-	
 	@Test
 	public void testGetX() throws Exception{
 		assertEquals(0.0, p1.getX());
 		assertEquals(128.0, p2.getX());
 	}
-	
 	@Test
 	public void testSetX() throws Exception{
 		p1.setX(90.0);
 		assertEquals(90.0, p1.getX());
 		p2.setX(346.0);
 		assertEquals(346.0, p2.getX());
 	}
-	
 	@Test
 	public void testGetY() throws Exception{
 		assertEquals(0.0, p1.getY());
 		assertEquals(256.0, p2.getY());
 	}
-	
 	@Test
 	public void testSetY() throws Exception{
 		p1.setY(72.0);
 		assertEquals(72.0, p1.getY());
 		p2.setY(925.0);
 		assertEquals(925.0, p2.getY());
 	}
-	
 	@Test
 	public void testGetHealth() throws Exception{
 		assertEquals(100.0, p1.getHealth());
 		assertEquals(100.0, p2.getHealth());
 	}
-	
 	@Test
 	public void testIncreaseHealth() throws Exception{
 		p1.increaseHealth(50.0);
 		assertEquals(150.0, p1.getHealth());
 		p2.increaseHealth(78.0);
 		assertEquals(178.0, p2.getHealth());
 	}
-	
 	@Test
 	public void testDecreaseHealth() throws Exception{
 		p1.decreaseHealth(50.0);
 		assertEquals(50.0, p1.getHealth());
 		p2.decreaseHealth(50);
 		assertEquals(50.0, p2.getHealth());
 	}
-	
+	@Test
+	public void testGetPlayerScore(){
+		assertEquals(0, p1.getPscore());
+	}
+	@Test
+	public void testIncreasePlayerScore(){
+		p1.increasePscore(10);
+		assertEquals(10, p1.getPscore());
+	}
+	@Test
+	public void testSetPlayerImageWidth(){
+		p1.setPlayerImageWidth(50);
+		assertEquals(50, p1.getPlayerImageWidth());
+	}
+	@Test 
+	public void testSetPlayerImageHeight(){
+		p1.setPlayerImageHeight(20);
+		assertEquals(20, p1.getPlayerImageHeight());
+	}
 	@Test
 	public void testCanMove() throws Exception{
 		p1.setX(-10.0);
 		p1.setY(14.0);
 		assertFalse(p1.canMove(m));
 
+		p2.setX(m.getLeft() + 10);
+		p2.setY(m.getTop()  + 10);
+		assertTrue(p2.canMove(m));
+		
+		p2.setX(m.getLeft() - 10);
+		assertFalse(p2.canMove(m));
+		
 
 	}
+	
 }
+	

ZombieProjectModelClasses/JUnitTests/zombieProject/SpawnedTest.java

@@ -0,0 +1,41 @@
+package zombieProject;
+
+import static org.junit.Assert.*;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import zombieProject.shared.Spawned;
+
+public class SpawnedTest {
+
+	Spawned tester;
+	
+	@Before
+	public void setUp() throws Exception {
+		tester = new Spawned(0.0, 0.0);
+	}
+
+	@Test
+	public void testGetX() {
+		assertEquals(0.0, tester.getX());
+	}
+	
+	@Test
+	public void testGetY(){
+		assertEquals(0.0, tester.getY());
+	}
+	
+	@Test
+	public void testSetX(){
+		tester.setX(10.0);
+		assertEquals(10.0, tester.getX());
+	}
+	
+	@Test
+	public void testSetY(){
+		tester.setY(15.0);
+		assertEquals(15.0, tester.getY());
+	}
+
+}

ZombieProjectModelClasses/JUnitTests/zombieProject/ZombieTest.java

@@ -24,51 +24,42 @@ protected void setUp() throws Exception {
 			p1 = new Player(10, 10);
 			m = new Map();
 		}
-		
 		@Test
 		public void testGetX() throws Exception{
 			assertEquals(0.0, z1.getX());
 			assertEquals(128.0, z2.getX());
 		}
-		
 		@Test
 		public void testSetX() throws Exception{
 			z1.setX(90.0);
 			assertEquals(90.0, z1.getX());
 			z2.setX(346.0);
 			assertEquals(346.0, z2.getX());
 		}
-		
 		@Test
 		public void testGetY() throws Exception{
 			assertEquals(0.0, z1.getY());
 			assertEquals(256.0, z2.getY());
 		}
-		
 		@Test
 		public void testSetY() throws Exception{
 			z1.setY(72.0);
 			assertEquals(72.0, z1.getY());
 			z2.setY(925.0);
 			assertEquals(925.0, z2.getY());
 		}
-		
 		@Test
 		public void testGetHealth() throws Exception{
 			assertEquals(50.0, z1.getHealth());
 			assertEquals(50.0, z2.getHealth());
 		}
-		
-		
 		@Test
 		public void testDecreaseHealth() throws Exception{
 			z1.decreaseHealth(50.0);
 			assertEquals(0.0, z1.getHealth());
 			z2.decreaseHealth(25);
 			assertEquals(25.0, z2.getHealth());
 		}
-		
-		
 		@Test
 		public void testMoveTowardsPlayerUp() throws Exception{
 			p1.setY(10.0);
@@ -81,8 +72,6 @@ public void testMoveTowardsPlayerUp() throws Exception{
 			assertEquals(6.0, z1.getY());
 			assertEquals(6.0, z1.getX());
 		}
-		
-		
 		@Test
 		public void testMoveTowardsPlayerDown() throws Exception{
 			p1.setY(10.0);
@@ -94,10 +83,13 @@ public void testMoveTowardsPlayerDown() throws Exception{
 			z1.moveTowardsPlayer(p1);
 			assertEquals(14.0, z1.getX());
 			assertEquals(14.0, z1.getY());
+			
+			z1.setX(15.0);
+			z1.moveTowardsPlayer(p1);
+			assertEquals(14.0, z1.getX());
+			
+			
 		}
-		
-
-		
 		@Test
 		public void testzombieRoam() throws Exception{
 			z1.setX(15.0);
@@ -110,8 +102,6 @@ public void testzombieRoam() throws Exception{
 				assertEquals(false, true);
 			}
 		}
-		
-		
 		@Test
 		public void testZombieMove() throws Exception{
 			p1.setY(10.0);
@@ -132,7 +122,6 @@ public void testZombieMove() throws Exception{
 			}
 
 		}
-		
 		@Test
 		public void testCanMove(){
 			assertTrue(z3.canMove(m)); //test inboundaries
@@ -146,30 +135,16 @@ public void testCanMove(){
 			z3.setY(m.getBottom() + 20);
 			assertFalse(z3.canMove(m)); // test bottom boundary
 		}
-
-		/*
-		 * 
-		 * one or the other should change
-		 * 
-		 * 
 		@Test
-		public void testzombieRoamX() throws Exception{
-			z1.setX(15.0);
-			z1.setY(15.0);
-			z1.zombieRoam();
-			System.out.println(z1.getX());
-			assertEquals(15.0, z1.getX());
+		public void setZombieImageWidth(){
+			z1.setZombieImageWidth(50);
+			assertEquals(50, z1.getZombieImageWidth());
 		}
-		
-		
 		@Test
-		public void testzombieRoamY() throws Exception{
-			z1.setX(15.0);
-			z1.setY(15.0);
-			z1.zombieRoam();
-			System.out.println(z1.getY());
-			assertEquals(15.0, z1.getY());
+		public void setZombieImageHeight(){
+			z1.setZombieImageHeight(20);
+			assertEquals(20, z1.getZombieImageHeight());
 		}
-		*/
+		
 }
 

ZombieProjectModelClasses/src/zombieProject/shared/Game.java

@@ -12,24 +12,33 @@
 public class Game {
 
 
-	Map m = new Map();
-	
 
-	Random generator = new Random();
+
 
 	private Player player;
-//	private Zombie zombie;
-	
 	ArrayList<Zombie> zombieList = new ArrayList<Zombie>();
 	ArrayList<Spawned> spawnList = new ArrayList<Spawned>();
 	ArrayList<Ammo> AmmoList = new ArrayList<Ammo>();
 
 
+
+	
+	/**
+	 * game constructor
+	 */
 	public Game() {
 		this.player = new Player(50, 50);
 		this.zombieList.add(new Zombie(0, 0));
 	}
-	
+
+
+
+
+
+	Random generator = new Random();
+
+
+
 	public Player getPlayer() {
 		return player;
 	}
@@ -56,14 +65,10 @@ public int listSize(){
 		return zombieList.size();
 	}
 
-
-	
-
 	public void removeZ(int i){
 		this.zombieList.remove(i);
 	}
 
-	
 	public int spawnSize(){
 		return spawnList.size();
 	}