Extended unit tests.

Author: Naveen Kumar

unittest/CMakeLists.txt

@@ -1,5 +1,27 @@
 # Locate GTest
-find_package(GTest REQUIRED)
+# Attempt to find GTest using find_package
+
+# Look for libgtest.a in CMAKE_LIBRARY_PATH
+find_library(GTEST_LIBRARY
+    NAMES gtest
+    PATHS ${CMAKE_LIBRARY_PATH}
+)
+
+# Check if libgtest.a is found
+if (GTEST_LIBRARY)
+    message(STATUS "Found GTest library: ${GTEST_LIBRARY}")
+    # Set variables expected by GTest
+    set(GTEST_LIBRARIES ${GTEST_LIBRARY})
+    # Set the include directories where GTest headers are located
+    get_filename_component(GTEST_INCLUDE_DIR "${GTEST_LIBRARY}" DIRECTORY)
+    set(GTEST_INCLUDE_DIRS "${GTEST_INCLUDE_DIR}/../include")
+    message(STATUS "Found GTest include folder: ${GTEST_INCLUDE_DIRS}")
+else()
+    message(STATUS "GTest library not found, using find_package!")
+    # Search the standard way and fail the standard way
+    find_package(GTest REQUIRED)
+endif()
+
 include_directories(${GTEST_INCLUDE_DIRS})
 
 # Add all test files in the current directory to a variable
@@ -11,10 +33,11 @@ add_executable(all_unit_tests ${TEST_SOURCES})
 
 # Link against GTest and your_library
 target_link_libraries(all_unit_tests ${GTEST_LIBRARIES} pthread rsodbc64-test)
+target_include_directories(all_unit_tests PUBLIC ${CMAKE_SOURCE_DIR}/src/logging)
 target_include_directories(all_unit_tests PUBLIC ${CMAKE_SOURCE_DIR}/src/odbc/rsodbc)
 target_include_directories(all_unit_tests PUBLIC ${CMAKE_SOURCE_DIR}/src/pgclient/src/interfaces/libpq)
 target_compile_definitions_rsodbc(all_unit_tests)
 
-gtest_discover_tests(all_unit_tests)
+add_test(NAME all_unit_tests COMMAND all_unit_tests)
 
 

unittest/bindoffset_test.cpp

@@ -0,0 +1,30 @@
+#include "common.h"
+#include <rsdesc.h>
+#include <rsodbc.h>
+#include <sql.h>
+
+TEST(BIND_OFFSET_TEST_SUITE, test_value_loss) {
+
+    long offset = 4294967295;
+    SQLPOINTER offsetPtr = &offset;
+    RS_ENV_INFO _phenv;
+    RS_ENV_INFO *_phenv_ = &_phenv;
+    RS_CONN_INFO _phdbc(_phenv_);
+    RS_CONN_INFO *_phdbc_ = &_phdbc;
+    RS_DESC_INFO phdesc_(_phdbc_, 0, 0);
+    phdesc_.pDescHeader = RS_DESC_HEADER(0);
+    phdesc_.pDescHeader.valid = 1;
+    SQLHDESC phdesc = &phdesc_;
+
+    RsDesc::RS_SQLSetDescField(phdesc, 0, SQL_DESC_BIND_OFFSET_PTR, offsetPtr,
+                               0, TRUE);
+
+    int iBindOffset = 0; // just to depict the buggy behavior
+    SQLLEN iBindOffset2 = 0;
+    EXPECT_EQ(iBindOffset, iBindOffset2);                  // baseline
+    iBindOffset = *(phdesc_.pDescHeader.plBindOffsetPtr);  // integer offset
+    iBindOffset2 = *(phdesc_.pDescHeader.plBindOffsetPtr); // 64bit offset
+    EXPECT_NE(iBindOffset, iBindOffset2);
+    EXPECT_EQ(iBindOffset2, offset); // value is preserved
+    EXPECT_LT(iBindOffset, 0);       // value is lost/rotated (-1)
+}

unittest/rslog_test.cpp

@@ -0,0 +1,42 @@
+
+#include "common.h"
+#include <rslog.h>
+#include <iostream>
+#include <fstream>
+#include <string>
+#include <cstdio>
+
+int findInFile(const std::string& filename, const std::string& target) {
+    int cnt = 0;
+    std::ifstream file(filename);
+    if (!file) {
+        std::cerr << "Failed to open the file." << std::endl;
+        return 1;
+    }
+
+    std::string line;
+    while (std::getline(file, line)) {
+        if (line.find(target.c_str()) != std::string::npos) {
+            ++cnt;
+        }
+    }
+
+    file.close();
+    return cnt;
+}
+
+TEST(RSLOG_TEST_SUITE, ascii_37) {
+    const std::string filename = "rslog_test.log";
+    std::remove(filename.c_str());
+    RS_LOG_VARS rsLogVars;
+    rsLogVars.iTraceLevel = 6;
+    sprintf(rsLogVars.szTraceFile, filename.c_str());
+    rsLogVars.isInitialized = 1;
+    initializeLoggingWithGlobalLogVars(&rsLogVars);
+    std::string str="%";
+    RS_LOG_DEBUG("CAT", "%s", "123");
+    RS_LOG_DEBUG("CAT", "%s", "%");
+    RS_LOG_DEBUG("CAT", "%s", str.c_str());
+    shutdownLogging();
+    ASSERT_EQ(2, findInFile(filename, "%"));
+}

unittest/version_test.cpp

@@ -53,11 +53,9 @@ TEST(VERSION_TEST_SUITE, odbc_dependency_change_check) {
 
 // Any change to the number or names of dependencies will be detected. And this
 // test will enforce a manual check
+    std::set<std::string> expectedDependencies = {"aws-sdk-cpp", "openssl", "c-ares"};
 #ifdef LINUX
-    std::set<std::string> expectedDependencies = {
-        "aws-sdk-cpp", "openssl", "c-ares", "curl", "nghttp2", "zlib"};
-#else
-    std::set<std::string> expectedDependencies = {"aws-sdk-cpp", "openssl"};
+    expectedDependencies.insert({"aws-sdk-cpp", "openssl", "curl", "nghttp2", "zlib"});
 #endif
     std::vector<std::string> dependencies;