F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disambiguate test asserts

Browse Source
This commit is contained in:
Peter D. Barnes, Jr.
2013-07-03 14:45:39 -07:00
parent e3611c4078
commit 12ea93c5a1
12 changed files with 153 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/core/test/ptr-test-suite.cc
View File

@@ -125,7 +125,7 @@ PtrTestCase::DoRun (void)
{
Ptr<NoCount> p = Create<NoCount> (this);
}
NS_TEST_EXPECT_MSG_EQ (m_nDestroyed, 1, "XXX");
NS_TEST_EXPECT_MSG_EQ (m_nDestroyed, 1, "001");
m_nDestroyed = 0;
{
@@ -133,7 +133,7 @@ PtrTestCase::DoRun (void)
p = Create<NoCount> (this);
p = p;
}
NS_TEST_EXPECT_MSG_EQ (m_nDestroyed, 1, "XXX");
NS_TEST_EXPECT_MSG_EQ (m_nDestroyed, 1, "002");
m_nDestroyed = 0;
{
@@ -141,7 +141,7 @@ PtrTestCase::DoRun (void)
p1 = Create<NoCount> (this);
Ptr<NoCount> p2 = p1;
}
NS_TEST_EXPECT_MSG_EQ (m_nDestroyed, 1, "XXX");
NS_TEST_EXPECT_MSG_EQ (m_nDestroyed, 1, "003");
m_nDestroyed = 0;
{
@@ -150,7 +150,7 @@ PtrTestCase::DoRun (void)
Ptr<NoCount> p2;
p2 = p1;
}
NS_TEST_EXPECT_MSG_EQ (m_nDestroyed, 1, "XXX");
NS_TEST_EXPECT_MSG_EQ (m_nDestroyed, 1, "004");
m_nDestroyed = 0;
{
@@ -159,7 +159,7 @@ PtrTestCase::DoRun (void)
Ptr<NoCount> p2 = Create<NoCount> (this);
p2 = p1;
}
NS_TEST_EXPECT_MSG_EQ (m_nDestroyed, 2, "XXX");
NS_TEST_EXPECT_MSG_EQ (m_nDestroyed, 2, "005");
m_nDestroyed = 0;
{
@@ -169,7 +169,7 @@ PtrTestCase::DoRun (void)
p2 = Create<NoCount> (this);
p2 = p1;
}
NS_TEST_EXPECT_MSG_EQ (m_nDestroyed, 2, "XXX");
NS_TEST_EXPECT_MSG_EQ (m_nDestroyed, 2, "006");
m_nDestroyed = 0;
{
@@ -177,7 +177,7 @@ PtrTestCase::DoRun (void)
p1 = Create<NoCount> (this);
p1 = Create<NoCount> (this);
}
NS_TEST_EXPECT_MSG_EQ (m_nDestroyed, 2, "XXX");
NS_TEST_EXPECT_MSG_EQ (m_nDestroyed, 2, "007");
m_nDestroyed = 0;
{
@@ -188,9 +188,9 @@ PtrTestCase::DoRun (void)
p2 = Create<NoCount> (this);
p2 = p1;
}
NS_TEST_EXPECT_MSG_EQ (m_nDestroyed, 1, "XXX");
NS_TEST_EXPECT_MSG_EQ (m_nDestroyed, 1, "008");
}
NS_TEST_EXPECT_MSG_EQ (m_nDestroyed, 2, "XXX");
NS_TEST_EXPECT_MSG_EQ (m_nDestroyed, 2, "009");
m_nDestroyed = 0;
{
@@ -201,9 +201,9 @@ PtrTestCase::DoRun (void)
p2 = Create<NoCount> (this);
p2 = CallTest (p1);
}
NS_TEST_EXPECT_MSG_EQ (m_nDestroyed, 1, "XXX");
NS_TEST_EXPECT_MSG_EQ (m_nDestroyed, 1, "010");
}
NS_TEST_EXPECT_MSG_EQ (m_nDestroyed, 2, "XXX");
NS_TEST_EXPECT_MSG_EQ (m_nDestroyed, 2, "011");
{
Ptr<NoCount> p1;
@@ -241,7 +241,7 @@ PtrTestCase::DoRun (void)
raw = GetPointer (p);
p = 0;
}
NS_TEST_EXPECT_MSG_EQ (m_nDestroyed, 0, "XXX");
NS_TEST_EXPECT_MSG_EQ (m_nDestroyed, 0, "012");
delete raw;
}
@@ -253,7 +253,7 @@ PtrTestCase::DoRun (void)
v1->Nothing ();
v2->Nothing ();
}
NS_TEST_EXPECT_MSG_EQ (m_nDestroyed, 1, "XXX");
NS_TEST_EXPECT_MSG_EQ (m_nDestroyed, 1, "013");
{
Ptr<Base> p0 = Create<NoCount> (this);

42
src/dsdv/test/dsdv-testcase.cc
View File

@@ -78,22 +78,22 @@ DsdvHeaderTestCase::DoRun ()
hdr2.SetDstSeqno (4);
hdr2.SetHopCount (1);
packet->AddHeader (hdr2);
NS_TEST_ASSERT_MSG_EQ (packet->GetSize (), 24, "XXX");
NS_TEST_ASSERT_MSG_EQ (packet->GetSize (), 24, "001");
}
{
dsdv::DsdvHeader hdr2;
packet->RemoveHeader (hdr2);
NS_TEST_ASSERT_MSG_EQ (hdr2.GetSerializedSize (),12,"XXX");
NS_TEST_ASSERT_MSG_EQ (hdr2.GetDst (),Ipv4Address ("10.1.1.3"),"XXX");
NS_TEST_ASSERT_MSG_EQ (hdr2.GetDstSeqno (),4,"XXX");
NS_TEST_ASSERT_MSG_EQ (hdr2.GetHopCount (),1,"XXX");
NS_TEST_ASSERT_MSG_EQ (hdr2.GetSerializedSize (),12,"002");
NS_TEST_ASSERT_MSG_EQ (hdr2.GetDst (),Ipv4Address ("10.1.1.3"),"003");
NS_TEST_ASSERT_MSG_EQ (hdr2.GetDstSeqno (),4,"004");
NS_TEST_ASSERT_MSG_EQ (hdr2.GetHopCount (),1,"005");
dsdv::DsdvHeader hdr1;
packet->RemoveHeader (hdr1);
NS_TEST_ASSERT_MSG_EQ (hdr1.GetSerializedSize (),12,"XXX");
NS_TEST_ASSERT_MSG_EQ (hdr1.GetDst (),Ipv4Address ("10.1.1.2"),"XXX");
NS_TEST_ASSERT_MSG_EQ (hdr1.GetDstSeqno (),2,"XXX");
NS_TEST_ASSERT_MSG_EQ (hdr1.GetHopCount (),2,"XXX");
NS_TEST_ASSERT_MSG_EQ (hdr1.GetSerializedSize (),12,"006");
NS_TEST_ASSERT_MSG_EQ (hdr1.GetDst (),Ipv4Address ("10.1.1.2"),"008");
NS_TEST_ASSERT_MSG_EQ (hdr1.GetDstSeqno (),2,"009");
NS_TEST_ASSERT_MSG_EQ (hdr1.GetHopCount (),2,"010");
}
}
@@ -156,28 +156,28 @@ DsdvTableTestCase::DoRun ()
dsdv::RoutingTableEntry rEntry;
if (rtable.LookupRoute (Ipv4Address ("10.1.1.4"), rEntry))
{
NS_TEST_ASSERT_MSG_EQ (rEntry.GetDestination (),Ipv4Address ("10.1.1.4"),"XXX");
NS_TEST_ASSERT_MSG_EQ (rEntry.GetSeqNo (),2,"XXX");
NS_TEST_ASSERT_MSG_EQ (rEntry.GetHop (),2,"XXX");
NS_TEST_ASSERT_MSG_EQ (rEntry.GetDestination (),Ipv4Address ("10.1.1.4"),"100");
NS_TEST_ASSERT_MSG_EQ (rEntry.GetSeqNo (),2,"101");
NS_TEST_ASSERT_MSG_EQ (rEntry.GetHop (),2,"102");
}
if (rtable.LookupRoute (Ipv4Address ("10.1.1.2"), rEntry))
{
NS_TEST_ASSERT_MSG_EQ (rEntry.GetDestination (),Ipv4Address ("10.1.1.2"),"XXX");
NS_TEST_ASSERT_MSG_EQ (rEntry.GetSeqNo (),4,"XXX");
NS_TEST_ASSERT_MSG_EQ (rEntry.GetHop (),1,"XXX");
NS_TEST_ASSERT_MSG_EQ (rEntry.GetDestination (),Ipv4Address ("10.1.1.2"),"103");
NS_TEST_ASSERT_MSG_EQ (rEntry.GetSeqNo (),4,"104");
NS_TEST_ASSERT_MSG_EQ (rEntry.GetHop (),1,"105");
}
if (rtable.LookupRoute (Ipv4Address ("10.1.1.3"), rEntry))
{
NS_TEST_ASSERT_MSG_EQ (rEntry.GetDestination (),Ipv4Address ("10.1.1.3"),"XXX");
NS_TEST_ASSERT_MSG_EQ (rEntry.GetSeqNo (),4,"XXX");
NS_TEST_ASSERT_MSG_EQ (rEntry.GetHop (),1,"XXX");
NS_TEST_ASSERT_MSG_EQ (rEntry.GetDestination (),Ipv4Address ("10.1.1.3"),"106");
NS_TEST_ASSERT_MSG_EQ (rEntry.GetSeqNo (),4,"107");
NS_TEST_ASSERT_MSG_EQ (rEntry.GetHop (),1,"108");
}
if (rtable.LookupRoute (Ipv4Address ("10.1.1.255"), rEntry))
{
NS_TEST_ASSERT_MSG_EQ (rEntry.GetDestination (),Ipv4Address ("10.1.1.255"),"XXX");
NS_TEST_ASSERT_MSG_EQ (rEntry.GetDestination (),Ipv4Address ("10.1.1.255"),"109");
}
NS_TEST_ASSERT_MSG_EQ (rEntry.GetInterface ().GetLocal (),Ipv4Address ("10.1.1.1"),"XXX");
NS_TEST_ASSERT_MSG_EQ (rEntry.GetInterface ().GetBroadcast (),Ipv4Address ("10.1.1.255"),"XXX");
NS_TEST_ASSERT_MSG_EQ (rEntry.GetInterface ().GetLocal (),Ipv4Address ("10.1.1.1"),"110");
NS_TEST_ASSERT_MSG_EQ (rEntry.GetInterface ().GetBroadcast (),Ipv4Address ("10.1.1.255"),"111");
NS_TEST_ASSERT_MSG_EQ (rtable.RoutingTableSize (),4,"Rtable size incorrect");
}
Simulator::Destroy ();

