From 20d5280437befd250a50a437a9c747fe91a94c10 Mon Sep 17 00:00:00 2001 From: Jeff Feasel Date: Thu, 25 Apr 2024 21:10:48 -0400 Subject: [PATCH] Merging TestSessionManager with TestContext. --- src/transport/tests/TestSessionManager.cpp | 59 ++++++++++------------ 1 file changed, 28 insertions(+), 31 deletions(-) diff --git a/src/transport/tests/TestSessionManager.cpp b/src/transport/tests/TestSessionManager.cpp index 8053a3d0daa9b9..f4024a1abe14b3 100644 --- a/src/transport/tests/TestSessionManager.cpp +++ b/src/transport/tests/TestSessionManager.cpp @@ -117,14 +117,11 @@ class TestSessMgrCallback : public SessionMessageDelegate bool LargeMessageSent = false; }; -class TestSessionManager : public ::testing::Test +class TestSessionManager : public ::testing::Test, public TestContext { protected: - TestSessionManager() { inContext = new TestContext(); } - ~TestSessionManager() { delete inContext; } - void SetUp() { ASSERT_EQ(inContext->Init(), CHIP_NO_ERROR); } - void TearDown() { inContext->Shutdown(); } - TestContext * inContext; + void SetUp() { ASSERT_EQ(this->Init(), CHIP_NO_ERROR); } + void TearDown() { this->Shutdown(); } }; TEST_F(TestSessionManager, CheckSimpleInitTest) @@ -137,7 +134,7 @@ TEST_F(TestSessionManager, CheckSimpleInitTest) EXPECT_EQ(CHIP_NO_ERROR, fabricTableHolder.Init()); EXPECT_EQ(CHIP_NO_ERROR, - sessionManager.Init(&inContext->GetSystemLayer(), &inContext->GetTransportMgr(), &gMessageCounterManager, + sessionManager.Init(&this->GetSystemLayer(), &this->GetTransportMgr(), &gMessageCounterManager, &deviceStorage, &fabricTableHolder.GetFabricTable(), sessionKeystore)); } @@ -166,7 +163,7 @@ TEST_F(TestSessionManager, CheckMessageTest) EXPECT_EQ(CHIP_NO_ERROR, fabricTableHolder.Init()); EXPECT_EQ(CHIP_NO_ERROR, - sessionManager.Init(&inContext->GetSystemLayer(), &inContext->GetTransportMgr(), &gMessageCounterManager, + sessionManager.Init(&this->GetSystemLayer(), &this->GetTransportMgr(), &gMessageCounterManager, &deviceStorage, &fabricTableHolder.GetFabricTable(), sessionKeystore)); sessionManager.SetMessageDelegate(&callback); @@ -212,7 +209,7 @@ TEST_F(TestSessionManager, CheckMessageTest) err = sessionManager.SendPreparedMessage(aliceToBobSession.Get().Value(), preparedMessage); EXPECT_EQ(err, CHIP_NO_ERROR); - inContext->DrainAndServiceIO(); + this->DrainAndServiceIO(); EXPECT_EQ(callback.ReceiveHandlerCallCount, 1); // Let's send the max sized message and make sure it is received @@ -227,7 +224,7 @@ TEST_F(TestSessionManager, CheckMessageTest) err = sessionManager.SendPreparedMessage(aliceToBobSession.Get().Value(), preparedMessage); EXPECT_EQ(err, CHIP_NO_ERROR); - inContext->DrainAndServiceIO(); + this->DrainAndServiceIO(); EXPECT_EQ(callback.ReceiveHandlerCallCount, 2); uint16_t large_payload_len = sizeof(LARGE_PAYLOAD); @@ -270,7 +267,7 @@ TEST_F(TestSessionManager, SendEncryptedPacketTest) EXPECT_EQ(CHIP_NO_ERROR, fabricTableHolder.Init()); EXPECT_EQ(CHIP_NO_ERROR, - sessionManager.Init(&inContext->GetSystemLayer(), &inContext->GetTransportMgr(), &gMessageCounterManager, + sessionManager.Init(&this->GetSystemLayer(), &this->GetTransportMgr(), &gMessageCounterManager, &deviceStorage, &fabricTableHolder.GetFabricTable(), sessionKeystore)); sessionManager.SetMessageDelegate(&callback); @@ -318,7 +315,7 @@ TEST_F(TestSessionManager, SendEncryptedPacketTest) err = sessionManager.SendPreparedMessage(aliceToBobSession.Get().Value(), preparedMessage); EXPECT_EQ(err, CHIP_NO_ERROR); - inContext->DrainAndServiceIO(); + this->DrainAndServiceIO(); EXPECT_EQ(callback.ReceiveHandlerCallCount, 1); // Reset receive side message counter, or duplicated message will be denied. @@ -328,7 +325,7 @@ TEST_F(TestSessionManager, SendEncryptedPacketTest) err = sessionManager.SendPreparedMessage(aliceToBobSession.Get().Value(), preparedMessage); EXPECT_EQ(err, CHIP_NO_ERROR); - inContext->DrainAndServiceIO(); + this->DrainAndServiceIO(); EXPECT_EQ(callback.ReceiveHandlerCallCount, 2); sessionManager.Shutdown(); @@ -359,7 +356,7 @@ TEST_F(TestSessionManager, SendBadEncryptedPacketTest) EXPECT_EQ(CHIP_NO_ERROR, fabricTableHolder.Init()); EXPECT_EQ(CHIP_NO_ERROR, - sessionManager.Init(&inContext->GetSystemLayer(), &inContext->GetTransportMgr(), &gMessageCounterManager, + sessionManager.Init(&this->GetSystemLayer(), &this->GetTransportMgr(), &gMessageCounterManager, &deviceStorage, &fabricTableHolder.GetFabricTable(), sessionKeystore)); sessionManager.SetMessageDelegate(&callback); @@ -407,7 +404,7 @@ TEST_F(TestSessionManager, SendBadEncryptedPacketTest) err = sessionManager.SendPreparedMessage(aliceToBobSession.Get().Value(), preparedMessage); EXPECT_EQ(err, CHIP_NO_ERROR); - inContext->DrainAndServiceIO(); + this->DrainAndServiceIO(); EXPECT_EQ(callback.ReceiveHandlerCallCount, 1); /* -------------------------------------------------------------------------------------------*/ @@ -428,7 +425,7 @@ TEST_F(TestSessionManager, SendBadEncryptedPacketTest) err = sessionManager.SendPreparedMessage(aliceToBobSession.Get().Value(), badMessageCounterMsg); EXPECT_EQ(err, CHIP_NO_ERROR); - inContext->DrainAndServiceIO(); + this->DrainAndServiceIO(); EXPECT_EQ(callback.ReceiveHandlerCallCount, 1); /* -------------------------------------------------------------------------------------------*/ @@ -445,7 +442,7 @@ TEST_F(TestSessionManager, SendBadEncryptedPacketTest) err = sessionManager.SendPreparedMessage(aliceToBobSession.Get().Value(), badKeyIdMsg); EXPECT_EQ(err, CHIP_NO_ERROR); - inContext->DrainAndServiceIO(); + this->DrainAndServiceIO(); EXPECT_EQ(callback.ReceiveHandlerCallCount, 1); /* -------------------------------------------------------------------------------------------*/ @@ -455,7 +452,7 @@ TEST_F(TestSessionManager, SendBadEncryptedPacketTest) err = sessionManager.SendPreparedMessage(aliceToBobSession.Get().Value(), preparedMessage); EXPECT_EQ(err, CHIP_NO_ERROR); - inContext->DrainAndServiceIO(); + this->DrainAndServiceIO(); EXPECT_EQ(callback.ReceiveHandlerCallCount, 2); sessionManager.Shutdown(); @@ -486,7 +483,7 @@ TEST_F(TestSessionManager, SendPacketWithOldCounterTest) EXPECT_EQ(CHIP_NO_ERROR, fabricTableHolder.Init()); EXPECT_EQ(CHIP_NO_ERROR, - sessionManager.Init(&inContext->GetSystemLayer(), &inContext->GetTransportMgr(), &gMessageCounterManager, + sessionManager.Init(&this->GetSystemLayer(), &this->GetTransportMgr(), &gMessageCounterManager, &deviceStorage, &fabricTableHolder.GetFabricTable(), sessionKeystore)); sessionManager.SetMessageDelegate(&callback); @@ -533,7 +530,7 @@ TEST_F(TestSessionManager, SendPacketWithOldCounterTest) err = sessionManager.SendPreparedMessage(aliceToBobSession.Get().Value(), preparedMessage); EXPECT_EQ(err, CHIP_NO_ERROR); - inContext->DrainAndServiceIO(); + this->DrainAndServiceIO(); EXPECT_EQ(callback.ReceiveHandlerCallCount, 1); // Now advance our message counter by 5. @@ -550,7 +547,7 @@ TEST_F(TestSessionManager, SendPacketWithOldCounterTest) err = sessionManager.SendPreparedMessage(aliceToBobSession.Get().Value(), newMessage); EXPECT_EQ(err, CHIP_NO_ERROR); - inContext->DrainAndServiceIO(); + this->DrainAndServiceIO(); EXPECT_EQ(callback.ReceiveHandlerCallCount, 2); // Now resend our original message. It should be rejected as a duplicate. @@ -558,7 +555,7 @@ TEST_F(TestSessionManager, SendPacketWithOldCounterTest) err = sessionManager.SendPreparedMessage(aliceToBobSession.Get().Value(), preparedMessage); EXPECT_EQ(err, CHIP_NO_ERROR); - inContext->DrainAndServiceIO(); + this->DrainAndServiceIO(); EXPECT_EQ(callback.ReceiveHandlerCallCount, 2); sessionManager.Shutdown(); @@ -589,7 +586,7 @@ TEST_F(TestSessionManager, SendPacketWithTooOldCounterTest) EXPECT_EQ(CHIP_NO_ERROR, fabricTableHolder.Init()); EXPECT_EQ(CHIP_NO_ERROR, - sessionManager.Init(&inContext->GetSystemLayer(), &inContext->GetTransportMgr(), &gMessageCounterManager, + sessionManager.Init(&this->GetSystemLayer(), &this->GetTransportMgr(), &gMessageCounterManager, &deviceStorage, &fabricTableHolder.GetFabricTable(), sessionKeystore)); sessionManager.SetMessageDelegate(&callback); @@ -635,7 +632,7 @@ TEST_F(TestSessionManager, SendPacketWithTooOldCounterTest) err = sessionManager.SendPreparedMessage(aliceToBobSession.Get().Value(), preparedMessage); EXPECT_EQ(err, CHIP_NO_ERROR); - inContext->DrainAndServiceIO(); + this->DrainAndServiceIO(); EXPECT_EQ(callback.ReceiveHandlerCallCount, 1); // Now advance our message counter by at least @@ -654,7 +651,7 @@ TEST_F(TestSessionManager, SendPacketWithTooOldCounterTest) err = sessionManager.SendPreparedMessage(aliceToBobSession.Get().Value(), newMessage); EXPECT_EQ(err, CHIP_NO_ERROR); - inContext->DrainAndServiceIO(); + this->DrainAndServiceIO(); EXPECT_EQ(callback.ReceiveHandlerCallCount, 2); // Now resend our original message. It should be rejected as a duplicate. @@ -662,7 +659,7 @@ TEST_F(TestSessionManager, SendPacketWithTooOldCounterTest) err = sessionManager.SendPreparedMessage(aliceToBobSession.Get().Value(), preparedMessage); EXPECT_EQ(err, CHIP_NO_ERROR); - inContext->DrainAndServiceIO(); + this->DrainAndServiceIO(); EXPECT_EQ(callback.ReceiveHandlerCallCount, 2); sessionManager.Shutdown(); @@ -694,7 +691,7 @@ TEST_F(TestSessionManager, SessionAllocationTest) SessionManager sessionManager; EXPECT_EQ(CHIP_NO_ERROR, - sessionManager.Init(&inContext->GetSystemLayer(), &inContext->GetTransportMgr(), &messageCounterManager, + sessionManager.Init(&this->GetSystemLayer(), &this->GetTransportMgr(), &messageCounterManager, &deviceStorage1, &fabricTableHolder.GetFabricTable(), sessionKeystore)); // Allocate a session. @@ -732,7 +729,7 @@ TEST_F(TestSessionManager, SessionAllocationTest) sessionManager.~SessionManager(); new (&sessionManager) SessionManager(); EXPECT_EQ(CHIP_NO_ERROR, - sessionManager.Init(&inContext->GetSystemLayer(), &inContext->GetTransportMgr(), &messageCounterManager, + sessionManager.Init(&this->GetSystemLayer(), &this->GetTransportMgr(), &messageCounterManager, &deviceStorage2, &fabricTableHolder.GetFabricTable(), sessionKeystore)); // Allocate a single session so we know what random id we are starting at. @@ -830,7 +827,7 @@ TEST_F(TestSessionManager, SessionCounterExhaustedTest) EXPECT_EQ(CHIP_NO_ERROR, fabricTableHolder.Init()); EXPECT_EQ(CHIP_NO_ERROR, - sessionManager.Init(&inContext->GetSystemLayer(), &inContext->GetTransportMgr(), &gMessageCounterManager, + sessionManager.Init(&this->GetSystemLayer(), &this->GetTransportMgr(), &gMessageCounterManager, &deviceStorage, &fabricTableHolder.GetFabricTable(), sessionKeystore)); Transport::PeerAddress peer(Transport::PeerAddress::UDP(addr, CHIP_PORT)); @@ -906,7 +903,7 @@ TEST_F(TestSessionManager, SessionShiftingTest) EXPECT_EQ(CHIP_NO_ERROR, fabricTableHolder.Init()); EXPECT_EQ(CHIP_NO_ERROR, - sessionManager.Init(&inContext->GetSystemLayer(), &inContext->GetTransportMgr(), &messageCounterManager, + sessionManager.Init(&this->GetSystemLayer(), &this->GetTransportMgr(), &messageCounterManager, &deviceStorage, &fabricTableHolder.GetFabricTable(), sessionKeystore)); Transport::PeerAddress peer(Transport::PeerAddress::UDP(addr, CHIP_PORT)); @@ -983,7 +980,7 @@ TEST_F(TestSessionManager, TestFindSecureSessionForNode) EXPECT_EQ(CHIP_NO_ERROR, fabricTableHolder.Init()); EXPECT_EQ(CHIP_NO_ERROR, - sessionManager.Init(&inContext->GetSystemLayer(), &inContext->GetTransportMgr(), &messageCounterManager, + sessionManager.Init(&this->GetSystemLayer(), &this->GetTransportMgr(), &messageCounterManager, &deviceStorage, &fabricTableHolder.GetFabricTable(), sessionKeystore)); Transport::PeerAddress peer(Transport::PeerAddress::UDP(addr, CHIP_PORT));