X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=testing%2F_PDCLIB_test.h;h=f380e61d5515402373d99244b6b72fb81134c72e;hb=c66f50d5348b47287f498184a3c2033bfa8d0576;hp=4eaa9d284333531d824f39c824d462cc03840efe;hpb=35ae2c90b1e06be0b78a67a11c1f14c71f547a40;p=pdclib.old

diff --git a/testing/_PDCLIB_test.h b/testing/_PDCLIB_test.h
index 4eaa9d2..f380e61 100644
--- a/testing/_PDCLIB_test.h
+++ b/testing/_PDCLIB_test.h
@@ -11,10 +11,21 @@
 /* -------------------------------------------------------------------------- */
 
 #include <stdio.h>
+#include <limits.h>
+#include <string.h>
+#include <assert.h>
+#include <wchar.h>
 
+/* Some strings used for <string.h> and <stdlib.h> testing. */
 static char const abcde[] = "abcde";
 static char const abcdx[] = "abcdx";
 static char const teststring[] = "1234567890\nABCDEFGHIJKLMNOPQRSTUVWXYZ\nabcdefghijklmnopqrstuvwxyz\n";
+
+static wchar_t const wabcde[] = L"abcde";
+static wchar_t const wabcdx[] = L"abcdx";
+static wchar_t const wteststring[] = L"1234567890\nABCDEFGHIJKLMNOPQRSTUVWXYZ\nabcdefghijklmnopqrstuvwxyz\n";
+
+/* Temporary file names */
 static char const testfile[]="testing/testfile";
 static char const testfile1[]="testing/testfile1";
 static char const testfile2[]="testing/testfile2";
@@ -23,14 +34,20 @@ static char const testfile2[]="testing/testfile2";
 
 static int TEST_RESULTS = 0;
 
+/* TESTCASE() - generic test */
 #define TESTCASE( x ) if ( x ) {} \
                       else { TEST_RESULTS += 1; printf( "FAILED: " __FILE__ ", line %d - %s\n", __LINE__, #x ); }
 
-#define TESTCASE_SPRINTF( x ) if ( strcmp( target, x ) == 0 ) {} \
-                              else { TEST_RESULTS += 1; printf( "FAILED: " __FILE__ " (" _PDCLIB_FILEID "), line %d - \"%s\" != \"%s\"\n", __LINE__, target, x ); }
-
+/* TESTCASE_NOREG() - PDCLib-only test */
 #ifndef REGTEST
-#define TESTCASE_NOREG( x ) TESTCASE( x )
+    #define TESTCASE_NOREG( x ) TESTCASE( x )
 #else
-#define TESTCASE_NOREG( x )
+    #define TESTCASE_NOREG( x )
 #endif
+
+/* Include printf() / scanf() test macros if required */
+
+#if defined( _PDCLIB_FILEIO ) || defined( _PDCLIB_STRINGIO )
+#include "_PDCLIB_iotest.h"
+#endif
+