Changeset 456

Timestamp:

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

Author:

vbarta

Message:

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

Location:

library/tests

Files:

• egamma_test.cpp (modified) (2 diffs)
• egiw.cfg (modified) (1 diff)
• egiw_harness.cpp (modified) (2 diffs)
• egiw_harness.h (modified) (1 diff)
• egiw_test.cpp (modified) (2 diffs)
• enorm.cfg (modified) (4 diffs)
• enorm_test.cpp (modified) (3 diffs)
• epdf_harness.cpp (modified) (5 diffs)
• epdf_harness.h (modified) (2 diffs)
• mat_checks.cpp (modified) (1 diff)
• mat_checks.h (modified) (1 diff)
• mepdf.cfg (modified) (1 diff)
• mepdf_test.cpp (modified) (1 diff)
• mgamma.cfg (modified) (1 diff)
• mgamma_test.cpp (modified) (1 diff)
• mpdf_harness.cpp (modified) (3 diffs)
• mpdf_harness.h (modified) (1 diff)
• square_mat_stress.cpp (modified) (2 diffs)
• square_mat_test.cpp (modified) (1 diff)
• unittest-cpp/TestDetails.cpp (modified) (1 diff)
• unittest-cpp/TestDetails.h (modified) (2 diffs)
• unittest-cpp/TestReporterStdout.cpp (modified) (1 diff)

library/tests/egamma_test.cpp

@@ -1 +1 @@
 #define BDMLIB // not an ideal way to prevent double registration of UI factories...
-#include "base/bdmbase.h"
 #include "base/user_info.h"
 #include "stat/exp_family.h"
-#include "itpp_ext.h"
 #include "epdf_harness.h"
-#include "mat_checks.h"
 #include "UnitTest++.h"
 
@@ -15 +12 @@
 
 TEST(test_egamma) {
-    RV::clear_all();
-    UIFile in("egamma.cfg");
-    Array<epdf_harness *> input;
-    UI::get(input, in, "data");
-    int sz = input.size();
-    CHECK(sz > 0);
-    for (int i = 0; i < sz; ++i) {
-        input(i)->test();
-    }
+    epdf_harness::test_config("egamma.cfg");
 }

library/tests/egiw.cfg

@@ -13 +13 @@
   };
   mean = [ 1.1, 0.1 ];
-  lognc = 11.45368;
+  lognc = 3.39463;
   variance = [ 0.01, 8e-05 ];
   support = ( "matrix", 2, 2, [ -2.0, 4.0, 0.01, 2.0 ] );
   nbins = [ 100, 200 ];
   integral = 1.0;
+  tolerance = 0.2;
 },
 {

library/tests/egiw_harness.cpp

@@ -4 +4 @@
 #include "test_util.h"
 #include "UnitTest++.h"
-
-const double epsilon = 0.00001;
-
-namespace UnitTest
-{
-
-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());
-    }
-}
-
-}
 
 namespace bdm {
@@ -41 +12 @@
 }
 
-void egiw_harness::test()
+void egiw_harness::test(const char *config_name, int idx)
 {
-    epdf_harness::test();
+    epdf_harness::test(config_name, idx);
+
+    CurrentContext cc(config_name, idx);
 
     egiw *wide = dynamic_cast<egiw *>(get_epdf());
     CHECK(wide);
 
-    CHECK_CLOSE(lognc, wide->lognc(), epsilon);
+    CHECK_CLOSE_EX(lognc, wide->lognc(), get_tolerance());
 }
 

library/tests/egiw_harness.h

@@ -27 +27 @@
     egiw_harness():lognc(0) { }
 
-    void test();
+    void test(const char *config_name, int idx);
 
     void from_setting(const Setting &set);

library/tests/egiw_test.cpp

@@ -11 +11 @@
 const double epsilon = 0.00001;
 
-namespace UnitTest
-{
-
-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());
-    }
-}
-
-}
-
 using namespace bdm;
 
@@ -38 +22 @@
 
 TEST(test_egiw) {
-    RV::clear_all();
-    UIFile in("egiw.cfg");
-    Array<epdf_harness *> input;
-    UI::get(input, in, "data");
-    int sz = input.size();
-    CHECK(sz > 0);
-    for (int i = 0; i < sz; ++i) {
-        input(i)->test();
-    }
+    epdf_harness::test_config("egiw.cfg");
 }
 

