commit b5734847efbd06da55a1e08766d64fea3f1297ab
author Junxiao Shi <git@mail1.yoursunny.com> Tue Jan 09 21:14:53 2024 +0000
committer Junxiao Shi <git@mail1.yoursunny.com> Tue Jan 09 21:53:16 2024 +0000
tree 18051df82e11a5d959533d0fa2a2af4d0c70a04d
parent f4674672e6858e7455b832334bff64c3700578f3

lsa: define CoordinateLsa operator==

getCorRadius, setCorRadius, getCorTheta, setCorTheta methods are
renamed, in accordance with ndn-cxx code style recommendations.

refs #4094

Change-Id: Iaf3ebf3b895d6dc351b2f754e4a9c65713bdca3a

tests/lsa/test-coordinate-lsa.cpp

diff --git a/tests/lsa/test-coordinate-lsa.cpp b/tests/lsa/test-coordinate-lsa.cpp
index 182665d..8e61f8b 100644
--- a/tests/lsa/test-coordinate-lsa.cpp
+++ b/tests/lsa/test-coordinate-lsa.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2014-2023,  The University of Memphis,
+ * Copyright (c) 2014-2024,  The University of Memphis,
  *                           Regents of the University of California,
  *                           Arizona Board of Regents.
  *
@@ -94,10 +94,10 @@
   CoordinateLsa clsa1("router1", 12, testTimePoint, 2.5, angles1);
   CoordinateLsa clsa2("router1", 12, testTimePoint, 2.5, angles2);
 
-  BOOST_CHECK_CLOSE(clsa1.getCorRadius(), 2.5, 0.0001);
-  BOOST_CHECK(clsa1.getCorTheta() == angles1);
+  BOOST_CHECK_CLOSE(clsa1.getRadius(), 2.5, 0.0001);
+  BOOST_TEST(clsa1.getTheta() == angles1, boost::test_tools::per_element());
 
-  BOOST_CHECK(clsa1.isEqualContent(clsa2));
+  BOOST_CHECK_EQUAL(clsa1, clsa2);
 
   BOOST_CHECK_EQUAL(clsa1.wireEncode(), clsa2.wireEncode());
 
@@ -105,11 +105,11 @@
   BOOST_TEST(wire == COORDINATE_LSA1, boost::test_tools::per_element());
 
   std::vector<double> angles3{40.0};
-  clsa1.setCorTheta(angles3);
+  clsa1.setTheta(angles3);
   wire = clsa1.wireEncode();
   BOOST_TEST(wire == COORDINATE_LSA_DIFF_ANGLE, boost::test_tools::per_element());
 
-  clsa1.setCorRadius(2.3);
+  clsa1.setRadius(2.3);
   wire = clsa1.wireEncode();
   BOOST_TEST(wire == COORDINATE_LSA_DIFF_RADIUS, boost::test_tools::per_element());
 

tests/test-statistics.cpp

diff --git a/tests/test-statistics.cpp b/tests/test-statistics.cpp
index 887112a..43bbf70 100644
--- a/tests/test-statistics.cpp
+++ b/tests/test-statistics.cpp
@@ -268,7 +268,7 @@
   auto coorLsa = lsdb.findLsa<CoordinateLsa>(conf.getRouterPrefix());
 
   seqNo = coorLsa->getSeqNo();
-  coorLsa->setCorTheta({20.0, 30.0});
+  coorLsa->setTheta({20.0, 30.0});
   lsdb.installLsa(coorLsa);
 
   // Receive Adjacency LSA Interest