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

Replace legacy CppUnit macros with CATCH ones

Browse Source 
Still no real changes, just use Catch macros directly instead of doing
it via CppUnit-compatible shims.
This commit is contained in:
Vadim Zeitlin
2019-09-27 15:58:09 +02:00
parent b176b59ffe
commit 7be12edc7a
1 changed files with 70 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

145
tests/controls/windowtest.cpp
View File

@@ -52,17 +52,17 @@ TEST_CASE_METHOD(WindowTestCase, "Window::ShowHideEvent", "[window]")
#if defined(__WXMSW__) #if defined(__WXMSW__)
EventCounter show(m_window, wxEVT_SHOW); EventCounter show(m_window, wxEVT_SHOW);
CPPUNIT_ASSERT(m_window->IsShown()); CHECK(m_window->IsShown());
m_window->Show(false); m_window->Show(false);
CPPUNIT_ASSERT(!m_window->IsShown()); CHECK(!m_window->IsShown());
m_window->Show(); m_window->Show();
CPPUNIT_ASSERT(m_window->IsShown()); CHECK(m_window->IsShown());
CPPUNIT_ASSERT_EQUAL(2, show.GetCount()); CHECK( show.GetCount() == 2 );
#endif // __WXMSW__ #endif // __WXMSW__
} }
@@ -85,9 +85,9 @@ TEST_CASE_METHOD(WindowTestCase, "Window::KeyEvent", "[window]")
sim.Char(WXK_SHIFT); sim.Char(WXK_SHIFT);
wxYield(); wxYield();
CPPUNIT_ASSERT_EQUAL(5, keydown.GetCount()); CHECK( keydown.GetCount() == 5 );
CPPUNIT_ASSERT_EQUAL(5, keyup.GetCount()); CHECK( keyup.GetCount() == 5 );
CPPUNIT_ASSERT_EQUAL(4, keychar.GetCount()); CHECK( keychar.GetCount() == 4 );
#endif #endif
} }
@@ -106,7 +106,7 @@ TEST_CASE_METHOD(WindowTestCase, "Window::FocusEvent", "[window]")
m_window->SetFocus(); m_window->SetFocus();
CPPUNIT_ASSERT(setfocus.WaitEvent(500)); CHECK(setfocus.WaitEvent(500));
CHECK_FOCUS_IS( m_window ); CHECK_FOCUS_IS( m_window );
wxButton* button = new wxButton(wxTheApp->GetTopWindow(), wxID_ANY); wxButton* button = new wxButton(wxTheApp->GetTopWindow(), wxID_ANY);
@@ -114,8 +114,8 @@ TEST_CASE_METHOD(WindowTestCase, "Window::FocusEvent", "[window]")
wxYield(); wxYield();
button->SetFocus(); button->SetFocus();
CPPUNIT_ASSERT_EQUAL(1, killfocus.GetCount()); CHECK( killfocus.GetCount() == 1 );
CPPUNIT_ASSERT(!m_window->HasFocus()); CHECK(!m_window->HasFocus());
#endif #endif
} }
@@ -124,64 +124,64 @@ TEST_CASE_METHOD(WindowTestCase, "Window::Mouse", "[window]")
wxCursor cursor(wxCURSOR_CHAR); wxCursor cursor(wxCURSOR_CHAR);
m_window->SetCursor(cursor); m_window->SetCursor(cursor);
CPPUNIT_ASSERT(m_window->GetCursor().IsOk()); CHECK(m_window->GetCursor().IsOk());
//A plain window doesn't have a caret //A plain window doesn't have a caret
CPPUNIT_ASSERT(!m_window->GetCaret()); CHECK(!m_window->GetCaret());
wxCaret* caret = new wxCaret(m_window, 16, 16); wxCaret* caret = new wxCaret(m_window, 16, 16);
m_window->SetCaret(caret); m_window->SetCaret(caret);
CPPUNIT_ASSERT(m_window->GetCaret()->IsOk()); CHECK(m_window->GetCaret()->IsOk());
m_window->CaptureMouse(); m_window->CaptureMouse();
CPPUNIT_ASSERT(m_window->HasCapture()); CHECK(m_window->HasCapture());
m_window->ReleaseMouse(); m_window->ReleaseMouse();
CPPUNIT_ASSERT(!m_window->HasCapture()); CHECK(!m_window->HasCapture());
} }
TEST_CASE_METHOD(WindowTestCase, "Window::Properties", "[window]") TEST_CASE_METHOD(WindowTestCase, "Window::Properties", "[window]")
{ {
m_window->SetLabel("label"); m_window->SetLabel("label");
CPPUNIT_ASSERT_EQUAL("label", m_window->GetLabel()); CHECK( m_window->GetLabel() == "label" );
m_window->SetName("name"); m_window->SetName("name");
CPPUNIT_ASSERT_EQUAL("name", m_window->GetName()); CHECK( m_window->GetName() == "name" );
//As we used wxID_ANY we should have a negative id //As we used wxID_ANY we should have a negative id
CPPUNIT_ASSERT(m_window->GetId() < 0); CHECK(m_window->GetId() < 0);
m_window->SetId(wxID_HIGHEST + 10); m_window->SetId(wxID_HIGHEST + 10);
CPPUNIT_ASSERT_EQUAL(wxID_HIGHEST + 10, m_window->GetId()); CHECK( m_window->GetId() == wxID_HIGHEST + 10 );
} }
#if wxUSE_TOOLTIPS #if wxUSE_TOOLTIPS
TEST_CASE_METHOD(WindowTestCase, "Window::ToolTip", "[window]") TEST_CASE_METHOD(WindowTestCase, "Window::ToolTip", "[window]")
{ {
CPPUNIT_ASSERT(!m_window->GetToolTip()); CHECK(!m_window->GetToolTip());
CPPUNIT_ASSERT_EQUAL("", m_window->GetToolTipText()); CHECK( m_window->GetToolTipText() == "" );
m_window->SetToolTip("text tip"); m_window->SetToolTip("text tip");
CPPUNIT_ASSERT_EQUAL("text tip", m_window->GetToolTipText()); CHECK( m_window->GetToolTipText() == "text tip" );
m_window->UnsetToolTip(); m_window->UnsetToolTip();
CPPUNIT_ASSERT(!m_window->GetToolTip()); CHECK(!m_window->GetToolTip());
CPPUNIT_ASSERT_EQUAL("", m_window->GetToolTipText()); CHECK( m_window->GetToolTipText() == "" );
wxToolTip* tip = new wxToolTip("other tip"); wxToolTip* tip = new wxToolTip("other tip");
m_window->SetToolTip(tip); m_window->SetToolTip(tip);
CPPUNIT_ASSERT_EQUAL(tip, m_window->GetToolTip()); CHECK( m_window->GetToolTip() == tip );
CPPUNIT_ASSERT_EQUAL("other tip", m_window->GetToolTipText()); CHECK( m_window->GetToolTipText() == "other tip" );
} }
#endif // wxUSE_TOOLTIPS #endif // wxUSE_TOOLTIPS
@@ -189,65 +189,65 @@ TEST_CASE_METHOD(WindowTestCase, "Window::Help", "[window]")
{ {
wxHelpProvider::Set(new wxSimpleHelpProvider()); wxHelpProvider::Set(new wxSimpleHelpProvider());
CPPUNIT_ASSERT_EQUAL("", m_window->GetHelpText()); CHECK( m_window->GetHelpText() == "" );
m_window->SetHelpText("helptext"); m_window->SetHelpText("helptext");
CPPUNIT_ASSERT_EQUAL("helptext", m_window->GetHelpText()); CHECK( m_window->GetHelpText() == "helptext" );
} }
TEST_CASE_METHOD(WindowTestCase, "Window::Parent", "[window]") TEST_CASE_METHOD(WindowTestCase, "Window::Parent", "[window]")
{ {
CPPUNIT_ASSERT_EQUAL(static_cast<wxWindow*>(NULL), m_window->GetGrandParent()); CHECK( m_window->GetGrandParent() == static_cast<wxWindow*>(NULL) );
CPPUNIT_ASSERT_EQUAL(wxTheApp->GetTopWindow(), m_window->GetParent()); CHECK( m_window->GetParent() == wxTheApp->GetTopWindow() );
} }
TEST_CASE_METHOD(WindowTestCase, "Window::Siblings", "[window]") TEST_CASE_METHOD(WindowTestCase, "Window::Siblings", "[window]")
{ {
CPPUNIT_ASSERT_EQUAL(static_cast<wxWindow*>(NULL), m_window->GetNextSibling()); CHECK( m_window->GetNextSibling() == static_cast<wxWindow*>(NULL) );
CPPUNIT_ASSERT_EQUAL(static_cast<wxWindow*>(NULL), m_window->GetPrevSibling()); CHECK( m_window->GetPrevSibling() == static_cast<wxWindow*>(NULL) );
wxWindow* newwin = new wxWindow(wxTheApp->GetTopWindow(), wxID_ANY); wxWindow* newwin = new wxWindow(wxTheApp->GetTopWindow(), wxID_ANY);
CPPUNIT_ASSERT_EQUAL(newwin, m_window->GetNextSibling()); CHECK( m_window->GetNextSibling() == newwin );
CPPUNIT_ASSERT_EQUAL(static_cast<wxWindow*>(NULL), m_window->GetPrevSibling()); CHECK( m_window->GetPrevSibling() == static_cast<wxWindow*>(NULL) );
CPPUNIT_ASSERT_EQUAL(static_cast<wxWindow*>(NULL), newwin->GetNextSibling()); CHECK( newwin->GetNextSibling() == static_cast<wxWindow*>(NULL) );
CPPUNIT_ASSERT_EQUAL(m_window, newwin->GetPrevSibling()); CHECK( newwin->GetPrevSibling() == m_window );
wxDELETE(newwin); wxDELETE(newwin);
} }
TEST_CASE_METHOD(WindowTestCase, "Window::Children", "[window]") TEST_CASE_METHOD(WindowTestCase, "Window::Children", "[window]")
{ {
CPPUNIT_ASSERT_EQUAL(0, m_window->GetChildren().GetCount()); CHECK( m_window->GetChildren().GetCount() == 0 );
wxWindow* child1 = new wxWindow(m_window, wxID_ANY); wxWindow* child1 = new wxWindow(m_window, wxID_ANY);
CPPUNIT_ASSERT_EQUAL(1, m_window->GetChildren().GetCount()); CHECK( m_window->GetChildren().GetCount() == 1 );
m_window->RemoveChild(child1); m_window->RemoveChild(child1);
CPPUNIT_ASSERT_EQUAL(0, m_window->GetChildren().GetCount()); CHECK( m_window->GetChildren().GetCount() == 0 );
child1->SetId(wxID_HIGHEST + 1); child1->SetId(wxID_HIGHEST + 1);
child1->SetName("child1"); child1->SetName("child1");
m_window->AddChild(child1); m_window->AddChild(child1);
CPPUNIT_ASSERT_EQUAL(1, m_window->GetChildren().GetCount()); CHECK( m_window->GetChildren().GetCount() == 1 );
CPPUNIT_ASSERT_EQUAL(child1, m_window->FindWindow(wxID_HIGHEST + 1)); CHECK( m_window->FindWindow(wxID_HIGHEST + 1) == child1 );
CPPUNIT_ASSERT_EQUAL(child1, m_window->FindWindow("child1")); CHECK( m_window->FindWindow("child1") == child1 );
m_window->DestroyChildren(); m_window->DestroyChildren();
CPPUNIT_ASSERT_EQUAL(0, m_window->GetChildren().GetCount()); CHECK( m_window->GetChildren().GetCount() == 0 );
} }
TEST_CASE_METHOD(WindowTestCase, "Window::Focus", "[window]") TEST_CASE_METHOD(WindowTestCase, "Window::Focus", "[window]")
{ {
#ifndef __WXOSX__ #ifndef __WXOSX__
CPPUNIT_ASSERT(!m_window->HasFocus()); CHECK(!m_window->HasFocus());
if ( m_window->AcceptsFocus() ) if ( m_window->AcceptsFocus() )
{ {
@@ -272,16 +272,14 @@ TEST_CASE_METHOD(WindowTestCase, "Window::Positioning", "[window]")
int x, y; int x, y;
m_window->GetPosition(&x, &y); m_window->GetPosition(&x, &y);
CPPUNIT_ASSERT_EQUAL(x, m_window->GetPosition().x); CHECK( m_window->GetPosition().x == x );
CPPUNIT_ASSERT_EQUAL(y, m_window->GetPosition().y); CHECK( m_window->GetPosition().y == y );
CPPUNIT_ASSERT_EQUAL(m_window->GetPosition(), CHECK( m_window->GetRect().GetTopLeft() == m_window->GetPosition() );
m_window->GetRect().GetTopLeft());
m_window->GetScreenPosition(&x, &y); m_window->GetScreenPosition(&x, &y);
CPPUNIT_ASSERT_EQUAL(x, m_window->GetScreenPosition().x); CHECK( m_window->GetScreenPosition().x == x );
CPPUNIT_ASSERT_EQUAL(y, m_window->GetScreenPosition().y); CHECK( m_window->GetScreenPosition().y == y );
CPPUNIT_ASSERT_EQUAL(m_window->GetScreenPosition(), CHECK( m_window->GetScreenRect().GetTopLeft() == m_window->GetScreenPosition() );
m_window->GetScreenRect().GetTopLeft());
} }
TEST_CASE_METHOD(WindowTestCase, "Window::PositioningBeyondShortLimit", "[window]") TEST_CASE_METHOD(WindowTestCase, "Window::PositioningBeyondShortLimit", "[window]")
@@ -295,19 +293,19 @@ TEST_CASE_METHOD(WindowTestCase, "Window::PositioningBeyondShortLimit", "[window
wxWindow* w = new wxWindow(m_window, wxID_ANY, wxWindow* w = new wxWindow(m_window, wxID_ANY,
wxPoint(0, SHRT_MAX + commonDim), wxPoint(0, SHRT_MAX + commonDim),
wxSize(commonDim, commonDim)); wxSize(commonDim, commonDim));
CPPUNIT_ASSERT_EQUAL(SHRT_MAX + commonDim, w->GetPosition().y); CHECK( w->GetPosition().y == SHRT_MAX + commonDim );
w->Move(0, 0); w->Move(0, 0);
// //
//Test window moving beyond SHRT_MAX //Test window moving beyond SHRT_MAX
w->Move(0, SHRT_MAX + commonDim); w->Move(0, SHRT_MAX + commonDim);
CPPUNIT_ASSERT_EQUAL(SHRT_MAX + commonDim, w->GetPosition().y); CHECK( w->GetPosition().y == SHRT_MAX + commonDim );
// //
//Test window moving below SHRT_MIN //Test window moving below SHRT_MIN
w->Move(0, SHRT_MIN - commonDim); w->Move(0, SHRT_MIN - commonDim);
CPPUNIT_ASSERT_EQUAL(SHRT_MIN - commonDim, w->GetPosition().y); CHECK( w->GetPosition().y == SHRT_MIN - commonDim );
// //
//Test deferred move beyond SHRT_MAX //Test deferred move beyond SHRT_MAX
@@ -321,50 +319,50 @@ TEST_CASE_METHOD(WindowTestCase, "Window::PositioningBeyondShortLimit", "[window
sizer->Add(w); sizer->Add(w);
m_window->SetSizer(sizer); m_window->SetSizer(sizer);
m_window->Layout(); m_window->Layout();
CPPUNIT_ASSERT_EQUAL(SHRT_MAX + commonDim, w->GetPosition().y); CHECK( w->GetPosition().y == SHRT_MAX + commonDim );
#endif #endif
} }
TEST_CASE_METHOD(WindowTestCase, "Window::Show", "[window]") TEST_CASE_METHOD(WindowTestCase, "Window::Show", "[window]")
{ {
CPPUNIT_ASSERT(m_window->IsShown()); CHECK(m_window->IsShown());
m_window->Hide(); m_window->Hide();
CPPUNIT_ASSERT(!m_window->IsShown()); CHECK(!m_window->IsShown());
m_window->Show(); m_window->Show();
CPPUNIT_ASSERT(m_window->IsShown()); CHECK(m_window->IsShown());
m_window->Show(false); m_window->Show(false);
CPPUNIT_ASSERT(!m_window->IsShown()); CHECK(!m_window->IsShown());
m_window->ShowWithEffect(wxSHOW_EFFECT_BLEND); m_window->ShowWithEffect(wxSHOW_EFFECT_BLEND);
CPPUNIT_ASSERT(m_window->IsShown()); CHECK(m_window->IsShown());
m_window->HideWithEffect(wxSHOW_EFFECT_BLEND); m_window->HideWithEffect(wxSHOW_EFFECT_BLEND);
CPPUNIT_ASSERT(!m_window->IsShown()); CHECK(!m_window->IsShown());
} }
TEST_CASE_METHOD(WindowTestCase, "Window::Enable", "[window]") TEST_CASE_METHOD(WindowTestCase, "Window::Enable", "[window]")
{ {
CPPUNIT_ASSERT(m_window->IsEnabled()); CHECK(m_window->IsEnabled());
m_window->Disable(); m_window->Disable();
CPPUNIT_ASSERT(!m_window->IsEnabled()); CHECK(!m_window->IsEnabled());
m_window->Enable(); m_window->Enable();
CPPUNIT_ASSERT(m_window->IsEnabled()); CHECK(m_window->IsEnabled());
m_window->Enable(false); m_window->Enable(false);
CPPUNIT_ASSERT(!m_window->IsEnabled()); CHECK(!m_window->IsEnabled());
} }
TEST_CASE_METHOD(WindowTestCase, "Window::FindWindowBy", "[window]") TEST_CASE_METHOD(WindowTestCase, "Window::FindWindowBy", "[window]")
@@ -373,14 +371,11 @@ TEST_CASE_METHOD(WindowTestCase, "Window::FindWindowBy", "[window]")
m_window->SetName("name"); m_window->SetName("name");
m_window->SetLabel("label"); m_window->SetLabel("label");
CPPUNIT_ASSERT_EQUAL(m_window, wxWindow::FindWindowById(wxID_HIGHEST + 1)); CHECK( wxWindow::FindWindowById(wxID_HIGHEST + 1) == m_window );
CPPUNIT_ASSERT_EQUAL(m_window, wxWindow::FindWindowByName("name")); CHECK( wxWindow::FindWindowByName("name") == m_window );
CPPUNIT_ASSERT_EQUAL(m_window, wxWindow::FindWindowByLabel("label")); CHECK( wxWindow::FindWindowByLabel("label") == m_window );
CPPUNIT_ASSERT_EQUAL(static_cast<wxWindow*>(NULL), CHECK( wxWindow::FindWindowById(wxID_HIGHEST + 3) == NULL );
wxWindow::FindWindowById(wxID_HIGHEST + 3)); CHECK( wxWindow::FindWindowByName("noname") == NULL );
CPPUNIT_ASSERT_EQUAL(static_cast<wxWindow*>(NULL), CHECK( wxWindow::FindWindowByLabel("nolabel") == NULL );
wxWindow::FindWindowByName("noname"));
CPPUNIT_ASSERT_EQUAL(static_cast<wxWindow*>(NULL),
wxWindow::FindWindowByLabel("nolabel"));
} }