72
src/internet/test/ipv4-address-generator-test-suite.cc
View File

@@ -46,30 +46,30 @@ NetworkNumberAllocatorTestCase::DoRun (void)
Ipv4AddressGenerator::Init (Ipv4Address ("1.0.0.0"), Ipv4Mask ("255.0.0.0"),
Ipv4Address ("0.0.0.0"));
network = Ipv4AddressGenerator::GetNetwork (Ipv4Mask ("255.0.0.0"));
NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("1.0.0.0"), "XXX");
NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("1.0.0.0"), "001");
network = Ipv4AddressGenerator::NextNetwork (Ipv4Mask ("255.0.0.0"));
NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("2.0.0.0"), "XXX");
NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("2.0.0.0"), "001");
Ipv4AddressGenerator::Init (Ipv4Address ("0.1.0.0"),
Ipv4Mask ("255.255.0.0"), Ipv4Address ("0.0.0.0"));
network = Ipv4AddressGenerator::GetNetwork (Ipv4Mask ("255.255.0.0"));
NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("0.1.0.0"), "XXX");
NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("0.1.0.0"), "003");
network = Ipv4AddressGenerator::NextNetwork (Ipv4Mask ("255.255.0.0"));
NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("0.2.0.0"), "XXX");
NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("0.2.0.0"), "004");
Ipv4AddressGenerator::Init (Ipv4Address ("0.0.1.0"),
Ipv4Mask ("255.255.255.0"), Ipv4Address ("0.0.0.0"));
network = Ipv4AddressGenerator::GetNetwork (Ipv4Mask ("255.255.255.0"));
NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("0.0.1.0"), "XXX");
NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("0.0.1.0"), "005");
network = Ipv4AddressGenerator::NextNetwork (Ipv4Mask ("255.255.255.0"));
NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("0.0.2.0"), "XXX");
NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("0.0.2.0"), "006");
network = Ipv4AddressGenerator::NextNetwork (Ipv4Mask ("255.0.0.0"));
NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("3.0.0.0"), "XXX");
NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("3.0.0.0"), "007");
network = Ipv4AddressGenerator::NextNetwork (Ipv4Mask ("255.255.0.0"));
NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("0.3.0.0"), "XXX");
NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("0.3.0.0"), "008");
network = Ipv4AddressGenerator::NextNetwork (Ipv4Mask ("255.255.255.0"));
NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("0.0.3.0"), "XXX");
NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("0.0.3.0"), "009");
}
class AddressAllocatorTestCase : public TestCase
@@ -94,23 +94,23 @@ AddressAllocatorTestCase::DoRun (void)
Ipv4AddressGenerator::Init (Ipv4Address ("1.0.0.0"), Ipv4Mask ("255.0.0.0"),
Ipv4Address ("0.0.0.3"));
address = Ipv4AddressGenerator::NextAddress (Ipv4Mask ("255.0.0.0"));
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("1.0.0.3"), "XXX");
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("1.0.0.3"), "100");
address = Ipv4AddressGenerator::NextAddress (Ipv4Mask ("255.0.0.0"));
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("1.0.0.4"), "XXX");
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("1.0.0.4"), "101");
Ipv4AddressGenerator::Init (Ipv4Address ("0.1.0.0"),
Ipv4Mask ("255.255.0.0"), Ipv4Address ("0.0.0.3"));
address = Ipv4AddressGenerator::NextAddress (Ipv4Mask ("255.255.0.0"));
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.1.0.3"), "XXX");
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.1.0.3"), "102");
address = Ipv4AddressGenerator::NextAddress (Ipv4Mask ("255.255.0.0"));
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.1.0.4"), "XXX");
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.1.0.4"), "103");
Ipv4AddressGenerator::Init (Ipv4Address ("0.0.1.0"),
Ipv4Mask ("255.255.255.0"), Ipv4Address ("0.0.0.3"));
address = Ipv4AddressGenerator::NextAddress (Ipv4Mask ("255.255.255.0"));
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.0.1.3"), "XXX");
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.0.1.3"), "104");
address = Ipv4AddressGenerator::NextAddress (Ipv4Mask ("255.255.255.0"));
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.0.1.4"), "XXX");
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.0.1.4"), "105");
}
void
@@ -150,38 +150,38 @@ NetworkAndAddressTestCase::DoRun (void)
Ipv4AddressGenerator::Init (Ipv4Address ("3.0.0.0"), Ipv4Mask ("255.0.0.0"),
Ipv4Address ("0.0.0.3"));
address = Ipv4AddressGenerator::NextAddress (Ipv4Mask ("255.0.0.0"));
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("3.0.0.3"), "XXX");
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("3.0.0.3"), "200");
address = Ipv4AddressGenerator::NextAddress (Ipv4Mask ("255.0.0.0"));
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("3.0.0.4"), "XXX");
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("3.0.0.4"), "201");
network = Ipv4AddressGenerator::NextNetwork (Ipv4Mask ("255.0.0.0"));
NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("4.0.0.0"), "XXX");
NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("4.0.0.0"), "202");
address = Ipv4AddressGenerator::NextAddress (Ipv4Mask ("255.0.0.0"));
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("4.0.0.5"), "XXX");
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("4.0.0.5"), "203");
Ipv4AddressGenerator::Init (Ipv4Address ("0.3.0.0"),
Ipv4Mask ("255.255.0.0"), Ipv4Address ("0.0.0.3"));
address = Ipv4AddressGenerator::NextAddress (Ipv4Mask ("255.255.0.0"));
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.3.0.3"), "XXX");
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.3.0.3"), "204");
address = Ipv4AddressGenerator::NextAddress (Ipv4Mask ("255.255.0.0"));
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.3.0.4"), "XXX");
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.3.0.4"), "205");
network = Ipv4AddressGenerator::NextNetwork (Ipv4Mask ("255.255.0.0"));
NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("0.4.0.0"), "XXX");
NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("0.4.0.0"), "206");
address = Ipv4AddressGenerator::NextAddress (Ipv4Mask ("255.255.0.0"));
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.4.0.5"), "XXX");
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.4.0.5"), "207");
Ipv4AddressGenerator::Init (Ipv4Address ("0.0.3.0"),
Ipv4Mask ("255.255.255.0"), Ipv4Address ("0.0.0.3"));
address = Ipv4AddressGenerator::NextAddress (Ipv4Mask ("255.255.255.0"));
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.0.3.3"), "XXX");
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.0.3.3"), "208");
address = Ipv4AddressGenerator::NextAddress (Ipv4Mask ("255.255.255.0"));
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.0.3.4"), "XXX");
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.0.3.4"), "209");
network = Ipv4AddressGenerator::NextNetwork (Ipv4Mask ("255.255.255.0"));
NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("0.0.4.0"), "XXX");
NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("0.0.4.0"), "210");
address = Ipv4AddressGenerator::NextAddress (Ipv4Mask ("255.255.255.0"));
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.0.4.5"), "XXX");
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.0.4.5"), "211");
}
class ExampleAddressGeneratorTestCase : public TestCase
@@ -215,11 +215,11 @@ ExampleAddressGeneratorTestCase::DoRun (void)
Ipv4AddressGenerator::Init (Ipv4Address ("192.168.0.0"),
Ipv4Mask ("255.255.255.0"), Ipv4Address ("0.0.0.3"));
address = Ipv4AddressGenerator::NextAddress (Ipv4Mask ("255.255.255.0"));
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("192.168.0.3"), "XXX");
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("192.168.0.3"), "300");
address = Ipv4AddressGenerator::NextAddress (Ipv4Mask ("255.255.255.0"));
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("192.168.0.4"), "XXX");
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("192.168.0.4"), "301");
address = Ipv4AddressGenerator::NextAddress (Ipv4Mask ("255.255.255.0"));
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("192.168.0.5"), "XXX");
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("192.168.0.5"), "302");
//
// Allocate the next network out of our /24 network (this should be
// 192.168.1.0) and begin allocating with IP address 0.0.0.3 out of that
@@ -233,7 +233,7 @@ ExampleAddressGeneratorTestCase::DoRun (void)
// is 192.168.1.3, of course.
//
address = Ipv4AddressGenerator::NextAddress (Ipv4Mask ("255.255.255.0"));
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("192.168.1.3"), "XXX");
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("192.168.1.3"), "304");
}
class AddressCollisionTestCase : public TestCase
@@ -286,19 +286,19 @@ AddressCollisionTestCase::DoRun (void)
Ipv4AddressGenerator::TestMode ();
bool added = Ipv4AddressGenerator::AddAllocated ("0.0.0.21");
NS_TEST_EXPECT_MSG_EQ (added, true, "XXX");
NS_TEST_EXPECT_MSG_EQ (added, true, "400");
added = Ipv4AddressGenerator::AddAllocated ("0.0.0.4");
NS_TEST_EXPECT_MSG_EQ (added, false, "XXX");
NS_TEST_EXPECT_MSG_EQ (added, false, "401");
added = Ipv4AddressGenerator::AddAllocated ("0.0.0.9");
NS_TEST_EXPECT_MSG_EQ (added, false, "XXX");
NS_TEST_EXPECT_MSG_EQ (added, false, "402");
added = Ipv4AddressGenerator::AddAllocated ("0.0.0.16");
NS_TEST_EXPECT_MSG_EQ (added, false, "XXX");
NS_TEST_EXPECT_MSG_EQ (added, false, "403");
added = Ipv4AddressGenerator::AddAllocated ("0.0.0.21");
NS_TEST_EXPECT_MSG_EQ (added, false, "XXX");
NS_TEST_EXPECT_MSG_EQ (added, false, "404");
}

