Merge lp:~michihenning/unity-scopes-api/remove-to_string into lp:unity-scopes-api

[Michi Henning]

Replaced calls to to_string() with calls to what() for all
unity exceptions. The to_string() calls were a hangover
from the time when what() on unity::Exception only printed
the exception name, but not the full string.

Replaced calls to to_string() with calls to what() for all
unity exceptions. The to_string() calls were a hangover
from the time when what() on unity::Exception only printed
the exception name, but not the full string.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:150
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-ci/287/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-trusty-amd64-ci/287
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-trusty-armhf-ci/287
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-trusty-armhf-ci/287/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-trusty-i386-ci/287/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-api-ci/287/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:150
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-ci/289/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-trusty-amd64-ci/289
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-trusty-armhf-ci/289
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-trusty-armhf-ci/289/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-trusty-i386-ci/289

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-api-ci/289/rebuild

review: Approve (continuous-integration)

[Paweł Stołowski (stolowski)]

Looks good! +1

review: Approve

=== modified file 'scoperegistry/scoperegistry.cpp'
--- scoperegistry/scoperegistry.cpp	2014-01-17 08:06:47 +0000
+++ scoperegistry/scoperegistry.cpp	2014-01-24 03:21:30 +0000
@@ -97,7 +97,7 @@
             }
             catch (FileException const& e)
             {
-                error("scope group config file ignored:\n" + e.to_string());
+                error(string("scope group config file ignored:\n") + e.what());
                 continue;
             }
 
@@ -108,7 +108,7 @@
             }
             catch (LogicException const& e)
             {
-                error("group file \"" + file + ": file ignored:\n" + e.to_string());
+                error("group file \"" + file + ": file ignored:\n" + e.what());
                 continue;
             }
 
@@ -213,7 +213,7 @@
         }
         catch (unity::Exception const& e)
         {
-            error("ignoring scope \"" + pair.first + "\": cannot create metadata: " + e.to_string());
+            error("ignoring scope \"" + pair.first + "\": cannot create metadata: " + e.what());
         }
     }
 }
@@ -323,7 +323,7 @@
             }
             catch (unity::Exception const& e)
             {
-                error("ignoring scope \"" + scope_name + "\": configuration error:\n" + e.to_string());
+                error("ignoring scope \"" + scope_name + "\": configuration error:\n" + e.what());
             }
         }
 
@@ -379,10 +379,6 @@
         middleware->wait_for_shutdown();
         exit_status = 0;
     }
-    catch (unity::Exception const& e)
-    {
-        error(e.to_string());
-    }
     catch (std::exception const& e)
     {
         error(e.what());
 
=== modified file 'scoperunner/scoperunner.cpp'
--- scoperunner/scoperunner.cpp	2014-01-15 11:32:33 +0000
+++ scoperunner/scoperunner.cpp	2014-01-24 03:21:30 +0000
@@ -169,11 +169,6 @@
             it->second.t.join();
             it->second.f.get();             // This will throw if the thread terminated due to an exception
         }
-        catch (unity::Exception const& e)
-        {
-            error(e.to_string());
-            ++num_errors;
-        }
         catch (std::exception const& e)
         {
             error(e.what());
@@ -216,10 +211,6 @@
 
         exit_status = run_scopes(runtime_config, config_files);
     }
-    catch (unity::Exception const& e)
-    {
-        error(e.to_string());
-    }
     catch (std::exception const& e)
     {
         error(e.what());
 
=== modified file 'test/gtest/scopes/Variant/Variant_test.cpp'
--- test/gtest/scopes/Variant/Variant_test.cpp	2014-01-07 12:22:29 +0000
+++ test/gtest/scopes/Variant/Variant_test.cpp	2014-01-24 03:21:30 +0000
@@ -191,9 +191,9 @@
     }
     catch (LogicException const& e)
     {
-        EXPECT_EQ("unity::LogicException: Variant does not contain a bool value:\n"
-                  "    boost::bad_get: failed value get using boost::get",
-                  e.to_string());
+        EXPECT_STREQ("unity::LogicException: Variant does not contain a bool value:\n"
+                     "    boost::bad_get: failed value get using boost::get",
+                     e.what());
     }
 
     try
@@ -204,9 +204,9 @@
     }
     catch (LogicException const& e)
     {
-        EXPECT_EQ("unity::LogicException: Variant does not contain a string value:\n"
-                  "    boost::bad_get: failed value get using boost::get",
-                  e.to_string());
+        EXPECT_STREQ("unity::LogicException: Variant does not contain a string value:\n"
+                     "    boost::bad_get: failed value get using boost::get",
+                     e.what());
     }
 
     try
@@ -217,9 +217,9 @@
     }
     catch (LogicException const& e)
     {
-        EXPECT_EQ("unity::LogicException: Variant does not contain an int value:\n"
-                  "    boost::bad_get: failed value get using boost::get",
-                  e.to_string());
+        EXPECT_STREQ("unity::LogicException: Variant does not contain an int value:\n"
+                     "    boost::bad_get: failed value get using boost::get",
+                     e.what());
     }
 
 }
 
=== modified file 'test/gtest/scopes/internal/ConfigBase/ConfigBase_test.cpp'
--- test/gtest/scopes/internal/ConfigBase/ConfigBase_test.cpp	2014-01-09 09:47:56 +0000
+++ test/gtest/scopes/internal/ConfigBase/ConfigBase_test.cpp	2014-01-24 03:21:30 +0000
@@ -65,7 +65,7 @@
     }
     catch (ConfigException const& e)
     {
-        EXPECT_EQ("unity::scopes::ConfigException: \"Test.ini\": Illegal empty value for Empty", e.to_string());
+        EXPECT_STREQ("unity::scopes::ConfigException: \"Test.ini\": Illegal empty value for Empty", e.what());
     }
 }
 
