Modified: trunk/Source/WebKit/chromium/ChangeLog (126074 => 126075)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-08-20 21:41:02 UTC (rev 126074)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-08-20 21:50:21 UTC (rev 126075)
@@ -1,3 +1,15 @@
+2012-08-20 Shawn Singh <shawnsi...@chromium.org>
+
+ [chromium] CCMathUtilTest.smallestAngleBetweenVectors unit test failing
+ https://bugs.webkit.org/show_bug.cgi?id=94502
+
+ Reviewed by Kenneth Russell.
+
+ The test needed to use EXPECT_FLOAT_EQ instead of EXPECT_EQ. In
+ this patch, the test is also re-enabled.
+
+ * tests/CCMathUtilTest.cpp:
+
2012-08-20 Leandro Gracia Gil <leandrogra...@chromium.org>
Move transformFriendlyBoundingBox out of Range
Modified: trunk/Source/WebKit/chromium/tests/CCMathUtilTest.cpp (126074 => 126075)
--- trunk/Source/WebKit/chromium/tests/CCMathUtilTest.cpp 2012-08-20 21:41:02 UTC (rev 126074)
+++ trunk/Source/WebKit/chromium/tests/CCMathUtilTest.cpp 2012-08-20 21:50:21 UTC (rev 126075)
@@ -152,8 +152,7 @@
EXPECT_FLOAT_RECT_EQ(FloatRect(FloatPoint(-100, -100), FloatSize(90, 90)), result);
}
-// http://webkit.org/b/94502
-TEST(CCMathUtilTest, DISABLED_smallestAngleBetweenVectors)
+TEST(CCMathUtilTest, smallestAngleBetweenVectors)
{
FloatSize x(1, 0);
FloatSize y(0, 1);
@@ -168,13 +167,13 @@
EXPECT_EQ(0, CCMathUtil::smallestAngleBetweenVectors(testVector, testVector));
// Parallel but reversed vectors are at 180 degrees.
- EXPECT_EQ(180, CCMathUtil::smallestAngleBetweenVectors(x, -x));
- EXPECT_EQ(180, CCMathUtil::smallestAngleBetweenVectors(y, -y));
- EXPECT_EQ(180, CCMathUtil::smallestAngleBetweenVectors(testVector, -testVector));
+ EXPECT_FLOAT_EQ(180, CCMathUtil::smallestAngleBetweenVectors(x, -x));
+ EXPECT_FLOAT_EQ(180, CCMathUtil::smallestAngleBetweenVectors(y, -y));
+ EXPECT_FLOAT_EQ(180, CCMathUtil::smallestAngleBetweenVectors(testVector, -testVector));
// The test vector is at a known angle.
- EXPECT_EQ(45, floor(CCMathUtil::smallestAngleBetweenVectors(testVector, x)));
- EXPECT_EQ(45, floor(CCMathUtil::smallestAngleBetweenVectors(testVector, y)));
+ EXPECT_FLOAT_EQ(45, floor(CCMathUtil::smallestAngleBetweenVectors(testVector, x)));
+ EXPECT_FLOAT_EQ(45, floor(CCMathUtil::smallestAngleBetweenVectors(testVector, y)));
}
TEST(CCMathUtilTest, vectorProjection)
