testing: fix cppcheck ClientTest::registerTests() warning

cppcheck warns that "factory" might get overwritten. Probably
never happened becaued registerTests() is only called once, but
let's fix it anyway.

2 files changed, 9 insertions, 2 deletions

diff --git a/test/ClientTest.cpp b/test/ClientTest.cpp
index 21c418bb..9fadd5e9 100644
--- a/test/ClientTest.cpp
+++ b/test/ClientTest.cpp
@@ -6654,6 +6654,7 @@ private:
 
 void ClientTest::registerTests()
 {
+    freeFactory();
     factory = (void *)new ClientTestFactory(*this);
     CppUnit::TestFactoryRegistry::getRegistry().registerFactory((CppUnit::TestFactory *)factory);
 }
@@ -6665,15 +6666,20 @@ ClientTest::ClientTest(int serverSleepSec, const std::string &serverLog) :
 {
 }
 
-ClientTest::~ClientTest()
+void ClientTest::freeFactory()
 {
     if(factory) {
         CppUnit::TestFactoryRegistry::getRegistry().unregisterFactory((CppUnit::TestFactory *)factory);
         delete (CppUnit::TestFactory *)factory;
-        factory = 0;
+        factory = NULL;
     }
 }
 
+ClientTest::~ClientTest()
+{
+    freeFactory();
+}
+
 void ClientTest::registerCleanup(Cleanup_t cleanup)
 {
     cleanupSet.insert(cleanup);
diff --git a/test/ClientTest.h b/test/ClientTest.h
index e23b25ad..dfa4626c 100644
--- a/test/ClientTest.h
+++ b/test/ClientTest.h
@@ -435,6 +435,7 @@ class ClientTest : private boost::noncopyable {
      * registerTests() and remains valid until the client is deleted
      */
     void *factory;
+    void freeFactory();
 };
 
 /**