@@ -81,9 +81,9 @@
     }
     catch (ConfigException const& e)
     {
-        EXPECT_EQ("unity::scopes::ConfigException: \"Test.ini\": Illegal value for Zmq.BadMiddleware: \"foo\": "
-                  "legal values are \"Zmq\" and \"REST\"",
-                  e.to_string());
+        EXPECT_STREQ("unity::scopes::ConfigException: \"Test.ini\": Illegal value for Zmq.BadMiddleware: \"foo\": "
+                     "legal values are \"Zmq\" and \"REST\"",
+                     e.what());
     }
     try
     {
@@ -92,9 +92,9 @@
     }
     catch (ConfigException const& e)
     {
-        EXPECT_EQ("unity::scopes::ConfigException: \"Test.ini\": Illegal value for REST.BadMiddleware: \"bar\": "
-                  "legal values are \"Zmq\" and \"REST\"",
-                  e.to_string());
+        EXPECT_STREQ("unity::scopes::ConfigException: \"Test.ini\": Illegal value for REST.BadMiddleware: \"bar\": "
+                     "legal values are \"Zmq\" and \"REST\"",
+                     e.what());
     }
 }
 
@@ -109,7 +109,7 @@
     }
     catch (ConfigException const& e)
     {
-        EXPECT_EQ("unity::scopes::ConfigException: \"Test.ini\": error", e.to_string());
+        EXPECT_STREQ("unity::scopes::ConfigException: \"Test.ini\": error", e.what());
     }
 }
 
@@ -121,7 +121,7 @@
     }
     catch (FileException const& e)
     {
-        EXPECT_EQ("unity::FileException: Could not load ini file no_such_file: No such file or directory (errno = 4)",
-                  e.to_string());
+        EXPECT_STREQ("unity::FileException: Could not load ini file no_such_file: No such file or directory (errno = 4)",
+                     e.what());
     }
 }
 
=== modified file 'test/gtest/scopes/internal/DynamicLoader/DynamicLoader_test.cpp'
--- test/gtest/scopes/internal/DynamicLoader/DynamicLoader_test.cpp	2014-01-07 12:22:29 +0000
+++ test/gtest/scopes/internal/DynamicLoader/DynamicLoader_test.cpp	2014-01-24 03:21:30 +0000
@@ -74,7 +74,7 @@
     catch (unity::ResourceException const& e)
     {
         boost::regex r("unity::ResourceException: .*/libbadtestlib.so: undefined symbol: foo");
-        EXPECT_TRUE(boost::regex_match(e.to_string(), r));
+        EXPECT_TRUE(boost::regex_match(e.what(), r));
     }
 }
 
@@ -87,8 +87,8 @@
         }
         catch (unity::ResourceException const& e)
         {
-            EXPECT_EQ("unity::ResourceException: no_such_lib: cannot open shared object file: No such file or directory",
-                      e.to_string());
+            EXPECT_STREQ("unity::ResourceException: no_such_lib: cannot open shared object file: No such file or directory",
+                         e.what());
         }
     }
 
@@ -101,7 +101,7 @@
         catch (unity::ResourceException const& e)
         {
             boost::regex r("unity::ResourceException: .*/libtestlib.so: undefined symbol: no_such_symbol");
-            EXPECT_TRUE(boost::regex_match(e.to_string(), r));
+            EXPECT_TRUE(boost::regex_match(e.what(), r));
         }
     }
 }
 
=== modified file 'test/gtest/scopes/internal/MiddlewareFactory/MiddlewareFactory_test.cpp'
--- test/gtest/scopes/internal/MiddlewareFactory/MiddlewareFactory_test.cpp	2014-01-09 09:47:56 +0000
+++ test/gtest/scopes/internal/MiddlewareFactory/MiddlewareFactory_test.cpp	2014-01-24 03:21:30 +0000
@@ -46,6 +46,6 @@
     }
     catch (ConfigException const& e)
     {
-        EXPECT_EQ("unity::scopes::ConfigException: Invalid middleware kind: NoSuchMiddleware", e.to_string());
+        EXPECT_STREQ("unity::scopes::ConfigException: Invalid middleware kind: NoSuchMiddleware", e.what());
     }
 }
 
=== modified file 'test/gtest/scopes/internal/Reaper/Reaper_test.cpp'
--- test/gtest/scopes/internal/Reaper/Reaper_test.cpp	2014-01-07 12:22:29 +0000
+++ test/gtest/scopes/internal/Reaper/Reaper_test.cpp	2014-01-24 03:21:30 +0000
@@ -197,8 +197,8 @@
     }
     catch (unity::InvalidArgumentException const& e)
     {
-        EXPECT_EQ("unity::InvalidArgumentException: Reaper: invalid reap_interval (0). Interval must be > 0.",
-                  e.to_string());
+        EXPECT_STREQ("unity::InvalidArgumentException: Reaper: invalid reap_interval (0). Interval must be > 0.",
+                     e.what());
     }
 
     try
@@ -208,8 +208,8 @@
     }
     catch (unity::LogicException const& e)
     {
-        EXPECT_EQ("unity::LogicException: Reaper: reap_interval (2) must be <= expiry_interval (1).",
-                  e.to_string());
+        EXPECT_STREQ("unity::LogicException: Reaper: reap_interval (2) must be <= expiry_interval (1).",
+                     e.what());
     }
 
     try
@@ -220,8 +220,8 @@
     }
     catch (unity::InvalidArgumentException const& e)
     {
-        EXPECT_EQ("unity::InvalidArgumentException: Reaper: invalid null callback passed to add().",
-                  e.to_string());
+        EXPECT_STREQ("unity::InvalidArgumentException: Reaper: invalid null callback passed to add().",
+                     e.what());
     }
 
     // Make sure that if a callback throws an exception, this does no harm.
 
=== modified file 'test/gtest/scopes/internal/RegistryConfig/RegistryConfig_test.cpp'
--- test/gtest/scopes/internal/RegistryConfig/RegistryConfig_test.cpp	2014-01-09 09:47:56 +0000
+++ test/gtest/scopes/internal/RegistryConfig/RegistryConfig_test.cpp	2014-01-24 03:21:30 +0000
@@ -45,8 +45,8 @@
     }
     catch (InvalidArgumentException const& e)
     {
-        EXPECT_EQ("unity::InvalidArgumentException: Registry identity cannot be an empty string",
-                  e.to_string());
+        EXPECT_STREQ("unity::InvalidArgumentException: Registry identity cannot be an empty string",
+                     e.what());
     }
 }
 
