No changes, just slightly simplify wxFileSystemWatcher unit test.

CheckResult() method of the test event handler doesn't need to return
anything, it uses CPPUNIT_ASSERTs and related macros inside it to check that
everything is expected.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67690 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2011-05-03 23:31:24 +00:00
parent ad94cb2b4f
commit 17e23c0cb9

View File

@@ -248,7 +248,7 @@ public:
break; break;
case 2: case 2:
// actual test // actual test
CPPUNIT_ASSERT(CheckResult()); CheckResult();
Exit(); Exit();
break; break;
@@ -325,7 +325,7 @@ public:
tested = true; tested = true;
} }
virtual bool CheckResult() virtual void CheckResult()
{ {
CPPUNIT_ASSERT_MESSAGE( "No events received", !m_events.empty() ); CPPUNIT_ASSERT_MESSAGE( "No events received", !m_events.empty() );
@@ -356,8 +356,6 @@ public:
CPPUNIT_ASSERT_EQUAL(expected.GetPath(), e->GetPath()); CPPUNIT_ASSERT_EQUAL(expected.GetPath(), e->GetPath());
CPPUNIT_ASSERT_EQUAL(expected.GetNewPath(), e->GetNewPath()); CPPUNIT_ASSERT_EQUAL(expected.GetNewPath(), e->GetNewPath());
return true;
} }
virtual void GenerateEvent() = 0; virtual void GenerateEvent() = 0;