[hydra-commits] beagles: branch ice/preserve-graphs r623 - /ice/branches/preserve-graphs/cpp/...

[SVN commits to the Hydra project]

Author: beagles
Date: Wed May 19 08:23:19 2010
New Revision: 623

URL: https://origsvn.digium.com/svn-view/hydra?view=rev&rev=623
Log:
Removed test of questionable validity (nested sliceable class)

Modified:
    ice/branches/preserve-graphs/cpp/test/Ice/slicing/objects/AllTests.cpp
    ice/branches/preserve-graphs/cpp/test/Ice/slicing/objects/ClientPrivate.ice

Modified: ice/branches/preserve-graphs/cpp/test/Ice/slicing/objects/AllTests.cpp
URL: https://origsvn.digium.com/svn-view/hydra/ice/branches/preserve-graphs/cpp/test/Ice/slicing/objects/AllTests.cpp?view=diff&rev=623&r1=622&r2=623
==============================================================================
--- ice/branches/preserve-graphs/cpp/test/Ice/slicing/objects/AllTests.cpp (original)
+++ ice/branches/preserve-graphs/cpp/test/Ice/slicing/objects/AllTests.cpp Wed May 19 08:23:19 2010
@@ -1453,35 +1453,6 @@
             throw;
         }
 
-    }
-    cout << "ok" << endl;
-
-    cout << "slice preserved object, sliceable inner class... " << flush;
-    {
-	try
-	{
-	    D6Ptr b1 = new D6;
-	    b1->sd6 = "D6.sd6";
-	    b1->innerD3 = new D3;
-	    b1->innerD3->sd3 = "D6.innerD3.sd3";
-	    BPtr b2 = new B;
-	    b2->sb = "B.sb";
-	    b2->pb = new B;
-	    b2->pb->sb = "B.B.sb";
-
-	    BPtr result = test->returnTest3(b1, b2);
-	    test(result);
-	    D6Ptr t = D6Ptr::dynamicCast(result);
-	    test(t);
-	    test(t->sd6 == "D6.sd6");
-	    test(t->innerD3 != 0);
-	    test(t->innerD3->ice_id() == "::Test::Base"); // Sliced.
-	}
-	catch(const Ice::Exception& ex)
-	{
-	    std::cerr << ex << std::endl;
-	    test(false);
-	}
     }
     cout << "ok" << endl;
 

Modified: ice/branches/preserve-graphs/cpp/test/Ice/slicing/objects/ClientPrivate.ice
URL: https://origsvn.digium.com/svn-view/hydra/ice/branches/preserve-graphs/cpp/test/Ice/slicing/objects/ClientPrivate.ice?view=diff&rev=623&r1=622&r2=623
==============================================================================
--- ice/branches/preserve-graphs/cpp/test/Ice/slicing/objects/ClientPrivate.ice (original)
+++ ice/branches/preserve-graphs/cpp/test/Ice/slicing/objects/ClientPrivate.ice Wed May 19 08:23:19 2010
@@ -30,7 +30,7 @@
 class D6 extends BU
 {
     string sd6;
-    D3 innerD3;
+    D5 innerD5;
 };
 
 class D7 extends BU