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

diff --git a/testing/_PDCLIB_test.h b/testing/_PDCLIB_test.h
index 4eaa9d2..aacd704 100644
--- a/testing/_PDCLIB_test.h
+++ b/testing/_PDCLIB_test.h
@@ -12,9 +12,12 @@
 
 #include <stdio.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";
+
+/* Temporary file names */
 static char const testfile[]="testing/testfile";
 static char const testfile1[]="testing/testfile1";
 static char const testfile2[]="testing/testfile2";
@@ -23,14 +26,40 @@ 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 )
 #else
 #define TESTCASE_NOREG( x )
 #endif
+
+/* ...printf() tests */
+#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
+#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 )
+
+/* ...scanf() tests */
+/* TODO: t.b.d. */