Changeset 907 for library/tests

Timestamp:

04/19/10 12:44:57 (14 years ago)

Author:

mido

Message:

LOG LEVEL improved and hopefully finished

Location:

library/tests

Files:

• CMakeLists.txt (modified) (1 diff)
• testsuite/datasource_test.cpp (modified) (1 diff)
• testsuite/logger_test.cpp (modified) (4 diffs)

library/tests/CMakeLists.txt

@@ -1 +1 @@
 # Make sure the compiler can find include files from our Bdm library.
 include_directories (${BDM_SOURCE_DIR}/bdm)
-include_directories (./unittest-cpp)
+include_directories (${BDM_SOURCE_DIR}/tests/unittest-cpp)
 
 # Make sure the linker can find the Hello library once it is built.
 link_directories (${BDM_BINARY_DIR}/bdm)
-link_directories (./unittest-cpp)
+link_directories (${BDM_BINARY_DIR}/tests/unittest-cpp)
 
 SET(testutil_src general_suite.cpp general_suite.h epdf_harness.cpp epdf_harness.h mat_checks.cpp mat_checks.h 

library/tests/testsuite/datasource_test.cpp

@@ -8 +8 @@
 TEST ( EpdfDS_test ) {
         UIFile uif ( "epdfds.cfg" );
-
         shared_ptr<EpdfDS> ds = UI::build<EpdfDS> ( uif, "ds" );
 

library/tests/testsuite/logger_test.cpp

@@ -32 +32 @@
 }
 
+class log_tester : public root
+{
+        LOG_LEVEL(log_tester,logr,logth,logpol);
+public:
+        RV th, r;
+        int pol, i;
+
+        log_tester() {
+                th = RV ( "{alog blog }" );
+                r = RV ( "{r }", "2" );
+                pol = 11;
+
+                log_level[logr] = true;
+                log_level[logth] = true;
+                log_level[logpol] = true;
+        }
+
+        void log_register( logger &L, const string prefix ) {
+                root::log_register( L, prefix );
+                L.add_vector( log_level, logr, r, prefix );
+                L.add_vector( log_level, logth, th, prefix );
+                L.add_setting( log_level, logpol, prefix );
+        }
+
+        void log_write() const {
+                root::log_write();
+                log_level.store( logr, vec_2 ( ( double ) i, ( double ) ( i + 1 ) ) );
+                log_level.store( logth, vec_2 ( ( double ) ( 100 - i ), ( double ) ( i - 50 ) ) );
+                log_level.store( logpol, pol );
+        }
+
+};
+
 TEST ( memlog_test ) {
-        RV th = RV ( "{alog blog }" );
-        RV r = RV ( "{r }", "2" );
-
         string ls ( "memlog_test" );
         remove_all ( ls.c_str() );
@@ -41 +71 @@
         memlog logger ( 100, ls );
 
-        int pol = 11;
 
-        int rid = logger.add_vector ( r, "" );
-        int thid = logger.add_vector ( th, "th" );
-        int polid = logger.add_setting ( "pols" );
-
+        log_tester tester;
+        tester.log_register( logger, "memlog" );
+        
         logger.init();
 
-        for ( int i = 0; i < 10; i++ ) {
-                logger.log_vector ( rid, vec_2 ( ( double ) i, ( double ) ( i + 1 ) ) );
-                logger.log_vector ( thid, vec_2 ( ( double ) ( 100 - i ), ( double ) ( i - 50 ) ) );
-                UI::save ( pol, logger.log_to_setting ( polid ), "polozka" );
+        for ( tester.i = 0; tester.i < 10; tester.i++ ) {
+                tester.log_write();
                 logger.step();
         }
@@ -63 +89 @@
 
 TEST ( dirfilelog_test ) {
-        RV th = RV ( "{alog blog }" );
-        RV r = RV ( "{r }", "2" );
+
 
         string ls ( "exp" );
@@ -71 +96 @@
         remove_all ( "dirfilelog_files" );
 
-        dirfilelog L ( "dirfilelog_files", 10 );
+        dirfilelog logger ( "dirfilelog_files", 10 );
 
-        int rid = L.add_vector ( r, "" );
-        int thid = L.add_vector ( th, "th" );
+        log_tester tester;
+        tester.log_register( logger, "dirfilelog" );    
 
-        L.init();
+        logger.init();
 
-        for ( int i = 0; i < 150; i++ ) {
-                L.log_vector ( rid, vec_2 ( ( double ) i, ( double ) ( i + 1 ) ) );
-                L.log_vector ( thid, vec_2 ( ( double ) ( 100 - i ), ( double ) ( i - 50 ) ) );
-                L.step();
+        for ( tester.i = 0; tester.i < 150; tester.i++ ) {
+                tester.log_write();
+                logger.step();
         }
 
-        L.finalize();
+        logger.finalize();
 
         std::string expected ( load_test_file ( "logger_test_dirfile_format.matrix" ) );