summaryrefslogtreecommitdiff
path: root/java/test/Ice/operations/MyDerivedClassI.java
diff options
context:
space:
mode:
authorMichi Henning <michi@zeroc.com>2009-02-05 15:09:41 +1000
committerMichi Henning <michi@zeroc.com>2009-02-05 15:09:41 +1000
commite68d6483186e4f7823267120a82d32a6e0fb6906 (patch)
tree9f672656d79d966e1b9b6f4e96f75e62d38c7899 /java/test/Ice/operations/MyDerivedClassI.java
parentFixed compilation bug with VC60. (diff)
downloadice-e68d6483186e4f7823267120a82d32a6e0fb6906.tar.bz2
ice-e68d6483186e4f7823267120a82d32a6e0fb6906.tar.xz
ice-e68d6483186e4f7823267120a82d32a6e0fb6906.zip
Bug 3373: struct as dictionary keys not tested.
Added tests for C++, Java, C#, Python, PHP, and Ruby. C++, Java, C#, and Python tests pass. Did not test PHP. Ruby test fails: the operation returns a dictionary that does not contain the expected value.
Diffstat (limited to 'java/test/Ice/operations/MyDerivedClassI.java')
-rw-r--r--java/test/Ice/operations/MyDerivedClassI.java12
1 files changed, 12 insertions, 0 deletions
diff --git a/java/test/Ice/operations/MyDerivedClassI.java b/java/test/Ice/operations/MyDerivedClassI.java
index 13ea6a2c086..025b466dd58 100644
--- a/java/test/Ice/operations/MyDerivedClassI.java
+++ b/java/test/Ice/operations/MyDerivedClassI.java
@@ -284,6 +284,18 @@ public final class MyDerivedClassI extends Test.MyDerivedClass
return r;
}
+ public java.util.Map<Test.MyStruct, Test.MyEnum>
+ opMyStructMyEnumD(java.util.Map p1, java.util.Map p2,
+ Test.MyStructMyEnumDHolder p3,
+ Ice.Current current)
+ {
+ p3.value = p1;
+ java.util.Map<Test.MyStruct, Test.MyEnum> r = new java.util.HashMap<Test.MyStruct, Test.MyEnum>();
+ r.putAll(p1);
+ r.putAll(p2);
+ return r;
+ }
+
public int[]
opIntS(int[] s, Ice.Current current)
{