Add new WX_ASSERT_EVENT_OCCURS macro to improve behaviour of testing asynchronous events. Use it in the wxWebView tests and re-enable previously failing tests.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70882 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Steve Lamerton
parent
7f6cf37004
commit
1e0b0d7c55
@ -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,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);
|
||||
}
|
||||
|
||||
@ -93,7 +99,7 @@ void WebTestCase::LoadUrl(int times)
|
||||
m_browser->LoadURL("about:blank");
|
||||
else
|
||||
m_browser->LoadURL("about:");
|
||||
wxYield();
|
||||
ENSURE_LOADED;
|
||||
}
|
||||
}
|
||||
|
||||
@ -103,7 +109,7 @@ void WebTestCase::Title()
|
||||
|
||||
//Test title after loading raw html
|
||||
m_browser->SetPage("<html><title>Title</title><body>Text</body></html>", "");
|
||||
wxYield();
|
||||
ENSURE_LOADED;
|
||||
CPPUNIT_ASSERT_EQUAL("Title", m_browser->GetCurrentTitle());
|
||||
|
||||
//Test title after loading a url, we yield to let events process
|
||||
@ -113,11 +119,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 +128,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());
|
||||
@ -169,16 +165,11 @@ void WebTestCase::HistoryEnable()
|
||||
|
||||
void WebTestCase::HistoryClear()
|
||||
{
|
||||
// FIXME: This test fails on MSW buildbot slaves although works fine on
|
||||
// development machine.
|
||||
if ( wxGetUserId().Lower().Matches("buildslave*") )
|
||||
return;
|
||||
|
||||
LoadUrl(2);
|
||||
|
||||
//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());
|
||||
@ -191,20 +182,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());
|
||||
@ -226,7 +212,7 @@ void WebTestCase::Editable()
|
||||
void WebTestCase::Selection()
|
||||
{
|
||||
m_browser->SetPage("<html><body>Some <strong>strong</strong> text</body></html>", "");
|
||||
wxYield();
|
||||
ENSURE_LOADED;
|
||||
CPPUNIT_ASSERT(!m_browser->HasSelection());
|
||||
|
||||
m_browser->SelectAll();
|
||||
@ -243,11 +229,6 @@ void WebTestCase::Selection()
|
||||
|
||||
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))
|
||||
{
|
||||
m_browser->SetZoomType(wxWEB_VIEW_ZOOM_TYPE_LAYOUT);
|
||||
@ -279,9 +260,11 @@ void WebTestCase::RunScript()
|
||||
void WebTestCase::SetPage()
|
||||
{
|
||||
m_browser->SetPage("<html><body>text</body></html>", "");
|
||||
ENSURE_LOADED;
|
||||
CPPUNIT_ASSERT_EQUAL("text", m_browser->GetPageText());
|
||||
|
||||
m_browser->SetPage("<html><body>other text</body></html>", "");
|
||||
ENSURE_LOADED;
|
||||
CPPUNIT_ASSERT_EQUAL("other text", m_browser->GetPageText());
|
||||
}
|
||||
|
||||
|
||||
@ -2,6 +2,8 @@
|
||||
#define WX_TESTPREC_INCLUDED 1
|
||||
|
||||
#include "wx/wxprec.h"
|
||||
#include "wx/stopwatch.h"
|
||||
#include "wx/evtloop.h"
|
||||
#include "wx/cppunit.h"
|
||||
|
||||
// Custom test macro that is only defined when wxUIActionSimulator is available
|
||||
@ -93,6 +95,25 @@ public:
|
||||
#define WX_ASSERT_FAILS_WITH_ASSERT(cond)
|
||||
#endif
|
||||
|
||||
#define WX_ASSERT_EVENT_OCCURS(eventcounter, count) \
|
||||
{\
|
||||
wxStopWatch sw; \
|
||||
wxEventLoopBase* loop = wxEventLoopBase::GetActive(); \
|
||||
while(eventcounter.GetCount() < count) \
|
||||
{ \
|
||||
if(sw.Time() < 100) \
|
||||
loop->Dispatch(); \
|
||||
else \
|
||||
{ \
|
||||
CPPUNIT_FAIL(wxString::Format("timeout reached with %d " \
|
||||
"events received, %d expected", \
|
||||
eventcounter.GetCount(), count).ToStdString()); \
|
||||
break; \
|
||||
} \
|
||||
} \
|
||||
eventcounter.Clear(); \
|
||||
}
|
||||
|
||||
// these functions can be used to hook into wxApp event processing and are
|
||||
// currently used by the events propagation test
|
||||
class WXDLLIMPEXP_FWD_BASE wxEvent;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user