X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/18cf6bb5b4eabd8a1eb1179a6712504b292d9dfa..9e1da4827a0ec18f9766d664b9af12c25e3f71fb:/tests/controls/webtest.cpp
diff --git a/tests/controls/webtest.cpp b/tests/controls/webtest.cpp
index b2c692a39b..fab56fab35 100644
--- a/tests/controls/webtest.cpp
+++ b/tests/controls/webtest.cpp
@@ -9,7 +9,7 @@
#include "testprec.h"
-#if wxUSE_WEB
+#if wxUSE_WEBVIEW && (wxUSE_WEBVIEW_WEBKIT || wxUSE_WEBVIEW_IE)
#ifdef __BORLANDC__
#pragma hdrstop
@@ -43,6 +43,8 @@ private:
CPPUNIT_TEST( Editable );
CPPUNIT_TEST( Selection );
CPPUNIT_TEST( Zoom );
+ CPPUNIT_TEST( RunScript );
+ CPPUNIT_TEST( SetPage );
CPPUNIT_TEST_SUITE_END();
void Title();
@@ -54,13 +56,19 @@ private:
void Editable();
void Selection();
void Zoom();
- void LoadUrl(const wxString& url, int times = 1);
+ void RunScript();
+ void SetPage();
+ void LoadUrl(int times = 1);
wxWebView* m_browser;
+ EventCounter* m_loaded;
DECLARE_NO_COPY_CLASS(WebTestCase)
};
+//Convenience macro
+#define ENSURE_LOADED WX_ASSERT_EVENT_OCCURS((*m_loaded), 1)
+
// register in the unnamed registry so that these tests are run by default
CPPUNIT_TEST_SUITE_REGISTRATION( WebTestCase );
@@ -70,21 +78,28 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( WebTestCase, "WebTestCase" );
void WebTestCase::setUp()
{
m_browser = wxWebView::New(wxTheApp->GetTopWindow(), wxID_ANY);
- //We yield to let the initial page load
- wxYield();
+
+ m_loaded = new EventCounter(m_browser, wxEVT_COMMAND_WEB_VIEW_LOADED);
+ ENSURE_LOADED;
}
void WebTestCase::tearDown()
{
+ wxDELETE(m_loaded);
wxDELETE(m_browser);
}
-void WebTestCase::LoadUrl(const wxString& url, int times)
+void WebTestCase::LoadUrl(int times)
{
+ //We alternate between urls as otherwise webkit merges them in the history
+ //we use about and about blank to avoid the need for a network connection
for(int i = 0; i < times; i++)
{
- m_browser->LoadUrl(url);
- wxYield();
+ if(i % 2 == 1)
+ m_browser->LoadURL("about:blank");
+ else
+ m_browser->LoadURL("about:");
+ ENSURE_LOADED;
}
}
@@ -93,11 +108,12 @@ void WebTestCase::Title()
CPPUNIT_ASSERT_EQUAL("", m_browser->GetCurrentTitle());
//Test title after loading raw html
- m_browser->SetPage("Title", "");
+ m_browser->SetPage("TitleText", "");
+ ENSURE_LOADED;
CPPUNIT_ASSERT_EQUAL("Title", m_browser->GetCurrentTitle());
//Test title after loading a url, we yield to let events process
- LoadUrl("about:blank");
+ LoadUrl();
CPPUNIT_ASSERT_EQUAL("", m_browser->GetCurrentTitle());
}
@@ -105,25 +121,28 @@ void WebTestCase::Url()
{
CPPUNIT_ASSERT_EQUAL("about:blank", m_browser->GetCurrentURL());
- LoadUrl("about:blank");
- CPPUNIT_ASSERT_EQUAL("about:blank", m_browser->GetCurrentURL());
+ //After first loading about:blank the next in the sequence is about:
+ LoadUrl();
+ CPPUNIT_ASSERT_EQUAL("about:", m_browser->GetCurrentURL());
}
void WebTestCase::History()
{
- //We use about:blank to remove the need for a network connection
- LoadUrl("about:blank", 3);
+ LoadUrl(3);
CPPUNIT_ASSERT(m_browser->CanGoBack());
CPPUNIT_ASSERT(!m_browser->CanGoForward());
m_browser->GoBack();
+ ENSURE_LOADED;
CPPUNIT_ASSERT(m_browser->CanGoBack());
CPPUNIT_ASSERT(m_browser->CanGoForward());
m_browser->GoBack();
+ ENSURE_LOADED;
m_browser->GoBack();
+ ENSURE_LOADED;
//We should now be at the start of the history
CPPUNIT_ASSERT(!m_browser->CanGoBack());
@@ -132,13 +151,13 @@ void WebTestCase::History()
void WebTestCase::HistoryEnable()
{
- LoadUrl("about:blank");
+ LoadUrl();
m_browser->EnableHistory(false);
CPPUNIT_ASSERT(!m_browser->CanGoForward());
CPPUNIT_ASSERT(!m_browser->CanGoBack());
- LoadUrl("about:blank");
+ LoadUrl();
CPPUNIT_ASSERT(!m_browser->CanGoForward());
CPPUNIT_ASSERT(!m_browser->CanGoBack());
@@ -146,10 +165,11 @@ void WebTestCase::HistoryEnable()
void WebTestCase::HistoryClear()
{
- LoadUrl("about:blank", 2);
+ LoadUrl(2);
//Now we are in the 'middle' of the history
m_browser->GoBack();
+ ENSURE_LOADED;
CPPUNIT_ASSERT(m_browser->CanGoForward());
CPPUNIT_ASSERT(m_browser->CanGoBack());
@@ -162,13 +182,15 @@ void WebTestCase::HistoryClear()
void WebTestCase::HistoryList()
{
- LoadUrl("about:blank", 2);
+ LoadUrl(2);
m_browser->GoBack();
+ ENSURE_LOADED;
CPPUNIT_ASSERT_EQUAL(1, m_browser->GetBackwardHistory().size());
CPPUNIT_ASSERT_EQUAL(1, m_browser->GetForwardHistory().size());
m_browser->LoadHistoryItem(m_browser->GetForwardHistory()[0]);
+ ENSURE_LOADED;
CPPUNIT_ASSERT(!m_browser->CanGoForward());
CPPUNIT_ASSERT_EQUAL(2, m_browser->GetBackwardHistory().size());
@@ -190,6 +212,7 @@ void WebTestCase::Editable()
void WebTestCase::Selection()
{
m_browser->SetPage("Some strong text", "");
+ ENSURE_LOADED;
CPPUNIT_ASSERT(!m_browser->HasSelection());
m_browser->SelectAll();
@@ -197,18 +220,15 @@ void WebTestCase::Selection()
CPPUNIT_ASSERT(m_browser->HasSelection());
CPPUNIT_ASSERT_EQUAL("Some strong text", m_browser->GetSelectedText());
//We lower case the result as ie returns tags in uppercase
- CPPUNIT_ASSERT_EQUAL("some strong text",
+ CPPUNIT_ASSERT_EQUAL("some strong text",
m_browser->GetSelectedSource().Lower());
- m_browser->DeleteSelection();
-
+ m_browser->ClearSelection();
CPPUNIT_ASSERT(!m_browser->HasSelection());
}
void WebTestCase::Zoom()
{
- CPPUNIT_ASSERT_EQUAL(wxWEB_VIEW_ZOOM_MEDIUM, m_browser->GetZoom());
-
if(m_browser->CanSetZoomType(wxWEB_VIEW_ZOOM_TYPE_LAYOUT))
{
m_browser->SetZoomType(wxWEB_VIEW_ZOOM_TYPE_LAYOUT);
@@ -231,4 +251,21 @@ void WebTestCase::Zoom()
}
}
-#endif //wxUSE_WEB
+void WebTestCase::RunScript()
+{
+ m_browser->RunScript("document.write(\"Hello World!\");");
+ CPPUNIT_ASSERT_EQUAL("Hello World!", m_browser->GetPageText());
+}
+
+void WebTestCase::SetPage()
+{
+ m_browser->SetPage("text", "");
+ ENSURE_LOADED;
+ CPPUNIT_ASSERT_EQUAL("text", m_browser->GetPageText());
+
+ m_browser->SetPage("other text", "");
+ ENSURE_LOADED;
+ CPPUNIT_ASSERT_EQUAL("other text", m_browser->GetPageText());
+}
+
+#endif //wxUSE_WEBVIEW && (wxUSE_WEBVIEW_WEBKIT || wxUSE_WEBVIEW_IE)