commit c7a79b2adb26ed153745b3417c73cec68cfa4d42
author akmhoque <akmhoque@gmail.com> Mon May 26 08:06:19 2014 -0500
committer akmhoque <akmhoque@gmail.com> Tue May 27 13:49:33 2014 -0500
tree 9a9495d8843064ad79c249fa10c0f63d2fc39eef
parent 674b0b1ffedbe0308d12b79d361a51115d3d47b7

src: Expiration time change for LSA and Fib entry

Changed lifetime of LSA and FIB Entry to ndn::time::system_clock::TimePoint
type expiration timepoint. And refreshing event is scheduled at that timepoint

Refs: #1594

Change-Id: Ib31fe7ca79e79174eb3a5a4956ed5334da093b1b

tests/test-lsa.cpp

diff --git a/tests/test-lsa.cpp b/tests/test-lsa.cpp
index bd87b4b..5c46855 100644
--- a/tests/test-lsa.cpp
+++ b/tests/test-lsa.cpp
@@ -7,6 +7,7 @@
 #include "name-prefix-list.hpp"
 #include "adjacent.hpp"
 #include <boost/test/unit_test.hpp>
+#include <ndn-cxx/util/time.hpp>
 
 namespace nlsr {
 namespace test {
@@ -21,15 +22,14 @@
 
   npl1.insert(s1);
   npl1.insert(s2);
-
+  ndn::time::system_clock::TimePoint testTimePoint =  ndn::time::system_clock::now();
 //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", std::string("name"), 12, 1800, npl1);
-  NameLsa nlsa2("router2", std::string("name"), 12, 1500, npl1);
+  NameLsa nlsa1("router1", std::string("name"), 12, testTimePoint, npl1);
+  NameLsa nlsa2("router2", std::string("name"), 12, testTimePoint, npl1);
 
   BOOST_CHECK_EQUAL(nlsa1.getLsType(), "name");
 
-  BOOST_CHECK(nlsa1.getLifeTime() != nlsa2.getLifeTime());
+  BOOST_CHECK(nlsa1.getExpirationTimePoint() == nlsa2.getExpirationTimePoint());
 
   BOOST_CHECK(nlsa1.getKey() != nlsa2.getKey());
 }
@@ -41,15 +41,15 @@
 
   AdjacencyList adjList;
   adjList.insert(adj1);
-
+  ndn::time::system_clock::TimePoint testTimePoint =  ndn::time::system_clock::now();
 //For AdjLsa, lsType is 2.
 //1 is the number of adjacent in adjacent list.
-  AdjLsa alsa1("router1", std::string("adjacency"), 12, 1800, 1, adjList);
-  AdjLsa alsa2("router1", std::string("adjacency"), 12, 1800, 1, adjList);
+  AdjLsa alsa1("router1", std::string("adjacency"), 12, testTimePoint, 1, adjList);
+  AdjLsa alsa2("router1", std::string("adjacency"), 12, testTimePoint, 1, adjList);
 
   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.getExpirationTimePoint(), testTimePoint);
   BOOST_CHECK_EQUAL(alsa1.getNoLink(), (uint32_t)1);
 
   BOOST_CHECK(alsa1.isEqualContent(alsa2));
@@ -62,9 +62,10 @@
 
 BOOST_AUTO_TEST_CASE(CoordinateLsaConstructorAndGetters)
 {
+  ndn::time::system_clock::TimePoint testTimePoint =  ndn::time::system_clock::now();
 //For CoordinateLsa, lsType is 3.
-  CoordinateLsa clsa1("router1", std::string("coordinate"), 12, 1800, 2.5, 30.0);
-  CoordinateLsa clsa2("router1", std::string("coordinate"), 12, 1800, 2.5, 30.0);
+  CoordinateLsa clsa1("router1", std::string("coordinate"), 12, testTimePoint, 2.5, 30.0);
+  CoordinateLsa clsa2("router1", std::string("coordinate"), 12, testTimePoint, 2.5, 30.0);
 
   BOOST_CHECK_CLOSE(clsa1.getCorRadius(), 2.5, 0.0001);
   BOOST_CHECK_CLOSE(clsa1.getCorTheta(), 30.0, 0.0001);