Title: [193815] trunk/Tools
- Revision
- 193815
- Author
- ma...@webkit.org
- Date
- 2015-12-09 03:09:31 -0800 (Wed, 09 Dec 2015)
Log Message
Refactored initialization code in LoadTrackingTest.
Rubber-stamped by Carlos Garcia Campos.
Small refactoring to make sure that the state of a LoadTrackingTest
gets properly reset before loading new web content.
* TestWebKitAPI/gtk/WebKit2Gtk/LoadTrackingTest.h:
* TestWebKitAPI/gtk/WebKit2Gtk/LoadTrackingTest.cpp:
(LoadTrackingTest::reset): New, refactored code from *load*() and go*()
functions and reset the remaining local variables.
(LoadTrackingTest::loadURI): Call reset();
(LoadTrackingTest::loadHtml): Ditto.
(LoadTrackingTest::loadPlainText): Ditto.
(LoadTrackingTest::loadBytes): Ditto.
(LoadTrackingTest::loadRequest): Ditto.
(LoadTrackingTest::reload): Ditto.
(LoadTrackingTest::goBack): Ditto.
(LoadTrackingTest::goForward): Ditto.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (193814 => 193815)
--- trunk/Tools/ChangeLog 2015-12-09 10:35:35 UTC (rev 193814)
+++ trunk/Tools/ChangeLog 2015-12-09 11:09:31 UTC (rev 193815)
@@ -1,3 +1,25 @@
+2015-12-09 Mario Sanchez Prada <ma...@endlessm.com>
+
+ Refactored initialization code in LoadTrackingTest.
+
+ Rubber-stamped by Carlos Garcia Campos.
+
+ Small refactoring to make sure that the state of a LoadTrackingTest
+ gets properly reset before loading new web content.
+
+ * TestWebKitAPI/gtk/WebKit2Gtk/LoadTrackingTest.h:
+ * TestWebKitAPI/gtk/WebKit2Gtk/LoadTrackingTest.cpp:
+ (LoadTrackingTest::reset): New, refactored code from *load*() and go*()
+ functions and reset the remaining local variables.
+ (LoadTrackingTest::loadURI): Call reset();
+ (LoadTrackingTest::loadHtml): Ditto.
+ (LoadTrackingTest::loadPlainText): Ditto.
+ (LoadTrackingTest::loadBytes): Ditto.
+ (LoadTrackingTest::loadRequest): Ditto.
+ (LoadTrackingTest::reload): Ditto.
+ (LoadTrackingTest::goBack): Ditto.
+ (LoadTrackingTest::goForward): Ditto.
+
2015-12-09 Gyuyoung Kim <gyuyoung....@webkit.org>
[EFL] REGRESSION(r193616): WKPreferences test has been failed since r193616
Modified: trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/LoadTrackingTest.cpp (193814 => 193815)
--- trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/LoadTrackingTest.cpp 2015-12-09 10:35:35 UTC (rev 193814)
+++ trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/LoadTrackingTest.cpp 2015-12-09 11:09:31 UTC (rev 193815)
@@ -180,64 +180,57 @@
void LoadTrackingTest::loadURI(const char* uri)
{
- m_loadEvents.clear();
- m_estimatedProgress = 0;
- m_error.reset();
+ reset();
WebViewTest::loadURI(uri);
}
void LoadTrackingTest::loadHtml(const char* html, const char* baseURI)
{
- m_loadEvents.clear();
- m_estimatedProgress = 0;
- m_error.reset();
+ reset();
WebViewTest::loadHtml(html, baseURI);
}
void LoadTrackingTest::loadPlainText(const char* plainText)
{
- m_loadEvents.clear();
- m_estimatedProgress = 0;
- m_error.reset();
+ reset();
WebViewTest::loadPlainText(plainText);
}
void LoadTrackingTest::loadBytes(GBytes* bytes, const char* mimeType, const char* encoding, const char* baseURI)
{
- m_loadEvents.clear();
- m_estimatedProgress = 0;
- m_error.reset();
+ reset();
WebViewTest::loadBytes(bytes, mimeType, encoding, baseURI);
}
void LoadTrackingTest::loadRequest(WebKitURIRequest* request)
{
- m_loadEvents.clear();
- m_estimatedProgress = 0;
- m_error.reset();
+ reset();
WebViewTest::loadRequest(request);
}
void LoadTrackingTest::reload()
{
- m_loadEvents.clear();
- m_estimatedProgress = 0;
- m_error.reset();
+ reset();
webkit_web_view_reload(m_webView);
}
void LoadTrackingTest::goBack()
{
- m_loadEvents.clear();
- m_estimatedProgress = 0;
- m_error.reset();
+ reset();
WebViewTest::goBack();
}
void LoadTrackingTest::goForward()
{
+ reset();
+ WebViewTest::goForward();
+}
+
+void LoadTrackingTest::reset()
+{
+ m_runLoadUntilCompletion = false;
+ m_loadFailed = false;
m_loadEvents.clear();
m_estimatedProgress = 0;
m_error.reset();
- WebViewTest::goForward();
}
Modified: trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/LoadTrackingTest.h (193814 => 193815)
--- trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/LoadTrackingTest.h 2015-12-09 10:35:35 UTC (rev 193814)
+++ trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/LoadTrackingTest.h 2015-12-09 11:09:31 UTC (rev 193815)
@@ -48,6 +48,7 @@
void reload();
void goBack();
void goForward();
+ void reset();
void setRedirectURI(const char* uri) { m_redirectURI = uri; }
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
