Changeset 10766 for trunk/psLib

Timestamp:

Dec 15, 2006, 4:05:43 PM (20 years ago)

Author:

jhoblitt

Message:

fix usage of fabs() instead of fabsf() and fabsl() instead of fabs()
add got/expected diag() output to ok_[float|double]_tol() macros

File:

• trunk/psLib/test/pstap/src/pstap.h (modified) (2 diffs)

trunk/psLib/test/pstap/src/pstap.h

@@ -16 +16 @@
            // use to test the value of a float
            # define ok_float(VALUE,EXPECT,COMMENT, ...)\
-           ok((fabs((VALUE)-(EXPECT)) < FLT_EPSILON), COMMENT, ## __VA_ARGS__);
+           ok((fabsf((VALUE)-(EXPECT)) < FLT_EPSILON), COMMENT, ## __VA_ARGS__);
 
 // use to test the value of a double
 # define ok_double(VALUE,EXPECT,COMMENT, ...)\
-ok((fabsl((VALUE)-(EXPECT)) < DBL_EPSILON), COMMENT, ## __VA_ARGS__);
+ok((fabs((VALUE)-(EXPECT)) < DBL_EPSILON), COMMENT, ## __VA_ARGS__);
 
 // use to test the value of a float within a defined tolerance
 # define ok_float_tol(VALUE,EXPECT,TOL,COMMENT, ...)\
-ok((fabs((VALUE)-(EXPECT)) < (TOL)), COMMENT, ## __VA_ARGS__);
+{ \
+    bool status = (fabsf((VALUE) - (EXPECT)) < (TOL)); \
+    ok(status, COMMENT, ## __VA_ARGS__); \
+    if (!status) { \
+        diag("         got: '%f'", VALUE); \
+        diag("    expected: '%f'", EXPECT); \
+    } \
+}
 
 // use to test the value of a double within a defined tolerance
 # define ok_double_tol(VALUE,EXPECT,TOL,COMMENT, ...)\
-ok((fabsl((VALUE)-(EXPECT)) < (TOL)), COMMENT, ## __VA_ARGS__);
+{ \
+    bool status = (fabs((VALUE) - (EXPECT)) < (TOL)); \
+    ok(status, COMMENT, ## __VA_ARGS__); \
+    if (!status) { \
+        diag("         got: '%f'", VALUE); \
+        diag("    expected: '%f'", EXPECT); \
+    } \
+}
 
 # define ok_str(VALUE, EXPECT, COMMENT, ...) \
@@ -54 +68 @@
 // use to test the value of a float
 # define ok_float(VALUE,EXPECT, ...)\
-ok((fabs((VALUE)-(EXPECT)) < FLT_EPSILON), __VA_ARGS__);
+ok((fabsf((VALUE)-(EXPECT)) < FLT_EPSILON), __VA_ARGS__);
 
 // use to test the value of a double
 # define ok_double(VALUE,EXPECT, ...)\
-ok((fabsl((VALUE)-(EXPECT)) < DBL_EPSILON), __VA_ARGS__);
+ok((fabs((VALUE)-(EXPECT)) < DBL_EPSILON), __VA_ARGS__);
 
 // use to test the value of a float
 # define ok_float_tol(VALUE,EXPECT,TOL, ...)\
-ok((fabs((VALUE)-(EXPECT)) < (TOL)), __VA_ARGS__);
+{ \
+    bool status = (fabsf((VALUE) - (EXPECT)) < (TOL)); \
+    ok(status, __VA_ARGS__); \
+    if (!status) { \
+        diag("         got: '%f'", VALUE); \
+        diag("    expected: '%f'", EXPECT); \
+    } \
+}
 
 // use to test the value of a double
 # define ok_double_tol(VALUE,EXPECT,TOL, ...)\
-ok((fabsl((VALUE)-(EXPECT)) < )(TOL)), __VA_ARGS__);
+{ \
+    bool status = (fabs((VALUE) - (EXPECT)) < (TOL)); \
+    ok(status, __VA_ARGS__); \
+    if (!status) { \
+        diag("         got: '%f'", VALUE); \
+        diag("    expected: '%f'", EXPECT); \
+    } \
+}
 
 # define ok_str(VALUE, EXPECT, ...) \