@@ -59,8 +59,8 @@
     }
     catch (ConfigException const& e)
     {
-        EXPECT_EQ("unity::scopes::ConfigException: ScoperunnerRelativePath.ini: Scoperunner.Path "
-                  "must be an absolute path",
-                  e.to_string());
+        EXPECT_STREQ("unity::scopes::ConfigException: ScoperunnerRelativePath.ini: Scoperunner.Path "
+                     "must be an absolute path",
+                     e.what());
     }
 }
 
=== modified file 'test/gtest/scopes/internal/RuntimeConfig/RuntimeConfig_test.cpp'
--- test/gtest/scopes/internal/RuntimeConfig/RuntimeConfig_test.cpp	2014-01-09 09:47:56 +0000
+++ test/gtest/scopes/internal/RuntimeConfig/RuntimeConfig_test.cpp	2014-01-24 03:21:30 +0000
@@ -42,8 +42,8 @@
     }
     catch (ConfigException const& e)
     {
-        EXPECT_EQ("unity::scopes::ConfigException: \"RegIDEmpty.ini\": Illegal empty value for Registry.Identity",
-                  e.to_string());
+        EXPECT_STREQ("unity::scopes::ConfigException: \"RegIDEmpty.ini\": Illegal empty value for Registry.Identity",
+                     e.what());
     }
 }
 
@@ -56,9 +56,9 @@
     }
     catch (ConfigException const& e)
     {
-        EXPECT_EQ("unity::scopes::ConfigException: \"BadRegID.ini\": Illegal character in value for "
-                  "Registry.Identity: \"Regi/stry\": identity cannot contain '/'",
-                  e.to_string());
+        EXPECT_STREQ("unity::scopes::ConfigException: \"BadRegID.ini\": Illegal character in value for "
+                     "Registry.Identity: \"Regi/stry\": identity cannot contain '/'",
+                     e.what());
     }
 }
 
@@ -71,8 +71,8 @@
     }
     catch (ConfigException const& e)
     {
-        EXPECT_EQ("unity::scopes::ConfigException: \"RegFileEmpty.ini\": Illegal empty value for Registry.ConfigFile",
-                  e.to_string());
+        EXPECT_STREQ("unity::scopes::ConfigException: \"RegFileEmpty.ini\": Illegal empty value for Registry.ConfigFile",
+                     e.what());
     }
 }
 
@@ -85,8 +85,8 @@
     }
     catch (ConfigException const& e)
     {
-        EXPECT_EQ("unity::scopes::ConfigException: \"MWEmpty.ini\": Illegal empty value for Default.Middleware",
-                  e.to_string());
+        EXPECT_STREQ("unity::scopes::ConfigException: \"MWEmpty.ini\": Illegal empty value for Default.Middleware",
+                     e.what());
     }
 }
 
@@ -99,8 +99,8 @@
     }
     catch (ConfigException const& e)
     {
-        EXPECT_EQ("unity::scopes::ConfigException: \"BadMW.ini\": Illegal value for Default.Middleware: "
-                  "\"Foo\": legal values are \"Zmq\" and \"REST\"",
-                  e.to_string());
+        EXPECT_STREQ("unity::scopes::ConfigException: \"BadMW.ini\": Illegal value for Default.Middleware: "
+                     "\"Foo\": legal values are \"Zmq\" and \"REST\"",
+                     e.what());
     }
 }
 
=== modified file 'test/gtest/scopes/internal/RuntimeImpl/RuntimeImpl_test.cpp'
--- test/gtest/scopes/internal/RuntimeImpl/RuntimeImpl_test.cpp	2014-01-09 09:47:56 +0000
+++ test/gtest/scopes/internal/RuntimeImpl/RuntimeImpl_test.cpp	2014-01-24 03:21:30 +0000
@@ -44,8 +44,8 @@
     }
     catch (LogicException const& e)
     {
-        EXPECT_EQ("unity::LogicException: registry(): Cannot obtain registry for already destroyed run time",
-                  e.to_string());
+        EXPECT_STREQ("unity::LogicException: registry(): Cannot obtain registry for already destroyed run time",
+                     e.what());
     }
 
     rt->destroy();
@@ -56,8 +56,8 @@
     }
     catch (LogicException const& e)
     {
-        EXPECT_EQ("unity::LogicException: factory(): Cannot obtain factory for already destroyed run time",
-                  e.to_string());
+        EXPECT_STREQ("unity::LogicException: factory(): Cannot obtain factory for already destroyed run time",
+                     e.what());
     }
 }
 
@@ -69,9 +69,9 @@
     }
     catch (ConfigException const& e)
     {
-        EXPECT_EQ("unity::scopes::ConfigException: Cannot instantiate run time for testscope, "
-                  "config file: NoSuchFile.ini:\n"
-                  "    unity::FileException: Could not load ini file NoSuchFile.ini: No such file or directory (errno = 4)",
-                  e.to_string());
+        EXPECT_STREQ("unity::scopes::ConfigException: Cannot instantiate run time for testscope, "
+                     "config file: NoSuchFile.ini:\n"
+                     "    unity::FileException: Could not load ini file NoSuchFile.ini: No such file or directory (errno = 4)",
+                     e.what());
     }
 }
 
=== modified file 'test/gtest/scopes/internal/ScopeLoader/ScopeLoader_test.cpp'
--- test/gtest/scopes/internal/ScopeLoader/ScopeLoader_test.cpp	2014-01-09 11:59:34 +0000
+++ test/gtest/scopes/internal/ScopeLoader/ScopeLoader_test.cpp	2014-01-24 03:21:30 +0000
@@ -92,8 +92,8 @@
     }
     catch (unity::Exception const& e)
     {
-        EXPECT_EQ("unity::InvalidArgumentException: Cannot load scope testScope: null registry proxy",
-                  e.to_string());
+        EXPECT_STREQ("unity::InvalidArgumentException: Cannot load scope testScope: null registry proxy",
+                     e.what());
     }
 }
 
