diff options
| author | Daiki Ueno <dueno@redhat.com> | 2017-05-16 18:20:13 +0200 |
|---|---|---|
| committer | Daiki Ueno <dueno@redhat.com> | 2017-05-16 18:20:13 +0200 |
| commit | e340db9aeabd6b77c57112596ae60f9bbf22ad8c (patch) | |
| tree | 52a9b9b9371de81931c8f315ed2e6dfd49f06c7c | |
| parent | 059fe46611aee0a839e4f5143e1d1cd2ca519576 (diff) | |
| download | nss-hg-e340db9aeabd6b77c57112596ae60f9bbf22ad8c.tar.gz | |
Bug 1365193, util_gtest: suppress coverity warning, r=kaie
| -rw-r--r-- | gtests/util_gtest/util_pkcs11uri_unittest.cc | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/gtests/util_gtest/util_pkcs11uri_unittest.cc b/gtests/util_gtest/util_pkcs11uri_unittest.cc index c8d003b4b..f4dfec5d2 100644 --- a/gtests/util_gtest/util_pkcs11uri_unittest.cc +++ b/gtests/util_gtest/util_pkcs11uri_unittest.cc @@ -31,13 +31,13 @@ class PK11URITest : public ::testing::Test { size_t i; for (i = 0; i < num_pattrs; i++) { const char *value = PK11URI_GetPathAttribute(tmp.get(), pattrs[i].name); - ASSERT_TRUE(value); - ASSERT_EQ(std::string(value), std::string(pattrs[i].value)); + EXPECT_TRUE(value); + if (value) EXPECT_EQ(std::string(value), std::string(pattrs[i].value)); } for (i = 0; i < num_qattrs; i++) { const char *value = PK11URI_GetQueryAttribute(tmp.get(), qattrs[i].name); - ASSERT_TRUE(value); - ASSERT_EQ(std::string(value), std::string(qattrs[i].value)); + EXPECT_TRUE(value); + if (value) EXPECT_EQ(std::string(value), std::string(qattrs[i].value)); } } @@ -48,8 +48,8 @@ class PK11URITest : public ::testing::Test { PK11URI_CreateURI(pattrs, num_pattrs, qattrs, num_qattrs)); ASSERT_TRUE(tmp); char *out = PK11URI_FormatURI(nullptr, tmp.get()); - ASSERT_TRUE(out); - ASSERT_EQ(std::string(out), formatted); + EXPECT_TRUE(out); + if (out) EXPECT_EQ(std::string(out), formatted); PORT_Free(out); } @@ -67,13 +67,13 @@ class PK11URITest : public ::testing::Test { size_t i; for (i = 0; i < num_pattrs; i++) { const char *value = PK11URI_GetPathAttribute(tmp.get(), pattrs[i].name); - ASSERT_TRUE(value); - ASSERT_EQ(std::string(value), std::string(pattrs[i].value)); + EXPECT_TRUE(value); + if (value) EXPECT_EQ(std::string(value), std::string(pattrs[i].value)); } for (i = 0; i < num_qattrs; i++) { const char *value = PK11URI_GetQueryAttribute(tmp.get(), qattrs[i].name); - ASSERT_TRUE(value); - ASSERT_EQ(std::string(value), std::string(qattrs[i].value)); + EXPECT_TRUE(value); + if (value) EXPECT_EQ(std::string(value), std::string(qattrs[i].value)); } } @@ -81,9 +81,11 @@ class PK11URITest : public ::testing::Test { ScopedPK11URI tmp(PK11URI_ParseURI(str.c_str())); ASSERT_TRUE(tmp); char *out = PK11URI_FormatURI(nullptr, tmp.get()); - ASSERT_TRUE(out); - ASSERT_EQ(std::string(out), formatted); - PORT_Free(out); + EXPECT_TRUE(out); + if (out) { + EXPECT_EQ(std::string(out), formatted); + PORT_Free(out); + } } protected: |