use common class for EngineResponse

1 files changed, 25 insertions, 17 deletions

diff --git a/Mastermind/Test.java b/Mastermind/Test.java
index 5d203aa..c6166d9 100644
--- a/Mastermind/Test.java
+++ b/Mastermind/Test.java
@@ -1,4 +1,6 @@
 package Mastermind;
+
+import Mastermind.EngineResponse;
 import Mastermind.FranekEngine;
 import Mastermind.MiguelEngine;
 
@@ -8,32 +10,38 @@ class Test
 	{
 		int good=0;
 		int bad=0;
+
 		System.out.println("Test all possible combos");
+
 		for (int c1=1;c1<=6;c1++)
 		for (int c2=1;c2<=6;c2++)
 		for (int c3=1;c3<=6;c3++)
 		for (int c4=1;c4<=6;c4++)
 		{
-		System.out.println("Test all guesses for code: "+c1+c2+c3+c4);
-		for (int g1=1;g1<=6;g1++)
-		for (int g2=1;g2<=6;g2++)
-		for (int g3=1;g3<=6;g3++)
-		for (int g4=1;g4<=6;g4++)
-		{
-			int fra=FranekEngine.run(c1,c2,c3,c4,g1,g2,g3,g4);
-			int mig=MiguelEngine.run(c1,c2,c3,c4,g1,g2,g3,g4);
-			if(fra!=mig)
+			System.out.println("Test all guesses for code: "+c1+c2+c3+c4);
+			for (int g1=1;g1<=6;g1++)
+			for (int g2=1;g2<=6;g2++)
+			for (int g3=1;g3<=6;g3++)
+			for (int g4=1;g4<=6;g4++)
 			{
-				System.out.println("Mismatch on " +c1+c2+c3+c4+ " with guess: "+g1+g2+g3+g4);
-				System.out.println("FRA: "+fra);
-				System.out.println("MIG: "+mig);
-				bad++;
-			}
-			else
-				good++;
+				EngineResponse fra=FranekEngine.run(c1,c2,c3,c4,g1,g2,g3,g4);
+				EngineResponse mig=MiguelEngine.run(c1,c2,c3,c4,g1,g2,g3,g4);
 
+				if(!fra.isSame(mig))
+				{
+					if(args.length>0 && args[0].equals("--show-mismatch")){
+						System.out.println("Mismatch on " +c1+c2+c3+c4+ " with guess: "+g1+g2+g3+g4);
+						System.out.println("FRA: "+mig.toString());
+						System.out.println("MIG: "+fra.toString());
+					}
+					bad++;
+				}
+				else
+					good++;
+
+			}
 		}
-		}
+
 		System.out.println("OK: "+good);
 		System.out.println("MISMATCH: "+bad);
 	}