[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    koffice/kspread/tests
From:       Ariya Hidayat <ariya () kde ! org>
Date:       2004-09-26 14:28:32
Message-ID: 20040926142832.23D77126D3 () office ! kde ! org
[Download RAW message or body]

CVS commit by ariya: 

now failed test shows correctly the source file and line number


  M +6 -5      value_tester.cc   1.4
  M +2 -2      value_tester.h   1.2


--- koffice/kspread/tests/value_tester.h  #1.1:1.2
@@ -36,6 +36,6 @@ public:
 private:
   template<typename T>
-  void check( const char* msg, const T& result, const T& expected );
-  void check( const char* msg, bool result, bool expected );
+  void check( const char *file, int line, const char* msg, const T& result, const T& expected );
+  void check( const char *file, int line, const char* msg, bool result, bool expected );
 };
 

--- koffice/kspread/tests/value_tester.cc  #1.3:1.4
@@ -25,5 +25,5 @@
 #include <kspread_value.h>
 
-#define CHECK(x,y)  check(#x,x,y)
+#define CHECK(x,y)  check(__FILE__,__LINE__,#x,x,y)
 
 using namespace KSpread;
@@ -39,5 +39,6 @@ QString ValueTester::name()
 
 template<typename T>
-void ValueTester::check( const char* msg, const T& result, const T& expected )
+void ValueTester::check( const char *file, int line, const char* msg, const T& result, 
+  const T& expected )
 {
   testCount++;
@@ -52,9 +53,9 @@ void ValueTester::check( const char* msg
     ts << "Expected:";
     ts << expected;
-    fail( __FILE__, __LINE__, message );
+    fail( file, line, message );
   }
 }
 
-void ValueTester::check( const char* msg, bool result, bool expected )
+void ValueTester::check( const char *file, int line, const char* msg, bool result, bool expected )
 {
   testCount++;
@@ -69,5 +70,5 @@ void ValueTester::check( const char* msg
     ts << "Expected: ";
     if( expected ) ts << "True"; else "False";
-    fail( __FILE__, __LINE__, message );
+    fail( file, line, message );
   }
 }


[prev in list] [next in list] [prev in thread] [next in thread]