5811d541da
We already had WX_ASSERT_EVENT_OCCURS_IN macro and a recent commit also added code doing almost the same thing manually in wxTopLevelWindow unit test, which was one version too many. Replace both of them with the new EventCounter::WaitEvent(). No real changes, this is just a refactoring.
93 lines
2.3 KiB
C++
93 lines
2.3 KiB
C++
///////////////////////////////////////////////////////////////////////////////
|
|
// Name: tests/toplevel/toplevel.cpp
|
|
// Purpose: Tests for wxTopLevelWindow
|
|
// Author: Kevin Ollivier
|
|
// Created: 2008-05-25
|
|
// Copyright: (c) 2009 Kevin Ollivier <kevino@theolliviers.com>
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// headers
|
|
// ----------------------------------------------------------------------------
|
|
|
|
#include "testprec.h"
|
|
|
|
#ifdef __BORLANDC__
|
|
#pragma hdrstop
|
|
#endif
|
|
|
|
#ifndef WX_PRECOMP
|
|
#include "wx/app.h"
|
|
#include "wx/dialog.h"
|
|
#include "wx/frame.h"
|
|
#include "wx/textctrl.h"
|
|
#include "wx/toplevel.h"
|
|
#endif // WX_PRECOMP
|
|
|
|
#include "testableframe.h"
|
|
|
|
static void TopLevelWindowShowTest(wxTopLevelWindow* tlw)
|
|
{
|
|
CHECK(!tlw->IsShown());
|
|
|
|
wxTextCtrl* textCtrl = new wxTextCtrl(tlw, -1, "test");
|
|
textCtrl->SetFocus();
|
|
|
|
// only run this test on platforms where ShowWithoutActivating is implemented.
|
|
#if defined(__WXMSW__) || defined(__WXMAC__)
|
|
wxTheApp->GetTopWindow()->SetFocus();
|
|
tlw->ShowWithoutActivating();
|
|
CHECK(tlw->IsShown());
|
|
CHECK(!tlw->IsActive());
|
|
|
|
tlw->Hide();
|
|
CHECK(!tlw->IsShown());
|
|
CHECK(!tlw->IsActive());
|
|
#endif
|
|
|
|
tlw->Show(true);
|
|
|
|
// 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();
|
|
CHECK(!tlw->IsShown());
|
|
#ifndef __WXGTK__
|
|
CHECK(!tlw->IsActive());
|
|
#endif
|
|
}
|
|
|
|
TEST_CASE("wxTopLevel::Show", "[tlw][show]")
|
|
{
|
|
SECTION("Dialog")
|
|
{
|
|
wxDialog* dialog = new wxDialog(NULL, -1, "Dialog Test");
|
|
TopLevelWindowShowTest(dialog);
|
|
dialog->Destroy();
|
|
}
|
|
|
|
SECTION("Frame")
|
|
{
|
|
wxFrame* frame = new wxFrame(NULL, -1, "Frame test");
|
|
TopLevelWindowShowTest(frame);
|
|
frame->Destroy();
|
|
}
|
|
}
|
|
|
|
// Check that we receive the expected event when showing the TLW.
|
|
TEST_CASE("wxTopLevel::ShowEvent", "[tlw][show][event]")
|
|
{
|
|
wxFrame* const frame = new wxFrame(NULL, wxID_ANY, "Maximized frame");
|
|
|
|
EventCounter countShow(frame, wxEVT_SHOW);
|
|
|
|
frame->Maximize();
|
|
frame->Show();
|
|
|
|
CHECK( countShow.WaitEvent() );
|
|
}
|