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

diff --git a/tests/fswatcher/fswatchertest.cpp b/tests/fswatcher/fswatchertest.cpp
index ed8268006172ce9849147385b05d62de07f07577..e75a1ccbe483935bacb5c681fff1bf08ce6dfd8d 100644 (file)
--- a/tests/fswatcher/fswatchertest.cpp
+++ b/tests/fswatcher/fswatchertest.cpp
@@ -248,7 +248,7 @@ public:
             break;
         case 2:
             // actual test
             break;
         case 2:
             // actual test

-            CPPUNIT_ASSERT(CheckResult());
+            CheckResult();

             Exit();
             break;
 
             Exit();
             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.GetNewPath(), e->GetNewPath());
 
         CPPUNIT_ASSERT_EQUAL(expected.GetPath(), e->GetPath());
         CPPUNIT_ASSERT_EQUAL(expected.GetNewPath(), e->GetNewPath());

-
-        return true;

     }
 
     virtual void GenerateEvent() = 0;
     }
 
     virtual void GenerateEvent() = 0;