Fixed slice2matlab generated code type for dictionary data members

Close #256

3 files changed, 38 insertions, 0 deletions

diff --git a/python/test/Ice/objects/AllTests.py b/python/test/Ice/objects/AllTests.py
index 5f59683ff33..2f6a5f0fee5 100644
--- a/python/test/Ice/objects/AllTests.py
+++ b/python/test/Ice/objects/AllTests.py
@@ -320,4 +320,24 @@ def allTests(helper, communicator):
     test(communicator.getValueFactoryManager().find("TestOF") != None)
     print("ok")
 
+    sys.stdout.write("testing class containing complex dictionary... ")
+    sys.stdout.flush()
+    m = Test.M()
+    m.v = {}
+    k1 = Test.StructKey(1, "1")
+    m.v[k1] = Test.L("one")
+    k2 = Test.StructKey(2, "2")
+    m.v[k2] = Test.L("two")
+    m1, m2 = initial.opM(m)
+    test(len(m1.v) == 2)
+    test(len(m2.v) == 2)
+
+    test(m1.v[k1].data == "one")
+    test(m2.v[k1].data == "one")
+
+    test(m1.v[k2].data == "two")
+    test(m2.v[k2].data == "two")
+
+    print("ok")
+
     return initial
diff --git a/python/test/Ice/objects/Test.ice b/python/test/Ice/objects/Test.ice
index 417891a894f..1bf545c88df 100644
--- a/python/test/Ice/objects/Test.ice
+++ b/python/test/Ice/objects/Test.ice
@@ -185,6 +185,19 @@ class L
 sequence<Value> ValueSeq;
 dictionary<string, Value> ValueMap;
 
+struct StructKey
+{
+    int i;
+    string s;
+}
+
+dictionary<StructKey, L> LMap;
+
+class M
+{
+    LMap v;
+}
+
 interface Initial
 {
     void shutdown();
@@ -228,6 +241,8 @@ interface Initial
 
     void throwInnerEx() throws Inner::Ex;
     void throwInnerSubEx() throws Inner::Sub::Ex;
+
+    M opM(M v1, out M v2);
 }
 
 }
diff --git a/python/test/Ice/objects/TestI.py b/python/test/Ice/objects/TestI.py
index 83cb67e51a8..121ea779941 100644
--- a/python/test/Ice/objects/TestI.py
+++ b/python/test/Ice/objects/TestI.py
@@ -195,6 +195,9 @@ class InitialI(Test.Initial):
     def throwInnerSubEx(self, current=None):
         raise Test.Inner.Sub.Ex("Inner::Sub::Ex")
 
+    def opM(self, m, current=None):
+        return (m, m)
+
 class UnexpectedObjectExceptionTestI(Test.UnexpectedObjectExceptionTest):
     def op(self, current=None):
         return Test.AlsoEmpty()