@@ -114,7 +114,7 @@
                        "    unity::ResourceException: Scope testScope was compiled with major version 666 of the "
                        "Unity scopes run time. This version is incompatible with the current major version "
                        "\\([0-9]+\\)\\.");
-        EXPECT_TRUE(boost::regex_match(e.to_string(), r)) << e.to_string();
+        EXPECT_TRUE(boost::regex_match(e.what(), r)) << e.what();
     }
     EXPECT_EQ(1, num_create());
     EXPECT_EQ(1, num_destroy());
@@ -190,8 +190,8 @@
     }
     catch (unity::Exception const& e)
     {
-        EXPECT_EQ("unity::ResourceException: no_such_lib: cannot open shared object file: No such file or directory",
-                  e.to_string());
+        EXPECT_STREQ("unity::ResourceException: no_such_lib: cannot open shared object file: No such file or directory",
+                     e.what());
         EXPECT_EQ(0, num_create());
         EXPECT_EQ(0, num_destroy());
     }
@@ -211,7 +211,7 @@
     catch (unity::Exception const& e)
     {
         boost::regex r("unity::ResourceException: .*/libNoDestroy.so: undefined symbol: unity_scope_destroy");
-        EXPECT_TRUE(boost::regex_match(e.to_string(), r));
+        EXPECT_TRUE(boost::regex_match(e.what(), r));
         EXPECT_EQ(0, num_create());
         EXPECT_EQ(0, num_destroy());
     }
@@ -230,8 +230,8 @@
     }
     catch (unity::Exception const& e)
     {
-        EXPECT_EQ("unity::ResourceException: Scope testScope returned nullptr from unity_scope_create",
-                  e.to_string());
+        EXPECT_STREQ("unity::ResourceException: Scope testScope returned nullptr from unity_scope_create",
+                     e.what());
         EXPECT_EQ(1, num_create());
         EXPECT_EQ(0, num_destroy());
     }
@@ -251,8 +251,8 @@
     }
     catch (unity::Exception const& e)
     {
-        EXPECT_EQ("unity::ResourceException: Scope testScope returned nullptr from unity_scope_create",
-                  e.to_string());
+        EXPECT_STREQ("unity::ResourceException: Scope testScope returned nullptr from unity_scope_create",
+                     e.what());
         EXPECT_EQ(1, num_create());
         EXPECT_EQ(0, num_destroy());
     }
@@ -273,9 +273,9 @@
         }
         catch (unity::Exception const& e)
         {
-            EXPECT_EQ("unity::ResourceException: Scope testScope: terminated due to exception in start():\n"
-                      "    unity::LogicException: start failure",
-                      e.to_string());
+            EXPECT_STREQ("unity::ResourceException: Scope testScope: terminated due to exception in start():\n"
+                         "    unity::LogicException: start failure",
+                         e.what());
         }
     }
     EXPECT_EQ(0, num_stop());
@@ -297,9 +297,9 @@
         }
         catch (unity::Exception const& e)
         {
-            EXPECT_EQ("unity::ResourceException: Scope testScope: terminated due to exception in start():\n"
-                      "    unity::LogicException: start failure",
-                      e.to_string());
+            EXPECT_STREQ("unity::ResourceException: Scope testScope: terminated due to exception in start():\n"
+                         "    unity::LogicException: start failure",
+                         e.what());
         }
     }
     EXPECT_EQ(0, num_stop());
@@ -323,9 +323,9 @@
         }
         catch (unity::Exception const& e)
         {
-            EXPECT_EQ("unity::ResourceException: Scope testScope: terminated due to exception in start():\n"
-                      "    unknown exception",
-                      e.to_string());
+            EXPECT_STREQ("unity::ResourceException: Scope testScope: terminated due to exception in start():\n"
+                         "    unknown exception",
+                         e.what());
         }
     }
     EXPECT_EQ(0, num_stop());
@@ -353,9 +353,9 @@
     }
     catch (unity::ResourceException const& e)
     {
-        EXPECT_EQ("unity::ResourceException: Scope testScope: terminated due to exception in stop():\n"
-                  "    unity::LogicException: stop failure",
-                  e.to_string());
+        EXPECT_STREQ("unity::ResourceException: Scope testScope: terminated due to exception in stop():\n"
+                     "    unity::LogicException: stop failure",
+                     e.what());
     }
 }
 
@@ -379,9 +379,9 @@
     }
     catch (unity::ResourceException const& e)
     {
-        EXPECT_EQ("unity::ResourceException: Scope testScope: terminated due to exception in stop():\n"
-                  "    stop failure",
-                  e.to_string());
+        EXPECT_STREQ("unity::ResourceException: Scope testScope: terminated due to exception in stop():\n"
+                     "    stop failure",
+                     e.what());
     }
 }
 
@@ -404,9 +404,9 @@
     }
     catch (unity::ResourceException const& e)
     {
-        EXPECT_EQ("unity::ResourceException: Scope testScope: terminated due to exception in stop():\n"
-                  "    unknown exception",
-                  e.to_string());
+        EXPECT_STREQ("unity::ResourceException: Scope testScope: terminated due to exception in stop():\n"
+                     "    unknown exception",
+                     e.what());
     }
 }
 
@@ -443,9 +443,9 @@
     }
     catch (unity::Exception const& e)
     {
-        EXPECT_EQ("unity::ResourceException: Scope testScope: terminated due to exception in stop():\n"
-                  "    unity::LogicException: stop failure",
-                  e.to_string());
+        EXPECT_STREQ("unity::ResourceException: Scope testScope: terminated due to exception in stop():\n"
+                     "    unity::LogicException: stop failure",
+                     e.what());
     }
 
     // Call unload again to make sure that the second time, it doesn't throw.