48
src/internet/test/ipv4-address-helper-test-suite.cc
View File

@@ -52,21 +52,21 @@ NetworkAllocatorHelperTestCase::DoRun (void)
h.SetBase ("1.0.0.0", "255.0.0.0");
network = h.NewNetwork ();
NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("2.0.0.0"), "XXX");
NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("2.0.0.0"), "100");
address = h.NewAddress ();
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("2.0.0.1"), "XXX");
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("2.0.0.1"), "101");
h.SetBase ("0.1.0.0", "255.255.0.0");
network = h.NewNetwork ();
NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("0.2.0.0"), "XXX");
NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("0.2.0.0"), "102");
address = h.NewAddress ();
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.2.0.1"), "XXX");
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.2.0.1"), "103");
h.SetBase ("0.0.1.0", "255.255.255.0");
network = h.NewNetwork ();
NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("0.0.2.0"), "XXX");
NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("0.0.2.0"), "104");
address = h.NewAddress ();
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.0.2.1"), "XXX");
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.0.2.1"), "105");
}
class AddressAllocatorHelperTestCase : public TestCase
@@ -99,21 +99,21 @@ AddressAllocatorHelperTestCase::DoRun (void)
h.SetBase ("1.0.0.0", "255.0.0.0", "0.0.0.3");
address = h.NewAddress ();
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("1.0.0.3"), "XXX");
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("1.0.0.3"), "200");
address = h.NewAddress ();
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("1.0.0.4"), "XXX");
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("1.0.0.4"), "201");
h.SetBase ("0.1.0.0", "255.255.0.0", "0.0.0.3");
address = h.NewAddress ();
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.1.0.3"), "XXX");
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.1.0.3"), "202");
address = h.NewAddress ();
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.1.0.4"), "XXX");
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.1.0.4"), "203");
h.SetBase ("0.0.1.0", "255.255.255.0", "0.0.0.3");
address = h.NewAddress ();
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.0.1.3"), "XXX");
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.0.1.3"), "204");
address = h.NewAddress ();
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.0.1.4"), "XXX");
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.0.1.4"), "205");
}
class ResetAllocatorHelperTestCase : public TestCase
@@ -143,33 +143,33 @@ ResetAllocatorHelperTestCase::DoRun (void)
h.SetBase ("1.0.0.0", "255.0.0.0", "0.0.0.3");
address = h.NewAddress ();
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("1.0.0.3"), "XXX");
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("1.0.0.3"), "301");
address = h.NewAddress ();
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("1.0.0.4"), "XXX");
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("1.0.0.4"), "302");
network = h.NewNetwork ();
NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("2.0.0.0"), "XXX");
NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("2.0.0.0"), "303");
address = h.NewAddress ();
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("2.0.0.3"), "XXX");
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("2.0.0.3"), "304");
h.SetBase ("0.1.0.0", "255.255.0.0", "0.0.0.3");
address = h.NewAddress ();
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.1.0.3"), "XXX");
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.1.0.3"), "305");
address = h.NewAddress ();
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.1.0.4"), "XXX");
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.1.0.4"), "306");
network = h.NewNetwork ();
NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("0.2.0.0"), "XXX");
NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("0.2.0.0"), "307");
address = h.NewAddress ();
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.2.0.3"), "XXX");
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.2.0.3"), "308");
h.SetBase ("0.0.1.0", "255.255.255.0", "0.0.0.3");
address = h.NewAddress ();
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.0.1.3"), "XXX");
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.0.1.3"), "309");
address = h.NewAddress ();
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.0.1.4"), "XXX");
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.0.1.4"), "310");
network = h.NewNetwork ();
NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("0.0.2.0"), "XXX");
NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("0.0.2.0"), "311");
address = h.NewAddress ();
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.0.2.3"), "XXX");
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.0.2.3"), "312");
}
void

