Improve test for shared_from_this

git-svn-id: file:///git/lcgcool.svndb/cool/trunk@19399 4525493e-7705-40b1-a816-d608a930855b

RelationalCool/tests/RalDatabase/test_RalDatabase.cpp

@@ -187,21 +187,14 @@ public:
     {
       Derived* pD = new Derived();
       std::cout << "Derived* = " << pD << std::endl;
-      std::cout << "Base* = " << (Base*)pD << std::endl;
-      std::shared_ptr<Base> spB1( (Base*)pD );
+      std::cout << "Base*    = " << (Base*)pD << std::endl;
+      std::shared_ptr<Base> spB1( (Base*)pD ); // uses ctor<Base> which is a different method than ctor<Derived> within shared_ptr<Base>!
       CPPUNIT_ASSERT_EQUAL_MESSAGE( "CountB1 = 1", 1l, spB1.use_count() );
       CPPUNIT_ASSERT_EQUAL_MESSAGE( "Derived*", pD, dynamic_cast<Derived*>( spB1.get() ) );
-      std::cout << "... about to throw?" << std::endl;
-      std::shared_ptr<Base> spB2 = pD->shared_from_this(); // throws bad_weak_ptr
-
-      std::cout << "... did not throw?" << std::endl;
-      CPPUNIT_ASSERT_EQUAL_MESSAGE( "CountB1 = 2", 2l, spB1.use_count() );
-      CPPUNIT_ASSERT_EQUAL_MESSAGE( "CountB2 = 2", 2l, spB2.use_count() );
+      CPPUNIT_ASSERT_THROW( pD->shared_from_this(), std::bad_weak_ptr ); // I guess this throws because ctor<Derived> was not called for this...
+      CPPUNIT_ASSERT_EQUAL_MESSAGE( "CountB1 = 1", 1l, spB1.use_count() );
       spB1.reset();
       CPPUNIT_ASSERT_EQUAL_MESSAGE( "CountB1 = 0", 0l, spB1.use_count() );
-      CPPUNIT_ASSERT_EQUAL_MESSAGE( "CountB2 = 1", 1l, spB2.use_count() );
-      spB2.reset();
-      CPPUNIT_ASSERT_EQUAL_MESSAGE( "CountB2 = 0", 0l, spB2.use_count() );
     }
 #endif
   }