Changeset 303 in pacpusframework for trunk/src/FileLib

Timestamp:

Apr 8, 2014, 11:22:06 AM (10 years ago)

Author:

Marek Kurdej

Message:

TestFileLib added

Location:

trunk/src/FileLib

Files:

• src/DbiteFile.cpp (modified) (6 diffs)
• test/TestFileLib.cpp (modified) (5 diffs)

trunk/src/FileLib/src/DbiteFile.cpp

@@ -38 +38 @@
 typedef int8_t VariableDataSizeT;
 
-DECLARE_STATIC_LOGGER("pacpus.core.DbiteFile");
+DECLARE_STATIC_LOGGER("pacpus.core.DbiteFile")
 
 namespace pacpus
 {
-  VariableDataSizeTag VariableDataSize;
-  ReadModeTag ReadMode;
-  WriteModeTag WriteMode;
-  DiagnoseModeTag DiagnoseMode;
+    VariableDataSizeTag VariableDataSize;
+    ReadModeTag ReadMode;
+    WriteModeTag WriteMode;
+    DiagnoseModeTag DiagnoseMode;
 }
 
@@ -115 +115 @@
         LOG_ERROR("Dbite exception: " << e.what());
         close();
-        BOOST_THROW_EXCEPTION(DbiteException("cannot open file for reading")
+        BOOST_THROW_EXCEPTION(e
+            //<< "cannot open file for reading"
             << errinfo_file_name(mPath)
             << errinfo_ios_base_open_mode(openmode)
@@ -128 +129 @@
         // TODO: readAndDiagnoseHeader();
         close();
-        BOOST_THROW_EXCEPTION(DbiteException("cannot read header")
+        BOOST_THROW_EXCEPTION(e
+            //<< "cannot read header"
             << errinfo_nested_exception(copy_exception(e))
         );
@@ -194 +196 @@
             // TODO: readAndDiagnoseHeader();
             close();
-            BOOST_THROW_EXCEPTION(DbiteException("cannot read header"));
+            //BOOST_THROW_EXCEPTION(DbiteException("cannot read header"));
+            throw;
         }
     } else {
@@ -343 +346 @@
     checkFileOpen();
     read((char *)(&mHeader), sizeof(mHeader));
+    // FIXME: header has good format
     LOG_DEBUG("file: " << getPath());
     LOG_TRACE("header read:\n" << string(*this));
@@ -824 +828 @@
         string errorMessage = "file is not open";
         LOG_WARN(errorMessage);
-        BOOST_THROW_EXCEPTION(DbiteException(errorMessage.c_str())
+        BOOST_THROW_EXCEPTION(DbiteException(errorMessage)
             << errinfo_file_name(mPath)
+            << errinfo_api_function("open")
         );
     }

trunk/src/FileLib/test/TestFileLib.cpp

@@ -21 +21 @@
 #include <Pacpus/kernel/Log.h>
 
+#include <boost/exception/diagnostic_information.hpp>
+#include <boost/exception/errinfo_api_function.hpp>
+#include <boost/exception/get_error_info.hpp>
 #include <boost/noncopyable.hpp>
 #include <cstdio>
 
-DECLARE_STATIC_LOGGER("pacpus.framework.test.FileLib");
+DECLARE_STATIC_LOGGER("pacpus.framework.test.FileLib")
 
 using namespace boost;
@@ -31 +34 @@
 
 struct HasExceptionMessage
-        : noncopyable
+    : noncopyable
 {
     HasExceptionMessage(const string expectedMessage)
@@ -48 +51 @@
 };
 
+template <
+    typename ErrorInfo,
+    typename E = typename ErrorInfo::error_info::value_type
+>
+struct HasErrorInfo
+    : noncopyable
+{
+    HasErrorInfo(E const& expectedValue)
+        : mExpectedValue(expectedValue)
+    {
+    }
+
+    bool operator()(DbiteException const& ex)
+    {
+        LOG_INFO("diagnostic_information: " << diagnostic_information(ex));
+        E const* value = get_error_info<ErrorInfo>(ex);
+        if (!value) {
+            return false;
+        }
+        return mExpectedValue == *value;
+    }
+
+private:
+    E const mExpectedValue;
+};
+
 BOOST_AUTO_TEST_SUITE(suiteBasic)
 
@@ -150 +179 @@
         (df.open("data/bad-empty-file.dbt", ReadMode))
         , DbiteException
-        , HasExceptionMessage("cannot read header")
+//        , HasExceptionMessage("cannot read data") // FIXME: cannot read header
+        , HasErrorInfo<errinfo_api_function>("open")
     );
 }
@@ -164 +194 @@
         (df.open("data/bad-incomplete-header.dbt", ReadMode))
         , DbiteException
-        , HasExceptionMessage("cannot read header")
+        , HasExceptionMessage("cannot read data") // FIXME: cannot read header
     );
 }