X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8a31648287be0ef976f133de2786b137f1e98340..a9fd42ccebb2534cfd3910bc7108171f4ee6d54b:/tests/controls/webtest.cpp?ds=sidebyside
diff --git a/tests/controls/webtest.cpp b/tests/controls/webtest.cpp
index d7aecbff6b..533f1da461 100644
--- a/tests/controls/webtest.cpp
+++ b/tests/controls/webtest.cpp
@@ -61,10 +61,14 @@ private:
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 );
@@ -74,12 +78,15 @@ 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_WEBVIEW_LOADED);
+ m_browser->LoadURL("about:");
+ ENSURE_LOADED;
}
void WebTestCase::tearDown()
{
+ wxDELETE(m_loaded);
wxDELETE(m_browser);
}
@@ -93,7 +100,7 @@ void WebTestCase::LoadUrl(int times)
m_browser->LoadURL("about:blank");
else
m_browser->LoadURL("about:");
- wxYield();
+ ENSURE_LOADED;
}
}
@@ -103,7 +110,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
@@ -113,11 +120,6 @@ void WebTestCase::Title()
void WebTestCase::Url()
{
- // FIXME: This test fails on MSW buildbot slaves although works fine on
- // development machine.
- if ( wxGetUserId().Lower().Matches("buildslave*") )
- return;
-
CPPUNIT_ASSERT_EQUAL("about:blank", m_browser->GetCurrentURL());
//After first loading about:blank the next in the sequence is about:
@@ -127,26 +129,21 @@ void WebTestCase::Url()
void WebTestCase::History()
{
- // FIXME: This test fails on MSW buildbot slaves although works fine on
- // development machine.
- if ( wxGetUserId().Lower().Matches("buildslave*") )
- return;
-
LoadUrl(3);
CPPUNIT_ASSERT(m_browser->CanGoBack());
CPPUNIT_ASSERT(!m_browser->CanGoForward());
m_browser->GoBack();
- wxYield();
+ ENSURE_LOADED;
CPPUNIT_ASSERT(m_browser->CanGoBack());
CPPUNIT_ASSERT(m_browser->CanGoForward());
m_browser->GoBack();
- wxYield();
+ ENSURE_LOADED;
m_browser->GoBack();
- wxYield();
+ ENSURE_LOADED;
//We should now be at the start of the history
CPPUNIT_ASSERT(!m_browser->CanGoBack());
@@ -173,7 +170,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());
@@ -186,20 +183,15 @@ void WebTestCase::HistoryClear()
void WebTestCase::HistoryList()
{
- // FIXME: This test fails on MSW buildbot slaves although works fine on
- // development machine.
- if ( wxGetUserId().Lower().Matches("buildslave*") )
- return;
-
LoadUrl(2);
m_browser->GoBack();
- wxYield();
+ 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]);
- wxYield();
+ ENSURE_LOADED;
CPPUNIT_ASSERT(!m_browser->CanGoForward());
CPPUNIT_ASSERT_EQUAL(2, m_browser->GetBackwardHistory().size());
@@ -221,7 +213,7 @@ void WebTestCase::Editable()
void WebTestCase::Selection()
{
m_browser->SetPage("Some strong text", "");
- wxYield();
+ ENSURE_LOADED;
CPPUNIT_ASSERT(!m_browser->HasSelection());
m_browser->SelectAll();
@@ -229,39 +221,34 @@ 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()
{
- // FIXME: This test fails on MSW buildbot slaves although works fine on
- // development machine.
- if ( wxGetUserId().Lower().Matches("buildslave*") )
- return;
-
- if(m_browser->CanSetZoomType(wxWEB_VIEW_ZOOM_TYPE_LAYOUT))
+ if(m_browser->CanSetZoomType(wxWEBVIEW_ZOOM_TYPE_LAYOUT))
{
- m_browser->SetZoomType(wxWEB_VIEW_ZOOM_TYPE_LAYOUT);
- CPPUNIT_ASSERT_EQUAL(wxWEB_VIEW_ZOOM_TYPE_LAYOUT, m_browser->GetZoomType());
+ m_browser->SetZoomType(wxWEBVIEW_ZOOM_TYPE_LAYOUT);
+ CPPUNIT_ASSERT_EQUAL(wxWEBVIEW_ZOOM_TYPE_LAYOUT, m_browser->GetZoomType());
- m_browser->SetZoom(wxWEB_VIEW_ZOOM_TINY);
- CPPUNIT_ASSERT_EQUAL(wxWEB_VIEW_ZOOM_TINY, m_browser->GetZoom());
+ m_browser->SetZoom(wxWEBVIEW_ZOOM_TINY);
+ CPPUNIT_ASSERT_EQUAL(wxWEBVIEW_ZOOM_TINY, m_browser->GetZoom());
}
//Reset the zoom level
- m_browser->SetZoom(wxWEB_VIEW_ZOOM_MEDIUM);
+ m_browser->SetZoom(wxWEBVIEW_ZOOM_MEDIUM);
- if(m_browser->CanSetZoomType(wxWEB_VIEW_ZOOM_TYPE_TEXT))
+ if(m_browser->CanSetZoomType(wxWEBVIEW_ZOOM_TYPE_TEXT))
{
- m_browser->SetZoomType(wxWEB_VIEW_ZOOM_TYPE_TEXT);
- CPPUNIT_ASSERT_EQUAL(wxWEB_VIEW_ZOOM_TYPE_TEXT, m_browser->GetZoomType());
+ m_browser->SetZoomType(wxWEBVIEW_ZOOM_TYPE_TEXT);
+ CPPUNIT_ASSERT_EQUAL(wxWEBVIEW_ZOOM_TYPE_TEXT, m_browser->GetZoomType());
- m_browser->SetZoom(wxWEB_VIEW_ZOOM_TINY);
- CPPUNIT_ASSERT_EQUAL(wxWEB_VIEW_ZOOM_TINY, m_browser->GetZoom());
+ m_browser->SetZoom(wxWEBVIEW_ZOOM_TINY);
+ CPPUNIT_ASSERT_EQUAL(wxWEBVIEW_ZOOM_TINY, m_browser->GetZoom());
}
}
@@ -274,9 +261,11 @@ void WebTestCase::RunScript()
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());
}