fixed typo in code

src/BlazeBrigadeTest/AnimationTest.cs

@@ -15,22 +15,20 @@ namespace ControllerTest
         //Test unit returns to original location after attacking Right, Left, Up, and Down
         public void attackAnimation_Return_to_previous_location_ShouldReturnTrue()
         {
-
             Mock<Unit> mockUnit = new Mock<Unit>();         //create mock object for unit
             mockUnit.Setup(Unit => Unit.Position).Returns(new Tuple<int, int>(18, 15)); //mock position of unit to return (18, 15)
-            var unitOrigPosition = new Tuple<int, int>(18, 15); //store mock original position of unit at (18, 15)
 
             View.Animation.attackAnimation(Direction.Right, mockUnit.Object); //animate unit attacking Right
-            Assert.IsTrue(mockUnit.Object.Position==unitOrigPosition);
+            Assert.AreEqual(mockUnit.Object.Position, new Tuple<int, int>(18, 15));
 
             View.Animation.attackAnimation(Direction.Left, mockUnit.Object); //animate unit attacking Left
-            Assert.IsTrue(mockUnit.Object.Position == unitOrigPosition);
+            Assert.AreEqual(mockUnit.Object.Position, new Tuple<int, int>(18, 15));
 
             View.Animation.attackAnimation(Direction.Up, mockUnit.Object); //animate unit attacking Up
-            Assert.IsTrue(mockUnit.Object.Position == unitOrigPosition);
+            Assert.AreEqual(mockUnit.Object.Position, new Tuple<int, int>(18, 15));
 
             View.Animation.attackAnimation(Direction.Down, mockUnit.Object); //animate unit attacking Down
-            Assert.IsTrue(mockUnit.Object.Position == unitOrigPosition);
+            Assert.AreEqual(mockUnit.Object.Position, new Tuple<int, int>(18, 15));
         }
 
 
@@ -43,40 +41,40 @@ namespace ControllerTest
             Mock<Node> mockNode = new Mock<Node>(); //create mock node that is clicked
 
             //set unit and node so that unit moves right
-            mockUnit.Setup(Unit => Unit.PixelCoordinates).Returns(new Vector2 (576,480)); //mock position of unit to return (18, 15)
+            mockUnit.Setup(Unit => Unit.PixelCoordinates).Returns(new Vector2(576, 480)); //mock position of unit to return (18, 15)
             mockNode.Setup(Node => Node.getPositionX()).Returns(20); //set node position X to be 2 to the right of unit
-            mockNode.Setup(Node => Node.getPositionX()).Returns(15); //set node position Y to be same as unit
-            Vector2 nodeVectorPixelCoordinates = new Vector2(mockNode.Object.getPositionX()*32, (mockNode.Object.getPositionY()*32));
+            mockNode.Setup(Node => Node.getPositionY()).Returns(15); //set node position Y to be same as unit
+            Vector2 nodeVectorPixelCoordinates = new Vector2(mockNode.Object.getPositionX() * 32, (mockNode.Object.getPositionY() * 32));
 
             View.Animation.animateUnitPosition(mockGraph.Object, mockUnit.Object, mockNode.Object);
-            Assert.IsTrue(mockUnit.Object.PixelCoordinates == nodeVectorPixelCoordinates);
+            Assert.AreEqual(mockUnit.Object.PixelCoordinates, nodeVectorPixelCoordinates);
 
             //set unit and node so that unit moves left
             mockUnit.Setup(Unit => Unit.PixelCoordinates).Returns(new Vector2(640, 480)); //mock position of unit to return (20, 15)
             mockNode.Setup(Node => Node.getPositionX()).Returns(18); //set node position X to be 2 to the left of unit
-            mockNode.Setup(Node => Node.getPositionX()).Returns(15); //set node position Y to be same as unit
+            mockNode.Setup(Node => Node.getPositionY()).Returns(15); //set node position Y to be same as unit
             nodeVectorPixelCoordinates = new Vector2(mockNode.Object.getPositionX() * 32, (mockNode.Object.getPositionY() * 32));
 
             View.Animation.animateUnitPosition(mockGraph.Object, mockUnit.Object, mockNode.Object);
