X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=testing%2F_PDCLIB_test.h;h=056b80bc281ab3ff84a20a1e2a50fc7139cd663f;hb=f60269dfbb4671b3bea11d1257de54bef0c9ffef;hp=e6c0c75bb3f04cccf18030eef139af83544f32ae;hpb=a7a8d2f1c85c2d7760d4d3479e90466cc3a81b04;p=pdclib

diff --git a/testing/_PDCLIB_test.h b/testing/_PDCLIB_test.h
index e6c0c75..056b80b 100644
--- a/testing/_PDCLIB_test.h
+++ b/testing/_PDCLIB_test.h
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* PDCLib testing suite <_PDCLIB_test.h>
 
    This file is part of the Public Domain C Library (PDCLib).
@@ -13,12 +11,18 @@
 #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";
@@ -39,55 +43,9 @@ static int TEST_RESULTS = 0;
     #define TESTCASE_NOREG( x )
 #endif
 
-/* ...printf() tests */
-#if defined( _PDCLIB_FILEIO )
-    #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( _PDCLIB_STRINGIO )
-   #define RESULT_MISMATCH( act, exp ) strcmp( act, exp ) != 0
-   #define RESULT_STRING( tgt ) tgt
-#endif
-
-#ifdef _PDCLIB_FILEIO
-#define PREP_RESULT_BUFFER char result_buffer[100];
-#else
-#define PREP_RESULT_BUFFER
-#endif
+/* Include printf() / scanf() test macros if required */
 
-#define PRINTF_TEST( expected_rc, expected_string, format, ... ) do { \
-        PREP_RESULT_BUFFER \
-        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 )
-
-/* ...scanf() tests */
-#if defined( _PDCLIB_FILEIO )
-    #define PREPARE_SOURCE( input_string ) \
-        rewind( source ); \
-        fwrite( input_string, 1, sizeof( input_string ), source ); \
-        rewind( source );
-#elif defined( _PDCLIB_STRINGIO )
-    #define PREPARE_SOURCE( input_string ) \
-        memcpy( source, input_string, sizeof( input_string ) );
+#if defined( _PDCLIB_FILEIO ) || defined( _PDCLIB_STRINGIO )
+#include "_PDCLIB_iotest.h"
 #endif
 
-#define SCANF_TEST( expected_rc, input_string, format, ... ) do { \
-        int actual_rc; \
-        PREPARE_SOURCE( input_string ); \
-        actual_rc = testscanf( source, format, __VA_ARGS__ ); \
-        if ( actual_rc != expected_rc ) \
-        { \
-            ++TEST_RESULTS; \
-            fprintf( stderr, "FAILED: " __FILE__ " (" _PDCLIB_FILEID "), line %d\n        expected %2d,        actual   %2d\n", __LINE__, expected_rc, actual_rc ); \
-        } \
-    } while ( 0 )
-