2
src/internet/test/ipv4-forwarding-test.cc
View File

@@ -96,7 +96,7 @@ Ipv4ForwardingTest::DoSendData (Ptr<Socket> socket, std::string to)
{
Address realTo = InetSocketAddress (Ipv4Address (to.c_str ()), 1234);
NS_TEST_EXPECT_MSG_EQ (socket->SendTo (Create<Packet> (123), 0, realTo),
123, "XXX");
123, "100");
}
void

16
src/internet/test/ipv4-list-routing-test-suite.cc
View File

@@ -73,10 +73,10 @@ Ipv4ListRoutingNegativeTestCase::DoRun (void)
lr->AddRoutingProtocol (bRouting, -5);
int16_t first = 3;
uint32_t num = lr->GetNRoutingProtocols ();
NS_TEST_ASSERT_MSG_EQ (num, 2, "XXX");
NS_TEST_ASSERT_MSG_EQ (num, 2, "100");
Ptr<Ipv4RoutingProtocol> firstRp = lr->GetRoutingProtocol (0, first);
NS_TEST_ASSERT_MSG_EQ (-5, first, "XXX");
NS_TEST_ASSERT_MSG_EQ (firstRp, bRouting, "XXX");
NS_TEST_ASSERT_MSG_EQ (-5, first, "101");
NS_TEST_ASSERT_MSG_EQ (firstRp, bRouting, "102");
}
class Ipv4ListRoutingPositiveTestCase : public TestCase
@@ -103,13 +103,13 @@ Ipv4ListRoutingPositiveTestCase::DoRun (void)
int16_t first = 3;
int16_t second = 3;
uint32_t num = lr->GetNRoutingProtocols ();
NS_TEST_ASSERT_MSG_EQ (num, 2, "XXX");
NS_TEST_ASSERT_MSG_EQ (num, 2, "200");
Ptr<Ipv4RoutingProtocol> firstRp = lr->GetRoutingProtocol (0, first);
NS_TEST_ASSERT_MSG_EQ (10, first, "XXX");
NS_TEST_ASSERT_MSG_EQ (firstRp, aRouting, "XXX");
NS_TEST_ASSERT_MSG_EQ (10, first, "201");
NS_TEST_ASSERT_MSG_EQ (firstRp, aRouting, "202");
Ptr<Ipv4RoutingProtocol> secondRp = lr->GetRoutingProtocol (1, second);
NS_TEST_ASSERT_MSG_EQ (5, second, "XXX");
NS_TEST_ASSERT_MSG_EQ (secondRp, bRouting, "XXX");
NS_TEST_ASSERT_MSG_EQ (5, second, "203");
NS_TEST_ASSERT_MSG_EQ (secondRp, bRouting, "204");
}
static class Ipv4ListRoutingTestSuite : public TestSuite

