Changeset 105688 in webkit

Timestamp:

Jan 23, 2012 8:40:30 PM (12 years ago)

Author:

Martin Robinson

Message:

[GTK][WK2] Make the LoadTracking and WebView test fixtures more flexible
​https://bugs.webkit.org/show_bug.cgi?id=76755

Reviewed by Alejandro G. Castro.

Always clear the loading events when loading new content in the load tracking
test. In the WebView test correctly handle loading HTML with a URL that isn't
"about:blank."

• UIProcess/API/gtk/tests/LoadTrackingTest.cpp:

(LoadTrackingTest::loadURI): Reset the class state when starting a new load.
(LoadTrackingTest::loadHtml): Ditto.
(LoadTrackingTest::loadPlainText): Ditto.
(LoadTrackingTest::loadRequest): Ditto.

• UIProcess/API/gtk/tests/LoadTrackingTest.h: Added new method definitions.
• UIProcess/API/gtk/tests/TestWebKitWebLoaderClient.cpp:

(assertNormalLoadHappened): No longer clear loading events. The fixture handles that now.
(testLoadHtml): Update to reflect new method name.
(testLoadPlainText): Ditto.
(testLoadRequest): Ditto.
(testWebViewReload): Ditto.

• UIProcess/API/gtk/tests/WebViewTest.cpp:

(WebViewTest::loadHtml): Properly interpret the baseURL parameter.

• UIProcess/API/gtk/tests/WebViewTest.h: Make loading methods virtual.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/gtk/tests/LoadTrackingTest.cpp (modified) (1 diff)
• UIProcess/API/gtk/tests/LoadTrackingTest.h (modified) (1 diff)
• UIProcess/API/gtk/tests/TestWebKitWebLoaderClient.cpp (modified) (6 diffs)
• UIProcess/API/gtk/tests/WebViewTest.cpp (modified) (1 diff)
• UIProcess/API/gtk/tests/WebViewTest.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-01-23  Martin Robinson  <mrobinson@igalia.com>
+
+        [GTK][WK2] Make the LoadTracking and WebView test fixtures more flexible
+        https://bugs.webkit.org/show_bug.cgi?id=76755
+
+        Reviewed by Alejandro G. Castro.
+
+        Always clear the loading events when loading new content in the load tracking
+        test. In the WebView test correctly handle loading HTML with a URL that isn't
+        "about:blank."
+
+        * UIProcess/API/gtk/tests/LoadTrackingTest.cpp:
+        (LoadTrackingTest::loadURI): Reset the class state when starting a new load.
+        (LoadTrackingTest::loadHtml): Ditto.
+        (LoadTrackingTest::loadPlainText): Ditto.
+        (LoadTrackingTest::loadRequest): Ditto.
+        * UIProcess/API/gtk/tests/LoadTrackingTest.h: Added new method definitions.
+        * UIProcess/API/gtk/tests/TestWebKitWebLoaderClient.cpp:
+        (assertNormalLoadHappened): No longer clear loading events. The fixture handles that now.
+        (testLoadHtml): Update to reflect new method name.
+        (testLoadPlainText): Ditto.
+        (testLoadRequest): Ditto.
+        (testWebViewReload): Ditto.
+        * UIProcess/API/gtk/tests/WebViewTest.cpp:
+        (WebViewTest::loadHtml): Properly interpret the baseURL parameter.
+        * UIProcess/API/gtk/tests/WebViewTest.h: Make loading methods virtual.
+
 2012-01-23  Alexander Færøy  <alexander.faeroy@nokia.com>
 

trunk/Source/WebKit2/UIProcess/API/gtk/tests/LoadTrackingTest.cpp

@@ -139 +139 @@
 }
 
