Merge pull request swig#2205 from swig-fortran/extend-tests

Fix and add additional tests to test suite

Author: ojwb

Examples/test-suite/abstract_basecast.i

@@ -0,0 +1,20 @@
+%module abstract_basecast
+
+%inline %{
+class BaseClass {
+public:
+    virtual ~BaseClass() { }
+
+    virtual void g() = 0;
+};
+
+class DerivedClass : public BaseClass {
+public:
+
+    virtual void g() { }
+
+    BaseClass& f() {
+        return *this;
+    }
+};
+%}

Examples/test-suite/callback.i

@@ -13,6 +13,7 @@
 %callback("%s") A::foom;
 #endif
 %callback("%(uppercase)s_Cb_Ptr") foo_T;  // this works in Python too
+%callback("%s_cb") identity_finger;
 
 %inline %{
 
@@ -85,6 +86,15 @@
   const T& ident(const T& x) {
     return x;
   }
+
+  // Test callbacks for enum types
+  typedef enum {One, Two, Three, Four, Five} finger;
+  typedef finger (*finger_finger)(finger);
+  finger identity_finger(finger f) { return f; }
+  finger apply_finger_cb(finger f, finger_finger cb) {
+      return cb(f);
+  }
+
 %}
 
 %template(foo_i) foo_T<int>;

Examples/test-suite/class_scope_namespace.i

@@ -15,6 +15,7 @@ namespace Space1 {
     void aaa(Space1::SubSpace1::A, SubSpace1::A, A) {}
   }
 }
+void global_namespace_a(A*) {}
 
 namespace Space2 {
   struct B;

Examples/test-suite/clientdata_prop_a.h

@@ -6,7 +6,7 @@ class A {
 
 typedef A tA;
 
-void test_A(A *a) {}
-void test_tA(tA *a) {}
+inline void test_A(A *a) {}
+inline void test_tA(tA *a) {}
 
-tA *new_tA() { return new tA(); }
+inline tA *new_tA() { return new tA(); }

Examples/test-suite/common.mk

@@ -102,6 +102,7 @@ C_TEST_BROKEN += \
 # C++ test cases. (Can be run individually using: make testcase.cpptest)
 CPP_TEST_CASES += \
 	abstract_access \
+	abstract_basecast \
 	abstract_inherit \
 	abstract_inherit_ok \
 	abstract_signature \
@@ -213,6 +214,7 @@ CPP_TEST_CASES += \
 	director_protected_overloaded \
 	director_redefined \
 	director_ref \
+	director_simple \
 	director_smartptr \
 	director_thread \
 	director_unroll \
@@ -696,6 +698,7 @@ C_TEST_CASES += \
 	command_line_define \
 	const_const \
 	constant_expr_c \
+	contract_c \
 	default_args_c \
 	empty_c \
 	enums \

Examples/test-suite/contract.i

@@ -48,6 +48,7 @@ int test_prepost(int x, int y) {
 }
 %}
 
+#ifdef __cplusplus
 /* Class tests */
 
 %contract Foo::test_preassert(int x, int y) {
@@ -235,4 +236,4 @@ class myClass
 };
 
 }
-
+#endif

Examples/test-suite/contract_c.i

@@ -0,0 +1,5 @@
+%module contract_c;
+
+%include <exception.i>
+
+%include "contract.i"

Examples/test-suite/cpp_basic.i

@@ -45,6 +45,9 @@ class FooSubSub : public FooSub {
     const char* __str__() const { return "FooSubSub"; }
 };
 
+Foo& get_reference(Foo& other) { return other; }
+const Foo& get_const_reference(const Foo& other) { return other; }
+
 %}
 
 %{

Examples/test-suite/director_binary_string.i

@@ -8,6 +8,7 @@
 
 %inline %{
 #include <stdlib.h>
+#include <string.h>
 
 #define BUFFER_SIZE_AA 8
 #define BUFFER_SIZE_BB 5

Examples/test-suite/director_simple.i

@@ -0,0 +1,42 @@
+%module(directors="1") director_simple
+
+%feature("director") IntBase;
+%feature("director") BoolBase;
+
+%inline %{
+class IntBase {
+ public:
+  virtual ~IntBase() {}
+  IntBase(int i = 3) { (void)i; }
+  virtual int apply(int x) const { return x * 2; }
+};
+
+class IntDerived : public IntBase {
+ public:
+  virtual int apply(int x) const { return x * 3; }
+};
+
+int apply(const IntBase& b, int x)
+{
+  return b.apply(x);
+}
+
+class BoolBase {
+ public:
+  virtual ~BoolBase() {}
+  BoolBase() {}
+  virtual bool apply(bool a, bool b) const = 0;
+};
+
+class BoolDerived : public BoolBase {
+ public:
+  virtual bool apply(bool a, bool b) const { return a != b; }
+};
+
+bool apply(const BoolBase& base, bool a, bool b)
+{
+  return base.apply(a, b);
+}
+
+%}
+