encoding: update to revision 3 of the naming conventions
Change-Id: I2e5c84762c148c4cea17db13b8ff92dd65299fce
diff --git a/tests/unit/name-component.t.cpp b/tests/unit/name-component.t.cpp
index 06e3d25..4dc0370 100644
--- a/tests/unit/name-component.t.cpp
+++ b/tests/unit/name-component.t.cpp
@@ -138,7 +138,7 @@
static void
testDecimalComponent(uint32_t type, const std::string& uriPrefix)
{
- const Component comp(makeNonNegativeIntegerBlock(type, 42)); // TLV-VALUE is a nonNegativeInteger
+ const Component comp(makeNonNegativeIntegerBlock(type, 42)); // TLV-VALUE is a NonNegativeInteger
BOOST_CHECK_EQUAL(comp.type(), type);
BOOST_CHECK_EQUAL(comp.isNumber(), true);
const auto compUri = uriPrefix + "42";
@@ -152,7 +152,7 @@
BOOST_CHECK_EQUAL(comp, Component::fromEscapedString(to_string(type) + "=%2A"));
BOOST_CHECK_EQUAL(comp, Component::fromNumber(42, type));
- const Component comp2(Block(type, fromHex("010203"))); // TLV-VALUE is *not* a nonNegativeInteger
+ const Component comp2(Block(type, fromHex("010203"))); // TLV-VALUE is *not* a NonNegativeInteger
BOOST_CHECK_EQUAL(comp2.type(), type);
BOOST_CHECK_EQUAL(comp2.isNumber(), false);
const auto comp2Uri = to_string(type) + "=%01%02%03";
@@ -396,7 +396,7 @@
return {&Component::fromSegment,
&Component::toSegment,
&Name::appendSegment,
- Name("/33=%27%10"),
+ Name("/50=%27%10"),
10000,
&Component::isSegment};
}
@@ -413,7 +413,7 @@
return {&Component::fromByteOffset,
&Component::toByteOffset,
&Name::appendByteOffset,
- Name("/34=%00%01%86%A0"),
+ Name("/52=%00%01%86%A0"),
100000,
&Component::isByteOffset};
}
@@ -447,7 +447,7 @@
return {&Component::fromVersion,
&Component::toVersion,
[] (Name& name, auto version) -> Name& { return name.appendVersion(version); },
- Name("/35=%00%0FB%40"),
+ Name("/54=%00%0FB%40"),
1000000,
&Component::isVersion};
}
@@ -458,7 +458,7 @@
public:
using ConventionRev = ConventionMarker;
- ConventionTest<time::system_clock::TimePoint>
+ ConventionTest<time::system_clock::time_point>
operator()() const
{
return {&Component::fromTimestamp,
@@ -475,13 +475,13 @@
public:
using ConventionRev = ConventionTyped;
- ConventionTest<time::system_clock::TimePoint>
+ ConventionTest<time::system_clock::time_point>
operator()() const
{
return {&Component::fromTimestamp,
&Component::toTimestamp,
[] (Name& name, auto tp) -> Name& { return name.appendTimestamp(tp); },
- Name("/36=%00%04%7BE%E3%1B%00%00"),
+ Name("/56=%00%04%7BE%E3%1B%00%00"),
time::getUnixEpoch() + 14600_days, // 40 years
&Component::isTimestamp};
}
@@ -515,7 +515,7 @@
return {&Component::fromSequenceNumber,
&Component::toSequenceNumber,
&Name::appendSequenceNumber,
- Name("/37=%00%98%96%80"),
+ Name("/58=%00%98%96%80"),
10000000,
&Component::isSequenceNumber};
}
diff --git a/tests/unit/prefix-announcement.t.cpp b/tests/unit/prefix-announcement.t.cpp
index e7399b0..f6cad22 100644
--- a/tests/unit/prefix-announcement.t.cpp
+++ b/tests/unit/prefix-announcement.t.cpp
@@ -35,7 +35,7 @@
{
return Data(
"0678 0718 announced-name=/net/example 08036E6574 08076578616D706C65"
- " keyword-prefix-ann=20025041 version=230101 segment=210100"
+ " keyword-prefix-ann=20025041 version=360101 segment=320100"
" 1403 content-type=prefix-ann 180105"
" 1530 expire in one hour 6D040036EE80"
" validity FD00FD26 FD00FE0F323031383130333054303030303030"