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

Add ClearEventCount to wxTestableFrame. This means we can clear an event count when an event counter goes out of scope so the are no spurious results in later tests.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65596 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Steve Lamerton
2010-09-23 16:55:29 +00:00
parent d13a8e05c2
commit 4ceca85497
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/testableframe.cpp
View File

@@ -2,7 +2,7 @@
// Name: testableframe.cpp // Name: testableframe.cpp
// Purpose: An improved wxFrame for unit-testing // Purpose: An improved wxFrame for unit-testing
// Author: Steven Lamerton // Author: Steven Lamerton
// RCS-ID: $Id:$ // RCS-ID: $Id$
// Copyright: (c) 2010 Steven Lamerton // Copyright: (c) 2010 Steven Lamerton
// Licence: wxWidgets licence // Licence: wxWidgets licence
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
@@ -54,6 +54,11 @@ int wxTestableFrame::GetEventCount(wxEventType type)
} }
} }
void wxTestableFrame::ClearEventCount(wxEventType type)
{
m_count[type] = 0;
}
EventCounter::EventCounter(wxWindow* win, wxEventType type) : m_type(type), EventCounter::EventCounter(wxWindow* win, wxEventType type) : m_type(type),
m_win(win) m_win(win)
@@ -74,6 +79,9 @@ EventCounter::~EventCounter()
NULL, NULL,
m_frame); m_frame);
//This stops spurious counts from previous tests
m_frame->ClearEventCount(m_type);
m_frame = NULL; m_frame = NULL;
m_win = NULL; m_win = NULL;
} }

5
tests/testableframe.h
View File

@@ -2,7 +2,7 @@
// Name: testableframe.h // Name: testableframe.h
// Purpose: An improved wxFrame for unit-testing // Purpose: An improved wxFrame for unit-testing
// Author: Steven Lamerton // Author: Steven Lamerton
// RCS-ID: $Id:$ // RCS-ID: $Id$
// Copyright: (c) 2010 Steven Lamerton // Copyright: (c) 2010 Steven Lamerton
// Licence: wxWidgets licence // Licence: wxWidgets licence
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
@@ -21,6 +21,9 @@ public:
//wxEVT_ANY get the count for all events or a type can be specified //wxEVT_ANY get the count for all events or a type can be specified
int GetEventCount(wxEventType type = wxEVT_ANY); int GetEventCount(wxEventType type = wxEVT_ANY);
//Used to clear an event count, after disconnecting a counter for example
void ClearEventCount(wxEventType type);
private: private:
wxLongToLongHashMap m_count; wxLongToLongHashMap m_count;
}; };