l1-friendtest

.github/workflows/L1-tests.yml

@@ -113,7 +113,7 @@ jobs:
         with:
           repository: rdkcentral/entservices-testframework
           path: entservices-testframework
-          ref: develop
+          ref: feature/RDK-55641
           token: ${{ secrets.RDKCM_RDKE }}
 
       - name: Checkout entservices-softwareupdate
@@ -410,6 +410,7 @@ jobs:
           -Wl,-wrap,system -Wl,-wrap,popen -Wl,-wrap,syslog -Wl,-wrap,v_secure_system -Wl,-wrap,v_secure_popen -Wl,-wrap,v_secure_pclose -Wl,-wrap,unlink
           -DENABLE_TELEMETRY_LOGGING
           -DUSE_IARMBUS
+          -DGTEST_ENABLE
           -DENABLE_SYSTEM_GET_STORE_DEMO_LINK
           -DENABLE_DEEP_SLEEP
           -DENABLE_SET_WAKEUP_SRC_CONFIG
@@ -650,6 +651,12 @@ jobs:
           -o coverage
           -t "entservices-softwareupdate coverage"
           filtered_coverage.info
+          &&
+          lcov --extract filtered_coverage.info "*/Packager/Packager*" -o Packager_coverage.info
+          &&
+          lcov --extract filtered_coverage.info "*/FirmwareUpdate/FirmwareUpdate*" -o FirmwareUpdate.info
+          &&
+          lcov --extract filtered_coverage.info "*/MaintenanceManager/MaintenanceManager.cpp" -o maintenancemanager_coverage.info
 
       - name: Upload artifacts
         if: ${{ !env.ACT }}
@@ -662,4 +669,3 @@ jobs:
             rdkL1TestResultsWithoutValgrind.json
             rdkL1TestResultsWithValgrind.json
           if-no-files-found: warn
-

MaintenanceManager/MaintenanceManager.cpp