library/tests/enorm.cfg

@@ -21 +21 @@
       names = ( "x" );
     };
-
+  tolerance = 0.2;
 },
 {
@@ -41 +41 @@
   nbins = [ 200, 200 ];
   integral = 1.0;
+  tolerance = 0.5;
 },
 {
@@ -58 +59 @@
   variance = [ 1 ];
   R = 1.0;
+  tolerance = 0.5;
 },
 {
@@ -105 +107 @@
   variance = [ 2.0, 0.5 ];
   R = ( "matrix", 2, 2, [ 2.0, 0.0, 0.0, 0.5 ] );
+  tolerance = 0.5;
 } );
 

library/tests/enorm_test.cpp

@@ -2 +2 @@
 #include "stat/exp_family.h"
 #include "epdf_harness.h"
-#include "mat_checks.h"
-#include "test_util.h"
 #include "UnitTest++.h"
 
@@ -9 +7 @@
 
 const double epsilon = 0.00001;
-
-namespace UnitTest
-{
-
-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());
-    }
-}
-
-}
 
 template<>
@@ -50 +21 @@
 
 TEST(test_enorm) {
-    RV::clear_all();
-    UIFile in("enorm.cfg");
-    Array<epdf_harness *> input;
-    UI::get(input, in, "data");
-    int sz = input.size();
-    CHECK(sz > 0);
-    for (int i = 0; i < sz; ++i) {
-        input(i)->test();
-    }
+    epdf_harness::test_config("enorm.cfg");
 }

library/tests/epdf_harness.cpp

@@ -1 +1 @@
 #include "epdf_harness.h"
+#include "base/bdmbase.h"
+#include "base/user_info.h"
 #include "stat/exp_family.h"
 #include "mat_checks.h"
 #include "test_util.h"
 #include "UnitTest++.h"
-
-const double epsilon = 0.00001;
-
-namespace UnitTest
-{
-
-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());
-    }
-}
-
-}
 
 namespace bdm {
@@ -39 +12 @@
 const ParticularUI<epdf_harness> &ParticularUI<epdf_harness>::factory(
     ParticularUI<epdf_harness>("epdf_harness"));
+
+void epdf_harness::test_config(const char *config_file_name) {
+    RV::clear_all();
+
+    UIFile in(config_file_name);
+    Array<epdf_harness *> input;
+    UI::get(input, in, "data");
+    int sz = input.size();
+    CHECK(sz > 0);
+    for (int i = 0; i < sz; ++i) {
+        input(i)->test(config_file_name, i);
+    }
+}
 
 void epdf_harness::from_setting(const Setting &set) {
@@ -64 +50 @@
         UI::get(R, set, "R");
     }
+
+    if (set.exists("tolerance")) {
+        UI::get(tolerance, set, "tolerance");
+    }
 }
 
-void epdf_harness::test()
+void epdf_harness::test(const char *config_name, int idx)
 {
-    CHECK_CLOSE(mean, hepdf->mean(), epsilon);
-    CHECK_CLOSE(variance, hepdf->variance(), epsilon);
+    CurrentContext cc(config_name, idx);
+
+    CHECK_CLOSE_EX(mean, hepdf->mean(), tolerance);
+    CHECK_CLOSE_EX(variance, hepdf->variance(), tolerance);
 
     if (support.rows() == 2) {
@@ -85 +77 @@
         }
 
-        CHECK_CLOSE(mean, num_mean2(hepdf.get(), xb, yb, nbins(0), nbins(1)), 0.1);
-        CHECK_CLOSE(integral, normcoef(hepdf.get(), xb, yb, nbins(0), nbins(1)), 0.1);
+        CHECK_CLOSE_EX(mean, num_mean2(hepdf.get(), xb, yb, nbins(0), nbins(1)), 0.1);
+        CHECK_CLOSE_EX(integral, normcoef(hepdf.get(), xb, yb, nbins(0), nbins(1)), 0.1);
     }
 
@@ -94 +86 @@
         vec Emu = smp * ones(n) / n;
         mat Er = (smp*smp.transpose())/n - outer_product(Emu,Emu);
