Update of /cvsroot/opal/opal/src/external/quicktest
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13924/src/external/quicktest
Modified Files:
quicktest.h
Log Message:
More Unit tests. Finished opal::Quaternion tests.
Index: quicktest.h
===================================================================
RCS file: /cvsroot/opal/opal/src/external/quicktest/quicktest.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** quicktest.h 1 Dec 2005 02:04:54 -0000 1.4
--- quicktest.h 1 Dec 2005 23:55:21 -0000 1.5
***************
*** 98,101 ****
--- 98,127 ----
/// The group name of this test
std::string mTestGroup;
+
+ /// helper method
+ static bool areEqual(double x, double y)
+ {
+ const double EPSILON = 0.000001;
+ double maxVal = 1;
+
+ if (fabs(static_cast<double>(x)) > maxVal)
+ {
+ maxVal = fabs(x);
+ }
+
+ if (fabs(static_cast<double>(y)) > maxVal)
+ {
+ maxVal = fabs(static_cast<double>(y));
+ }
+
+ if (fabs(static_cast<double>(x - y)) <= EPSILON * maxVal)
+ {
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+ }
};
***************
*** 245,248 ****
--- 271,275 ----
{\
recordFailure(_result, __FILE__, __LINE__, #condition);\
+ return;\
}\
}
***************
*** 258,261 ****
--- 285,289 ----
<< std::endl << "(" << (value2) << ")";\
recordFailure(_result, __FILE__, __LINE__, oss.str());\
+ return;\
}\
}
***************
*** 270,273 ****
--- 298,302 ----
<< "value2 (" << (value2) << ")";\
recordFailure(_result, __FILE__, __LINE__, oss.str());\
+ return;\
}\
}
***************
*** 276,282 ****
/// the second parameter. This is useful for comparing floating point
/// values.
! #define QT_CHECK_CLOSE(value1, value2, tolerance)\
{\
! if (abs((value1)-(value2)) > tolerance)\
{\
std::ostringstream oss;\
--- 305,311 ----
/// the second parameter. This is useful for comparing floating point
/// values.
! #define QT_CHECK_CLOSE(value1, value2)\
{\
! if (areEqual((value1),(value2)) == false )\
{\
std::ostringstream oss;\
***************
*** 284,287 ****
--- 313,317 ----
<< "value2 (" << (value2) << ")";\
recordFailure(_result, __FILE__, __LINE__, oss.str());\
+ return;\
}\
}
***************
*** 296,299 ****
--- 326,330 ----
<< "value2 (" << (value2) << ")";\
recordFailure(_result, __FILE__, __LINE__, oss.str());\
+ return;\
}\
}
***************
*** 308,311 ****
--- 339,343 ----
<< "equal to " << "value2 (" << (value2) << ")";\
recordFailure(_result, __FILE__, __LINE__, oss.str());\
+ return;\
}\
}
***************
*** 320,323 ****
--- 352,356 ----
<< "value2 (" << (value2) << ")";\
recordFailure(_result, __FILE__, __LINE__, oss.str());\
+ return;\
}\
}
***************
*** 333,336 ****
--- 366,370 ----
<< "equal to " << "value2 (" << (value2) << ")";\
recordFailure(_result, __FILE__, __LINE__, oss.str());\
+ return;\
}\
}
***************
*** 340,343 ****
--- 374,378 ----
{\
recordFailure(_result, __FILE__, __LINE__, (message));\
+ return;\
}\
|
