Fixed Linux build

- used ASSERT_DOUBLE_EQ for better error messages

1 files changed, 22 insertions, 27 deletions

diff --git a/JSImpl/test/ParserTests.cpp b/JSImpl/test/ParserTests.cpp
index f1fc6eb..a5b0c99 100644
--- a/JSImpl/test/ParserTests.cpp
+++ b/JSImpl/test/ParserTests.cpp
@@ -8,11 +8,6 @@
 
 #include <sstream>
 
-bool CloseFload(double a, double b, double eps = 0.00001)
-{
-	return fabs(a - b) < eps;
-}
-
 TEST(Parser, ParseUnaryExpr)
 {
 	IPLVector<Token> tokens;
@@ -62,7 +57,7 @@ TEST(Parser, VariableDeclarationAdditionOfLiterals)
 	ASTInterpreter i;
 	i.Run(expr.get());
 	ASSERT_TRUE(i.HasVariable("s"));
-	ASSERT_TRUE(CloseFload(i.ModifyVariable("s"), 11.0));
+	ASSERT_DOUBLE_EQ(i.ModifyVariable("s"), 11.0);
 }
 
 TEST(Parser, VariableDeclarationAdditionOfVariables)
@@ -77,9 +72,9 @@ TEST(Parser, VariableDeclarationAdditionOfVariables)
 	ASSERT_TRUE(i.HasVariable("a"));
 	ASSERT_TRUE(i.HasVariable("b"));
 	ASSERT_TRUE(i.HasVariable("c"));
-	ASSERT_TRUE(CloseFload(i.ModifyVariable("a"), 5.0));
-	ASSERT_TRUE(CloseFload(i.ModifyVariable("b"), 4.0));
-	ASSERT_TRUE(CloseFload(i.ModifyVariable("c"), 9.0));
+	ASSERT_DOUBLE_EQ(i.ModifyVariable("a"), 5.0);
+	ASSERT_DOUBLE_EQ(i.ModifyVariable("b"), 4.0);
+	ASSERT_DOUBLE_EQ(i.ModifyVariable("c"), 9.0);
 }
 
 TEST(Parser, VariableDeclarationMultiplicationOfLiterals)
@@ -92,7 +87,7 @@ TEST(Parser, VariableDeclarationMultiplicationOfLiterals)
 	ASTInterpreter i;
 	i.Run(expr.get());
 	ASSERT_TRUE(i.HasVariable("s"));
-	ASSERT_TRUE(CloseFload(i.ModifyVariable("s"), 30.0));
+	ASSERT_DOUBLE_EQ(i.ModifyVariable("s"), 30.0);
 }
 
 TEST(Parser, VariableDeclarationMultiplicationOfVariables)
@@ -107,9 +102,9 @@ TEST(Parser, VariableDeclarationMultiplicationOfVariables)
 	ASSERT_TRUE(i.HasVariable("a"));
 	ASSERT_TRUE(i.HasVariable("b"));
 	ASSERT_TRUE(i.HasVariable("c"));
-	ASSERT_TRUE(CloseFload(i.ModifyVariable("a"), 5.0));
-	ASSERT_TRUE(CloseFload(i.ModifyVariable("b"), 4.0));
-	ASSERT_TRUE(CloseFload(i.ModifyVariable("c"), 20.0));
+	ASSERT_DOUBLE_EQ(i.ModifyVariable("a"), 5.0);
+	ASSERT_DOUBLE_EQ(i.ModifyVariable("b"), 4.0);
+	ASSERT_DOUBLE_EQ(i.ModifyVariable("c"), 20.0);
 }
 
 
@@ -124,8 +119,8 @@ TEST(Parser, Unary)
 	i.Run(expr.get());
 	ASSERT_TRUE(i.HasVariable("a"));
 	ASSERT_TRUE(i.HasVariable("b"));
-	ASSERT_TRUE(CloseFload(i.ModifyVariable("a"), 6.0));
-	ASSERT_TRUE(CloseFload(i.ModifyVariable("b"), 5.0));
+	ASSERT_DOUBLE_EQ(i.ModifyVariable("a"), 6.0);
+	ASSERT_DOUBLE_EQ(i.ModifyVariable("b"), 5.0);
 }
 
 