+void LoadTrackingTest::loadURI(const char* uri)
+{
+    m_loadEvents.clear();
+    m_estimatedProgress = 0;
+    WebViewTest::loadURI(uri);
+}
+
+void LoadTrackingTest::loadHtml(const char* html, const char* baseURI)
+{
+    m_loadEvents.clear();
+    m_estimatedProgress = 0;
+    WebViewTest::loadHtml(html, baseURI);
+}
+
+void LoadTrackingTest::loadPlainText(const char* plainText)
+{
+    m_loadEvents.clear();
+    m_estimatedProgress = 0;
+    WebViewTest::loadPlainText(plainText);
+}
+
+void LoadTrackingTest::loadRequest(WebKitURIRequest* request)
+{
+    m_loadEvents.clear();
+    m_estimatedProgress = 0;
+    WebViewTest::loadRequest(request);
+}

trunk/Source/WebKit2/UIProcess/API/gtk/tests/LoadTrackingTest.h

@@ -40 +40 @@
     virtual void estimatedProgressChanged();
 
+    void loadURI(const char* uri);
+    void loadHtml(const char* html, const char* baseURI);
+    void loadPlainText(const char* plainText);
+    void loadRequest(WebKitURIRequest*);
+
     void setRedirectURI(const char* uri) { m_redirectURI = uri; }
 

trunk/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitWebLoaderClient.cpp

@@ -56 +56 @@
 }
 
-static void assertNormalLoadHappenedAndClearEvents(Vector<LoadTrackingTest::LoadEvents>& events)
+static void assertNormalLoadHappened(Vector<LoadTrackingTest::LoadEvents>& events)
 {
     g_assert_cmpint(events.size(), ==, 3);
@@ -62 +62 @@
     g_assert_cmpint(events[1], ==, LoadTrackingTest::LoadCommitted);
     g_assert_cmpint(events[2], ==, LoadTrackingTest::LoadFinished);
-    events.clear();
 }
 
@@ -69 +68 @@
     test->loadHtml("<html><body>Hello WebKit-GTK+</body></html>", 0);
     test->waitUntilLoadFinished();
-    assertNormalLoadHappenedAndClearEvents(test->m_loadEvents);
+    assertNormalLoadHappened(test->m_loadEvents);
 }
 
@@ -76 +75 @@
     test->loadPlainText("Hello WebKit-GTK+");
     test->waitUntilLoadFinished();
-    assertNormalLoadHappenedAndClearEvents(test->m_loadEvents);
+    assertNormalLoadHappened(test->m_loadEvents);
 }
 
@@ -84 +83 @@
     test->loadRequest(request.get());
     test->waitUntilLoadFinished();
-    assertNormalLoadHappenedAndClearEvents(test->m_loadEvents);
+    assertNormalLoadHappened(test->m_loadEvents);
 }
 
@@ -132 +131 @@
     test->loadURI(kServer->getURIForPath("/normal").data());
     test->waitUntilLoadFinished();
-    assertNormalLoadHappenedAndClearEvents(test->m_loadEvents);
+    assertNormalLoadHappened(test->m_loadEvents);
 
     webkit_web_view_reload(test->m_webView);
     test->waitUntilLoadFinished();
-    assertNormalLoadHappenedAndClearEvents(test->m_loadEvents);
+    assertNormalLoadHappened(test->m_loadEvents);
 }
 

trunk/Source/WebKit2/UIProcess/API/gtk/tests/WebViewTest.cpp

@@ -49 +49 @@
 void WebViewTest::loadHtml(const char* html, const char* baseURI)
 {
-    m_activeURI = "about:blank";
+    if (!baseURI)
+        m_activeURI = "about:blank";
+    else
+        m_activeURI = baseURI;
     webkit_web_view_load_html(m_webView, html, baseURI);
 }

trunk/Source/WebKit2/UIProcess/API/gtk/tests/WebViewTest.h

@@ -32 +32 @@
     virtual ~WebViewTest();
 
-    void loadURI(const char* uri);
-    void loadHtml(const char* html, const char* baseURI);
-    void loadPlainText(const char* plainText);
-    void loadRequest(WebKitURIRequest*);
+    virtual void loadURI(const char* uri);
+    virtual void loadHtml(const char* html, const char* baseURI);
+    virtual void loadPlainText(const char* plainText);
+    virtual void loadRequest(WebKitURIRequest*);
     void replaceContent(const char* html, const char* contentURI, const char* baseURI);
     void goBack();