-            Assert.IsTrue(mockUnit.Object.PixelCoordinates == nodeVectorPixelCoordinates);
+            Assert.AreEqual(mockUnit.Object.PixelCoordinates, nodeVectorPixelCoordinates);
 
             //set unit and node so that unit moves down
             mockUnit.Setup(Unit => Unit.PixelCoordinates).Returns(new Vector2(576, 480)); //mock position of unit to return (18, 15)
             mockNode.Setup(Node => Node.getPositionX()).Returns(18); //set node position X to be 2 to the right of unit
-            mockNode.Setup(Node => Node.getPositionX()).Returns(17); //set node position Y to be 2 down of unit
+            mockNode.Setup(Node => Node.getPositionY()).Returns(17); //set node position Y to be 2 down of unit
             nodeVectorPixelCoordinates = new Vector2(mockNode.Object.getPositionX() * 32, (mockNode.Object.getPositionY() * 32));
 
             View.Animation.animateUnitPosition(mockGraph.Object, mockUnit.Object, mockNode.Object);
-            Assert.IsTrue(mockUnit.Object.PixelCoordinates == nodeVectorPixelCoordinates);
+            Assert.AreEqual(mockUnit.Object.PixelCoordinates, nodeVectorPixelCoordinates);
 
             //set unit and node so that unit moves up
             mockUnit.Setup(Unit => Unit.PixelCoordinates).Returns(new Vector2(576, 544)); //mock position of unit to return (18, 17)
             mockNode.Setup(Node => Node.getPositionX()).Returns(18); //set node position X to be 2 to the right of unit
-            mockNode.Setup(Node => Node.getPositionX()).Returns(15); //set node position Y to be same as unit
+            mockNode.Setup(Node => Node.getPositionY()).Returns(15); //set node position Y to be same as unit
             nodeVectorPixelCoordinates = new Vector2(mockNode.Object.getPositionX() * 32, (mockNode.Object.getPositionY() * 32));
 
             View.Animation.animateUnitPosition(mockGraph.Object, mockUnit.Object, mockNode.Object);
-            Assert.IsTrue(mockUnit.Object.PixelCoordinates == nodeVectorPixelCoordinates);
+            Assert.AreEqual(mockUnit.Object.PixelCoordinates, nodeVectorPixelCoordinates);
         }
 
 
@@ -88,75 +86,75 @@ namespace ControllerTest
 
             //check animation for unit moving down
 
-            mockUnit.Setup(Unit => Unit.currentFrame).Returns(5); //unit is facing a different direction
+            mockUnit.Setup(Unit => Unit.currentFrame).Returns(55); //unit is facing a different direction
             View.Animation.animate(Direction.Down, mockUnit.Object);
-            Assert.IsTrue(mockUnit.Object.currentFrame == 1); //unit should now face down
+            Assert.AreEqual(mockUnit.Object.currentFrame, 1); //unit should now face down
 
             mockUnit.Setup(Unit => Unit.currentFrame).Returns(0); //frame 1 of walking down
             View.Animation.animate(Direction.Down, mockUnit.Object);
-            Assert.IsTrue(mockUnit.Object.currentFrame == 1); //should be frame 2 of walking down
+            Assert.AreEqual(mockUnit.Object.currentFrame, 1); //should be frame 2 of walking down
 
             mockUnit.Setup(Unit => Unit.currentFrame).Returns(1); //frame 2 of walking down
             View.Animation.animate(Direction.Down, mockUnit.Object);
-            Assert.IsTrue(mockUnit.Object.currentFrame == 2); //should be frame 3 of walking down
+            Assert.AreEqual(mockUnit.Object.currentFrame, 2); //should be frame 3 of walking down
 
             mockUnit.Setup(Unit => Unit.currentFrame).Returns(2); //frame 3 of walking down
             View.Animation.animate(Direction.Down, mockUnit.Object);
-            Assert.IsTrue(mockUnit.Object.currentFrame == 0); //should be frame 1 of walking down
+            Assert.AreEqual(mockUnit.Object.currentFrame, 0); //should be frame 1 of walking down
 
             //check animation for unit moving left
 
             mockUnit.Setup(Unit => Unit.currentFrame).Returns(10); //unit is facing a different direction
             View.Animation.animate(Direction.Left, mockUnit.Object);
-            Assert.IsTrue(mockUnit.Object.currentFrame == 4); //unit should now face left
+            Assert.AreEqual(mockUnit.Object.currentFrame, 4); //unit should now face left
 
             mockUnit.Setup(Unit => Unit.currentFrame).Returns(3); //frame 1 of walking left
             View.Animation.animate(Direction.Left, mockUnit.Object);
