Changeset 481 for library/tests/mat_checks.h

Timestamp:

08/06/09 13:38:17 (15 years ago)

Author:

vbarta

Message:

doubled tolerance computed from variance, repeating failing tests (at most) 3 times; epdf tests pass

Files:

• library/tests/mat_checks.h (modified) (5 diffs)

library/tests/mat_checks.h

@@ -16 +16 @@
 #include "../bdm/itpp_ext.h"
 #include "UnitTest++.h"
+#include <string>
 
 namespace UnitTest {
@@ -52 +53 @@
 }
 
-/*! CHECK_EQUAL_EX and CHECK_CLOSE_EX macros should be used only in
-  blocks having an instance of this class (which sets the globals for
-  error reporting). */
+/*! CHECK_*_EX macros should be used only in blocks having an instance
+  of this class (which sets the globals for error reporting). */
 class CurrentContext {
+public:
+        // how many times to repeat a failing test before reporting
+        // failure
+        static const int max_trial_count = 3;
+
 private:
         static const char *config_name;
@@ -65 +70 @@
         ~CurrentContext();
 
+        /* Should be called only in blocks having an instance of
+           CurrentContext. The argument, when not default, should be
+           __LINE__ (and it is included in the returned string).
+        */
+        static std::string format_context( int ln = -1 );
+
         template<typename Expected, typename Actual>
         static void CheckEqualEx ( UnitTest::TestResults& results,
@@ -72 +83 @@
                 if ( ! ( expected == actual ) ) {
                         UnitTest::MemoryOutStream stream;
-                        stream << "error at " << config_name << '[' << index << "]: expected " << expected << " but was " << actual;
+                        stream << format_context() << "expected " << expected << " but was " << actual;
 
                         results.OnTestFailure ( details, stream.GetText() );
@@ -86 +97 @@
                 if ( !UnitTest::AreClose ( expected, actual, tolerance ) ) {
                         UnitTest::MemoryOutStream stream;
-                        stream << "error at " << config_name << '[' << index << "]: expected " << expected << " +/- " << tolerance << " but was " << actual;
+                        stream << format_context() << "expected " << expected << " +/- " << tolerance << " but was " << actual;
 
                         results.OnTestFailure ( details, stream.GetText() );