summaryrefslogtreecommitdiff
path: root/gtests/pk11_gtest
diff options
context:
space:
mode:
authorMartin Thomson <mt@lowentropy.net>2021-12-28 23:25:50 +0000
committerMartin Thomson <mt@lowentropy.net>2021-12-28 23:25:50 +0000
commitbcba0393a488eccf59bf53cb388e50e57c23787d (patch)
tree673370305727b29b45ae3192dfb1bc5032b44c99 /gtests/pk11_gtest
parent1b1ab2fff7eb4311533e69e8ff5f4a7761acfba6 (diff)
downloadnss-hg-bcba0393a488eccf59bf53cb388e50e57c23787d.tar.gz
Bug 1747316 - Use ASSERT_ macros to end failed tests early, r=nss-reviewers,jschanck
Differential Revision: https://phabricator.services.mozilla.com/D134557
Diffstat (limited to 'gtests/pk11_gtest')
-rw-r--r--gtests/pk11_gtest/pk11_module_unittest.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/gtests/pk11_gtest/pk11_module_unittest.cc b/gtests/pk11_gtest/pk11_module_unittest.cc
index 9627c823e..41ce8c086 100644
--- a/gtests/pk11_gtest/pk11_module_unittest.cc
+++ b/gtests/pk11_gtest/pk11_module_unittest.cc
@@ -43,10 +43,10 @@ TEST_F(Pkcs11ModuleTest, LoadUnload) {
TEST_F(Pkcs11ModuleTest, ListSlots) {
ScopedPK11SlotList slots(
PK11_GetAllTokens(CKM_INVALID_MECHANISM, PR_FALSE, PR_FALSE, nullptr));
- EXPECT_NE(nullptr, slots);
+ ASSERT_NE(nullptr, slots);
PK11SlotListElement* element = PK11_GetFirstSafe(slots.get());
- EXPECT_NE(nullptr, element);
+ ASSERT_NE(nullptr, element);
// These tokens are always present.
const std::vector<std::string> kSlotsWithToken = {
@@ -72,12 +72,12 @@ TEST_F(Pkcs11ModuleTest, PublicCertificatesToken) {
const std::string kPublicCertificatesToken = "Test PKCS11 Public Certs Token";
ScopedPK11SlotInfo slot1(PK11_FindSlotByName(kRegularToken.c_str()));
- EXPECT_NE(nullptr, slot1);
+ ASSERT_NE(nullptr, slot1);
EXPECT_FALSE(PK11_IsFriendly(slot1.get()));
ScopedPK11SlotInfo slot2(
PK11_FindSlotByName(kPublicCertificatesToken.c_str()));
- EXPECT_NE(nullptr, slot2);
+ ASSERT_NE(nullptr, slot2);
EXPECT_TRUE(PK11_IsFriendly(slot2.get()));
}