2
src/internet/test/ipv4-packet-info-tag-test-suite.cc
View File

@@ -114,7 +114,7 @@ Ipv4PacketInfoTagTest::DoSendData (Ptr<Socket> socket, std::string to)
if (DynamicCast<UdpSocket> (socket) != 0)
{
NS_TEST_EXPECT_MSG_EQ (socket->SendTo (Create<Packet> (123), 0, realTo),
123, "XXX");
123, "100");
}
// Should only Ipv4RawSock
else

2
src/internet/test/ipv6-forwarding-test.cc
View File

@@ -99,7 +99,7 @@ Ipv6ForwardingTest::DoSendData (Ptr<Socket> socket, std::string to)
{
Address realTo = Inet6SocketAddress (Ipv6Address (to.c_str ()), 1234);
NS_TEST_EXPECT_MSG_EQ (socket->SendTo (Create<Packet> (123), 0, realTo),
123, "XXX");
123, "100");
}
void

16
src/internet/test/ipv6-list-routing-test-suite.cc
View File

@@ -80,10 +80,10 @@ Ipv6ListRoutingNegativeTestCase::DoRun (void)
lr->AddRoutingProtocol (bRouting, -5);
int16_t first = 3;
uint32_t num = lr->GetNRoutingProtocols ();
NS_TEST_ASSERT_MSG_EQ (num, 2, "XXX");
NS_TEST_ASSERT_MSG_EQ (num, 2, "100");
Ptr<Ipv6RoutingProtocol> firstRp = lr->GetRoutingProtocol (0, first);
NS_TEST_ASSERT_MSG_EQ (-5, first, "XXX");
NS_TEST_ASSERT_MSG_EQ (firstRp, bRouting, "XXX");
NS_TEST_ASSERT_MSG_EQ (-5, first, "101");
NS_TEST_ASSERT_MSG_EQ (firstRp, bRouting, "102");
}
class Ipv6ListRoutingPositiveTestCase : public TestCase
@@ -110,13 +110,13 @@ Ipv6ListRoutingPositiveTestCase::DoRun (void)
int16_t first = 3;
int16_t second = 3;
uint32_t num = lr->GetNRoutingProtocols ();
NS_TEST_ASSERT_MSG_EQ (num, 2, "XXX");
NS_TEST_ASSERT_MSG_EQ (num, 2, "200");
Ptr<Ipv6RoutingProtocol> firstRp = lr->GetRoutingProtocol (0, first);
NS_TEST_ASSERT_MSG_EQ (10, first, "XXX");
NS_TEST_ASSERT_MSG_EQ (firstRp, aRouting, "XXX");
NS_TEST_ASSERT_MSG_EQ (10, first, "201");
NS_TEST_ASSERT_MSG_EQ (firstRp, aRouting, "202");
Ptr<Ipv6RoutingProtocol> secondRp = lr->GetRoutingProtocol (1, second);
NS_TEST_ASSERT_MSG_EQ (5, second, "XXX");
NS_TEST_ASSERT_MSG_EQ (secondRp, bRouting, "XXX");
NS_TEST_ASSERT_MSG_EQ (5, second, "203");
NS_TEST_ASSERT_MSG_EQ (secondRp, bRouting, "204");
}
static class Ipv6ListRoutingTestSuite : public TestSuite

