commit ff9a62713b34295f0e2adb3587d9314d583dd7d9
author Nick Gordon <nmgordon@memphis.edu> Thu Oct 12 13:38:29 2017 -0500
committer Nick Gordon <nmgordon@memphis.edu> Fri Oct 13 16:03:27 2017 -0700
tree e4e30e470d2f5162a2865fdf61bd17034d8d81f8
parent e18296c270922c61e25ef089ac07133cdb4007de

style: made container APIs more consistent.

Change-Id: Ib4feedfc4c9fb497dfcd67e7e6a33ee03db58d7f
refs: #4337

tests/test-lsa.cpp

diff --git a/tests/test-lsa.cpp b/tests/test-lsa.cpp
index e501c59..2750bb4 100644
--- a/tests/test-lsa.cpp
+++ b/tests/test-lsa.cpp
@@ -19,14 +19,12 @@
  * NLSR, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
  **/
 
-#include "test-common.hpp"
-
-#include "adjacent.hpp"
 #include "lsa.hpp"
+#include "test-common.hpp"
+#include "adjacent.hpp"
 #include "name-prefix-list.hpp"
 
 #include <ndn-cxx/util/time.hpp>
-
 #include <sstream>
 
 namespace nlsr {
@@ -70,8 +68,8 @@
   activeAdjacencies.insert(activeAdjacency);
 
   AdjLsa alsa1(routerName, seqNo, testTimePoint,
-               activeAdjacencies.getSize(), activeAdjacencies);
-  BOOST_CHECK_EQUAL(alsa1.getAdl().getSize(), 1);
+               activeAdjacencies.size(), activeAdjacencies);
+  BOOST_CHECK_EQUAL(alsa1.getAdl().size(), 1);
   BOOST_CHECK_EQUAL(alsa1.getLsType(), AdjLsa::TYPE_STRING);
   BOOST_CHECK_EQUAL(alsa1.getLsSeqNo(), seqNo);
   BOOST_CHECK_EQUAL(alsa1.getExpirationTimePoint(), testTimePoint);
@@ -85,15 +83,15 @@
   inactiveAdjacencies.insert(inactiveAdjacency);
 
   AdjLsa alsa2(routerName, seqNo, testTimePoint,
-               inactiveAdjacencies.getSize(), inactiveAdjacencies);
-  BOOST_CHECK_EQUAL(alsa2.getAdl().getSize(), 0);
+               inactiveAdjacencies.size(), inactiveAdjacencies);
+  BOOST_CHECK_EQUAL(alsa2.getAdl().size(), 0);
 
   // Thus, the two LSAs should not have equal content
   BOOST_CHECK_EQUAL(alsa1.isEqualContent(alsa2), false);
 
   // Create a duplicate of alsa1 which should have equal content
   AdjLsa alsa3(routerName, seqNo, testTimePoint,
-               activeAdjacencies.getSize(), activeAdjacencies);
+               activeAdjacencies.size(), activeAdjacencies);
   BOOST_CHECK(alsa1.isEqualContent(alsa3));
 }
 
@@ -132,7 +130,7 @@
 
   const std::string TEST_TIME_POINT_STRING = ss.str();
 
-  AdjLsa lsa("router1", 12, testTimePoint, adjList.getSize(), adjList);
+  AdjLsa lsa("router1", 12, testTimePoint, adjList.size(), adjList);
 
   std::string EXPECTED_OUTPUT =
    "Adj Lsa:\n"
@@ -178,7 +176,7 @@
 
   ndn::time::system_clock::TimePoint testTimePoint = ndn::time::system_clock::now();
 
-  AdjLsa adjlsa1("router1", 1, testTimePoint, adjList.getSize(), adjList);
+  AdjLsa adjlsa1("router1", 1, testTimePoint, adjList.size(), adjList);
   AdjLsa adjlsa2;
 
   BOOST_CHECK(adjlsa2.initializeFromContent(adjlsa1.getData()));