Fix ASSERT_SIDE_EFFECT defect

Change-Id: Ia7dba817b6d776ea5ec30c3b6a1913621628405c

diff --git a/tests/capi/test-certificate.cpp b/tests/capi/test-certificate.cpp
index 87d1ef9750810fc76bf3e83651c12a22ac6741cf..032d6f4b43ace2c45e4c7eb3ac17232953325763 100644 (file)
--- a/tests/capi/test-certificate.cpp
+++ b/tests/capi/test-certificate.cpp
@@ -423,20 +423,22 @@ RUNNER_TEST(T0204_certificate_verify)
        const int MAXC = 3;
        CertSvcCertificate certificate[MAXC];
        size_t certCount = 0;
+       bool test;
+       int result;
 
-       for (auto &cert : TestData::certChain)
-               RUNNER_ASSERT_MSG(
-                       CERTSVC_SUCCESS ==
-                       certsvc_certificate_new_from_memory(
-                               vinstance,
-                               reinterpret_cast<const unsigned char *>(cert.c_str()),
-                               cert.size(),
-                               CERTSVC_FORM_DER_BASE64,
-                               &certificate[certCount++]),
-                       "Error reading certificate");
+       for (auto &cert : TestData::certChain) {
+               result = certsvc_certificate_new_from_memory(
+                       vinstance,
+                       reinterpret_cast<const unsigned char *>(cert.c_str()),
+                       cert.size(),
+                       CERTSVC_FORM_DER_BASE64,
+                       &certificate[certCount++]);
+               test = (result == CERTSVC_SUCCESS);
+               RUNNER_ASSERT_MSG(test, "Error reading certificate");
+       }
 
        int status;
-       int result = certsvc_certificate_verify(certificate[0], &certificate[1], MAXC - 1, NULL, 0,
+       result = certsvc_certificate_verify(certificate[0], &certificate[1], MAXC - 1, NULL, 0,
                                                                                        &status);
        RUNNER_ASSERT_MSG(CERTSVC_SUCCESS == result, "Error in certificate verification function.");
        RUNNER_ASSERT_MSG(CERTSVC_SUCCESS == status, "Error in certificate verification process.");
@@ -515,24 +517,29 @@ RUNNER_TEST(T0206_certificate_get_visibility)
                CertSvcInstance instance;
                CertSvcCertificate certificate;
                int retval;
-               RUNNER_ASSERT_MSG(
-                       (retval = certsvc_instance_new(&instance)) == CERTSVC_SUCCESS,
-                       "Failed to certsvc_instance_new. retval:" << retval);
-               RUNNER_ASSERT_MSG(
-                       (retval = certsvc_certificate_new_from_memory(
-                                               instance,
-                                               reinterpret_cast<const unsigned char *>(ca.second.c_str()),
-                                               ca.second.size(),
-                                               CERTSVC_FORM_DER_BASE64,
-                                               &certificate) == CERTSVC_SUCCESS),
-                       "Failed to certsvc_certificate_new_from_memory. retval: " << retval);
+               bool test;
+
+               retval = certsvc_instance_new(&instance);
+               test = (retval == CERTSVC_SUCCESS);
+               RUNNER_ASSERT_MSG(test, "Failed to certsvc_instance_new. retval:" << retval);
+
+               retval = certsvc_certificate_new_from_memory(
+                       instance,
+                       reinterpret_cast<const unsigned char *>(ca.second.c_str()),
+                       ca.second.size(),
+                       CERTSVC_FORM_DER_BASE64,
+                       &certificate);
+               test = (retval == CERTSVC_SUCCESS);
+               RUNNER_ASSERT_MSG(test, "Failed to certsvc_certificate_new_from_memory. retval: " << retval);
+
                CertSvcVisibility visibility;
-               RUNNER_ASSERT_MSG(
-                       (retval == certsvc_certificate_get_visibility(
-                                                       certificate, &visibility)) == CERTSVC_SUCCESS,
-                       "Failed to certsvc_certificate_get_visibility. retval: " << retval);
-               RUNNER_ASSERT_MSG(
-                       visibility == ca.first,
+               retval = certsvc_certificate_get_visibility(
+                       certificate, &visibility);
+               test = (retval == CERTSVC_SUCCESS);
+               RUNNER_ASSERT_MSG(test, "Failed to certsvc_certificate_get_visibility. retval: " << retval);
+
+               test = (visibility == ca.first);
+               RUNNER_ASSERT_MSG(test,
                        "returned visibility should be (" << ca.first <<
                        ") but returned(" << visibility << ")");
                certsvc_instance_free(instance);