2
src/internet/test/ipv6-packet-info-tag-test-suite.cc
View File

@@ -106,7 +106,7 @@ Ipv6PacketInfoTagTest::DoSendData (Ptr<Socket> socket, std::string to)
if (DynamicCast<UdpSocket> (socket) != 0)
{
NS_TEST_EXPECT_MSG_EQ (socket->SendTo (Create<Packet> (123), 0, realTo),
123, "XXX");
123, "100");
}
// Should only Ipv6RawSock
else

4
src/internet/test/udp-test.cc
View File

@@ -242,7 +242,7 @@ UdpSocketImplTest::DoSendData (Ptr<Socket> socket, std::string to)
{
Address realTo = InetSocketAddress (Ipv4Address (to.c_str ()), 1234);
NS_TEST_EXPECT_MSG_EQ (socket->SendTo (Create<Packet> (123), 0, realTo),
123, "XXX");
123, "100");
}
void
@@ -445,7 +445,7 @@ Udp6SocketImplTest::DoSendData (Ptr<Socket> socket, std::string to)
{
Address realTo = Inet6SocketAddress (Ipv6Address (to.c_str ()), 1234);
NS_TEST_EXPECT_MSG_EQ (socket->SendTo (Create<Packet> (123), 0, realTo),
123, "XXX");
123, "200");
}
void

