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

diff --git a/testing/_PDCLIB_test.h b/testing/_PDCLIB_test.h
index f39ce8a..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,34 +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 ); }
 
-#if defined( FPRINTF_FUNCTION )
-static char result_buffer[ 1000 ];
-#define RESULT_MISMATCH( act, exp ) \
-    rewind( act ), \
-    result_buffer[ fread( result_buffer, 1, strlen( exp ) + 1, act ) ] = '\0', \
-    rewind( act ), \
-    memcmp( result_buffer, exp, strlen( exp ) )
-#define RESULT_STRING( tgt ) result_buffer
-#elif defined( SPRINTF_FUNCTION )
-#define RESULT_MISMATCH( act, exp ) strcmp( act, exp ) != 0
-#define RESULT_STRING( tgt ) tgt
+/* TESTCASE_NOREG() - PDCLib-only test */
+#ifndef REGTEST
+    #define TESTCASE_NOREG( x ) TESTCASE( x )
+#else
+    #define TESTCASE_NOREG( x )
 #endif
 
-#define PRINTF_TEST( expected_rc, expected_string, format, ... ) { \
-        int actual_rc = testprintf( target, format, __VA_ARGS__ ); \
-        if ( ( actual_rc != expected_rc ) || \
-             ( RESULT_MISMATCH( target, expected_string ) ) ) \
-        { \
-            ++TEST_RESULTS; \
-            fprintf( stderr, "FAILED: " __FILE__ " (" _PDCLIB_FILEID "), line %d\n        expected %2d, \"%s\"\n        actual   %2d, \"%s\"\n", __LINE__, expected_rc, expected_string, actual_rc, RESULT_STRING( target ) ); \
-        } \
-    } while ( 0 )
+/* Include printf() / scanf() test macros if required */
 
-#ifndef REGTEST
-#define TESTCASE_NOREG( x ) TESTCASE( x )
-#else
-#define TESTCASE_NOREG( x )
+#if defined( _PDCLIB_FILEIO ) || defined( _PDCLIB_STRINGIO )
+#include "_PDCLIB_iotest.h"
 #endif
+