[cpp-sp] branch main updated: Fix test errors due to use of nullptr on older Boost
Scott Cantor
cantor.2 at osu.edu
Mon Oct 20 13:45:17 UTC 2025
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=e7b2d1410867860882ba8ea45403c54e677fb2c9
The following commit(s) were added to refs/heads/main by this push:
new e7b2d141 Fix test errors due to use of nullptr on older Boost
e7b2d141 is described below
commit e7b2d1410867860882ba8ea45403c54e677fb2c9
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Oct 20 09:45:11 2025 -0400
Fix test errors due to use of nullptr on older Boost
---
tests/DummyRequest.h | 2 -
tests/impl/XMLRequestMapperTests.cpp | 64 ++++++++++++++++----------------
tests/platform/iis/ModuleConfigTests.cpp | 12 +++---
3 files changed, 38 insertions(+), 40 deletions(-)
diff --git a/tests/DummyRequest.h b/tests/DummyRequest.h
index 334d4983..86cfe441 100644
--- a/tests/DummyRequest.h
+++ b/tests/DummyRequest.h
@@ -23,8 +23,6 @@
#include <map>
#include <string>
-#define DATA_PATH "./data/session/impl/"
-
namespace shibsp {
class DummyRequest : public AbstractSPRequest {
diff --git a/tests/impl/XMLRequestMapperTests.cpp b/tests/impl/XMLRequestMapperTests.cpp
index 304a130e..3640c362 100644
--- a/tests/impl/XMLRequestMapperTests.cpp
+++ b/tests/impl/XMLRequestMapperTests.cpp
@@ -156,11 +156,11 @@ BOOST_FIXTURE_TEST_CASE(XMLRequestMapper_inline_defaultingId, XMLRequestMapperFi
request.m_port = 443;
#ifdef HAVE_CXX14
- shared_lock locker(*mapper);
+ shared_lock<RequestMapper> locker(*mapper);
#endif
const RequestMapper::Settings settings = mapper->getSettings(request);
- BOOST_CHECK_EQUAL(settings.second, nullptr);
+ BOOST_CHECK(!settings.second);
BOOST_CHECK_EQUAL(settings.first->getString("name"), "sp.example.org");
BOOST_CHECK_EQUAL(settings.first->getString("applicationId"), "default");
}
@@ -183,11 +183,11 @@ BOOST_FIXTURE_TEST_CASE(XMLRequestMapper_inline_customId, XMLRequestMapperFixtur
request.m_port = 443;
#ifdef HAVE_CXX14
- shared_lock locker(*mapper);
+ shared_lock<RequestMapper> locker(*mapper);
#endif
const RequestMapper::Settings settings = mapper->getSettings(request);
- BOOST_CHECK_EQUAL(settings.second, nullptr);
+ BOOST_CHECK(!settings.second);
BOOST_CHECK_EQUAL(settings.first->getString("name"), "sp.example.org");
BOOST_CHECK_EQUAL(settings.first->getString("applicationId"), "custom");
}
@@ -210,13 +210,13 @@ BOOST_FIXTURE_TEST_CASE(XMLRequestMapper_inline_no_mapping, XMLRequestMapperFixt
request.m_port = 80;
#ifdef HAVE_CXX14
- shared_lock locker(*mapper);
+ shared_lock<RequestMapper> locker(*mapper);
#endif
const RequestMapper::Settings settings = mapper->getSettings(request);
- BOOST_CHECK_EQUAL(settings.second, nullptr);
+ BOOST_CHECK(!settings.second);
BOOST_CHECK_EQUAL(settings.first->getString("applicationId"), "default");
- BOOST_CHECK_EQUAL(settings.first->getString("name"), nullptr);
+ BOOST_CHECK(!settings.first->getString("name"));
}
/////////////
@@ -237,14 +237,14 @@ BOOST_FIXTURE_TEST_CASE(XMLRequestMapper_inline_HostRegex_mapping_failed, XMLReq
request.m_port = 443;
#ifdef HAVE_CXX14
- shared_lock locker(*mapper);
+ shared_lock<RequestMapper> locker(*mapper);
#endif
const RequestMapper::Settings settings = mapper->getSettings(request);
- BOOST_CHECK_EQUAL(settings.second, nullptr);
+ BOOST_CHECK(!settings.second);
BOOST_CHECK_EQUAL(settings.first->getString("applicationId"), "default");
- BOOST_CHECK_EQUAL(settings.first->getString("name"), nullptr);
- BOOST_CHECK_EQUAL(settings.first->getString("regex"), nullptr);
+ BOOST_CHECK(!settings.first->getString("name"));
+ BOOST_CHECK(!settings.first->getString("regex"));
BOOST_CHECK(!settings.first->getBool("requireSession", false));
BOOST_CHECK(!settings.first->getBool("isPassive", false));
}
@@ -263,13 +263,13 @@ BOOST_FIXTURE_TEST_CASE(XMLRequestMapper_inline_HostRegex_mapping, XMLRequestMap
request.m_port = 443;
#ifdef HAVE_CXX14
- shared_lock locker(*mapper);
+ shared_lock<RequestMapper> locker(*mapper);
#endif
const RequestMapper::Settings settings = mapper->getSettings(request);
- BOOST_CHECK_EQUAL(settings.second, nullptr);
+ BOOST_CHECK(!settings.second);
BOOST_CHECK_EQUAL(settings.first->getString("applicationId"), "default");
- BOOST_CHECK_EQUAL(settings.first->getString("name"), nullptr);
+ BOOST_CHECK(!settings.first->getString("name"));
BOOST_CHECK_EQUAL(settings.first->getString("regex"), "https\\://sp\\d\\.example\\.org\\:443");
BOOST_CHECK(!settings.first->getBool("requireSession", false));
BOOST_CHECK(settings.first->getBool("isPassive", false));
@@ -293,11 +293,11 @@ BOOST_FIXTURE_TEST_CASE(XMLRequestMapper_inline_Path_mapping, XMLRequestMapperFi
request.m_port = 443;
#ifdef HAVE_CXX14
- shared_lock locker(*mapper);
+ shared_lock<RequestMapper> locker(*mapper);
#endif
const RequestMapper::Settings settings = mapper->getSettings(request);
- BOOST_CHECK_EQUAL(settings.second, nullptr);
+ BOOST_CHECK(!settings.second);
BOOST_CHECK_EQUAL(settings.first->getString("applicationId"), "default");
BOOST_CHECK_EQUAL(settings.first->getString("name"), "secure");
BOOST_CHECK(settings.first->getBool("requireSession", false));
@@ -322,11 +322,11 @@ BOOST_FIXTURE_TEST_CASE(XMLRequestMapper_inline_nested_Path_mapping, XMLRequestM
request.m_port = 443;
#ifdef HAVE_CXX14
- shared_lock locker(*mapper);
+ shared_lock<RequestMapper> locker(*mapper);
#endif
const RequestMapper::Settings settings = mapper->getSettings(request);
- BOOST_CHECK_EQUAL(settings.second, nullptr);
+ BOOST_CHECK(!settings.second);
BOOST_CHECK_EQUAL(settings.first->getString("applicationId"), "default");
BOOST_CHECK_EQUAL(settings.first->getString("name"), "baz");
BOOST_CHECK(!settings.first->getBool("requireSession", false));
@@ -351,16 +351,16 @@ BOOST_FIXTURE_TEST_CASE(XMLRequestMapper_inline_PathRegex_mapping_failed, XMLReq
request.m_port = 443;
#ifdef HAVE_CXX14
- shared_lock locker(*mapper);
+ shared_lock<RequestMapper> locker(*mapper);
#endif
const RequestMapper::Settings settings = mapper->getSettings(request);
- BOOST_CHECK_EQUAL(settings.second, nullptr);
+ BOOST_CHECK(!settings.second);
BOOST_CHECK_EQUAL(settings.first->getString("applicationId"), "default");
BOOST_CHECK_EQUAL(settings.first->getString("name"), "sp.example.org");
- BOOST_CHECK_EQUAL(settings.first->getString("regex"), nullptr);
+ BOOST_CHECK(!settings.first->getString("regex"));
BOOST_CHECK(!settings.first->getBool("requireSession", false));
- BOOST_CHECK_EQUAL(settings.first->getString("requireSessionWith"), nullptr);
+ BOOST_CHECK(!settings.first->getString("requireSessionWith"));
}
BOOST_FIXTURE_TEST_CASE(XMLRequestMapper_inline_PathRegex_mapping, XMLRequestMapperFixture)
@@ -377,11 +377,11 @@ BOOST_FIXTURE_TEST_CASE(XMLRequestMapper_inline_PathRegex_mapping, XMLRequestMap
request.m_port = 443;
#ifdef HAVE_CXX14
- shared_lock locker(*mapper);
+ shared_lock<RequestMapper> locker(*mapper);
#endif
const RequestMapper::Settings settings = mapper->getSettings(request);
- BOOST_CHECK_EQUAL(settings.second, nullptr);
+ BOOST_CHECK(!settings.second);
BOOST_CHECK_EQUAL(settings.first->getString("applicationId"), "default");
BOOST_CHECK_EQUAL(settings.first->getString("regex"), "FoLdEr\\d");
BOOST_CHECK(!settings.first->getBool("requireSession", false));
@@ -407,11 +407,11 @@ BOOST_FIXTURE_TEST_CASE(XMLRequestMapper_inline_Query_mapping, XMLRequestMapperF
request.m_query = "foo=jdoe&bar=baz";
#ifdef HAVE_CXX14
- shared_lock locker(*mapper);
+ shared_lock<RequestMapper> locker(*mapper);
#endif
const RequestMapper::Settings settings = mapper->getSettings(request);
- BOOST_CHECK_EQUAL(settings.second, nullptr);
+ BOOST_CHECK(!settings.second);
BOOST_CHECK_EQUAL(settings.first->getString("applicationId"), "default");
BOOST_CHECK_EQUAL(settings.first->getString("name"), "foo");
BOOST_CHECK(settings.first->getBool("requireSession", false));
@@ -437,15 +437,15 @@ BOOST_FIXTURE_TEST_CASE(XMLRequestMapper_inline_Query_regex_mapping_failed, XMLR
request.m_query = "baz=jdoe";
#ifdef HAVE_CXX14
- shared_lock locker(*mapper);
+ shared_lock<RequestMapper> locker(*mapper);
#endif
const RequestMapper::Settings settings = mapper->getSettings(request);
- BOOST_CHECK_EQUAL(settings.second, nullptr);
+ BOOST_CHECK(!settings.second);
BOOST_CHECK_EQUAL(settings.first->getString("applicationId"), "default");
BOOST_CHECK_EQUAL(settings.first->getString("name"), "secure");
BOOST_CHECK(settings.first->getBool("requireSession", false));
- BOOST_CHECK_EQUAL(settings.first->getString("entityId"), nullptr);
+ BOOST_CHECK(!settings.first->getString("entityId"));
}
BOOST_FIXTURE_TEST_CASE(XMLRequestMapper_inline_Query_regex_mapping, XMLRequestMapperFixture)
@@ -463,11 +463,11 @@ BOOST_FIXTURE_TEST_CASE(XMLRequestMapper_inline_Query_regex_mapping, XMLRequestM
request.m_query = "baz=jdoe&bar=baz";
#ifdef HAVE_CXX14
- shared_lock locker(*mapper);
+ shared_lock<RequestMapper> locker(*mapper);
#endif
const RequestMapper::Settings settings = mapper->getSettings(request);
- BOOST_CHECK_EQUAL(settings.second, nullptr);
+ BOOST_CHECK(!settings.second);
BOOST_CHECK_EQUAL(settings.first->getString("applicationId"), "default");
BOOST_CHECK_EQUAL(settings.first->getString("name"), "bar");
BOOST_CHECK(settings.first->getBool("requireSession", false));
@@ -487,7 +487,7 @@ BOOST_FIXTURE_TEST_CASE(XMLRequestMapper_external_ACL, XMLRequestMapperFixture)
tree.front().second.get<string>("<xmlattr>.type").c_str(), tree.front().second, true));
#ifdef HAVE_CXX14
- shared_lock locker(*mapper);
+ shared_lock<RequestMapper> locker(*mapper);
#endif
DummySession session;
diff --git a/tests/platform/iis/ModuleConfigTests.cpp b/tests/platform/iis/ModuleConfigTests.cpp
index 1837b00f..8d48ab38 100644
--- a/tests/platform/iis/ModuleConfigTests.cpp
+++ b/tests/platform/iis/ModuleConfigTests.cpp
@@ -78,14 +78,14 @@ BOOST_FIXTURE_TEST_CASE(ModuleConfigTest_xml_invalid, ModuleConfigFixture)
void validateSites(const ModuleConfig* config)
{
// Bad site should be absent.
- BOOST_CHECK_EQUAL(config->getSiteConfig("bad"), nullptr);
+ BOOST_CHECK(!config->getSiteConfig("bad"));
const PropertySet* one = config->getSiteConfig("1");
BOOST_CHECK(one);
BOOST_CHECK_EQUAL(one->getString(ModuleConfig::SITE_NAME_PROP_NAME), "sp.example.org");
- BOOST_CHECK_EQUAL(one->getString(ModuleConfig::SITE_SCHEME_PROP_NAME), nullptr);
+ BOOST_CHECK(!one->getString(ModuleConfig::SITE_SCHEME_PROP_NAME));
BOOST_CHECK_EQUAL(one->getUnsignedInt(ModuleConfig::SITE_PORT_PROP_NAME, 0), 0);
- BOOST_CHECK_EQUAL(one->getString(ModuleConfig::SITE_ALIASES_PROP_NAME), nullptr);
+ BOOST_CHECK(!one->getString(ModuleConfig::SITE_ALIASES_PROP_NAME));
BOOST_CHECK(!one->getBool(RequestMapper::USE_HEADERS_PROP_NAME, true));
const PropertySet* two = config->getSiteConfig("2");
@@ -93,12 +93,12 @@ void validateSites(const ModuleConfig* config)
BOOST_CHECK_EQUAL(two->getString(ModuleConfig::SITE_NAME_PROP_NAME), "sp2.example.org");
BOOST_CHECK_EQUAL(two->getString(ModuleConfig::SITE_SCHEME_PROP_NAME), "https");
BOOST_CHECK_EQUAL(two->getUnsignedInt(ModuleConfig::SITE_PORT_PROP_NAME, 0), 443);
- BOOST_CHECK_EQUAL(two->getString(ModuleConfig::SITE_ALIASES_PROP_NAME), nullptr);
+ BOOST_CHECK(!two->getString(ModuleConfig::SITE_ALIASES_PROP_NAME));
const PropertySet* three = config->getSiteConfig("3");
BOOST_CHECK(three);
BOOST_CHECK_EQUAL(three->getString(ModuleConfig::SITE_NAME_PROP_NAME), "sp3.example.org");
- BOOST_CHECK_EQUAL(three->getString(ModuleConfig::SITE_SCHEME_PROP_NAME), nullptr);
+ BOOST_CHECK(!three->getString(ModuleConfig::SITE_SCHEME_PROP_NAME));
BOOST_CHECK_EQUAL(three->getUnsignedInt(ModuleConfig::SITE_PORT_PROP_NAME, 0), 0);
BOOST_CHECK_EQUAL(three->getString(ModuleConfig::SITE_ALIASES_PROP_NAME), "alt.example.org alt2.example.org");
}
@@ -119,7 +119,7 @@ BOOST_FIXTURE_TEST_CASE(ModuleConfigTest_xml, ModuleConfigFixture)
BOOST_CHECK(!config->getBool(RequestMapper::USE_VARIABLES_PROP_NAME, true));
BOOST_CHECK(config->getBool(RequestMapper::USE_HEADERS_PROP_NAME, false));
- BOOST_CHECK_EQUAL(config->getString(ModuleConfig::AUTHENTICATED_ROLE_PROP_NAME), nullptr);
+ BOOST_CHECK(!config->getString(ModuleConfig::AUTHENTICATED_ROLE_PROP_NAME));
BOOST_CHECK_EQUAL(config->getString(ModuleConfig::ROLE_ATTRIBUTES_PROP_NAME), "foo bar");
validateSites(config.get());
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list