diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 47dd23c..f7d178e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,2 +1,4 @@ add_subdirectory(examples) -add_subdirectory(test) +if (ENABLE_TESTING) + add_subdirectory(test) +endif () diff --git a/src/test/cpp/xml/domtestcase.cpp b/src/test/cpp/xml/domtestcase.cpp index a500628..b5926b5 100644 --- a/src/test/cpp/xml/domtestcase.cpp +++ b/src/test/cpp/xml/domtestcase.cpp @@ -190,9 +190,32 @@ LOGUNIT_CLASS(DOMTestCase) DOMConfigurator::configure(LOG4CXX_TEST_STR("input/xml/DOMTestCase3.xml")); LOG4CXX_INFO(logger, "File name is expected to end with a superscript 3"); #if LOG4CXX_LOGCHAR_IS_UTF8 - const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0xC2, 0xB3, 0 }; + const logchar fname[] = { static_cast(0x6F), + static_cast(0x75), + static_cast(0x74), + static_cast(0x70), + static_cast(0x75), + static_cast(0x74), + static_cast(0x2F), + static_cast(0x64), + static_cast(0x6F), + static_cast(0x6D), + static_cast(0xC2), + static_cast(0xB3), + 0 }; #else - const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0xB3, 0 }; + const logchar fname[] = { static_cast(0x6F), + static_cast(0x75), + static_cast(0x74), + static_cast(0x70), + static_cast(0x75), + static_cast(0x74), + static_cast(0x2F), + static_cast(0x64), + static_cast(0x6F), + static_cast(0x6D), + static_cast(0xB3), + 0 }; #endif File file; file.setPath(fname); @@ -209,9 +232,33 @@ LOGUNIT_CLASS(DOMTestCase) DOMConfigurator::configure(LOG4CXX_TEST_STR("input/xml/DOMTestCase4.xml")); LOG4CXX_INFO(logger, "File name is expected to end with an ideographic 4"); #if LOG4CXX_LOGCHAR_IS_UTF8 - const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0xE3, 0x86, 0x95, 0 }; + const logchar fname[] = { static_cast(0x6F), + static_cast(0x75), + static_cast(0x74), + static_cast(0x70), + static_cast(0x75), + static_cast(0x74), + static_cast(0x2F), + static_cast(0x64), + static_cast(0x6F), + static_cast(0x6D), + static_cast(0xE3), + static_cast(0x86), + static_cast(0x95), + 0 }; #else - const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0x3195, 0 }; + const logchar fname[] = { static_cast(0x6F), + static_cast(0x75), + static_cast(0x74), + static_cast(0x70), + static_cast(0x75), + static_cast(0x74), + static_cast(0x2F), + static_cast(0x64), + static_cast(0x6F), + static_cast(0x6D), + static_cast(0x3195), + 0 }; #endif File file; file.setPath(fname);