From 34211bb68e8b478099741c237e17042efdd8d50e Mon Sep 17 00:00:00 2001
From: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
Date: Tue, 3 May 2011 11:18:41 +0200
Subject: [PATCH] improve test output upon failure

---
 src/network/test/buffer-test.cc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/network/test/buffer-test.cc b/src/network/test/buffer-test.cc
index db77cedc2..655e99d13 100644
--- a/src/network/test/buffer-test.cc
+++ b/src/network/test/buffer-test.cc
@@ -9,7 +9,7 @@ namespace ns3 {
 //-----------------------------------------------------------------------------
 class BufferTest : public TestCase {
 private:
-  void EnsureWrittenBytes (Buffer b, uint32_t n, uint8_t array[]);
+  void EnsureWrittenBytes (Buffer b, uint32_t n, uint8_t array[], const char *file, int line);
 public:
   virtual void DoRun (void);
   BufferTest ();
@@ -21,7 +21,7 @@ BufferTest::BufferTest ()
 }
 
 void
-BufferTest::EnsureWrittenBytes (Buffer b, uint32_t n, uint8_t array[])
+BufferTest::EnsureWrittenBytes (Buffer b, uint32_t n, uint8_t array[], const char *file, int line)
 {
   bool success = true;
   uint8_t *expected = array;
@@ -53,7 +53,7 @@ BufferTest::EnsureWrittenBytes (Buffer b, uint32_t n, uint8_t array[])
           failure << (uint16_t)got[j] << " ";
         }
       failure << std::endl;
-      NS_TEST_ASSERT_MSG_EQ(true, false, failure.str());
+      NS_TEST_ASSERT_MSG_EQ_INTERNAL(true, false, failure.str(), file, line);
     }
 }
 
@@ -64,7 +64,7 @@ BufferTest::EnsureWrittenBytes (Buffer b, uint32_t n, uint8_t array[])
 #define ENSURE_WRITTEN_BYTES(buffer, n, ...)			\
   {								\
     uint8_t bytes[] = {__VA_ARGS__};				\
-    EnsureWrittenBytes (buffer,	n, bytes);			\
+    EnsureWrittenBytes (buffer,	n, bytes, __FILE__, __LINE__);	\
   }
 
 void