Feature/usblogupload backup

unit_test.sh

@@ -18,7 +18,7 @@
 ## SPDX-License-Identifier: Apache-2.0
 #
 
-ENABLE_COV=false
+ENABLE_COV=true
 
 if [ "x$1" = "x--enable-cov" ]; then
       echo "Enabling coverage options"
@@ -29,7 +29,8 @@ if [ "x$1" = "x--enable-cov" ]; then
 fi
 export TOP_DIR=`pwd`
 export top_srcdir=`pwd`
-
+export LD_LIBRARY_PATH="/usr/local/lib:$TOP_DIR/uploadstblogs/src/.libs:$LD_LIBRARY_PATH"
+echo "RDK_PROFILE=TV" >> /etc/device.properties
 cd unittest/
 cp mocks/mockrbus.h /usr/local/include
 cp ../uploadstblogs/include/*.h /usr/local/include
@@ -42,6 +43,9 @@ make clean
 make
 
 cd ../uploadstblogs/unittest
+cd ../..
+sh cov_build.sh
+cd -
 git clone https://github.com/rdkcentral/iarmmgrs.git
 cp iarmmgrs/sysmgr/include/sysMgr.h /usr/local/include
 cp iarmmgrs/maintenance/include/maintenanceMGR.h /usr/local/include
@@ -55,9 +59,18 @@ autoreconf --install
 
 make clean
 make
+pwd
+cd ../../usbLogUpload/unittest
+automake --add-missing
+autoreconf --install
 
+./configure
+
+make clean
+make
+echo "RDK_PROFILE=TV" >> /etc/device.properties
 fail=0
-cd -
+cd $TOP_DIR/unittest/
 
 for test in \
   ./dcm_utils_gtest \
@@ -81,7 +94,11 @@ for test in \
   ./../uploadstblogs/unittest/retry_logic_gtest \
   ./../uploadstblogs/unittest/strategies_gtest \
   ./../uploadstblogs/unittest/strategy_handler_gtest \
-  ./../uploadstblogs/unittest/uploadlogsnow_gtest
+  ./../uploadstblogs/unittest/uploadlogsnow_gtest \
+  ./../usbLogUpload/unittest/usb_log_file_manager_gtest \
+  ./../usbLogUpload/unittest/usb_log_validation_gtest \
+  ./../usbLogUpload/unittest/usb_log_utils_gtest \
+  ./../usbLogUpload/unittest/usb_log_archive_gtest
 
 do
     $test
@@ -107,5 +124,4 @@ if [ "$ENABLE_COV" = true ]; then
     lcov --capture --directory . --output-file coverage.info
     lcov --remove coverage.info '/usr/*' --output-file coverage.info
     lcov --remove coverage.info "${PWD}/*" --output-file coverage.info
-    lcov --list coverage.info
 fi

usbLogUpload/include/usb_log_validation.h

@@ -41,15 +41,6 @@ extern "C" {
  */
 int validate_usb_mount_point(const char *mount_point);
 
