Use more C++17 features
Mainly structured bindings, inline variables, and class template
argument deduction, plus many more smaller things.
Change-Id: I810d17e0adb470426e4e30c898e03b3140ad052f
diff --git a/tests/daemon/rib/rib-update.t.cpp b/tests/daemon/rib/rib-update.t.cpp
index 81ee10e..90c80f0 100644
--- a/tests/daemon/rib/rib-update.t.cpp
+++ b/tests/daemon/rib/rib-update.t.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2014-2019, Regents of the University of California,
+ * Copyright (c) 2014-2022, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -27,25 +27,20 @@
#include "rib/rib-update-batch.hpp"
#include "tests/test-common.hpp"
-#include "tests/daemon/global-io-fixture.hpp"
#include "tests/daemon/rib/create-route.hpp"
namespace nfd {
namespace rib {
namespace tests {
-using namespace nfd::tests;
-
-BOOST_FIXTURE_TEST_SUITE(TestRibUpdate, GlobalIoFixture)
+BOOST_AUTO_TEST_SUITE(TestRibUpdate)
BOOST_AUTO_TEST_CASE(BatchBasic)
{
const uint64_t faceId = 1;
-
RibUpdateBatch batch(faceId);
Route routeRegister = createRoute(faceId, 128, 10, ndn::nfd::ROUTE_FLAG_CHILD_INHERIT);
-
RibUpdate registerUpdate;
registerUpdate.setAction(RibUpdate::REGISTER)
.setName("/a")
@@ -56,7 +51,6 @@
BOOST_CHECK_EQUAL(batch.getFaceId(), faceId);
Route routeUnregister = createRoute(faceId, 0, 0, ndn::nfd::ROUTE_FLAG_CAPTURE);
-
RibUpdate unregisterUpdate;
unregisterUpdate.setAction(RibUpdate::UNREGISTER)
.setName("/a/b")
@@ -65,7 +59,7 @@
batch.add(unregisterUpdate);
BOOST_REQUIRE_EQUAL(batch.size(), 2);
- RibUpdateBatch::const_iterator it = batch.begin();
+ auto it = batch.begin();
BOOST_CHECK_EQUAL(it->getAction(), RibUpdate::REGISTER);
BOOST_CHECK_EQUAL(it->getName(), "/a");