[cpp-sp] branch main updated: Relocate acl test files.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch main
in repository cpp-sp.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-sp.git;a=commit;h=93b567b664fb5669db6fd8d2632ac76cdf5c6bff

The following commit(s) were added to refs/heads/main by this push:
     new 93b567b6 Relocate acl test files.
93b567b6 is described below

commit 93b567b664fb5669db6fd8d2632ac76cdf5c6bff
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Dec 19 11:24:02 2024 -0500

    Relocate acl test files.
---
 tests/data/impl/{ => acl}/acl-badxml.xml              | 0
 tests/data/impl/{ => acl}/and-acl.xml                 | 0
 tests/data/impl/acl/external-acl-badxml.xml           | 1 +
 tests/data/impl/acl/external-and-acl.xml              | 1 +
 tests/data/impl/acl/external-not-acl.xml              | 1 +
 tests/data/impl/acl/external-or-acl.xml               | 1 +
 tests/data/impl/{ => acl}/inline-ac-acl.xml           | 0
 tests/data/impl/{ => acl}/inline-attr-acl.xml         | 0
 tests/data/impl/{ => acl}/inline-not-multiple-acl.xml | 0
 tests/data/impl/{ => acl}/inline-user-acl.xml         | 0
 tests/data/impl/{ => acl}/inline-valid-user-acl.xml   | 0
 tests/data/impl/{ => acl}/internal-acl-invalid.xml    | 0
 tests/data/impl/{ => acl}/internal-acl-invalid2.xml   | 0
 tests/data/impl/{ => acl}/not-acl.xml                 | 0
 tests/data/impl/{ => acl}/or-acl.xml                  | 0
 tests/data/impl/external-acl-badxml.xml               | 1 -
 tests/data/impl/external-and-acl.xml                  | 1 -
 tests/data/impl/external-not-acl.xml                  | 1 -
 tests/data/impl/external-or-acl.xml                   | 1 -
 tests/impl/XMLAccessControlTests.cpp                  | 4 ++--
 20 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/data/impl/acl-badxml.xml b/tests/data/impl/acl/acl-badxml.xml
