commit 82a34c2cd8e73dc95860a5e781c894ed30cd099a
author dulalsaurab <sdulal@memphis.edu> Mon Feb 04 17:31:21 2019 +0000
committer Saurab Dulal <sdulal@memphis.edu> Tue Feb 19 15:49:38 2019 -0600
tree 9943318dd542b8940a44c75feca6ab48eaef5c06
parent 85998a1dc942974a7d4bf3e9f642c5a22dffb6f8

**breaking change** nlsr.conf: rename seq-dir as state-dir

update: conf file in seperate directory for runtime modification

refs:  #4823

Change-Id: I5378d831294814e382ad23a9e522d0b576180f20

tests/test-conf-file-processor.cpp

diff --git a/tests/test-conf-file-processor.cpp b/tests/test-conf-file-processor.cpp
index 9cff6f9..4f0d8a7 100644
--- a/tests/test-conf-file-processor.cpp
+++ b/tests/test-conf-file-processor.cpp
@@ -45,7 +45,7 @@
   "  router-dead-interval 86400\n"
   "  sync-protocol psync\n"
   "  sync-interest-lifetime 10000\n"
-  "  seq-dir /tmp\n"
+  "  state-dir /tmp\n"
   "}\n\n";
 
 const std::string SECTION_NEIGHBORS =
@@ -176,7 +176,7 @@
   BOOST_CHECK_EQUAL(conf.getLsaInterestLifetime(), ndn::time::seconds(3));
   BOOST_CHECK_EQUAL(conf.getRouterDeadInterval(), 86400);
   BOOST_CHECK_EQUAL(conf.getSyncInterestLifetime(), ndn::time::milliseconds(10000));
-  BOOST_CHECK_EQUAL(conf.getSeqFileDir(), "/tmp");
+  BOOST_CHECK_EQUAL(conf.getStateFileDir(), "/tmp");
 
   // Neighbors
   BOOST_CHECK_EQUAL(conf.getInterestRetryNumber(), 3);

tests/update/test-save-delete-prefix.cpp

diff --git a/tests/update/test-save-delete-prefix.cpp b/tests/update/test-save-delete-prefix.cpp
index ab65564..10988bf 100644
--- a/tests/update/test-save-delete-prefix.cpp
+++ b/tests/update/test-save-delete-prefix.cpp
@@ -24,6 +24,7 @@
 
 #include "../control-commands.hpp"
 #include "../test-common.hpp"
+#include "conf-parameter.hpp"
 
 #include <ndn-cxx/mgmt/nfd/control-response.hpp>
 #include <ndn-cxx/security/command-interest-signer.hpp>
@@ -58,6 +59,7 @@
     source.close();
     destination.close();
 
+    conf.setConfFileNameDynamic(testConfFile);
     siteIdentity = addIdentity(siteIdentityName);
     saveCertificate(siteIdentity, SITE_CERT_PATH.string());
 
@@ -80,6 +82,7 @@
         }
       }
     }
+
     inputFile.close();
 
     // Site cert
@@ -172,7 +175,7 @@
 
 BOOST_AUTO_TEST_CASE(Basic)
 {
-  // only advertise
+
   face.receive(advertiseWithdraw("/prefix/to/save", "advertise", false));
   this->advanceClocks(ndn::time::milliseconds(10));
   BOOST_CHECK_EQUAL(checkPrefix("/prefix/to/save"), false);
@@ -208,7 +211,7 @@
   BOOST_CHECK_EQUAL(checkPrefix("/prefix/to/save"), true);
 
   // trying to advertise same name prefix
-  /*face.receive(advertiseWithdraw("/prefix/to/save", "advertise", true));
+  face.receive(advertiseWithdraw("/prefix/to/save", "advertise", true));
   this->advanceClocks(ndn::time::milliseconds(10));
   BOOST_REQUIRE(counter == 1);
   BOOST_CHECK_EQUAL(getResponseCode(), 406);
@@ -226,7 +229,7 @@
   this->advanceClocks(ndn::time::milliseconds(10));
   // after withdrawn delete prefix should be deleted from the file
   BOOST_CHECK_EQUAL(getResponseCode(), 205);
-  BOOST_CHECK_EQUAL(checkPrefix("/prefix/to/save"), false);*/
+  BOOST_CHECK_EQUAL(checkPrefix("/prefix/to/save"), false);
 }
 
 BOOST_AUTO_TEST_SUITE_END()