[webkit-changes] [208978] trunk/Tools

Fri, 25 Nov 2016 16:17:45 -0800

Title: [208978] trunk/Tools
Revision
208978
Author
o...@webkit.org
Date
2016-11-25 16:17:19 -0800 (Fri, 25 Nov 2016)

Log Message

Fix compile warnings after r208415
https://bugs.webkit.org/show_bug.cgi?id=165061

Reviewed by Andy Estes.

* TestWebKitAPI/Tests/WTF/Time.cpp:
(TestWebKitAPI::TEST):

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (208977 => 208978)


--- trunk/Tools/ChangeLog	2016-11-25 18:38:15 UTC (rev 208977)
+++ trunk/Tools/ChangeLog	2016-11-26 00:17:19 UTC (rev 208978)
@@ -1,3 +1,13 @@
+2016-11-25  Csaba Osztrogonác  <o...@webkit.org>
+
+        Fix compile warnings after r208415
+        https://bugs.webkit.org/show_bug.cgi?id=165061
+
+        Reviewed by Andy Estes.
+
+        * TestWebKitAPI/Tests/WTF/Time.cpp:
+        (TestWebKitAPI::TEST):
+
 2016-11-24  Michael Catanzaro  <mcatanz...@igalia.com>
 
         [GTK] Notifications API does not expose or respect the "tag" attribute

Modified: trunk/Tools/TestWebKitAPI/Tests/WTF/Time.cpp (208977 => 208978)


