[asterisk-scf-commits] asterisk-scf/integration/bridging.git branch "master" updated.

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  4d0a948da331e1c497c5f2332363476509e86ba4 (commit)
      from  5c4feb990419026d315890da246d1114334b8ba2 (commit)

Summary of changes:
 test/TestBridging.cpp |   21 +++++++++++++++------
 1 files changed, 15 insertions(+), 6 deletions(-)


- Log -----------------------------------------------------------------
commit 4d0a948da331e1c497c5f2332363476509e86ba4
Author: Brent Eagles <beagles at digium.com>
Date:   Wed Aug 25 13:40:30 2010 -0230

    Fix up destroy test cases to use a proxy for the calls after the destroy
    has been invoked.

diff --git a/test/TestBridging.cpp b/test/TestBridging.cpp
index 513f69d..982eddd 100644
--- a/test/TestBridging.cpp
+++ b/test/TestBridging.cpp
@@ -1626,8 +1626,9 @@ BOOST_AUTO_TEST_CASE(BridgeOperationsAfterDestroy)
     {
         Hydra::Session::V1::SessionEndpointSeq eps;
         Hydra::BridgeService::BridgeImplPtr bridge(new Hydra::BridgeService::BridgeImpl(adapter, 0, eps, 0, 0));
-        std::cerr << "Hunh" << std::endl;
-        bridge->destroy(dummy);
+        Hydra::Core::Bridging::V1::BridgePrx bridgePrx =
+            Hydra::Core::Bridging::V1::BridgePrx::checkedCast(adapter->addWithUUID(bridge));
+        bridgePrx->destroy();
         //
         // Calling shutdown while in the process of shutting down is permitted but is a no-op.
         //
@@ -1639,7 +1640,7 @@ BOOST_AUTO_TEST_CASE(BridgeOperationsAfterDestroy)
         }
         catch(const Ice::ObjectNotExistException&)
         {
-            BOOST_CHECK("should not have succeeded." == 0);
+            BOOST_CHECK(true);
         }
         catch(const Ice::NotRegisteredException&)
         {
@@ -1674,7 +1675,7 @@ BOOST_AUTO_TEST_CASE(BridgeOperationsAfterDestroy)
         }
         catch(const Ice::ObjectNotExistException&)
         {
-            BOOST_CHECK("should not have succeeded." == 0);
+            BOOST_CHECK(true);
         }
         catch(const Ice::NotRegisteredException&)
         {
@@ -1687,7 +1688,7 @@ BOOST_AUTO_TEST_CASE(BridgeOperationsAfterDestroy)
         }
         catch(const Ice::ObjectNotExistException&)
         {
-            BOOST_CHECK("should not have succeeded." == 0);
+            BOOST_CHECK(true);
         }
         catch(const Ice::NotRegisteredException&)
         {
@@ -1710,6 +1711,10 @@ BOOST_AUTO_TEST_CASE(BridgeOperationsAfterDestroy)
         {
             BOOST_CHECK("but this might happen in the future" != 0);
         }
+        catch(const Ice::ObjectNotExistException&)
+        {
+            BOOST_CHECK(true);
+        }
         catch(const Ice::NotRegisteredException&)
         {
             BOOST_CHECK(true);
@@ -1728,6 +1733,10 @@ BOOST_AUTO_TEST_CASE(BridgeOperationsAfterDestroy)
         {
             BOOST_CHECK("but this might happen in the future" != 0);
         }
+        catch(const Ice::ObjectNotExistException&)
+        {
+            BOOST_CHECK(true);
+        }
         catch(const Ice::NotRegisteredException&)
         {
             BOOST_CHECK(true);
@@ -1740,7 +1749,7 @@ BOOST_AUTO_TEST_CASE(BridgeOperationsAfterDestroy)
         }
         catch(const Ice::ObjectNotExistException&)
         {
-            BOOST_CHECK("should not have succeeded." == 0);
+            BOOST_CHECK(true);
         }
         catch(const Ice::NotRegisteredException&)
         {

-----------------------------------------------------------------------


-- 
asterisk-scf/integration/bridging.git