Reworked scanf() testing. General cleanups.

[fw/pdclib] / testing / _PDCLIB_test.h

diff --git a/testing/_PDCLIB_test.h b/testing/_PDCLIB_test.h
index aacd70454788266b67bf16784787548347b124c1..e6c0c75bb3f04cccf18030eef139af83544f32ae 100644 (file)
--- a/testing/_PDCLIB_test.h
+++ b/testing/_PDCLIB_test.h
@@ -11,6 +11,8 @@
 /* -------------------------------------------------------------------------- */
 
 #include <stdio.h>
+#include <limits.h>
+#include <string.h>
 
 /* Some strings used for <string.h> and <stdlib.h> testing. */
 static char const abcde[] = "abcde";
@@ -32,26 +34,32 @@ static int TEST_RESULTS = 0;
 
 /* 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
 
 /* ...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
+#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
 
-#define PRINTF_TEST( expected_rc, expected_string, format, ... ) { \
+#ifdef _PDCLIB_FILEIO
+#define PREP_RESULT_BUFFER char result_buffer[100];
+#else
+#define PREP_RESULT_BUFFER
+#endif
+
+#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 ) ) ) \
@@ -62,4 +70,24 @@ static char result_buffer[ 1000 ];
     } while ( 0 )
 
 /* ...scanf() tests */
-/* TODO: t.b.d. */
+#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 ) );
+#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 )
+