Changeset 315 in pacpusframework

Timestamp:

07/28/14 17:11:27 (10 years ago)

Author:

Marek Kurdej

Message:

TestFileLib: fixes on errinfo_api_function.

Location:

trunk/src/FileLib

Files:

• src/DbiteFile.cpp (modified) (1 diff)
• test/TestFileLib.cpp (modified) (1 diff)

trunk/src/FileLib/src/DbiteFile.cpp

@@ -129 +129 @@
         // TODO: readAndDiagnoseHeader();
         close();
-        BOOST_THROW_EXCEPTION(e
-            //<< "cannot read header"
+        BOOST_THROW_EXCEPTION(DbiteException("cannot read header")
+            << errinfo_api_function("open")
             << errinfo_nested_exception(copy_exception(e))
         );

trunk/src/FileLib/test/TestFileLib.cpp

@@ -77 +77 @@
 };
 
+template <typename ErrorInfo>
+struct HasErrorInfo<ErrorInfo, char const*>
+    : noncopyable
+{
+private:
+    typedef char const* E;
+public:
+    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 std::string(mExpectedValue) == std::string(*value);
+    }
+
+private:
+    E const mExpectedValue;
+};
+
 BOOST_AUTO_TEST_SUITE(suiteBasic)