fw: FaceTable
refs #1317
Change-Id: Ief04fe572407120ca6777c087a519c1749f0cdd2
diff --git a/tests/core/map-value-iterator.cpp b/tests/core/map-value-iterator.cpp
new file mode 100644
index 0000000..c874b8f
--- /dev/null
+++ b/tests/core/map-value-iterator.cpp
@@ -0,0 +1,39 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/**
+ * Copyright (C) 2014 Named Data Networking Project
+ * See COPYING for copyright and distribution information.
+ */
+
+#include "core/map-value-iterator.hpp"
+#include <boost/concept_check.hpp>
+
+#include "tests/test-common.hpp"
+
+namespace nfd {
+namespace tests {
+
+BOOST_FIXTURE_TEST_SUITE(CoreMapValueIterator, BaseFixture)
+
+BOOST_AUTO_TEST_CASE(Basic)
+{
+ typedef std::map<char, int> CharIntMap;
+ typedef MapValueIterator<CharIntMap> CharIntMapValueIterator;
+ BOOST_CONCEPT_ASSERT((boost::ForwardIterator<CharIntMapValueIterator>));
+
+ CharIntMap map;
+ map['a'] = 1918;
+ map['b'] = 2675;
+ map['c'] = 7783;
+ map['d'] = 2053;
+
+ CharIntMapValueIterator begin(map.begin());
+ CharIntMapValueIterator end (map.end ());
+
+ int expected[] = { 1918, 2675, 7783, 2053 };
+ BOOST_CHECK_EQUAL_COLLECTIONS(begin, end, expected, expected + 4);
+}
+
+BOOST_AUTO_TEST_SUITE_END()
+
+} // namespace tests
+} // namespace nfd
diff --git a/tests/fw/face-table.cpp b/tests/fw/face-table.cpp
new file mode 100644
index 0000000..474a756
--- /dev/null
+++ b/tests/fw/face-table.cpp
@@ -0,0 +1,99 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/**
+ * Copyright (C) 2014 Named Data Networking Project
+ * See COPYING for copyright and distribution information.
+ */
+
+#include "fw/face-table.hpp"
+#include "fw/forwarder.hpp"
+
+#include "tests/test-common.hpp"
+#include "tests/face/dummy-face.hpp"
+
+namespace nfd {
+namespace tests {
+
+BOOST_FIXTURE_TEST_SUITE(FwFaceTable, BaseFixture)
+
+BOOST_AUTO_TEST_CASE(AddRemove)
+{
+ Forwarder forwarder;
+
+ shared_ptr<Face> face1 = make_shared<DummyFace>();
+ shared_ptr<Face> face2 = make_shared<DummyFace>();
+
+ BOOST_CHECK_EQUAL(face1->getId(), INVALID_FACEID);
+ BOOST_CHECK_EQUAL(face2->getId(), INVALID_FACEID);
+
+ forwarder.addFace(face1);
+ forwarder.addFace(face2);
+
+ BOOST_CHECK_NE(face1->getId(), INVALID_FACEID);
+ BOOST_CHECK_NE(face2->getId(), INVALID_FACEID);
+ BOOST_CHECK_NE(face1->getId(), face2->getId());
+
+ forwarder.removeFace(face1);
+ forwarder.removeFace(face2);
+
+ BOOST_CHECK_EQUAL(face1->getId(), INVALID_FACEID);
+ BOOST_CHECK_EQUAL(face2->getId(), INVALID_FACEID);
+}
+
+BOOST_AUTO_TEST_CASE(Enumerate)
+{
+ Forwarder forwarder;
+ FaceTable& faceTable = forwarder.getFaceTable();
+
+ shared_ptr<Face> face1 = make_shared<DummyFace>();
+ shared_ptr<Face> face2 = make_shared<DummyFace>();
+ bool hasFace1 = false, hasFace2 = false;
+
+ BOOST_CHECK_EQUAL(faceTable.size(), 0);
+ BOOST_CHECK_EQUAL(std::distance(faceTable.begin(), faceTable.end()), faceTable.size());
+
+ faceTable.add(face1);
+ BOOST_CHECK_EQUAL(faceTable.size(), 1);
+ BOOST_CHECK_EQUAL(std::distance(faceTable.begin(), faceTable.end()), faceTable.size());
+ hasFace1 = hasFace2 = false;
+ for (FaceTable::const_iterator it = faceTable.begin(); it != faceTable.end(); ++it) {
+ if (*it == face1) {
+ hasFace1 = true;
+ }
+ }
+ BOOST_CHECK(hasFace1);
+
+ faceTable.add(face2);
+ BOOST_CHECK_EQUAL(faceTable.size(), 2);
+ BOOST_CHECK_EQUAL(std::distance(faceTable.begin(), faceTable.end()), faceTable.size());
+ hasFace1 = hasFace2 = false;
+ for (FaceTable::const_iterator it = faceTable.begin(); it != faceTable.end(); ++it) {
+ if (*it == face1) {
+ hasFace1 = true;
+ }
+ if (*it == face2) {
+ hasFace2 = true;
+ }
+ }
+ BOOST_CHECK(hasFace1);
+ BOOST_CHECK(hasFace2);
+
+ faceTable.remove(face1);
+ BOOST_CHECK_EQUAL(faceTable.size(), 1);
+ BOOST_CHECK_EQUAL(std::distance(faceTable.begin(), faceTable.end()), faceTable.size());
+ hasFace1 = hasFace2 = false;
+ for (FaceTable::const_iterator it = faceTable.begin(); it != faceTable.end(); ++it) {
+ if (*it == face1) {
+ hasFace1 = true;
+ }
+ if (*it == face2) {
+ hasFace2 = true;
+ }
+ }
+ BOOST_CHECK(!hasFace1);
+ BOOST_CHECK(hasFace2);
+}
+
+BOOST_AUTO_TEST_SUITE_END()
+
+} // namespace tests
+} // namespace nfd
diff --git a/tests/fw/forwarder.cpp b/tests/fw/forwarder.cpp
index 0a30852..b9e460c 100644
--- a/tests/fw/forwarder.cpp
+++ b/tests/fw/forwarder.cpp
@@ -14,30 +14,6 @@
BOOST_FIXTURE_TEST_SUITE(FwForwarder, BaseFixture)
-BOOST_AUTO_TEST_CASE(AddRemoveFace)
-{
- Forwarder forwarder;
-
- shared_ptr<Face> face1 = make_shared<DummyFace>();
- shared_ptr<Face> face2 = make_shared<DummyFace>();
-
- BOOST_CHECK_EQUAL(face1->getId(), INVALID_FACEID);
- BOOST_CHECK_EQUAL(face2->getId(), INVALID_FACEID);
-
- forwarder.addFace(face1);
- forwarder.addFace(face2);
-
- BOOST_CHECK_NE(face1->getId(), INVALID_FACEID);
- BOOST_CHECK_NE(face2->getId(), INVALID_FACEID);
- BOOST_CHECK_NE(face1->getId(), face2->getId());
-
- forwarder.removeFace(face1);
- forwarder.removeFace(face2);
-
- BOOST_CHECK_EQUAL(face1->getId(), INVALID_FACEID);
- BOOST_CHECK_EQUAL(face2->getId(), INVALID_FACEID);
-}
-
BOOST_AUTO_TEST_CASE(SimpleExchange)
{
Forwarder forwarder;