Move all the various X509 test data files under src/tests/data/x509

1 files changed, 10 insertions, 10 deletions

diff --git a/src/tests/test_x509_path.cpp b/src/tests/test_x509_path.cpp
index c1d8a5b17..2ac4a3fce 100644
--- a/src/tests/test_x509_path.cpp
+++ b/src/tests/test_x509_path.cpp
@@ -72,12 +72,12 @@ class X509test_Path_Validation_Tests final : public Test
          // Test certs generated by https://github.com/yymax/x509test
 
          std::map<std::string, std::string> expected =
-            read_results(Test::data_file("x509test/expected.txt"));
+            read_results(Test::data_file("x509/x509test/expected.txt"));
 
          // Current tests use SHA-1
          const Botan::Path_Validation_Restrictions restrictions(false, 80);
 
-         Botan::X509_Certificate root(Test::data_file("x509test/root.pem"));
+         Botan::X509_Certificate root(Test::data_file("x509/x509test/root.pem"));
          Botan::Certificate_Store_In_Memory trusted;
          trusted.add_certificate(root);
 
@@ -91,7 +91,7 @@ class X509test_Path_Validation_Tests final : public Test
             const std::string expected_result = i->second;
 
             std::vector<Botan::X509_Certificate> certs =
-               load_cert_file(Test::data_file("x509test/" + filename));
+               load_cert_file(Test::data_file("x509/x509test/" + filename));
 
             if(certs.empty())
                {
@@ -159,7 +159,7 @@ std::vector<Test::Result> NIST_Path_Validation_Tests::run()
    *  - Tests #75 and #76 are skipped as they make use of relatively
    *    obscure CRL extensions which are not supported.
    */
-   const std::string nist_test_dir = Test::data_dir() + "/nist_x509";
+   const std::string nist_test_dir = Test::data_dir() + "/x509/nist";
 
    try
       {
@@ -175,7 +175,7 @@ std::vector<Test::Result> NIST_Path_Validation_Tests::run()
       }
 
    std::map<std::string, std::string> expected =
-      read_results(Test::data_file("nist_x509/expected.txt"));
+      read_results(Test::data_file("x509/nist/expected.txt"));
 
    const Botan::X509_Certificate root_cert(nist_test_dir + "/root.crt");
    const Botan::X509_CRL root_crl(nist_test_dir + "/root.crl");
@@ -259,7 +259,7 @@ std::vector<Test::Result> Extended_Path_Validation_Tests::run()
    {
    std::vector<Test::Result> results;
 
-   const std::string extended_x509_test_dir = Test::data_dir() + "/extended_x509";
+   const std::string extended_x509_test_dir = Test::data_dir() + "/x509/extended";
 
    try
       {
@@ -275,7 +275,7 @@ std::vector<Test::Result> Extended_Path_Validation_Tests::run()
       }
 
    std::map<std::string, std::string> expected =
-      read_results(Test::data_file("extended_x509/expected.txt"));
+      read_results(Test::data_file("x509/extended/expected.txt"));
 
    for(auto i = expected.begin(); i != expected.end(); ++i)
       {
@@ -337,7 +337,7 @@ std::vector<Test::Result> PSS_Path_Validation_Tests::run()
    {
    std::vector<Test::Result> results;
 
-   const std::string pss_x509_test_dir = Test::data_dir() + "/pss_x509";
+   const std::string pss_x509_test_dir = Test::data_dir() + "/x509/pss_certs";
 
    try
       {
@@ -353,10 +353,10 @@ std::vector<Test::Result> PSS_Path_Validation_Tests::run()
       }
 
    std::map<std::string, std::string> expected =
-      read_results(Test::data_file("pss_x509/expected.txt"));
+      read_results(Test::data_file("x509/pss_certs/expected.txt"));
 
    std::map<std::string, std::string> validation_times =
-      read_results(Test::data_file("pss_x509/validation_times.txt"));
+      read_results(Test::data_file("x509/pss_certs/validation_times.txt"));
 
    auto validation_times_iter = validation_times.begin();
    for(auto i = expected.begin(); i != expected.end(); ++i)