Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Bug 1677207 - Replace references to TestCase, which is deprecated, wi…
…th TestSuite r=bbeurdouche

grep -rl --exclude-dir=google_test INSTANTIATE_TEST_CASE_P gtests | xargs sed -i '' s/INSTANTIATE_TEST_CASE_P/INSTANTIATE_TEST_SUITE_P/g
grep -rl --exclude-dir=google_test SetUpTestCase gtests | xargs sed -i '' s/SetUpTestCase/SetUpTestSuite/g

Differential Revision: https://phabricator.services.mozilla.com/D98818

--HG--
extra : moz-landing-system : lando
  • Loading branch information
Kevin Jacobs committed Dec 11, 2020
1 parent 9ee9207 commit 3df5a6b
Show file tree
Hide file tree
Showing 62 changed files with 197 additions and 192 deletions.
4 changes: 2 additions & 2 deletions gtests/certdb_gtest/alg1485_unittest.cc
Expand Up @@ -86,9 +86,9 @@ TEST_P(Alg1485CompareTest, CompareAVAStrings) {
EXPECT_EQ(param.expectedResult, CERT_CompareName(a.get(), b.get()));
}

INSTANTIATE_TEST_CASE_P(ParseAVAStrings, Alg1485ParseTest,
INSTANTIATE_TEST_SUITE_P(ParseAVAStrings, Alg1485ParseTest,
::testing::ValuesIn(kAVATestStrings));
INSTANTIATE_TEST_CASE_P(CompareAVAStrings, Alg1485CompareTest,
INSTANTIATE_TEST_SUITE_P(CompareAVAStrings, Alg1485CompareTest,
::testing::ValuesIn(kAVACompareStrings));

TEST_F(Alg1485Test, ShortOIDTest) {
Expand Down
4 changes: 2 additions & 2 deletions gtests/cryptohi_gtest/cryptohi_unittest.cc
Expand Up @@ -356,7 +356,7 @@ TEST_P(SignParamsSourceTest, CreateRsaPssWithHashMismatch) {
EXPECT_EQ(nullptr, params);
}

INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
SignParamsTestCases, SignParamsTest,
::testing::Combine(::testing::Values(SEC_OID_UNKNOWN, SEC_OID_SHA1,
SEC_OID_SHA224, SEC_OID_SHA256,
Expand All @@ -365,7 +365,7 @@ INSTANTIATE_TEST_CASE_P(
SEC_OID_SHA224, SEC_OID_SHA256,
SEC_OID_SHA384, SEC_OID_SHA512)));

INSTANTIATE_TEST_CASE_P(SignParamsSourceTestCases, SignParamsSourceTest,
INSTANTIATE_TEST_SUITE_P(SignParamsSourceTestCases, SignParamsSourceTest,
::testing::Values(SEC_OID_UNKNOWN, SEC_OID_SHA1,
SEC_OID_SHA224, SEC_OID_SHA256,
SEC_OID_SHA384, SEC_OID_SHA512));
Expand Down
2 changes: 1 addition & 1 deletion gtests/der_gtest/der_quickder_unittest.cc
Expand Up @@ -103,7 +103,7 @@ TEST_P(QuickDERTest, InvalidLengths) {
PORT_DestroyCheapArena(&pool);
}

INSTANTIATE_TEST_CASE_P(QuickderTestsInvalidLengths, QuickDERTest,
INSTANTIATE_TEST_SUITE_P(QuickderTestsInvalidLengths, QuickDERTest,
testing::ValuesIn(kInvalidDER));

} // namespace nss_test
4 changes: 2 additions & 2 deletions gtests/freebl_gtest/blake2b_unittest.cc
Expand Up @@ -56,9 +56,9 @@ TEST_P(Blake2BKATKeyed, Keyed) {
EXPECT_EQ(values, std::get<1>(GetParam()));
}

INSTANTIATE_TEST_CASE_P(UnkeyedKAT, Blake2BKATUnkeyed,
INSTANTIATE_TEST_SUITE_P(UnkeyedKAT, Blake2BKATUnkeyed,
::testing::ValuesIn(TestcasesUnkeyed));
INSTANTIATE_TEST_CASE_P(KeyedKAT, Blake2BKATKeyed,
INSTANTIATE_TEST_SUITE_P(KeyedKAT, Blake2BKATKeyed,
::testing::ValuesIn(TestcasesKeyed));

TEST_F(Blake2BTests, ContextTest) {
Expand Down
2 changes: 1 addition & 1 deletion gtests/freebl_gtest/ghash_unittest.cc
Expand Up @@ -49,7 +49,7 @@ TEST_P(GHashTest, KAT_X86_HW) { TestGHash(GetParam(), false); }
#endif
TEST_P(GHashTest, KAT_Sftw) { TestGHash(GetParam(), true); }

INSTANTIATE_TEST_CASE_P(NISTTestVector, GHashTest,
INSTANTIATE_TEST_SUITE_P(NISTTestVector, GHashTest,
::testing::ValuesIn(kGcmKatValues));

} // nss_test
2 changes: 1 addition & 1 deletion gtests/freebl_gtest/prng_kat_unittest.cc
Expand Up @@ -158,7 +158,7 @@ class PRNGTest : public ::testing::TestWithParam<PRNGTestValues> {

TEST_P(PRNGTest, HashDRBG) { RunTest(GetParam()); }

INSTANTIATE_TEST_CASE_P(NISTTestVector, PRNGTest,
INSTANTIATE_TEST_SUITE_P(NISTTestVector, PRNGTest,
::testing::ValuesIn(test_vector));

} // nss_test
Expand Down
4 changes: 2 additions & 2 deletions gtests/mozpkix_gtest/pkixbuild_tests.cpp
Expand Up @@ -173,7 +173,7 @@ class TestTrustDomain final : public DefaultCryptoTrustDomain
class pkixbuild : public ::testing::Test
{
public:
static void SetUpTestCase()
static void SetUpTestSuite()
{
if (!trustDomain.SetUpCertChainTail()) {
abort();
Expand Down Expand Up @@ -521,7 +521,7 @@ TEST_P(pkixbuild_IssuerNameCheck, MatchingName)
nullptr/*stapledOCSPResponse*/));
}

INSTANTIATE_TEST_CASE_P(pkixbuild_IssuerNameCheck, pkixbuild_IssuerNameCheck,
INSTANTIATE_TEST_SUITE_P(pkixbuild_IssuerNameCheck, pkixbuild_IssuerNameCheck,
testing::ValuesIn(ISSUER_NAME_CHECK_PARAMS));


Expand Down
2 changes: 1 addition & 1 deletion gtests/mozpkix_gtest/pkixcert_extension_tests.cpp
Expand Up @@ -244,7 +244,7 @@ TEST_P(pkixcert_extension, ExtensionHandledProperly)
nullptr/*stapledOCSPResponse*/));
}

INSTANTIATE_TEST_CASE_P(pkixcert_extension,
INSTANTIATE_TEST_SUITE_P(pkixcert_extension,
pkixcert_extension,
testing::ValuesIn(EXTENSION_TESTCASES));

Expand Down
Expand Up @@ -304,6 +304,6 @@ TEST_P(pkixcert_IsValidChainForAlgorithm, IsValidChainForAlgorithm)
CertPolicyId::anyPolicy, nullptr));
}

INSTANTIATE_TEST_CASE_P(pkixcert_IsValidChainForAlgorithm,
INSTANTIATE_TEST_SUITE_P(pkixcert_IsValidChainForAlgorithm,
pkixcert_IsValidChainForAlgorithm,
testing::ValuesIn(CHAIN_VALIDITY));
Expand Up @@ -474,7 +474,7 @@ static const EKUTestcase EKU_TESTCASES[] =
DOUBLE_EKU_FAILURE(tlv_unknownOID, tlv_anyExtendedKeyUsage, KeyPurposeId::id_kp_OCSPSigning),
};

INSTANTIATE_TEST_CASE_P(pkixcheck_CheckExtendedKeyUsage,
INSTANTIATE_TEST_SUITE_P(pkixcheck_CheckExtendedKeyUsage,
CheckExtendedKeyUsageTest,
::testing::ValuesIn(EKU_TESTCASES));

Expand Down Expand Up @@ -717,6 +717,6 @@ static const EKUChainTestcase EKU_CHAIN_TESTCASES[] =
},
};

INSTANTIATE_TEST_CASE_P(pkixcheck_CheckExtendedKeyUsage,
INSTANTIATE_TEST_SUITE_P(pkixcheck_CheckExtendedKeyUsage,
CheckExtendedKeyUsageChainTest,
::testing::ValuesIn(EKU_CHAIN_TESTCASES));
Expand Up @@ -265,7 +265,7 @@ TEST_P(pkixcheck_CheckSignatureAlgorithm, CheckSignatureAlgorithm)
trustDomain.checkedModulusSizeInBits);
}

INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
pkixcheck_CheckSignatureAlgorithm, pkixcheck_CheckSignatureAlgorithm,
testing::ValuesIn(CHECKSIGNATUREALGORITHM_TEST_PARAMS));

Expand Down
Expand Up @@ -114,7 +114,7 @@ TEST_P(pkixcheck_TLSFeaturesSatisfiedInternal, TLSFeaturesSatisfiedInternal) {
TLSFeaturesSatisfiedInternal(&featuresInput, &responseInput));
}

INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
pkixcheck_TLSFeaturesSatisfiedInternal,
pkixcheck_TLSFeaturesSatisfiedInternal,
testing::ValuesIn(TLSFEATURESSATISFIED_TEST_PARAMS));
8 changes: 4 additions & 4 deletions gtests/mozpkix_gtest/pkixder_pki_types_tests.cpp
Expand Up @@ -265,7 +265,7 @@ TEST_P(pkixder_DigestAlgorithmIdentifier_Valid, Valid)
}
}

INSTANTIATE_TEST_CASE_P(pkixder_DigestAlgorithmIdentifier_Valid,
INSTANTIATE_TEST_SUITE_P(pkixder_DigestAlgorithmIdentifier_Valid,
pkixder_DigestAlgorithmIdentifier_Valid,
testing::ValuesIn(VALID_DIGEST_ALGORITHM_TEST_INFO));

Expand Down Expand Up @@ -301,7 +301,7 @@ TEST_P(pkixder_DigestAlgorithmIdentifier_Invalid, Invalid)
DigestAlgorithmIdentifier(reader, alg));
}

INSTANTIATE_TEST_CASE_P(pkixder_DigestAlgorithmIdentifier_Invalid,
INSTANTIATE_TEST_SUITE_P(pkixder_DigestAlgorithmIdentifier_Invalid,
pkixder_DigestAlgorithmIdentifier_Invalid,
testing::ValuesIn(INVALID_DIGEST_ALGORITHM_TEST_INFO));

Expand Down Expand Up @@ -422,7 +422,7 @@ TEST_P(pkixder_SignatureAlgorithmIdentifierValue_Valid, Valid)
}
}

INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
pkixder_SignatureAlgorithmIdentifierValue_Valid,
pkixder_SignatureAlgorithmIdentifierValue_Valid,
testing::ValuesIn(VALID_SIGNATURE_ALGORITHM_VALUE_TEST_INFO));
Expand Down Expand Up @@ -474,7 +474,7 @@ TEST_P(pkixder_SignatureAlgorithmIdentifier_Invalid, Invalid)
SignatureAlgorithmIdentifierValue(reader, publicKeyAlg, digestAlg));
}

INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
pkixder_SignatureAlgorithmIdentifier_Invalid,
pkixder_SignatureAlgorithmIdentifier_Invalid,
testing::ValuesIn(INVALID_SIGNATURE_ALGORITHM_VALUE_TEST_INFO));
2 changes: 1 addition & 1 deletion gtests/mozpkix_gtest/pkixder_universal_types_tests.cpp
Expand Up @@ -1126,7 +1126,7 @@ TEST_P(pkixder_universal_types_tests_Integer,

#undef INVALID

INSTANTIATE_TEST_CASE_P(pkixder_universal_types_tests_Integer,
INSTANTIATE_TEST_SUITE_P(pkixder_universal_types_tests_Integer,
pkixder_universal_types_tests_Integer,
testing::ValuesIn(INTEGER_TEST_PARAMS));

Expand Down
24 changes: 12 additions & 12 deletions gtests/mozpkix_gtest/pkixnames_tests.cpp
Expand Up @@ -948,7 +948,7 @@ TEST_P(pkixnames_MatchPresentedDNSIDWithReferenceDNSID,
}
}

INSTANTIATE_TEST_CASE_P(pkixnames_MatchPresentedDNSIDWithReferenceDNSID,
INSTANTIATE_TEST_SUITE_P(pkixnames_MatchPresentedDNSIDWithReferenceDNSID,
pkixnames_MatchPresentedDNSIDWithReferenceDNSID,
testing::ValuesIn(DNSID_MATCH_PARAMS));

Expand Down Expand Up @@ -995,7 +995,7 @@ TEST_P(pkixnames_Turkish_I_Comparison, MatchPresentedDNSIDWithReferenceDNSID)
}
}

