[test] enhance {Verify/Success}OrQuit() and their use in unit test (#6764)

This commit updates `VerifyOrQuit()` and `SuccessOrQuit()` macros to
include the failed condition in the error message that is printed on
a failure (in addition to function name and line number where the
error happened). This commit also changes the second parameter
(`aMessage`) to in these macros to be optional.

This commit also updates unit tests to remove the second `aMessage`
string in cases where the failure can be inferred from the condition
itself.
This commit is contained in:
Abtin Keshavarzian
2021-06-28 11:38:10 -07:00
committed by GitHub
parent 2db3ddca33
commit 57d072d352
36 changed files with 1733 additions and 1864 deletions
+14 -15
View File
@@ -90,10 +90,10 @@ void TestSha256(void)
uint16_t offsets[OT_ARRAY_LENGTH(kTestCases)];
uint8_t index;
VerifyOrQuit(instance != nullptr, "Null OpenThread instance");
VerifyOrQuit(instance != nullptr);
messagePool = &instance->Get<MessagePool>();
VerifyOrQuit((message = messagePool->New(Message::kTypeIp6, 0)) != nullptr, "Message::New failed");
VerifyOrQuit((message = messagePool->New(Message::kTypeIp6, 0)) != nullptr);
for (const TestCase &testCase : kTestCases)
{
@@ -104,7 +104,7 @@ void TestSha256(void)
sha256.Update(testCase.mData, static_cast<uint16_t>(strlen(testCase.mData)));
sha256.Finish(hash);
VerifyOrQuit(hash == static_cast<const Crypto::HmacSha256::Hash &>(testCase.mHash), "HMAC-SHA-256 failed");
VerifyOrQuit(hash == static_cast<const Crypto::HmacSha256::Hash &>(testCase.mHash));
}
// Append all test case `mData` in the message.
@@ -113,11 +113,10 @@ void TestSha256(void)
for (const TestCase &testCase : kTestCases)
{
SuccessOrQuit(message->Append("Hello"), "Message::Append() failed");
SuccessOrQuit(message->Append("Hello"));
offsets[index++] = message->GetLength();
SuccessOrQuit(message->AppendBytes(testCase.mData, static_cast<uint16_t>(strlen(testCase.mData))),
"Message::AppendBytes() failed");
SuccessOrQuit(message->Append("There!"), "Message::Append() failed");
SuccessOrQuit(message->AppendBytes(testCase.mData, static_cast<uint16_t>(strlen(testCase.mData))));
SuccessOrQuit(message->Append("There!"));
}
index = 0;
@@ -131,7 +130,7 @@ void TestSha256(void)
sha256.Update(*message, offsets[index++], static_cast<uint16_t>(strlen(testCase.mData)));
sha256.Finish(hash);
VerifyOrQuit(hash == static_cast<const Crypto::HmacSha256::Hash &>(testCase.mHash), "HMAC-SHA-256 failed");
VerifyOrQuit(hash == static_cast<const Crypto::HmacSha256::Hash &>(testCase.mHash));
}
testFreeInstance(instance);
@@ -235,10 +234,10 @@ void TestHmacSha256(void)
printf("TestHmacSha256\n");
VerifyOrQuit(instance != nullptr, "Null OpenThread instance");
VerifyOrQuit(instance != nullptr);
messagePool = &instance->Get<MessagePool>();
VerifyOrQuit((message = messagePool->New(Message::kTypeIp6, 0)) != nullptr, "Message::New failed");
VerifyOrQuit((message = messagePool->New(Message::kTypeIp6, 0)) != nullptr);
for (const TestCase &testCase : kTestCases)
{
@@ -249,7 +248,7 @@ void TestHmacSha256(void)
hmac.Update(testCase.mData, testCase.mDataLength);
hmac.Finish(hash);
VerifyOrQuit(hash == static_cast<const Crypto::HmacSha256::Hash &>(testCase.mHash), "HMAC-SHA-256 failed");
VerifyOrQuit(hash == static_cast<const Crypto::HmacSha256::Hash &>(testCase.mHash));
}
// Append all test case `mData` in the message.
@@ -258,10 +257,10 @@ void TestHmacSha256(void)
for (const TestCase &testCase : kTestCases)
{
SuccessOrQuit(message->Append("Hello"), "Message::Append() failed");
SuccessOrQuit(message->Append("Hello"));
offsets[index++] = message->GetLength();
SuccessOrQuit(message->AppendBytes(testCase.mData, testCase.mDataLength), "Message::AppendBytes() failed");
SuccessOrQuit(message->Append("There"), "Message::Append() failed");
SuccessOrQuit(message->AppendBytes(testCase.mData, testCase.mDataLength));
SuccessOrQuit(message->Append("There"));
}
index = 0;
@@ -275,7 +274,7 @@ void TestHmacSha256(void)
hmac.Update(*message, offsets[index++], testCase.mDataLength);
hmac.Finish(hash);
VerifyOrQuit(hash == static_cast<const Crypto::HmacSha256::Hash &>(testCase.mHash), "HMAC-SHA-256 failed");
VerifyOrQuit(hash == static_cast<const Crypto::HmacSha256::Hash &>(testCase.mHash));
}
message->Free();