util: eliminate selector usage in SegmentFetcher
refs #4555
Change-Id: I61c28a916ca92d30538bfc7a917f0c44c3854722
diff --git a/tests/unit-tests/util/segment-fetcher.t.cpp b/tests/unit-tests/util/segment-fetcher.t.cpp
index c804f70..34afd03 100644
--- a/tests/unit-tests/util/segment-fetcher.t.cpp
+++ b/tests/unit-tests/util/segment-fetcher.t.cpp
@@ -180,7 +180,7 @@
const Interest& interest = face.sentInterests[0];
BOOST_CHECK_EQUAL(interest.getName(), "/hello/world");
BOOST_CHECK_EQUAL(interest.getMustBeFresh(), true);
- BOOST_CHECK_EQUAL(interest.getChildSelector(), 1);
+ BOOST_CHECK_EQUAL(interest.getCanBePrefix(), true);
advanceClocks(98_ms);
BOOST_CHECK_EQUAL(nErrors, 0);
@@ -761,7 +761,7 @@
const Interest& interest = face.sentInterests[0];
BOOST_CHECK_EQUAL(interest.getName(), "/hello/world");
BOOST_CHECK_EQUAL(interest.getMustBeFresh(), true);
- BOOST_CHECK_EQUAL(interest.getChildSelector(), 1);
+ BOOST_CHECK_EQUAL(interest.getCanBePrefix(), true);
BOOST_CHECK_EQUAL(interest.getInterestLifetime(), 1000_s);
}
@@ -802,19 +802,19 @@
const Interest& interest0 = face.sentInterests[0];
BOOST_CHECK_EQUAL(interest0.getName(), "/hello/world");
BOOST_CHECK_EQUAL(interest0.getMustBeFresh(), true);
- BOOST_CHECK_EQUAL(interest0.getChildSelector(), 1);
+ BOOST_CHECK_EQUAL(interest0.getCanBePrefix(), true);
BOOST_CHECK_EQUAL(interest0.getInterestLifetime(), 1000_s);
const Interest& interest1 = face.sentInterests[1];
BOOST_CHECK_EQUAL(interest1.getName(), "/hello/world/version0/%00%01");
BOOST_CHECK_EQUAL(interest1.getMustBeFresh(), false);
- BOOST_CHECK_EQUAL(interest1.getChildSelector(), 0);
+ BOOST_CHECK_EQUAL(interest1.getCanBePrefix(), false);
BOOST_CHECK_EQUAL(interest1.getInterestLifetime(), 1000_s);
const Interest& interest2 = face.sentInterests[2];
BOOST_CHECK_EQUAL(interest2.getName(), "/hello/world/version0/%00%02");
BOOST_CHECK_EQUAL(interest2.getMustBeFresh(), false);
- BOOST_CHECK_EQUAL(interest2.getChildSelector(), 0);
+ BOOST_CHECK_EQUAL(interest2.getCanBePrefix(), false);
BOOST_CHECK_EQUAL(interest2.getInterestLifetime(), 1000_s);
}
@@ -857,7 +857,7 @@
const Interest& interest = face.sentInterests[0];
BOOST_CHECK_EQUAL(interest.getName(), "/hello/world");
BOOST_CHECK_EQUAL(interest.getMustBeFresh(), true);
- BOOST_CHECK_EQUAL(interest.getChildSelector(), 1);
+ BOOST_CHECK_EQUAL(interest.getCanBePrefix(), true);
BOOST_CHECK_EQUAL(interest.getInterestLifetime(), 1000_s);
}
@@ -894,7 +894,7 @@
const Interest& interest = face.sentInterests[0];
BOOST_CHECK_EQUAL(interest.getName(), "/hello/world");
BOOST_CHECK_EQUAL(interest.getMustBeFresh(), true);
- BOOST_CHECK_EQUAL(interest.getChildSelector(), 1);
+ BOOST_CHECK_EQUAL(interest.getCanBePrefix(), true);
BOOST_CHECK_EQUAL(interest.getInterestLifetime(), 1000_s);
}