build "almost fixed"

Author: d-led

CMakeLists.txt

@@ -132,8 +132,8 @@ if(USE_CONAN AND CONAN_TOOLCHAIN_FOUND)
         )
         message(STATUS "Using Conan packages: cpprestsdk::cpprestsdk")
         # Add rxcpp if found from Conan
-        if(TARGET RxCpp::RxCpp)
-            list(APPEND CONAN_LIBS RxCpp::RxCpp)
+        if(TARGET rxcpp::rxcpp)
+            list(APPEND CONAN_LIBS rxcpp::rxcpp)
             message(STATUS "Found rxcpp from Conan")
         endif()
         # Add openssl explicitly to ensure headers are available  
@@ -315,6 +315,14 @@ if(BUILD_TESTING)
     endif()
 endif()
 
+# Enable testing
+enable_testing()
+
+# Register tests with CTest
+add_test(NAME test-influxdb-cpp-rest COMMAND test-influxdb-cpp-rest)
+add_test(NAME test-influx-c-rest COMMAND test-influx-c-rest)
+add_test(NAME test-influxdb-cpp-auth COMMAND test-influxdb-cpp-auth)
+
 # Set output directories for executables
 set_target_properties(test-influxdb-cpp-rest test-influx-c-rest test-influxdb-cpp-auth
     PROPERTIES

src/auth_test/auth_test.cpp

@@ -6,8 +6,8 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 //
 
-#define CATCH_CONFIG_RUNNER
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/catch_session.hpp>
 
 #include <influxdb_line.h>
 #include <influxdb_raw_db_utf8.h>
@@ -19,6 +19,7 @@
 
 #include <chrono>
 #include <thread>
+#include <iostream>
 
 const char* url = "http://localhost:8086";
 const char* db_name = "auth_test";
@@ -86,7 +87,7 @@ TEST_CASE_METHOD(authentication_test, "authentication smoke test")
     }
 }
 
-TEST_CASE_METHOD(authentication_test, "C api authentication smoke test", "[!hide]")
+TEST_CASE_METHOD(authentication_test, "C api authentication smoke test DISABLED_until_auth_setup", "[.]")
 {
     SECTION("query")
     {

src/test-shared/async_c_test.cpp

@@ -6,7 +6,7 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 //
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 #include "../influx-c-rest/influx_c_rest_async.h"
 #include "../influx-c-rest/influx_c_rest_query.h"
 

src/test-shared/test_main.cpp

@@ -6,5 +6,4 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 //
 
-#define CATCH_CONFIG_MAIN
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>

src/test/sanitizer_test.cpp

@@ -6,7 +6,7 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 //
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 #include "../influxdb-cpp-rest/input_sanitizer.h"
 
 using namespace influxdb::utility;

src/test/simple_api_test.cpp

@@ -6,7 +6,7 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 //
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include "../influxdb-cpp-rest/influxdb_simple_api.h"
 #include "../influxdb-cpp-rest/influxdb_simple_async_api.h"

src/test/test_main.cpp

@@ -6,5 +6,4 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 //
 
-#define CATCH_CONFIG_MAIN
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>

src/test/utf8_client_test.cpp

@@ -6,7 +6,7 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 //
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include "fixtures.h"