commit d6e2dfb5e8b9a0ae81817b6beeaa14ccd9c00872
author Andrei Litvin <andy314@gmail.com> Tue Nov 22 15:52:30 2022 -0500
committer GitHub <noreply@github.com> Tue Nov 22 15:52:30 2022 -0500
tree 7c27c4329798f26ea7713a517196928191a5e797
parent 91f45092e3932f01763368d91a3a0383ff65dbe7

Minor unit test cleanups (#23723)

* Remove unused member in Network test helper, reorder code a bit

* Fix proper ifdef for log test - value is always defined but may be 0 or 1

src/lib/support/tests/TestBytesToHex.cpp

diff --git a/src/lib/support/tests/TestBytesToHex.cpp b/src/lib/support/tests/TestBytesToHex.cpp
index f99fed9..21a6963 100644
--- a/src/lib/support/tests/TestBytesToHex.cpp
+++ b/src/lib/support/tests/TestBytesToHex.cpp
@@ -338,6 +338,8 @@
     NL_TEST_ASSERT(inSuite, test16Out == test16OutExpected);
 }
 
+#if CHIP_PROGRESS_LOGGING
+
 ENFORCE_FORMAT(3, 0) void AccumulateLogLineCallback(const char * module, uint8_t category, const char * msg, va_list args)
 {
     (void) module;
@@ -427,13 +429,15 @@
     }
 }
 
+#endif
+
 const nlTest sTests[] = {
     NL_TEST_DEF("TestBytesToHexNotNullTerminated", TestBytesToHexNotNullTerminated), //
     NL_TEST_DEF("TestBytesToHexNullTerminated", TestBytesToHexNullTerminated),       //
     NL_TEST_DEF("TestBytesToHexErrors", TestBytesToHexErrors),                       //
     NL_TEST_DEF("TestBytesToHexUint64", TestBytesToHexUint64),                       //
     NL_TEST_DEF("TestHexToBytesAndUint", TestHexToBytesAndUint),                     //
-#ifdef CHIP_PROGRESS_LOGGING
+#if CHIP_PROGRESS_LOGGING
     NL_TEST_DEF("TestLogBufferAsHex", TestLogBufferAsHex), //
 #endif
     NL_TEST_SENTINEL() //

src/transport/raw/tests/NetworkTestHelpers.h

diff --git a/src/transport/raw/tests/NetworkTestHelpers.h b/src/transport/raw/tests/NetworkTestHelpers.h
index de459cb..6de687e 100644
--- a/src/transport/raw/tests/NetworkTestHelpers.h
+++ b/src/transport/raw/tests/NetworkTestHelpers.h
@@ -124,15 +124,13 @@
             {
                 mDelegate->OnMessageDropped();
             }
-        }
-        else
-        {
-            System::PacketBufferHandle receivedMessage = msgBuf.CloneData();
-            mPendingMessageQueue.push(PendingMessageItem(address, std::move(receivedMessage)));
-            mSystemLayer->ScheduleWork(OnMessageReceived, this);
+
+            return CHIP_NO_ERROR;
         }
 
-        return CHIP_NO_ERROR;
+        System::PacketBufferHandle receivedMessage = msgBuf.CloneData();
+        mPendingMessageQueue.push(PendingMessageItem(address, std::move(receivedMessage)));
+        return mSystemLayer->ScheduleWork(OnMessageReceived, this);
     }
 
     bool CanSendToPeer(const Transport::PeerAddress & address) override { return true; }
@@ -158,7 +156,6 @@
 
     System::Layer * mSystemLayer = nullptr;
     std::queue<PendingMessageItem> mPendingMessageQueue;
-    Transport::PeerAddress mTxAddress;
     uint32_t mNumMessagesToDrop                = 0;
     uint32_t mDroppedMessageCount              = 0;
     uint32_t mSentMessageCount                 = 0;