From 0fe3f7e3721ea854850d76d75d19cf9909deaa52 Mon Sep 17 00:00:00 2001 From: Zang MingJie Date: Tue, 16 Feb 2021 16:34:51 +0800 Subject: [PATCH] Fix conflict --- src/messaging/tests/TestExchangeMgr.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/messaging/tests/TestExchangeMgr.cpp b/src/messaging/tests/TestExchangeMgr.cpp index de50edd5af507d..78e28b7a554620 100644 --- a/src/messaging/tests/TestExchangeMgr.cpp +++ b/src/messaging/tests/TestExchangeMgr.cpp @@ -193,12 +193,12 @@ void CheckExchangeChannels(nlTestSuite * inSuite, void * inContext) ExchangeContext * ec1 = channelHandle.NewExchange(&mockAppDelegate); // send a malicious packet - ec1->SendMessage(0x0001, 0x0002, System::PacketBufferHandle::New(System::kMaxPacketBufferSize), + ec1->SendMessage(0x0001, 0x0002, System::PacketBufferHandle::New(System::PacketBuffer::kMaxSize), SendFlags(Messaging::SendMessageFlags::kNone)); NL_TEST_ASSERT(inSuite, !mockUnsolicitedAppDelegate.IsOnMessageReceivedCalled); // send a good packet - ec1->SendMessage(0x0001, 0x0001, System::PacketBufferHandle::New(System::kMaxPacketBufferSize), + ec1->SendMessage(0x0001, 0x0001, System::PacketBufferHandle::New(System::PacketBuffer::kMaxSize), SendFlags(Messaging::SendMessageFlags::kNone)); NL_TEST_ASSERT(inSuite, mockUnsolicitedAppDelegate.IsOnMessageReceivedCalled);