Apply suggestions from code review

Co-authored-by: Arkadiusz Bokowy <arkadiusz.bokowy@gmail.com>

Author: jlatusek

src/credentials/tests/TestDeviceAttestationCredentials.cpp

@@ -49,11 +49,7 @@ static const ByteSpan kExpectedPaiPublicKey = DevelopmentCerts::kPaiPublicKey;
 
 struct TestDeviceAttestationCredentials : public ::testing::Test
 {
-    static void SetUpTestSuite()
-    {
-        CHIP_ERROR error = chip::Platform::MemoryInit();
-        EXPECT_EQ(error, CHIP_NO_ERROR);
-    }
+    static void SetUpTestSuite() { ASSERT_EQ([error](chip::Platform::MemoryInit()), CHIP_NO_ERROR); }
     static void TearDownTestSuite() { chip::Platform::MemoryShutdown(); }
 };
 
@@ -71,7 +67,7 @@ TEST_F(TestDeviceAttestationCredentials, TestDACProvidersExample_Providers)
 
     // Replace default provider with example provider
     DeviceAttestationCredentialsProvider * example_dac_provider = Examples::GetExampleDACProvider();
-    EXPECT_NE(example_dac_provider, nullptr);
+    ASSERT_NE(example_dac_provider, nullptr);
     EXPECT_NE(default_provider, example_dac_provider);
 
     SetDeviceAttestationCredentialsProvider(example_dac_provider);
@@ -127,7 +123,7 @@ TEST_F(TestDeviceAttestationCredentials, TestDACProvidersExample_Signature)
                                             0x26, 0x27, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37 };
 
     DeviceAttestationCredentialsProvider * example_dac_provider = Examples::GetExampleDACProvider();
-    EXPECT_NE(example_dac_provider, nullptr);
+    ASSERT_NE(example_dac_provider, nullptr);
 
     // Sign using the example attestation private key
     P256ECDSASignature da_signature;
@@ -200,15 +196,15 @@ TEST_F(TestDeviceAttestationCredentials, TestDACVerifierExample_AttestationInfoV
 
     // Make sure default verifier exists and is not implemented on at least one method
     DeviceAttestationVerifier * default_verifier = GetDeviceAttestationVerifier();
-    EXPECT_NE(default_verifier, nullptr);
+    ASSERT_NE(default_verifier, nullptr);
 
     AttestationVerificationResult attestationResult = AttestationVerificationResult::kSuccess;
     ByteSpan emptyByteSpan;
     attestationResult = default_verifier->ValidateCertificationDeclarationSignature(ByteSpan(), emptyByteSpan);
     EXPECT_EQ(attestationResult, AttestationVerificationResult::kNotImplemented);
 
     DeviceAttestationVerifier * example_dac_verifier = GetDefaultDACVerifier(GetTestAttestationTrustStore());
-    EXPECT_NE(example_dac_verifier, nullptr);
+    ASSERT_NE(example_dac_verifier, nullptr);
     EXPECT_NE(default_verifier, example_dac_verifier);
 
     SetDeviceAttestationVerifier(example_dac_verifier);
@@ -267,7 +263,7 @@ TEST_F(TestDeviceAttestationCredentials, TestDACVerifierExample_CertDeclarationV
 
     // Replace default verifier with example verifier
     DeviceAttestationVerifier * example_dac_verifier = GetDefaultDACVerifier(GetTestAttestationTrustStore());
-    EXPECT_NE(example_dac_verifier, nullptr);
+    ASSERT_NE(example_dac_verifier, nullptr);
 
     SetDeviceAttestationVerifier(example_dac_verifier);
     DeviceAttestationVerifier * default_verifier = GetDeviceAttestationVerifier();
@@ -344,7 +340,7 @@ TEST_F(TestDeviceAttestationCredentials, TestDACVerifierExample_NocsrInformation
                                                  0x8d, 0x85, 0xfb, 0xd7, 0xa0, 0x7c, 0x8e, 0x83, 0x7d, 0xa4, 0xd5, 0xa8, 0xb9 };
 
     DeviceAttestationVerifier * exampleDacVerifier = GetDefaultDACVerifier(GetTestAttestationTrustStore());
-    EXPECT_NE(exampleDacVerifier, nullptr);
+    ASSERT_NE(exampleDacVerifier, nullptr);
 
     P256PublicKey dacPubkey;
     EXPECT_EQ(sizeof(attestationPublicKey), dacPubkey.Length());
@@ -392,7 +388,7 @@ TEST_F(TestDeviceAttestationCredentials, TestAttestationTrustStore)
     };
 
     const AttestationTrustStore * testAttestationTrustStore = GetTestAttestationTrustStore();
-    EXPECT_NE(testAttestationTrustStore, nullptr);
+    ASSERT_NE(testAttestationTrustStore, nullptr);
 
     for (const auto & testCase : kTestCases)
     {

src/credentials/tests/TestFabricTable.cpp

@@ -189,8 +189,7 @@ struct TestFabricTable : public ::testing::Test
     static void SetUpTestSuite()
     {
         DeviceLayer::SetConfigurationMgr(&DeviceLayer::ConfigurationManagerImpl::GetDefaultInstance());
-        auto error = chip::Platform::MemoryInit();
-        EXPECT_EQ(error, CHIP_NO_ERROR);
+        ASSERT_EQ(chip::Platform::MemoryInit(), CHIP_NO_ERROR);
     }
     static void TearDownTestSuite() { chip::Platform::MemoryShutdown(); }
 };