commit 3781c7ebc12a932b7c7c950b23882a011756367c
author Ashlesh Gawande <agawande@memphis.edu> Sat May 22 22:36:26 2021 -0700
committer Ashlesh Gawande <ashu2493@gmail.com> Fri Jun 11 07:42:18 2021 -0700
tree a8376228770b0870601a62b63d76ca6148155353
parent 22520e68f52d1645dae288e3b9e888c305eddca9

NameLsa: fix Lsdb update bug by sorting the NPLs before difference

Change-Id: Ib3d5bbf546de3356e0594732ca09671d7c32dbf1

tests/test-lsa.cpp

diff --git a/tests/test-lsa.cpp b/tests/test-lsa.cpp
index 16af215..ebb6c4e 100644
--- a/tests/test-lsa.cpp
+++ b/tests/test-lsa.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2014-2020,  The University of Memphis,
+ * Copyright (c) 2014-2021,  The University of Memphis,
  *                           Regents of the University of California,
  *                           Arizona Board of Regents.
  *
@@ -376,7 +376,7 @@
   BOOST_CHECK(adjlsa1.isEqualContent(adjlsa2));
 
   //Name LSA
-  /*ndn::Name s1{"name1"};
+  ndn::Name s1{"name1"};
   ndn::Name s2{"name2"};
   NamePrefixList npl1{s1, s2};
 
@@ -388,7 +388,7 @@
   std::vector<double> angles = {30, 40.0};
   CoordinateLsa clsa1("router1", 12, testTimePoint, 2.5, angles);
   CoordinateLsa clsa2(clsa1.wireEncode());
-  BOOST_CHECK_EQUAL(clsa1.wireEncode(), clsa2.wireEncode());*/
+  BOOST_CHECK_EQUAL(clsa1.wireEncode(), clsa2.wireEncode());
 }
 
 BOOST_AUTO_TEST_CASE(OperatorEquals)
@@ -410,6 +410,40 @@
   BOOST_CHECK(lsa1.isEqualContent(lsa2));
 }
 
+BOOST_AUTO_TEST_CASE(NameLsaUpdate)
+{
+  NameLsa knownNameLsa;
+  knownNameLsa.m_originRouter = ndn::Name("/yoursunny/_/%C1.Router/dal");
+  knownNameLsa.m_seqNo = 2683;
+  knownNameLsa.setExpirationTimePoint(ndn::time::system_clock::now() + 3561_ms);
+  knownNameLsa.addName("/yoursunny/_/dal");
+  knownNameLsa.addName("/ndn");
+
+  std::shared_ptr<Lsa> rcvdLsa = std::make_shared<NameLsa>();
+
+  rcvdLsa->m_originRouter = ndn::Name("/yoursunny/_/%C1.Router/dal");
+  rcvdLsa->m_seqNo = 2684;
+  rcvdLsa->setExpirationTimePoint(ndn::time::system_clock::now() + 3600_ms);
+  auto nlsa = std::static_pointer_cast<NameLsa>(rcvdLsa);
+  nlsa->addName("/ndn");
+  nlsa->addName("/yoursunny/_/dal");
+  ndn::Name addedName1("/yoursunny/video/ndn-dpdk_acmicn20_20200917");
+  ndn::Name addedName2("/yoursunny/pushups");
+  nlsa->addName(addedName1);
+  nlsa->addName(addedName2);
+
+  bool updated;
+  std::list<ndn::Name> namesToAdd, namesToRemove;
+  std::tie(updated, namesToAdd, namesToRemove) = knownNameLsa.update(rcvdLsa);
+
+  BOOST_CHECK_EQUAL(namesToRemove.size(), 0);
+  BOOST_CHECK_EQUAL(namesToAdd.size(), 2);
+  auto it = std::find(namesToAdd.begin(), namesToAdd.end(), addedName1);
+  BOOST_CHECK(it != namesToAdd.end());
+  it = std::find(namesToAdd.begin(), namesToAdd.end(), addedName2);
+  BOOST_CHECK(it != namesToAdd.end());
+}
+
 BOOST_AUTO_TEST_SUITE_END()
 
 } // namespace test