1.1 --- a/src/common/packet-metadata-test.cc	Thu Oct 01 13:25:21 2009 +0400
     1.2 +++ b/src/common/packet-metadata-test.cc	Thu Oct 01 13:39:14 2009 +0400
     1.3 @@ -17,8 +17,6 @@
     1.4   *
     1.5   * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
     1.6   */
     1.7 -#ifdef RUN_SELF_TESTS
     1.8 -
     1.9  #include <stdarg.h>
    1.10  #include <iostream>
    1.11  #include <sstream>
    1.12 @@ -250,20 +248,18 @@
    1.13  
    1.14  namespace ns3 {
    1.15  
    1.16 -
    1.17 -
    1.18 -class PacketMetadataTest : public Test {
    1.19 +class PacketMetadataTest : public TestCase {
    1.20  public:
    1.21    PacketMetadataTest ();
    1.22    virtual ~PacketMetadataTest ();
    1.23    bool CheckHistory (Ptr<Packet> p, const char *file, int line, uint32_t n, ...);
    1.24 -  virtual bool RunTests (void);
    1.25 +  virtual bool DoRun (void);
    1.26  private:
    1.27    Ptr<Packet> DoAddHeader (Ptr<Packet> p);
    1.28  };
    1.29  
    1.30  PacketMetadataTest::PacketMetadataTest ()
    1.31 -  : Test ("PacketMetadata")
    1.32 +  : TestCase ("Packet metadata")
    1.33  {}
    1.34  
    1.35  PacketMetadataTest::~PacketMetadataTest ()
    1.36 @@ -339,20 +335,21 @@
    1.37      }
    1.38    return true;
    1.39   error:
    1.40 -  Failure () << "PacketMetadata error. file="<< file 
    1.41 -            << ", line=" << line << ", got:\"";
    1.42 +  std::ostringstream failure;
    1.43 +  failure << "PacketMetadata error. Got:\"";
    1.44    for (std::list<int>::iterator i = got.begin (); 
    1.45         i != got.end (); i++)
    1.46      {
    1.47 -      Failure () << *i << ", ";
    1.48 +      failure << *i << ", ";
    1.49      }
    1.50 -  Failure () << "\", expected: \"";
    1.51 +  failure << "\", expected: \"";
    1.52    for (std::list<int>::iterator j = expected.begin ();
    1.53         j != expected.end (); j++)
    1.54      {
    1.55 -      Failure () << *j << ", ";
    1.56 +      failure << *j << ", ";
    1.57      }
    1.58 -  Failure () << "\"" << std::endl;
    1.59 +  failure << "\"" << std::endl;
    1.60 +  ReportTestFailure ("", "", "", failure.str(), file, line);
    1.61    return false;
    1.62  }
    1.63  
    1.64 @@ -403,7 +400,7 @@
    1.65  }
    1.66  
    1.67  bool
    1.68 -PacketMetadataTest::RunTests (void)
    1.69 +PacketMetadataTest::DoRun (void)
    1.70  {
    1.71    bool result = true;
    1.72  
    1.73 @@ -722,7 +719,7 @@
    1.74    ADD_HEADER (p1, 20);
    1.75    REM_HEADER (p1, 20);
    1.76    REM_TRAILER (p1, 5);
    1.77 -  NS_TEST_ASSERT_EQUAL (p->GetSize (), 1015);
    1.78 +  NS_TEST_EXPECT_MSG_EQ (p->GetSize (), 1015, "Correct size");
    1.79  
    1.80    
    1.81    p = Create<Packet> (1510);
    1.82 @@ -733,7 +730,7 @@
    1.83    p1 = p->CreateFragment (0, 1500);
    1.84    p2 = p1->Copy ();
    1.85    ADD_HEADER (p2, 24);
    1.86 -  NS_TEST_ASSERT_EQUAL (p->GetSize (), 1519);
    1.87 +  NS_TEST_EXPECT_MSG_EQ (p->GetSize (), 1519, "Correct size");
    1.88  
    1.89    p = Create<Packet> (1000);
    1.90    ADD_HEADER (p, 2);
    1.91 @@ -776,12 +773,20 @@
    1.92    p->RemoveAtStart (10);
    1.93    CHECK_HISTORY (p, 1, 490);
    1.94    
    1.95 +  return !result;
    1.96 +}
    1.97 +//-----------------------------------------------------------------------------
    1.98 +class PacketMetadataTestSuite : public TestSuite
    1.99 +{
   1.100 +public:
   1.101 +  PacketMetadataTestSuite ();
   1.102 +};
   1.103  
   1.104 -  return result;
   1.105 +PacketMetadataTestSuite::PacketMetadataTestSuite ()
   1.106 +  : TestSuite ("packet-metadata", UNIT)
   1.107 +{
   1.108 +  AddTestCase (new PacketMetadataTest);
   1.109  }
   1.110  
   1.111 -static PacketMetadataTest g_packetHistoryTest;
   1.112 -
   1.113 +PacketMetadataTestSuite g_packetMetadataTest;
   1.114  }//namespace ns3
   1.115 -
   1.116 -#endif /* RUN_SELF_TESTS */