Skip to site navigation (Press enter)

[webkit-changes] [160582] trunk/Tools

weinig Fri, 13 Dec 2013 19:14:00 -0800

Title: [160582] trunk/Tools

Revision: 160582
Author: wei...@apple.com
Date: 2013-12-13 19:16:42 -0800 (Fri, 13 Dec 2013)

Log Message

Fix API tests.

* TestWebKitAPI/Tests/WebKit2/WillLoad.cpp:
(TestWebKitAPI::TEST_F):


Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/TestWebKitAPI/Tests/WebKit2/WillLoad.cpp

Diff

Modified: trunk/Tools/ChangeLog (160581 => 160582)


--- trunk/Tools/ChangeLog	2013-12-14 03:14:12 UTC (rev 160581)
+++ trunk/Tools/ChangeLog	2013-12-14 03:16:42 UTC (rev 160582)
@@ -1,3 +1,10 @@
+2013-12-13  Sam Weinig  <s...@webkit.org>
+
+        Fix API tests.
+
+        * TestWebKitAPI/Tests/WebKit2/WillLoad.cpp:
+        (TestWebKitAPI::TEST_F):
+
 2013-12-13  Brent Fulgham  <bfulg...@apple.com>
 
         [Win] Remove Pre-VS2013 support code.

Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/WillLoad.cpp (160581 => 160582)


--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/WillLoad.cpp	2013-12-14 03:14:12 UTC (rev 160581)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/WillLoad.cpp	2013-12-14 03:16:42 UTC (rev 160582)
@@ -179,7 +179,7 @@
 
     WKPageLoadHTMLStringWithUserData(webView->page(), htmlString.get(), baseURL.get(), userData.get());
 
-    testWillLoadDataRequestReturnValues(baseURL.get(), Util::toWK("text/html").get(), Util::toWK("utf-16").get(), 0, userData.get());
+    testWillLoadDataRequestReturnValues(baseURL.get(), Util::toWK("text/html").get(), Util::toWK("utf-8").get(), 0, userData.get());
 }
 
 TEST_F(WebKit2WillLoadTest, WKPageLoadHTMLString)
@@ -189,7 +189,7 @@
 
     WKPageLoadHTMLString(webView->page(), htmlString.get(), baseURL.get());
 
-    testWillLoadDataRequestReturnValues(baseURL.get(), Util::toWK("text/html").get(), Util::toWK("utf-16").get(), 0, 0);
+    testWillLoadDataRequestReturnValues(baseURL.get(), Util::toWK("text/html").get(), Util::toWK("utf-8").get(), 0, 0);
 }
 
 TEST_F(WebKit2WillLoadTest, WKPageLoadAlternateHTMLStringWithUserData)
@@ -202,7 +202,7 @@
 
     WKPageLoadAlternateHTMLStringWithUserData(webView->page(), htmlString.get(), baseURL.get(), unreachableURL.get(), userData.get());
 
-    testWillLoadDataRequestReturnValues(baseURL.get(), Util::toWK("text/html").get(), Util::toWK("utf-16").get(), unreachableURL.get(), userData.get());
+    testWillLoadDataRequestReturnValues(baseURL.get(), Util::toWK("text/html").get(), Util::toWK("utf-8").get(), unreachableURL.get(), userData.get());
 }
 
 TEST_F(WebKit2WillLoadTest, WKPageLoadAlternateHTMLString)
@@ -214,7 +214,7 @@
 
     WKPageLoadAlternateHTMLString(webView->page(), htmlString.get(), baseURL.get(), unreachableURL.get());
 
-    testWillLoadDataRequestReturnValues(baseURL.get(), Util::toWK("text/html").get(), Util::toWK("utf-16").get(), unreachableURL.get(), 0);
+    testWillLoadDataRequestReturnValues(baseURL.get(), Util::toWK("text/html").get(), Util::toWK("utf-8").get(), unreachableURL.get(), 0);
 }
 
 TEST_F(WebKit2WillLoadTest, WKPageLoadPlainTextStringWithUserData)
@@ -225,7 +225,7 @@
     WKPageLoadPlainTextStringWithUserData(webView->page(), plaintTextString.get(), userData.get());
 
     WKRetainPtr<WKURLRef> blankURL = adoptWK(WKURLCreateWithUTF8CString("about:blank"));
-    testWillLoadDataRequestReturnValues(blankURL.get(), Util::toWK("text/plain").get(), Util::toWK("utf-16").get(), 0, userData.get());
+    testWillLoadDataRequestReturnValues(blankURL.get(), Util::toWK("text/plain").get(), Util::toWK("utf-8").get(), 0, userData.get());
 }
 
 TEST_F(WebKit2WillLoadTest, WKPageLoadPlainTextString)
@@ -235,7 +235,7 @@
     WKPageLoadPlainTextString(webView->page(), plaintTextString.get());
 
     WKRetainPtr<WKURLRef> blankURL = adoptWK(WKURLCreateWithUTF8CString("about:blank"));
-    testWillLoadDataRequestReturnValues(blankURL.get(), Util::toWK("text/plain").get(), Util::toWK("utf-16").get(), 0, 0);
+    testWillLoadDataRequestReturnValues(blankURL.get(), Util::toWK("text/plain").get(), Util::toWK("utf-8").get(), 0, 0);
 }
 
 } // namespace TestWebKitAPI

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