tests+tools: minor code cleanup
Change-Id: Ic3356d4a18a8e5eeb45fc076fc0563c3d1549c8a
diff --git a/tests/daemon/mgmt/fib-manager.t.cpp b/tests/daemon/mgmt/fib-manager.t.cpp
index 1002e44..5d61168 100644
--- a/tests/daemon/mgmt/fib-manager.t.cpp
+++ b/tests/daemon/mgmt/fib-manager.t.cpp
@@ -65,7 +65,7 @@
{
auto face = make_shared<DummyFace>();
m_faceTable.add(face);
- advanceClocks(time::milliseconds(1), 10);
+ advanceClocks(1_ms, 10);
m_responses.clear(); // clear all event notifications, if any
return face->getId();
}
diff --git a/tests/daemon/mgmt/forwarder-status-manager.t.cpp b/tests/daemon/mgmt/forwarder-status-manager.t.cpp
index bb728f2..e40e20d 100644
--- a/tests/daemon/mgmt/forwarder-status-manager.t.cpp
+++ b/tests/daemon/mgmt/forwarder-status-manager.t.cpp
@@ -53,7 +53,7 @@
BOOST_AUTO_TEST_CASE(GeneralStatusDataset)
{
// cause counters to be non-zero
- this->advanceClocks(time::seconds(3600));
+ this->advanceClocks(1_h);
m_forwarder.getFib().insert("ndn:/fib1");
m_forwarder.getPit().insert(*makeInterest("ndn:/pit1"));
m_forwarder.getPit().insert(*makeInterest("ndn:/pit2"));
diff --git a/tests/daemon/mgmt/manager-base.t.cpp b/tests/daemon/mgmt/manager-base.t.cpp
index 3aeeb9e..0dace4e 100644
--- a/tests/daemon/mgmt/manager-base.t.cpp
+++ b/tests/daemon/mgmt/manager-base.t.cpp
@@ -125,7 +125,7 @@
const uint8_t buf[] = {0x82, 0x01, 0x02};
post(Block(buf, sizeof(buf)));
- advanceClocks(time::milliseconds(1));
+ advanceClocks(1_ms);
BOOST_REQUIRE_EQUAL(m_responses.size(), 1);
BOOST_CHECK_EQUAL(m_responses[0].getName(),