Add path validation error expectations for PKITS tests.

net/cert/internal/path_builder_pkits_unittest.cc

Index: net/cert/internal/path_builder_pkits_unittest.cc
diff --git a/net/cert/internal/path_builder_pkits_unittest.cc b/net/cert/internal/path_builder_pkits_unittest.cc
index 18a64452fa7f2a53eb9b962eb0cbaa196e29dd67..3b2b622fbe24024e99382ae455a106a0c6209244 100644
--- a/net/cert/internal/path_builder_pkits_unittest.cc
+++ b/net/cert/internal/path_builder_pkits_unittest.cc
@@ -14,28 +14,6 @@
 #include "net/der/input.h"
 #include "third_party/boringssl/src/include/openssl/pool.h"
 
-// Disable tests that require DSA signatures (DSA signatures are intentionally
-// unsupported). Custom versions of the DSA tests are defined below which expect
-// verification to fail.
-#define Section1ValidDSASignaturesTest4 DISABLED_Section1ValidDSASignaturesTest4
-#define Section1ValidDSAParameterInheritanceTest5 \
-  DISABLED_Section1ValidDSAParameterInheritanceTest5
-
-// Disable tests that require name constraints with name types that are
-// intentionally unsupported. Custom versions of the tests are defined below
-// which expect verification to fail.
-#define Section13ValidRFC822nameConstraintsTest21 \
-  DISABLED_Section13ValidRFC822nameConstraintsTest21
-#define Section13ValidRFC822nameConstraintsTest23 \
-  DISABLED_Section13ValidRFC822nameConstraintsTest23
-#define Section13ValidRFC822nameConstraintsTest25 \
-  DISABLED_Section13ValidRFC822nameConstraintsTest25
-#define Section13ValidDNandRFC822nameConstraintsTest27 \
-  DISABLED_Section13ValidDNandRFC822nameConstraintsTest27
-#define Section13ValidURInameConstraintsTest34 \
-  DISABLED_Section13ValidURInameConstraintsTest34
-#define Section13ValidURInameConstraintsTest36 \
-  DISABLED_Section13ValidURInameConstraintsTest36
 
 // TODO(mattm): these require CRL support:
 #define Section7InvalidkeyUsageCriticalcRLSignFalseTest4 \
@@ -101,128 +79,6 @@ class PathBuilderPkitsTestDelegate {
 
 }  // namespace
 
