apps: Switch ndn::App::GetId() to use application ID on the node
Previously, GetId() used ID of the underlying application face, which
is less convenient for simulation trace analyses.
Change-Id: I403182ecb4b9e8fb010c4c25ab007c1e274bc86a
diff --git a/tests/unit-tests/utils/tracers/ndn-app-delay-tracer.t.cpp b/tests/unit-tests/utils/tracers/ndn-app-delay-tracer.t.cpp
index 64e4aa9..1ed6890 100644
--- a/tests/unit-tests/utils/tracers/ndn-app-delay-tracer.t.cpp
+++ b/tests/unit-tests/utils/tracers/ndn-app-delay-tracer.t.cpp
@@ -89,12 +89,12 @@
BOOST_CHECK_EQUAL(buffer.str(),
"Time Node AppId SeqNo Type DelayS DelayUS RetxCount HopCount\n"
- "0.0417424 1 257 0 LastDelay 0.0417424 41742.4 1 2\n"
- "0.0417424 1 257 0 FullDelay 0.0417424 41742.4 1 2\n"
- "2 2 258 0 LastDelay 0 0 1 0\n"
- "2 2 258 0 FullDelay 0 0 1 0\n"
- "3.02087 2 258 1 LastDelay 0.0208712 20871.2 1 1\n"
- "3.02087 2 258 1 FullDelay 0.0208712 20871.2 1 1\n");
+ "0.0417424 1 0 0 LastDelay 0.0417424 41742.4 1 2\n"
+ "0.0417424 1 0 0 FullDelay 0.0417424 41742.4 1 2\n"
+ "2 2 0 0 LastDelay 0 0 1 0\n"
+ "2 2 0 0 FullDelay 0 0 1 0\n"
+ "3.02087 2 0 1 LastDelay 0.0208712 20871.2 1 1\n"
+ "3.02087 2 0 1 FullDelay 0.0208712 20871.2 1 1\n");
}
BOOST_AUTO_TEST_CASE(InstallNodeContainer)
@@ -115,8 +115,8 @@
BOOST_CHECK_EQUAL(buffer.str(),
"Time Node AppId SeqNo Type DelayS DelayUS RetxCount HopCount\n"
- "0.0417424 1 257 0 LastDelay 0.0417424 41742.4 1 2\n"
- "0.0417424 1 257 0 FullDelay 0.0417424 41742.4 1 2\n");
+ "0.0417424 1 0 0 LastDelay 0.0417424 41742.4 1 2\n"
+ "0.0417424 1 0 0 FullDelay 0.0417424 41742.4 1 2\n");
}
BOOST_AUTO_TEST_CASE(InstallNode)
@@ -134,10 +134,10 @@
BOOST_CHECK_EQUAL(buffer.str(),
"Time Node AppId SeqNo Type DelayS DelayUS RetxCount HopCount\n"
- "2 2 258 0 LastDelay 0 0 1 0\n"
- "2 2 258 0 FullDelay 0 0 1 0\n"
- "3.02087 2 258 1 LastDelay 0.0208712 20871.2 1 1\n"
- "3.02087 2 258 1 FullDelay 0.0208712 20871.2 1 1\n");
+ "2 2 0 0 LastDelay 0 0 1 0\n"
+ "2 2 0 0 FullDelay 0 0 1 0\n"
+ "3.02087 2 0 1 LastDelay 0.0208712 20871.2 1 1\n"
+ "3.02087 2 0 1 FullDelay 0.0208712 20871.2 1 1\n");
}
BOOST_AUTO_TEST_CASE(InstallNodeDumpStream)
@@ -151,10 +151,10 @@
tracer = nullptr; // destroy tracer
BOOST_CHECK(output->is_equal(
- "2 2 258 0 LastDelay 0 0 1 0\n"
- "2 2 258 0 FullDelay 0 0 1 0\n"
- "3.02087 2 258 1 LastDelay 0.0208712 20871.2 1 1\n"
- "3.02087 2 258 1 FullDelay 0.0208712 20871.2 1 1\n"));
+ "2 2 0 0 LastDelay 0 0 1 0\n"
+ "2 2 0 0 FullDelay 0 0 1 0\n"
+ "3.02087 2 0 1 LastDelay 0.0208712 20871.2 1 1\n"
+ "3.02087 2 0 1 FullDelay 0.0208712 20871.2 1 1\n"));
}
BOOST_AUTO_TEST_SUITE_END()