commit f1aa52389ae664efdbab327d966947b41571eeaf
author Vince Lehman <vslehman@memphis.edu> Mon Oct 06 17:57:35 2014 -0500
committer Vince Lehman <vslehman@memphis.edu> Wed Oct 08 12:51:25 2014 -0700
tree 75ec0e90475b4845d172e88630406ea195a670d5
parent 0913112f4ad33ee354545d68d707f15d5e5015d3

src: Sort names before std::set_difference

refs: #2029

Change-Id: I170f17cd69fd5a109913c6ebe9a13ab5552132a3

src/lsdb.cpp

diff --git a/src/lsdb.cpp b/src/lsdb.cpp
index 427cc0b..0b7e4e7 100644
--- a/src/lsdb.cpp
+++ b/src/lsdb.cpp
@@ -152,6 +152,9 @@
           }
         }
       }
+
+      chkNameLsa->getNpl().sort();
+
       std::list<ndn::Name> nameToRemove;
       std::set_difference(chkNameLsa->getNpl().getNameList().begin(),
                           chkNameLsa->getNpl().getNameList().end(),

tests/test-lsdb.cpp

diff --git a/tests/test-lsdb.cpp b/tests/test-lsdb.cpp
index 1caefcf..077a381 100644
--- a/tests/test-lsdb.cpp
+++ b/tests/test-lsdb.cpp
@@ -44,13 +44,24 @@
     : face(ndn::makeDummyFace())
     , nlsr(g_ioService, g_scheduler, ndn::ref(*face))
     , sync(*face, nlsr.getLsdb(), nlsr.getConfParameter())
+    , lsdb(nlsr.getLsdb())
+    , conf(nlsr.getConfParameter())
     , REGISTER_COMMAND_PREFIX("/localhost/nfd/rib")
     , REGISTER_VERB("register")
   {
+    conf.setNetwork("/ndn");
+    conf.setSiteName("/site");
+    conf.setRouterName("/%C1.router/this-router");
+
+    nlsr.initialize();
+
+    face->processEvents(ndn::time::milliseconds(1));
+    face->m_sentInterests.clear();
   }
 
-  void extractParameters(ndn::Interest& interest, ndn::Name::Component& verb,
-                         ndn::nfd::ControlParameters& extractedParameters)
+  void
+  extractParameters(ndn::Interest& interest, ndn::Name::Component& verb,
+                    ndn::nfd::ControlParameters& extractedParameters)
   {
     const ndn::Name& name = interest.getName();
     verb = name[REGISTER_COMMAND_PREFIX.size()];
@@ -60,11 +71,32 @@
     extractedParameters.wireDecode(rawParameters);
   }
 
+  void
+  areNamePrefixListsEqual(NamePrefixList& lhs, NamePrefixList& rhs)
+  {
+    typedef std::list<ndn::Name> NameList;
+
+    NameList& lhsList = lhs.getNameList();
+    NameList& rhsList = rhs.getNameList();
+
+    BOOST_REQUIRE_EQUAL(lhsList.size(), rhsList.size());
+
+    NameList::iterator i = lhsList.begin();
+    NameList::iterator j = rhsList.begin();
+
+    for (; i != lhsList.end(); ++i, ++j) {
+      BOOST_CHECK_EQUAL(*i, *j);
+    }
+  }
+
 public:
   shared_ptr<DummyFace> face;
   Nlsr nlsr;
   SyncLogicHandler sync;
 
+  Lsdb& lsdb;
+  ConfParameter& conf;
+
   ndn::Name REGISTER_COMMAND_PREFIX;
   ndn::Name::Component REGISTER_VERB;
 };
@@ -104,17 +136,6 @@
 
 BOOST_AUTO_TEST_CASE(RegisterSyncPrefixOnFirstAdjLsaBuild)
 {
-  ConfParameter& conf = nlsr.getConfParameter();
-  conf.setNetwork("/ndn");
-  conf.setSiteName("/site");
-  conf.setRouterName("/%C1.router/this-router");
-
-  nlsr.initialize();
-
-  Lsdb& lsdb = nlsr.getLsdb();
-  face->processEvents(ndn::time::milliseconds(1));
-  face->m_sentInterests.clear();
-
   // Should register Sync prefix
   lsdb.buildAndInstallOwnAdjLsa();
   face->processEvents(ndn::time::milliseconds(1));
@@ -138,6 +159,71 @@
   BOOST_CHECK_EQUAL(interests.size(), 0);
 }
 
+BOOST_AUTO_TEST_CASE(InstallNameLsa)
+{
+  // Install lsa with name1 and name2
+  ndn::Name name1("/ndn/name1");
+  ndn::Name name2("/ndn/name2");
+
+  NamePrefixList prefixes;
+  prefixes.insert(name1);
+  prefixes.insert(name2);
+
+  std::string otherRouter("/ndn/site/%C1.router/other-router");
+  ndn::time::system_clock::TimePoint MAX_TIME = ndn::time::system_clock::TimePoint::max();
+
+  NameLsa lsa(otherRouter, "name", 1, MAX_TIME, prefixes);
+  lsdb.installNameLsa(lsa);
+
+  BOOST_REQUIRE_EQUAL(lsdb.doesLsaExist(otherRouter + "/name", "name"), true);
+  NamePrefixList& nameList = lsdb.findNameLsa(otherRouter + "/name")->getNpl();
+
+  areNamePrefixListsEqual(nameList, prefixes);
+
+  // Add a prefix: name3
+  ndn::Name name3("/ndn/name3");
+  prefixes.insert(name3);
+
+  NameLsa addLsa(otherRouter, "name", 2, MAX_TIME, prefixes);
+  lsdb.installNameLsa(addLsa);
+
+  // Lsa should include name1, name2, and name3
+  areNamePrefixListsEqual(nameList, prefixes);
+
+  // Remove a prefix: name2
+  prefixes.remove(name2);
+
+  NameLsa removeLsa(otherRouter, "name", 3, MAX_TIME, prefixes);
+  lsdb.installNameLsa(removeLsa);
+
+  // Lsa should include name1 and name3
+  areNamePrefixListsEqual(nameList, prefixes);
+
+  // Add and remove a prefix: add name2, remove name3
+  prefixes.insert(name2);
+  prefixes.remove(name3);
+
+  NameLsa addAndRemoveLsa(otherRouter, "name", 4, MAX_TIME, prefixes);
+  lsdb.installNameLsa(addAndRemoveLsa);
+
+  // Lsa should include name1 and name2
+  areNamePrefixListsEqual(nameList, prefixes);
+
+  // Install a completely new list of prefixes
+  ndn::Name name4("/ndn/name4");
+  ndn::Name name5("/ndn/name5");
+
+  NamePrefixList newPrefixes;
+  newPrefixes.insert(name4);
+  newPrefixes.insert(name5);
+
+  NameLsa newLsa(otherRouter, "name", 5, MAX_TIME, newPrefixes);
+  lsdb.installNameLsa(newLsa);
+
+  // Lsa should include name4 and name5
+  areNamePrefixListsEqual(nameList, newPrefixes);
+}
+
 BOOST_AUTO_TEST_SUITE_END()
 
 } //namespace test