Changeset 425

Timestamp:

07/22/09 14:57:26 (15 years ago)

Author:

vbarta

Message:

moved logger test to testsuite, updated logger docs (a bit)

Location:

library

Files:

• bdm/base/loggers.h (modified) (3 diffs)
• tests/CMakeLists.txt (modified) (2 diffs)
• tests/dirfile-format.matrix (added)
• tests/loggers_test.cpp (modified) (1 diff)
• tests/test_user_info.cpp (modified) (2 diffs)
• tests/test_util.cpp (added)
• tests/test_util.h (added)

library/bdm/base/loggers.h

@@ -21 +21 @@
 
 /*!
-* \brief Logging into matrices in data format in memory
-
-* More?...
-*/
-
+ * Logging into matrices in data format in memory, optionally persisted into a file.
+ */
 class memlog : public logger {
 
@@ -71 +68 @@
         \code
         logger = {
-                type = "itpplog";
+                class = "memlog";
                 filename = "file_name.it"; // resulting filename with results in it format
                 maxlen = 100;          // size of memory buffer
@@ -115 +112 @@
         void write_buffers ( int Len );
 
-        // TODO dokumentace - aktualizovat
         /*! \brief UI for dirfilelog (Kst file format) 
         \code
         logger = {
-                type = "dirfilelog";
-                dirmane = "directory_for_files"; // resulting files will be stored there
+                class = "dirfilelog";
+                dirname = "directory_for_files"; // resulting files will be stored there
                 maxlen = 100;                    // size of memory buffer, when full results are written to disk
         }

library/tests/CMakeLists.txt

@@ -9 +9 @@
 # Add executable called "helloDemo" that is built from the source files
 # "demo.cxx" and "demo_b.cxx".  The extensions are automatically found.
-
-# BASIC EXECS
-EXEC(loggers_test)
 
 EXEC(chmat_test)
@@ -40 +37 @@
 
 # using UnitTest++
-add_executable(testsuite datalink_test.cpp rv_test.cpp testsuite.cpp test_user_info.cpp test_shared_ptr.cpp)
+add_executable(testsuite datalink_test.cpp loggers_test.cpp rv_test.cpp testsuite.cpp test_user_info.cpp test_util.cpp test_util.h test_shared_ptr.cpp)
 target_link_libraries(testsuite bdm itpp unittest)
 

library/tests/loggers_test.cpp

@@ -1 @@
-
+#define BDMLIB // not an ideal way to prevent double registration of UI factories...
 #include "base/loggers.h"
+#include "test_util.h"
+#include "UnitTest++.h"
+#include <string>
+#include <sys/stat.h>
+#include <sys/types.h>
 
 using namespace bdm;
 
-//These lines are needed for use of cout and endl
-using std::cout;
-using std::endl;
+TEST(test_dirfilelog)
+{
+    RV th = RV("{alog blog }");
+    RV r = RV("{r }", "2");
 
-int main()
-{
-        int i;
-        
-        RV th = RV ( "{a b }");
-        RV r = RV ( "{r }","2");
+    if (mkdir("exp", 0777)) {
+        remove_all("exp/dirfile");
+    }
 
-        dirfilelog L("exp/dirfile",10);
-        
-        int rid;
-        int thid;
-        
-        rid=L.add(r,"");
-        thid=L.add(th,"th");
-        
-        L.init();
+    dirfilelog L("exp/dirfile", 10);
 
-        for (i=0; i<150; i++){  
-                L.logit(rid,vec_2((double)i,(double)(i+1)));
-                L.logit(thid,vec_2((double)(100-i),(double)(i-50)));
-                L.step();
-        }
-        L.finalize();
+    int rid;
+    int thid;
+
+    rid = L.add(r, "");
+    thid = L.add(th, "th");
+
+    L.init();
+
+    for (int i = 0; i < 150; i++) {
+            L.logit(rid, vec_2((double)i, (double)(i + 1)));
+            L.logit(thid, vec_2((double)(100 - i), (double)(i - 50)));
+            L.step();
+    }
+
+    L.finalize();
+
+    std::string expected(load_test_file("dirfile-format.matrix"));
+    std::string actual(load_test_file("exp/dirfile/format"));
+    CHECK_EQUAL(expected, actual);
 }

library/tests/test_user_info.cpp

@@ -1 @@
-#include <fstream>
 #include <memory>
 #include <string>
 #include <string.h>
 #include "base/user_info.h"
+#include "test_util.h"
 #include "UnitTest++.h"
 
@@ -196 +196 @@
 UIREGISTER(Bike);
 
-// Non-general but simple file load - handles only files of limited
-// size which do not contain '\0' characters, but for testing that
-// should be enough.
-string load_test_file(const char *fname)
-{
-    char buffer[8192];
-    memset(buffer, 0, sizeof(buffer));
-    ifstream src(fname, ios_base::binary);
-    src.read(buffer, sizeof(buffer) - 1);
-    return string(buffer);
-}
-
 TEST(test_load)
 {