commit 31d1d4b331be8b075b7f9e7da2178038b481895a
author akmhoque <akmhoque@gmail.com> Mon May 05 22:08:14 2014 -0500
committer akmhoque <akmhoque@gmail.com> Mon May 12 11:08:57 2014 -0500
tree e0271e2328a81c67abfcb2c6bbeeb5a0f00435bd
parent fdbddb114eae5b88d2a6c8bac6a321efc25fa013

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

tests/test-lsa.cpp

diff --git a/tests/test-lsa.cpp b/tests/test-lsa.cpp
index e7326b4..bd87b4b 100644
--- a/tests/test-lsa.cpp
+++ b/tests/test-lsa.cpp
@@ -24,10 +24,10 @@
 
 //lsType is 1 for NameLsa, 3rd arg is seqNo. which will be a random number I just put in 12.
 //1800 is default lsa refresh time.
-  NameLsa nlsa1("router1", 1, 12, 1800, npl1);
-  NameLsa nlsa2("router2", 1, 12, 1500, npl1);
+  NameLsa nlsa1("router1", std::string("name"), 12, 1800, npl1);
+  NameLsa nlsa2("router2", std::string("name"), 12, 1500, npl1);
 
-  BOOST_CHECK_EQUAL(nlsa1.getLsType(), (uint8_t)1);
+  BOOST_CHECK_EQUAL(nlsa1.getLsType(), "name");
 
   BOOST_CHECK(nlsa1.getLifeTime() != nlsa2.getLifeTime());
 
@@ -44,10 +44,10 @@
 
 //For AdjLsa, lsType is 2.
 //1 is the number of adjacent in adjacent list.
-  AdjLsa alsa1("router1", 2, 12, 1800, 1, adjList);
-  AdjLsa alsa2("router1", 2, 12, 1800, 1, adjList);
+  AdjLsa alsa1("router1", std::string("adjacency"), 12, 1800, 1, adjList);
+  AdjLsa alsa2("router1", std::string("adjacency"), 12, 1800, 1, adjList);
 
-  BOOST_CHECK_EQUAL(alsa1.getLsType(), (uint8_t)2);
+  BOOST_CHECK_EQUAL(alsa1.getLsType(), "adjacency");
   BOOST_CHECK_EQUAL(alsa1.getLsSeqNo(), (uint32_t)12);
   BOOST_CHECK_EQUAL(alsa1.getLifeTime(), (uint32_t)1800);
   BOOST_CHECK_EQUAL(alsa1.getNoLink(), (uint32_t)1);
@@ -63,8 +63,8 @@
 BOOST_AUTO_TEST_CASE(CoordinateLsaConstructorAndGetters)
 {
 //For CoordinateLsa, lsType is 3.
-  CoordinateLsa clsa1("router1", 3, 12, 1800, 2.5, 30.0);
-  CoordinateLsa clsa2("router1", 3, 12, 1800, 2.5, 30.0);
+  CoordinateLsa clsa1("router1", std::string("coordinate"), 12, 1800, 2.5, 30.0);
+  CoordinateLsa clsa2("router1", std::string("coordinate"), 12, 1800, 2.5, 30.0);
 
   BOOST_CHECK_CLOSE(clsa1.getCorRadius(), 2.5, 0.0001);
   BOOST_CHECK_CLOSE(clsa1.getCorTheta(), 30.0, 0.0001);