src: Replace Tokenizer with the methods of ndn::Name
Purpose of this commit is to replace Tokenizer in all
places except conf-file-processor.*pp with the methods
of ndn::Name. One static method in class NameHelper
is added. Tokenizer will be removed finally when
configuration file parsing commit is complete.
Refs: 1533
Change-Id: I14a67655eb963c5cc5b045c3c9f7d516e405ff19
diff --git a/tests/test-lsdb.cpp b/tests/test-lsdb.cpp
index 7511fdb..022efa7 100644
--- a/tests/test-lsdb.cpp
+++ b/tests/test-lsdb.cpp
@@ -31,17 +31,17 @@
//For NameLsa lsType is 1.
//12 is seqNo, randomly generated.
//1800 is the default life time.
- NameLsa nlsa1("router1", 1, 12, 1800, npl1);
+ NameLsa nlsa1("router1", std::string("name"), 12, 1800, npl1);
- Lsdb lsdb1;
+ Lsdb lsdb1(nlsr1);
- lsdb1.installNameLsa(nlsr1, nlsa1);
+ lsdb1.installNameLsa(nlsa1);
- BOOST_CHECK(lsdb1.doesLsaExist("router1/1", 1));
+ BOOST_CHECK(lsdb1.doesLsaExist("router1/1", std::string("name")));
- lsdb1.removeNameLsa(nlsr1, router1);
+ lsdb1.removeNameLsa(router1);
- BOOST_CHECK_EQUAL(lsdb1.doesLsaExist("router1/1", 1), false);
+ BOOST_CHECK_EQUAL(lsdb1.doesLsaExist("router1/1", std::string("name")), false);
}
BOOST_AUTO_TEST_SUITE_END()