Rename shared_ptr testcase

CHANGES.current

@@ -7,6 +7,9 @@ the issue number to the end of the URL: https://github.com/swig/swig/issues/
 Version 3.0.13 (in progress)
 ============================
 
+2017-04-21: tamuratak
+            [Ruby] #964 - Add shared_ptr director typemaps.
+
 2017-04-20: tamuratak
             [Ruby] #930, #937 - Fix containers of std::shared_ptr.
             Upcasting, const types (eg vector<shared_ptr<const T>>) and NULL/nullptr support added.

Examples/test-suite/li_boost_shared_ptr_director.i

@@ -0,0 +1,90 @@
+%module(directors="1") "li_boost_shared_ptr_director"
+
+%{
+#include <boost/shared_ptr.hpp>
+%}
+
+%include "boost_shared_ptr.i";
+%shared_ptr(C);
+%feature("director") Base;
+
+%inline %{
+struct C {
+  C() : m(1) {};
+  C(int n) : m(n) {};
+  int get_m() { return m; };
+  int m;
+};
+
+struct Base {
+  Base() {};
+  virtual boost::shared_ptr<C> ret_c_shared_ptr() = 0;
+  virtual C ret_c_by_value() = 0;
+  virtual int take_c_by_value(C c) = 0;
+  virtual int take_c_shared_ptr_by_value(boost::shared_ptr<C> c) = 0;
+  virtual int take_c_shared_ptr_by_ref(boost::shared_ptr<C>& c) = 0;
+  virtual int take_c_shared_ptr_by_pointer(boost::shared_ptr<C>* c) = 0;
+  virtual int take_c_shared_ptr_by_pointer_ref(boost::shared_ptr<C>*const&c) = 0;
+  virtual ~Base() {}
+};
+
+int call_ret_c_shared_ptr(Base* b) {
+  boost::shared_ptr<C> ptr = b->ret_c_shared_ptr();
+  if (ptr) {
+    return ptr->get_m();
+  } else {
+    return -1;
+  }
+}
+
+int call_ret_c_by_value(Base* b) {
+  C c = b->ret_c_by_value();
+  return c.get_m();
+}
+
+int call_take_c_by_value(Base* b) {
+  C c(5);
+  return b->take_c_by_value(c);
+}
+
+int call_take_c_shared_ptr_by_value(Base* b) {
+  boost::shared_ptr<C> ptr(new C(6));
+  return b->take_c_shared_ptr_by_value(ptr);
+}
+
+int call_take_c_shared_ptr_by_value_with_null(Base* b) {
+  boost::shared_ptr<C> ptr;
+  return b->take_c_shared_ptr_by_value(ptr);
+}
+
+int call_take_c_shared_ptr_by_ref(Base* b) {
+  boost::shared_ptr<C> ptr(new C(7));
+  return b->take_c_shared_ptr_by_ref(ptr);
+}
+
+int call_take_c_shared_ptr_by_ref_with_null(Base* b) {
+  boost::shared_ptr<C> ptr;
+  return b->take_c_shared_ptr_by_ref(ptr);
+}
+
+int call_take_c_shared_ptr_by_pointer(Base* b) {
+  boost::shared_ptr<C> ptr(new C(8));
+  return b->take_c_shared_ptr_by_pointer(&ptr);
+}
+
+int call_take_c_shared_ptr_by_pointer_with_null(Base* b) {
+  boost::shared_ptr<C> ptr;
+  return b->take_c_shared_ptr_by_pointer(&ptr);
+}
+
+int call_take_c_shared_ptr_by_pointer_ref(Base* b) {
+  boost::shared_ptr<C> *ptr = new boost::shared_ptr<C>(new C(9));
+  return b->take_c_shared_ptr_by_pointer_ref(ptr);
+}
+
+int call_take_c_shared_ptr_by_pointer_ref_with_null(Base* b) {
+  boost::shared_ptr<C> *ptr = new boost::shared_ptr<C>();
+  return b->take_c_shared_ptr_by_pointer_ref(ptr);
+}
+
+%}

Examples/test-suite/ruby/Makefile.in

@@ -11,6 +11,7 @@ top_srcdir   = @top_srcdir@
 top_builddir = @top_builddir@
 
 CPP_TEST_CASES = \
+	li_boost_shared_ptr_director \
 	li_cstring \
 	li_factory \
 	li_std_functors \
@@ -34,7 +35,6 @@ CPP11_TEST_CASES = \
 	cpp11_hash_tables \
 	cpp11_shared_ptr_upcast \
 	cpp11_shared_ptr_const \
-	cpp11_shared_ptr_director
 
 C_TEST_CASES += \
 	li_cstring \

Examples/test-suite/ruby/li_boost_shared_ptr_director_runme.rb

@@ -0,0 +1,79 @@
+require 'li_boost_shared_ptr_director'
+
+include Li_boost_shared_ptr_director
+
+class Derived < Base
+
+  def initialize(flag)
+    @return_none = flag
+    super()
+  end
+
+  def ret_c_shared_ptr
+    if @return_none
+      nil
+    else
+      C.new
+    end
+  end
+
+  def ret_c_by_value
+    C.new
+  end
+
+  def take_c_by_value(c)
+    c.get_m
+  end
+
+  def take_c_shared_ptr_by_value(c)
+    if c
+      c.get_m
+    else
+      -2
+    end
+  end
+
+  def take_c_shared_ptr_by_ref(c)
+    if c
+      c.get_m
+    else
+      -3
+    end
+  end
+
+  def take_c_shared_ptr_by_pointer(c)
+    if c
+      c.get_m
+    else
+      -4
+    end
+  end
+
+  def take_c_shared_ptr_by_pointer_ref(c)
+    if c
+      c.get_m
+    else
+      -5
+    end
+  end
+
+end
+
+a = Derived.new(false)
+b = Derived.new(true)
+
+raise unless call_ret_c_shared_ptr(a) ==  1
+raise unless call_ret_c_shared_ptr(b) == -1
+raise unless call_ret_c_by_value(a)   ==  1
+
+raise unless call_take_c_by_value(a)                  == 5
+raise unless call_take_c_shared_ptr_by_value(a)       == 6
+raise unless call_take_c_shared_ptr_by_ref(a)         == 7
+raise unless call_take_c_shared_ptr_by_pointer(a)     == 8
+raise unless call_take_c_shared_ptr_by_pointer_ref(a) == 9
+
+raise unless call_take_c_shared_ptr_by_value_with_null(a)       == -2
+raise unless call_take_c_shared_ptr_by_ref_with_null(a)         == -3
+raise unless call_take_c_shared_ptr_by_pointer_with_null(a)     == -4
+raise unless call_take_c_shared_ptr_by_pointer_ref_with_null(a) == -5
+