@@ -475,7 +475,7 @@
     }
     catch (unity::Exception const& e)
     {
-        EXPECT_EQ("unity::LogicException: Cannot start scope testScope in Finished state", e.to_string());
+        EXPECT_STREQ("unity::LogicException: Cannot start scope testScope in Finished state", e.what());
     }
 }
 
@@ -495,7 +495,7 @@
     }
     catch (unity::Exception const& e)
     {
-        EXPECT_EQ("unity::LogicException: Cannot stop scope testScope in Finished state", e.to_string());
+        EXPECT_STREQ("unity::LogicException: Cannot stop scope testScope in Finished state", e.what());
     }
 }
 
@@ -522,7 +522,7 @@
     }
     catch (unity::Exception const& e)
     {
-        EXPECT_EQ("unity::LogicException: Cannot start scope testScope in Failed state", e.to_string());
+        EXPECT_STREQ("unity::LogicException: Cannot start scope testScope in Failed state", e.what());
     }
 
     try
@@ -531,7 +531,7 @@
     }
     catch (unity::Exception const& e)
     {
-        EXPECT_EQ("unity::LogicException: Cannot stop scope testScope in Failed state", e.to_string());
+        EXPECT_STREQ("unity::LogicException: Cannot stop scope testScope in Failed state", e.what());
     }
 }
 
 
=== modified file 'test/gtest/scopes/internal/ScopeMetadataImpl/ScopeMetadataImpl_test.cpp'
--- test/gtest/scopes/internal/ScopeMetadataImpl/ScopeMetadataImpl_test.cpp	2014-01-15 22:52:19 +0000
+++ test/gtest/scopes/internal/ScopeMetadataImpl/ScopeMetadataImpl_test.cpp	2014-01-24 03:21:30 +0000
@@ -64,7 +64,7 @@
     }
     catch (NotFoundException const& e)
     {
-        EXPECT_EQ("unity::scopes::NotFoundException: attribute not set (name = art)", e.to_string());
+        EXPECT_STREQ("unity::scopes::NotFoundException: attribute not set (name = art)", e.what());
     }
 
     try
@@ -74,7 +74,7 @@
     }
     catch (NotFoundException const& e)
     {
-        EXPECT_EQ("unity::scopes::NotFoundException: attribute not set (name = icon)", e.to_string());
+        EXPECT_STREQ("unity::scopes::NotFoundException: attribute not set (name = icon)", e.what());
     }
 
     try
@@ -84,7 +84,7 @@
     }
     catch (NotFoundException const& e)
     {
-        EXPECT_EQ("unity::scopes::NotFoundException: attribute not set (name = search_hint)", e.to_string());
+        EXPECT_STREQ("unity::scopes::NotFoundException: attribute not set (name = search_hint)", e.what());
     }
 
     try
@@ -94,7 +94,7 @@
     }
     catch (NotFoundException const& e)
     {
-        EXPECT_EQ("unity::scopes::NotFoundException: attribute not set (name = hot_key)", e.to_string());
+        EXPECT_STREQ("unity::scopes::NotFoundException: attribute not set (name = hot_key)", e.what());
     }
 
     // Check that the copy has the same values as the original
@@ -235,8 +235,8 @@
     }
     catch (InvalidArgumentException const&e)
     {
-        EXPECT_EQ("unity::InvalidArgumentException: ScopeMetadata: required attribute 'scope_name' is empty",
-                   e.to_string());
+        EXPECT_STREQ("unity::InvalidArgumentException: ScopeMetadata: required attribute 'scope_name' is empty",
+                     e.what());
     }
 
     try
@@ -247,8 +247,8 @@
     }
     catch (InvalidArgumentException const&e)
     {
-        EXPECT_EQ("unity::InvalidArgumentException: ScopeMetadataImpl::serialize(): required attribute 'proxy' is null",
-                   e.to_string());
+        EXPECT_STREQ("unity::InvalidArgumentException: ScopeMetadataImpl::serialize(): required attribute 'proxy' is null",
+                      e.what());
     }
 
     try
@@ -260,8 +260,8 @@
     }
     catch (InvalidArgumentException const&e)
     {
-        EXPECT_EQ("unity::InvalidArgumentException: ScopeMetadata: required attribute 'display_name' is empty",
-                   e.to_string());
+        EXPECT_STREQ("unity::InvalidArgumentException: ScopeMetadata: required attribute 'display_name' is empty",
+                      e.what());
     }
 
     try
@@ -272,8 +272,8 @@
     }
     catch (InvalidArgumentException const&e)
     {
-        EXPECT_EQ("unity::InvalidArgumentException: ScopeMetadata: required attribute 'description' is empty",
-                   e.to_string());
+        EXPECT_STREQ("unity::InvalidArgumentException: ScopeMetadata: required attribute 'description' is empty",
+                     e.what());
     }
 }
 
@@ -291,9 +291,9 @@
     }
     catch (InvalidArgumentException const&e)
     {
-        EXPECT_EQ("unity::InvalidArgumentException: ScopeMetadata::deserialize(): required attribute "
-                  "'scope_name' is missing",
-                   e.to_string());
+        EXPECT_STREQ("unity::InvalidArgumentException: ScopeMetadata::deserialize(): required attribute "
+                     "'scope_name' is missing",
+                     e.what());
     }
 
     m["scope_name"] = "scope_name";
@@ -305,9 +305,9 @@
     }
     catch (InvalidArgumentException const&e)
     {
-        EXPECT_EQ("unity::InvalidArgumentException: ScopeMetadata::deserialize(): required attribute "
-                  "'proxy' is missing",
-                   e.to_string());
+        EXPECT_STREQ("unity::InvalidArgumentException: ScopeMetadata::deserialize(): required attribute "
+                     "'proxy' is missing",
+                     e.what());
     }
 
     VariantMap proxy;