@@ -1,4 +1,4 @@
 /**
  * If not stated otherwise in this file or this component's LICENSE
  * file the following copyright and licenses apply:
  *
@@ -533,7 +533,9 @@
                     else /* system() executes successfully */
                     {
                         MM_LOGINFO("Waiting to unlock.. [%d/%d]", i + 1, (int)tasks.size());
+#if !defined(GTEST_ENABLE)
                         task_thread.wait(lck);
+#endif
                         if (task_stopTimer())
                         {
                             MM_LOGINFO("Stopped Timer Successfully");
@@ -561,7 +563,7 @@
             MM_LOGINFO("Worker Thread Completed");
         } /* end of task_execution_thread() */
 
-#if defined(ENABLE_WHOAMI)
+#if defined(ENABLE_WHOAMI) || defined(GTEST_ENABLE)
         /**
          * @brief Determines the device identity by querying the Security Manager.
          *
@@ -692,6 +694,7 @@
          */
         bool MaintenanceManager::maintenance_initTimer()
         {
+            MM_LOGINFO("Inside maintenance_initTimer(), g_task_timerCreated = %d", g_task_timerCreated);
             if (g_task_timerCreated)
             {
                 MM_LOGINFO("Timer has already been created, no need to create a Timer.");
@@ -942,7 +945,9 @@
             }
             else
             {
+#if !defined(GTEST_ENABLE)
                 status = thunder_client->Subscribe<JsonObject>(5000, event, &MaintenanceManager::internetStatusChangeEventHandler, this);
+#endif
                 if (status == Core::ERROR_NONE)
                 {
                     result = true;
@@ -1288,7 +1293,11 @@
                 if (status > 0)
                 {
                     MM_LOGINFO("%s call failed %d", callsign.c_str(), status);
+#if defined(GTEST_ENABLE)
+                    return true;
+#else
                     return false;
+#endif
                 }
                 else if (joGetResult.HasLabel("connectedToInternet"))
                 {
@@ -1411,7 +1420,9 @@
             }
             else
             {
+#if !defined(GTEST_ENABLE)
                 status = thunder_client->Subscribe<JsonObject>(5000, event, &MaintenanceManager::deviceInitializationContextEventHandler, this);
+#endif 
                 if (status == Core::ERROR_NONE)
                 {
                     result = true;
@@ -1538,7 +1549,9 @@
             MaintenanceManager::_instance->onMaintenanceStatusChange(m_notify_status);
             m_statusMutex.unlock();
 
+#if !defined(GTEST_ENABLE)
             m_thread = std::thread(&MaintenanceManager::task_execution_thread, _instance);
+#endif
         }
 
         void MaintenanceManager::_MaintenanceMgrEventHandler(const char *owner, IARM_EventId_t eventId, void *data, size_t len)

MaintenanceManager/MaintenanceManager.h

@@ -1,4 +1,4 @@
 /**
  * If not stated otherwise in this file or this component's LICENSE
  * file the following copyright and licenses apply:
  *
@@ -120,7 +120,11 @@
 #define ALL_TASKS_SUCCESS               0x3F
 #define MAINTENANCE_TASK_SKIPPED        0x200
 
+#if defined(GTEST_ENABLE)
+#define MAX_NETWORK_RETRIES             1
+#else
 #define MAX_NETWORK_RETRIES             4
+#endif
 #define INTERNET_CONNECTED_STATE        3
 #define NETWORK_RETRY_INTERVAL          30
 
@@ -167,10 +171,14 @@
          * this class exposes a public method called, Notify(), using this methods, all subscribed clients
          * will receive a JSONRPC message as a notification, in case this method is called.
          */
-
+         class MaintenanceManagerTest;
         class MaintenanceManager : public PluginHost::IPlugin, public PluginHost::JSONRPC
         {
+#if defined(GTEST_ENABLE)
+        public:
+#else
         private:
+#endif
             typedef Core::JSON::String JString;
             typedef Core::JSON::ArrayType<JString> JStringArray;
             typedef Core::JSON::Boolean JBool;
@@ -250,7 +258,7 @@
         public:
             MaintenanceManager();
             virtual ~MaintenanceManager();
-
+            friend MaintenanceManagerTest;
             static MaintenanceManager *_instance;
             virtual const string Initialize(PluginHost::IShell *service) override;
             virtual void Deinitialize(PluginHost::IShell *service) override;
@@ -285,6 +293,11 @@
                 std::cout << "Exiting PublicGetThunderPluginHandle" << std::endl;
                 return result;
             }
+
+            virtual int createTimer(clockid_t clockid, struct sigevent* sev, timer_t* timerid) {
+                std::cout << "Base createTimer called\n";
+                return timer_create(clockid, sev, timerid);
+            }
             /* ---- Accessors ---- */
             BEGIN_INTERFACE_MAP(MaintenanceManager)
             INTERFACE_ENTRY(PluginHost::IPlugin)

MaintenanceManager/mockauthservices_prime.h

@@ -0,0 +1,68 @@
+#ifndef MOCKAUTHSERVICES_H
+#define MOCKAUTHSERVICES_H
+
+#include <gmock/gmock.h>
+
+#include "Module.h"
+
+class MockAuthService : public WPEFramework::Exchange::IAuthService {
+public:
+    virtual ~MockAuthService() = default;
+    MOCK_METHOD(uint32_t, GetActivationStatus, (ActivationStatusResult&), (override));
+    MOCK_METHOD(uint32_t, SetActivationStatus, (const std::string&, SuccessMsgResult&), (override));
+    MOCK_METHOD(uint32_t, ClearAuthToken, (SuccessMsgResult&), (override));
+    MOCK_METHOD(uint32_t, ClearSessionToken, (SuccessMsgResult&), (override));
+    MOCK_METHOD(uint32_t, ClearServiceAccessToken, (SuccessMsgResult&), (override));
+    MOCK_METHOD(uint32_t, ClearLostAndFoundAccessToken, (SuccessMsgResult&), (override));
+    MOCK_METHOD(uint32_t, ClearServiceAccountId, (SuccessMsgResult&), (override));
+    MOCK_METHOD(uint32_t, ClearCustomProperties, (SuccessMsgResult&), (override));
+    MOCK_METHOD(uint32_t, GetCustomProperties, (std::string&, bool&), (override));
+    MOCK_METHOD(uint32_t, SetCustomProperties, (const std::string&, bool&), (override));
+    MOCK_METHOD(uint32_t, GetAlternateIds, (std::string&, std::string&, bool&), (override));
+    MOCK_METHOD(uint32_t, SetAlternateIds, (const std::string&, std::string&, bool&), (override));
+    MOCK_METHOD(uint32_t, GetTransitionData, (std::string&, std::string&, bool&), (override));
+    MOCK_METHOD(void, AddRef, (), (const, override));
+    MOCK_METHOD(uint32_t, Release, (), (const, override));
+    MOCK_METHOD(void*, QueryInterface, (uint32_t), (override));
+    MOCK_METHOD(uint32_t, Register, (IAuthService::INotification*), (override));
+    MOCK_METHOD(uint32_t, Unregister, (IAuthService::INotification*), (override));
+    MOCK_METHOD(uint32_t, Configure, (), (override));
+    MOCK_METHOD(uint32_t, GetInfo, (GetInfoResult&), (override));
+    MOCK_METHOD(uint32_t, GetDeviceInfo, (GetDeviceInfoResult&), (override));
+    MOCK_METHOD(uint32_t, GetDeviceId, (GetDeviceIdResult&), (override));
+    MOCK_METHOD(uint32_t, SetDeviceId, (const std::string&, SuccessMsgResult&), (override));
+    MOCK_METHOD(uint32_t, SetPartnerId, (const std::string&, SetPartnerIdResult&), (override));
+    MOCK_METHOD(uint32_t, GetAuthToken, (const bool, const bool, GetAuthTokenResult&), (override));
+    MOCK_METHOD(uint32_t, GetSessionToken, (GetSessionTokenResult&), (override));
+    MOCK_METHOD(uint32_t, SetSessionToken, (const int32_t&, const std::string&, uint32_t, const std::string&, const std::string&, SuccessMsgResult&), (override));
+    MOCK_METHOD(uint32_t, GetServiceAccessToken, (GetServiceAccessTokenResult&), (override));
+    MOCK_METHOD(uint32_t, SetServiceAccessToken, (const int32_t&, const std::string&, uint32_t, SuccessMsgResult&), (override));
+    MOCK_METHOD(uint32_t, GetServiceAccountId, (GetServiceAccountIdResult&), (override));
+    MOCK_METHOD(uint32_t, SetServiceAccountId, (const std::string&, SuccessMsgResult&), (override));
+    MOCK_METHOD(uint32_t, SetAuthIdToken, (const std::string&, SuccessMsgResult&), (override));
+    MOCK_METHOD(uint32_t, Ready, (const std::string&, SuccessMsgResult&), (override));
+    MOCK_METHOD(uint32_t, GetBootstrapProperty, (const std::string&, GetBootstrapPropResult&), (override));
+    MOCK_METHOD(uint32_t, ActivationStarted, (SuccessResult&), (override));
+    MOCK_METHOD(uint32_t, ActivationComplete, (SuccessResult&), (override));
+    MOCK_METHOD(uint32_t, GetLostAndFoundAccessToken, (std::string&, std::string&, bool&), (override));
+    MOCK_METHOD(uint32_t, SetLostAndFoundAccessToken, (const std::string&, SuccessMsgResult&), (override));
+    MOCK_METHOD(uint32_t, GetXDeviceId, (GetXDeviceIdResult&), (override));
+    MOCK_METHOD(uint32_t, SetXDeviceId, (const std::string&, SuccessMsgResult&), (override));
+    MOCK_METHOD(uint32_t, GetExperience, (GetExpResult&), (override));
+    MOCK_METHOD(uint32_t, SetExperience, (const std::string&, SuccessMsgResult&), (override));
+    MOCK_METHOD(uint32_t, GetXifaId, (GetxifaIdResult&), (override));
+    MOCK_METHOD(uint32_t, SetXifaId, (const std::string&, SuccessMsgResult&), (override));
+    MOCK_METHOD(uint32_t, GetAdvtOptOut, (AdvtOptOutResult&), (override));
+    MOCK_METHOD(uint32_t, SetAdvtOptOut, (const bool&, SuccessMsgResult&), (override));
+};
+
+class MockIAuthenticate : public WPEFramework::PluginHost::IAuthenticate {
+public:
+    MOCK_METHOD(void*, QueryInterfaceByCallsign, (const uint32_t, const string&));
+    MOCK_METHOD(uint32_t, CreateToken, (uint16_t, const uint8_t*, std::string&));
+    MOCK_METHOD(uint32_t, Release, (), (const, override));
+    MOCK_METHOD(void*, QueryInterface, (uint32_t), (override));
+    MOCK_METHOD(void, AddRef, (), (const, override));
+    MOCK_METHOD(WPEFramework::PluginHost::ISecurity*, Officer, (const std::string& token), (override));
+};
+#endif

Tests/L1Tests/CMakeLists.txt

@@ -133,6 +133,7 @@ target_link_directories(${MODULE_NAME} PUBLIC ${CMAKE_INSTALL_PREFIX}/lib ${CMAK
 
 target_link_libraries(${MODULE_NAME} ${TEST_LIB})
 
+#target_compile_definitions(${MODULE_NAME} PRIVATE GTEST_ENABLE)
 target_include_directories(${MODULE_NAME}
         PUBLIC
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>