tests: filename and test suite name corrections in pib and ping
This commit splits IdentityManagementFixture from IdentityManagementTimeFixture,
and copies its API from NFD repository.
refs #3018
Change-Id: I14dc66dd6eacc83ef2761c0c484173168d98dcef
diff --git a/tests/ping/client/ping.t.cpp b/tests/ping/client/ping.t.cpp
index e39c65a..2b20124 100644
--- a/tests/ping/client/ping.t.cpp
+++ b/tests/ping/client/ping.t.cpp
@@ -18,9 +18,9 @@
*/
#include "tools/ping/client/ping.hpp"
-#include <ndn-cxx/util/dummy-client-face.hpp>
#include "tests/test-common.hpp"
+#include <ndn-cxx/util/dummy-client-face.hpp>
namespace ndn {
namespace ping {
@@ -29,7 +29,10 @@
using namespace ndn::tests;
-BOOST_AUTO_TEST_SUITE(PingClientPing)
+BOOST_AUTO_TEST_SUITE(Ping)
+BOOST_AUTO_TEST_SUITE(TestPing)
+
+using ping::client::Ping;
BOOST_FIXTURE_TEST_CASE(Basic, UnitTestTimeFixture)
{
@@ -91,7 +94,8 @@
io.stop();
}
-BOOST_AUTO_TEST_SUITE_END()
+BOOST_AUTO_TEST_SUITE_END() // TestPing
+BOOST_AUTO_TEST_SUITE_END() // Ping
} // namespace tests
} // namespace client
diff --git a/tests/ping/client/statistics-collector.t.cpp b/tests/ping/client/statistics-collector.t.cpp
index 6093785..6bcb9fb 100644
--- a/tests/ping/client/statistics-collector.t.cpp
+++ b/tests/ping/client/statistics-collector.t.cpp
@@ -18,9 +18,9 @@
*/
#include "tools/ping/client/statistics-collector.hpp"
-#include <ndn-cxx/util/dummy-client-face.hpp>
#include "tests/test-common.hpp"
+#include <ndn-cxx/util/dummy-client-face.hpp>
namespace ndn {
namespace ping {
@@ -62,7 +62,8 @@
StatisticsCollector sc;
};
-BOOST_FIXTURE_TEST_SUITE(PingClientStatisticsCollector, StatisticsCollectorFixture)
+BOOST_AUTO_TEST_SUITE(Ping)
+BOOST_FIXTURE_TEST_SUITE(TestStatisticsCollector, StatisticsCollectorFixture)
BOOST_AUTO_TEST_CASE(Resp50msResp50ms)
{
@@ -184,7 +185,8 @@
BOOST_CHECK_CLOSE(stats.packetLossRate, 0.5, 0.001);
}
-BOOST_AUTO_TEST_SUITE_END()
+BOOST_AUTO_TEST_SUITE_END() // TestStatisticsCollector
+BOOST_AUTO_TEST_SUITE_END() // Ping
} // namespace tests
} // namespace client
diff --git a/tests/ping/integrated.t.cpp b/tests/ping/integrated.t.cpp
index fb6f1cc..9e929aa 100644
--- a/tests/ping/integrated.t.cpp
+++ b/tests/ping/integrated.t.cpp
@@ -19,10 +19,9 @@
#include "tools/ping/server/ping-server.hpp"
#include "tools/ping/client/ping.hpp"
-#include <ndn-cxx/util/dummy-client-face.hpp>
-#include "tests/test-common.hpp"
-#include "../identity-management-time-fixture.hpp"
+#include "tests/identity-management-fixture.hpp"
+#include <ndn-cxx/util/dummy-client-face.hpp>
namespace ndn {
namespace ping {
@@ -68,7 +67,8 @@
bool wantLoss;
};
-BOOST_AUTO_TEST_SUITE(PingIntegrated)
+BOOST_AUTO_TEST_SUITE(Ping)
+BOOST_AUTO_TEST_SUITE(TestIntegrated)
BOOST_FIXTURE_TEST_CASE(Normal, PingIntegratedFixture)
{
@@ -134,7 +134,8 @@
BOOST_REQUIRE_EQUAL(0, server->getNPings());
}
-BOOST_AUTO_TEST_SUITE_END()
+BOOST_AUTO_TEST_SUITE_END() // TestIntegrated
+BOOST_AUTO_TEST_SUITE_END() // Ping
} // namespace tests
} // namespace ping
diff --git a/tests/ping/server/ping-server.t.cpp b/tests/ping/server/ping-server.t.cpp
index 7d2a8da..0192008 100644
--- a/tests/ping/server/ping-server.t.cpp
+++ b/tests/ping/server/ping-server.t.cpp
@@ -21,7 +21,7 @@
#include <ndn-cxx/util/dummy-client-face.hpp>
#include "tests/test-common.hpp"
-#include "../../identity-management-time-fixture.hpp"
+#include "../../identity-management-fixture.hpp"
namespace ndn {
namespace ping {
@@ -30,7 +30,8 @@
using namespace ndn::tests;
-BOOST_AUTO_TEST_SUITE(PingServerPingServer)
+BOOST_AUTO_TEST_SUITE(Ping)
+BOOST_AUTO_TEST_SUITE(TestPingServer)
class CreatePingServerFixture : public IdentityManagementTimeFixture
{
@@ -89,7 +90,8 @@
BOOST_REQUIRE_EQUAL(2, pingServer.getNPings());
}
-BOOST_AUTO_TEST_SUITE_END()
+BOOST_AUTO_TEST_SUITE_END() // TestPingServer
+BOOST_AUTO_TEST_SUITE_END() // Ping
} // namespace tests
} // namespace server