commit 97210d5b150e00676dc168ff6d48829f11a59c8e
author Davide Pesavento <davide.pesavento@lip6.fr> Fri Oct 14 15:45:48 2016 +0200
committer Davide Pesavento <davide.pesavento@lip6.fr> Fri Oct 14 15:45:48 2016 +0200
tree aae8687d948dc9d847ebbe6316352f44f66a82d4
parent 436f3bd9feaf68c993acc80e06bbe7b7ddfc8a18

tests: respect naming conventions and improve nesting of some test suites

Change-Id: I65af858bc6d10197c6ee11111fa9f7c1faa617ef
Refs: #2497

tests/rib/auto-prefix-propagator.t.cpp

diff --git a/tests/rib/auto-prefix-propagator.t.cpp b/tests/rib/auto-prefix-propagator.t.cpp
index ebdf94b..5077bab 100644
--- a/tests/rib/auto-prefix-propagator.t.cpp
+++ b/tests/rib/auto-prefix-propagator.t.cpp
@@ -25,8 +25,8 @@
 
 #include "rib/auto-prefix-propagator.hpp"
 
-#include "tests/test-common.hpp"
 #include "tests/identity-management-fixture.hpp"
+
 #include <ndn-cxx/util/dummy-client-face.hpp>
 
 namespace nfd {
@@ -35,13 +35,10 @@
 
 using namespace nfd::tests;
 
-NFD_LOG_INIT("AutoPrefixPropagatorTest");
-
 const Name TEST_LINK_LOCAL_NFD_PREFIX("/localhop/nfd");
 const time::milliseconds TEST_PREFIX_PROPAGATION_TIMEOUT(1000);
 
-class AutoPrefixPropagatorFixture : public IdentityManagementFixture
-                                  , public UnitTestTimeFixture
+class AutoPrefixPropagatorFixture : public IdentityManagementTimeFixture
 {
 public:
   AutoPrefixPropagatorFixture()
@@ -66,7 +63,7 @@
   insertEntryToRib(const Name& name, const uint64_t& faceId = 0)
   {
     if (m_rib.find(name) != m_rib.end()) {
-      NFD_LOG_INFO("RIB entry already exists: " << name);
+      BOOST_TEST_MESSAGE("RIB entry already exists: " + name.toUri());
       return false;
     }
 
@@ -82,7 +79,7 @@
   eraseEntryFromRib(const Name& name)
   {
     if (m_rib.find(name) == m_rib.end()) {
-      NFD_LOG_INFO("RIB entry does not exist: " << name);
+      BOOST_TEST_MESSAGE("RIB entry does not exist: " + name.toUri());
       return false;
     }
 
@@ -215,8 +212,6 @@
   return os;
 }
 
-BOOST_AUTO_TEST_SUITE(Rib)
-
 BOOST_FIXTURE_TEST_SUITE(TestAutoPrefixPropagator, AutoPrefixPropagatorFixture)
 
 BOOST_AUTO_TEST_CASE(EnableDisable)
@@ -277,8 +272,6 @@
   BOOST_CHECK_EQUAL(m_propagator.m_maxRetryWait, time::seconds(55));
 }
 
-BOOST_AUTO_TEST_SUITE(Helpers)
-
 BOOST_AUTO_TEST_CASE(GetPrefixPropagationParameters)
 {
   BOOST_REQUIRE(addIdentity("/test/A"));
@@ -365,8 +358,6 @@
   BOOST_CHECK(m_entries.find("test/B/C") == m_entries.end());
 }
 
-BOOST_AUTO_TEST_SUITE_END() // Helpers
-
 BOOST_AUTO_TEST_SUITE(PropagateRevokeSemantics)
 
 BOOST_AUTO_TEST_CASE(Basic)
@@ -684,7 +675,6 @@
 BOOST_AUTO_TEST_SUITE_END() // PropagatedEntryStateChanges
 
 BOOST_AUTO_TEST_SUITE_END() // TestAutoPrefixPropagator
-BOOST_AUTO_TEST_SUITE_END() // Rib
 
 } // namespace tests
 } // namespace rib