diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2016-04-26 09:00:57 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2016-04-26 09:00:57 +0200 |
| commit | c2ce37b7b0f6fc033cac4d52d460ee2f389d7737 (patch) | |
| tree | dab204bc1dfd9298c7acb13b9493a210f8c4e978 /ruby/test | |
| parent | Add jquery-cookie to bower dependency (diff) | |
| download | ice-c2ce37b7b0f6fc033cac4d52d460ee2f389d7737.tar.bz2 ice-c2ce37b7b0f6fc033cac4d52d460ee2f389d7737.tar.xz ice-c2ce37b7b0f6fc033cac4d52d460ee2f389d7737.zip | |
Fixed ICE-7115 - unmarshalling bug with optional parameters
Diffstat (limited to 'ruby/test')
| -rw-r--r-- | ruby/test/Ice/optional/AllTests.rb | 6 | ||||
| -rw-r--r-- | ruby/test/Ice/optional/ClientPrivate.ice | 2 | ||||
| -rw-r--r-- | ruby/test/Ice/optional/Test.ice | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/ruby/test/Ice/optional/AllTests.rb b/ruby/test/Ice/optional/AllTests.rb index da003618a69..167eddc9f37 100644 --- a/ruby/test/Ice/optional/AllTests.rb +++ b/ruby/test/Ice/optional/AllTests.rb @@ -318,8 +318,7 @@ def allTests(communicator) outer = Test::Recursive.new outer.value = recursive1 initial.pingPong(outer) - - + g = Test::G.new g.gg1Opt = Test::G1.new("gg1Opt") g.gg2 = Test::G2.new(10) @@ -331,6 +330,9 @@ def allTests(communicator) test(r.gg2Opt.a == 20) test(r.gg1.a == "gg1") + initial2 = Test::Initial2Prx::uncheckedCast(base) + initial2.opVoid(15, "test"); + puts "ok" print "testing marshaling of large containers with fixed size elements... " diff --git a/ruby/test/Ice/optional/ClientPrivate.ice b/ruby/test/Ice/optional/ClientPrivate.ice index 9a173d452e1..5dd08613b9a 100644 --- a/ruby/test/Ice/optional/ClientPrivate.ice +++ b/ruby/test/Ice/optional/ClientPrivate.ice @@ -32,6 +32,8 @@ class D extends B class Initial2 { void opClassAndUnknownOptional(A p, optional(1) Object o); + + void opVoid(optional(1) int a, optional(2) string v); }; }; diff --git a/ruby/test/Ice/optional/Test.ice b/ruby/test/Ice/optional/Test.ice index 5a66b8be45d..00751400009 100644 --- a/ruby/test/Ice/optional/Test.ice +++ b/ruby/test/Ice/optional/Test.ice @@ -276,9 +276,11 @@ class Initial void sendOptionalClass(bool req, optional(1) OneOptional o); void returnOptionalClass(bool req, out optional(1) OneOptional o); - + G opG(G g); + void opVoid(); + bool supportsRequiredParams(); bool supportsJavaSerializable(); |