uplift code diff coverage

Author: zjswhhh

src/DbInterface.cpp

@@ -1231,7 +1231,7 @@ void DbInterface::setMuxMode(const std::string &portName, const std::string stat
 //
 // handle set mux mode 
 //
-void DbInterface::handleSetMuxMode(const std::string portName, const std::string state)
+void DbInterface::handleSetMuxMode(const std::string &portName, const std::string state)
 {
     MUXLOGWARNING(boost::format("%s: configuring mux mode to %s after warm restart") % portName % state);
 

src/DbInterface.h

@@ -271,7 +271,7 @@ class DbInterface
      *  
      * @return none
      */
-    virtual void setMuxMode(const std::string &portName, const std::string state);
+    void setMuxMode(const std::string &portName, const std::string state);
 
     /**
      * @method setMuxReconciled
@@ -280,7 +280,7 @@ class DbInterface
      * 
      * @return none
      */
-    virtual void setMuxReconciled();
+    void setMuxReconciled();
 
     /**
      * @method checkWarmRestart
@@ -414,7 +414,7 @@ class DbInterface
      * 
      * @return none
      */
-    void handleSetMuxReconciled();
+    virtual void handleSetMuxReconciled();
 
     /**
      * @method handleSetMuxMode
@@ -426,7 +426,7 @@ class DbInterface
      * 
      * @return none
      */
-    void handleSetMuxMode(const std::string portName, const std::string state);
+    virtual void handleSetMuxMode(const std::string &portName, const std::string state);
 
     /**
     *@method processTorMacAddress

test/FakeDbInterface.cpp

@@ -92,14 +92,14 @@ void FakeDbInterface::postPckLossRatio(
     mExpectedPacketCount = expectedPacketCount;
 } 
 
-void FakeDbInterface::setMuxReconciled()
+void FakeDbInterface::handleSetMuxReconciled()
 {
     mSetMuxReconciledInvokeCount += 1;
 }
 
-void FakeDbInterface::checkWarmRestart(const std::string &portName)
+void FakeDbInterface::handleSetMuxMode(const std::string &portName, const std::string state)
 {
-    mCheckWarmRestartInvokeCount += 1;
+    mSetMuxModeInvokeCount += 1;
 }
 
 } /* namespace test */

test/FakeDbInterface.h

@@ -62,8 +62,9 @@ class FakeDbInterface: public mux::DbInterface
 
     void setNextMuxState(mux_state::MuxState::Label label) {mNextMuxState = label;};
 
-    virtual void setMuxReconciled() override;
-    virtual void checkWarmRestart(const std::string &portName) override;
+private:
+    virtual void handleSetMuxMode(const std::string &portName, const std::string state) override;
+    virtual void handleSetMuxReconciled() override;
 
 public:
     mux_state::MuxState::Label mNextMuxState;
@@ -84,7 +85,7 @@ class FakeDbInterface: public mux::DbInterface
     uint64_t mExpectedPacketCount = 0;
 
     uint32_t mSetMuxReconciledInvokeCount = 0;
-    uint32_t mCheckWarmRestartInvokeCount = 0;
+    uint32_t mSetMuxModeInvokeCount = 0;
 };
 
 } /* namespace test */

test/LinkManagerStateMachineTest.cpp

@@ -188,7 +188,6 @@ void LinkManagerStateMachineTest::activateStateMachine()
 {
     mFakeMuxPort.activateStateMachine();
     mFakeMuxPort.handleDefaultRouteState("ok");
-    mFakeMuxPort.checkWarmRestart();
 }
 
 void LinkManagerStateMachineTest::setMuxActive()
@@ -1165,11 +1164,4 @@ TEST_F(LinkManagerStateMachineTest, EnableDecreaseLinkProberIntervalFeature)
     EXPECT_EQ(mFakeMuxPort.mFakeLinkProber->mDecreaseIntervalCallCount, 1);
 }
 
-TEST_F(LinkManagerStateMachineTest, CheckWarmRestart)
-{
-    setMuxActive();
-
-    EXPECT_EQ(mDbInterfacePtr->mCheckWarmRestartInvokeCount, 1);
-}
-
 } /* namespace test */

test/MuxManagerTest.cpp

@@ -205,6 +205,19 @@ void MuxManagerTest::processWarmRestartFlag(const std::string &flag)
     mMuxManagerPtr->processWarmRestartFlag(flag);
 }
 
+void MuxManagerTest::checkWarmRestart(const std::string &portName)
+{
+    std::shared_ptr<mux::MuxPort> muxPortPtr = mMuxManagerPtr->mPortMap[portName];
+
+    muxPortPtr->checkWarmRestart();
+}
+
+void MuxManagerTest::updatePortReconciliationCount(int increment)
+{
+    mMuxManagerPtr->updateWarmRestartReconciliationCount(increment);
+    runIoService(1);
+}
+
 void MuxManagerTest::initLinkProberActiveActive(std::shared_ptr<link_manager::ActiveActiveStateMachine> linkManagerStateMachineActiveActive)
 {
     mFakeLinkProber = std::make_shared<FakeLinkProber> (linkManagerStateMachineActiveActive->getLinkProberStateMachinePtr().get());
@@ -646,9 +659,27 @@ TEST_F(MuxManagerTest, WarmRestart)
     std::string flag = "true";
     processWarmRestartFlag(flag);
     EXPECT_TRUE(mMuxManagerPtr->getWarmRestartFlag());
+    
+    updatePortReconciliationCount(1);
+    checkWarmRestart(port);
 
-    EXPECT_EQ(mDbInterfacePtr->mSetMuxReconciledInvokeCount, 0);
-    runIoService();
+    runIoService(4);
+    EXPECT_EQ(mDbInterfacePtr->mSetMuxModeInvokeCount, 1);
+    EXPECT_EQ(mDbInterfacePtr->mSetMuxReconciledInvokeCount, 1);
+}
+
+TEST_F(MuxManagerTest, WarmRestartReconciliationTimeout)
+{
+    std::string port = "Ethernet0";
+
+    createPort(port);
+    EXPECT_FALSE(mMuxManagerPtr->getWarmRestartFlag());
+
+    std::string flag = "true";
+    processWarmRestartFlag(flag);
+    EXPECT_TRUE(mMuxManagerPtr->getWarmRestartFlag());
+
+    runIoService(2);
     EXPECT_EQ(mDbInterfacePtr->mSetMuxReconciledInvokeCount, 1);
 }
 

test/MuxManagerTest.h

@@ -76,6 +76,8 @@ class MuxManagerTest: public testing::Test
     void initLinkProberActiveStandby(std::shared_ptr<link_manager::ActiveStandbyStateMachine> linkManagerStateMachine);
     void generateServerMac(const std::string &portName, std::array<uint8_t, ETHER_ADDR_LEN> &address);
     void processWarmRestartFlag(const std::string &flag);
+    void checkWarmRestart(const std::string &portName);
+    void updatePortReconciliationCount(int increment);
     void createPort(std::string port, common::MuxPortConfig::PortCableType portCableType = common::MuxPortConfig::PortCableType::ActiveStandby);
 
 public: