Changeset 456 for library/tests/mat_checks.h

Timestamp:

07/31/09 08:38:18 (16 years ago)

Author:

vbarta

Message:

custom test location for harness tests (extended UnitTest?++), configurable tolerance - all tests pass (most of the time)

Files:

• library/tests/mat_checks.h (modified) (1 diff)

library/tests/mat_checks.h

@@ -19 +19 @@
 namespace UnitTest
 {
-  bool AreClose(const itpp::vec &expected, const itpp::vec &actual,
-                double tolerance);
 
-  bool AreClose(const itpp::mat &expected, const itpp::mat &actual,
-                double tolerance);
+bool AreClose(const itpp::vec &expected, const itpp::vec &actual,
+              double tolerance);
+
+bool AreClose(const itpp::mat &expected, const itpp::mat &actual,
+              double tolerance);
+
+inline void CheckClose(TestResults &results, const itpp::vec &expected,
+                       const itpp::vec &actual, double tolerance,
+                       TestDetails const &details) {
+    if (!AreClose(expected, actual, tolerance)) { 
+        MemoryOutStream stream;
+        stream << "Expected " << expected << " +/- " << tolerance << " but was " << actual;
+
+        results.OnTestFailure(details, stream.GetText());
+    }
 }
 
+inline void CheckClose(TestResults &results, const itpp::mat &expected,
+                       const itpp::mat &actual, double tolerance,
+                       TestDetails const &details) {
+    if (!AreClose(expected, actual, tolerance)) { 
+        MemoryOutStream stream;
+        stream << "Expected " << expected << " +/- " << tolerance << " but was " << actual;
+
+        results.OnTestFailure(details, stream.GetText());
+    }
+}
+
+}
+
+/*! CHECK_CLOSE_EX macro should be used only in blocks having an
+  instance of this class (which sets the globals for error
+  reporting). */
+class CurrentContext
+{
+private:
+    static const char *config_name;
+    static int index;
+
+public:
+    // the pointer must stay valid for the lifetime of the object
+    CurrentContext(const char *name, int idx);
+    ~CurrentContext();
+
+    template< typename Expected, typename Actual, typename Tolerance >
+    static void CheckCloseEx(UnitTest::TestResults& results,
+                             Expected const& expected,
+                             Actual const& actual,
+                             Tolerance const& tolerance,
+                             UnitTest::TestDetails const& details) {
+        if (!UnitTest::AreClose(expected, actual, tolerance)) { 
+            UnitTest::MemoryOutStream stream;
+            stream << "error at " << config_name << '[' << index << "]: expected " << expected << " +/- " << tolerance << " but was " << actual;
+
+            results.OnTestFailure(details, stream.GetText());
+        }
+    }
+};
+
+#define CHECK_CLOSE_EX(expected, actual, tolerance) \
+    do \
+    { \
+        try { \
+            CurrentContext::CheckCloseEx(*UnitTest::CurrentTest::Results(), expected, actual, tolerance, UnitTest::TestDetails(*UnitTest::CurrentTest::Details(), 0, false)); \
+        } \
+        catch (...) { \
+            UnitTest::CurrentTest::Results()->OnTestFailure(UnitTest::TestDetails(*UnitTest::CurrentTest::Details(), __LINE__), \
+                    "Unhandled exception in CHECK_CLOSE(" #expected ", " #actual ")"); \
+        } \
+    } while (0)
+
 #endif