Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix wxWebViewEdge tests

Browse Source 
Edge does not support the about: URL using it in the test resulted
in various problems. Just use about:blank for now as the edge backend
does not merge them for the history checks.
This commit is contained in:
Tobias Taschner
2021-11-03 10:17:10 +01:00
committed by Tobias Taschner
parent 9cc0c9a082
commit fd2920ff22
1 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
tests/controls/webtest.cpp
View File

@@ -35,6 +35,17 @@ public:
: m_browser(wxWebView::New()), : m_browser(wxWebView::New()),
m_loaded(new EventCounter(m_browser, wxEVT_WEBVIEW_LOADED)) m_loaded(new EventCounter(m_browser, wxEVT_WEBVIEW_LOADED))
{ {
#ifdef __WXMSW__
if (wxWebView::IsBackendAvailable(wxWebViewBackendEdge))
{
// The blank page does not have an empty title with edge
m_blankTitle = "about:blank";
// Edge does not support about: url use a different URL instead
m_alternateHistoryURL = "about:blank";
}
else
#endif
m_alternateHistoryURL = "about:";
} }
~WebViewTestCase() ~WebViewTestCase()
@@ -53,13 +64,15 @@ protected:
if(i % 2 == 1) if(i % 2 == 1)
m_browser->LoadURL("about:blank"); m_browser->LoadURL("about:blank");
else else
m_browser->LoadURL("about:"); m_browser->LoadURL(m_alternateHistoryURL);
ENSURE_LOADED; ENSURE_LOADED;
} }
} }
wxWebView* const m_browser; wxWebView* const m_browser;
EventCounter* const m_loaded; EventCounter* const m_loaded;
wxString m_blankTitle;
wxString m_alternateHistoryURL;
}; };
TEST_CASE_METHOD(WebViewTestCase, "WebView", "[wxWebView]") TEST_CASE_METHOD(WebViewTestCase, "WebView", "[wxWebView]")
@@ -88,7 +101,7 @@ TEST_CASE_METHOD(WebViewTestCase, "WebView", "[wxWebView]")
//Test title after loading a url, we yield to let events process //Test title after loading a url, we yield to let events process
LoadUrl(); LoadUrl();
CHECK(m_browser->GetCurrentTitle() == ""); CHECK(m_browser->GetCurrentTitle() == m_blankTitle);
} }
SECTION("URL") SECTION("URL")
@@ -97,7 +110,7 @@ TEST_CASE_METHOD(WebViewTestCase, "WebView", "[wxWebView]")
//After first loading about:blank the next in the sequence is about: //After first loading about:blank the next in the sequence is about:
LoadUrl(); LoadUrl();
CHECK(m_browser->GetCurrentURL() == "about:"); CHECK(m_browser->GetCurrentURL() == m_alternateHistoryURL);
} }
SECTION("History") SECTION("History")
@@ -336,9 +349,9 @@ TEST_CASE_METHOD(WebViewTestCase, "WebView", "[wxWebView]")
CHECK(m_browser->RunScript("function f(a){return a;}f(false);", &result)); CHECK(m_browser->RunScript("function f(a){return a;}f(false);", &result));
CHECK(result == "false"); CHECK(result == "false");
CHECK(m_browser->RunScript("function f(){var person = new Object();person.name = 'Foo'; \ CHECK(m_browser->RunScript("function f(){var person = new Object();person.lastName = 'Bar'; \
person.lastName = 'Bar';return person;}f();", &result)); person.name = 'Foo';return person;}f();", &result));
CHECK(result == "{\"name\":\"Foo\",\"lastName\":\"Bar\"}"); CHECK(result == "{\"lastName\":\"Bar\",\"name\":\"Foo\"}");
CHECK(m_browser->RunScript("function f(){ return [\"foo\", \"bar\"]; }f();", &result)); CHECK(m_browser->RunScript("function f(){ return [\"foo\", \"bar\"]; }f();", &result));
CHECK(result == "[\"foo\",\"bar\"]"); CHECK(result == "[\"foo\",\"bar\"]");