INSTANTIATE_TEST_CASE_P(pkixnames_Turkish_I_Comparison,
INSTANTIATE_TEST_SUITE_P(pkixnames_Turkish_I_Comparison,
pkixnames_Turkish_I_Comparison,
testing::ValuesIn(DNSNAMES_VALIDITY_TURKISH_I));

Expand All @@ -1018,10 +1018,10 @@ TEST_P(pkixnames_IsValidReferenceDNSID, IsValidReferenceDNSID)
ASSERT_EQ(inputValidity.isValidPresentedID, IsValidPresentedDNSID(input));
}

INSTANTIATE_TEST_CASE_P(pkixnames_IsValidReferenceDNSID,
INSTANTIATE_TEST_SUITE_P(pkixnames_IsValidReferenceDNSID,
pkixnames_IsValidReferenceDNSID,
testing::ValuesIn(DNSNAMES_VALIDITY));
INSTANTIATE_TEST_CASE_P(pkixnames_IsValidReferenceDNSID_Turkish_I,
INSTANTIATE_TEST_SUITE_P(pkixnames_IsValidReferenceDNSID_Turkish_I,
pkixnames_IsValidReferenceDNSID,
testing::ValuesIn(DNSNAMES_VALIDITY_TURKISH_I));

Expand Down Expand Up @@ -1049,7 +1049,7 @@ TEST_P(pkixnames_ParseIPv4Address, ParseIPv4Address)
}
}

INSTANTIATE_TEST_CASE_P(pkixnames_ParseIPv4Address,
INSTANTIATE_TEST_SUITE_P(pkixnames_ParseIPv4Address,
pkixnames_ParseIPv4Address,
testing::ValuesIn(IPV4_ADDRESSES));

Expand Down Expand Up @@ -1077,7 +1077,7 @@ TEST_P(pkixnames_ParseIPv6Address, ParseIPv6Address)
}
}

INSTANTIATE_TEST_CASE_P(pkixnames_ParseIPv6Address,
INSTANTIATE_TEST_SUITE_P(pkixnames_ParseIPv6Address,
pkixnames_ParseIPv6Address,
testing::ValuesIn(IPV6_ADDRESSES));

Expand Down Expand Up @@ -1616,7 +1616,7 @@ TEST_P(pkixnames_CheckCertHostname, CheckCertHostname)
mNameMatchingPolicy));
}

INSTANTIATE_TEST_CASE_P(pkixnames_CheckCertHostname,
INSTANTIATE_TEST_SUITE_P(pkixnames_CheckCertHostname,
pkixnames_CheckCertHostname,
testing::ValuesIn(CHECK_CERT_HOSTNAME_PARAMS));

Expand Down Expand Up @@ -1701,7 +1701,7 @@ TEST_P(pkixnames_CheckCertHostname_PresentedMatchesReference,
mNameMatchingPolicy));
}

INSTANTIATE_TEST_CASE_P(pkixnames_CheckCertHostname_DNSID_MATCH_PARAMS,
INSTANTIATE_TEST_SUITE_P(pkixnames_CheckCertHostname_DNSID_MATCH_PARAMS,
pkixnames_CheckCertHostname_PresentedMatchesReference,
testing::ValuesIn(DNSID_MATCH_PARAMS));

Expand Down Expand Up @@ -1820,7 +1820,7 @@ TEST_P(pkixnames_CheckCertHostname_IPV4_Addresses,
mNameMatchingPolicy));
}

INSTANTIATE_TEST_CASE_P(pkixnames_CheckCertHostname_IPV4_ADDRESSES,
INSTANTIATE_TEST_SUITE_P(pkixnames_CheckCertHostname_IPV4_ADDRESSES,
pkixnames_CheckCertHostname_IPV4_Addresses,
testing::ValuesIn(IPV4_ADDRESSES));

Expand Down Expand Up @@ -2680,7 +2680,7 @@ TEST_P(pkixnames_CheckNameConstraints,
}
}

INSTANTIATE_TEST_CASE_P(pkixnames_CheckNameConstraints,
INSTANTIATE_TEST_SUITE_P(pkixnames_CheckNameConstraints,
pkixnames_CheckNameConstraints,
testing::ValuesIn(NAME_CONSTRAINT_PARAMS));

Expand Down Expand Up @@ -2772,7 +2772,7 @@ TEST_P(pkixnames_CheckNameConstraintsOnIntermediate,
}
}

