diff --git a/Examples/test-suite/director_wombat.i b/Examples/test-suite/director_wombat.i index d32a9f7b1..56043a291 100644 --- a/Examples/test-suite/director_wombat.i +++ b/Examples/test-suite/director_wombat.i @@ -22,7 +22,9 @@ class Bar public: virtual ~Bar(); virtual Foo_int *meth(); - virtual void foo_meth(Foo_int &, int); + virtual void foo_meth_ref(Foo_int &, int); + virtual void foo_meth_ptr(Foo_int *, int); + virtual void foo_meth_val(Foo_int, int); }; Bar::~Bar() @@ -34,10 +36,9 @@ Bar::meth() return new Foo_int(); } -void -Bar::foo_meth(Foo_int &arg, int param) -{ -} +void Bar::foo_meth_ref(Foo_int &arg, int param) { } +void Bar::foo_meth_ptr(Foo_int *arg, int param) { } +void Bar::foo_meth_val(Foo_int arg, int param) { } %} %template(Foo_integers) Foo; diff --git a/Examples/test-suite/java/director_wombat_runme.java b/Examples/test-suite/java/director_wombat_runme.java index 7a0bb6677..575d8d7f1 100644 --- a/Examples/test-suite/java/director_wombat_runme.java +++ b/Examples/test-suite/java/director_wombat_runme.java @@ -39,7 +39,9 @@ public class director_wombat_runme b.delete(); b = new director_wombat_Bar_derived_1(); - b.foo_meth(a, 0); + b.foo_meth_ref(a, 0); + b.foo_meth_ptr(a, 1); + b.foo_meth_val(a, 2); } } @@ -71,10 +73,22 @@ class director_wombat_Bar_derived_1 extends Bar super(); } - public void foo_meth(Foo_integers foo_obj, int param) + public void foo_meth_ref(Foo_integers foo_obj, int param) { if (!(foo_obj instanceof director_wombat_Foo_integers_derived_2)) { - throw new RuntimeException ("Test failed: foo_obj is not director_wombat_Foo_integers_derived_2, got " + foo_obj); + throw new RuntimeException ("Test failed: foo_obj in foo_meth_ref is not director_wombat_Foo_integers_derived_2, got " + foo_obj); + } + } + public void foo_meth_ptr(Foo_integers foo_obj, int param) + { + if (!(foo_obj instanceof director_wombat_Foo_integers_derived_2)) { + throw new RuntimeException ("Test failed: foo_obj in foo_meth_ptr is not director_wombat_Foo_integers_derived_2, got " + foo_obj); + } + } + public void foo_meth_val(Foo_integers foo_obj, int param) + { + if (!(foo_obj instanceof director_wombat_Foo_integers_derived_2)) { + throw new RuntimeException ("Test failed: foo_obj in foo_meth_val is not director_wombat_Foo_integers_derived_2, got " + foo_obj); } } }