-/**
- * @brief Validate system prerequisites
- * 
- * Checks that all required system components and utilities are available.
- * 
- * @return int 0 if all prerequisites met, negative error code otherwise
- */
-int validate_system_prerequisites(void);
-
 /**
  * @brief Validate input parameters
  * 

usbLogUpload/src/usb_log_main.c

@@ -32,6 +32,7 @@
 #include <time.h>
 #include <string.h>
 
+#ifndef GTEST_ENABLE
 /**
  * @brief Main application entry point
  * 
@@ -66,6 +67,7 @@ int main(int argc, char *argv[])
 
     return ret;
 }
+#endif
 
 /**
  * @brief Execute USB log upload operation

usbLogUpload/unittest/Makefile.am

@@ -20,7 +20,7 @@ AUTOMAKE_OPTIONS = subdir-objects
 ACLOCAL_AMFLAGS = -I m4
 
 # Define the test executables
-bin_PROGRAMS = usb_log_file_manager_gtest usb_log_main_gtest usb_log_validation_gtest
+bin_PROGRAMS = usb_log_file_manager_gtest usb_log_main_gtest usb_log_validation_gtest usb_log_archive_gtest usb_log_utils_gtest
 
 # Common include directories
 COMMON_CPPFLAGS = -I/usr/include/gtest -I/usr/local/include -I/usr/local/include/gtest \
@@ -29,9 +29,11 @@ COMMON_CPPFLAGS = -I/usr/include/gtest -I/usr/local/include -I/usr/local/include
 
 AM_CPPFLAGS = $(COMMON_CPPFLAGS)
 AM_CXXFLAGS = -std=c++14
+export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH="$TOP_DIR/uploadstblogs/src/.libs:$LD_LIBRARY_PATH"
 
 # Common libraries
-COMMON_LDADD = -lgtest -lgmock -lpthread -lcurl -lcjson -lssl -lcrypto -lgcov
+COMMON_LDADD = -lgtest -lgmock -lpthread -lcurl -lcjson -lssl -lcrypto -lgcov -lrdkloggers -lfwutils -L/usr/local/lib -luploadstblogs
 
 # Common compiler flags
 COMMON_CXXFLAGS = -fprofile-arcs -ftest-coverage -fpermissive -Wno-write-strings -Wno-unused-result
@@ -40,7 +42,7 @@ COMMON_CXXFLAGS = -fprofile-arcs -ftest-coverage -fpermissive -Wno-write-strings
 
 # USB Log File Manager GTest
 usb_log_file_manager_gtest_SOURCES = usb_log_file_manager_gtest.cpp \
-                                     ../src/usb_log_file_manager.c
+                                     ../src/usb_log_file_manager.c ../src/usb_log_utils.c  ../../uploadstblogs/unittest/mocks/mock_file_operations.cpp
 
 usb_log_file_manager_gtest_CPPFLAGS = $(COMMON_CPPFLAGS)
 usb_log_file_manager_gtest_LDADD = $(COMMON_LDADD)
@@ -53,10 +55,11 @@ usb_log_main_gtest_SOURCES = usb_log_main_gtest.cpp \
                              ../src/usb_log_validation.c \
                              ../src/usb_log_file_manager.c \
                              ../src/usb_log_archive.c \
-                             ../src/usb_log_utils.c
+                             ../src/usb_log_utils.c \
+                             ../../uploadstblogs/unittest/mocks/mock_file_operations.cpp
 
 usb_log_main_gtest_CPPFLAGS = $(COMMON_CPPFLAGS)
-usb_log_main_gtest_LDADD = $(COMMON_LDADD)
+usb_log_main_gtest_LDADD = $(COMMON_LDADD) -L/usr/local/lib -luploadstblogs
 usb_log_main_gtest_CXXFLAGS = $(COMMON_CXXFLAGS)
 usb_log_main_gtest_CFLAGS = $(COMMON_CXXFLAGS)
 
@@ -70,3 +73,21 @@ usb_log_validation_gtest_LDADD = $(COMMON_LDADD)
 usb_log_validation_gtest_CXXFLAGS = $(COMMON_CXXFLAGS)
 usb_log_validation_gtest_CFLAGS = $(COMMON_CXXFLAGS)
 
+# USB Log Archive GTest
+usb_log_archive_gtest_SOURCES = usb_log_archive_gtest.cpp \
+                                 ../src/usb_log_archive.c \
+                                 ../../uploadstblogs/unittest/mocks/mock_file_operations.cpp
+
+usb_log_archive_gtest_CPPFLAGS = $(COMMON_CPPFLAGS)
+usb_log_archive_gtest_LDADD = $(COMMON_LDADD)
+usb_log_archive_gtest_CXXFLAGS = $(COMMON_CXXFLAGS)
+usb_log_archive_gtest_CFLAGS = $(COMMON_CXXFLAGS)
+
+# USB Log Utils GTest
+usb_log_utils_gtest_SOURCES = usb_log_utils_gtest.cpp \
+                             ../src/usb_log_utils.c
+
+usb_log_utils_gtest_CPPFLAGS = $(COMMON_CPPFLAGS)
+usb_log_utils_gtest_LDADD = $(COMMON_LDADD)
+usb_log_utils_gtest_CXXFLAGS = $(COMMON_CXXFLAGS)
+usb_log_utils_gtest_CFLAGS = $(COMMON_CXXFLAGS)

usbLogUpload/unittest/configure.ac

@@ -0,0 +1,25 @@
+AC_INIT([usbLogUpload-unittest], [1.0], [support@example.com])
+AM_INIT_AUTOMAKE([foreign subdir-objects])
+AC_CONFIG_SRCDIR([Makefile.am])
+AC_CONFIG_HEADERS([config.h])
+
+# Checks for programs.
+AC_PROG_CC
+AC_PROG_CXX
+AC_PROG_INSTALL
+
+# Checks for libraries.
+AC_CHECK_LIB([pthread], [pthread_create])
+AC_CHECK_LIB([cjson], [cJSON_Parse])
+AC_CHECK_LIB([curl], [curl_easy_init])
+AC_CHECK_LIB([ssl], [SSL_library_init])
+AC_CHECK_LIB([crypto], [CRYPTO_new_ex_data])
+AC_CHECK_LIB([gtest], [main])
+AC_CHECK_LIB([gmock], [main])
+
+# Checks for header files.
+AC_CHECK_HEADERS([stdio.h stdlib.h string.h unistd.h sys/types.h sys/stat.h])
+
+# Output files
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT

usbLogUpload/unittest/usb_log_archive_gtest.cpp

@@ -0,0 +1,59 @@
+// Copyright 2026
+// Unit tests for usb_log_archive.c
+#include <gtest/gtest.h>
+#include "usb_log_archive.h"
+#include <string>
+#include <cstdio>
+#include <sys/stat.h>
+
+// Mocks and stubs for dependencies
+extern "C" {
+    int get_current_timestamp(char *buf, size_t len) {
+        strncpy(buf, "01/01/26-12:00:00", len-1);
+        buf[len-1] = '\0';
+        return 0;
+    }
+    int copy_file_and_delete(const char *src, const char *dst) {
+        // Simulate successful copy
+        return 0;
+    }
+    void RDK_LOG(int level, int module, const char *fmt, ...) {}
+}
+
+class UsbLogArchiveTest : public ::testing::Test {
+protected:
+    std::string temp_dir;
+    void SetUp() override {
+        temp_dir = "./test_usb_log_dir";
+        mkdir(temp_dir.c_str(), 0777);
+    }
+    void TearDown() override {
+        rmdir(temp_dir.c_str());
+    }
+};
+
+TEST_F(UsbLogArchiveTest, CreateUsbLogArchive_Success) {
+    char archive_path[256] = "./test_usb_log_dir/test_archive.tar.gz";
+    int ret = create_usb_log_archive(temp_dir.c_str(), archive_path, "00:11:22:33:44:55");
+    EXPECT_EQ(ret, 0);
+}
+
+TEST_F(UsbLogArchiveTest, CreateUsbLogArchive_InvalidParams) {
+    char archive_path[256] = "./test_usb_log_dir/test_archive.tar.gz";
+    EXPECT_EQ(create_usb_log_archive(nullptr, archive_path, "00:11:22:33:44:55"), -1);
+    EXPECT_EQ(create_usb_log_archive(temp_dir.c_str(), nullptr, "00:11:22:33:44:55"), -1);
+    EXPECT_EQ(create_usb_log_archive(temp_dir.c_str(), archive_path, nullptr), -1);
+}
+
+TEST_F(UsbLogArchiveTest, CreateUsbLogArchive_SourceDirMissing) {
+    char archive_path[256] = "./test_usb_log_dir/test_archive.tar.gz";
+    std::string missing_dir = "./does_not_exist";
+    EXPECT_EQ(create_usb_log_archive(missing_dir.c_str(), archive_path, "00:11:22:33:44:55"), -2);
+}
+int main(int argc, char** argv) {
+    ::testing::InitGoogleTest(&argc, argv);
+    int result = RUN_ALL_TESTS();
+
+    return result;
+}
+