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

Replace CPPUNIT_ASSERT_EQUAL() with CHECK() in wxBoxSizer test

Browse Source 
No real changes, just get rid of the last traces of CppUnit in this
test.
This commit is contained in:
Vadim Zeitlin
2019-03-23 17:13:06 +01:00
parent 8fdb5a7982
commit 20db193332
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
tests/sizers/boxsizer.cpp
View File

@@ -62,29 +62,29 @@ TEST_CASE_METHOD(BoxSizerTestCase, "BoxSizer::Size1", "[sizer]")
child = new wxWindow(m_win, wxID_ANY, wxDefaultPosition, sizeChild); child = new wxWindow(m_win, wxID_ANY, wxDefaultPosition, sizeChild);
m_sizer->Add(child); m_sizer->Add(child);
m_win->Layout(); m_win->Layout();
CPPUNIT_ASSERT_EQUAL( sizeChild, child->GetSize() ); CHECK(child->GetSize() == sizeChild);
m_sizer->Clear(); m_sizer->Clear();
m_sizer->Add(child, wxSizerFlags(1)); m_sizer->Add(child, wxSizerFlags(1));
m_win->Layout(); m_win->Layout();
CPPUNIT_ASSERT_EQUAL( wxSize(sizeTotal.x, sizeChild.y), child->GetSize() ); CHECK( child->GetSize() == wxSize(sizeTotal.x, sizeChild.y) );
m_sizer->Clear(); m_sizer->Clear();
m_sizer->Add(child, wxSizerFlags(1).Expand()); m_sizer->Add(child, wxSizerFlags(1).Expand());
m_win->Layout(); m_win->Layout();
CPPUNIT_ASSERT_EQUAL( sizeTotal, child->GetSize() ); CHECK(child->GetSize() == sizeTotal);
m_sizer->Clear(); m_sizer->Clear();
m_sizer->Add(child, wxSizerFlags()); m_sizer->Add(child, wxSizerFlags());
m_sizer->SetItemMinSize(child, sizeTotal*2); m_sizer->SetItemMinSize(child, sizeTotal*2);
m_win->Layout(); m_win->Layout();
CPPUNIT_ASSERT_EQUAL( sizeTotal, child->GetSize() ); CHECK(child->GetSize() == sizeTotal);
m_sizer->Clear(); m_sizer->Clear();
m_sizer->Add(child, wxSizerFlags().Expand()); m_sizer->Add(child, wxSizerFlags().Expand());
m_sizer->SetItemMinSize(child, sizeTotal*2); m_sizer->SetItemMinSize(child, sizeTotal*2);
m_win->Layout(); m_win->Layout();
CPPUNIT_ASSERT_EQUAL( sizeTotal, child->GetSize() ); CHECK(child->GetSize() == sizeTotal);
} }
TEST_CASE_METHOD(BoxSizerTestCase, "BoxSizer::Size3", "[sizer]") TEST_CASE_METHOD(BoxSizerTestCase, "BoxSizer::Size3", "[sizer]")
@@ -281,10 +281,10 @@ TEST_CASE_METHOD(BoxSizerTestCase, "BoxSizer::SetMinSize", "[sizer]")
// Setting minimal size explicitly must make GetMinSize() return at least // Setting minimal size explicitly must make GetMinSize() return at least
// this size even if it needs a much smaller one. // this size even if it needs a much smaller one.
m_sizer->SetMinSize(100, 0); m_sizer->SetMinSize(100, 0);
CPPUNIT_ASSERT_EQUAL( 100, m_sizer->GetMinSize().x ); CHECK(m_sizer->GetMinSize().x == 100);
m_sizer->Layout(); m_sizer->Layout();
CPPUNIT_ASSERT_EQUAL( 100, m_sizer->GetMinSize().x ); CHECK(m_sizer->GetMinSize().x == 100);
} }
TEST_CASE_METHOD(BoxSizerTestCase, "BoxSizer::BestSizeRespectsMaxSize", "[sizer]") TEST_CASE_METHOD(BoxSizerTestCase, "BoxSizer::BestSizeRespectsMaxSize", "[sizer]")
@@ -302,7 +302,7 @@ TEST_CASE_METHOD(BoxSizerTestCase, "BoxSizer::BestSizeRespectsMaxSize", "[sizer]
m_sizer->Add(sizer); m_sizer->Add(sizer);
m_win->Layout(); m_win->Layout();
CPPUNIT_ASSERT_EQUAL(maxWidth, listbox->GetSize().GetWidth()); CHECK(listbox->GetSize().GetWidth() == maxWidth);
} }
TEST_CASE_METHOD(BoxSizerTestCase, "BoxSizer::RecalcSizesRespectsMaxSize1", "[sizer]") TEST_CASE_METHOD(BoxSizerTestCase, "BoxSizer::RecalcSizesRespectsMaxSize1", "[sizer]")
@@ -330,7 +330,7 @@ TEST_CASE_METHOD(BoxSizerTestCase, "BoxSizer::RecalcSizesRespectsMaxSize1", "[si
m_win->Layout(); m_win->Layout();
CPPUNIT_ASSERT_EQUAL(maxWidth, listbox2->GetSize().GetWidth()); CHECK(listbox2->GetSize().GetWidth() == maxWidth);
} }
TEST_CASE_METHOD(BoxSizerTestCase, "BoxSizer::RecalcSizesRespectsMaxSize2", "[sizer]") TEST_CASE_METHOD(BoxSizerTestCase, "BoxSizer::RecalcSizesRespectsMaxSize2", "[sizer]")
@@ -354,9 +354,9 @@ TEST_CASE_METHOD(BoxSizerTestCase, "BoxSizer::RecalcSizesRespectsMaxSize2", "[si
m_win->Layout(); m_win->Layout();
CPPUNIT_ASSERT_EQUAL(125, child1->GetSize().GetHeight()); CHECK(child1->GetSize().GetHeight() == 125);
CPPUNIT_ASSERT_EQUAL(50, child2->GetSize().GetHeight()); CHECK(child2->GetSize().GetHeight() == 50);
CPPUNIT_ASSERT_EQUAL(125, child3->GetSize().GetHeight()); CHECK(child3->GetSize().GetHeight() == 125);
} }
TEST_CASE_METHOD(BoxSizerTestCase, "BoxSizer::IncompatibleFlags", "[sizer]") TEST_CASE_METHOD(BoxSizerTestCase, "BoxSizer::IncompatibleFlags", "[sizer]")