commit d08e392e9a354cd2f2c58c7ec0e81df521812de8
author Stephen Webb <swebb2066@gmail.com> Mon Feb 03 13:16:11 2020 +1100
committer Stephen Webb <swebb2066@gmail.com> Mon Feb 03 13:16:11 2020 +1100
tree 6b8fc1e34d29c74605aead203c7b3024fd535576
parent f1331491386f42bb3673c62bd02e455048bd22cc

Fix failing defaultinittestcase

src/test/cpp/CMakeLists.txt

diff --git a/src/test/cpp/CMakeLists.txt b/src/test/cpp/CMakeLists.txt
index cc5d250..9d7b0e3 100644
--- a/src/test/cpp/CMakeLists.txt
+++ b/src/test/cpp/CMakeLists.txt
@@ -53,7 +53,7 @@
     target_include_directories(${testName} PRIVATE ${CMAKE_CURRENT_LIST_DIR} $<TARGET_PROPERTY:log4cxx,INCLUDE_DIRECTORIES>)
     target_link_libraries(${testName} PRIVATE testingFramework testingUtilities log4cxx ${APR_LIBRARIES})
     add_test(NAME ${testName}
-        COMMAND ${testName} -v
+        COMMAND ${testName} -v ${${testName}_command_args}
         WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/../resources
     )
     set_tests_properties(${testName} PROPERTIES

src/test/cpp/defaultinit/CMakeLists.txt

diff --git a/src/test/cpp/defaultinit/CMakeLists.txt b/src/test/cpp/defaultinit/CMakeLists.txt
index a9d2ee8..45d8dce 100644
--- a/src/test/cpp/defaultinit/CMakeLists.txt
+++ b/src/test/cpp/defaultinit/CMakeLists.txt
@@ -1,2 +1,3 @@
-add_executable(defaultinittestcase testcase1.cpp testcase2.cpp testcase3.cpp testcase4.cpp)
-set(ALL_LOG4CXX_TESTS ${ALL_LOG4CXX_TESTS} defaultinittestcase PARENT_SCOPE)
+add_executable(uninitializedtestcase testcase1.cpp)
+add_executable(defaultinittestcase testcase2.cpp testcase3.cpp testcase4.cpp)
+set(ALL_LOG4CXX_TESTS ${ALL_LOG4CXX_TESTS} uninitializedtestcase defaultinittestcase PARENT_SCOPE)

src/test/cpp/defaultinit/testcase1.cpp

diff --git a/src/test/cpp/defaultinit/testcase1.cpp b/src/test/cpp/defaultinit/testcase1.cpp
index 9d60bb5..b0059a4 100644
--- a/src/test/cpp/defaultinit/testcase1.cpp
+++ b/src/test/cpp/defaultinit/testcase1.cpp
@@ -48,5 +48,5 @@
 };
 
 
-LOGUNIT_TEST_SUITE_REGISTRATION_DISABLED(TestCase1)
+LOGUNIT_TEST_SUITE_REGISTRATION(TestCase1)
 

src/test/cpp/defaultinit/testcase2.cpp

diff --git a/src/test/cpp/defaultinit/testcase2.cpp b/src/test/cpp/defaultinit/testcase2.cpp
index 13c755d..df1d236 100644
--- a/src/test/cpp/defaultinit/testcase2.cpp
+++ b/src/test/cpp/defaultinit/testcase2.cpp
@@ -23,6 +23,7 @@
 #include <log4cxx/logger.h>
 #include "../insertwide.h"
 #include "../logunit.h"
+#include <log4cxx/xml/domconfigurator.h>
 
 using namespace log4cxx;
 
@@ -35,6 +36,7 @@
 public:
    void setUp()
    {
+      log4cxx::xml::DOMConfigurator::configure("input/xml/defaultInit.xml");
    }
 
    void tearDown()
@@ -56,6 +58,6 @@
 
 };
 
-LOGUNIT_TEST_SUITE_REGISTRATION_DISABLED(TestCase2)
+LOGUNIT_TEST_SUITE_REGISTRATION(TestCase2)
 
 

src/test/cpp/defaultinit/testcase3.cpp

diff --git a/src/test/cpp/defaultinit/testcase3.cpp b/src/test/cpp/defaultinit/testcase3.cpp
index 37e0761..da9471d 100644
--- a/src/test/cpp/defaultinit/testcase3.cpp
+++ b/src/test/cpp/defaultinit/testcase3.cpp
@@ -16,6 +16,7 @@
  */
 
 #include <log4cxx/logmanager.h>
+#include <log4cxx/propertyconfigurator.h>
 #include <log4cxx/logger.h>
 #include "../insertwide.h"
 #include "../logunit.h"
@@ -31,6 +32,7 @@
 public:
    void setUp()
    {
+      PropertyConfigurator::configure(LOG4CXX_FILE("input/defaultInit3.properties"));
    }
 
    void tearDown()
@@ -52,4 +54,4 @@
 
 };
 
-LOGUNIT_TEST_SUITE_REGISTRATION_DISABLED(TestCase3)
+LOGUNIT_TEST_SUITE_REGISTRATION(TestCase3)

src/test/cpp/defaultinit/testcase4.cpp

diff --git a/src/test/cpp/defaultinit/testcase4.cpp b/src/test/cpp/defaultinit/testcase4.cpp
index 64bc06e..1ff3a2e 100644
--- a/src/test/cpp/defaultinit/testcase4.cpp
+++ b/src/test/cpp/defaultinit/testcase4.cpp
@@ -21,6 +21,7 @@
 
 #include <log4cxx/logmanager.h>
 #include <log4cxx/logger.h>
+#include <log4cxx/xml/domconfigurator.h>
 #include "../insertwide.h"
 #include "../logunit.h"
 
@@ -35,6 +36,7 @@
 public:
    void setUp()
    {
+      log4cxx::xml::DOMConfigurator::configure("input/xml/defaultInit.xml");
    }
 
    void tearDown()
@@ -57,5 +59,5 @@
 
 };
 
-LOGUNIT_TEST_SUITE_REGISTRATION_DISABLED(TestCase4)
+LOGUNIT_TEST_SUITE_REGISTRATION(TestCase4)