-            Assert.IsTrue(mockUnit.Object.currentFrame == 4); //should be frame 2 of walking left
+            Assert.AreEqual(mockUnit.Object.currentFrame, 4); //should be frame 2 of walking left
 
             mockUnit.Setup(Unit => Unit.currentFrame).Returns(4); //frame 2 of walking left
             View.Animation.animate(Direction.Left, mockUnit.Object);
-            Assert.IsTrue(mockUnit.Object.currentFrame == 5); //should be frame 3 of walking left
+            Assert.AreEqual(mockUnit.Object.currentFrame, 5); //should be frame 3 of walking left
 
             mockUnit.Setup(Unit => Unit.currentFrame).Returns(5); //frame 3 of walking left
             View.Animation.animate(Direction.Left, mockUnit.Object);
-            Assert.IsTrue(mockUnit.Object.currentFrame == 3); //should be frame 1 of walking left
+            Assert.AreEqual(mockUnit.Object.currentFrame, 3); //should be frame 1 of walking left
 
             //check animation for unit moving right
 
             mockUnit.Setup(Unit => Unit.currentFrame).Returns(11); //unit is facing a different direction
             View.Animation.animate(Direction.Right, mockUnit.Object);
-            Assert.IsTrue(mockUnit.Object.currentFrame == 7); //unit should now face right
+            Assert.AreEqual(mockUnit.Object.currentFrame, 7); //unit should now face right
 
             mockUnit.Setup(Unit => Unit.currentFrame).Returns(6); //frame 1 of walking right
             View.Animation.animate(Direction.Right, mockUnit.Object);
-            Assert.IsTrue(mockUnit.Object.currentFrame == 7); //should be frame 2 of walking right
+            Assert.AreEqual(mockUnit.Object.currentFrame, 7); //should be frame 2 of walking right
 
             mockUnit.Setup(Unit => Unit.currentFrame).Returns(7); //frame 2 of walking right
             View.Animation.animate(Direction.Right, mockUnit.Object);
-            Assert.IsTrue(mockUnit.Object.currentFrame == 8); //should be frame 3 of walking right
+            Assert.AreEqual(mockUnit.Object.currentFrame, 8); //should be frame 3 of walking right
 
             mockUnit.Setup(Unit => Unit.currentFrame).Returns(8); //frame 3 of walking right
             View.Animation.animate(Direction.Right, mockUnit.Object);
-            Assert.IsTrue(mockUnit.Object.currentFrame == 6); //should be frame 1 of walking right
+            Assert.AreEqual(mockUnit.Object.currentFrame, 6); //should be frame 1 of walking right
 
             //check animation for unit moving up
 
             mockUnit.Setup(Unit => Unit.currentFrame).Returns(1); //unit is facing a different direction
             View.Animation.animate(Direction.Up, mockUnit.Object);
-            Assert.IsTrue(mockUnit.Object.currentFrame == 10); //unit should now face up
+            Assert.AreEqual(mockUnit.Object.currentFrame, 10); //unit should now face up
 
             mockUnit.Setup(Unit => Unit.currentFrame).Returns(9); //frame 1 of walking up
             View.Animation.animate(Direction.Up, mockUnit.Object);
-            Assert.IsTrue(mockUnit.Object.currentFrame == 10); //should be frame 2 of walking up
+            Assert.AreEqual(mockUnit.Object.currentFrame, 10); //should be frame 2 of walking up
 
             mockUnit.Setup(Unit => Unit.currentFrame).Returns(10); //frame 2 of walking up
             View.Animation.animate(Direction.Up, mockUnit.Object);
-            Assert.IsTrue(mockUnit.Object.currentFrame == 11); //should be frame 3 of walking up
+            Assert.AreEqual(mockUnit.Object.currentFrame, 11); //should be frame 3 of walking up
 
             mockUnit.Setup(Unit => Unit.currentFrame).Returns(11); //frame 3 of walking up
             View.Animation.animate(Direction.Up, mockUnit.Object);
-            Assert.IsTrue(mockUnit.Object.currentFrame == 9); //should be frame 1 of walking up
+            Assert.AreEqual(mockUnit.Object.currentFrame, 9); //should be frame 1 of walking up
         }
     }
 }