rib: route addition and removal signals
refs: #3818
Change-Id: Ic47afeba4b4133a2092b26ecd49adbaac0505781
diff --git a/tests/rib/rib-entry.t.cpp b/tests/rib/rib-entry.t.cpp
new file mode 100644
index 0000000..03cd8b9
--- /dev/null
+++ b/tests/rib/rib-entry.t.cpp
@@ -0,0 +1,79 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/**
+ * Copyright (c) 2014-2016, Regents of the University of California,
+ * Arizona Board of Regents,
+ * Colorado State University,
+ * University Pierre & Marie Curie, Sorbonne University,
+ * Washington University in St. Louis,
+ * Beijing Institute of Technology,
+ * The University of Memphis.
+ *
+ * This file is part of NFD (Named Data Networking Forwarding Daemon).
+ * See AUTHORS.md for complete list of NFD authors and contributors.
+ *
+ * NFD is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later version.
+ *
+ * NFD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * NFD, e.g., in COPYING.md file. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "rib/rib-entry.hpp"
+#include "tests/test-common.hpp"
+
+namespace nfd {
+namespace rib {
+namespace tests {
+
+BOOST_FIXTURE_TEST_SUITE(TestRibEntry, nfd::tests::BaseFixture)
+
+BOOST_AUTO_TEST_CASE(Basic)
+{
+ rib::RibEntry entry;
+ rib::RibEntry::iterator entryIt;
+ bool didInsert = false;
+
+ rib::Route route1;
+ route1.faceId = 1;
+ route1.origin = 0;
+
+ std::tie(entryIt, didInsert) = entry.insertRoute(route1);
+ BOOST_CHECK_EQUAL(entry.getRoutes().size(), 1);
+ BOOST_CHECK(entryIt == entry.findRoute(route1));
+ BOOST_CHECK(didInsert);
+
+ Route route2;
+ route2.faceId = 1;
+ route2.origin = 128;
+
+ std::tie(entryIt, didInsert) = entry.insertRoute(route2);
+ BOOST_CHECK_EQUAL(entry.getRoutes().size(), 2);
+ BOOST_CHECK(entryIt == entry.findRoute(route2));
+ BOOST_CHECK(didInsert);
+
+ entry.eraseRoute(route1);
+ BOOST_CHECK_EQUAL(entry.getRoutes().size(), 1);
+ BOOST_CHECK(entry.findRoute(route1) == entry.end());
+
+ BOOST_CHECK(entry.findRoute(route1) == entry.getRoutes().end());
+ BOOST_CHECK(entry.findRoute(route2) != entry.getRoutes().end());
+
+ std::tie(entryIt, didInsert) = entry.insertRoute(route2);
+ BOOST_CHECK_EQUAL(entry.getRoutes().size(), 1);
+ BOOST_CHECK(!didInsert);
+
+ entry.eraseRoute(route1);
+ BOOST_CHECK_EQUAL(entry.getRoutes().size(), 1);
+ BOOST_CHECK(entry.findRoute(route2) != entry.getRoutes().end());
+}
+
+BOOST_AUTO_TEST_SUITE_END() // TestRibEntry
+
+} // namespace tests
+} // namespace rib
+} // namespace nfd
diff --git a/tests/rib/rib.t.cpp b/tests/rib/rib.t.cpp
index eed09f9..9a73ac7 100644
--- a/tests/rib/rib.t.cpp
+++ b/tests/rib/rib.t.cpp
@@ -1,4 +1,4 @@
-/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+ /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
* Copyright (c) 2014-2016, Regents of the University of California,
* Arizona Board of Regents,
@@ -35,38 +35,6 @@
BOOST_FIXTURE_TEST_SUITE(TestRib, nfd::tests::BaseFixture)
-BOOST_AUTO_TEST_CASE(RibEntry)
-{
- rib::RibEntry entry;
-
- rib::Route route1;
- route1.faceId = 1;
- route1.origin = 0;
-
- entry.insertRoute(route1);
- BOOST_CHECK_EQUAL(entry.getRoutes().size(), 1);
-
- Route route2;
- route2.faceId = 1;
- route2.origin = 128;
-
- entry.insertRoute(route2);
- BOOST_CHECK_EQUAL(entry.getRoutes().size(), 2);
-
- entry.eraseRoute(route1);
- BOOST_CHECK_EQUAL(entry.getRoutes().size(), 1);
-
- BOOST_CHECK(entry.findRoute(route1) == entry.getRoutes().end());
- BOOST_CHECK(entry.findRoute(route2) != entry.getRoutes().end());
-
- entry.insertRoute(route2);
- BOOST_CHECK_EQUAL(entry.getRoutes().size(), 1);
-
- entry.eraseRoute(route1);
- BOOST_CHECK_EQUAL(entry.getRoutes().size(), 1);
- BOOST_CHECK(entry.findRoute(route2) != entry.getRoutes().end());
-}
-
BOOST_AUTO_TEST_CASE(Parent)
{
rib::Rib rib;
@@ -295,6 +263,79 @@
BOOST_CHECK_EQUAL(rib.size(), 1);
}
+BOOST_AUTO_TEST_CASE(RibSignals)
+{
+ rib::Rib rib;
+
+ Route route;
+ Name name("/hello/world");
+
+ Route route1;
+ route1.faceId = 1;
+ route1.origin = 20;
+ route1.cost = 10;
+
+ Route route2;
+ route2.faceId = 2;
+ route2.origin = 30;
+ route2.cost = 20;
+
+ RibRouteRef routeInfo;
+
+ int nAfterInsertEntryInvocations = 0;
+ int nAfterAddRouteInvocations = 0;
+ int nBeforeRemoveRouteInvocations = 0;
+ int nAfterEraseEntryInvocations = 0;
+ rib.afterInsertEntry.connect([&] (const Name& inName) {
+ BOOST_CHECK_EQUAL(nAfterInsertEntryInvocations, 0);
+ BOOST_CHECK_EQUAL(nAfterAddRouteInvocations, 0);
+ BOOST_CHECK(rib.find(name) != rib.end());
+ nAfterInsertEntryInvocations++;
+ });
+
+ rib.afterAddRoute.connect([&] (const RibRouteRef& rrr) {
+ BOOST_CHECK_EQUAL(nAfterInsertEntryInvocations, 1);
+ BOOST_CHECK(rib.find(name) != rib.end());
+ BOOST_CHECK(rib.find(name, route) != nullptr);
+ nAfterAddRouteInvocations++;
+ });
+
+ rib.beforeRemoveRoute.connect([&] (const RibRouteRef& rrr) {
+ BOOST_CHECK_EQUAL(nAfterEraseEntryInvocations, 0);
+ BOOST_CHECK(rib.find(name) != rib.end());
+ BOOST_CHECK(rib.find(name, route) != nullptr);
+ nBeforeRemoveRouteInvocations++;
+ });
+
+ rib.afterEraseEntry.connect([&] (const Name& inName) {
+ BOOST_CHECK_EQUAL(nBeforeRemoveRouteInvocations, 2);
+ BOOST_CHECK_EQUAL(nAfterEraseEntryInvocations, 0);
+ BOOST_CHECK(rib.find(name) == rib.end());
+ nAfterEraseEntryInvocations++;
+ });
+
+ route = route1;
+ rib.insert(name, route);
+ BOOST_CHECK_EQUAL(nAfterInsertEntryInvocations, 1);
+ BOOST_CHECK_EQUAL(nAfterAddRouteInvocations, 1);
+
+ route = route2;
+ rib.insert(name, route);
+ BOOST_CHECK_EQUAL(nAfterInsertEntryInvocations, 1);
+ BOOST_CHECK_EQUAL(nAfterAddRouteInvocations, 2);
+
+ route = route1;
+ rib.erase(name, route);
+ BOOST_CHECK_EQUAL(nBeforeRemoveRouteInvocations, 1);
+ BOOST_CHECK_EQUAL(nAfterEraseEntryInvocations, 0);
+
+ route = route2;
+ rib.erase(name, route);
+ BOOST_CHECK_EQUAL(nBeforeRemoveRouteInvocations, 2);
+ BOOST_CHECK_EQUAL(nAfterEraseEntryInvocations, 1);
+
+}
+
BOOST_AUTO_TEST_SUITE_END() // TestRib
} // namespace tests