tests: respect naming conventions and improve nesting of some test suites
Change-Id: I65af858bc6d10197c6ee11111fa9f7c1faa617ef
Refs: #2497
diff --git a/tests/rib/fib-updates-common.hpp b/tests/rib/fib-updates-common.hpp
index 1f293c6..df41c3e 100644
--- a/tests/rib/fib-updates-common.hpp
+++ b/tests/rib/fib-updates-common.hpp
@@ -33,8 +33,6 @@
namespace rib {
namespace tests {
-using namespace nfd::tests;
-
inline bool
compareNameFaceIdCostAction(const FibUpdate& lhs, const FibUpdate& rhs)
{
@@ -58,7 +56,7 @@
return false;
}
-class FibUpdatesFixture : public IdentityManagementFixture
+class FibUpdatesFixture : public nfd::tests::IdentityManagementFixture
{
public:
FibUpdatesFixture()
@@ -168,9 +166,9 @@
public:
ndn::util::DummyClientFace face;
ndn::nfd::Controller controller;
- rib::FibUpdater fibUpdater;
- rib::Rib rib;
+ Rib rib;
+ FibUpdater fibUpdater;
FibUpdater::FibUpdateList fibUpdates;
};