Attachment #729 for bug #793

View | Details | Raw Unified | Return to bug 793
Collapse All | Expand All

(-)a/src/contrib/event-garbage-collector.cc (-1 / +1 lines)

Lines 138-144	Link Here

138

  Simulator::Run ();

138

  Simulator::Run ();

139

  NS_TEST_EXPECT_MSG_EQ (m_events, 0, "");

139

  NS_TEST_EXPECT_MSG_EQ (m_events, 0, "");

140

  NS_TEST_EXPECT_MSG_EQ (m_counter, 50, "");

140

  NS_TEST_EXPECT_MSG_EQ (m_counter, 50, "");

141

  Simulator::Destroy ();

142

  return false;

142

  return false;

143

144

(-)a/src/devices/wifi/wifi-test.cc (-1 / +1 lines)

Lines 143-149	Link Here

143

  m_propDelay.SetTypeId ("ns3::RandomPropagationDelayModel");

143

  m_propDelay.SetTypeId ("ns3::RandomPropagationDelayModel");

144

  m_mac.SetTypeId ("ns3::AdhocWifiMac");

144

  m_mac.SetTypeId ("ns3::AdhocWifiMac");

145

  RunOne ();

145

  RunOne ();

146

  Simulator::Destroy ();

147

  return false;

147

  return false;

148

149




#include "ns3/net-device.h"
#include "ns3/ipv4.h"
#include "ns3/ipv4-address-generator.h"
#include "ns3/simulator.h"
#include "ipv4-address-helper.h"

NS_LOG_COMPONENT_DEFINE("Ipv4AddressHelper");

NetworkAllocatorHelperTestCase::DoTeardown (void)
{
  Ipv4AddressGenerator::Reset ();
  Simulator::Destroy ();
}
bool
NetworkAllocatorHelperTestCase::DoRun (void)

AddressAllocatorHelperTestCase::DoTeardown (void)
{
  Ipv4AddressGenerator::Reset ();
  Simulator::Destroy ();
}

bool

ResetAllocatorHelperTestCase::DoTeardown (void)
{
  Ipv4AddressGenerator::Reset ();
  Simulator::Destroy ();
}

static class Ipv4AddressHelperTestSuite : public TestSuite

(-)a/src/internet-stack/ipv4-test.cc (-1 / +1 lines)

Lines 94-100	Link Here

  Ipv4InterfaceAddress output = interface->GetAddress (2);

  Ipv4InterfaceAddress output = interface->GetAddress (2);

  NS_TEST_ASSERT_MSG_EQ (ifaceAddr4, output,

  NS_TEST_ASSERT_MSG_EQ (ifaceAddr4, output,

      "The addresses should be identical");

      "The addresses should be identical");

  Simulator::Destroy ();

  return false;

  return false;

100

(-)a/src/internet-stack/ipv6-test.cc (-1 / +1 lines)

Lines 135-141	Link Here

135

136

  index = ipv6->GetInterfaceForAddress ("2001:ffff:5678:9000::1"); /* address we just remove */

136

  index = ipv6->GetInterfaceForAddress ("2001:ffff:5678:9000::1"); /* address we just remove */

137

  NS_TEST_ASSERT_MSG_EQ (index, (uint32_t) -1, "Address should not be found??");

137

  NS_TEST_ASSERT_MSG_EQ (index, (uint32_t) -1, "Address should not be found??");

138

  Simulator::Destroy ();

139

  return false;

139

  return false;

140

}//end DoRun

140

}//end DoRun

141

static class IPv6L3ProtocolTestSuite : public TestSuite

141

static class IPv6L3ProtocolTestSuite : public TestSuite




AddressAllocatorTestCase::DoTeardown (void)
{
  Ipv4AddressGenerator::Reset ();
  Simulator::Destroy ();
}



NetworkAndAddressTestCase::DoTeardown (void)
{
  Ipv4AddressGenerator::Reset ();
  Simulator::Destroy ();
}

bool

AddressCollisionTestCase::DoTeardown (void)
{
  Ipv4AddressGenerator::Reset ();
  Simulator::Destroy ();
}
bool
AddressCollisionTestCase::DoRun (void)

(-)a/src/routing/aodv/aodv-test-suite.cc (-2 / +2 lines)

Lines 474-480	Link Here

474

    NS_TEST_EXPECT_MSG_EQ (rt.IsPrecursorListEmpty (), true, "trivial");

474

    NS_TEST_EXPECT_MSG_EQ (rt.IsPrecursorListEmpty (), true, "trivial");

475

    rt.GetPrecursors (prec);

475

    rt.GetPrecursors (prec);

476

    NS_TEST_EXPECT_MSG_EQ (prec.size (), 2, "trivial");

476

    NS_TEST_EXPECT_MSG_EQ (prec.size (), 2, "trivial");

477

    Simulator::Destroy ();

478

    return GetErrorStatus ();

478

    return GetErrorStatus ();

479

480

};

480

};

Lines 528-534	Link Here

528

    NS_TEST_EXPECT_MSG_EQ (rt.GetFlag (), INVALID, "trivial");

528

    NS_TEST_EXPECT_MSG_EQ (rt.GetFlag (), INVALID, "trivial");

529

    NS_TEST_EXPECT_MSG_EQ (rtable.DeleteRoute (Ipv4Address ("1.2.3.4")), true, "trivial");

529

    NS_TEST_EXPECT_MSG_EQ (rtable.DeleteRoute (Ipv4Address ("1.2.3.4")), true, "trivial");

530

    NS_TEST_EXPECT_MSG_EQ (rtable.DeleteRoute (Ipv4Address ("1.2.3.4")), false, "trivial");

530

    NS_TEST_EXPECT_MSG_EQ (rtable.DeleteRoute (Ipv4Address ("1.2.3.4")), false, "trivial");

531

    Simulator::Destroy ();

532

    return GetErrorStatus ();

532

    return GetErrorStatus ();

533

534

};

534

};

Return to bug 793