74
src/olsr/test/olsr-header-test-suite.cc
View File

@@ -42,7 +42,7 @@ OlsrEmfTestCase::DoRun (void)
uint8_t emf = olsr::SecondsToEmf (time);
double seconds = olsr::EmfToSeconds (emf);
NS_TEST_ASSERT_MSG_EQ ((seconds < 0 || std::fabs (seconds - time) > 0.1), false,
"XXX");
"100");
}
}
@@ -110,25 +110,25 @@ OlsrMidTestCase::DoRun (void)
{
olsr::PacketHeader hdr;
packet.RemoveHeader (hdr);
NS_TEST_ASSERT_MSG_EQ (hdr.GetPacketSequenceNumber (), 123, "XXX");
NS_TEST_ASSERT_MSG_EQ (hdr.GetPacketSequenceNumber (), 123, "200");
uint32_t sizeLeft = hdr.GetPacketLength () - hdr.GetSerializedSize ();
{
olsr::MessageHeader msg1;
packet.RemoveHeader (msg1);
NS_TEST_ASSERT_MSG_EQ (msg1.GetTimeToLive (), 255, "XXX");
NS_TEST_ASSERT_MSG_EQ (msg1.GetOriginatorAddress (), Ipv4Address ("11.22.33.44"), "XXX");
NS_TEST_ASSERT_MSG_EQ (msg1.GetVTime (), Seconds (9), "XXX");
NS_TEST_ASSERT_MSG_EQ (msg1.GetMessageType (), olsr::MessageHeader::MID_MESSAGE, "XXX");
NS_TEST_ASSERT_MSG_EQ (msg1.GetMessageSequenceNumber (), 7, "XXX");
NS_TEST_ASSERT_MSG_EQ (msg1.GetTimeToLive (), 255, "201");
NS_TEST_ASSERT_MSG_EQ (msg1.GetOriginatorAddress (), Ipv4Address ("11.22.33.44"), "202");
NS_TEST_ASSERT_MSG_EQ (msg1.GetVTime (), Seconds (9), "203");
NS_TEST_ASSERT_MSG_EQ (msg1.GetMessageType (), olsr::MessageHeader::MID_MESSAGE, "204");
NS_TEST_ASSERT_MSG_EQ (msg1.GetMessageSequenceNumber (), 7, "205");
olsr::MessageHeader::Mid &mid1 = msg1.GetMid ();
NS_TEST_ASSERT_MSG_EQ (mid1.interfaceAddresses.size (), 2, "XXX");
NS_TEST_ASSERT_MSG_EQ (*mid1.interfaceAddresses.begin (), Ipv4Address ("1.2.3.4"), "XXX");
NS_TEST_ASSERT_MSG_EQ (mid1.interfaceAddresses.size (), 2, "206");
NS_TEST_ASSERT_MSG_EQ (*mid1.interfaceAddresses.begin (), Ipv4Address ("1.2.3.4"), "207");
sizeLeft -= msg1.GetSerializedSize ();
NS_TEST_ASSERT_MSG_EQ ((sizeLeft > 0), true, "XXX");
NS_TEST_ASSERT_MSG_EQ ((sizeLeft > 0), true, "208");
}
{
// now read the second message
@@ -136,18 +136,18 @@ OlsrMidTestCase::DoRun (void)
packet.RemoveHeader (msg2);
NS_TEST_ASSERT_MSG_EQ (msg2.GetTimeToLive (), 254, "XXX");
NS_TEST_ASSERT_MSG_EQ (msg2.GetOriginatorAddress (), Ipv4Address ("12.22.33.44"), "XXX");
NS_TEST_ASSERT_MSG_EQ (msg2.GetVTime (), Seconds (10), "XXX");
NS_TEST_ASSERT_MSG_EQ (msg2.GetMessageType (), olsr::MessageHeader::MID_MESSAGE, "XXX");
NS_TEST_ASSERT_MSG_EQ (msg2.GetMessageSequenceNumber (), 7, "XXX");
NS_TEST_ASSERT_MSG_EQ (msg2.GetTimeToLive (), 254, "209");
NS_TEST_ASSERT_MSG_EQ (msg2.GetOriginatorAddress (), Ipv4Address ("12.22.33.44"), "210");
NS_TEST_ASSERT_MSG_EQ (msg2.GetVTime (), Seconds (10), "211");
NS_TEST_ASSERT_MSG_EQ (msg2.GetMessageType (), olsr::MessageHeader::MID_MESSAGE, "212");
NS_TEST_ASSERT_MSG_EQ (msg2.GetMessageSequenceNumber (), 7, "213");
olsr::MessageHeader::Mid mid2 = msg2.GetMid ();
NS_TEST_ASSERT_MSG_EQ (mid2.interfaceAddresses.size (), 2, "XXX");
NS_TEST_ASSERT_MSG_EQ (*mid2.interfaceAddresses.begin (), Ipv4Address ("2.2.3.4"), "XXX");
NS_TEST_ASSERT_MSG_EQ (mid2.interfaceAddresses.size (), 2, "214");
NS_TEST_ASSERT_MSG_EQ (*mid2.interfaceAddresses.begin (), Ipv4Address ("2.2.3.4"), "215");
sizeLeft -= msg2.GetSerializedSize ();
NS_TEST_ASSERT_MSG_EQ (sizeLeft, 0, "XXX");
NS_TEST_ASSERT_MSG_EQ (sizeLeft, 0, "216");
}
}
}
@@ -193,21 +193,21 @@ OlsrHelloTestCase::DoRun (void)
packet.RemoveHeader (msgOut);
olsr::MessageHeader::Hello &helloOut = msgOut.GetHello ();
NS_TEST_ASSERT_MSG_EQ (helloOut.GetHTime (), Seconds (7), "XXX");
NS_TEST_ASSERT_MSG_EQ (helloOut.willingness, 66, "XXX");
NS_TEST_ASSERT_MSG_EQ (helloOut.linkMessages.size (), 2, "XXX");
NS_TEST_ASSERT_MSG_EQ (helloOut.GetHTime (), Seconds (7), "300");
NS_TEST_ASSERT_MSG_EQ (helloOut.willingness, 66, "301");
NS_TEST_ASSERT_MSG_EQ (helloOut.linkMessages.size (), 2, "302");
NS_TEST_ASSERT_MSG_EQ (helloOut.linkMessages[0].linkCode, 2, "XXX");
NS_TEST_ASSERT_MSG_EQ (helloOut.linkMessages[0].linkCode, 2, "303");
NS_TEST_ASSERT_MSG_EQ (helloOut.linkMessages[0].neighborInterfaceAddresses[0],
Ipv4Address ("1.2.3.4"), "XXX");
Ipv4Address ("1.2.3.4"), "304");
NS_TEST_ASSERT_MSG_EQ (helloOut.linkMessages[0].neighborInterfaceAddresses[1],
Ipv4Address ("1.2.3.5"), "XXX");
Ipv4Address ("1.2.3.5"), "305");
NS_TEST_ASSERT_MSG_EQ (helloOut.linkMessages[1].linkCode, 3, "XXX");
NS_TEST_ASSERT_MSG_EQ (helloOut.linkMessages[1].linkCode, 3, "306");
NS_TEST_ASSERT_MSG_EQ (helloOut.linkMessages[1].neighborInterfaceAddresses[0],
Ipv4Address ("2.2.3.4"), "XXX");
Ipv4Address ("2.2.3.4"), "307");
NS_TEST_ASSERT_MSG_EQ (helloOut.linkMessages[1].neighborInterfaceAddresses[1],
Ipv4Address ("2.2.3.5"), "XXX");
Ipv4Address ("2.2.3.5"), "308");
NS_TEST_ASSERT_MSG_EQ (packet.GetSize (), 0, "All bytes in packet were not read");
@@ -239,15 +239,15 @@ OlsrTcTestCase::DoRun (void)
packet.RemoveHeader (msgOut);
olsr::MessageHeader::Tc &tcOut = msgOut.GetTc ();
NS_TEST_ASSERT_MSG_EQ (tcOut.ansn, 0x1234, "XXX");
NS_TEST_ASSERT_MSG_EQ (tcOut.neighborAddresses.size (), 2, "XXX");
NS_TEST_ASSERT_MSG_EQ (tcOut.ansn, 0x1234, "400");
NS_TEST_ASSERT_MSG_EQ (tcOut.neighborAddresses.size (), 2, "401");
NS_TEST_ASSERT_MSG_EQ (tcOut.neighborAddresses[0],
Ipv4Address ("1.2.3.4"), "XXX");
Ipv4Address ("1.2.3.4"), "402");
NS_TEST_ASSERT_MSG_EQ (tcOut.neighborAddresses[1],
Ipv4Address ("1.2.3.5"), "XXX");
Ipv4Address ("1.2.3.5"), "403");
NS_TEST_ASSERT_MSG_EQ (packet.GetSize (), 0, "XXX");
NS_TEST_ASSERT_MSG_EQ (packet.GetSize (), 0, "404");
}
@@ -279,17 +279,17 @@ OlsrHnaTestCase::DoRun (void)
packet.RemoveHeader (msgOut);
olsr::MessageHeader::Hna &hnaOut = msgOut.GetHna ();
NS_TEST_ASSERT_MSG_EQ (hnaOut.associations.size (), 2, "XXX");
NS_TEST_ASSERT_MSG_EQ (hnaOut.associations.size (), 2, "500");
NS_TEST_ASSERT_MSG_EQ (hnaOut.associations[0].address,
Ipv4Address ("1.2.3.4"), "XXX");
Ipv4Address ("1.2.3.4"), "501");
NS_TEST_ASSERT_MSG_EQ (hnaOut.associations[0].mask,
Ipv4Mask ("255.255.255.0"), "XXX");
Ipv4Mask ("255.255.255.0"), "502");
NS_TEST_ASSERT_MSG_EQ (hnaOut.associations[1].address,
Ipv4Address ("1.2.3.5"), "XXX");
Ipv4Address ("1.2.3.5"), "503");
NS_TEST_ASSERT_MSG_EQ (hnaOut.associations[1].mask,
Ipv4Mask ("255.255.0.0"), "XXX");
Ipv4Mask ("255.255.0.0"), "504");
NS_TEST_ASSERT_MSG_EQ (packet.GetSize (), 0, "All bytes in packet were not read");