X-Git-Url: https://ginac.de/CLN/cln.git//cln.git?a=blobdiff_plain;f=tests%2Ftest.h;h=3df9f9a5e70eef688ab26d755b9483cea9afb374;hb=320ec424c5b34df724fc4b163d3a43c98361e621;hp=ae3c3c448604bcc03cf1c42ebd8d53b7e1262eba;hpb=dd9e0f894eec7e2a8cf85078330ddc0a6639090b;p=cln.git

diff --git a/tests/test.h b/tests/test.h
index ae3c3c4..3df9f9a 100644
--- a/tests/test.h
+++ b/tests/test.h
@@ -1,76 +1,43 @@
-#include <cl_io.h>
+#include <cln/io.h>
+using namespace std;
+using namespace cln;
 
 #define ASSERT(expr)  \
   if (!(expr)) {					\
-	fprint(cl_stderr,"Assertion failed! File ");	\
-	fprint(cl_stderr,__FILE__);			\
-	fprint(cl_stderr,", line ");			\
-	fprintdecimal(cl_stderr,__LINE__);		\
-	fprint(cl_stderr,".\n");			\
+	std::cerr << "Assertion failed! File " << __FILE__ << ", line " << __LINE__ << endl;	\
 	error = 1;					\
   }
 
 #define ASSERT1(expr,a)  \
   if (!(expr)) {					\
-	fprint(cl_stderr,"Assertion failed! File ");	\
-	fprint(cl_stderr,__FILE__);			\
-	fprint(cl_stderr,", line ");			\
-	fprintdecimal(cl_stderr,__LINE__);		\
-	fprint(cl_stderr,".\n");			\
-	fprint(cl_stderr,#a" = ");			\
-	fprint(cl_stderr,a);				\
-	fprint(cl_stderr,"\n");				\
+	std::cerr << "Assertion failed! File " << __FILE__ << ", line " << __LINE__ << endl;	\
+	std::cerr << #a" = " << a << endl;			\
 	error = 1;					\
   }
 
 #define ASSERT2(expr,a,b)  \
   if (!(expr)) {					\
-	fprint(cl_stderr,"Assertion failed! File ");	\
-	fprint(cl_stderr,__FILE__);			\
-	fprint(cl_stderr,", line ");			\
-	fprintdecimal(cl_stderr,__LINE__);		\
-	fprint(cl_stderr,".\n");			\
-	fprint(cl_stderr,#a" = ");			\
-	fprint(cl_stderr,a);				\
-	fprint(cl_stderr,"\n"#b" = ");			\
-	fprint(cl_stderr,b);				\
-	fprint(cl_stderr,"\n");				\
+	std::cerr << "Assertion failed! File " << __FILE__ << ", line " << __LINE__ << endl;	\
+	std::cerr << #a" = " << a << endl;			\
+	std::cerr << #b" = " << b << endl;			\
 	error = 1;					\
   }
 
 #define ASSERT3(expr,a,b,c)  \
   if (!(expr)) {					\
-	fprint(cl_stderr,"Assertion failed! File ");	\
-	fprint(cl_stderr,__FILE__);			\
-	fprint(cl_stderr,", line ");			\
-	fprintdecimal(cl_stderr,__LINE__);		\
-	fprint(cl_stderr,".\n");			\
-	fprint(cl_stderr,#a" = ");			\
-	fprint(cl_stderr,a);				\
-	fprint(cl_stderr,"\n"#b" = ");			\
-	fprint(cl_stderr,b);				\
-	fprint(cl_stderr,"\n"#c" = ");			\
-	fprint(cl_stderr,c);				\
-	fprint(cl_stderr,"\n");				\
+	std::cerr << "Assertion failed! File " << __FILE__ << ", line " << __LINE__ << endl;	\
+	std::cerr << #a" = " << a << endl;			\
+	std::cerr << #b" = " << b << endl;			\
+	std::cerr << #c" = " << c << endl;			\
 	error = 1;					\
   }
 
 #define ASSERT4(expr,a,b,c,d)  \
   if (!(expr)) {					\
-	fprint(cl_stderr,"Assertion failed! File ");	\
-	fprint(cl_stderr,__FILE__);			\
-	fprint(cl_stderr,", line ");			\
-	fprintdecimal(cl_stderr,__LINE__);		\
-	fprint(cl_stderr,".\n");			\
-	fprint(cl_stderr,#a" = ");			\
-	fprint(cl_stderr,a);				\
-	fprint(cl_stderr,"\n"#b" = ");			\
-	fprint(cl_stderr,b);				\
-	fprint(cl_stderr,"\n"#c" = ");			\
-	fprint(cl_stderr,c);				\
-	fprint(cl_stderr,"\n"#d" = ");			\
-	fprint(cl_stderr,d);				\
-	fprint(cl_stderr,"\n");				\
+	std::cerr << "Assertion failed! File " << __FILE__ << ", line " << __LINE__ << endl;	\
+	std::cerr << #a" = " << a << endl;			\
+	std::cerr << #b" = " << b << endl;			\
+	std::cerr << #c" = " << c << endl;			\
+	std::cerr << #d" = " << d << endl;			\
 	error = 1;					\
   }
-