commit 0d2ed2ee77275d94ad31540215ebebe600fec62c
author Spyridon Mastorakis <spiros.mastorakis@gmail.com> Mon Jul 27 19:09:12 2015 -0700
committer Spyridon Mastorakis <spiros.mastorakis@gmail.com> Mon Aug 10 21:07:15 2015 -0700
tree 3fa0339c2847643938edc2b2a4b2437010d3459d
parent 6f35a0f05b359d1775276f775fe0e79ff8cce16b

Enhance exception throwing with Boost Exception library

Change-Id: I471023fc23ffaebe04d9668426b4c1b03e4962ba
Refs: #2997

tests/unit-tests/security/dummy-keychain.cpp

diff --git a/tests/unit-tests/security/dummy-keychain.cpp b/tests/unit-tests/security/dummy-keychain.cpp
index 58f3b9e..c7e7a10 100644
--- a/tests/unit-tests/security/dummy-keychain.cpp
+++ b/tests/unit-tests/security/dummy-keychain.cpp
@@ -333,14 +333,14 @@
 DummyTpm::decryptInTpm(const uint8_t* data, size_t dataLength, const Name& keyName,
                        bool isSymmetric)
 {
-  throw Error("Not supported");
+  BOOST_THROW_EXCEPTION(Error("Not supported"));
 }
 
 ConstBufferPtr
 DummyTpm::encryptInTpm(const uint8_t* data, size_t dataLength, const Name& keyName,
                        bool isSymmetric)
 {
-  throw Error("Not supported");
+  BOOST_THROW_EXCEPTION(Error("Not supported"));
 }
 
 void
@@ -369,7 +369,7 @@
 ConstBufferPtr
 DummyTpm::exportPrivateKeyPkcs8FromTpm(const Name& keyName)
 {
-  throw Error("Not supported");
+  BOOST_THROW_EXCEPTION(Error("Not supported"));
 }
 
 bool

tests/unit-tests/util/signal.t.cpp

diff --git a/tests/unit-tests/util/signal.t.cpp b/tests/unit-tests/util/signal.t.cpp
index 41750c2..153ad91 100644
--- a/tests/unit-tests/util/signal.t.cpp
+++ b/tests/unit-tests/util/signal.t.cpp
@@ -405,14 +405,14 @@
 {
   SignalOwner0 so;
 
-  struct HandlerError
+  struct HandlerError : public std::exception
   {
   };
 
   int hit = 0;
   so.sig.connect([&] {
     ++hit;
-    throw HandlerError();
+    BOOST_THROW_EXCEPTION(HandlerError());
   });
 
   BOOST_CHECK_THROW(so.emitSignal(sig), HandlerError);

tests/unit-tests/util/simple-notification.hpp

diff --git a/tests/unit-tests/util/simple-notification.hpp b/tests/unit-tests/util/simple-notification.hpp
index 1d22a2a..66e4641 100644
--- a/tests/unit-tests/util/simple-notification.hpp
+++ b/tests/unit-tests/util/simple-notification.hpp
@@ -77,7 +77,7 @@
 
     // error for testing
     if (!m_message.empty() && m_message[0] == '\x07')
-      throw tlv::Error("0x07 error");
+      BOOST_THROW_EXCEPTION(tlv::Error("0x07 error"));
   }
 
 public: