From e2a9fb1fba639405e5259cf454b9f15d76364e32 Mon Sep 17 00:00:00 2001
From: Ilya Sinitsyn <the_siv@mail.ru>
Date: Thu, 14 Mar 2019 21:33:52 +0700
Subject: [PATCH] Use CATCH in WrapSizer unit tests

Use CATCH instead of CppUnit for unit tests of wxWrapSizer.
---
 tests/sizers/wrapsizer.cpp | 91 +++++++++-----------------------------
 1 file changed, 20 insertions(+), 71 deletions(-)

diff --git a/tests/sizers/wrapsizer.cpp b/tests/sizers/wrapsizer.cpp
index d574b24962..e167c5db45 100644
--- a/tests/sizers/wrapsizer.cpp
+++ b/tests/sizers/wrapsizer.cpp
@@ -24,104 +24,53 @@
 
 #include "asserthelper.h"
 
-// ----------------------------------------------------------------------------
-// test class
-// ----------------------------------------------------------------------------
-
-class WrapSizerTestCase : public CppUnit::TestCase
+TEST_CASE("wxWrapSizer::CalcMin", "[wxWrapSizer]")
 {
-public:
-    WrapSizerTestCase() { }
+    wxScopedPtr<wxWindow> win(new wxWindow(wxTheApp->GetTopWindow(), wxID_ANY));
+    win->SetClientSize(180, 240);
 
-    virtual void setUp() wxOVERRIDE;
-    virtual void tearDown() wxOVERRIDE;
+    wxSizer *sizer = new wxWrapSizer(wxHORIZONTAL);
+    win->SetSizer(sizer);
 
-private:
-    CPPUNIT_TEST_SUITE( WrapSizerTestCase );
-        CPPUNIT_TEST( CalcMin );
-    CPPUNIT_TEST_SUITE_END();
-
-    void CalcMin();
-
-    wxWindow *m_win;
-    wxSizer *m_sizer;
-
-    wxDECLARE_NO_COPY_CLASS(WrapSizerTestCase);
-};
-
-// register in the unnamed registry so that these tests are run by default
-CPPUNIT_TEST_SUITE_REGISTRATION( WrapSizerTestCase );
-
-// also include in its own registry so that these tests can be run alone
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( WrapSizerTestCase, "WrapSizerTestCase" );
-
-// ----------------------------------------------------------------------------
-// test initialization
-// ----------------------------------------------------------------------------
-
-void WrapSizerTestCase::setUp()
-{
-    m_win = new wxWindow(wxTheApp->GetTopWindow(), wxID_ANY);
-    m_win->SetClientSize(180, 240);
-
-    m_sizer = new wxWrapSizer(wxHORIZONTAL);
-    m_win->SetSizer(m_sizer);
-}
-
-void WrapSizerTestCase::tearDown()
-{
-    delete m_win;
-    m_win = NULL;
-
-    m_sizer = NULL;
-}
-
-// ----------------------------------------------------------------------------
-// tests themselves
-// ----------------------------------------------------------------------------
-
-void WrapSizerTestCase::CalcMin()
-{
-    const wxSize sizeTotal = m_win->GetClientSize();
     wxSize sizeMinExpected;
 
     // With a single child the min size must be the same as child size.
-    const wxSize sizeChild1 = wxSize(sizeTotal.x/2 - 10, sizeTotal.y/4);
+    const wxSize sizeChild1 = wxSize(80, 60);
     sizeMinExpected = sizeChild1;
 
     wxWindow * const
-        child1 = new wxWindow(m_win, wxID_ANY, wxDefaultPosition, sizeChild1);
+        child1 = new wxWindow(win.get(), wxID_ANY, wxDefaultPosition, sizeChild1);
     child1->SetBackgroundColour(*wxRED);
-    m_sizer->Add(child1);
-    m_win->Layout();
+    sizer->Add(child1);
+    win->Layout();
 
-    CPPUNIT_ASSERT_EQUAL( sizeMinExpected, m_sizer->CalcMin() );
+    CHECK( sizeMinExpected == sizer->CalcMin() );
 
     // If both children can fit in the same row, the minimal size of the sizer
     // is determined by the sum of their minimal horizontal dimensions and
     // the maximum of their minimal vertical dimensions.
-    const wxSize sizeChild2 = wxSize(sizeTotal.x/2 + 10, sizeTotal.y/3);
+    const wxSize sizeChild2 = wxSize(100, 80);
     sizeMinExpected.x += sizeChild2.x;
     sizeMinExpected.y = wxMax(sizeChild1.y, sizeChild2.y);
 
     wxWindow * const
-        child2 = new wxWindow(m_win, wxID_ANY, wxDefaultPosition, sizeChild2);
+        child2 = new wxWindow(win.get(), wxID_ANY, wxDefaultPosition, sizeChild2);
     child2->SetBackgroundColour(*wxYELLOW);
-    m_sizer->Add(child2);
-    m_win->Layout();
+    sizer->Add(child2);
+    win->Layout();
 
-    CPPUNIT_ASSERT_EQUAL( sizeMinExpected, m_sizer->CalcMin() );
+    CHECK( sizeMinExpected == sizer->CalcMin() );
 
     // Three children will take at least two rows so the minimal size in
     // vertical direction must increase.
-    const wxSize sizeChild3 = wxSize(sizeTotal.x/2, sizeTotal.y/5);
+    const wxSize sizeChild3 = wxSize(90, 40);
     sizeMinExpected.y += sizeChild3.y;
 
     wxWindow * const
-        child3 = new wxWindow(m_win, wxID_ANY, wxDefaultPosition, sizeChild3);
+        child3 = new wxWindow(win.get(), wxID_ANY, wxDefaultPosition, sizeChild3);
     child3->SetBackgroundColour(*wxGREEN);
-    m_sizer->Add(child3);
-    m_win->Layout();
+    sizer->Add(child3);
+    win->Layout();
 
-    CPPUNIT_ASSERT_EQUAL( sizeMinExpected, m_sizer->CalcMin() );
+    CHECK( sizeMinExpected == sizer->CalcMin() );
 }