similarity index 100%
rename from tests/data/impl/acl-badxml.xml
rename to tests/data/impl/acl/acl-badxml.xml
diff --git a/tests/data/impl/and-acl.xml b/tests/data/impl/acl/and-acl.xml
similarity index 100%
rename from tests/data/impl/and-acl.xml
rename to tests/data/impl/acl/and-acl.xml
diff --git a/tests/data/impl/acl/external-acl-badxml.xml b/tests/data/impl/acl/external-acl-badxml.xml
new file mode 100644
index 00000000..c130684a
--- /dev/null
+++ b/tests/data/impl/acl/external-acl-badxml.xml
@@ -0,0 +1 @@
+<AccessControlProvider type="XML" path="./data/impl/acl/acl-badxml.xml" />
diff --git a/tests/data/impl/acl/external-and-acl.xml b/tests/data/impl/acl/external-and-acl.xml
new file mode 100644
index 00000000..3753f698
--- /dev/null
+++ b/tests/data/impl/acl/external-and-acl.xml
@@ -0,0 +1 @@
+<AccessControlProvider type="XML" path="./data/impl/acl/and-acl.xml" reloadChanges="1" />
diff --git a/tests/data/impl/acl/external-not-acl.xml b/tests/data/impl/acl/external-not-acl.xml
new file mode 100644
index 00000000..a511548f
--- /dev/null
+++ b/tests/data/impl/acl/external-not-acl.xml
@@ -0,0 +1 @@
+<AccessControlProvider type="XML" path="./data/impl/acl/not-acl.xml" reloadChanges="1" />
diff --git a/tests/data/impl/acl/external-or-acl.xml b/tests/data/impl/acl/external-or-acl.xml
new file mode 100644
index 00000000..f37e2c12
--- /dev/null
+++ b/tests/data/impl/acl/external-or-acl.xml
@@ -0,0 +1 @@
+<AccessControlProvider type="XML" path="./data/impl/acl/or-acl.xml" reloadChanges="1" />
diff --git a/tests/data/impl/inline-ac-acl.xml b/tests/data/impl/acl/inline-ac-acl.xml
similarity index 100%
rename from tests/data/impl/inline-ac-acl.xml
rename to tests/data/impl/acl/inline-ac-acl.xml
diff --git a/tests/data/impl/inline-attr-acl.xml b/tests/data/impl/acl/inline-attr-acl.xml
similarity index 100%
rename from tests/data/impl/inline-attr-acl.xml
rename to tests/data/impl/acl/inline-attr-acl.xml
diff --git a/tests/data/impl/inline-not-multiple-acl.xml b/tests/data/impl/acl/inline-not-multiple-acl.xml
similarity index 100%
rename from tests/data/impl/inline-not-multiple-acl.xml
rename to tests/data/impl/acl/inline-not-multiple-acl.xml
diff --git a/tests/data/impl/inline-user-acl.xml b/tests/data/impl/acl/inline-user-acl.xml
similarity index 100%
rename from tests/data/impl/inline-user-acl.xml
rename to tests/data/impl/acl/inline-user-acl.xml
diff --git a/tests/data/impl/inline-valid-user-acl.xml b/tests/data/impl/acl/inline-valid-user-acl.xml
similarity index 100%
rename from tests/data/impl/inline-valid-user-acl.xml
rename to tests/data/impl/acl/inline-valid-user-acl.xml
diff --git a/tests/data/impl/internal-acl-invalid.xml b/tests/data/impl/acl/internal-acl-invalid.xml
similarity index 100%
rename from tests/data/impl/internal-acl-invalid.xml
rename to tests/data/impl/acl/internal-acl-invalid.xml
diff --git a/tests/data/impl/internal-acl-invalid2.xml b/tests/data/impl/acl/internal-acl-invalid2.xml
similarity index 100%
rename from tests/data/impl/internal-acl-invalid2.xml
rename to tests/data/impl/acl/internal-acl-invalid2.xml
diff --git a/tests/data/impl/not-acl.xml b/tests/data/impl/acl/not-acl.xml
similarity index 100%
rename from tests/data/impl/not-acl.xml
rename to tests/data/impl/acl/not-acl.xml
diff --git a/tests/data/impl/or-acl.xml b/tests/data/impl/acl/or-acl.xml
similarity index 100%
rename from tests/data/impl/or-acl.xml
rename to tests/data/impl/acl/or-acl.xml
diff --git a/tests/data/impl/external-acl-badxml.xml b/tests/data/impl/external-acl-badxml.xml
deleted file mode 100644
index 99111352..00000000
--- a/tests/data/impl/external-acl-badxml.xml
+++ /dev/null
@@ -1 +0,0 @@
-<AccessControlProvider type="XML" path="./data/impl/acl-badxml.xml" />
diff --git a/tests/data/impl/external-and-acl.xml b/tests/data/impl/external-and-acl.xml
deleted file mode 100644
index 93433b49..00000000
--- a/tests/data/impl/external-and-acl.xml
+++ /dev/null
@@ -1 +0,0 @@
-<AccessControlProvider type="XML" path="./data/impl/and-acl.xml" reloadChanges="1" />
diff --git a/tests/data/impl/external-not-acl.xml b/tests/data/impl/external-not-acl.xml
deleted file mode 100644
index 94726a21..00000000
--- a/tests/data/impl/external-not-acl.xml
+++ /dev/null
@@ -1 +0,0 @@
-<AccessControlProvider type="XML" path="./data/impl/not-acl.xml" reloadChanges="1" />
diff --git a/tests/data/impl/external-or-acl.xml b/tests/data/impl/external-or-acl.xml
deleted file mode 100644
index f0a96472..00000000
--- a/tests/data/impl/external-or-acl.xml
+++ /dev/null
@@ -1 +0,0 @@
-<AccessControlProvider type="XML" path="./data/impl/or-acl.xml" reloadChanges="1" />
diff --git a/tests/impl/XMLAccessControlTests.cpp b/tests/impl/XMLAccessControlTests.cpp
index c3bf6a69..6c13caef 100644
--- a/tests/impl/XMLAccessControlTests.cpp
+++ b/tests/impl/XMLAccessControlTests.cpp
@@ -38,7 +38,7 @@ using namespace shibsp;
 using namespace boost::property_tree;
 using namespace std;
 
-#define DATA_PATH "./data/impl/"
+#define DATA_PATH "./data/impl/acl/"
 
 namespace {
 
@@ -137,7 +137,7 @@ private:
 struct XMLAccessControlFixture
 {
     XMLAccessControlFixture() : data_path(DATA_PATH) {
-        AgentConfig::getConfig().init(nullptr, (data_path + "console-shibboleth.ini").c_str(), true);
+        AgentConfig::getConfig().init(nullptr, (data_path + "../console-shibboleth.ini").c_str(), true);
     }
     ~XMLAccessControlFixture() {
         AgentConfig::getConfig().term();

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.