From 6db71c690a8ef6032eab89298fd98c0550bf285f Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Mon, 16 Jan 2017 07:46:03 +0000
Subject: [PATCH] Add template_default_cache runtime tests

Also correct illegal C++ namespace names
---
 .../java/template_default_cache_runme.java     | 18 ++++++++++++++++++
 .../python/template_default_cache_runme.py     |  9 +++++++++
 Examples/test-suite/template_default_cache.i   | 14 +++++++-------
 3 files changed, 34 insertions(+), 7 deletions(-)
 create mode 100644 Examples/test-suite/java/template_default_cache_runme.java
 create mode 100644 Examples/test-suite/python/template_default_cache_runme.py

diff --git a/Examples/test-suite/java/template_default_cache_runme.java b/Examples/test-suite/java/template_default_cache_runme.java
new file mode 100644
index 000000000..90b584261
--- /dev/null
+++ b/Examples/test-suite/java/template_default_cache_runme.java
@@ -0,0 +1,18 @@
+import template_default_cache.*;
+
+public class template_default_cache_runme {
+
+  static {
+    try {
+	System.loadLibrary("template_default_cache");
+    } catch (UnsatisfiedLinkError e) {
+      System.err.println("Native code library failed to load. See the chapter on Dynamic Linking Problems in the SWIG Java documentation for help.\n" + e);
+      System.exit(1);
+    }
+  }
+
+  public static void main(String argv[]) {
+    AModelPtr ap = template_default_cache.get_mp_a();
+    BModelPtr bp = template_default_cache.get_mp_b();
+  }
+}
diff --git a/Examples/test-suite/python/template_default_cache_runme.py b/Examples/test-suite/python/template_default_cache_runme.py
new file mode 100644
index 000000000..ffe155acf
--- /dev/null
+++ b/Examples/test-suite/python/template_default_cache_runme.py
@@ -0,0 +1,9 @@
+import template_default_cache
+
+ap = template_default_cache.get_mp_a();
+bp = template_default_cache.get_mp_b();
+
+if not isinstance(ap, template_default_cache.AModelPtr):
+    raise RuntimeError("get_mp_a fail")
+if not isinstance(bp, template_default_cache.BModelPtr):
+    raise RuntimeError("get_mp_b fail")
diff --git a/Examples/test-suite/template_default_cache.i b/Examples/test-suite/template_default_cache.i
index b7ef9e869..70bccd595 100644
--- a/Examples/test-suite/template_default_cache.i
+++ b/Examples/test-suite/template_default_cache.i
@@ -6,10 +6,10 @@
     }
 %}
 
-%ignore ns__a::iface1::Model;
+%ignore ns_a::iface1::Model;
 
 %inline %{
-namespace ns__a {
+namespace ns_a {
     namespace iface1 {
         class Model {};
         typedef d::d<Model> ModelPtr;
@@ -19,17 +19,17 @@ namespace ns__a {
 %}
 
 %inline %{
-namespace ns__b {
+namespace ns_b {
     namespace iface1 {
         class Model {
         public:
-            ns__a::ModelPtr foo() { return ns__a::ModelPtr(); };
+            ns_a::ModelPtr foo() { return ns_a::ModelPtr(); };
         };
         typedef d::d<Model> ModelPtr;
-        ns__a::ModelPtr get_mp_a() { return ns__a::ModelPtr(); }
+        ns_a::ModelPtr get_mp_a() { return ns_a::ModelPtr(); }
         ModelPtr get_mp_b() { return ModelPtr(); }
     }
  }
 %}
-%template(AModelPtr) d::d<ns__a::iface1::Model>;
-%template(BModelPtr) d::d<ns__b::iface1::Model>;
+%template(AModelPtr) d::d<ns_a::iface1::Model>;
+%template(BModelPtr) d::d<ns_b::iface1::Model>;