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

Rename class used as the test skeleton

Browse Source 
Use a better name than the absolutely meaningless EventHandler.

Also add a brief comment describing this class.

No real changes.
This commit is contained in:
Vadim Zeitlin
2019-04-25 02:38:46 +02:00
parent 87318ec4ee
commit 789ba56c77
1 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
tests/fswatcher/fswatchertest.cpp
View File

@@ -193,13 +193,16 @@ protected:
EventGenerator* EventGenerator::ms_instance = 0; EventGenerator* EventGenerator::ms_instance = 0;
// custom event handler // Abstract base class from which concrete event tests inherit.
class EventHandler : public wxEvtHandler //
// This class provides the common test skeleton which various virtual hooks
// that should or can be reimplemented by the derived classes.
class FSWTesterBase : public wxEvtHandler
{ {
public: public:
enum { WAIT_DURATION = 3 }; enum { WAIT_DURATION = 3 };
EventHandler(int types = wxFSW_EVENT_ALL) : FSWTesterBase(int types = wxFSW_EVENT_ALL) :
eg(EventGenerator::Get()), m_loop(0), eg(EventGenerator::Get()), m_loop(0),
#ifdef OSX_EVENT_LOOP_WORKAROUND #ifdef OSX_EVENT_LOOP_WORKAROUND
m_loopActivator(NULL), m_loopActivator(NULL),
@@ -210,12 +213,12 @@ public:
#ifdef OSX_EVENT_LOOP_WORKAROUND #ifdef OSX_EVENT_LOOP_WORKAROUND
m_loopActivator = new wxEventLoopActivator(m_loop); m_loopActivator = new wxEventLoopActivator(m_loop);
#endif #endif
Connect(wxEVT_IDLE, wxIdleEventHandler(EventHandler::OnIdle)); Connect(wxEVT_IDLE, wxIdleEventHandler(FSWTesterBase::OnIdle));
Connect(wxEVT_FSWATCHER, wxFileSystemWatcherEventHandler( Connect(wxEVT_FSWATCHER, wxFileSystemWatcherEventHandler(
EventHandler::OnFileSystemEvent)); FSWTesterBase::OnFileSystemEvent));
} }
virtual ~EventHandler() virtual ~FSWTesterBase()
{ {
delete m_watcher; delete m_watcher;
#ifdef OSX_EVENT_LOOP_WORKAROUND #ifdef OSX_EVENT_LOOP_WORKAROUND
@@ -521,7 +524,7 @@ void FileSystemWatcherTestCase::TestEventCreate()
{ {
wxLogDebug("TestEventCreate()"); wxLogDebug("TestEventCreate()");
class EventTester : public EventHandler class EventTester : public FSWTesterBase
{ {
public: public:
virtual void GenerateEvent() wxOVERRIDE virtual void GenerateEvent() wxOVERRIDE
@@ -552,7 +555,7 @@ void FileSystemWatcherTestCase::TestEventDelete()
{ {
wxLogDebug("TestEventDelete()"); wxLogDebug("TestEventDelete()");
class EventTester : public EventHandler class EventTester : public FSWTesterBase
{ {
public: public:
virtual void GenerateEvent() wxOVERRIDE virtual void GenerateEvent() wxOVERRIDE
@@ -585,7 +588,7 @@ void FileSystemWatcherTestCase::TestEventRename()
{ {
wxLogDebug("TestEventRename()"); wxLogDebug("TestEventRename()");
class EventTester : public EventHandler class EventTester : public FSWTesterBase
{ {
public: public:
virtual void GenerateEvent() wxOVERRIDE virtual void GenerateEvent() wxOVERRIDE
@@ -616,7 +619,7 @@ void FileSystemWatcherTestCase::TestEventModify()
{ {
wxLogDebug("TestEventModify()"); wxLogDebug("TestEventModify()");
class EventTester : public EventHandler class EventTester : public FSWTesterBase
{ {
public: public:
virtual void GenerateEvent() wxOVERRIDE virtual void GenerateEvent() wxOVERRIDE
@@ -647,7 +650,7 @@ void FileSystemWatcherTestCase::TestEventAccess()
{ {
wxLogDebug("TestEventAccess()"); wxLogDebug("TestEventAccess()");
class EventTester : public EventHandler class EventTester : public FSWTesterBase
{ {
public: public:
virtual void GenerateEvent() wxOVERRIDE virtual void GenerateEvent() wxOVERRIDE
@@ -680,7 +683,7 @@ void FileSystemWatcherTestCase::TestEventAttribute()
{ {
wxLogDebug("TestEventAttribute()"); wxLogDebug("TestEventAttribute()");
class EventTester : public EventHandler class EventTester : public FSWTesterBase
{ {
public: public:
virtual void GenerateEvent() wxOVERRIDE virtual void GenerateEvent() wxOVERRIDE
@@ -711,12 +714,12 @@ void FileSystemWatcherTestCase::TestSingleWatchtypeEvent()
{ {
wxLogDebug("TestSingleWatchtypeEvent()"); wxLogDebug("TestSingleWatchtypeEvent()");
class EventTester : public EventHandler class EventTester : public FSWTesterBase
{ {
public: public:
// We could pass wxFSW_EVENT_CREATE or MODIFY instead, but not RENAME or // We could pass wxFSW_EVENT_CREATE or MODIFY instead, but not RENAME or
// DELETE as the event path fields would be wrong in CheckResult() // DELETE as the event path fields would be wrong in CheckResult()
EventTester() : EventHandler(wxFSW_EVENT_ACCESS) {} EventTester() : FSWTesterBase(wxFSW_EVENT_ACCESS) {}
virtual void GenerateEvent() wxOVERRIDE virtual void GenerateEvent() wxOVERRIDE
{ {
@@ -747,7 +750,7 @@ void FileSystemWatcherTestCase::TestSingleWatchtypeEvent()
void FileSystemWatcherTestCase::TestTrees() void FileSystemWatcherTestCase::TestTrees()
{ {
class TreeTester : public EventHandler class TreeTester : public FSWTesterBase
{ {
const size_t subdirs; const size_t subdirs;
const size_t files; const size_t files;
@@ -1003,7 +1006,7 @@ namespace
// can't be a weak_definition // can't be a weak_definition
// //
// So define this class outside the function instead. // So define this class outside the function instead.
class NoEventsAfterRemoveEventTester : public EventHandler, class NoEventsAfterRemoveEventTester : public FSWTesterBase,
public wxTimer public wxTimer
{ {
public: public: