Changeset 721 for library/tests/testsuite

Timestamp:

11/13/09 09:15:50 (15 years ago)

Author:

mido

Message:

stresssuite - halfway point

Location:

library/tests/testsuite

Files:

• CMakeLists.txt (modified) (1 diff)
• emix_test.cpp (modified) (3 diffs)
• logger_test.cpp (modified) (2 diffs)
• logger_test.matrix (moved) (moved from library/tests/stresssuite/test_log.matrix)
• logger_test_dirfile_format.matrix (moved) (moved from library/tests/stresssuite/dirfile-format.matrix)
• pdf_test.cpp (modified) (2 diffs)
• testsuite.cpp (modified) (1 diff)
• user_info_matrix.cfg (moved) (moved from library/tests/testsuite/testUI_out.matrix)
• user_info_test.cpp (modified) (1 diff)

library/tests/testsuite/CMakeLists.txt

@@ -1 +1 @@
 # using UnitTest++
 
-SET(unit_test_configurations egiw.cfg mlnorm.cfg edirich.cfg mprod.cfg generator.cfg epdfds.cfg pdfds.cfg user_info_valid.cfg merger.cfg  egamma.cfg user_info_external.cfg   user_info_valid.cfg  user_info_erroneous.cfg merger_error.cfg mgamma.cfg enorm.cfg mmix.cfg emix.cfg)
+SET(unit_test_configurations egiw.cfg mlnorm.cfg edirich.cfg mprod.cfg generator.cfg epdfds.cfg pdfds.cfg user_info_valid.cfg merger.cfg  egamma.cfg user_info_external.cfg   user_info_valid.cfg user_info_matrix.cfg user_info_erroneous.cfg merger_error.cfg mgamma.cfg enorm.cfg mmix.cfg emix.cfg)
 
 add_executable(testsuite arx_straux_test.cpp datalink_test.cpp  datasource_test.cpp egiw_test.cpp emix_test.cpp epdf_test.cpp logger_test.cpp LQG_test.cpp merger_test.cpp pdf_test.cpp randun_test.cpp rectangular_support_test.cpp rv_test.cpp shared_ptr_test.cpp square_mat_test.cpp testsuite.cpp user_info_test.cpp  ${unit_test_configurations} )

library/tests/testsuite/emix_test.cpp

@@ -4 +4 @@
 #include "UnitTest++.h"
 #include "../test_util.h"
+#include "../pdf_harness.h"
+
 
 const double epsilon = 0.00001;
@@ -12 +14 @@
 
 static void check_covariance ( emix &distrib_obj, int nsamples, const mat &R, double tolerance);
+
+TEST ( emix_test ) {
+        pdf_harness::test_config ( "emix.cfg" );
+}
 
 TEST ( emix_1_test ) {
@@ -88 +94 @@
 }
 
-TEST ( emix_2_test ) {
-        int N = 10000; // number of samples
-        vec mu0 ( "1.5 1.7" );
-        mat V0 ( "1.2 0.3; 0.3 5" );
-        ldmat R = ldmat ( V0 );
-
-        enorm_ldmat_ptr eN;
-        eN->set_parameters ( mu0, R );
-
-        vec a = "100000,10000";
-        vec b = a / 10.0;
-        egamma_ptr eG;
-        eG->set_parameters ( a, b );
-
-        emix eMix;
-        epdf_array Coms ( 2 );
-        Coms ( 0 ) = eG;
-        Coms ( 1 ) = eN;
-
-        eMix.set_parameters ( vec_2 ( 0.5, 0.5 ), Coms );
-        check_mean ( eMix, N, eMix.mean(), 0.1 );
-}
 
 static void check_mean ( emix &distrib_obj, int nsamples, const vec &mean, double tolerance ) {

library/tests/testsuite/logger_test.cpp

@@ -54 +54 @@
         logger.finalize();
 
-        CHECK_EQUAL ( get_file_size ( "test_log.matrix" ), get_file_size ( ls.c_str() ) );
+        CHECK_EQUAL ( get_file_size ( "logger_test.matrix" ), get_file_size ( ls.c_str() ) );
 }
 
@@ -81 +81 @@
         L.finalize();
 
-        std::string expected ( load_test_file ( "dirfile-format.matrix" ) );
+        std::string expected ( load_test_file ( "logger_test_dirfile_format.matrix" ) );
         std::string actual ( load_test_file ( "exp/dirfile/format" ) );
         CHECK_EQUAL ( expected, actual );

library/tests/testsuite/pdf_test.cpp

@@ -8 +8 @@
 
 using namespace bdm;
-
-static void check_mean(pdf &distrib_obj, const vec &mu0, int nsamples, const vec &mean, double tolerance);
-
-static void check_covariance(mmix &distrib_obj, const vec &mu0, int nsamples, const mat &R, double tolerance);
 
 TEST ( mgamma_test ) {
@@ -28 +24 @@
         pdf_harness::test_config ( "mmix.cfg" );
 }
-
-TEST ( emix_test ) {
-        pdf_harness::test_config ( "emix.cfg" );
-}

library/tests/testsuite/testsuite.cpp

@@ -56 +56 @@
                 }
         } else {
-                cout << "usage: " << endl <<
-                     "\"" << argv[0] << "\" - to run all unit tests " << endl <<
-                     "\"" << argv[0] << " particular_test_1 particular_test_2\" - to run selected unit tests" << endl <<
-                     "\"" << argv[0] << " print\" - to print all the implemented unit tests" << endl;
+                cout << endl << "TESTSUITE - a program covering all BDM unit tests." << endl << endl 
+                     << argv[0] << " ....................................... run all unit tests" << endl 
+                     << argv[0] << " particular_test_1 particular_test_2 ... run selected unit tests" << endl 
+                     << argv[0] << " print ................................. print all the implemented unit tests" << endl;
         }
 

library/tests/testsuite/user_info_test.cpp

@@ -254 +254 @@
         UI::save ( &author, out, "karlovo" );
         UI::save ( pepikovo, out, "pepikovo" );
-        out.save ( "testUI_out.cfg" );
-
-        string expected ( load_test_file ( "testUI_out.matrix" ) );
-        string actual ( load_test_file ( "testUI_out.cfg" ) );
+        out.save ( "user_info_output.cfg" );
+
+        string expected ( load_test_file ( "user_info_matrix.cfg" ) );
+        string actual ( load_test_file ( "user_info_output.cfg" ) );
         CHECK_EQUAL ( expected, actual );
 }