diff options
| author | Jose <jose@zeroc.com> | 2019-08-08 12:35:27 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2019-08-08 12:35:27 +0200 |
| commit | b8b04d7ffd9774210bc78a3b51758eb88780c1d0 (patch) | |
| tree | cd1768a2a86ea3e09964f32e66f16c01c14aea8e /ruby | |
| parent | Minor fix for Glacier2/SessionRouterI - See #30 (diff) | |
| download | ice-b8b04d7ffd9774210bc78a3b51758eb88780c1d0.tar.bz2 ice-b8b04d7ffd9774210bc78a3b51758eb88780c1d0.tar.xz ice-b8b04d7ffd9774210bc78a3b51758eb88780c1d0.zip | |
Additional fixes for Ice/optional Swift cross testing
Diffstat (limited to 'ruby')
| -rw-r--r-- | ruby/test/Ice/optional/AllTests.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ruby/test/Ice/optional/AllTests.rb b/ruby/test/Ice/optional/AllTests.rb index 726f9428d1a..ddb12631447 100644 --- a/ruby/test/Ice/optional/AllTests.rb +++ b/ruby/test/Ice/optional/AllTests.rb @@ -171,7 +171,11 @@ def allTests(helper, communicator) test(mo5.h == mo1.h) test(mo5.i == mo1.i) test(mo5.j == mo1.j) - test(mo5.k == nil) + # + # With Swift mapping you cannot distinguish null from unset + # so we test for both here to support cross testing. + # + test(mo5.k == nil || Ice::Unset) test(mo5.bs.unpack("C*") == [0x05]) test(mo5.ss == mo1.ss) test(mo5.iid[4] == 3) |