diff --git a/tests/nexus/test_5_1_10.cpp b/tests/nexus/test_5_1_10.cpp index 23ae9110d..d3a4d0ba0 100644 --- a/tests/nexus/test_5_1_10.cpp +++ b/tests/nexus/test_5_1_10.cpp @@ -146,8 +146,8 @@ void Test5_1_10(void) router1.AllowList(dut); router2.AllowList(dut); - IgnoreError(dut.Get().AddRssIn(router2.Get().GetExtAddress(), kRssiLinkQuality2)); - IgnoreError(router2.Get().AddRssIn(dut.Get().GetExtAddress(), kRssiLinkQuality2)); + SuccessOrQuit(dut.Get().AddRssIn(router2.Get().GetExtAddress(), kRssiLinkQuality2)); + SuccessOrQuit(router2.Get().AddRssIn(dut.Get().GetExtAddress(), kRssiLinkQuality2)); Log("---------------------------------------------------------------------------------------"); Log("Step 3: Router_3 (DUT)"); diff --git a/tests/nexus/test_5_1_5.cpp b/tests/nexus/test_5_1_5.cpp index 2b6312f0a..8c794b9e2 100644 --- a/tests/nexus/test_5_1_5.cpp +++ b/tests/nexus/test_5_1_5.cpp @@ -133,7 +133,7 @@ void Test5_1_5(void) * - Router_1 automatically sends a link request, re-attaches and requests its original Router ID. * - Pass Criteria: N/A */ - IgnoreError(router1.Get().Start()); + SuccessOrQuit(router1.Get().Start()); Log("---------------------------------------------------------------------------------------"); Log("Step 4: Leader (DUT)"); @@ -179,7 +179,7 @@ void Test5_1_5(void) * - Router_1 reattaches and requests its most recent Router ID. * - Pass Criteria: N/A */ - IgnoreError(router1.Get().Start()); + SuccessOrQuit(router1.Get().Start()); Log("---------------------------------------------------------------------------------------"); Log("Step 7: Leader (DUT)"); diff --git a/tests/nexus/test_5_1_9.cpp b/tests/nexus/test_5_1_9.cpp index f00eed065..80ae906de 100644 --- a/tests/nexus/test_5_1_9.cpp +++ b/tests/nexus/test_5_1_9.cpp @@ -151,17 +151,17 @@ void Test5_1_9(void) */ Log("Step 2: Harness configures the RSSI"); - IgnoreError(leader.Get().AddRssIn(router1.Get().GetExtAddress(), kLq3Rssi)); - IgnoreError(leader.Get().AddRssIn(reed1.Get().GetExtAddress(), kLq3Rssi)); - IgnoreError(leader.Get().AddRssIn(reed2.Get().GetExtAddress(), kLq3Rssi)); + SuccessOrQuit(leader.Get().AddRssIn(router1.Get().GetExtAddress(), kLq3Rssi)); + SuccessOrQuit(leader.Get().AddRssIn(reed1.Get().GetExtAddress(), kLq3Rssi)); + SuccessOrQuit(leader.Get().AddRssIn(reed2.Get().GetExtAddress(), kLq3Rssi)); - IgnoreError(router1.Get().AddRssIn(leader.Get().GetExtAddress(), kLq3Rssi)); - IgnoreError(router1.Get().AddRssIn(reed1.Get().GetExtAddress(), kLq3Rssi)); + SuccessOrQuit(router1.Get().AddRssIn(leader.Get().GetExtAddress(), kLq3Rssi)); + SuccessOrQuit(router1.Get().AddRssIn(reed1.Get().GetExtAddress(), kLq3Rssi)); - IgnoreError(reed1.Get().AddRssIn(leader.Get().GetExtAddress(), kLq3Rssi)); - IgnoreError(reed1.Get().AddRssIn(router1.Get().GetExtAddress(), kLq3Rssi)); + SuccessOrQuit(reed1.Get().AddRssIn(leader.Get().GetExtAddress(), kLq3Rssi)); + SuccessOrQuit(reed1.Get().AddRssIn(router1.Get().GetExtAddress(), kLq3Rssi)); - IgnoreError(reed2.Get().AddRssIn(leader.Get().GetExtAddress(), kLq3Rssi)); + SuccessOrQuit(reed2.Get().AddRssIn(leader.Get().GetExtAddress(), kLq3Rssi)); // Setup DUT connectivity (only to REEDs) dut.AllowList(reed1); @@ -169,10 +169,10 @@ void Test5_1_9(void) dut.AllowList(reed2); reed2.AllowList(dut); - IgnoreError(dut.Get().AddRssIn(reed1.Get().GetExtAddress(), kLq3Rssi)); - IgnoreError(dut.Get().AddRssIn(reed2.Get().GetExtAddress(), kLq3Rssi)); - IgnoreError(reed1.Get().AddRssIn(dut.Get().GetExtAddress(), kLq3Rssi)); - IgnoreError(reed2.Get().AddRssIn(dut.Get().GetExtAddress(), kLq3Rssi)); + SuccessOrQuit(dut.Get().AddRssIn(reed1.Get().GetExtAddress(), kLq3Rssi)); + SuccessOrQuit(dut.Get().AddRssIn(reed2.Get().GetExtAddress(), kLq3Rssi)); + SuccessOrQuit(reed1.Get().AddRssIn(dut.Get().GetExtAddress(), kLq3Rssi)); + SuccessOrQuit(reed2.Get().AddRssIn(dut.Get().GetExtAddress(), kLq3Rssi)); /** * Step 3: Router_2 (DUT) diff --git a/tests/nexus/test_5_6_4.cpp b/tests/nexus/test_5_6_4.cpp index 0590c23b5..1fd5d3292 100644 --- a/tests/nexus/test_5_6_4.cpp +++ b/tests/nexus/test_5_6_4.cpp @@ -156,22 +156,22 @@ void Test5_6_4(void) NetworkData::OnMeshPrefixConfig config; config.Clear(); - IgnoreError(config.GetPrefix().FromString(kPrefix1)); + SuccessOrQuit(config.GetPrefix().FromString(kPrefix1)); config.mStable = true; config.mOnMesh = true; config.mPreferred = true; config.mSlaac = true; config.mDefaultRoute = true; - IgnoreError(router1.Get().AddOnMeshPrefix(config)); + SuccessOrQuit(router1.Get().AddOnMeshPrefix(config)); config.Clear(); - IgnoreError(config.GetPrefix().FromString(kPrefix2)); + SuccessOrQuit(config.GetPrefix().FromString(kPrefix2)); config.mStable = false; config.mOnMesh = true; config.mPreferred = true; config.mSlaac = true; config.mDefaultRoute = true; - IgnoreError(router1.Get().AddOnMeshPrefix(config)); + SuccessOrQuit(router1.Get().AddOnMeshPrefix(config)); router1.Get().HandleServerDataUpdated(); } diff --git a/tests/nexus/test_6_1_5.cpp b/tests/nexus/test_6_1_5.cpp index 441bb11c0..1baa3d304 100644 --- a/tests/nexus/test_6_1_5.cpp +++ b/tests/nexus/test_6_1_5.cpp @@ -161,8 +161,8 @@ void Test6_1_5(void) router1.AllowList(sed1); reed2.AllowList(sed1); - IgnoreError(sed1.Get().AddRssIn(reed2.Get().GetExtAddress(), kRssiLinkQuality2)); - IgnoreError(reed2.Get().AddRssIn(sed1.Get().GetExtAddress(), kRssiLinkQuality2)); + SuccessOrQuit(sed1.Get().AddRssIn(reed2.Get().GetExtAddress(), kRssiLinkQuality2)); + SuccessOrQuit(reed2.Get().AddRssIn(sed1.Get().GetExtAddress(), kRssiLinkQuality2)); Log("---------------------------------------------------------------------------------------"); Log("Step 3: Automatically begins attach process by sending a multicast MLE Parent Request."); diff --git a/tests/nexus/test_7_1_2.cpp b/tests/nexus/test_7_1_2.cpp index 77c855cc4..b13f3ceae 100644 --- a/tests/nexus/test_7_1_2.cpp +++ b/tests/nexus/test_7_1_2.cpp @@ -134,24 +134,24 @@ void Test7_1_2(void) NetworkData::OnMeshPrefixConfig config; config.Clear(); - IgnoreError(static_cast(config.mPrefix.mPrefix).FromString(kPrefix1)); + SuccessOrQuit(static_cast(config.mPrefix.mPrefix).FromString(kPrefix1)); config.mPrefix.mLength = kPrefixLength; config.mStable = true; config.mOnMesh = true; config.mPreferred = true; config.mSlaac = true; config.mDefaultRoute = true; - IgnoreError(router1.Get().AddOnMeshPrefix(config)); + SuccessOrQuit(router1.Get().AddOnMeshPrefix(config)); config.Clear(); - IgnoreError(static_cast(config.mPrefix.mPrefix).FromString(kPrefix2)); + SuccessOrQuit(static_cast(config.mPrefix.mPrefix).FromString(kPrefix2)); config.mPrefix.mLength = kPrefixLength; config.mStable = false; config.mOnMesh = true; config.mPreferred = true; config.mSlaac = true; config.mDefaultRoute = true; - IgnoreError(router1.Get().AddOnMeshPrefix(config)); + SuccessOrQuit(router1.Get().AddOnMeshPrefix(config)); } router1.Join(leader); diff --git a/tests/nexus/test_7_1_8.cpp b/tests/nexus/test_7_1_8.cpp index 54f1eb10b..3cc42e540 100644 --- a/tests/nexus/test_7_1_8.cpp +++ b/tests/nexus/test_7_1_8.cpp @@ -157,22 +157,22 @@ void Test7_1_8(const char *aJsonFile) NetworkData::OnMeshPrefixConfig config; config.Clear(); - IgnoreError(config.GetPrefix().FromString(kPrefix1)); + SuccessOrQuit(config.GetPrefix().FromString(kPrefix1)); config.mStable = true; config.mDefaultRoute = true; config.mSlaac = true; config.mOnMesh = true; config.mPreferred = true; - IgnoreError(fed1.Get().AddOnMeshPrefix(config)); + SuccessOrQuit(fed1.Get().AddOnMeshPrefix(config)); config.Clear(); - IgnoreError(config.GetPrefix().FromString(kPrefix2)); + SuccessOrQuit(config.GetPrefix().FromString(kPrefix2)); config.mStable = false; config.mDefaultRoute = true; config.mSlaac = true; config.mOnMesh = true; config.mPreferred = true; - IgnoreError(fed1.Get().AddOnMeshPrefix(config)); + SuccessOrQuit(fed1.Get().AddOnMeshPrefix(config)); fed1.Get().HandleServerDataUpdated(); }