tests: refactor EthernetFixture
Also, use BOOST_TEST_INFO_SCOPE in a few places.
Change-Id: I113f326207825949ed9d3d22ade0654976d49b76
diff --git a/tests/tools/mock-nfd-mgmt-fixture.hpp b/tests/tools/mock-nfd-mgmt-fixture.hpp
index eed9846..f5feb86 100644
--- a/tests/tools/mock-nfd-mgmt-fixture.hpp
+++ b/tests/tools/mock-nfd-mgmt-fixture.hpp
@@ -173,7 +173,7 @@
* \param name dataset prefix without version and segment
* \param contentArgs passed to Data::setContent
*/
- template<typename ...ContentArgs>
+ template<typename... ContentArgs>
void
sendDatasetReply(Name name, ContentArgs&&... contentArgs)
{
@@ -220,8 +220,8 @@
[&interest] { \
auto params = parseCommand(interest, (expectedPrefix)); \
BOOST_REQUIRE_MESSAGE(params.has_value(), "Interest " << interest.getName() << \
- " does not match command prefix " << (expectedPrefix)); \
+ " must match the prefix " << (expectedPrefix)); \
return *params; \
- } ()
+ }()
#endif // NFD_TESTS_TOOLS_MOCK_NFD_MGMT_FIXTURE_HPP