Added equality method to move to use in testing

john · Apr 29, 2016 · cdf6293 · cdf6293
1 parent 76fa25c
commit cdf6293
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/src/model/Move.java b/src/model/Move.java
@@ -14,6 +14,13 @@ public boolean isJump() {
 				&& Math.abs(source.row - destination.row) == 2;
 	}
 
+	public boolean equals(Move other) {
+		return  this.destination.row 	== other.destination.row &&
+				this.destination.column == other.destination.column &&
+				this.source.row			== other.source.row &&
+				this.source.column		== other.source.column;
+	}
+
 	@Override
 	public String toString() {
 		return "From (" + this.source.row + ", " + this.source.column + ")" +

diff --git a/src/test/CommunicationTest.java b/src/test/CommunicationTest.java
@@ -13,14 +13,8 @@ public CommunicationTest() {
 	}
 
 	public boolean moveExistsInSet(Move move, ArrayList<Move> set) {
-		for (Move m : set) {
-			if (	move.destination.row 	== m.destination.row &&
-					move.destination.column == m.destination.column &&
-					move.source.row			== m.source.row &&
-					move.source.column		== m.source.column) {
-				return true;
-			}
-		}
+		for (Move m : set)
+			if (move.equals(m)) return true;
 		return false;
 	}