X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c9ccc09c64f4c29d4667796bef7b507d9e8d25ed..a05cbc20e3481f38761f6a4abb8d359d92c94b3b:/tests/controls/webtest.cpp
diff --git a/tests/controls/webtest.cpp b/tests/controls/webtest.cpp
index ae4cfe2245..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
@@ -44,6 +44,7 @@ private:
CPPUNIT_TEST( Selection );
CPPUNIT_TEST( Zoom );
CPPUNIT_TEST( RunScript );
+ CPPUNIT_TEST( SetPage );
CPPUNIT_TEST_SUITE_END();
void Title();
@@ -56,13 +57,18 @@ private:
void Selection();
void Zoom();
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 );
@@ -72,12 +78,14 @@ 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);
}
@@ -88,10 +96,10 @@ void WebTestCase::LoadUrl(int times)
for(int i = 0; i < times; i++)
{
if(i % 2 == 1)
- m_browser->LoadUrl("about:blank");
+ m_browser->LoadURL("about:blank");
else
- m_browser->LoadUrl("about:");
- wxYield();
+ m_browser->LoadURL("about:");
+ ENSURE_LOADED;
}
}
@@ -101,7 +109,7 @@ void WebTestCase::Title()
//Test title after loading raw html
m_browser->SetPage("TitleText", "");
- wxYield();
+ ENSURE_LOADED;
CPPUNIT_ASSERT_EQUAL("Title", m_browser->GetCurrentTitle());
//Test title after loading a url, we yield to let events process
@@ -126,12 +134,15 @@ void WebTestCase::History()
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());
@@ -158,7 +169,7 @@ void WebTestCase::HistoryClear()
//Now we are in the 'middle' of the history
m_browser->GoBack();
- wxYield();
+ ENSURE_LOADED;
CPPUNIT_ASSERT(m_browser->CanGoForward());
CPPUNIT_ASSERT(m_browser->CanGoBack());
@@ -173,11 +184,13 @@ void WebTestCase::HistoryList()
{
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());
@@ -199,7 +212,7 @@ void WebTestCase::Editable()
void WebTestCase::Selection()
{
m_browser->SetPage("Some strong text", "");
- wxYield();
+ ENSURE_LOADED;
CPPUNIT_ASSERT(!m_browser->HasSelection());
m_browser->SelectAll();
@@ -207,11 +220,11 @@ 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->ClearSelection();
- CPPUNIT_ASSERT(!m_browser->HasSelection());
+ CPPUNIT_ASSERT(!m_browser->HasSelection());
}
void WebTestCase::Zoom()
@@ -244,4 +257,15 @@ void WebTestCase::RunScript()
CPPUNIT_ASSERT_EQUAL("Hello World!", m_browser->GetPageText());
}
-#endif //wxUSE_WEB
+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)