tests: Small corrections in cases
Changes include:
- disable use of std::cout in DNS test case (use BOOST_TEST_MESSAGE instead)
- renaming test suites for InMemoryStorage cases. All InMemoryStorage
cases are grouped under InMemoryStorage super-suite and specific
implementations are put in Common, Fifo, Lru, Lfu, Persistent suites.
Change-Id: Id42642304b7a06bbabd980c3cb50ddfa26bd349f
diff --git a/tests/unit-tests/util/test-dns.cpp b/tests/unit-tests/util/test-dns.cpp
index 94cf027..6eeb6e0 100644
--- a/tests/unit-tests/util/test-dns.cpp
+++ b/tests/unit-tests/util/test-dns.cpp
@@ -44,7 +44,7 @@
bool isValid,
bool shouldCheckAddress = false)
{
- std::cout << "Resolved to: " << resolvedAddress << std::endl;
+ BOOST_TEST_MESSAGE("Resolved to: " << resolvedAddress);
++m_nSuccesses;
diff --git a/tests/unit-tests/util/test-in-memory-storage-template.cpp b/tests/unit-tests/util/test-in-memory-storage-common.cpp
similarity index 98%
rename from tests/unit-tests/util/test-in-memory-storage-template.cpp
rename to tests/unit-tests/util/test-in-memory-storage-common.cpp
index d675d18..e82325f 100644
--- a/tests/unit-tests/util/test-in-memory-storage-template.cpp
+++ b/tests/unit-tests/util/test-in-memory-storage-common.cpp
@@ -33,11 +33,13 @@
namespace ndn {
namespace util {
+BOOST_AUTO_TEST_SUITE(UtilInMemoryStorage)
+
+BOOST_AUTO_TEST_SUITE(Common)
+
typedef boost::mpl::list<InMemoryStoragePersistent, InMemoryStorageFifo, InMemoryStorageLfu,
InMemoryStorageLru> InMemoryStorages;
-BOOST_AUTO_TEST_SUITE(UtilInMemoryStorageTemplate)
-
BOOST_AUTO_TEST_CASE_TEMPLATE(Insertion, T, InMemoryStorages)
{
T ims;
@@ -1036,9 +1038,9 @@
BOOST_CHECK_EQUAL(find(), 6);
}
-BOOST_AUTO_TEST_SUITE_END()
-
-BOOST_AUTO_TEST_SUITE_END()
+BOOST_AUTO_TEST_SUITE_END() // Find
+BOOST_AUTO_TEST_SUITE_END() // Common
+BOOST_AUTO_TEST_SUITE_END() // UtilInMemoryStorage
} // namespace util
} // namespace ndn
diff --git a/tests/unit-tests/util/test-in-memory-storage-fifo.cpp b/tests/unit-tests/util/test-in-memory-storage-fifo.cpp
index 768dddd..9a7a13b 100644
--- a/tests/unit-tests/util/test-in-memory-storage-fifo.cpp
+++ b/tests/unit-tests/util/test-in-memory-storage-fifo.cpp
@@ -28,7 +28,8 @@
namespace ndn {
namespace util {
-BOOST_AUTO_TEST_SUITE(UtilInMemoryStorageFifo)
+BOOST_AUTO_TEST_SUITE(UtilInMemoryStorage)
+BOOST_AUTO_TEST_SUITE(Fifo)
BOOST_AUTO_TEST_CASE(ArrivalQueue)
{
@@ -71,7 +72,8 @@
BOOST_CHECK(!static_cast<bool>(found2));
}
-BOOST_AUTO_TEST_SUITE_END()
+BOOST_AUTO_TEST_SUITE_END() // Fifo
+BOOST_AUTO_TEST_SUITE_END() // UtilInMemoryStorage
} // namespace util
} // namespace ndn
diff --git a/tests/unit-tests/util/test-in-memory-storage-lfu.cpp b/tests/unit-tests/util/test-in-memory-storage-lfu.cpp
index 835b804..428d2e3 100644
--- a/tests/unit-tests/util/test-in-memory-storage-lfu.cpp
+++ b/tests/unit-tests/util/test-in-memory-storage-lfu.cpp
@@ -28,7 +28,8 @@
namespace ndn {
namespace util {
-BOOST_AUTO_TEST_SUITE(UtilInMemoryStorageLfu)
+BOOST_AUTO_TEST_SUITE(UtilInMemoryStorage)
+BOOST_AUTO_TEST_SUITE(Lfu)
BOOST_AUTO_TEST_CASE(FrequencyQueue)
{
@@ -126,7 +127,8 @@
BOOST_CHECK_EQUAL(found3->getName(), name3);
}
-BOOST_AUTO_TEST_SUITE_END()
+BOOST_AUTO_TEST_SUITE_END() // Lfu
+BOOST_AUTO_TEST_SUITE_END() // UtilInMemoryStorage
} // namesapce util
} // namespace ndn
diff --git a/tests/unit-tests/util/test-in-memory-storage-lru.cpp b/tests/unit-tests/util/test-in-memory-storage-lru.cpp
index 8c07e6e..d91f7ad 100644
--- a/tests/unit-tests/util/test-in-memory-storage-lru.cpp
+++ b/tests/unit-tests/util/test-in-memory-storage-lru.cpp
@@ -28,7 +28,8 @@
namespace ndn {
namespace util {
-BOOST_AUTO_TEST_SUITE(UtilInMemoryStorageLru)
+BOOST_AUTO_TEST_SUITE(UtilInMemoryStorage)
+BOOST_AUTO_TEST_SUITE(Lru)
BOOST_AUTO_TEST_CASE(UsedTimeQueue)
{
@@ -128,7 +129,8 @@
BOOST_CHECK_EQUAL(found3->getName(), name3);
}
-BOOST_AUTO_TEST_SUITE_END()
+BOOST_AUTO_TEST_SUITE_END() // Lru
+BOOST_AUTO_TEST_SUITE_END() // UtilInMemoryStorage
} // namespace util
} // namespace ndn
diff --git a/tests/unit-tests/util/test-in-memory-storage-persistent.cpp b/tests/unit-tests/util/test-in-memory-storage-persistent.cpp
index 3bd53bb..3da691f 100644
--- a/tests/unit-tests/util/test-in-memory-storage-persistent.cpp
+++ b/tests/unit-tests/util/test-in-memory-storage-persistent.cpp
@@ -28,7 +28,8 @@
namespace ndn {
namespace util {
-BOOST_AUTO_TEST_SUITE(UtilInMemoryStoragePersistent)
+BOOST_AUTO_TEST_SUITE(UtilInMemoryStorage)
+BOOST_AUTO_TEST_SUITE(Persistent)
BOOST_AUTO_TEST_CASE(GetLimit)
{
@@ -56,7 +57,8 @@
BOOST_CHECK_EQUAL(ims.getCapacity(), 20);
}
-BOOST_AUTO_TEST_SUITE_END()
+BOOST_AUTO_TEST_SUITE_END() // Persistent
+BOOST_AUTO_TEST_SUITE_END() // UtilInMemoryStorage
} // namespace util
} // namespace ndn