intrusive_ptr_hook の deleter 指定のテストを追加

diff --git a/tests/intrusive_ptr_hook.cc b/tests/intrusive_ptr_hook.cc
old mode 100644 (file)
new mode 100755 (executable)
index cbd8904..a2c8449
--- a/tests/intrusive_ptr_hook.cc
+++ b/tests/intrusive_ptr_hook.cc
@@ -14,6 +14,7 @@ struct simple
   static int instances;
   
   simple() { ++instances; }
+  simple( simple const& src ) : gintenlib::intrusive_ptr_hook<simple>(src) { ++instances; }
   ~simple() throw () { --instances; }
   
   int use_count() const
@@ -30,6 +31,7 @@ void simple_test()
   {
     // 通常の生成と破棄
     simple const x;
+    
     BOOST_CHECK( simple::instances == 1 );
     BOOST_CHECK( x.use_count() == 0 );
   }
@@ -37,11 +39,14 @@ void simple_test()
   {
     // 本番
     boost::intrusive_ptr<simple const> p1( new simple ), p2( new simple );
+    
     BOOST_CHECK( simple::instances == 2 );
     BOOST_CHECK( p1->use_count() == 1 );
     BOOST_CHECK( p2->use_count() == 1 );
+    
     // 移動させてカウントを変化させる
     p2 = p1;
+    
     BOOST_CHECK( simple::instances == 1 );
     BOOST_CHECK( p1->use_count() == 2 );
     BOOST_CHECK( p2->use_count() == 2 );
@@ -49,9 +54,86 @@ void simple_test()
   BOOST_CHECK( simple::instances == 0 );
 }
 
+// 複雑な例
+class compound;
+// 削除子（状態を持つ）
+// 例なのでシンプルに、int を持たせただけのデリータを使う
+struct compound_deleter
+{
+  compound_deleter()
+    : x() {}
+  explicit compound_deleter( int x_ )
+    : x( x_ ) {}
+
+  template<typename T>
+  void operator()( T* p )
+  {
+    delete p;
+  }
+
+  int x;
+};
+
+struct compound
+  : gintenlib::intrusive_ptr_hook<compound, compound_deleter>
+{
+  typedef gintenlib::intrusive_ptr_hook<compound, compound_deleter> base;
+  static int instances;
+  
+  compound() { ++instances; }
+  compound( compound const& src ) : base(src) { ++instances; }
+  ~compound() throw () { --instances; }
+  
+  int use_count() const
+  {
+    return intrusive_ptr_use_count( this );
+  }
+
+  int  x() const { return base::get_deleter().x; }
+  int& x()       { return base::get_deleter().x; }
+
+};
+int compound::instances = 0;
+
+void compound_test()
+{
+  BOOST_CHECK( compound::instances == 0 );
+  {
+    // 通常の生成と破棄
+    compound x;
+    
+    BOOST_CHECK( compound::instances == 1 );
+    BOOST_CHECK( x.use_count() == 0 );
+
+    // コピー（削除子はコピーされないことを確認）
+    x.x() = 13;
+    compound const y = x;
+    BOOST_CHECK( x.x() == 13 );
+    BOOST_CHECK( y.x() ==  0 );
+  }
+  BOOST_CHECK( compound::instances == 0 );
+  {
+    // 本番
+    boost::intrusive_ptr<compound const> p1( new compound ), p2( new compound );
+    
+    BOOST_CHECK( compound::instances == 2 );
+    BOOST_CHECK( p1->use_count() == 1 );
+    BOOST_CHECK( p2->use_count() == 1 );
+    
+    // 移動させてカウントを変化させる
+    p2 = p1;
+    
+    BOOST_CHECK( compound::instances == 1 );
+    BOOST_CHECK( p1->use_count() == 2 );
+    BOOST_CHECK( p2->use_count() == 2 );
+  }
+  BOOST_CHECK( compound::instances == 0 );
+}
+
 int test_main( int, char** )
 {
   simple_test();
+  compound_test();
   
   return 0;
 }