INSTANTIATE_TEST_CASE_P(pkixnames_CheckNameConstraintsOnIntermediate,
INSTANTIATE_TEST_SUITE_P(pkixnames_CheckNameConstraintsOnIntermediate,
pkixnames_CheckNameConstraintsOnIntermediate,
testing::ValuesIn(NO_FALLBACK_NAME_CONSTRAINT_PARAMS));

Expand Down Expand Up @@ -2833,6 +2833,6 @@ TEST_P(pkixnames_CheckNameConstraintsForNonServerAuthUsage,
}
}

INSTANTIATE_TEST_CASE_P(pkixnames_CheckNameConstraintsForNonServerAuthUsage,
INSTANTIATE_TEST_SUITE_P(pkixnames_CheckNameConstraintsForNonServerAuthUsage,
pkixnames_CheckNameConstraintsForNonServerAuthUsage,
testing::ValuesIn(NO_FALLBACK_NAME_CONSTRAINT_PARAMS));
8 changes: 4 additions & 4 deletions gtests/mozpkix_gtest/pkixocsp_VerifyEncodedOCSPResponse.cpp
Expand Up @@ -69,7 +69,7 @@ char const* const rootName = "Test CA 1";
class pkixocsp_VerifyEncodedResponse : public ::testing::Test
{
public:
static void SetUpTestCase()
static void SetUpTestSuite()
{
rootKeyPair.reset(GenerateKeyPair());
if (!rootKeyPair) {
Expand Down Expand Up @@ -179,7 +179,7 @@ TEST_P(pkixocsp_VerifyEncodedResponse_WithoutResponseBytes, CorrectErrorCode)
response, expired));
}

INSTANTIATE_TEST_CASE_P(pkixocsp_VerifyEncodedResponse_WithoutResponseBytes,
INSTANTIATE_TEST_SUITE_P(pkixocsp_VerifyEncodedResponse_WithoutResponseBytes,
pkixocsp_VerifyEncodedResponse_WithoutResponseBytes,
testing::ValuesIn(WITHOUT_RESPONSEBYTES));

Expand All @@ -202,9 +202,9 @@ class pkixocsp_VerifyEncodedResponse_successful
pkixocsp_VerifyEncodedResponse::SetUp();
}

static void SetUpTestCase()
static void SetUpTestSuite()
{
pkixocsp_VerifyEncodedResponse::SetUpTestCase();
pkixocsp_VerifyEncodedResponse::SetUpTestSuite();
}

ByteString CreateEncodedOCSPSuccessfulResponse(
Expand Down
2 changes: 1 addition & 1 deletion gtests/pk11_gtest/pk11_aes_cmac_unittest.cc
Expand Up @@ -92,7 +92,7 @@ class Pkcs11AesCmacTest : public ::testing::TestWithParam<AesCmacTestVector> {

TEST_P(Pkcs11AesCmacTest, TestVectors) { RunTestVector(GetParam()); }

INSTANTIATE_TEST_CASE_P(WycheproofTestVector, Pkcs11AesCmacTest,
INSTANTIATE_TEST_SUITE_P(WycheproofTestVector, Pkcs11AesCmacTest,
::testing::ValuesIn(kCmacWycheproofVectors));

// Sanity check of the PKCS #11 API only. Extensive tests for correctness of
Expand Down
4 changes: 2 additions & 2 deletions gtests/pk11_gtest/pk11_aes_gcm_unittest.cc
Expand Up @@ -351,10 +351,10 @@ class Pkcs11AesGcmTest : public ::testing::TestWithParam<AesGcmKatValue> {

TEST_P(Pkcs11AesGcmTest, TestVectors) { RunTest(GetParam()); }

INSTANTIATE_TEST_CASE_P(NISTTestVector, Pkcs11AesGcmTest,
INSTANTIATE_TEST_SUITE_P(NISTTestVector, Pkcs11AesGcmTest,
::testing::ValuesIn(kGcmKatValues));

INSTANTIATE_TEST_CASE_P(WycheproofTestVector, Pkcs11AesGcmTest,
INSTANTIATE_TEST_SUITE_P(WycheproofTestVector, Pkcs11AesGcmTest,
::testing::ValuesIn(kGcmWycheproofVectors));

TEST_F(Pkcs11AesGcmTest, ZeroLengthIV) {
Expand Down
2 changes: 1 addition & 1 deletion gtests/pk11_gtest/pk11_aeskeywrap_unittest.cc
Expand Up @@ -117,6 +117,6 @@ class Pkcs11AESKeyWrapTest : public ::testing::TestWithParam<keywrap_vector> {

TEST_P(Pkcs11AESKeyWrapTest, TestVectors) { WrapUnwrap(GetParam()); }

INSTANTIATE_TEST_CASE_P(Pkcs11WycheproofAESKWTest, Pkcs11AESKeyWrapTest,
INSTANTIATE_TEST_SUITE_P(Pkcs11WycheproofAESKWTest, Pkcs11AESKeyWrapTest,
::testing::ValuesIn(kWycheproofAesKWVectors));
} /* nss_test */
2 changes: 1 addition & 1 deletion gtests/pk11_gtest/pk11_aeskeywrapkwp_unittest.cc
Expand Up @@ -118,6 +118,6 @@ class Pkcs11AESKeyWrapKwpTest

TEST_P(Pkcs11AESKeyWrapKwpTest, TestVectors) { WrapUnwrap(GetParam()); }

INSTANTIATE_TEST_CASE_P(Pkcs11NistAESKWPTest, Pkcs11AESKeyWrapKwpTest,
INSTANTIATE_TEST_SUITE_P(Pkcs11NistAESKWPTest, Pkcs11AESKeyWrapKwpTest,
::testing::ValuesIn(kNistAesKWPVectors));
} /* nss_test */
4 changes: 2 additions & 2 deletions gtests/pk11_gtest/pk11_cbc_unittest.cc
Expand Up @@ -553,7 +553,7 @@ TEST_P(Pkcs11CbcPadTest, EncryptDecrypt_ShortValidPadding) {
EXPECT_EQ(0, memcmp(decrypted.data(), input.data(), decrypted_len));
}

INSTANTIATE_TEST_CASE_P(EncryptDecrypt, Pkcs11CbcPadTest,
INSTANTIATE_TEST_SUITE_P(EncryptDecrypt, Pkcs11CbcPadTest,
::testing::Values(CKM_AES_CBC_PAD, CKM_AES_CBC,
CKM_DES3_CBC_PAD, CKM_DES3_CBC));

Expand Down Expand Up @@ -602,7 +602,7 @@ class Pkcs11AesCbcWycheproofTest

TEST_P(Pkcs11AesCbcWycheproofTest, TestVectors) { RunTest(GetParam()); }

INSTANTIATE_TEST_CASE_P(WycheproofTestVector, Pkcs11AesCbcWycheproofTest,
INSTANTIATE_TEST_SUITE_P(WycheproofTestVector, Pkcs11AesCbcWycheproofTest,
::testing::ValuesIn(kCbcWycheproofVectors));

} // namespace nss_test
4 changes: 2 additions & 2 deletions gtests/pk11_gtest/pk11_chacha20poly1305_unittest.cc
Expand Up @@ -469,10 +469,10 @@ TEST_F(Pkcs11ChaCha20Poly1305Test, XorInvalidParams) {

TEST_P(Pkcs11ChaCha20Poly1305Test, TestVectors) { EncryptDecrypt(GetParam()); }

INSTANTIATE_TEST_CASE_P(NSSTestVector, Pkcs11ChaCha20Poly1305Test,
INSTANTIATE_TEST_SUITE_P(NSSTestVector, Pkcs11ChaCha20Poly1305Test,
::testing::ValuesIn(kChaCha20Vectors));

INSTANTIATE_TEST_CASE_P(WycheproofTestVector, Pkcs11ChaCha20Poly1305Test,
INSTANTIATE_TEST_SUITE_P(WycheproofTestVector, Pkcs11ChaCha20Poly1305Test,
::testing::ValuesIn(kChaCha20WycheproofVectors));

// basic message interface it's the most common configuration
Expand Down
4 changes: 2 additions & 2 deletions gtests/pk11_gtest/pk11_curve25519_unittest.cc
Expand Up @@ -117,10 +117,10 @@ class Pkcs11Curve25519Test

TEST_P(Pkcs11Curve25519Test, TestVectors) { Derive(GetParam()); }

INSTANTIATE_TEST_CASE_P(NSSTestVector, Pkcs11Curve25519Test,
INSTANTIATE_TEST_SUITE_P(NSSTestVector, Pkcs11Curve25519Test,
::testing::ValuesIn(kCurve25519Vectors));

INSTANTIATE_TEST_CASE_P(WycheproofTestVector, Pkcs11Curve25519Test,
INSTANTIATE_TEST_SUITE_P(WycheproofTestVector, Pkcs11Curve25519Test,
::testing::ValuesIn(kCurve25519WycheproofVectors));

} // namespace nss_test

0 comments on commit 3df5a6b

Please sign in to comment.