r2corba 1.5.4 → 1.5.5
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.rdoc +2 -1
- data/ext/extload/extload.c +5 -6
- data/ext/libr2tao/object.cpp +4 -4
- data/ext/libr2tao/orb.cpp +8 -8
- data/ext/libr2tao/r2tao_ext.h +0 -12
- data/ext/libr2tao/required.cpp +2 -2
- data/ext/libr2tao/required.h +9 -11
- data/ext/libr2tao/values.cpp +5 -5
- data/ext/libr2tao/values.h +19 -19
- data/ext/librpoa/iortable.cpp +3 -3
- data/ext/librpoa/poa.cpp +7 -7
- data/ext/librpoa/servant.cpp +15 -90
- data/ext/librpoa/servant.h +13 -35
- data/lib/corba/cbase/ORB.rb +7 -7
- data/lib/corba/cbase/Streams.rb +2 -2
- data/lib/corba/cbase/Typecode.rb +6 -6
- data/lib/corba/cbase/exception.rb +2 -2
- data/lib/corba/cbase/policies.rb +1 -1
- data/lib/corba/cmds/base.rb +1 -1
- data/lib/corba/common/Any.rb +1 -1
- data/lib/corba/common/ORB.rb +1 -1
- data/lib/corba/common/Object.rb +0 -1
- data/lib/corba/common/Stub.rb +1 -1
- data/lib/corba/common/Typecode.rb +34 -34
- data/lib/corba/common/const.rb +2 -2
- data/lib/corba/common/version.rb +1 -1
- data/lib/corba/jbase/Any.rb +23 -23
- data/lib/corba/jbase/ORB.rb +3 -3
- data/lib/corba/jbase/Request.rb +5 -5
- data/lib/corba/jbase/Servant.rb +10 -10
- data/lib/corba/jbase/ServerRequest.rb +7 -7
- data/lib/corba/jbase/Streams.rb +3 -3
- data/lib/corba/jbase/Typecode.rb +14 -14
- data/lib/corba/jbase/exception.rb +1 -1
- data/lib/corba/jbase/poa.rb +2 -2
- data/lib/corba/jbase/policies.rb +3 -3
- data/lib/corba/poa.rb +1 -1
- data/lib/corba/policies.rb +1 -1
- data/lib/corba/require.rb +2 -2
- data/lib/corba/svcs/ins/cos_naming.rb +27 -27
- data/lib/corba/svcs/ins/ins.rb +17 -17
- data/lib/corba/svcs/ins/naming_service.rb +2 -2
- data/lib/ridlbe/ruby/config.rb +10 -10
- data/lib/ridlbe/ruby/walker.rb +21 -21
- data/mkrf_conf_srcgem.rb +5 -5
- data/rakelib/bin.rake +1 -1
- data/rakelib/bin.rb +3 -3
- data/rakelib/build.rake +15 -15
- data/rakelib/config.rb +13 -13
- data/rakelib/ext.rake +3 -5
- data/rakelib/ext.rb +13 -13
- data/rakelib/ext_r2tao.rb +12 -18
- data/rakelib/gem.rake +5 -5
- data/rakelib/gem.rb +5 -5
- data/test/BiDirectional/client.rb +3 -3
- data/test/BiDirectional/run_test.rb +1 -1
- data/test/BiDirectional/server.rb +4 -5
- data/test/CORBA_Services/Naming/BindingIterator/client.rb +5 -5
- data/test/CORBA_Services/Naming/BindingIterator/run_test.rb +1 -1
- data/test/CORBA_Services/Naming/BindingIterator/server.rb +4 -4
- data/test/CORBA_Services/Naming/Corbaname/client.rb +3 -3
- data/test/CORBA_Services/Naming/Corbaname/run_test.rb +1 -1
- data/test/CORBA_Services/Naming/Corbaname/server.rb +10 -10
- data/test/CORBA_Services/Naming/Simple/client.rb +4 -4
- data/test/CORBA_Services/Naming/Simple/run_test.rb +1 -1
- data/test/CORBA_Services/Naming/Simple/server.rb +4 -4
- data/test/Collocation/test.rb +2 -2
- data/test/Connect_Timeout/client.rb +3 -4
- data/test/DII/client.rb +5 -5
- data/test/DII/run_test.rb +1 -1
- data/test/DII/server.rb +3 -3
- data/test/DSI/client.rb +3 -3
- data/test/DSI/run_test.rb +1 -1
- data/test/DSI/server.rb +3 -3
- data/test/Exceptions/client.rb +4 -4
- data/test/Exceptions/run_test.rb +1 -1
- data/test/Exceptions/server.rb +3 -3
- data/test/Hello/client.rb +3 -3
- data/test/Hello/run_test.rb +1 -1
- data/test/Hello/server.rb +3 -3
- data/test/IDL_Test/client.rb +3 -3
- data/test/IDL_Test/run_test.rb +1 -1
- data/test/IDL_Test/server.rb +3 -3
- data/test/IORMap/client.rb +3 -3
- data/test/IORMap/run_test.rb +1 -1
- data/test/IORMap/server.rb +4 -4
- data/test/IORTable/client.rb +3 -3
- data/test/IORTable/run_test.rb +1 -1
- data/test/IORTable/server.rb +4 -4
- data/test/Implicit_Conversion/client.rb +4 -4
- data/test/Implicit_Conversion/run_test.rb +1 -1
- data/test/Implicit_Conversion/server.rb +3 -3
- data/test/Multi_Threading/Multiple_ORB/client.rb +3 -3
- data/test/Multi_Threading/Multiple_ORB/run_test.rb +2 -2
- data/test/Multi_Threading/Multiple_ORB/server.rb +3 -3
- data/test/Multi_Threading/Simple/client.rb +4 -4
- data/test/Multi_Threading/Simple/run_test.rb +1 -1
- data/test/Multi_Threading/Simple/server.rb +3 -3
- data/test/Multi_Threading/Threads/client.rb +3 -3
- data/test/Multi_Threading/Threads/run_test.rb +1 -1
- data/test/Multi_Threading/Threads/server.rb +4 -4
- data/test/Multi_Threading/Threads/watchdog.rb +3 -3
- data/test/Multiple_Servant_Interfaces/client.rb +3 -3
- data/test/Multiple_Servant_Interfaces/run_test.rb +1 -1
- data/test/Multiple_Servant_Interfaces/server.rb +3 -3
- data/test/Nil/test.rb +3 -4
- data/test/OBV/AbstractInterface/client.rb +3 -3
- data/test/OBV/AbstractInterface/run_test.rb +1 -1
- data/test/OBV/AbstractInterface/server.rb +3 -3
- data/test/OBV/Custom/client.rb +3 -3
- data/test/OBV/Custom/run_test.rb +1 -1
- data/test/OBV/Custom/server.rb +3 -3
- data/test/OBV/Simple/client.rb +3 -3
- data/test/OBV/Simple/run_test.rb +1 -1
- data/test/OBV/Simple/server.rb +3 -3
- data/test/OBV/Simple_Event/client.rb +3 -3
- data/test/OBV/Simple_Event/run_test.rb +1 -1
- data/test/OBV/Simple_Event/server.rb +3 -3
- data/test/OBV/Supports/client.rb +3 -3
- data/test/OBV/Supports/run_test.rb +1 -1
- data/test/OBV/Supports/server.rb +3 -3
- data/test/OBV/Tree/client.rb +3 -3
- data/test/OBV/Tree/run_test.rb +1 -1
- data/test/OBV/Tree/server.rb +3 -3
- data/test/OBV/Truncatable/Truncatable_impl.rb +1 -1
- data/test/OBV/Truncatable/client.rb +4 -4
- data/test/OBV/Truncatable/run_test.rb +1 -1
- data/test/OBV/Truncatable/server.rb +3 -3
- data/test/OBV/ValueBox/client.rb +44 -44
- data/test/OBV/ValueBox/run_test.rb +1 -1
- data/test/OBV/ValueBox/server.rb +29 -29
- data/test/Object/client.rb +4 -4
- data/test/Object/run_test.rb +1 -1
- data/test/Object/server.rb +3 -3
- data/test/POA/test.rb +3 -3
- data/test/Param_Test/client.rb +6 -6
- data/test/Param_Test/run_test.rb +1 -1
- data/test/Param_Test/server.rb +6 -6
- data/test/Performance/Simple/client.rb +3 -3
- data/test/Performance/Simple/run_test.rb +1 -1
- data/test/Performance/Simple/server.rb +3 -3
- data/test/Policies/test.rb +2 -3
- data/test/Timeout/client.rb +6 -6
- data/test/Timeout/run_test.rb +1 -1
- data/test/Timeout/server.rb +4 -4
- data/test/lib/assert.rb +0 -1
- data/test/lib/test.rb +14 -15
- data/test/test_runner.rb +5 -6
- metadata +4 -6
- data/ext/librpoa/srvreq_fix.cpp +0 -282
- data/ext/librpoa/srvreq_fix.h +0 -148
@@ -33,13 +33,13 @@ ARGV.options do |opts|
|
|
33
33
|
|
34
34
|
opts.on("--k IORFILE",
|
35
35
|
"Set IOR.",
|
36
|
-
"Default: 'file://server.ior'") { |v| OPTIONS[:iorfile]=v }
|
36
|
+
"Default: 'file://server.ior'") { |v| OPTIONS[:iorfile] = v }
|
37
37
|
opts.on("--d LVL",
|
38
38
|
"Set ORBDebugLevel value.",
|
39
|
-
"Default: 0") { |v| OPTIONS[:orb_debuglevel]=v }
|
39
|
+
"Default: 0") { |v| OPTIONS[:orb_debuglevel] = v }
|
40
40
|
opts.on("--use-implement",
|
41
41
|
"Load IDL through CORBA.implement() instead of precompiled code.",
|
42
|
-
"Default: off") { |v| OPTIONS[:use_implement]=v }
|
42
|
+
"Default: off") { |v| OPTIONS[:use_implement] = v }
|
43
43
|
|
44
44
|
opts.separator ""
|
45
45
|
|
@@ -25,13 +25,13 @@ ARGV.options do |opts|
|
|
25
25
|
|
26
26
|
opts.on("--o IORFILE",
|
27
27
|
"Set IOR filename.",
|
28
|
-
"Default: 'server.ior'") { |v| OPTIONS[:iorfile]=v }
|
28
|
+
"Default: 'server.ior'") { |v| OPTIONS[:iorfile] = v }
|
29
29
|
opts.on("--d LVL",
|
30
30
|
"Set ORBDebugLevel value.",
|
31
|
-
"Default: 0") { |v| OPTIONS[:orb_debuglevel]=v }
|
31
|
+
"Default: 0") { |v| OPTIONS[:orb_debuglevel] = v }
|
32
32
|
opts.on("--use-implement",
|
33
33
|
"Load IDL through CORBA.implement() instead of precompiled code.",
|
34
|
-
"Default: off") { |v| OPTIONS[:use_implement]=v }
|
34
|
+
"Default: off") { |v| OPTIONS[:use_implement] = v }
|
35
35
|
|
36
36
|
opts.separator ""
|
37
37
|
|
data/test/OBV/Custom/client.rb
CHANGED
@@ -27,13 +27,13 @@ ARGV.options do |opts|
|
|
27
27
|
|
28
28
|
opts.on("--k IORFILE",
|
29
29
|
"Set IOR.",
|
30
|
-
"Default: 'file://server.ior'") { |v| OPTIONS[:iorfile]=v }
|
30
|
+
"Default: 'file://server.ior'") { |v| OPTIONS[:iorfile] = v }
|
31
31
|
opts.on("--d LVL",
|
32
32
|
"Set ORBDebugLevel value.",
|
33
|
-
"Default: 0") { |v| OPTIONS[:orb_debuglevel]=v }
|
33
|
+
"Default: 0") { |v| OPTIONS[:orb_debuglevel] = v }
|
34
34
|
opts.on("--use-implement",
|
35
35
|
"Load IDL through CORBA.implement() instead of precompiled code.",
|
36
|
-
"Default: off") { |v| OPTIONS[:use_implement]=v }
|
36
|
+
"Default: off") { |v| OPTIONS[:use_implement] = v }
|
37
37
|
|
38
38
|
opts.separator ""
|
39
39
|
|
data/test/OBV/Custom/run_test.rb
CHANGED
data/test/OBV/Custom/server.rb
CHANGED
@@ -25,13 +25,13 @@ ARGV.options do |opts|
|
|
25
25
|
|
26
26
|
opts.on("--o IORFILE",
|
27
27
|
"Set IOR filename.",
|
28
|
-
"Default: 'server.ior'") { |v| OPTIONS[:iorfile]=v }
|
28
|
+
"Default: 'server.ior'") { |v| OPTIONS[:iorfile] = v }
|
29
29
|
opts.on("--d LVL",
|
30
30
|
"Set ORBDebugLevel value.",
|
31
|
-
"Default: 0") { |v| OPTIONS[:orb_debuglevel]=v }
|
31
|
+
"Default: 0") { |v| OPTIONS[:orb_debuglevel] = v }
|
32
32
|
opts.on("--use-implement",
|
33
33
|
"Load IDL through CORBA.implement() instead of precompiled code.",
|
34
|
-
"Default: off") { |v| OPTIONS[:use_implement]=v }
|
34
|
+
"Default: off") { |v| OPTIONS[:use_implement] = v }
|
35
35
|
|
36
36
|
opts.separator ""
|
37
37
|
|
data/test/OBV/Simple/client.rb
CHANGED
@@ -27,13 +27,13 @@ ARGV.options do |opts|
|
|
27
27
|
|
28
28
|
opts.on("--k IORFILE",
|
29
29
|
"Set IOR.",
|
30
|
-
"Default: 'file://server.ior'") { |v| OPTIONS[:iorfile]=v }
|
30
|
+
"Default: 'file://server.ior'") { |v| OPTIONS[:iorfile] = v }
|
31
31
|
opts.on("--d LVL",
|
32
32
|
"Set ORBDebugLevel value.",
|
33
|
-
"Default: 0") { |v| OPTIONS[:orb_debuglevel]=v }
|
33
|
+
"Default: 0") { |v| OPTIONS[:orb_debuglevel] = v }
|
34
34
|
opts.on("--use-implement",
|
35
35
|
"Load IDL through CORBA.implement() instead of precompiled code.",
|
36
|
-
"Default: off") { |v| OPTIONS[:use_implement]=v }
|
36
|
+
"Default: off") { |v| OPTIONS[:use_implement] = v }
|
37
37
|
|
38
38
|
opts.separator ""
|
39
39
|
|
data/test/OBV/Simple/run_test.rb
CHANGED
data/test/OBV/Simple/server.rb
CHANGED
@@ -25,13 +25,13 @@ ARGV.options do |opts|
|
|
25
25
|
|
26
26
|
opts.on("--o IORFILE",
|
27
27
|
"Set IOR filename.",
|
28
|
-
"Default: 'server.ior'") { |v| OPTIONS[:iorfile]=v }
|
28
|
+
"Default: 'server.ior'") { |v| OPTIONS[:iorfile] = v }
|
29
29
|
opts.on("--d LVL",
|
30
30
|
"Set ORBDebugLevel value.",
|
31
|
-
"Default: 0") { |v| OPTIONS[:orb_debuglevel]=v }
|
31
|
+
"Default: 0") { |v| OPTIONS[:orb_debuglevel] = v }
|
32
32
|
opts.on("--use-implement",
|
33
33
|
"Load IDL through CORBA.implement() instead of precompiled code.",
|
34
|
-
"Default: off") { |v| OPTIONS[:use_implement]=v }
|
34
|
+
"Default: off") { |v| OPTIONS[:use_implement] = v }
|
35
35
|
|
36
36
|
opts.separator ""
|
37
37
|
|
@@ -27,13 +27,13 @@ ARGV.options do |opts|
|
|
27
27
|
|
28
28
|
opts.on("--k IORFILE",
|
29
29
|
"Set IOR.",
|
30
|
-
"Default: 'file://server.ior'") { |v| OPTIONS[:iorfile]=v }
|
30
|
+
"Default: 'file://server.ior'") { |v| OPTIONS[:iorfile] = v }
|
31
31
|
opts.on("--d LVL",
|
32
32
|
"Set ORBDebugLevel value.",
|
33
|
-
"Default: 0") { |v| OPTIONS[:orb_debuglevel]=v }
|
33
|
+
"Default: 0") { |v| OPTIONS[:orb_debuglevel] = v }
|
34
34
|
opts.on("--use-implement",
|
35
35
|
"Load IDL through CORBA.implement() instead of precompiled code.",
|
36
|
-
"Default: off") { |v| OPTIONS[:use_implement]=v }
|
36
|
+
"Default: off") { |v| OPTIONS[:use_implement] = v }
|
37
37
|
|
38
38
|
opts.separator ""
|
39
39
|
|
@@ -25,13 +25,13 @@ ARGV.options do |opts|
|
|
25
25
|
|
26
26
|
opts.on("--o IORFILE",
|
27
27
|
"Set IOR filename.",
|
28
|
-
"Default: 'server.ior'") { |v| OPTIONS[:iorfile]=v }
|
28
|
+
"Default: 'server.ior'") { |v| OPTIONS[:iorfile] = v }
|
29
29
|
opts.on("--d LVL",
|
30
30
|
"Set ORBDebugLevel value.",
|
31
|
-
"Default: 0") { |v| OPTIONS[:orb_debuglevel]=v }
|
31
|
+
"Default: 0") { |v| OPTIONS[:orb_debuglevel] = v }
|
32
32
|
opts.on("--use-implement",
|
33
33
|
"Load IDL through CORBA.implement() instead of precompiled code.",
|
34
|
-
"Default: off") { |v| OPTIONS[:use_implement]=v }
|
34
|
+
"Default: off") { |v| OPTIONS[:use_implement] = v }
|
35
35
|
|
36
36
|
opts.separator ""
|
37
37
|
|
data/test/OBV/Supports/client.rb
CHANGED
@@ -27,13 +27,13 @@ ARGV.options do |opts|
|
|
27
27
|
|
28
28
|
opts.on("--k IORFILE",
|
29
29
|
"Set IOR.",
|
30
|
-
"Default: 'file://server.ior'") { |v| OPTIONS[:iorfile]=v }
|
30
|
+
"Default: 'file://server.ior'") { |v| OPTIONS[:iorfile] = v }
|
31
31
|
opts.on("--d LVL",
|
32
32
|
"Set ORBDebugLevel value.",
|
33
|
-
"Default: 0") { |v| OPTIONS[:orb_debuglevel]=v }
|
33
|
+
"Default: 0") { |v| OPTIONS[:orb_debuglevel] = v }
|
34
34
|
opts.on("--use-implement",
|
35
35
|
"Load IDL through CORBA.implement() instead of precompiled code.",
|
36
|
-
"Default: off") { |v| OPTIONS[:use_implement]=v }
|
36
|
+
"Default: off") { |v| OPTIONS[:use_implement] = v }
|
37
37
|
|
38
38
|
opts.separator ""
|
39
39
|
|
data/test/OBV/Supports/server.rb
CHANGED
@@ -25,13 +25,13 @@ ARGV.options do |opts|
|
|
25
25
|
|
26
26
|
opts.on("--o IORFILE",
|
27
27
|
"Set IOR filename.",
|
28
|
-
"Default: 'server.ior'") { |v| OPTIONS[:iorfile]=v }
|
28
|
+
"Default: 'server.ior'") { |v| OPTIONS[:iorfile] = v }
|
29
29
|
opts.on("--d LVL",
|
30
30
|
"Set ORBDebugLevel value.",
|
31
|
-
"Default: 0") { |v| OPTIONS[:orb_debuglevel]=v }
|
31
|
+
"Default: 0") { |v| OPTIONS[:orb_debuglevel] = v }
|
32
32
|
opts.on("--use-implement",
|
33
33
|
"Load IDL through CORBA.implement() instead of precompiled code.",
|
34
|
-
"Default: off") { |v| OPTIONS[:use_implement]=v }
|
34
|
+
"Default: off") { |v| OPTIONS[:use_implement] = v }
|
35
35
|
|
36
36
|
opts.separator ""
|
37
37
|
|
data/test/OBV/Tree/client.rb
CHANGED
@@ -27,13 +27,13 @@ ARGV.options do |opts|
|
|
27
27
|
|
28
28
|
opts.on("--k IORFILE",
|
29
29
|
"Set IOR.",
|
30
|
-
"Default: 'file://server.ior'") { |v| OPTIONS[:iorfile]=v }
|
30
|
+
"Default: 'file://server.ior'") { |v| OPTIONS[:iorfile] = v }
|
31
31
|
opts.on("--d LVL",
|
32
32
|
"Set ORBDebugLevel value.",
|
33
|
-
"Default: 0") { |v| OPTIONS[:orb_debuglevel]=v }
|
33
|
+
"Default: 0") { |v| OPTIONS[:orb_debuglevel] = v }
|
34
34
|
opts.on("--use-implement",
|
35
35
|
"Load IDL through CORBA.implement() instead of precompiled code.",
|
36
|
-
"Default: off") { |v| OPTIONS[:use_implement]=v }
|
36
|
+
"Default: off") { |v| OPTIONS[:use_implement] = v }
|
37
37
|
|
38
38
|
opts.separator ""
|
39
39
|
|
data/test/OBV/Tree/run_test.rb
CHANGED
data/test/OBV/Tree/server.rb
CHANGED
@@ -25,13 +25,13 @@ ARGV.options do |opts|
|
|
25
25
|
|
26
26
|
opts.on("--o IORFILE",
|
27
27
|
"Set IOR filename.",
|
28
|
-
"Default: 'server.ior'") { |v| OPTIONS[:iorfile]=v }
|
28
|
+
"Default: 'server.ior'") { |v| OPTIONS[:iorfile] = v }
|
29
29
|
opts.on("--d LVL",
|
30
30
|
"Set ORBDebugLevel value.",
|
31
|
-
"Default: 0") { |v| OPTIONS[:orb_debuglevel]=v }
|
31
|
+
"Default: 0") { |v| OPTIONS[:orb_debuglevel] = v }
|
32
32
|
opts.on("--use-implement",
|
33
33
|
"Load IDL through CORBA.implement() instead of precompiled code.",
|
34
|
-
"Default: off") { |v| OPTIONS[:use_implement]=v }
|
34
|
+
"Default: off") { |v| OPTIONS[:use_implement] = v }
|
35
35
|
|
36
36
|
opts.separator ""
|
37
37
|
|
@@ -63,7 +63,7 @@ class Test_impl < POA::OBV_TruncatableTest::Test
|
|
63
63
|
ov = ::OBV_TruncatableTest::TValue1.new
|
64
64
|
iv = nil
|
65
65
|
target = CORBA::Any.value_for_any(val)
|
66
|
-
if
|
66
|
+
if target.nil?
|
67
67
|
STDERR.puts "server:Test_impl::op5 extract failed\n"
|
68
68
|
ov.basic_data = 101
|
69
69
|
ov.data1 = 10101
|
@@ -27,13 +27,13 @@ ARGV.options do |opts|
|
|
27
27
|
|
28
28
|
opts.on("--k IORFILE",
|
29
29
|
"Set IOR.",
|
30
|
-
"Default: 'file://server.ior'") { |v| OPTIONS[:iorfile]=v }
|
30
|
+
"Default: 'file://server.ior'") { |v| OPTIONS[:iorfile] = v }
|
31
31
|
opts.on("--d LVL",
|
32
32
|
"Set ORBDebugLevel value.",
|
33
|
-
"Default: 0") { |v| OPTIONS[:orb_debuglevel]=v }
|
33
|
+
"Default: 0") { |v| OPTIONS[:orb_debuglevel] = v }
|
34
34
|
opts.on("--use-implement",
|
35
35
|
"Load IDL through CORBA.implement() instead of precompiled code.",
|
36
|
-
"Default: off") { |v| OPTIONS[:use_implement]=v }
|
36
|
+
"Default: off") { |v| OPTIONS[:use_implement] = v }
|
37
37
|
|
38
38
|
opts.separator ""
|
39
39
|
|
@@ -210,7 +210,7 @@ begin
|
|
210
210
|
v3.nv4 = nv
|
211
211
|
v3.data4 = 66
|
212
212
|
|
213
|
-
desc = "multiple IN truncatable valuetype parameters"+
|
213
|
+
desc = "multiple IN truncatable valuetype parameters" +
|
214
214
|
" and return truncatable valuetype"
|
215
215
|
STDERR.print "Case 7: #{desc}: "
|
216
216
|
ov, odesc = tester.op4("case7", v1, 5, v2, v3, v4, desc)
|
@@ -25,13 +25,13 @@ ARGV.options do |opts|
|
|
25
25
|
|
26
26
|
opts.on("--o IORFILE",
|
27
27
|
"Set IOR filename.",
|
28
|
-
"Default: 'server.ior'") { |v| OPTIONS[:iorfile]=v }
|
28
|
+
"Default: 'server.ior'") { |v| OPTIONS[:iorfile] = v }
|
29
29
|
opts.on("--d LVL",
|
30
30
|
"Set ORBDebugLevel value.",
|
31
|
-
"Default: 0") { |v| OPTIONS[:orb_debuglevel]=v }
|
31
|
+
"Default: 0") { |v| OPTIONS[:orb_debuglevel] = v }
|
32
32
|
opts.on("--use-implement",
|
33
33
|
"Load IDL through CORBA.implement() instead of precompiled code.",
|
34
|
-
"Default: off") { |v| OPTIONS[:use_implement]=v }
|
34
|
+
"Default: off") { |v| OPTIONS[:use_implement] = v }
|
35
35
|
|
36
36
|
opts.separator ""
|
37
37
|
|
data/test/OBV/ValueBox/client.rb
CHANGED
@@ -27,13 +27,13 @@ ARGV.options do |opts|
|
|
27
27
|
|
28
28
|
opts.on("--k IORFILE",
|
29
29
|
"Set IOR.",
|
30
|
-
"Default: 'file://server.ior'") { |v| OPTIONS[:iorfile]=v }
|
30
|
+
"Default: 'file://server.ior'") { |v| OPTIONS[:iorfile] = v }
|
31
31
|
opts.on("--d LVL",
|
32
32
|
"Set ORBDebugLevel value.",
|
33
|
-
"Default: 0") { |v| OPTIONS[:orb_debuglevel]=v }
|
33
|
+
"Default: 0") { |v| OPTIONS[:orb_debuglevel] = v }
|
34
34
|
opts.on("--use-implement",
|
35
35
|
"Load IDL through CORBA.implement() instead of precompiled code.",
|
36
|
-
"Default: off") { |v| OPTIONS[:use_implement]=v }
|
36
|
+
"Default: off") { |v| OPTIONS[:use_implement] = v }
|
37
37
|
|
38
38
|
opts.separator ""
|
39
39
|
|
@@ -64,9 +64,9 @@ module Test
|
|
64
64
|
STDERR.puts '*** basic_op1 (1)'
|
65
65
|
retval, p2_out, p3_out = test.basic_op1(p1, p2)
|
66
66
|
|
67
|
-
assert "basic_invocations:1 failed", (p2_out == (53*3))
|
68
|
-
assert "basic_invocations:1 failed", (p3_out == (53*5))
|
69
|
-
assert "basic_invocations:1 failed", (retval == (p1.value*3))
|
67
|
+
assert "basic_invocations:1 failed", (p2_out == (53 * 3))
|
68
|
+
assert "basic_invocations:1 failed", (p3_out == (53 * 5))
|
69
|
+
assert "basic_invocations:1 failed", (retval == (p1.value * 3))
|
70
70
|
|
71
71
|
# test boxed value using implicit conversion of Ruby types
|
72
72
|
p1 = 25
|
@@ -78,9 +78,9 @@ module Test
|
|
78
78
|
STDERR.puts '*** basic_op1 (2)'
|
79
79
|
retval, p2_out, p3_out = test.basic_op1(p1, p2)
|
80
80
|
|
81
|
-
assert "basic_invocations:2 failed", (p2_out == (53*3))
|
82
|
-
assert "basic_invocations:2 failed", (p3_out == (53*5))
|
83
|
-
assert "basic_invocations:2 failed", (retval == (p1*3))
|
81
|
+
assert "basic_invocations:2 failed", (p2_out == (53 * 3))
|
82
|
+
assert "basic_invocations:2 failed", (p3_out == (53 * 5))
|
83
|
+
assert "basic_invocations:2 failed", (retval == (p1 * 3))
|
84
84
|
|
85
85
|
# test boxed value using nil
|
86
86
|
p1 = nil
|
@@ -92,8 +92,8 @@ module Test
|
|
92
92
|
STDERR.puts '*** basic_op1 (3)'
|
93
93
|
retval, p2_out, p3_out = test.basic_op1(p1, p2)
|
94
94
|
|
95
|
-
assert "basic_invocations:2 failed", (p2_out == (53*3))
|
96
|
-
assert "basic_invocations:2 failed", (p3_out == (53*5))
|
95
|
+
assert "basic_invocations:2 failed", (p2_out == (53 * 3))
|
96
|
+
assert "basic_invocations:2 failed", (p3_out == (53 * 5))
|
97
97
|
assert "basic_invocations:2 failed", (retval.nil?)
|
98
98
|
|
99
99
|
# test boxed value from nested module
|
@@ -105,9 +105,9 @@ module Test
|
|
105
105
|
|
106
106
|
retval, p2_out, p3_out = test.basic_op2(p1, p2)
|
107
107
|
|
108
|
-
assert "basic_invocations:3 failed", (p2_out == (53*3))
|
109
|
-
assert "basic_invocations:3 failed", (p3_out == (53*5))
|
110
|
-
assert "basic_invocations:3 failed", (retval == (p1.value*3))
|
108
|
+
assert "basic_invocations:3 failed", (p2_out == (53 * 3))
|
109
|
+
assert "basic_invocations:3 failed", (p3_out == (53 * 5))
|
110
|
+
assert "basic_invocations:3 failed", (retval == (p1.value * 3))
|
111
111
|
|
112
112
|
# test regular Ruby types using values from valueboxes
|
113
113
|
p1 = VBlong.new(25)
|
@@ -118,9 +118,9 @@ module Test
|
|
118
118
|
|
119
119
|
retval, p2_out, p3_out = test.basic_op3(p1.value, p2.value)
|
120
120
|
|
121
|
-
assert "basic_invocations:4 failed", (p2_out == (53*3))
|
122
|
-
assert "basic_invocations:4 failed", (p3_out == (53*5))
|
123
|
-
assert "basic_invocations:4 failed", (retval == (p1.value*3))
|
121
|
+
assert "basic_invocations:4 failed", (p2_out == (53 * 3))
|
122
|
+
assert "basic_invocations:4 failed", (p3_out == (53 * 5))
|
123
|
+
assert "basic_invocations:4 failed", (retval == (p1.value * 3))
|
124
124
|
end
|
125
125
|
|
126
126
|
def Test.boxed_string_invocations(test)
|
@@ -176,7 +176,7 @@ module Test
|
|
176
176
|
def Test.boxed_sequence_invocations(test)
|
177
177
|
# basic test
|
178
178
|
p1 = VBseqlong.new([101, 202, 303])
|
179
|
-
assert "boxed_sequence_invocations:0 failed", (p1.value[0]==101 && p1.value[2]==303)
|
179
|
+
assert "boxed_sequence_invocations:0 failed", (p1.value[0] == 101 && p1.value[2] == 303)
|
180
180
|
|
181
181
|
# test invocation with value boxes
|
182
182
|
p1 = VBseqlong.new([10, 9, 8, 7])
|
@@ -190,10 +190,10 @@ module Test
|
|
190
190
|
retval, p2_out, p3_out = test.seq_op1(p1, p2)
|
191
191
|
|
192
192
|
p2.value().each_with_index do |e, i|
|
193
|
-
assert "boxed_sequence_invocations:2 failed", (p2_out[i] == e*3)
|
193
|
+
assert "boxed_sequence_invocations:2 failed", (p2_out[i] == e * 3)
|
194
194
|
end
|
195
195
|
p2.value().each_with_index do |e, i|
|
196
|
-
assert "boxed_sequence_invocations:2 failed", (p3_out[i] == e*5)
|
196
|
+
assert "boxed_sequence_invocations:2 failed", (p3_out[i] == e * 5)
|
197
197
|
end
|
198
198
|
p1.value().each_with_index do |e, i|
|
199
199
|
assert "boxed_sequence_invocations:2 failed", (retval[i] == e)
|
@@ -205,10 +205,10 @@ module Test
|
|
205
205
|
p2_out, p3_out = test.seq_op2(p1.value, p2.value)
|
206
206
|
|
207
207
|
p2.value().each_with_index do |e, i|
|
208
|
-
assert "boxed_sequence_invocations:3 failed", (p2_out[i] == e*3)
|
208
|
+
assert "boxed_sequence_invocations:3 failed", (p2_out[i] == e * 3)
|
209
209
|
end
|
210
210
|
p2.value().each_with_index do |e, i|
|
211
|
-
assert "boxed_sequence_invocations:3 failed", (p3_out[i] == e*5)
|
211
|
+
assert "boxed_sequence_invocations:3 failed", (p3_out[i] == e * 5)
|
212
212
|
end
|
213
213
|
end
|
214
214
|
|
@@ -216,7 +216,7 @@ module Test
|
|
216
216
|
# basic test
|
217
217
|
p1 = VBfixed_struct1.new(
|
218
218
|
Fixed_Struct1.new(29,
|
219
|
-
Fixed_Struct1::Bstruct.new(117,21)))
|
219
|
+
Fixed_Struct1::Bstruct.new(117, 21)))
|
220
220
|
|
221
221
|
assert "boxed_struct_invocations:0 failed", (p1.value.is_a?(Fixed_Struct1))
|
222
222
|
assert "boxed_struct_invocations:0 failed", (p1.value.l == 29)
|
@@ -225,21 +225,21 @@ module Test
|
|
225
225
|
# test invocation with valueboxes
|
226
226
|
p2 = VBfixed_struct1.new(
|
227
227
|
Fixed_Struct1.new(92,
|
228
|
-
Fixed_Struct1::Bstruct.new(171,12)))
|
228
|
+
Fixed_Struct1::Bstruct.new(171, 12)))
|
229
229
|
p2_out = nil
|
230
230
|
p3_out = nil
|
231
231
|
retval = nil
|
232
232
|
retval, p2_out, p3_out = test.struct_op1(p1, p2)
|
233
233
|
|
234
234
|
assert "boxed_struct_invocations:1 failed", (p2_out.is_a?(Fixed_Struct1))
|
235
|
-
assert "boxed_struct_invocations:1 failed", (p2_out.l == (92*3))
|
236
|
-
assert "boxed_struct_invocations:1 failed", (p2_out.abstruct.s1 == (171*3) &&
|
237
|
-
p2_out.abstruct.s2 == (12*3))
|
235
|
+
assert "boxed_struct_invocations:1 failed", (p2_out.l == (92 * 3))
|
236
|
+
assert "boxed_struct_invocations:1 failed", (p2_out.abstruct.s1 == (171 * 3) &&
|
237
|
+
p2_out.abstruct.s2 == (12 * 3))
|
238
238
|
|
239
239
|
assert "boxed_struct_invocations:1 failed", (p3_out.is_a?(Fixed_Struct1))
|
240
|
-
assert "boxed_struct_invocations:1 failed", (p3_out.l == (92*5))
|
241
|
-
assert "boxed_struct_invocations:1 failed", (p3_out.abstruct.s1 == (171*5) &&
|
242
|
-
p3_out.abstruct.s2 == (12*5))
|
240
|
+
assert "boxed_struct_invocations:1 failed", (p3_out.l == (92 * 5))
|
241
|
+
assert "boxed_struct_invocations:1 failed", (p3_out.abstruct.s1 == (171 * 5) &&
|
242
|
+
p3_out.abstruct.s2 == (12 * 5))
|
243
243
|
|
244
244
|
assert "boxed_struct_invocations:1 failed", (retval.is_a?(Fixed_Struct1))
|
245
245
|
assert "boxed_struct_invocations:1 failed", (retval.l == p1.value.l)
|
@@ -250,9 +250,9 @@ module Test
|
|
250
250
|
p2_out, p3_out = test.struct_op2(p1.value, p2_out)
|
251
251
|
|
252
252
|
assert "boxed_struct_invocations:2 failed", (p2_out.is_a?(Fixed_Struct1))
|
253
|
-
assert "boxed_struct_invocations:2 failed", (p2_out.l == (92*3*3))
|
254
|
-
assert "boxed_struct_invocations:2 failed", (p2_out.abstruct.s1 == (171*3*3) &&
|
255
|
-
p2_out.abstruct.s2 == (12*3*3))
|
253
|
+
assert "boxed_struct_invocations:2 failed", (p2_out.l == (92 * 3 * 3))
|
254
|
+
assert "boxed_struct_invocations:2 failed", (p2_out.abstruct.s1 == (171 * 3 * 3) &&
|
255
|
+
p2_out.abstruct.s2 == (12 * 3 * 3))
|
256
256
|
|
257
257
|
assert "boxed_struct_invocations:2 failed", (p3_out.is_a?(Fixed_Struct1))
|
258
258
|
assert "boxed_struct_invocations:2 failed", (p3_out.l == p1.value.l)
|
@@ -273,11 +273,11 @@ module Test
|
|
273
273
|
retval, p2_out, p3_out = test.struct_op3(p1, p2)
|
274
274
|
|
275
275
|
assert "boxed_struct_invocations:4 failed", (p2_out.is_a?(Variable_Struct1))
|
276
|
-
assert "boxed_struct_invocations:4 failed", (p2_out.l == (37*3))
|
276
|
+
assert "boxed_struct_invocations:4 failed", (p2_out.l == (37 * 3))
|
277
277
|
assert "boxed_struct_invocations:4 failed", (p2_out.str == '2variable')
|
278
278
|
|
279
279
|
assert "boxed_struct_invocations:4 failed", (p3_out.is_a?(Variable_Struct1))
|
280
|
-
assert "boxed_struct_invocations:4 failed", (p3_out.l == (37*3))
|
280
|
+
assert "boxed_struct_invocations:4 failed", (p3_out.l == (37 * 3))
|
281
281
|
assert "boxed_struct_invocations:4 failed", (p3_out.str == '2variable')
|
282
282
|
|
283
283
|
assert "boxed_struct_invocations:1 failed", (retval.is_a?(Variable_Struct1))
|
@@ -288,7 +288,7 @@ module Test
|
|
288
288
|
p2_out, p3_out = test.struct_op4(p1.value, p2_out)
|
289
289
|
|
290
290
|
assert "boxed_struct_invocations:4 failed", (p2_out.is_a?(Variable_Struct1))
|
291
|
-
assert "boxed_struct_invocations:4 failed", (p2_out.l == (37*3*3))
|
291
|
+
assert "boxed_struct_invocations:4 failed", (p2_out.l == (37 * 3 * 3))
|
292
292
|
assert "boxed_struct_invocations:4 failed", (p2_out.str == 'e2variabl')
|
293
293
|
|
294
294
|
assert "boxed_struct_invocations:1 failed", (p3_out.is_a?(Variable_Struct1))
|
@@ -299,7 +299,7 @@ module Test
|
|
299
299
|
def Test.boxed_array_invocations(test)
|
300
300
|
# basic test
|
301
301
|
p1 = VBlongarray.new([101, 202, 303])
|
302
|
-
assert "boxed_array_invocations:0 failed", (p1.value[0]==101 && p1.value[2]==303)
|
302
|
+
assert "boxed_array_invocations:0 failed", (p1.value[0] == 101 && p1.value[2] == 303)
|
303
303
|
|
304
304
|
# test invocation with value boxes
|
305
305
|
p1 = VBlongarray.new([10, 9, 8])
|
@@ -313,10 +313,10 @@ module Test
|
|
313
313
|
retval, p2_out, p3_out = test.array_op1(p1, p2)
|
314
314
|
|
315
315
|
p2.value().each_with_index do |e, i|
|
316
|
-
assert "boxed_array_invocations:2 failed", (p2_out[i] == e*3)
|
316
|
+
assert "boxed_array_invocations:2 failed", (p2_out[i] == e * 3)
|
317
317
|
end
|
318
318
|
p2.value().each_with_index do |e, i|
|
319
|
-
assert "boxed_array_invocations:2 failed", (p3_out[i] == e*3)
|
319
|
+
assert "boxed_array_invocations:2 failed", (p3_out[i] == e * 3)
|
320
320
|
end
|
321
321
|
p1.value().each_with_index do |e, i|
|
322
322
|
assert "boxed_array_invocations:2 failed", (retval[i] == e)
|
@@ -328,7 +328,7 @@ module Test
|
|
328
328
|
p2_out, p3_out = test.array_op2(p1.value, p2.value)
|
329
329
|
|
330
330
|
p2.value().each_with_index do |e, i|
|
331
|
-
assert "boxed_array_invocations:3 failed", (p2_out[i] == e*3)
|
331
|
+
assert "boxed_array_invocations:3 failed", (p2_out[i] == e * 3)
|
332
332
|
end
|
333
333
|
p1.value().each_with_index do |e, i|
|
334
334
|
assert "boxed_array_invocations:3 failed", (p3_out[i] == e)
|
@@ -390,15 +390,15 @@ module Test
|
|
390
390
|
|
391
391
|
assert "boxed_union_invocations:1 failed", (p2_out.is_a?(Fixed_Union1))
|
392
392
|
assert "boxed_union_invocations:1 failed", (p2_out._disc == 2)
|
393
|
-
assert "boxed_union_invocations:1 failed", (p2_out.m2 == 789*3)
|
393
|
+
assert "boxed_union_invocations:1 failed", (p2_out.m2 == 789 * 3)
|
394
394
|
|
395
395
|
assert "boxed_union_invocations:1 failed", (p3_out.is_a?(Fixed_Union1))
|
396
396
|
assert "boxed_union_invocations:1 failed", (p3_out._disc == 1)
|
397
|
-
assert "boxed_union_invocations:1 failed", (p3_out.m1 == 321*3)
|
397
|
+
assert "boxed_union_invocations:1 failed", (p3_out.m1 == 321 * 3)
|
398
398
|
|
399
399
|
assert "boxed_union_invocations:1 failed", (retval.is_a?(Fixed_Union1))
|
400
400
|
assert "boxed_union_invocations:1 failed", (retval._disc == 1)
|
401
|
-
assert "boxed_union_invocations:1 failed", (retval.m1 == 321*3)
|
401
|
+
assert "boxed_union_invocations:1 failed", (retval.m1 == 321 * 3)
|
402
402
|
|
403
403
|
# test invocation with Ruby types using valuebox values
|
404
404
|
p2_out = nil
|
@@ -407,7 +407,7 @@ module Test
|
|
407
407
|
|
408
408
|
assert "boxed_union_invocations:1 failed", (p2_out.is_a?(Fixed_Union1))
|
409
409
|
assert "boxed_union_invocations:1 failed", (p2_out._disc == 2)
|
410
|
-
assert "boxed_union_invocations:1 failed", (p2_out.m2 == 789*3)
|
410
|
+
assert "boxed_union_invocations:1 failed", (p2_out.m2 == 789 * 3)
|
411
411
|
|
412
412
|
assert "boxed_union_invocations:1 failed", (p3_out.is_a?(Fixed_Union1))
|
413
413
|
assert "boxed_union_invocations:1 failed", (p3_out._disc == 1)
|