-class PkitsTest01SignatureVerificationCustomPathBuilderFoo
-    : public PkitsTest<PathBuilderPkitsTestDelegate> {};
-
-// Modified version of 4.1.4 Valid DSA Signatures Test4
-TEST_F(PkitsTest01SignatureVerificationCustomPathBuilderFoo,
-       Section1ValidDSASignaturesTest4Custom) {
-  const char* const certs[] = {"TrustAnchorRootCertificate", "DSACACert",
-                               "ValidDSASignaturesTest4EE"};
-  const char* const crls[] = {"TrustAnchorRootCRL", "DSACACRL"};
-  // DSA signatures are intentionally unsupported.
-  PkitsTestInfo info;
-  info.should_validate = false;
-
-  this->RunTest(certs, crls, info);
-}
-
-// Modified version of 4.1.5 Valid DSA Parameter Inheritance Test5
-TEST_F(PkitsTest01SignatureVerificationCustomPathBuilderFoo,
-       Section1ValidDSAParameterInheritanceTest5Custom) {
-  const char* const certs[] = {"TrustAnchorRootCertificate", "DSACACert",
-                               "DSAParametersInheritedCACert",
-                               "ValidDSAParameterInheritanceTest5EE"};
-  const char* const crls[] = {"TrustAnchorRootCRL", "DSACACRL",
-                              "DSAParametersInheritedCACRL"};
-  // DSA signatures are intentionally unsupported.
-  PkitsTestInfo info;
-  info.should_validate = false;
-
-  this->RunTest(certs, crls, info);
-}
-
-class PkitsTest13SignatureVerificationCustomPathBuilderFoo
-    : public PkitsTest<PathBuilderPkitsTestDelegate> {};
-
-// Modified version of 4.13.21 Valid RFC822 nameConstraints Test21
-TEST_F(PkitsTest13SignatureVerificationCustomPathBuilderFoo,
-       Section13ValidRFC822nameConstraintsTest21Custom) {
-  const char* const certs[] = {"TrustAnchorRootCertificate",
-                               "nameConstraintsRFC822CA1Cert",
-                               "ValidRFC822nameConstraintsTest21EE"};
-  const char* const crls[] = {"TrustAnchorRootCRL",
-                              "nameConstraintsRFC822CA1CRL"};
-  // Name constraints on rfc822Names are not supported.
-  PkitsTestInfo info;
-  info.should_validate = false;
-
-  this->RunTest(certs, crls, info);
-}
-
-// Modified version of 4.13.23 Valid RFC822 nameConstraints Test23
-TEST_F(PkitsTest13SignatureVerificationCustomPathBuilderFoo,
-       Section13ValidRFC822nameConstraintsTest23Custom) {
-  const char* const certs[] = {"TrustAnchorRootCertificate",
-                               "nameConstraintsRFC822CA2Cert",
-                               "ValidRFC822nameConstraintsTest23EE"};
-  const char* const crls[] = {"TrustAnchorRootCRL",
-                              "nameConstraintsRFC822CA2CRL"};
-  // Name constraints on rfc822Names are not supported.
-  PkitsTestInfo info;
-  info.should_validate = false;
-
-  this->RunTest(certs, crls, info);
-}
-
-// Modified version of 4.13.25 Valid RFC822 nameConstraints Test25
-TEST_F(PkitsTest13SignatureVerificationCustomPathBuilderFoo,
-       Section13ValidRFC822nameConstraintsTest25Custom) {
-  const char* const certs[] = {"TrustAnchorRootCertificate",
-                               "nameConstraintsRFC822CA3Cert",
-                               "ValidRFC822nameConstraintsTest25EE"};
-  const char* const crls[] = {"TrustAnchorRootCRL",
-                              "nameConstraintsRFC822CA3CRL"};
-  // Name constraints on rfc822Names are not supported.
-  PkitsTestInfo info;
-  info.should_validate = false;
-
-  this->RunTest(certs, crls, info);
-}
-
-// Modified version of 4.13.27 Valid DN and RFC822 nameConstraints Test27
-TEST_F(PkitsTest13SignatureVerificationCustomPathBuilderFoo,
-       Section13ValidDNandRFC822nameConstraintsTest27Custom) {
-  const char* const certs[] = {"TrustAnchorRootCertificate",
-                               "nameConstraintsDN1CACert",
-                               "nameConstraintsDN1subCA3Cert",
-                               "ValidDNandRFC822nameConstraintsTest27EE"};
-  const char* const crls[] = {"TrustAnchorRootCRL", "nameConstraintsDN1CACRL",
-                              "nameConstraintsDN1subCA3CRL"};
-  // Name constraints on rfc822Names are not supported.
-  PkitsTestInfo info;
-  info.should_validate = false;
-
-  this->RunTest(certs, crls, info);
-}
-
-// Modified version of 4.13.34 Valid URI nameConstraints Test34
-TEST_F(PkitsTest13SignatureVerificationCustomPathBuilderFoo,
-       Section13ValidURInameConstraintsTest34Custom) {
-  const char* const certs[] = {"TrustAnchorRootCertificate",
-                               "nameConstraintsURI1CACert",
-                               "ValidURInameConstraintsTest34EE"};
-  const char* const crls[] = {"TrustAnchorRootCRL", "nameConstraintsURI1CACRL"};
-  // Name constraints on uniformResourceIdentifiers are not supported.
-  PkitsTestInfo info;
-  info.should_validate = false;
-
-  this->RunTest(certs, crls, info);
-}
-
-// Modified version of 4.13.36 Valid URI nameConstraints Test36
-TEST_F(PkitsTest13SignatureVerificationCustomPathBuilderFoo,
-       Section13ValidURInameConstraintsTest36Custom) {
-  const char* const certs[] = {"TrustAnchorRootCertificate",
-                               "nameConstraintsURI2CACert",
-                               "ValidURInameConstraintsTest36EE"};
-  const char* const crls[] = {"TrustAnchorRootCRL", "nameConstraintsURI2CACRL"};
-  // Name constraints on uniformResourceIdentifiers are not supported.
-  PkitsTestInfo info;
-  info.should_validate = false;
-
-  this->RunTest(certs, crls, info);
-}
 
 INSTANTIATE_TYPED_TEST_CASE_P(PathBuilder,
                               PkitsTest01SignatureVerification,