commit 5867b5233f76e38ced74df56f07235f9e84a68c5
author Nick Gordon <nmgordon@memphis.edu> Wed Sep 06 17:41:37 2017 -0500
committer Nick Gordon <nmgordon@memphis.edu> Thu Sep 07 08:48:11 2017 -0700
tree 10a1df9cd668870b468aecb7641f759997b4ac39
parent d40a588e254a3a448c7fe69a966ff7d12a7a01cd

fib: merged redundant functions

Change-Id: Iebec912fa7a3b8ab2cfe36835868dbdb068d7076
refs: #4105

tests/test-fib.cpp

diff --git a/tests/test-fib.cpp b/tests/test-fib.cpp
index 993a7a6..84642f1 100644
--- a/tests/test-fib.cpp
+++ b/tests/test-fib.cpp
@@ -19,11 +19,9 @@
  *
  **/
 
+#include "route/fib.hpp"
 #include "test-common.hpp"
 #include "control-commands.hpp"
-
-#include "route/fib.hpp"
-
 #include "adjacency-list.hpp"
 #include "conf-parameter.hpp"
 
@@ -107,7 +105,7 @@
   hops.addNextHop(hop1);
   hops.addNextHop(hop2);
 
-  fib->processUpdate("/ndn/name", hops);
+  fib->update("/ndn/name", hops);
   face->processEvents(ndn::time::milliseconds(-1));
 
   // Should register faces 1 and 2 for /ndn/name
@@ -141,13 +139,13 @@
   oldHops.addNextHop(hop1);
   oldHops.addNextHop(hop2);
 
-  fib->processUpdate("/ndn/name", oldHops);
+  fib->update("/ndn/name", oldHops);
   face->processEvents(ndn::time::milliseconds(-1));
 
   BOOST_REQUIRE_EQUAL(interests.size(), 2);
   interests.clear();
 
-  fib->processUpdate("/ndn/name", oldHops);
+  fib->update("/ndn/name", oldHops);
   face->processEvents(ndn::time::milliseconds(-1));
 
   // Should register face 1 and 2 for /ndn/name
@@ -180,7 +178,7 @@
   oldHops.addNextHop(hop1);
   oldHops.addNextHop(hop2);
 
-  fib->processUpdate("/ndn/name", oldHops);
+  fib->update("/ndn/name", oldHops);
   face->processEvents(ndn::time::milliseconds(-1));
 
   BOOST_REQUIRE_EQUAL(interests.size(), 2);
@@ -188,7 +186,7 @@
 
   NexthopList empty;
 
-  fib->processUpdate("/ndn/name", empty);
+  fib->update("/ndn/name", empty);
   face->processEvents(ndn::time::milliseconds(-1));
 
   // Should unregister faces 1 and 2 for /ndn/name
@@ -223,7 +221,7 @@
   hops.addNextHop(hop2);
   hops.addNextHop(hop3);
 
-  fib->processUpdate("/ndn/name", hops);
+  fib->update("/ndn/name", hops);
   face->processEvents(ndn::time::milliseconds(-1));
 
   // Should only register faces 1 and 2 for /ndn/name
@@ -256,7 +254,7 @@
   hops.addNextHop(hop1);
   hops.addNextHop(hop2);
 
-  fib->processUpdate("/ndn/name", hops);
+  fib->update("/ndn/name", hops);
   face->processEvents(ndn::time::milliseconds(-1));
 
   // FIB
@@ -269,7 +267,7 @@
   NextHop hop3(router3FaceUri, 5);
   hops.addNextHop(hop3);
 
-  fib->processUpdate("/ndn/name", hops);
+  fib->update("/ndn/name", hops);
   face->processEvents(ndn::time::milliseconds(-1));
 
   // To maintain a max 2 face requirement, face 3 should be registered and face 2 should be