From 447f193c87862391208742573886525f595652cd Mon Sep 17 00:00:00 2001 From: Zang MingJie Date: Thu, 9 Sep 2021 15:41:37 +0800 Subject: [PATCH] Rename Local and Peer in message tests into Alice and Bob --- src/app/tests/TestReadInteraction.cpp | 12 +++--- src/app/tests/TestWriteInteraction.cpp | 11 +++-- src/messaging/tests/MessagingContext.cpp | 20 ++++----- src/messaging/tests/MessagingContext.h | 42 +++++++++---------- src/messaging/tests/TestExchangeMgr.cpp | 20 ++++----- .../tests/TestReliableMessageProtocol.cpp | 38 ++++++++--------- .../secure_channel/tests/TestCASESession.cpp | 18 ++++---- .../tests/TestMessageCounterManager.cpp | 8 ++-- .../secure_channel/tests/TestPASESession.cpp | 16 +++---- 9 files changed, 92 insertions(+), 93 deletions(-) diff --git a/src/app/tests/TestReadInteraction.cpp b/src/app/tests/TestReadInteraction.cpp index 6dfe57bf4872c5..be52e93a774dcf 100644 --- a/src/app/tests/TestReadInteraction.cpp +++ b/src/app/tests/TestReadInteraction.cpp @@ -322,7 +322,7 @@ void TestReadInteraction::TestReadClient(nlTestSuite * apSuite, void * apContext System::PacketBufferHandle buf = System::PacketBufferHandle::New(System::PacketBuffer::kMaxSize); err = readClient.Init(&ctx.GetExchangeManager(), &delegate, 0 /* application identifier */); NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR); - ReadPrepareParams readPrepareParams(ctx.GetSessionLocalToPeer()); + ReadPrepareParams readPrepareParams(ctx.GetSessionBobToAlice()); err = readClient.SendReadRequest(readPrepareParams); NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR); @@ -347,7 +347,7 @@ void TestReadInteraction::TestReadHandler(nlTestSuite * apSuite, void * apContex auto * engine = chip::app::InteractionModelEngine::GetInstance(); err = engine->Init(&ctx.GetExchangeManager(), &delegate); NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR); - Messaging::ExchangeContext * exchangeCtx = ctx.NewExchangeToPeer(nullptr); + Messaging::ExchangeContext * exchangeCtx = ctx.NewExchangeToAlice(nullptr); readHandler.Init(&ctx.GetExchangeManager(), nullptr, exchangeCtx); GenerateReportData(apSuite, apContext, reportDatabuf); @@ -449,7 +449,7 @@ void TestReadInteraction::TestReadClientInvalidReport(nlTestSuite * apSuite, voi err = readClient.Init(&ctx.GetExchangeManager(), &delegate, 0 /* application identifier */); NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR); - ReadPrepareParams readPrepareParams(ctx.GetSessionLocalToPeer()); + ReadPrepareParams readPrepareParams(ctx.GetSessionBobToAlice()); err = readClient.SendReadRequest(readPrepareParams); NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR); @@ -475,7 +475,7 @@ void TestReadInteraction::TestReadHandlerInvalidAttributePath(nlTestSuite * apSu auto * engine = chip::app::InteractionModelEngine::GetInstance(); err = engine->Init(&ctx.GetExchangeManager(), &delegate); NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR); - Messaging::ExchangeContext * exchangeCtx = ctx.NewExchangeToPeer(nullptr); + Messaging::ExchangeContext * exchangeCtx = ctx.NewExchangeToAlice(nullptr); readHandler.Init(&ctx.GetExchangeManager(), nullptr, exchangeCtx); GenerateReportData(apSuite, apContext, reportDatabuf); @@ -656,7 +656,7 @@ void TestReadInteraction::TestReadRoundtrip(nlTestSuite * apSuite, void * apCont attributePathParams[1].mFlags.Set(chip::app::AttributePathParams::Flags::kFieldIdValid); attributePathParams[1].mFlags.Set(chip::app::AttributePathParams::Flags::kListIndexValid); - ReadPrepareParams readPrepareParams(ctx.GetSessionLocalToPeer()); + ReadPrepareParams readPrepareParams(ctx.GetSessionBobToAlice()); readPrepareParams.mpEventPathParamsList = eventPathParams; readPrepareParams.mEventPathParamsListSize = 2; readPrepareParams.mpAttributePathParamsList = attributePathParams; @@ -701,7 +701,7 @@ void TestReadInteraction::TestReadInvalidAttributePathRoundtrip(nlTestSuite * ap attributePathParams[0].mListIndex = 0; attributePathParams[0].mFlags.Set(chip::app::AttributePathParams::Flags::kFieldIdValid); - ReadPrepareParams readPrepareParams(ctx.GetSessionLocalToPeer()); + ReadPrepareParams readPrepareParams(ctx.GetSessionBobToAlice()); readPrepareParams.mpAttributePathParamsList = attributePathParams; readPrepareParams.mAttributePathParamsListSize = 1; err = chip::app::InteractionModelEngine::GetInstance()->SendReadRequest(readPrepareParams); diff --git a/src/app/tests/TestWriteInteraction.cpp b/src/app/tests/TestWriteInteraction.cpp index 81b955212491ba..9d8802a6c85d17 100644 --- a/src/app/tests/TestWriteInteraction.cpp +++ b/src/app/tests/TestWriteInteraction.cpp @@ -216,9 +216,8 @@ void TestWriteInteraction::TestWriteClient(nlTestSuite * apSuite, void * apConte NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR); AddAttributeDataElement(apSuite, apContext, writeClientHandle); - SessionHandle session = ctx.GetSessionLocalToPeer(); - err = writeClientHandle.SendWriteRequest(ctx.GetDestinationNodeId(), ctx.GetFabricIndex(), - Optional::Value(session)); + SessionHandle session = ctx.GetSessionBobToAlice(); + err = writeClientHandle.SendWriteRequest(ctx.GetAliceNodeId(), ctx.GetFabricIndex(), Optional::Value(session)); NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR); // The internal WriteClient should be nullptr once we SendWriteRequest. NL_TEST_ASSERT(apSuite, nullptr == writeClientHandle.mpWriteClient); @@ -249,7 +248,7 @@ void TestWriteInteraction::TestWriteHandler(nlTestSuite * apSuite, void * apCont GenerateWriteRequest(apSuite, apContext, buf); TestExchangeDelegate delegate; - Messaging::ExchangeContext * exchange = ctx.NewExchangeToLocal(&delegate); + Messaging::ExchangeContext * exchange = ctx.NewExchangeToBob(&delegate); err = writeHandler.OnWriteRequest(exchange, std::move(buf)); NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR); @@ -305,9 +304,9 @@ void TestWriteInteraction::TestWriteRoundtrip(nlTestSuite * apSuite, void * apCo NL_TEST_ASSERT(apSuite, !delegate.mGotResponse); - SessionHandle session = ctx.GetSessionLocalToPeer(); + SessionHandle session = ctx.GetSessionBobToAlice(); - err = writeClient.SendWriteRequest(ctx.GetDestinationNodeId(), ctx.GetFabricIndex(), Optional::Value(session)); + err = writeClient.SendWriteRequest(ctx.GetAliceNodeId(), ctx.GetFabricIndex(), Optional::Value(session)); NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR); NL_TEST_ASSERT(apSuite, delegate.mGotResponse); diff --git a/src/messaging/tests/MessagingContext.cpp b/src/messaging/tests/MessagingContext.cpp index 10c2ceca50d4a6..dc96e07fb9146e 100644 --- a/src/messaging/tests/MessagingContext.cpp +++ b/src/messaging/tests/MessagingContext.cpp @@ -37,10 +37,10 @@ CHIP_ERROR MessagingContext::Init(nlTestSuite * suite, TransportMgrBase * transp ReturnErrorOnFailure(mExchangeManager.Init(&mSecureSessionMgr)); ReturnErrorOnFailure(mMessageCounterManager.Init(&mExchangeManager)); - ReturnErrorOnFailure(mSecureSessionMgr.NewPairing(mPeer, GetDestinationNodeId(), &mPairingLocalToPeer, + ReturnErrorOnFailure(mSecureSessionMgr.NewPairing(mAddress, GetAliceNodeId(), &mPairingBobToAlice, SecureSession::SessionRole::kInitiator, mSrcFabricIndex)); - return mSecureSessionMgr.NewPairing(mPeer, GetSourceNodeId(), &mPairingPeerToLocal, SecureSession::SessionRole::kResponder, + return mSecureSessionMgr.NewPairing(mAddress, GetBobNodeId(), &mPairingAliceToBob, SecureSession::SessionRole::kResponder, mDestFabricIndex); } @@ -55,28 +55,28 @@ CHIP_ERROR MessagingContext::Shutdown() return CHIP_NO_ERROR; } -SessionHandle MessagingContext::GetSessionLocalToPeer() +SessionHandle MessagingContext::GetSessionBobToAlice() { // TODO: temporarily create a SessionHandle from node id, will be fixed in PR 3602 - return SessionHandle(GetDestinationNodeId(), GetLocalKeyId(), GetPeerKeyId(), GetFabricIndex()); + return SessionHandle(GetAliceNodeId(), GetBobKeyId(), GetAliceKeyId(), GetFabricIndex()); } -SessionHandle MessagingContext::GetSessionPeerToLocal() +SessionHandle MessagingContext::GetSessionAliceToBob() { // TODO: temporarily create a SessionHandle from node id, will be fixed in PR 3602 - return SessionHandle(GetSourceNodeId(), GetPeerKeyId(), GetLocalKeyId(), mDestFabricIndex); + return SessionHandle(GetBobNodeId(), GetAliceKeyId(), GetBobKeyId(), mDestFabricIndex); } -Messaging::ExchangeContext * MessagingContext::NewExchangeToPeer(Messaging::ExchangeDelegate * delegate) +Messaging::ExchangeContext * MessagingContext::NewExchangeToAlice(Messaging::ExchangeDelegate * delegate) { // TODO: temprary create a SessionHandle from node id, will be fix in PR 3602 - return mExchangeManager.NewContext(GetSessionLocalToPeer(), delegate); + return mExchangeManager.NewContext(GetSessionBobToAlice(), delegate); } -Messaging::ExchangeContext * MessagingContext::NewExchangeToLocal(Messaging::ExchangeDelegate * delegate) +Messaging::ExchangeContext * MessagingContext::NewExchangeToBob(Messaging::ExchangeDelegate * delegate) { // TODO: temprary create a SessionHandle from node id, will be fix in PR 3602 - return mExchangeManager.NewContext(GetSessionPeerToLocal(), delegate); + return mExchangeManager.NewContext(GetSessionAliceToBob(), delegate); } } // namespace Test diff --git a/src/messaging/tests/MessagingContext.h b/src/messaging/tests/MessagingContext.h index fc441646d8d041..6bb4e70df69eb0 100644 --- a/src/messaging/tests/MessagingContext.h +++ b/src/messaging/tests/MessagingContext.h @@ -37,8 +37,8 @@ class MessagingContext { public: MessagingContext() : - mInitialized(false), mPeer(Transport::PeerAddress::UDP(GetAddress(), CHIP_PORT)), - mPairingPeerToLocal(GetLocalKeyId(), GetPeerKeyId()), mPairingLocalToPeer(GetPeerKeyId(), GetLocalKeyId()) + mInitialized(false), mAddress(Transport::PeerAddress::UDP(GetAddress(), CHIP_PORT)), + mPairingAliceToBob(GetBobKeyId(), GetAliceKeyId()), mPairingBobToAlice(GetAliceKeyId(), GetBobKeyId()) {} ~MessagingContext() { VerifyOrDie(mInitialized == false); } @@ -54,17 +54,17 @@ class MessagingContext Inet::IPAddress::FromString("127.0.0.1", addr); return addr; } - NodeId GetSourceNodeId() const { return mSourceNodeId; } - NodeId GetDestinationNodeId() const { return mDestinationNodeId; } + NodeId GetBobNodeId() const { return mBobNodeId; } + NodeId GetAliceNodeId() const { return mAliceNodeId; } - void SetSourceNodeId(NodeId nodeId) { mSourceNodeId = nodeId; } - void SetDestinationNodeId(NodeId nodeId) { mDestinationNodeId = nodeId; } + void SetBobNodeId(NodeId nodeId) { mBobNodeId = nodeId; } + void SetAliceNodeId(NodeId nodeId) { mAliceNodeId = nodeId; } - uint16_t GetLocalKeyId() const { return mLocalKeyId; } - uint16_t GetPeerKeyId() const { return mPeerKeyId; } + uint16_t GetBobKeyId() const { return mBobKeyId; } + uint16_t GetAliceKeyId() const { return mAliceKeyId; } - void SetLocalKeyId(uint16_t id) { mLocalKeyId = id; } - void SetPeerKeyId(uint16_t id) { mPeerKeyId = id; } + void SetBobKeyId(uint16_t id) { mBobKeyId = id; } + void SetAliceKeyId(uint16_t id) { mAliceKeyId = id; } FabricIndex GetFabricIndex() const { return mSrcFabricIndex; } void SetFabricIndex(FabricIndex id) @@ -77,11 +77,11 @@ class MessagingContext Messaging::ExchangeManager & GetExchangeManager() { return mExchangeManager; } secure_channel::MessageCounterManager & GetMessageCounterManager() { return mMessageCounterManager; } - SessionHandle GetSessionLocalToPeer(); - SessionHandle GetSessionPeerToLocal(); + SessionHandle GetSessionBobToAlice(); + SessionHandle GetSessionAliceToBob(); - Messaging::ExchangeContext * NewExchangeToPeer(Messaging::ExchangeDelegate * delegate); - Messaging::ExchangeContext * NewExchangeToLocal(Messaging::ExchangeDelegate * delegate); + Messaging::ExchangeContext * NewExchangeToAlice(Messaging::ExchangeDelegate * delegate); + Messaging::ExchangeContext * NewExchangeToBob(Messaging::ExchangeDelegate * delegate); Credentials::OperationalCredentialSet & GetOperationalCredentialSet() { return mOperationalCredentialSet; } @@ -94,13 +94,13 @@ class MessagingContext secure_channel::MessageCounterManager mMessageCounterManager; IOContext * mIOContext; - NodeId mSourceNodeId = 123654; - NodeId mDestinationNodeId = 111222333; - uint16_t mLocalKeyId = 1; - uint16_t mPeerKeyId = 2; - Optional mPeer; - SecurePairingUsingTestSecret mPairingPeerToLocal; - SecurePairingUsingTestSecret mPairingLocalToPeer; + NodeId mBobNodeId = 123654; + NodeId mAliceNodeId = 111222333; + uint16_t mBobKeyId = 1; + uint16_t mAliceKeyId = 2; + Optional mAddress; + SecurePairingUsingTestSecret mPairingAliceToBob; + SecurePairingUsingTestSecret mPairingBobToAlice; Transport::FabricTable mFabrics; FabricIndex mSrcFabricIndex = 0; FabricIndex mDestFabricIndex = 0; diff --git a/src/messaging/tests/TestExchangeMgr.cpp b/src/messaging/tests/TestExchangeMgr.cpp index ae58e04a068f26..7733d5becd9a09 100644 --- a/src/messaging/tests/TestExchangeMgr.cpp +++ b/src/messaging/tests/TestExchangeMgr.cpp @@ -95,21 +95,21 @@ void CheckNewContextTest(nlTestSuite * inSuite, void * inContext) TestContext & ctx = *reinterpret_cast(inContext); MockAppDelegate mockAppDelegate; - ExchangeContext * ec1 = ctx.NewExchangeToLocal(&mockAppDelegate); + ExchangeContext * ec1 = ctx.NewExchangeToBob(&mockAppDelegate); NL_TEST_ASSERT(inSuite, ec1 != nullptr); NL_TEST_ASSERT(inSuite, ec1->IsInitiator() == true); NL_TEST_ASSERT(inSuite, ec1->GetExchangeId() != 0); auto sessionPeerToLocal = ctx.GetSecureSessionManager().GetPeerConnectionState(ec1->GetSecureSession()); - NL_TEST_ASSERT(inSuite, sessionPeerToLocal->GetPeerNodeId() == ctx.GetSourceNodeId()); - NL_TEST_ASSERT(inSuite, sessionPeerToLocal->GetPeerKeyID() == ctx.GetLocalKeyId()); + NL_TEST_ASSERT(inSuite, sessionPeerToLocal->GetPeerNodeId() == ctx.GetBobNodeId()); + NL_TEST_ASSERT(inSuite, sessionPeerToLocal->GetPeerKeyID() == ctx.GetBobKeyId()); NL_TEST_ASSERT(inSuite, ec1->GetDelegate() == &mockAppDelegate); - ExchangeContext * ec2 = ctx.NewExchangeToPeer(&mockAppDelegate); + ExchangeContext * ec2 = ctx.NewExchangeToAlice(&mockAppDelegate); NL_TEST_ASSERT(inSuite, ec2 != nullptr); NL_TEST_ASSERT(inSuite, ec2->GetExchangeId() > ec1->GetExchangeId()); auto sessionLocalToPeer = ctx.GetSecureSessionManager().GetPeerConnectionState(ec2->GetSecureSession()); - NL_TEST_ASSERT(inSuite, sessionLocalToPeer->GetPeerNodeId() == ctx.GetDestinationNodeId()); - NL_TEST_ASSERT(inSuite, sessionLocalToPeer->GetPeerKeyID() == ctx.GetPeerKeyId()); + NL_TEST_ASSERT(inSuite, sessionLocalToPeer->GetPeerNodeId() == ctx.GetAliceNodeId()); + NL_TEST_ASSERT(inSuite, sessionLocalToPeer->GetPeerKeyID() == ctx.GetAliceKeyId()); ec1->Close(); ec2->Close(); @@ -120,7 +120,7 @@ void CheckSessionExpirationBasics(nlTestSuite * inSuite, void * inContext) TestContext & ctx = *reinterpret_cast(inContext); MockAppDelegate sendDelegate; - ExchangeContext * ec1 = ctx.NewExchangeToLocal(&sendDelegate); + ExchangeContext * ec1 = ctx.NewExchangeToBob(&sendDelegate); // Expire the session this exchange is supposedly on. ctx.GetExchangeManager().OnConnectionExpired(ec1->GetSecureSession()); @@ -145,7 +145,7 @@ void CheckSessionExpirationTimeout(nlTestSuite * inSuite, void * inContext) TestContext & ctx = *reinterpret_cast(inContext); WaitForTimeoutDelegate sendDelegate; - ExchangeContext * ec1 = ctx.NewExchangeToLocal(&sendDelegate); + ExchangeContext * ec1 = ctx.NewExchangeToBob(&sendDelegate); ec1->SendMessage(Protocols::BDX::Id, kMsgType_TEST1, System::PacketBufferHandle::New(System::PacketBuffer::kMaxSize), SendFlags(Messaging::SendMessageFlags::kExpectResponse).Set(Messaging::SendMessageFlags::kNoAutoRequestAck)); @@ -191,7 +191,7 @@ void CheckExchangeMessages(nlTestSuite * inSuite, void * inContext) // create solicited exchange MockAppDelegate mockSolicitedAppDelegate; - ExchangeContext * ec1 = ctx.NewExchangeToPeer(&mockSolicitedAppDelegate); + ExchangeContext * ec1 = ctx.NewExchangeToAlice(&mockSolicitedAppDelegate); // create unsolicited exchange MockAppDelegate mockUnsolicitedAppDelegate; @@ -204,7 +204,7 @@ void CheckExchangeMessages(nlTestSuite * inSuite, void * inContext) SendFlags(Messaging::SendMessageFlags::kNoAutoRequestAck)); NL_TEST_ASSERT(inSuite, !mockUnsolicitedAppDelegate.IsOnMessageReceivedCalled); - ec1 = ctx.NewExchangeToPeer(&mockSolicitedAppDelegate); + ec1 = ctx.NewExchangeToAlice(&mockSolicitedAppDelegate); // send a good packet ec1->SendMessage(Protocols::BDX::Id, kMsgType_TEST1, System::PacketBufferHandle::New(System::PacketBuffer::kMaxSize), diff --git a/src/messaging/tests/TestReliableMessageProtocol.cpp b/src/messaging/tests/TestReliableMessageProtocol.cpp index 45af7707f7253a..1f5a4b94ab217f 100644 --- a/src/messaging/tests/TestReliableMessageProtocol.cpp +++ b/src/messaging/tests/TestReliableMessageProtocol.cpp @@ -192,7 +192,7 @@ void CheckAddClearRetrans(nlTestSuite * inSuite, void * inContext) TestContext & ctx = *reinterpret_cast(inContext); MockAppDelegate mockAppDelegate; - ExchangeContext * exchange = ctx.NewExchangeToPeer(&mockAppDelegate); + ExchangeContext * exchange = ctx.NewExchangeToAlice(&mockAppDelegate); NL_TEST_ASSERT(inSuite, exchange != nullptr); ReliableMessageMgr * rm = ctx.GetExchangeManager().GetReliableMessageMgr(); @@ -215,7 +215,7 @@ void CheckFailRetrans(nlTestSuite * inSuite, void * inContext) TestContext & ctx = *reinterpret_cast(inContext); MockAppDelegate mockAppDelegate; - ExchangeContext * exchange = ctx.NewExchangeToPeer(&mockAppDelegate); + ExchangeContext * exchange = ctx.NewExchangeToAlice(&mockAppDelegate); NL_TEST_ASSERT(inSuite, exchange != nullptr); ReliableMessageMgr * rm = ctx.GetExchangeManager().GetReliableMessageMgr(); @@ -243,7 +243,7 @@ void CheckResendApplicationMessage(nlTestSuite * inSuite, void * inContext) MockAppDelegate mockSender; // TODO: temporarily create a SessionHandle from node id, will be fix in PR 3602 - ExchangeContext * exchange = ctx.NewExchangeToPeer(&mockSender); + ExchangeContext * exchange = ctx.NewExchangeToAlice(&mockSender); NL_TEST_ASSERT(inSuite, exchange != nullptr); ReliableMessageMgr * rm = ctx.GetExchangeManager().GetReliableMessageMgr(); @@ -308,7 +308,7 @@ void CheckCloseExchangeAndResendApplicationMessage(nlTestSuite * inSuite, void * MockAppDelegate mockSender; // TODO: temporarily create a SessionHandle from node id, will be fixed in PR 3602 - ExchangeContext * exchange = ctx.NewExchangeToPeer(&mockSender); + ExchangeContext * exchange = ctx.NewExchangeToAlice(&mockSender); NL_TEST_ASSERT(inSuite, exchange != nullptr); ReliableMessageMgr * rm = ctx.GetExchangeManager().GetReliableMessageMgr(); @@ -367,7 +367,7 @@ void CheckFailedMessageRetainOnSend(nlTestSuite * inSuite, void * inContext) CHIP_ERROR err = CHIP_NO_ERROR; MockSessionEstablishmentDelegate mockSender; - ExchangeContext * exchange = ctx.NewExchangeToPeer(&mockSender); + ExchangeContext * exchange = ctx.NewExchangeToAlice(&mockSender); NL_TEST_ASSERT(inSuite, exchange != nullptr); ReliableMessageMgr * rm = ctx.GetExchangeManager().GetReliableMessageMgr(); @@ -421,7 +421,7 @@ void CheckUnencryptedMessageReceiveFailure(nlTestSuite * inSuite, void * inConte mockReceiver.mMessageDispatch.mRequireEncryption = true; MockSessionEstablishmentDelegate mockSender; - ExchangeContext * exchange = ctx.NewExchangeToPeer(&mockSender); + ExchangeContext * exchange = ctx.NewExchangeToAlice(&mockSender); NL_TEST_ASSERT(inSuite, exchange != nullptr); ReliableMessageMgr * rm = ctx.GetExchangeManager().GetReliableMessageMgr(); @@ -463,7 +463,7 @@ void CheckResendApplicationMessageWithPeerExchange(nlTestSuite * inSuite, void * mockReceiver.mTestSuite = inSuite; MockAppDelegate mockSender; - ExchangeContext * exchange = ctx.NewExchangeToPeer(&mockSender); + ExchangeContext * exchange = ctx.NewExchangeToAlice(&mockSender); NL_TEST_ASSERT(inSuite, exchange != nullptr); ReliableMessageMgr * rm = ctx.GetExchangeManager().GetReliableMessageMgr(); @@ -525,7 +525,7 @@ void CheckDuplicateMessageClosedExchange(nlTestSuite * inSuite, void * inContext mockReceiver.mTestSuite = inSuite; MockAppDelegate mockSender; - ExchangeContext * exchange = ctx.NewExchangeToPeer(&mockSender); + ExchangeContext * exchange = ctx.NewExchangeToAlice(&mockSender); NL_TEST_ASSERT(inSuite, exchange != nullptr); ReliableMessageMgr * rm = ctx.GetExchangeManager().GetReliableMessageMgr(); @@ -584,10 +584,10 @@ void CheckResendSessionEstablishmentMessageWithPeerExchange(nlTestSuite * inSuit CHIP_ERROR err = ctx.Init(inSuite, &gTransportMgr, &gIOContext); NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR); - ctx.SetSourceNodeId(kPlaceholderNodeId); - ctx.SetDestinationNodeId(kPlaceholderNodeId); - ctx.SetLocalKeyId(0); - ctx.SetPeerKeyId(0); + ctx.SetBobNodeId(kPlaceholderNodeId); + ctx.SetAliceNodeId(kPlaceholderNodeId); + ctx.SetBobKeyId(0); + ctx.SetAliceKeyId(0); ctx.SetFabricIndex(kUndefinedFabricIndex); chip::System::PacketBufferHandle buffer = chip::MessagePacketBuffer::NewWithData(PAYLOAD, sizeof(PAYLOAD)); @@ -600,7 +600,7 @@ void CheckResendSessionEstablishmentMessageWithPeerExchange(nlTestSuite * inSuit mockReceiver.mTestSuite = inSuite; MockSessionEstablishmentDelegate mockSender; - ExchangeContext * exchange = ctx.NewExchangeToPeer(&mockSender); + ExchangeContext * exchange = ctx.NewExchangeToAlice(&mockSender); NL_TEST_ASSERT(inSuite, exchange != nullptr); ReliableMessageMgr * rm = ctx.GetExchangeManager().GetReliableMessageMgr(); @@ -676,7 +676,7 @@ void CheckDuplicateMessage(nlTestSuite * inSuite, void * inContext) mockReceiver.mTestSuite = inSuite; MockAppDelegate mockSender; - ExchangeContext * exchange = ctx.NewExchangeToPeer(&mockSender); + ExchangeContext * exchange = ctx.NewExchangeToAlice(&mockSender); NL_TEST_ASSERT(inSuite, exchange != nullptr); ReliableMessageMgr * rm = ctx.GetExchangeManager().GetReliableMessageMgr(); @@ -746,7 +746,7 @@ void CheckReceiveAfterStandaloneAck(nlTestSuite * inSuite, void * inContext) mockReceiver.mTestSuite = inSuite; MockAppDelegate mockSender; - ExchangeContext * exchange = ctx.NewExchangeToPeer(&mockSender); + ExchangeContext * exchange = ctx.NewExchangeToAlice(&mockSender); NL_TEST_ASSERT(inSuite, exchange != nullptr); mockSender.mTestSuite = inSuite; @@ -831,7 +831,7 @@ void CheckNoPiggybackAfterPiggyback(nlTestSuite * inSuite, void * inContext) mockReceiver.mTestSuite = inSuite; MockAppDelegate mockSender; - ExchangeContext * exchange = ctx.NewExchangeToPeer(&mockSender); + ExchangeContext * exchange = ctx.NewExchangeToAlice(&mockSender); NL_TEST_ASSERT(inSuite, exchange != nullptr); mockSender.mTestSuite = inSuite; @@ -958,7 +958,7 @@ void CheckSendUnsolicitedStandaloneAckMessage(nlTestSuite * inSuite, void * inCo CHIP_ERROR err = CHIP_NO_ERROR; MockAppDelegate mockSender; - ExchangeContext * exchange = ctx.NewExchangeToPeer(&mockSender); + ExchangeContext * exchange = ctx.NewExchangeToAlice(&mockSender); NL_TEST_ASSERT(inSuite, exchange != nullptr); mockSender.mTestSuite = inSuite; @@ -994,7 +994,7 @@ void CheckSendStandaloneAckMessage(nlTestSuite * inSuite, void * inContext) TestContext & ctx = *reinterpret_cast(inContext); MockAppDelegate mockAppDelegate; - ExchangeContext * exchange = ctx.NewExchangeToPeer(&mockAppDelegate); + ExchangeContext * exchange = ctx.NewExchangeToAlice(&mockAppDelegate); NL_TEST_ASSERT(inSuite, exchange != nullptr); ReliableMessageMgr * rm = ctx.GetExchangeManager().GetReliableMessageMgr(); @@ -1038,7 +1038,7 @@ void CheckMessageAfterClosed(nlTestSuite * inSuite, void * inContext) mockReceiver.mTestSuite = inSuite; MockAppDelegate mockSender; - ExchangeContext * exchange = ctx.NewExchangeToPeer(&mockSender); + ExchangeContext * exchange = ctx.NewExchangeToAlice(&mockSender); NL_TEST_ASSERT(inSuite, exchange != nullptr); mockSender.mTestSuite = inSuite; diff --git a/src/protocols/secure_channel/tests/TestCASESession.cpp b/src/protocols/secure_channel/tests/TestCASESession.cpp index a568e9ed9ad841..2868e7373ded63 100644 --- a/src/protocols/secure_channel/tests/TestCASESession.cpp +++ b/src/protocols/secure_channel/tests/TestCASESession.cpp @@ -177,7 +177,7 @@ void CASE_SecurePairingStartTest(nlTestSuite * inSuite, void * inContext) NL_TEST_ASSERT(inSuite, fabric != nullptr); NL_TEST_ASSERT(inSuite, pairing.MessageDispatch().Init(&gTransportMgr) == CHIP_NO_ERROR); - ExchangeContext * context = ctx.NewExchangeToLocal(&pairing); + ExchangeContext * context = ctx.NewExchangeToBob(&pairing); NL_TEST_ASSERT(inSuite, pairing.EstablishSession(Transport::PeerAddress(Transport::Type::kBle), nullptr, Node01_01, 0, nullptr, @@ -198,7 +198,7 @@ void CASE_SecurePairingStartTest(nlTestSuite * inSuite, void * inContext) gLoopback.mSentMessageCount = 0; gLoopback.mMessageSendError = CHIP_ERROR_BAD_REQUEST; - ExchangeContext * context1 = ctx.NewExchangeToLocal(&pairing1); + ExchangeContext * context1 = ctx.NewExchangeToBob(&pairing1); NL_TEST_ASSERT(inSuite, pairing1.EstablishSession(Transport::PeerAddress(Transport::Type::kBle), fabric, Node01_01, 0, context1, @@ -225,7 +225,7 @@ void CASE_SecurePairingHandshakeTestCommon(nlTestSuite * inSuite, void * inConte ctx.GetExchangeManager().RegisterUnsolicitedMessageHandlerForType( Protocols::SecureChannel::MsgType::CASE_SigmaR1, &pairingAccessory) == CHIP_NO_ERROR); - ExchangeContext * contextCommissioner = ctx.NewExchangeToLocal(&pairingCommissioner); + ExchangeContext * contextCommissioner = ctx.NewExchangeToBob(&pairingCommissioner); FabricInfo * fabric = gCommissionerFabrics.FindFabricWithIndex(gCommissionerFabricIndex); NL_TEST_ASSERT(inSuite, fabric != nullptr); @@ -353,7 +353,7 @@ void CASE_SecurePairingHandshakeServerTest(nlTestSuite * inSuite, void * inConte &ctx.GetSecureSessionManager(), &gDeviceFabrics, &idAllocator) == CHIP_NO_ERROR); - ExchangeContext * contextCommissioner = ctx.NewExchangeToLocal(pairingCommissioner); + ExchangeContext * contextCommissioner = ctx.NewExchangeToBob(pairingCommissioner); FabricInfo * fabric = gCommissionerFabrics.FindFabricWithIndex(gCommissionerFabricIndex); NL_TEST_ASSERT(inSuite, fabric != nullptr); @@ -367,7 +367,7 @@ void CASE_SecurePairingHandshakeServerTest(nlTestSuite * inSuite, void * inConte auto * pairingCommissioner1 = chip::Platform::New(); NL_TEST_ASSERT(inSuite, pairingCommissioner1->MessageDispatch().Init(&gTransportMgr) == CHIP_NO_ERROR); - ExchangeContext * contextCommissioner1 = ctx.NewExchangeToLocal(pairingCommissioner1); + ExchangeContext * contextCommissioner1 = ctx.NewExchangeToBob(pairingCommissioner1); NL_TEST_ASSERT(inSuite, pairingCommissioner1->EstablishSession(Transport::PeerAddress(Transport::Type::kBle), fabric, Node01_01, 0, @@ -480,10 +480,10 @@ CHIP_ERROR CASETestSecurePairingSetup(void * inContext) ReturnErrorOnFailure(ctx.Init(&sSuite, &gTransportMgr, &gIOContext)); - ctx.SetSourceNodeId(kPlaceholderNodeId); - ctx.SetDestinationNodeId(kPlaceholderNodeId); - ctx.SetLocalKeyId(0); - ctx.SetPeerKeyId(0); + ctx.SetBobNodeId(kPlaceholderNodeId); + ctx.SetAliceNodeId(kPlaceholderNodeId); + ctx.SetBobKeyId(0); + ctx.SetAliceKeyId(0); ctx.SetFabricIndex(kUndefinedFabricIndex); gTransportMgr.SetSecureSessionMgr(&ctx.GetSecureSessionManager()); diff --git a/src/protocols/secure_channel/tests/TestMessageCounterManager.cpp b/src/protocols/secure_channel/tests/TestMessageCounterManager.cpp index 699a488788b212..1548d78e4bf37b 100644 --- a/src/protocols/secure_channel/tests/TestMessageCounterManager.cpp +++ b/src/protocols/secure_channel/tests/TestMessageCounterManager.cpp @@ -78,8 +78,8 @@ void MessageCounterSyncProcess(nlTestSuite * inSuite, void * inContext) CHIP_ERROR err = CHIP_NO_ERROR; - SessionHandle localSession = ctx.GetSessionLocalToPeer(); - SessionHandle peerSession = ctx.GetSessionPeerToLocal(); + SessionHandle localSession = ctx.GetSessionBobToAlice(); + SessionHandle peerSession = ctx.GetSessionAliceToBob(); Transport::PeerConnectionState * localState = ctx.GetSecureSessionManager().GetPeerConnectionState(localSession); Transport::PeerConnectionState * peerState = ctx.GetSecureSessionManager().GetPeerConnectionState(peerSession); @@ -99,7 +99,7 @@ void CheckReceiveMessage(nlTestSuite * inSuite, void * inContext) TestContext & ctx = *reinterpret_cast(inContext); CHIP_ERROR err = CHIP_NO_ERROR; - SessionHandle peerSession = ctx.GetSessionPeerToLocal(); + SessionHandle peerSession = ctx.GetSessionAliceToBob(); Transport::PeerConnectionState * peerState = ctx.GetSecureSessionManager().GetPeerConnectionState(peerSession); peerState->GetSessionMessageCounter().GetPeerMessageCounter().Reset(); @@ -110,7 +110,7 @@ void CheckReceiveMessage(nlTestSuite * inSuite, void * inContext) System::PacketBufferHandle msgBuf = MessagePacketBuffer::NewWithData(PAYLOAD, payload_len); NL_TEST_ASSERT(inSuite, !msgBuf.IsNull()); - Messaging::ExchangeContext * ec = ctx.NewExchangeToPeer(nullptr); + Messaging::ExchangeContext * ec = ctx.NewExchangeToAlice(nullptr); NL_TEST_ASSERT(inSuite, ec != nullptr); err = ec->SendMessage(chip::Protocols::Echo::MsgType::EchoRequest, std::move(msgBuf), diff --git a/src/protocols/secure_channel/tests/TestPASESession.cpp b/src/protocols/secure_channel/tests/TestPASESession.cpp index 330299c655e4dc..417b5bd3a212a3 100644 --- a/src/protocols/secure_channel/tests/TestPASESession.cpp +++ b/src/protocols/secure_channel/tests/TestPASESession.cpp @@ -123,7 +123,7 @@ void SecurePairingStartTest(nlTestSuite * inSuite, void * inContext) gLoopback.Reset(); NL_TEST_ASSERT(inSuite, pairing.MessageDispatch().Init(&gTransportMgr) == CHIP_NO_ERROR); - ExchangeContext * context = ctx.NewExchangeToLocal(&pairing); + ExchangeContext * context = ctx.NewExchangeToBob(&pairing); NL_TEST_ASSERT(inSuite, pairing.Pair(Transport::PeerAddress(Transport::Type::kBle), 1234, 0, nullptr, nullptr) != CHIP_NO_ERROR); @@ -140,7 +140,7 @@ void SecurePairingStartTest(nlTestSuite * inSuite, void * inContext) PASESession pairing1; NL_TEST_ASSERT(inSuite, pairing1.MessageDispatch().Init(&gTransportMgr) == CHIP_NO_ERROR); - ExchangeContext * context1 = ctx.NewExchangeToLocal(&pairing1); + ExchangeContext * context1 = ctx.NewExchangeToBob(&pairing1); NL_TEST_ASSERT(inSuite, pairing1.Pair(Transport::PeerAddress(Transport::Type::kBle), 1234, 0, context1, &delegate) == CHIP_ERROR_BAD_REQUEST); @@ -160,7 +160,7 @@ void SecurePairingHandshakeTestCommon(nlTestSuite * inSuite, void * inContext, P NL_TEST_ASSERT(inSuite, pairingCommissioner.MessageDispatch().Init(&gTransportMgr) == CHIP_NO_ERROR); NL_TEST_ASSERT(inSuite, pairingAccessory.MessageDispatch().Init(&gTransportMgr) == CHIP_NO_ERROR); - ExchangeContext * contextCommissioner = ctx.NewExchangeToLocal(&pairingCommissioner); + ExchangeContext * contextCommissioner = ctx.NewExchangeToBob(&pairingCommissioner); if (gLoopback.mNumMessagesToDrop != 0) { @@ -234,7 +234,7 @@ void SecurePairingFailedHandshake(nlTestSuite * inSuite, void * inContext) NL_TEST_ASSERT(inSuite, pairingAccessory.MessageDispatch().Init(&gTransportMgr) == CHIP_NO_ERROR); TestContext & ctx = *reinterpret_cast(inContext); - ExchangeContext * contextCommissioner = ctx.NewExchangeToLocal(&pairingCommissioner); + ExchangeContext * contextCommissioner = ctx.NewExchangeToBob(&pairingCommissioner); pairingCommissioner.MessageDispatch().SetPeerAddress(PeerAddress(Type::kUdp)); pairingAccessory.MessageDispatch().SetPeerAddress(PeerAddress(Type::kUdp)); @@ -376,10 +376,10 @@ int TestSecurePairing_Setup(void * inContext) auto & ctx = *static_cast(inContext); VerifyOrReturnError(ctx.Init(&sSuite, &gTransportMgr, &gIOContext) == CHIP_NO_ERROR, FAILURE); - ctx.SetSourceNodeId(kPlaceholderNodeId); - ctx.SetDestinationNodeId(kPlaceholderNodeId); - ctx.SetLocalKeyId(0); - ctx.SetPeerKeyId(0); + ctx.SetBobNodeId(kPlaceholderNodeId); + ctx.SetAliceNodeId(kPlaceholderNodeId); + ctx.SetBobKeyId(0); + ctx.SetAliceKeyId(0); ctx.SetFabricIndex(kUndefinedFabricIndex); gTransportMgr.SetSecureSessionMgr(&ctx.GetSecureSessionManager());