@@ -320,8 +320,8 @@
     }
     catch (InvalidArgumentException const&e)
     {
-        EXPECT_EQ("unity::InvalidArgumentException: ScopeMetadataImpl::deserialize(): missing 'proxy.identity'",
-                   e.to_string());
+        EXPECT_STREQ("unity::InvalidArgumentException: ScopeMetadataImpl::deserialize(): missing 'proxy.identity'",
+                     e.what());
     }
 
     proxy["identity"] = "identity";
@@ -334,8 +334,8 @@
     }
     catch (InvalidArgumentException const&e)
     {
-        EXPECT_EQ("unity::InvalidArgumentException: ScopeMetadataImpl::deserialize(): missing 'proxy.endpoint'",
-                   e.to_string());
+        EXPECT_STREQ("unity::InvalidArgumentException: ScopeMetadataImpl::deserialize(): missing 'proxy.endpoint'",
+                     e.what());
     }
 
     proxy["endpoint"] = "endpoint";
@@ -348,9 +348,9 @@
     }
     catch (InvalidArgumentException const&e)
     {
-        EXPECT_EQ("unity::InvalidArgumentException: ScopeMetadata::deserialize(): required attribute "
-                  "'display_name' is missing",
-                   e.to_string());
+        EXPECT_STREQ("unity::InvalidArgumentException: ScopeMetadata::deserialize(): required attribute "
+                     "'display_name' is missing",
+                     e.what());
     }
 
     m["display_name"] = "display_name";
@@ -362,9 +362,9 @@
     }
     catch (InvalidArgumentException const&e)
     {
-        EXPECT_EQ("unity::InvalidArgumentException: ScopeMetadata::deserialize(): required attribute "
-                  "'description' is missing",
-                   e.to_string());
+        EXPECT_STREQ("unity::InvalidArgumentException: ScopeMetadata::deserialize(): required attribute "
+                     "'description' is missing",
+                     e.what());
     }
     m["description"] = "description";
 
 
=== modified file 'test/gtest/scopes/internal/ThreadPool/ThreadPool_test.cpp'
--- test/gtest/scopes/internal/ThreadPool/ThreadPool_test.cpp	2014-01-07 12:22:29 +0000
+++ test/gtest/scopes/internal/ThreadPool/ThreadPool_test.cpp	2014-01-24 03:21:30 +0000
@@ -92,7 +92,7 @@
     }
     catch (unity::InvalidArgumentException const& e)
     {
-        EXPECT_EQ("unity::InvalidArgumentException: ThreadPool(): invalid pool size: 0", e.to_string());
+        EXPECT_STREQ("unity::InvalidArgumentException: ThreadPool(): invalid pool size: 0", e.what());
     }
 
     try
@@ -101,6 +101,6 @@
     }
     catch (unity::InvalidArgumentException const& e)
     {
-        EXPECT_EQ("unity::InvalidArgumentException: ThreadPool(): invalid pool size: -1", e.to_string());
+        EXPECT_STREQ("unity::InvalidArgumentException: ThreadPool(): invalid pool size: -1", e.what());
     }
 }
 
=== modified file 'test/gtest/scopes/internal/zmq_middleware/ObjectAdapter/ObjectAdapter_test.cpp'
--- test/gtest/scopes/internal/zmq_middleware/ObjectAdapter/ObjectAdapter_test.cpp	2014-01-16 13:40:51 +0000
+++ test/gtest/scopes/internal/zmq_middleware/ObjectAdapter/ObjectAdapter_test.cpp	2014-01-24 03:21:30 +0000
@@ -176,9 +176,9 @@
         }
         catch (MiddlewareException const& e)
         {
-            EXPECT_EQ("unity::scopes::MiddlewareException: Object adapter in Destroyed "
-                      "state (adapter: testscope)",
-                      e.to_string());
+            EXPECT_STREQ("unity::scopes::MiddlewareException: Object adapter in Destroyed "
+                         "state (adapter: testscope)",
+                         e.what());
         }
     }
 
@@ -194,12 +194,12 @@
         }
         catch (MiddlewareException const& e)
         {
-            EXPECT_EQ("unity::scopes::MiddlewareException: ObjectAdapter::run_workers(): broker thread "
-                      "failure (adapter: testscope):\n"
-                      "    unity::scopes::MiddlewareException: ObjectAdapter: broker thread failure "
-                      "(adapter: testscope):\n"
-                      "        Address already in use",
-                      e.to_string());
+            EXPECT_STREQ("unity::scopes::MiddlewareException: ObjectAdapter::run_workers(): broker thread "
+                         "failure (adapter: testscope):\n"
+                         "    unity::scopes::MiddlewareException: ObjectAdapter: broker thread failure "
+                         "(adapter: testscope):\n"
+                         "        Address already in use",
+                         e.what());
         }
         try
         {
@@ -207,13 +207,13 @@
         }
         catch (MiddlewareException const& e)
         {
-            EXPECT_EQ("unity::scopes::MiddlewareException: Object adapter in Failed state (adapter: testscope)\n"
-                      "    Exception history:\n"
-                      "        Exception #1:\n"
-                      "            unity::scopes::MiddlewareException: ObjectAdapter: broker thread failure "
-                      "(adapter: testscope):\n"
-                      "                Address already in use",
-                      e.to_string());
+            EXPECT_STREQ("unity::scopes::MiddlewareException: Object adapter in Failed state (adapter: testscope)\n"
+                         "    Exception history:\n"
+                         "        Exception #1:\n"
+                         "            unity::scopes::MiddlewareException: ObjectAdapter: broker thread failure "
+                         "(adapter: testscope):\n"
+                         "                Address already in use",
+                         e.what());
         }
         try
         {
@@ -221,13 +221,13 @@
         }
         catch (MiddlewareException const& e)
         {
-            EXPECT_EQ("unity::scopes::MiddlewareException: Object adapter in Failed state (adapter: testscope)\n"
-                       "    Exception history:\n"
-                       "        Exception #1:\n"
-                       "            unity::scopes::MiddlewareException: ObjectAdapter: broker thread failure "
-                       "(adapter: testscope):\n"
-                       "                Address already in use",
-                       e.to_string());
+            EXPECT_STREQ("unity::scopes::MiddlewareException: Object adapter in Failed state (adapter: testscope)\n"
+                          "    Exception history:\n"
+                          "        Exception #1:\n"
+                          "            unity::scopes::MiddlewareException: ObjectAdapter: broker thread failure "
+                          "(adapter: testscope):\n"
+                          "                Address already in use",
+                          e.what());
         }
     }
 }
