connectivity monitor test code updated

cmuhammedrafi · Dec 27, 2024 · 7c4ff7b · 7c4ff7b
1 parent 73b14f6
commit 7c4ff7b
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/NetworkManagerConnectivity.cpp b/NetworkManagerConnectivity.cpp
@@ -452,8 +452,7 @@ namespace WPEFramework
     ConnectivityMonitor::~ConnectivityMonitor()
     {
         NMLOG_WARNING("~ConnectivityMonitor");
-        m_cmRunning = false;
-        m_cmCv.notify_one();
+        stopConnectivityMonitor();
     }
 
     std::vector<std::string> ConnectivityMonitor::getConnectivityMonitorEndpoints()
@@ -537,7 +536,7 @@ namespace WPEFramework
     {
         m_cmRunning = false;
         m_cmCv.notify_one();
-        NMLOG_INFO("connectivity monitor stopping");
+        NMLOG_INFO("connectivity monitor stopping ...");
         return true;
     }
 

diff --git a/NetworkManagerGnomeProxy.cpp b/NetworkManagerGnomeProxy.cpp
@@ -51,6 +51,8 @@ namespace WPEFramework
             nmEvent = GnomeNetworkManagerEvents::getInstance();
             nmEvent->startNetworkMangerEventMonitor();
             wifi = wifiManager::getInstance();
+            /* start connectivity monitor */
+            connectivityMonitor.startConnectivityMonitor();
             return;
         }
 

diff --git a/NetworkManagerImplementation.cpp b/NetworkManagerImplementation.cpp
@@ -57,6 +57,10 @@ namespace WPEFramework
         NetworkManagerImplementation::~NetworkManagerImplementation()
         {
             LOG_ENTRY_FUNCTION();
+
+            /* stoping connectivity monitor */
+            connectivityMonitor.stopConnectivityMonitor();
+
             if(m_registrationThread.joinable())
             {
                 m_registrationThread.join();

diff --git a/NetworkManagerRDKProxy.cpp b/NetworkManagerRDKProxy.cpp
@@ -677,6 +677,7 @@ namespace WPEFramework
                 getInitialConnectionState();
             }
 
+            connectivityMonitor.startConnectivityMonitor();
         }
 
         uint32_t NetworkManagerImplementation::GetAvailableInterfaces (Exchange::INetworkManager::IInterfaceDetailsIterator*& interfacesItr/* @out */)

diff --git a/Tests/unit_test/test_NetworkManagerConnectivity.cpp b/Tests/unit_test/test_NetworkManagerConnectivity.cpp
@@ -14,12 +14,7 @@ class ConnectivityMonitorTest : public ::testing::Test {
 TEST_F(ConnectivityMonitorTest, StartConnectivityMonitor_Success) {
     bool result = cm.startConnectivityMonitor();
     EXPECT_TRUE(result);
-    bool result = cm.startConnectivityMonitor();
-    EXPECT_TRUE(result);
-}
-
-TEST_F(ConnectivityMonitorTest, StartConnectivityMonitor_Success) {
-    bool result = cm.stopConnectivityMonitor();
+    result = cm.startConnectivityMonitor();
     EXPECT_TRUE(result);
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -677,6 +677,7 @@ namespace WPEFramework @@
                     getInitialConnectionState();
                 }
+                connectivityMonitor.startConnectivityMonitor();
             }
             uint32_t NetworkManagerImplementation::GetAvailableInterfaces (Exchange::INetworkManager::IInterfaceDetailsIterator*& interfacesItr/* @out */)
@@ Expand Down @@