tests: use std::nullopt
Change-Id: I7efdc8076c1bc4ced11dd3bdab7f199609009545
diff --git a/tests/daemon/mgmt/command-authenticator.t.cpp b/tests/daemon/mgmt/command-authenticator.t.cpp
index 6ef3ce8..2dd3da6 100644
--- a/tests/daemon/mgmt/command-authenticator.t.cpp
+++ b/tests/daemon/mgmt/command-authenticator.t.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2014-2022, Regents of the University of California,
+ * Copyright (c) 2014-2023, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -303,7 +303,7 @@
BOOST_CHECK_EQUAL(authorize1_V02(
[] (Interest& interest) {
ndn::SignatureInfo sigInfo(interest.getName().at(ndn::command_interest::POS_SIG_INFO).blockFromValue());
- sigInfo.setKeyLocator(ndn::nullopt);
+ sigInfo.setKeyLocator(std::nullopt);
setNameComponent(interest, ndn::command_interest::POS_SIG_INFO, span(sigInfo.wireEncode()));
}
), false);
@@ -312,7 +312,7 @@
BOOST_CHECK_EQUAL(authorize1_V03(
[] (Interest& interest) {
auto sigInfo = interest.getSignatureInfo().value();
- sigInfo.setKeyLocator(ndn::nullopt);
+ sigInfo.setKeyLocator(std::nullopt);
interest.setSignatureInfo(sigInfo);
}
), false);
@@ -371,7 +371,7 @@
BOOST_CHECK_EQUAL(authorize1_V03(
[] (Interest& interest) {
auto sigInfo = interest.getSignatureInfo().value();
- sigInfo.setTime(ndn::nullopt);
+ sigInfo.setTime(std::nullopt);
interest.setSignatureInfo(sigInfo);
}
), false);
diff --git a/tests/daemon/mgmt/rib-manager-sl-announce.t.cpp b/tests/daemon/mgmt/rib-manager-sl-announce.t.cpp
index b085657..1108a06 100644
--- a/tests/daemon/mgmt/rib-manager-sl-announce.t.cpp
+++ b/tests/daemon/mgmt/rib-manager-sl-announce.t.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2014-2022, Regents of the University of California,
+ * Copyright (c) 2014-2023, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -273,7 +273,7 @@
BOOST_AUTO_TEST_CASE(AnnounceExpired)
{
- auto pa = makeTrustedAnn("/awrVv6V7", 1_h, std::pair(-3_h, -1_h));
+ auto pa = makeTrustedAnn("/awrVv6V7", 1_h, ndn::security::ValidityPeriod::makeRelative(-3_h, -1_h));
BOOST_CHECK_EQUAL(slAnnounceSync(pa, 9087, 1_h), SlAnnounceResult::EXPIRED);
BOOST_CHECK(findAnnRoute("/awrVv6V7", 9087) == nullptr);
diff --git a/tests/daemon/rib/route.t.cpp b/tests/daemon/rib/route.t.cpp
index dc999b7..c51e964 100644
--- a/tests/daemon/rib/route.t.cpp
+++ b/tests/daemon/rib/route.t.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2014-2022, Regents of the University of California,
+ * Copyright (c) 2014-2023, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -53,7 +53,7 @@
BOOST_AUTO_TEST_CASE(BeforeNotBefore)
{
- auto pa = makePrefixAnn("/A", 212_s, {10_s, 80_s});
+ auto pa = makePrefixAnn("/A", 212_s, ndn::security::ValidityPeriod::makeRelative(10_s, 80_s));
Route route(pa, 1053);
BOOST_CHECK_LE(route.annExpires, time::steady_clock::now());
BOOST_REQUIRE(route.expires);
@@ -62,7 +62,7 @@
BOOST_AUTO_TEST_CASE(AfterNotAfter)
{
- auto pa = makePrefixAnn("/A", 212_s, {-80_s, -10_s});
+ auto pa = makePrefixAnn("/A", 212_s, ndn::security::ValidityPeriod::makeRelative(-80_s, -10_s));
Route route(pa, 2972);
BOOST_CHECK_LE(route.annExpires, time::steady_clock::now());
BOOST_REQUIRE(route.expires);
@@ -71,7 +71,7 @@
BOOST_AUTO_TEST_CASE(ExpirationLtValidity)
{
- auto pa = makePrefixAnn("/A", 212_s, {-100_s, 300_s});
+ auto pa = makePrefixAnn("/A", 212_s, ndn::security::ValidityPeriod::makeRelative(-100_s, 300_s));
Route route(pa, 7804);
BOOST_CHECK_EQUAL(route.annExpires, time::steady_clock::now() + 212_s);
BOOST_REQUIRE(route.expires);
@@ -80,7 +80,7 @@
BOOST_AUTO_TEST_CASE(ValidityLtExpiration)
{
- auto pa = makePrefixAnn("/A", 212_s, {-100_s, 200_s});
+ auto pa = makePrefixAnn("/A", 212_s, ndn::security::ValidityPeriod::makeRelative(-100_s, 200_s));
Route route(pa, 7804);
BOOST_CHECK_EQUAL(route.annExpires, time::steady_clock::now() + 200_s);
BOOST_REQUIRE(route.expires);