@@ -294,8 +294,8 @@
     }
     catch (InvalidArgumentException const& e)
     {
-        EXPECT_EQ("unity::InvalidArgumentException: ObjectAdapter::add(): invalid empty id (adapter: testscope)",
-                  e.to_string());
+        EXPECT_STREQ("unity::InvalidArgumentException: ObjectAdapter::add(): invalid empty id (adapter: testscope)",
+                     e.what());
     }
 
     try
@@ -305,8 +305,8 @@
     }
     catch (InvalidArgumentException const& e)
     {
-        EXPECT_EQ("unity::InvalidArgumentException: ObjectAdapter::add(): invalid nullptr object (adapter: testscope)",
-                  e.to_string());
+        EXPECT_STREQ("unity::InvalidArgumentException: ObjectAdapter::add(): invalid nullptr object (adapter: testscope)",
+                     e.what());
     }
 
     shared_ptr<MyServant> o(new MyServant);
@@ -321,9 +321,9 @@
     }
     catch (MiddlewareException const& e)
     {
-        EXPECT_EQ("unity::scopes::MiddlewareException: ObjectAdapter::add(): cannot add id \"fred\":"
-                  " id already in use (adapter: testscope)",
-                  e.to_string());
+        EXPECT_STREQ("unity::scopes::MiddlewareException: ObjectAdapter::add(): cannot add id \"fred\":"
+                     " id already in use (adapter: testscope)",
+                     e.what());
     }
 
     a.remove("fred");
@@ -333,9 +333,9 @@
     }
     catch (MiddlewareException const& e)
     {
-        EXPECT_EQ("unity::scopes::MiddlewareException: ObjectAdapter::remove(): cannot remove id \"fred\":"
-                  " id not present (adapter: testscope)",
-                  e.to_string());
+        EXPECT_STREQ("unity::scopes::MiddlewareException: ObjectAdapter::remove(): cannot remove id \"fred\":"
+                     " id not present (adapter: testscope)",
+                     e.what());
     }
 
     EXPECT_EQ(nullptr, a.find("fred").get());
@@ -907,8 +907,8 @@
             }
             catch (MiddlewareException const& e)
             {
-                EXPECT_EQ("unity::scopes::MiddlewareException: Object adapter in Destroyed state (adapter: testscope)",
-                          e.to_string());
+                EXPECT_STREQ("unity::scopes::MiddlewareException: Object adapter in Destroyed state (adapter: testscope)",
+                             e.what());
             }
         };
         a.add("fred", make_shared<UpdaterServant>(test_func));
@@ -928,9 +928,9 @@
             }
             catch (MiddlewareException const& e)
             {
-                EXPECT_EQ("unity::scopes::MiddlewareException: ObjectAdapter::remove(): "
-                          "cannot remove id \"fred\": id not present (adapter: testscope)",
-                          e.to_string());
+                EXPECT_STREQ("unity::scopes::MiddlewareException: ObjectAdapter::remove(): "
+                             "cannot remove id \"fred\": id not present (adapter: testscope)",
+                             e.what());
             }
         };
         auto servant = make_shared<UpdaterServant>(test_func);
@@ -952,9 +952,9 @@
             }
             catch (MiddlewareException const& e)
             {
-                EXPECT_EQ("unity::scopes::MiddlewareException: ObjectAdapter::remove(): "
-                          "cannot remove id \"fred\": id not present (adapter: testscope)",
-                          e.to_string());
+                EXPECT_STREQ("unity::scopes::MiddlewareException: ObjectAdapter::remove(): "
+                             "cannot remove id \"fred\": id not present (adapter: testscope)",
+                             e.what());
             }
         };
         auto servant = make_shared<UpdaterServant>(test_func);
@@ -1005,9 +1005,9 @@
         }
         catch (MiddlewareException const& e)
         {
-            EXPECT_EQ("unity::scopes::MiddlewareException: Object adapter in Destroyed "
-                      "state (adapter: testscope)",
-                      e.to_string());
+            EXPECT_STREQ("unity::scopes::MiddlewareException: Object adapter in Destroyed "
+                         "state (adapter: testscope)",
+                         e.what());
         }
         try
         {
@@ -1016,9 +1016,9 @@
         }
         catch (MiddlewareException const& e)
         {
-            EXPECT_EQ("unity::scopes::MiddlewareException: Object adapter in Destroyed "
-                      "state (adapter: testscope)",
-                      e.to_string());
+            EXPECT_STREQ("unity::scopes::MiddlewareException: Object adapter in Destroyed "
+                         "state (adapter: testscope)",
+                         e.what());
         }
     }
 }
@@ -1196,9 +1196,9 @@
     }
     catch (InvalidArgumentException const& e)
     {
-        EXPECT_EQ("unity::InvalidArgumentException: ObjectAdapter::add_dflt_servant(): "
-                  "invalid nullptr object (adapter: testscope)",
-                  e.to_string());
+        EXPECT_STREQ("unity::InvalidArgumentException: ObjectAdapter::add_dflt_servant(): "
+                     "invalid nullptr object (adapter: testscope)",
+                     e.what());
     }
 
     ObjectAdapter b(mw, "testscope2", "ipc://testscope", RequestType::Oneway, 2);
 