@@ -141,8 +136,8 @@ TEST(Parser, If)
 		i.Run(expr.get());
 		ASSERT_TRUE(i.HasVariable("a"));
 		ASSERT_TRUE(i.HasVariable("b"));
-		ASSERT_TRUE(CloseFload(i.ModifyVariable("a"), 6.0));
-		ASSERT_TRUE(CloseFload(i.ModifyVariable("b"), 5.0));
+		ASSERT_DOUBLE_EQ(i.ModifyVariable("a"), 6.0);
+		ASSERT_DOUBLE_EQ(i.ModifyVariable("b"), 5.0);
 	}
 	{
 		IPLVector<Token> tokens;
@@ -154,8 +149,8 @@ TEST(Parser, If)
 		i.Run(expr.get());
 		ASSERT_TRUE(i.HasVariable("a"));
 		ASSERT_TRUE(i.HasVariable("b"));
-		ASSERT_TRUE(CloseFload(i.ModifyVariable("a"), 6.0));
-		ASSERT_TRUE(CloseFload(i.ModifyVariable("b"), 5.0));
+		ASSERT_DOUBLE_EQ(i.ModifyVariable("a"), 6.0);
+		ASSERT_DOUBLE_EQ(i.ModifyVariable("b"), 5.0);
 	}
 
 	{
@@ -168,8 +163,8 @@ TEST(Parser, If)
 		i.Run(expr.get());
 		ASSERT_TRUE(i.HasVariable("a"));
 		ASSERT_TRUE(i.HasVariable("b"));
-		ASSERT_TRUE(CloseFload(i.ModifyVariable("a"), 5.0));
-		ASSERT_TRUE(CloseFload(i.ModifyVariable("b"), 5.0));
+		ASSERT_DOUBLE_EQ(i.ModifyVariable("a"), 5.0);
+		ASSERT_DOUBLE_EQ(i.ModifyVariable("b"), 5.0);
 	}
 
 	{
@@ -182,8 +177,8 @@ TEST(Parser, If)
 		i.Run(expr.get());
 		ASSERT_TRUE(i.HasVariable("a"));
 		ASSERT_TRUE(i.HasVariable("b"));
-		ASSERT_TRUE(CloseFload(i.ModifyVariable("a"), 5.0));
-		ASSERT_TRUE(CloseFload(i.ModifyVariable("b"), 5.0));
+		ASSERT_DOUBLE_EQ(i.ModifyVariable("a"), 5.0);
+		ASSERT_DOUBLE_EQ(i.ModifyVariable("b"), 5.0);
 	}
 
 	{
@@ -196,8 +191,8 @@ TEST(Parser, If)
 		i.Run(expr.get());
 		ASSERT_TRUE(i.HasVariable("a"));
 		ASSERT_TRUE(i.HasVariable("b"));
-		ASSERT_TRUE(CloseFload(i.ModifyVariable("a"), 6.0));
-		ASSERT_TRUE(CloseFload(i.ModifyVariable("b"), 4.0));
+		ASSERT_DOUBLE_EQ(i.ModifyVariable("a"), 6.0);
+		ASSERT_DOUBLE_EQ(i.ModifyVariable("b"), 4.0);
 	}
 }
 
@@ -212,7 +207,7 @@ TEST(Parser, For)
 		ASTInterpreter i;
 		i.Run(expr.get());
 		ASSERT_TRUE(i.HasVariable("i"));
-		ASSERT_TRUE(CloseFload(i.ModifyVariable("i"), 45.0));
+		ASSERT_DOUBLE_EQ(i.ModifyVariable("i"), 45.0);
 	}
 	{
 		IPLVector<Token> tokens;
@@ -222,6 +217,6 @@ TEST(Parser, For)
 		ASTInterpreter i;
 		i.Run(expr.get());
 		ASSERT_TRUE(i.HasVariable("i"));
-		ASSERT_TRUE(CloseFload(i.ModifyVariable("i"), 45.0));
+		ASSERT_DOUBLE_EQ(i.ModifyVariable("i"), 45.0);
 	}
 }