-        CHECK_CLOSE(mean, Emu, 0.1);
-        CHECK_CLOSE(R, Er, 0.1);
+        CHECK_CLOSE_EX(mean, Emu, tolerance);
+        CHECK_CLOSE_EX(R, Er, tolerance);
     }
 }

library/tests/epdf_harness.h

@@ -36 +36 @@
     double integral;
     mat R;
+    double tolerance;
 
 public:
-    epdf_harness():nsamples(1000), integral(0) { }
+    static void test_config(const char *config_file_name);
 
-    virtual void test();
+    epdf_harness():nsamples(1000), integral(0), tolerance(0.1) { }
+
+    virtual void test(const char *config_name, int idx);
 
     void from_setting(const Setting &set);
@@ -46 +49 @@
 protected:
     epdf *get_epdf() { return hepdf.get(); }
+
+    double get_tolerance() const { return tolerance; }
 };
 

library/tests/mat_checks.cpp

@@ -37 +37 @@
 
 }
+
+const char *CurrentContext::config_name = "???";
+
+int CurrentContext::index = -1;
+
+CurrentContext::CurrentContext(const char *name, int idx)
+{
+    config_name = name;
+    index = idx;
+}
+
+CurrentContext::~CurrentContext()
+{
+    config_name = "???";
+    index = -1;
+}

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

library/tests/mepdf.cfg

@@ -18 +18 @@
   mean = [ 1.1, -1.0 ];
   R = ( "matrix", 2, 2, [ 1.0, -0.5, -0.5, 2.0 ] );
+  tolerance = 0.3;
 } );
 

library/tests/mepdf_test.cpp

@@ -13 +13 @@
 const double epsilon = 0.00001;
 
-namespace UnitTest
-{
-
-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());
-    }
-}
-
-}
-
 TEST(test_mepdf) {
-    RV::clear_all();
-    UIFile in("mepdf.cfg");
-    Array<mpdf_harness *> input;
-    UI::get(input, in, "data");
-    int sz = input.size();
-    CHECK(sz > 0);
-    for (int i = 0; i < sz; ++i) {
-        input(i)->test();
-    }
+    mpdf_harness::test_config("mepdf.cfg");
 }
 

library/tests/mgamma.cfg

@@ -20 +20 @@
   mean = [ 1.5, 1.7 ];
   R = ( "matrix", 2, 2, [ 2.25, 0.0, 0.0, 2.89 ] );
+  tolerance = 0.5;
 } );
 

library/tests/mgamma_test.cpp

@@ -15 +15 @@
 
 TEST(test_mgamma) {
-    RV::clear_all();
-    UIFile in("mgamma.cfg");
-    Array<mpdf_harness *> input;
-    UI::get(input, in, "data");
-    int sz = input.size();
-    CHECK(sz > 0);
-    for (int i = 0; i < sz; ++i) {
-        input(i)->test();
-    }
+    mpdf_harness::test_config("mgamma.cfg");
 }

library/tests/mpdf_harness.cpp

@@ -1 +1 @@
 #include "mpdf_harness.h"
+#include "base/bdmbase.h"
+#include "base/user_info.h"
 #include "stat/exp_family.h"
 #include "mat_checks.h"
 #include "test_util.h"
 #include "UnitTest++.h"
-
-const double epsilon = 0.00001;
-
-namespace UnitTest
-{
-
-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());
-    }
-}
-
-}
 
 namespace bdm {
@@ -39 +12 @@
 const ParticularUI<mpdf_harness> &ParticularUI<mpdf_harness>::factory(
     ParticularUI<mpdf_harness>("mpdf_harness"));
+
+void mpdf_harness::test_config(const char *config_file_name) {
+    RV::clear_all();
+
+    UIFile in(config_file_name);
+    Array<mpdf_harness *> input;
+    UI::get(input, in, "data");
+    int sz = input.size();
+    CHECK(sz > 0);
+    for (int i = 0; i < sz; ++i) {
+        input(i)->test(config_file_name, i);
+    }
+}
 
 void mpdf_harness::from_setting(const Setting &set) {
@@ -50 +36 @@
 
     UI::get(R, set, "R");
+
+    if (set.exists("tolerance")) {
+        UI::get(tolerance, set, "tolerance");
+    }
 }
 
-void mpdf_harness::test()
+void mpdf_harness::test(const char *config_name, int idx)
 {
+    CurrentContext cc(config_name, idx);
+
     mat smp = hmpdf->samplecond_m(cond, nsamples);
     int n = smp.cols();
-    vec Emu = smp * ones(n) / n;
-    mat Er = (smp*smp.transpose())/n - outer_product(Emu,Emu);
-    CHECK_CLOSE(mean, Emu, 0.1);
-    CHECK_CLOSE(R, Er, 0.1);
+    vec emu = smp * ones(n) / n;
+    mat er = (smp * smp.T()) / n - outer_product(emu, emu);
+    CHECK_CLOSE_EX(mean, emu, tolerance);
+    CHECK_CLOSE_EX(R, er, tolerance);
 }
 

library/tests/mpdf_harness.h

@@ -33 +33 @@
     int nsamples;
     mat R;
+    double tolerance;
 
 public:    
-    mpdf_harness():nsamples(1000) { }
+    static void test_config(const char *config_file_name);
 
-    virtual void test();
+    mpdf_harness():nsamples(1000), tolerance(0.1) { }
+
+    virtual void test(const char *config_name, int idx);
 
     void from_setting(const Setting &set);

library/tests/square_mat_stress.cpp

@@ -1 +1 @@
 #include "../bdm/math/square_mat.h"
 #include "../bdm/math/chmat.h"
-#include "mat_checks.h"
 #include "UnitTest++.h"
 #include "TestReporterStdout.h"
@@ -19 +18 @@
 namespace UnitTest
 {
+
+// can't include mat_checks.h because CheckClose is different in this file
+extern bool AreClose(const itpp::vec &expected, const itpp::vec &actual,
+                     double tolerance);
+
+extern bool AreClose(const itpp::mat &expected, const itpp::mat &actual,
+                     double tolerance);
 
 void CheckClose(TestResults &results, const itpp::mat &expected,

library/tests/square_mat_test.cpp

@@ -6 +6 @@
 
 const double epsilon = 0.00001;
-
-bool fast = false;
-
-namespace UnitTest
-{
-
-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());
-    }
-}
-
-}
 
 template<typename TMatrix>

library/tests/unittest-cpp/TestDetails.cpp

@@ -3 +3 @@
 namespace UnitTest {
 
-TestDetails::TestDetails(char const* testName_, char const* suiteName_, char const* filename_, int lineNumber_)
+TestDetails::TestDetails(char const* testName_, char const* suiteName_, char const* filename_, int lineNumber_, bool useFilename_)
     : suiteName(suiteName_)
     , testName(testName_)
     , filename(filename_)
     , lineNumber(lineNumber_)
+    , useFilename(useFilename_)
 {
 }
 
-TestDetails::TestDetails(const TestDetails& details, int lineNumber_)
+TestDetails::TestDetails(const TestDetails& details, int lineNumber_, bool useFilename_)
     : suiteName(details.suiteName)
     , testName(details.testName)
     , filename(details.filename)
     , lineNumber(lineNumber_)
+    , useFilename(useFilename_)
 {
 }

library/tests/unittest-cpp/TestDetails.h

@@ -7 +7 @@
 {
 public:
-    TestDetails(char const* testName, char const* suiteName, char const* filename, int lineNumber);
-    TestDetails(const TestDetails& details, int lineNumber);
+    TestDetails(char const* testName, char const* suiteName, char const* filename, int lineNumber, bool useFilename = true);
+    TestDetails(const TestDetails& details, int lineNumber, bool useFilename = true);
 
     char const* const suiteName;
@@ -14 +14 @@
     char const* const filename;
     int const lineNumber;
+    bool const useFilename;
 
     TestDetails(TestDetails const&); // Why is it public? --> http://gcc.gnu.org/bugs.html#cxx_rvalbind

library/tests/unittest-cpp/TestReporterStdout.cpp

@@ -19 +19 @@
 #endif
 
-        using namespace std;
-    printf(errorFormat, details.filename, details.lineNumber, details.testName, failure);
+    using namespace std;
+
+    if (details.useFilename) {
+        // standard way
+        printf(errorFormat, details.filename, details.lineNumber, details.testName, failure);
+    } else { 
+        // extended for BDM - the failure string already includes
+        // (custom) test location info
+        printf("%s\n", failure);
+    }
 }