--- trunk/Tools/TestWebKitAPI/Tests/WTF/Time.cpp	2016-11-25 18:38:15 UTC (rev 208977)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/Time.cpp	2016-11-26 00:17:19 UTC (rev 208978)
@@ -167,116 +167,116 @@
 
 TEST(WTF_Time, less)
 {
-    EXPECT_EQ(false, s(2) < s(1));
-    EXPECT_EQ(false, s(2) < s(2));
-    EXPECT_EQ(true, s(2) < s(3));
-    EXPECT_EQ(false, wt(2) < wt(1));
-    EXPECT_EQ(false, wt(2) < wt(2));
-    EXPECT_EQ(true, wt(2) < wt(3));
-    EXPECT_EQ(false, mt(2) < mt(1));
-    EXPECT_EQ(false, mt(2) < mt(2));
-    EXPECT_EQ(true, mt(2) < mt(3));
-    EXPECT_EQ(false, dtw(2) < dtw(1));
-    EXPECT_EQ(false, dtw(2) < dtw(2));
-    EXPECT_EQ(true, dtw(2) < dtw(3));
-    EXPECT_EQ(false, dtm(2) < dtm(1));
-    EXPECT_EQ(false, dtm(2) < dtm(2));
-    EXPECT_EQ(true, dtm(2) < dtm(3));
+    EXPECT_FALSE(s(2) < s(1));
+    EXPECT_FALSE(s(2) < s(2));
+    EXPECT_TRUE(s(2) < s(3));
+    EXPECT_FALSE(wt(2) < wt(1));
+    EXPECT_FALSE(wt(2) < wt(2));
+    EXPECT_TRUE(wt(2) < wt(3));
+    EXPECT_FALSE(mt(2) < mt(1));
+    EXPECT_FALSE(mt(2) < mt(2));
+    EXPECT_TRUE(mt(2) < mt(3));
+    EXPECT_FALSE(dtw(2) < dtw(1));
+    EXPECT_FALSE(dtw(2) < dtw(2));
+    EXPECT_TRUE(dtw(2) < dtw(3));
+    EXPECT_FALSE(dtm(2) < dtm(1));
+    EXPECT_FALSE(dtm(2) < dtm(2));
+    EXPECT_TRUE(dtm(2) < dtm(3));
 }
 
 TEST(WTF_Time, lessEqual)
 {
-    EXPECT_EQ(false, s(2) <= s(1));
-    EXPECT_EQ(true, s(2) <= s(2));
-    EXPECT_EQ(true, s(2) <= s(3));
-    EXPECT_EQ(false, wt(2) <= wt(1));
-    EXPECT_EQ(true, wt(2) <= wt(2));
-    EXPECT_EQ(true, wt(2) <= wt(3));
-    EXPECT_EQ(false, mt(2) <= mt(1));
-    EXPECT_EQ(true, mt(2) <= mt(2));
-    EXPECT_EQ(true, mt(2) <= mt(3));
-    EXPECT_EQ(false, dtw(2) <= dtw(1));
-    EXPECT_EQ(true, dtw(2) <= dtw(2));
-    EXPECT_EQ(true, dtw(2) <= dtw(3));
-    EXPECT_EQ(false, dtm(2) <= dtm(1));
-    EXPECT_EQ(true, dtm(2) <= dtm(2));
-    EXPECT_EQ(true, dtm(2) <= dtm(3));
+    EXPECT_FALSE(s(2) <= s(1));
+    EXPECT_TRUE(s(2) <= s(2));
+    EXPECT_TRUE(s(2) <= s(3));
+    EXPECT_FALSE(wt(2) <= wt(1));
+    EXPECT_TRUE(wt(2) <= wt(2));
+    EXPECT_TRUE(wt(2) <= wt(3));
+    EXPECT_FALSE(mt(2) <= mt(1));
+    EXPECT_TRUE(mt(2) <= mt(2));
+    EXPECT_TRUE(mt(2) <= mt(3));
+    EXPECT_FALSE(dtw(2) <= dtw(1));
+    EXPECT_TRUE(dtw(2) <= dtw(2));
+    EXPECT_TRUE(dtw(2) <= dtw(3));
+    EXPECT_FALSE(dtm(2) <= dtm(1));
+    EXPECT_TRUE(dtm(2) <= dtm(2));
+    EXPECT_TRUE(dtm(2) <= dtm(3));
 }
 
 TEST(WTF_Time, greater)
 {
-    EXPECT_EQ(true, s(2) > s(1));
-    EXPECT_EQ(false, s(2) > s(2));
-    EXPECT_EQ(false, s(2) > s(3));
-    EXPECT_EQ(true, wt(2) > wt(1));
-    EXPECT_EQ(false, wt(2) > wt(2));
-    EXPECT_EQ(false, wt(2) > wt(3));
-    EXPECT_EQ(true, mt(2) > mt(1));
-    EXPECT_EQ(false, mt(2) > mt(2));
-    EXPECT_EQ(false, mt(2) > mt(3));
-    EXPECT_EQ(true, dtw(2) > dtw(1));
-    EXPECT_EQ(false, dtw(2) > dtw(2));
-    EXPECT_EQ(false, dtw(2) > dtw(3));
-    EXPECT_EQ(true, dtm(2) > dtm(1));
-    EXPECT_EQ(false, dtm(2) > dtm(2));
-    EXPECT_EQ(false, dtm(2) > dtm(3));
+    EXPECT_TRUE(s(2) > s(1));
+    EXPECT_FALSE(s(2) > s(2));
+    EXPECT_FALSE(s(2) > s(3));
+    EXPECT_TRUE(wt(2) > wt(1));
+    EXPECT_FALSE(wt(2) > wt(2));
+    EXPECT_FALSE(wt(2) > wt(3));
+    EXPECT_TRUE(mt(2) > mt(1));
+    EXPECT_FALSE(mt(2) > mt(2));
+    EXPECT_FALSE(mt(2) > mt(3));
+    EXPECT_TRUE(dtw(2) > dtw(1));
+    EXPECT_FALSE(dtw(2) > dtw(2));
+    EXPECT_FALSE(dtw(2) > dtw(3));
+    EXPECT_TRUE(dtm(2) > dtm(1));
+    EXPECT_FALSE(dtm(2) > dtm(2));
+    EXPECT_FALSE(dtm(2) > dtm(3));
 }
 
 TEST(WTF_Time, greaterEqual)
 {
-    EXPECT_EQ(true, s(2) >= s(1));
-    EXPECT_EQ(true, s(2) >= s(2));
-    EXPECT_EQ(false, s(2) >= s(3));
-    EXPECT_EQ(true, wt(2) >= wt(1));
-    EXPECT_EQ(true, wt(2) >= wt(2));
-    EXPECT_EQ(false, wt(2) >= wt(3));
-    EXPECT_EQ(true, mt(2) >= mt(1));
-    EXPECT_EQ(true, mt(2) >= mt(2));
-    EXPECT_EQ(false, mt(2) >= mt(3));
-    EXPECT_EQ(true, dtw(2) >= dtw(1));
-    EXPECT_EQ(true, dtw(2) >= dtw(2));
-    EXPECT_EQ(false, dtw(2) >= dtw(3));
-    EXPECT_EQ(true, dtm(2) >= dtm(1));
-    EXPECT_EQ(true, dtm(2) >= dtm(2));
-    EXPECT_EQ(false, dtm(2) >= dtm(3));
+    EXPECT_TRUE(s(2) >= s(1));
+    EXPECT_TRUE(s(2) >= s(2));
+    EXPECT_FALSE(s(2) >= s(3));
+    EXPECT_TRUE(wt(2) >= wt(1));
+    EXPECT_TRUE(wt(2) >= wt(2));
+    EXPECT_FALSE(wt(2) >= wt(3));
+    EXPECT_TRUE(mt(2) >= mt(1));
+    EXPECT_TRUE(mt(2) >= mt(2));
+    EXPECT_FALSE(mt(2) >= mt(3));
+    EXPECT_TRUE(dtw(2) >= dtw(1));
+    EXPECT_TRUE(dtw(2) >= dtw(2));
+    EXPECT_FALSE(dtw(2) >= dtw(3));
+    EXPECT_TRUE(dtm(2) >= dtm(1));
+    EXPECT_TRUE(dtm(2) >= dtm(2));
+    EXPECT_FALSE(dtm(2) >= dtm(3));
 }
 
 TEST(WTF_Time, equal)
 {
-    EXPECT_EQ(false, s(2) == s(1));
-    EXPECT_EQ(true, s(2) == s(2));
-    EXPECT_EQ(false, s(2) == s(3));
-    EXPECT_EQ(false, wt(2) == wt(1));
-    EXPECT_EQ(true, wt(2) == wt(2));
-    EXPECT_EQ(false, wt(2) == wt(3));
-    EXPECT_EQ(false, mt(2) == mt(1));
-    EXPECT_EQ(true, mt(2) == mt(2));
-    EXPECT_EQ(false, mt(2) == mt(3));
-    EXPECT_EQ(false, dtw(2) == dtw(1));
-    EXPECT_EQ(true, dtw(2) == dtw(2));
-    EXPECT_EQ(false, dtw(2) == dtw(3));
-    EXPECT_EQ(false, dtm(2) == dtm(1));
-    EXPECT_EQ(true, dtm(2) == dtm(2));
-    EXPECT_EQ(false, dtm(2) == dtm(3));
+    EXPECT_FALSE(s(2) == s(1));
+    EXPECT_TRUE(s(2) == s(2));
+    EXPECT_FALSE(s(2) == s(3));
+    EXPECT_FALSE(wt(2) == wt(1));
+    EXPECT_TRUE(wt(2) == wt(2));
+    EXPECT_FALSE(wt(2) == wt(3));
+    EXPECT_FALSE(mt(2) == mt(1));
+    EXPECT_TRUE(mt(2) == mt(2));
+    EXPECT_FALSE(mt(2) == mt(3));
+    EXPECT_FALSE(dtw(2) == dtw(1));
+    EXPECT_TRUE(dtw(2) == dtw(2));
+    EXPECT_FALSE(dtw(2) == dtw(3));
+    EXPECT_FALSE(dtm(2) == dtm(1));
+    EXPECT_TRUE(dtm(2) == dtm(2));
+    EXPECT_FALSE(dtm(2) == dtm(3));
 }
 
 TEST(WTF_Time, notEqual)
 {
-    EXPECT_EQ(true, s(2) != s(1));
-    EXPECT_EQ(false, s(2) != s(2));
-    EXPECT_EQ(true, s(2) != s(3));
-    EXPECT_EQ(true, wt(2) != wt(1));
-    EXPECT_EQ(false, wt(2) != wt(2));
-    EXPECT_EQ(true, wt(2) != wt(3));
-    EXPECT_EQ(true, mt(2) != mt(1));
-    EXPECT_EQ(false, mt(2) != mt(2));
-    EXPECT_EQ(true, mt(2) != mt(3));
-    EXPECT_EQ(true, dtw(2) != dtw(1));
-    EXPECT_EQ(false, dtw(2) != dtw(2));
-    EXPECT_EQ(true, dtw(2) != dtw(3));
-    EXPECT_EQ(true, dtm(2) != dtm(1));
-    EXPECT_EQ(false, dtm(2) != dtm(2));
-    EXPECT_EQ(true, dtm(2) != dtm(3));
+    EXPECT_TRUE(s(2) != s(1));
+    EXPECT_FALSE(s(2) != s(2));
+    EXPECT_TRUE(s(2) != s(3));
+    EXPECT_TRUE(wt(2) != wt(1));
+    EXPECT_FALSE(wt(2) != wt(2));
+    EXPECT_TRUE(wt(2) != wt(3));
+    EXPECT_TRUE(mt(2) != mt(1));
+    EXPECT_FALSE(mt(2) != mt(2));
+    EXPECT_TRUE(mt(2) != mt(3));
+    EXPECT_TRUE(dtw(2) != dtw(1));
+    EXPECT_FALSE(dtw(2) != dtw(2));
+    EXPECT_TRUE(dtw(2) != dtw(3));
+    EXPECT_TRUE(dtm(2) != dtm(1));
+    EXPECT_FALSE(dtm(2) != dtm(2));
+    EXPECT_TRUE(dtm(2) != dtm(3));
 }
 
 } // namespace TestWebKitAPI

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to