=== modified file 'test/gtest/scopes/internal/zmq_middleware/RegistryI/RegistryI_test.cpp'
--- test/gtest/scopes/internal/zmq_middleware/RegistryI/RegistryI_test.cpp	2014-01-21 04:38:37 +0000
+++ test/gtest/scopes/internal/zmq_middleware/RegistryI/RegistryI_test.cpp	2014-01-24 03:21:30 +0000
@@ -58,34 +58,26 @@
 
 TEST(RegistryI, get_metadata)
 {
-    try
-    {
-        vector<string> dummy_spawn_command;
-        RuntimeImpl::UPtr runtime = RuntimeImpl::create(
-            "TestRegistry", TEST_BUILD_ROOT "/gtest/scopes/internal/zmq_middleware/RegistryI/Runtime.ini");
-
-        string identity = runtime->registry_identity();
-        RegistryConfig c(identity, runtime->registry_configfile());
-        string mw_kind = c.mw_kind();
-        string mw_endpoint = c.endpoint();
-        string mw_configfile = c.mw_configfile();
-
-        MiddlewareBase::SPtr middleware = runtime->factory()->create(identity, mw_kind, mw_configfile);
-        RegistryObject::SPtr ro(make_shared<RegistryObject>());
-        auto registry = middleware->add_registry_object(identity, ro);
-        auto p = middleware->create_scope_proxy("scope1", "ipc:///tmp/scope1");
-        EXPECT_TRUE(ro->add("scope1", move(make_meta("scope1", p, middleware)),
-                dummy_spawn_command));
-
-        auto r = runtime->registry();
-        auto scope = r->get_metadata("scope1");
-        EXPECT_EQ("scope1", scope.scope_name());
-    }
-    catch (unity::Exception const& e)
-    {
-        cerr << e.to_string() << endl;
-        FAIL();
-    }
+    vector<string> dummy_spawn_command;
+    RuntimeImpl::UPtr runtime = RuntimeImpl::create(
+        "TestRegistry", TEST_BUILD_ROOT "/gtest/scopes/internal/zmq_middleware/RegistryI/Runtime.ini");
+
+    string identity = runtime->registry_identity();
+    RegistryConfig c(identity, runtime->registry_configfile());
+    string mw_kind = c.mw_kind();
+    string mw_endpoint = c.endpoint();
+    string mw_configfile = c.mw_configfile();
+
+    MiddlewareBase::SPtr middleware = runtime->factory()->create(identity, mw_kind, mw_configfile);
+    RegistryObject::SPtr ro(make_shared<RegistryObject>());
+    auto registry = middleware->add_registry_object(identity, ro);
+    auto p = middleware->create_scope_proxy("scope1", "ipc:///tmp/scope1");
+    EXPECT_TRUE(ro->add("scope1", move(make_meta("scope1", p, middleware)),
+            dummy_spawn_command));
+
+    auto r = runtime->registry();
+    auto scope = r->get_metadata("scope1");
+    EXPECT_EQ("scope1", scope.scope_name());
 }
 
 TEST(RegistryI, list)
@@ -216,8 +208,8 @@
     }
     catch (NotFoundException const& e)
     {
-        EXPECT_EQ("unity::scopes::NotFoundException: Registry::get_metadata(): no such scope (name = fred)",
-                  e.to_string());
+        EXPECT_STREQ("unity::scopes::NotFoundException: Registry::get_metadata(): no such scope (name = fred)",
+                     e.what());
     }
 
     try
@@ -227,9 +219,9 @@
     }
     catch (MiddlewareException const& e)
     {
-        EXPECT_EQ("unity::scopes::MiddlewareException: unity::InvalidArgumentException: "
-                  "Registry: Cannot search for scope with empty name",
-                  e.to_string());
+        EXPECT_STREQ("unity::scopes::MiddlewareException: unity::InvalidArgumentException: "
+                     "Registry: Cannot search for scope with empty name",
+                     e.what());
     }
 
     try
@@ -240,8 +232,8 @@
     }
     catch (InvalidArgumentException const& e)
     {
-        EXPECT_EQ("unity::InvalidArgumentException: Registry: Cannot add scope with empty name",
-                  e.to_string());
+        EXPECT_STREQ("unity::InvalidArgumentException: Registry: Cannot add scope with empty name",
+                     e.what());
     }
 
     try
@@ -251,8 +243,8 @@
     }
     catch (InvalidArgumentException const& e)
     {
-        EXPECT_EQ("unity::InvalidArgumentException: Registry: Cannot remove scope with empty name",
-                  e.to_string());
+        EXPECT_STREQ("unity::InvalidArgumentException: Registry: Cannot remove scope with empty name",
+                     e.what());
     }
 }
 
@@ -298,7 +290,7 @@
     auto r_proxy = dynamic_pointer_cast<ZmqRegistry>(r);
     auto proxy = middleware->create_scope_proxy("scope1", "ipc:///tmp/scope1");
     mro->add("scope1", move(make_meta("scope1", proxy, middleware)),
-            dummy_spawn_command);
+             dummy_spawn_command);
 
     auto p = r_proxy->locate("scope1");
     EXPECT_EQ("scope1", p->identity());
@@ -325,28 +317,27 @@
         EXPECT_STREQ("unity::scopes::RegistryException: Couldn't start error_scope", e.what());
     }
 
-#if 0
     try
     {
         auto proxy = middleware->create_scope_proxy("scope1", "ipc:///tmp/scope1");
-        ro->add("", move(make_meta("blah", proxy, middleware)));
+        mro->add("", move(make_meta("blah", proxy, middleware)),
+                 dummy_spawn_command);
         FAIL();
     }
     catch (InvalidArgumentException const& e)
     {
-        EXPECT_EQ("unity::InvalidArgumentException: Registry: Cannot add scope with empty name",
-                  e.to_string());
+        EXPECT_STREQ("unity::InvalidArgumentException: Registry: Cannot add scope with empty name",
+                     e.what());
     }
 
     try
     {
-        ro->remove("");
+        mro->remove("");
         FAIL();
     }
     catch (InvalidArgumentException const& e)
     {
-        EXPECT_EQ("unity::InvalidArgumentException: Registry: Cannot remove scope with empty name",
-                  e.to_string());
+        EXPECT_STREQ("unity::InvalidArgumentException: Registry: Cannot remove scope with empty name",
+                     e.what());
     }
-#endif
 }