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

Disable wxTopLevelWindow::IsActive() unit test for wxGTK

Browse Source 
It just doesn't work in the test, so live without it for now.

Also use CHECK() instead of CPPUNIT_ASSERT(), which expands into
REQUIRE(), for independent tests to let later tests to still be done
even if an earlier one fails.
This commit is contained in:
Vadim Zeitlin
2017-11-07 16:16:08 +01:00
parent 548d7a0518
commit c13e28ebfb
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
tests/toplevel/toplevel.cpp
View File

@@ -73,7 +73,7 @@ void TopLevelWindowTestCase::FrameShowTest()
void TopLevelWindowTestCase::TopLevelWindowShowTest(wxTopLevelWindow* tlw) void TopLevelWindowTestCase::TopLevelWindowShowTest(wxTopLevelWindow* tlw)
{ {
CPPUNIT_ASSERT(!tlw->IsShown()); CHECK(!tlw->IsShown());
wxTextCtrl* textCtrl = new wxTextCtrl(tlw, -1, "test"); wxTextCtrl* textCtrl = new wxTextCtrl(tlw, -1, "test");
textCtrl->SetFocus(); textCtrl->SetFocus();
@@ -81,19 +81,26 @@ void TopLevelWindowTestCase::TopLevelWindowShowTest(wxTopLevelWindow* tlw)
// only run this test on platforms where ShowWithoutActivating is implemented. // only run this test on platforms where ShowWithoutActivating is implemented.
#if defined(__WXMSW__) || defined(__WXMAC__) #if defined(__WXMSW__) || defined(__WXMAC__)
tlw->ShowWithoutActivating(); tlw->ShowWithoutActivating();
CPPUNIT_ASSERT(tlw->IsShown()); CHECK(tlw->IsShown());
CPPUNIT_ASSERT(!tlw->IsActive()); CHECK(!tlw->IsActive());
tlw->Hide(); tlw->Hide();
CPPUNIT_ASSERT(!tlw->IsShown()); CHECK(!tlw->IsShown());
CPPUNIT_ASSERT(!tlw->IsActive()); CHECK(!tlw->IsActive());
#endif #endif
tlw->Show(true); tlw->Show(true);
CPPUNIT_ASSERT(tlw->IsActive());
CPPUNIT_ASSERT(tlw->IsShown()); // wxGTK needs many event loop iterations before the TLW becomes active and
// this doesn't happen in this test, so avoid checking for it.
#ifndef __WXGTK__
CHECK(tlw->IsActive());
#endif
CHECK(tlw->IsShown());
tlw->Hide(); tlw->Hide();
CPPUNIT_ASSERT(!tlw->IsShown()); CHECK(!tlw->IsShown());
CPPUNIT_ASSERT(tlw->IsActive()); #ifndef __WXGTK__
CHECK(tlw->IsActive());
#endif
} }