From 0510f36078a0f8533775967f551fb2f2893fb399 Mon Sep 17 00:00:00 2001 From: Chandrakant jena Date: Fri, 17 Dec 2021 19:45:36 +0100 Subject: [PATCH] internet: change NS_ASSERT to NS_TEST_ASSERT* in tests --- .../test/global-route-manager-impl-test-suite.cc | 2 +- src/internet/test/ipv4-deduplication-test.cc | 6 +++--- src/internet/test/ipv4-forwarding-test.cc | 2 +- src/internet/test/ipv4-global-routing-test-suite.cc | 2 +- src/internet/test/ipv4-header-test.cc | 4 ++-- src/internet/test/ipv4-raw-test.cc | 8 ++++---- src/internet/test/ipv4-rip-test.cc | 6 +++--- src/internet/test/ipv4-static-routing-test-suite.cc | 2 +- src/internet/test/ipv6-forwarding-test.cc | 2 +- src/internet/test/ipv6-raw-test.cc | 8 ++++---- src/internet/test/ipv6-ripng-test.cc | 6 +++--- src/internet/test/tcp-advertised-window-test.cc | 1 - src/internet/test/tcp-fast-retr-test.cc | 2 +- src/internet/test/tcp-rto-test.cc | 2 +- src/internet/test/tcp-rtt-estimation.cc | 2 +- src/internet/test/udp-test.cc | 12 ++++++------ 16 files changed, 33 insertions(+), 34 deletions(-) diff --git a/src/internet/test/global-route-manager-impl-test-suite.cc b/src/internet/test/global-route-manager-impl-test-suite.cc index bc74c14cc..e6f3fe192 100644 --- a/src/internet/test/global-route-manager-impl-test-suite.cc +++ b/src/internet/test/global-route-manager-impl-test-suite.cc @@ -201,7 +201,7 @@ GlobalRouteManagerImplTestCase::DoRun (void) srmlsdb->Insert (lsa1->GetLinkStateId (), lsa1); srmlsdb->Insert (lsa2->GetLinkStateId (), lsa2); srmlsdb->Insert (lsa3->GetLinkStateId (), lsa3); - NS_ASSERT (lsa2 == srmlsdb->GetLSA (lsa2->GetLinkStateId ())); + NS_TEST_ASSERT_MSG_EQ (lsa2, srmlsdb->GetLSA (lsa2->GetLinkStateId ()), "The Ipv4Address is not stored as the link state ID"); // next, calculate routes based on the manually created LSDB GlobalRouteManagerImpl* srm = new GlobalRouteManagerImpl (); diff --git a/src/internet/test/ipv4-deduplication-test.cc b/src/internet/test/ipv4-deduplication-test.cc index f8a85deec..a3dedc459 100644 --- a/src/internet/test/ipv4-deduplication-test.cc +++ b/src/internet/test/ipv4-deduplication-test.cc @@ -199,7 +199,7 @@ void Ipv4DeduplicationTest::ReceivePkt (Ptr socket) uint32_t availableData; availableData = socket->GetRxAvailable (); Ptr packet = socket->Recv (std::numeric_limits::max (), 0); - NS_ASSERT (availableData == packet->GetSize ()); + NS_TEST_ASSERT_MSG_EQ (availableData, packet->GetSize (), "Received packet size is not equal to the Rx buffer size"); auto node = socket->GetNode (); std::string name = Names::FindName (node); @@ -339,7 +339,7 @@ Ipv4DeduplicationTest::DoRun (void) //// many Unix variants. //// So, we just log it and fall through to LookupStatic () auto ipv4 = (*iter)->GetObject (); - NS_ASSERT_MSG ((bool) ipv4, "Node " << Names::FindName (*iter) << " does not have Ipv4 aggregate"); + NS_TEST_ASSERT_MSG_EQ ((bool) ipv4, true, "Node " << Names::FindName (*iter) << " does not have Ipv4 aggregate"); auto routing = staticRouting.GetStaticRouting (ipv4); routing->AddHostRouteTo (targetAddr.c_str (), ipv4->GetInterfaceForDevice (*diter), 0); @@ -615,7 +615,7 @@ Ipv4DeduplicationPerformanceTest::DoRun (void) //// many Unix variants. //// So, we just log it and fall through to LookupStatic () auto ipv4 = (*iter)->GetObject (); - NS_ASSERT_MSG ((bool) ipv4, "Node " << (*iter)->GetId () << " does not have Ipv4 aggregate"); + NS_TEST_ASSERT_MSG_EQ ((bool) ipv4, true, "Node " << (*iter)->GetId () << " does not have Ipv4 aggregate"); auto routing = staticRouting.GetStaticRouting (ipv4); routing->AddHostRouteTo (targetAddr.c_str (), ipv4->GetInterfaceForDevice (*diter), 0); diff --git a/src/internet/test/ipv4-forwarding-test.cc b/src/internet/test/ipv4-forwarding-test.cc index 2c74039eb..bdc857188 100644 --- a/src/internet/test/ipv4-forwarding-test.cc +++ b/src/internet/test/ipv4-forwarding-test.cc @@ -91,7 +91,7 @@ void Ipv4ForwardingTest::ReceivePkt (Ptr socket) uint32_t availableData; availableData = socket->GetRxAvailable (); m_receivedPacket = socket->Recv (std::numeric_limits::max (), 0); - NS_ASSERT (availableData == m_receivedPacket->GetSize ()); + NS_TEST_ASSERT_MSG_EQ (availableData, m_receivedPacket->GetSize (), "Received packet size is not equal to Rx buffer size"); } void diff --git a/src/internet/test/ipv4-global-routing-test-suite.cc b/src/internet/test/ipv4-global-routing-test-suite.cc index af33887ed..475505d29 100644 --- a/src/internet/test/ipv4-global-routing-test-suite.cc +++ b/src/internet/test/ipv4-global-routing-test-suite.cc @@ -1139,7 +1139,7 @@ Ipv4GlobalRoutingSlash32TestCase::ReceivePkt (Ptr socket) uint32_t availableData; availableData = socket->GetRxAvailable (); m_receivedPacket = socket->Recv (std::numeric_limits::max (), 0); - NS_ASSERT (availableData == m_receivedPacket->GetSize ()); + NS_TEST_ASSERT_MSG_EQ (availableData, m_receivedPacket->GetSize (), "Received packet size is not equal to Rx buffer size"); //cast availableData to void, to suppress 'availableData' set but not used //compiler warning (void) availableData; diff --git a/src/internet/test/ipv4-header-test.cc b/src/internet/test/ipv4-header-test.cc index cf8d75d49..94d4c55ae 100644 --- a/src/internet/test/ipv4-header-test.cc +++ b/src/internet/test/ipv4-header-test.cc @@ -113,9 +113,9 @@ void Ipv4HeaderTest::ReceivePkt (Ptr socket) uint32_t availableData; availableData = socket->GetRxAvailable (); m_receivedPacket = socket->Recv (2, MSG_PEEK); - NS_ASSERT (m_receivedPacket->GetSize () == 2); + NS_TEST_ASSERT_MSG_EQ (m_receivedPacket->GetSize (),2, "Received packet size is not equal to 2"); m_receivedPacket = socket->Recv (std::numeric_limits::max (), 0); - NS_ASSERT (availableData == m_receivedPacket->GetSize ()); + NS_TEST_ASSERT_MSG_EQ (availableData, m_receivedPacket->GetSize (), "Received packet size is not equal to Rx buffer size"); m_receivedPacket->PeekHeader (m_receivedHeader); } diff --git a/src/internet/test/ipv4-raw-test.cc b/src/internet/test/ipv4-raw-test.cc index a9344da36..bb94e32e6 100644 --- a/src/internet/test/ipv4-raw-test.cc +++ b/src/internet/test/ipv4-raw-test.cc @@ -138,9 +138,9 @@ void Ipv4RawSocketImplTest::ReceivePkt (Ptr socket) uint32_t availableData; availableData = socket->GetRxAvailable (); m_receivedPacket = socket->Recv (2, MSG_PEEK); - NS_ASSERT (m_receivedPacket->GetSize () == 2); + NS_TEST_ASSERT_MSG_EQ (m_receivedPacket->GetSize (), 2, "ReceivedPacket size is not equal to 2"); m_receivedPacket = socket->Recv (std::numeric_limits::max (), 0); - NS_ASSERT (availableData == m_receivedPacket->GetSize ()); + NS_TEST_ASSERT_MSG_EQ (availableData, m_receivedPacket->GetSize (), "Received packet size is not equal to Rx buffer size"); } void Ipv4RawSocketImplTest::ReceivePkt2 (Ptr socket) @@ -148,9 +148,9 @@ void Ipv4RawSocketImplTest::ReceivePkt2 (Ptr socket) uint32_t availableData; availableData = socket->GetRxAvailable (); m_receivedPacket2 = socket->Recv (2, MSG_PEEK); - NS_ASSERT (m_receivedPacket2->GetSize () == 2); + NS_TEST_ASSERT_MSG_EQ (m_receivedPacket2->GetSize (), 2, "ReceivedPacket size is not equal to 2"); m_receivedPacket2 = socket->Recv (std::numeric_limits::max (), 0); - NS_ASSERT (availableData == m_receivedPacket2->GetSize ()); + NS_TEST_ASSERT_MSG_EQ (availableData, m_receivedPacket2->GetSize (), "Received packet size is not equal to Rx buffer size"); } void diff --git a/src/internet/test/ipv4-rip-test.cc b/src/internet/test/ipv4-rip-test.cc index e66c86402..f27ffd5ab 100644 --- a/src/internet/test/ipv4-rip-test.cc +++ b/src/internet/test/ipv4-rip-test.cc @@ -91,7 +91,7 @@ void Ipv4RipTest::ReceivePkt (Ptr socket) uint32_t availableData; availableData = socket->GetRxAvailable (); m_receivedPacket = socket->Recv (std::numeric_limits::max (), 0); - NS_ASSERT (availableData == m_receivedPacket->GetSize ()); + NS_TEST_ASSERT_MSG_EQ (availableData, m_receivedPacket->GetSize (), "Received Packet size is not equal to the Rx buffer size"); //cast availableData to void, to suppress 'availableData' set but not used //compiler warning (void) availableData; @@ -313,7 +313,7 @@ void Ipv4RipCountToInfinityTest::ReceivePkt (Ptr socket) uint32_t availableData; availableData = socket->GetRxAvailable (); m_receivedPacket = socket->Recv (std::numeric_limits::max (), 0); - NS_ASSERT (availableData == m_receivedPacket->GetSize ()); + NS_TEST_ASSERT_MSG_EQ (availableData, m_receivedPacket->GetSize (), "Received Packet size is not equal to the Rx buffer size"); //cast availableData to void, to suppress 'availableData' set but not used //compiler warning (void) availableData; @@ -535,7 +535,7 @@ void Ipv4RipSplitHorizonStrategyTest::ReceivePktProbe (Ptr socket) availableData = socket->GetRxAvailable (); Address srcAddr; Ptr receivedPacketProbe = socket->RecvFrom (std::numeric_limits::max (), 0, srcAddr); - NS_ASSERT (availableData == receivedPacketProbe->GetSize ()); + NS_TEST_ASSERT_MSG_EQ (availableData, receivedPacketProbe->GetSize (), "Received Packet size is not equal to the Rx buffer size"); Ipv4Address senderAddress = InetSocketAddress::ConvertFrom (srcAddr).GetIpv4 (); if (senderAddress == "192.168.0.2") diff --git a/src/internet/test/ipv4-static-routing-test-suite.cc b/src/internet/test/ipv4-static-routing-test-suite.cc index ca4c03829..04f10d5de 100644 --- a/src/internet/test/ipv4-static-routing-test-suite.cc +++ b/src/internet/test/ipv4-static-routing-test-suite.cc @@ -91,7 +91,7 @@ Ipv4StaticRoutingSlash32TestCase::ReceivePkt (Ptr socket) uint32_t availableData; availableData = socket->GetRxAvailable (); m_receivedPacket = socket->Recv (std::numeric_limits::max (), 0); - NS_ASSERT (availableData == m_receivedPacket->GetSize ()); + NS_TEST_ASSERT_MSG_EQ (availableData, m_receivedPacket->GetSize (), "Received packet size is not equal to Rx buffer size"); //cast availableData to void, to suppress 'availableData' set but not used //compiler warning (void) availableData; diff --git a/src/internet/test/ipv6-forwarding-test.cc b/src/internet/test/ipv6-forwarding-test.cc index 98cac5331..a2e31001a 100644 --- a/src/internet/test/ipv6-forwarding-test.cc +++ b/src/internet/test/ipv6-forwarding-test.cc @@ -89,7 +89,7 @@ void Ipv6ForwardingTest::ReceivePkt (Ptr socket) uint32_t availableData; availableData = socket->GetRxAvailable (); m_receivedPacket = socket->Recv (std::numeric_limits::max (), 0); - NS_ASSERT (availableData == m_receivedPacket->GetSize ()); + NS_TEST_ASSERT_MSG_EQ (availableData, m_receivedPacket->GetSize (), "Received packet size is not equal to Rx buffer size"); //cast availableData to void, to suppress 'availableData' set but not used //compiler warning (void) availableData; diff --git a/src/internet/test/ipv6-raw-test.cc b/src/internet/test/ipv6-raw-test.cc index f58caf93d..582d8f811 100644 --- a/src/internet/test/ipv6-raw-test.cc +++ b/src/internet/test/ipv6-raw-test.cc @@ -127,9 +127,9 @@ void Ipv6RawSocketImplTest::ReceivePkt (Ptr socket) uint32_t availableData; availableData = socket->GetRxAvailable (); m_receivedPacket = socket->Recv (2, MSG_PEEK); - NS_ASSERT (m_receivedPacket->GetSize () == 2); + NS_TEST_ASSERT_MSG_EQ (m_receivedPacket->GetSize (), 2, "ReceivedPacket size is not equal to 2"); m_receivedPacket = socket->Recv (std::numeric_limits::max (), 0); - NS_ASSERT (availableData == m_receivedPacket->GetSize ()); + NS_TEST_ASSERT_MSG_EQ (availableData, m_receivedPacket->GetSize (), "Received packet size is not equal to Rx buffer size"); } void Ipv6RawSocketImplTest::ReceivePkt2 (Ptr socket) @@ -138,9 +138,9 @@ void Ipv6RawSocketImplTest::ReceivePkt2 (Ptr socket) Address addr; availableData = socket->GetRxAvailable (); m_receivedPacket2 = socket->Recv (2, MSG_PEEK); - NS_ASSERT (m_receivedPacket2->GetSize () == 2); + NS_TEST_ASSERT_MSG_EQ (m_receivedPacket2->GetSize (), 2, "ReceivedPacket size is not equal to 2"); m_receivedPacket2 = socket->RecvFrom (std::numeric_limits::max (), 0, addr); - NS_ASSERT (availableData == m_receivedPacket2->GetSize ()); + NS_TEST_ASSERT_MSG_EQ (availableData, m_receivedPacket2->GetSize (), "Received packet size is not equal to Rx buffer size"); Inet6SocketAddress v6addr = Inet6SocketAddress::ConvertFrom (addr); NS_TEST_EXPECT_MSG_EQ (v6addr.GetIpv6 (), Ipv6Address ("2001:db8::2"), "recvfrom"); } diff --git a/src/internet/test/ipv6-ripng-test.cc b/src/internet/test/ipv6-ripng-test.cc index fd005f978..691e06817 100644 --- a/src/internet/test/ipv6-ripng-test.cc +++ b/src/internet/test/ipv6-ripng-test.cc @@ -90,7 +90,7 @@ void Ipv6RipngTest::ReceivePkt (Ptr socket) uint32_t availableData; availableData = socket->GetRxAvailable (); m_receivedPacket = socket->Recv (std::numeric_limits::max (), 0); - NS_ASSERT (availableData == m_receivedPacket->GetSize ()); + NS_TEST_ASSERT_MSG_EQ (availableData, m_receivedPacket->GetSize (), "Received packet size is not equal to Rx buffer size"); //cast availableData to void, to suppress 'availableData' set but not used //compiler warning (void) availableData; @@ -313,7 +313,7 @@ void Ipv6RipngCountToInfinityTest::ReceivePkt (Ptr socket) uint32_t availableData; availableData = socket->GetRxAvailable (); m_receivedPacket = socket->Recv (std::numeric_limits::max (), 0); - NS_ASSERT (availableData == m_receivedPacket->GetSize ()); + NS_TEST_ASSERT_MSG_EQ (availableData, m_receivedPacket->GetSize (), "Received packet size is not equal to Rx buffer size"); //cast availableData to void, to suppress 'availableData' set but not used //compiler warning (void) availableData; @@ -532,7 +532,7 @@ void Ipv6RipngSplitHorizonStrategyTest::ReceivePktProbe (Ptr socket) availableData = socket->GetRxAvailable (); Address srcAddr; Ptr receivedPacketProbe = socket->RecvFrom (std::numeric_limits::max (), 0, srcAddr); - NS_ASSERT (availableData == receivedPacketProbe->GetSize ()); + NS_TEST_ASSERT_MSG_EQ (availableData, receivedPacketProbe->GetSize (), "ReceivedPacketProbe size is not equal to the Rx buffer size"); Ipv6Address senderAddress = Inet6SocketAddress::ConvertFrom (srcAddr).GetIpv6 (); if (senderAddress == "fe80::200:ff:fe00:4") diff --git a/src/internet/test/tcp-advertised-window-test.cc b/src/internet/test/tcp-advertised-window-test.cc index eadb78283..7c1c918b1 100644 --- a/src/internet/test/tcp-advertised-window-test.cc +++ b/src/internet/test/tcp-advertised-window-test.cc @@ -16,7 +16,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * */ - #include "tcp-general-test.h" #include "ns3/node.h" #include "ns3/log.h" diff --git a/src/internet/test/tcp-fast-retr-test.cc b/src/internet/test/tcp-fast-retr-test.cc index b2e2529ea..3c8dace7c 100644 --- a/src/internet/test/tcp-fast-retr-test.cc +++ b/src/internet/test/tcp-fast-retr-test.cc @@ -375,7 +375,7 @@ TcpFastRetrTest::ProcessedAck (const Ptr tcb, const TcpHea void TcpFastRetrTest::AfterRTOExpired (const Ptr tcb, SocketWho who) { - NS_ASSERT_MSG (true == false, "RTO isn't expected here"); + NS_TEST_ASSERT_MSG_EQ (true, false, "RTO isn't expected here"); } void diff --git a/src/internet/test/tcp-rto-test.cc b/src/internet/test/tcp-rto-test.cc index 42ed10990..3b4a21087 100644 --- a/src/internet/test/tcp-rto-test.cc +++ b/src/internet/test/tcp-rto-test.cc @@ -408,7 +408,7 @@ TcpTimeRtoTest::Tx (const Ptr p, const TcpHeader&h, SocketWho who) if (h.GetFlags () & TcpHeader::SYN) { - NS_ASSERT (m_senderSentSegments == 1); + NS_TEST_ASSERT_MSG_EQ (m_senderSentSegments, 1, "Number of segments sent is equal to 1"); Time s_rto = GetRto (SENDER); NS_TEST_ASSERT_MSG_EQ (s_rto, GetConnTimeout (SENDER), diff --git a/src/internet/test/tcp-rtt-estimation.cc b/src/internet/test/tcp-rtt-estimation.cc index 639196235..5f40e99f8 100644 --- a/src/internet/test/tcp-rtt-estimation.cc +++ b/src/internet/test/tcp-rtt-estimation.cc @@ -127,7 +127,7 @@ TcpRttEstimationTest::Tx (const Ptr p, const TcpHeader &h, SocketW } Ptr rttEstimator = GetRttEstimator (SENDER); - NS_ASSERT (rttEstimator != 0); + NS_TEST_ASSERT_MSG_NE (rttEstimator, 0, "rtt is 0 (and should be different from zero)"); NS_LOG_DEBUG ("S Tx: seq=" << h.GetSequenceNumber () << " ack=" << h.GetAckNumber ()); NS_TEST_ASSERT_MSG_NE (rttEstimator->GetEstimate (), Seconds (1), "Default Estimate for the RTT"); diff --git a/src/internet/test/udp-test.cc b/src/internet/test/udp-test.cc index 1bec1b0e8..f3ae48240 100644 --- a/src/internet/test/udp-test.cc +++ b/src/internet/test/udp-test.cc @@ -89,7 +89,7 @@ void UdpSocketLoopbackTest::ReceivePkt (Ptr socket) uint32_t availableData; availableData = socket->GetRxAvailable (); m_receivedPacket = socket->Recv (std::numeric_limits::max (), 0); - NS_ASSERT (availableData == m_receivedPacket->GetSize ()); + NS_TEST_ASSERT_MSG_EQ (availableData, m_receivedPacket->GetSize (), "ReceivedPacket size is not equal to the Rx buffer size"); } void @@ -141,7 +141,7 @@ void Udp6SocketLoopbackTest::ReceivePkt (Ptr socket) uint32_t availableData; availableData = socket->GetRxAvailable (); m_receivedPacket = socket->Recv (std::numeric_limits::max (), 0); - NS_ASSERT (availableData == m_receivedPacket->GetSize ()); + NS_TEST_ASSERT_MSG_EQ (availableData, m_receivedPacket->GetSize (), "ReceivedPacket size is not equal to the Rx buffer size"); //cast availableData to void, to suppress 'availableData' set but not used //compiler warning (void) availableData; @@ -245,7 +245,7 @@ void UdpSocketImplTest::ReceivePkt (Ptr socket) uint32_t availableData; availableData = socket->GetRxAvailable (); m_receivedPacket = socket->Recv (std::numeric_limits::max (), 0); - NS_ASSERT (availableData == m_receivedPacket->GetSize ()); + NS_TEST_ASSERT_MSG_EQ (availableData, m_receivedPacket->GetSize (), "ReceivedPacket size is not equal to the Rx buffer size"); } void UdpSocketImplTest::ReceivePkt2 (Ptr socket) @@ -253,7 +253,7 @@ void UdpSocketImplTest::ReceivePkt2 (Ptr socket) uint32_t availableData; availableData = socket->GetRxAvailable (); m_receivedPacket2 = socket->Recv (std::numeric_limits::max (), 0); - NS_ASSERT (availableData == m_receivedPacket2->GetSize ()); + NS_TEST_ASSERT_MSG_EQ (availableData, m_receivedPacket2->GetSize (), "ReceivedPacket size is not equal to the Rx buffer size"); } void UdpSocketImplTest::SentPkt (Ptr item) @@ -552,7 +552,7 @@ void Udp6SocketImplTest::ReceivePkt (Ptr socket) uint32_t availableData; availableData = socket->GetRxAvailable (); m_receivedPacket = socket->Recv (std::numeric_limits::max (), 0); - NS_ASSERT (availableData == m_receivedPacket->GetSize ()); + NS_TEST_ASSERT_MSG_EQ (availableData, m_receivedPacket->GetSize (), "ReceivedPacket size is not equal to the Rx buffer size"); //cast availableData to void, to suppress 'availableData' set but not used //compiler warning (void) availableData; @@ -563,7 +563,7 @@ void Udp6SocketImplTest::ReceivePkt2 (Ptr socket) uint32_t availableData; availableData = socket->GetRxAvailable (); m_receivedPacket2 = socket->Recv (std::numeric_limits::max (), 0); - NS_ASSERT (availableData == m_receivedPacket2->GetSize ()); + NS_TEST_ASSERT_MSG_EQ (availableData, m_receivedPacket2->GetSize (), "ReceivedPacket size is not equal to the Rx buffer size"); //cast availableData to void, to suppress 'availableData' set but not used //compiler warning (void) availableData;