r2corba 1.5.1-universal-java → 1.6.1-universal-java
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +5 -5
- data/LICENSE +5 -5
- data/README.rdoc +62 -0
- data/THANKS +4 -4
- data/lib/corba/cbase/IORMap.rb +0 -1
- data/lib/corba/cbase/ORB.rb +26 -24
- data/lib/corba/cbase/Request.rb +4 -5
- data/lib/corba/cbase/Streams.rb +2 -3
- data/lib/corba/cbase/Stub.rb +0 -1
- data/lib/corba/cbase/Typecode.rb +6 -7
- data/lib/corba/cbase/Values.rb +4 -3
- data/lib/corba/cbase/exception.rb +6 -5
- data/lib/corba/cbase/poa.rb +1 -2
- data/lib/corba/cbase/policies.rb +3 -4
- data/lib/corba/cbase/post_require.rb +1 -2
- data/lib/corba/cbase/require.rb +10 -2
- data/lib/corba/cmds/base.rb +1 -2
- data/lib/corba/cmds/test.rb +0 -1
- data/lib/corba/common/Any.rb +3 -3
- data/lib/corba/common/IDL.rb +6 -10
- data/lib/corba/common/ORB.rb +22 -23
- data/lib/corba/common/Object.rb +18 -15
- data/lib/corba/common/Request.rb +1 -2
- data/lib/corba/common/Servant.rb +4 -5
- data/lib/corba/common/Struct.rb +1 -2
- data/lib/corba/common/Stub.rb +6 -7
- data/lib/corba/common/Typecode.rb +91 -65
- data/lib/corba/common/Union.rb +6 -2
- data/lib/corba/common/Values.rb +2 -2
- data/lib/corba/common/const.rb +2 -3
- data/lib/corba/common/exception.rb +2 -2
- data/lib/corba/common/require.rb +8 -1
- data/lib/corba/common/version.rb +3 -4
- data/lib/corba/idl/BiDirPolicyC.rb +2 -3
- data/lib/corba/idl/CosNamingC.rb +4 -5
- data/lib/corba/idl/CosNamingS.rb +2 -3
- data/lib/corba/idl/IDL.rb +1 -2
- data/lib/corba/idl/IORTable.pidl +0 -1
- data/lib/corba/idl/MessagingC.rb +2 -3
- data/lib/corba/idl/POAC.rb +10 -11
- data/lib/corba/idl/TAO_Ext.pidl +0 -1
- data/lib/corba/idl/r2c_orb.rb +5 -6
- data/lib/corba/idl/require.rb +0 -1
- data/lib/corba/jbase/Any.rb +29 -28
- data/lib/corba/jbase/IORMap.rb +1 -2
- data/lib/corba/jbase/ORB.rb +5 -6
- data/lib/corba/jbase/Object.rb +13 -14
- data/lib/corba/jbase/Request.rb +9 -10
- data/lib/corba/jbase/Servant.rb +11 -12
- data/lib/corba/jbase/ServerRequest.rb +8 -9
- data/lib/corba/jbase/Streams.rb +68 -5
- data/lib/corba/jbase/Stub.rb +0 -1
- data/lib/corba/jbase/Typecode.rb +17 -17
- data/lib/corba/jbase/Values.rb +2 -1
- data/lib/corba/jbase/exception.rb +2 -2
- data/lib/corba/jbase/poa.rb +21 -22
- data/lib/corba/jbase/policies.rb +33 -34
- data/lib/corba/jbase/post_require.rb +0 -1
- data/lib/corba/jbase/require.rb +5 -2
- data/lib/corba/naming.rb +0 -1
- data/lib/corba/naming_service.rb +0 -1
- data/lib/corba/poa.rb +1 -2
- data/lib/corba/policies.rb +1 -2
- data/lib/corba/require.rb +2 -3
- data/lib/corba/svcs/ins/cos_naming.rb +74 -68
- data/lib/corba/svcs/ins/ins.rb +58 -59
- data/lib/corba/svcs/ins/naming_service.rb +9 -10
- data/lib/corba.rb +1 -2
- data/lib/ridlbe/ruby/config.rb +78 -74
- data/lib/ridlbe/ruby/orb.pidlc +0 -0
- data/lib/ridlbe/ruby/require.rb +0 -1
- data/lib/ridlbe/ruby/walker.rb +311 -288
- data/mkrf_conf_bingem.rb +4 -6
- data/rakelib/bin.rake +2 -3
- data/rakelib/bin.rb +4 -5
- data/rakelib/build.rake +22 -22
- data/rakelib/config.rake +2 -3
- data/rakelib/config.rb +32 -34
- data/rakelib/gem.rake +53 -38
- data/rakelib/gem.rb +9 -10
- data/rakelib/package.rake +2 -3
- data/rakelib/test.rake +0 -1
- data/test/BiDirectional/Test.idl +0 -1
- data/test/BiDirectional/client.rb +18 -19
- data/test/BiDirectional/run_test.rb +11 -12
- data/test/BiDirectional/server.rb +21 -23
- data/test/CORBA_Services/Naming/BindingIterator/Test.idl +0 -1
- data/test/CORBA_Services/Naming/BindingIterator/client.rb +17 -18
- data/test/CORBA_Services/Naming/BindingIterator/run_test.rb +13 -14
- data/test/CORBA_Services/Naming/BindingIterator/server.rb +19 -20
- data/test/CORBA_Services/Naming/Corbaname/Test.idl +0 -1
- data/test/CORBA_Services/Naming/Corbaname/client.rb +15 -16
- data/test/CORBA_Services/Naming/Corbaname/run_test.rb +13 -14
- data/test/CORBA_Services/Naming/Corbaname/server.rb +27 -28
- data/test/CORBA_Services/Naming/Simple/Test.idl +0 -1
- data/test/CORBA_Services/Naming/Simple/client.rb +16 -17
- data/test/CORBA_Services/Naming/Simple/run_test.rb +13 -14
- data/test/CORBA_Services/Naming/Simple/server.rb +19 -20
- data/test/Collocation/Diamond.idl +0 -1
- data/test/Collocation/run_test.rb +10 -11
- data/test/Collocation/test.rb +27 -21
- data/test/Connect_Timeout/Test.idl +0 -1
- data/test/Connect_Timeout/client.rb +16 -18
- data/test/Connect_Timeout/run_test.rb +10 -11
- data/test/DII/Test.idl +0 -1
- data/test/DII/client.rb +30 -31
- data/test/DII/run_test.rb +11 -12
- data/test/DII/server.rb +16 -17
- data/test/DSI/Test.idl +0 -1
- data/test/DSI/client.rb +16 -17
- data/test/DSI/run_test.rb +11 -12
- data/test/DSI/server.rb +17 -18
- data/test/Exceptions/Test.idl +0 -1
- data/test/Exceptions/client.rb +22 -23
- data/test/Exceptions/run_test.rb +11 -12
- data/test/Exceptions/server.rb +16 -17
- data/test/Hello/Test.idl +0 -1
- data/test/Hello/client.rb +16 -17
- data/test/Hello/run_test.rb +11 -12
- data/test/Hello/server.rb +17 -18
- data/test/IDL_Test/Test.idl +4 -1
- data/test/IDL_Test/client.rb +24 -23
- data/test/IDL_Test/run_test.rb +11 -12
- data/test/IDL_Test/server.rb +23 -19
- data/test/IORMap/Test.idl +0 -1
- data/test/IORMap/client.rb +14 -15
- data/test/IORMap/run_test.rb +11 -12
- data/test/IORMap/server.rb +23 -24
- data/test/IORTable/Test.idl +0 -1
- data/test/IORTable/client.rb +14 -15
- data/test/IORTable/run_test.rb +11 -12
- data/test/IORTable/server.rb +23 -24
- data/test/Implicit_Conversion/Test.idl +0 -1
- data/test/Implicit_Conversion/client.rb +20 -18
- data/test/Implicit_Conversion/run_test.rb +11 -12
- data/test/Implicit_Conversion/server.rb +16 -17
- data/test/Multi_Threading/Multiple_ORB/Test.idl +0 -1
- data/test/Multi_Threading/Multiple_ORB/client.rb +14 -15
- data/test/Multi_Threading/Multiple_ORB/run_test.rb +12 -13
- data/test/Multi_Threading/Multiple_ORB/server.rb +17 -18
- data/test/Multi_Threading/Simple/Test.idl +0 -1
- data/test/Multi_Threading/Simple/client.rb +17 -18
- data/test/Multi_Threading/Simple/run_test.rb +11 -12
- data/test/Multi_Threading/Simple/server.rb +17 -18
- data/test/Multi_Threading/Threads/Test.idl +0 -4
- data/test/Multi_Threading/Threads/client.rb +23 -26
- data/test/Multi_Threading/Threads/run_test.rb +11 -12
- data/test/Multi_Threading/Threads/server.rb +19 -22
- data/test/Multi_Threading/Threads/watchdog.rb +16 -16
- data/test/Multiple_Servant_Interfaces/Test.idl +0 -1
- data/test/Multiple_Servant_Interfaces/client.rb +14 -15
- data/test/Multiple_Servant_Interfaces/run_test.rb +11 -12
- data/test/Multiple_Servant_Interfaces/server.rb +18 -19
- data/test/Nil/Test.idl +0 -1
- data/test/Nil/run_test.rb +10 -11
- data/test/Nil/test.rb +22 -20
- data/test/OBV/AbstractInterface/client.rb +14 -15
- data/test/OBV/AbstractInterface/run_test.rb +11 -12
- data/test/OBV/AbstractInterface/server.rb +20 -20
- data/test/OBV/AbstractInterface/test.idl +0 -1
- data/test/OBV/Custom/OBV_impl.rb +2 -1
- data/test/OBV/Custom/client.rb +14 -15
- data/test/OBV/Custom/run_test.rb +11 -12
- data/test/OBV/Custom/server.rb +16 -17
- data/test/OBV/Simple/OBV_impl.rb +1 -1
- data/test/OBV/Simple/client.rb +14 -15
- data/test/OBV/Simple/run_test.rb +11 -12
- data/test/OBV/Simple/server.rb +16 -17
- data/test/OBV/Simple_Event/Event_impl.rb +1 -1
- data/test/OBV/Simple_Event/client.rb +14 -15
- data/test/OBV/Simple_Event/run_test.rb +11 -12
- data/test/OBV/Simple_Event/server.rb +16 -17
- data/test/OBV/Supports/client.rb +19 -20
- data/test/OBV/Supports/run_test.rb +11 -12
- data/test/OBV/Supports/server.rb +15 -16
- data/test/OBV/Supports/supports.idl +0 -1
- data/test/OBV/Supports/supports_impl.rb +3 -1
- data/test/OBV/Tree/client.rb +14 -15
- data/test/OBV/Tree/run_test.rb +11 -12
- data/test/OBV/Tree/server.rb +19 -20
- data/test/OBV/Tree/test.idl +0 -1
- data/test/OBV/Truncatable/Extra.idl +0 -1
- data/test/OBV/Truncatable/Truncatable_impl.rb +1 -2
- data/test/OBV/Truncatable/client.rb +57 -58
- data/test/OBV/Truncatable/run_test.rb +11 -12
- data/test/OBV/Truncatable/server.rb +15 -16
- data/test/OBV/ValueBox/client.rb +154 -154
- data/test/OBV/ValueBox/run_test.rb +11 -12
- data/test/OBV/ValueBox/server.rb +42 -42
- data/test/Object/Test.idl +0 -1
- data/test/Object/client.rb +15 -16
- data/test/Object/run_test.rb +11 -12
- data/test/Object/server.rb +19 -20
- data/test/POA/run_test.rb +10 -11
- data/test/POA/test.rb +17 -18
- data/test/Param_Test/client.rb +53 -54
- data/test/Param_Test/run_test.rb +11 -12
- data/test/Param_Test/server.rb +60 -61
- data/test/Performance/Simple/Test.idl +0 -1
- data/test/Performance/Simple/client.rb +16 -17
- data/test/Performance/Simple/run_test.rb +11 -12
- data/test/Performance/Simple/server.rb +16 -17
- data/test/Policies/Test.idl +0 -1
- data/test/Policies/run_test.rb +10 -11
- data/test/Policies/test.rb +23 -25
- data/test/Timeout/client.rb +21 -22
- data/test/Timeout/run_test.rb +11 -12
- data/test/Timeout/server.rb +19 -20
- data/test/Timeout/test.idl +0 -1
- data/test/lib/assert.rb +0 -2
- data/test/lib/test.rb +29 -25
- data/test/test_runner.rb +22 -24
- metadata +27 -64
- data/README +0 -62
- data/jacorb/lib/antlr-2.7.2.jar +0 -0
- data/jacorb/lib/jacorb-3.5.jar +0 -0
- data/jacorb/lib/jacorb-omgapi-3.5.jar +0 -0
- data/jacorb/lib/jacorb-services-3.5.jar +0 -0
- data/jacorb/lib/slf4j-api-1.7.6.jar +0 -0
- data/jacorb/lib/slf4j-jdk14-1.7.6.jar +0 -0
- data/test/BiDirectional/server.ior +0 -1
- data/test/CORBA_Services/Naming/BindingIterator/ins.ior +0 -1
- data/test/CORBA_Services/Naming/Corbaname/corbaname.ior +0 -1
- data/test/CORBA_Services/Naming/Corbaname/ins.ior +0 -1
- data/test/CORBA_Services/Naming/Simple/ins.ior +0 -1
- data/test/DII/server.ior +0 -1
- data/test/DSI/server.ior +0 -1
- data/test/Exceptions/server.ior +0 -1
- data/test/Hello/gateway.ior +0 -1
- data/test/IDL_Test/server.ior +0 -1
- data/test/IORMap/server.ior +0 -1
- data/test/IORTable/server.ior +0 -0
- data/test/Implicit_Conversion/server.ior +0 -1
- data/test/Multi_Threading/Multiple_ORB/server0.ior +0 -1
- data/test/Multi_Threading/Multiple_ORB/server1.ior +0 -1
- data/test/Multi_Threading/Simple/server.ior +0 -1
- data/test/Multi_Threading/Threads/server.ior +0 -1
- data/test/Multi_Threading/Threads/watchdog.ior +0 -1
- data/test/Multiple_Servant_Interfaces/server.ior +0 -1
- data/test/OBV/AbstractInterface/server.ior +0 -1
- data/test/OBV/Custom/server.ior +0 -1
- data/test/OBV/Simple/server.ior +0 -1
- data/test/OBV/Simple_Event/server.ior +0 -1
- data/test/OBV/Supports/server.ior +0 -1
- data/test/OBV/Tree/server.ior +0 -1
- data/test/OBV/Truncatable/server.ior +0 -1
- data/test/OBV/ValueBox/server.ior +0 -1
- data/test/Object/server.ior +0 -1
- data/test/Param_Test/server.ior +0 -1
- data/test/Performance/Simple/server.ior +0 -1
- data/test/Timeout/server.ior +0 -1
- data/test/test.log +0 -20
- data/test/test2.log +0 -5000
data/test/OBV/ValueBox/client.rb
CHANGED
@@ -7,7 +7,6 @@
|
|
7
7
|
# included with this program.
|
8
8
|
#
|
9
9
|
# Copyright (c) Remedy IT Expertise BV
|
10
|
-
# Chamber of commerce Rotterdam nr.276339, The Netherlands
|
11
10
|
#--------------------------------------------------------------------
|
12
11
|
|
13
12
|
require 'optparse'
|
@@ -24,22 +23,22 @@ ARGV.options do |opts|
|
|
24
23
|
script_name = File.basename($0)
|
25
24
|
opts.banner = "Usage: ruby #{script_name} [options]"
|
26
25
|
|
27
|
-
opts.separator
|
26
|
+
opts.separator ''
|
28
27
|
|
29
|
-
opts.on(
|
30
|
-
|
31
|
-
"Default: 'file://server.ior'") { |v| OPTIONS[:iorfile]=v }
|
32
|
-
opts.on(
|
33
|
-
|
34
|
-
|
35
|
-
opts.on(
|
36
|
-
|
37
|
-
|
28
|
+
opts.on('--k IORFILE',
|
29
|
+
'Set IOR.',
|
30
|
+
"Default: 'file://server.ior'") { |v| OPTIONS[:iorfile] = v }
|
31
|
+
opts.on('--d LVL',
|
32
|
+
'Set ORBDebugLevel value.',
|
33
|
+
'Default: 0') { |v| OPTIONS[:orb_debuglevel] = v }
|
34
|
+
opts.on('--use-implement',
|
35
|
+
'Load IDL through CORBA.implement() instead of precompiled code.',
|
36
|
+
'Default: off') { |v| OPTIONS[:use_implement] = v }
|
38
37
|
|
39
|
-
opts.separator
|
38
|
+
opts.separator ''
|
40
39
|
|
41
|
-
opts.on(
|
42
|
-
|
40
|
+
opts.on('-h', '--help',
|
41
|
+
'Show this help message.') { puts opts; exit }
|
43
42
|
|
44
43
|
opts.parse!
|
45
44
|
end
|
@@ -65,9 +64,9 @@ module Test
|
|
65
64
|
STDERR.puts '*** basic_op1 (1)'
|
66
65
|
retval, p2_out, p3_out = test.basic_op1(p1, p2)
|
67
66
|
|
68
|
-
assert
|
69
|
-
assert
|
70
|
-
assert
|
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))
|
71
70
|
|
72
71
|
# test boxed value using implicit conversion of Ruby types
|
73
72
|
p1 = 25
|
@@ -79,9 +78,9 @@ module Test
|
|
79
78
|
STDERR.puts '*** basic_op1 (2)'
|
80
79
|
retval, p2_out, p3_out = test.basic_op1(p1, p2)
|
81
80
|
|
82
|
-
assert
|
83
|
-
assert
|
84
|
-
assert
|
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))
|
85
84
|
|
86
85
|
# test boxed value using nil
|
87
86
|
p1 = nil
|
@@ -93,9 +92,9 @@ module Test
|
|
93
92
|
STDERR.puts '*** basic_op1 (3)'
|
94
93
|
retval, p2_out, p3_out = test.basic_op1(p1, p2)
|
95
94
|
|
96
|
-
assert
|
97
|
-
assert
|
98
|
-
assert
|
95
|
+
assert 'basic_invocations:2 failed', (p2_out == (53 * 3))
|
96
|
+
assert 'basic_invocations:2 failed', (p3_out == (53 * 5))
|
97
|
+
assert 'basic_invocations:2 failed', (retval.nil?)
|
99
98
|
|
100
99
|
# test boxed value from nested module
|
101
100
|
p1 = Vb_basic::M_VBlong.new(25) # explicit value box
|
@@ -106,9 +105,9 @@ module Test
|
|
106
105
|
|
107
106
|
retval, p2_out, p3_out = test.basic_op2(p1, p2)
|
108
107
|
|
109
|
-
assert
|
110
|
-
assert
|
111
|
-
assert
|
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))
|
112
111
|
|
113
112
|
# test regular Ruby types using values from valueboxes
|
114
113
|
p1 = VBlong.new(25)
|
@@ -119,71 +118,71 @@ module Test
|
|
119
118
|
|
120
119
|
retval, p2_out, p3_out = test.basic_op3(p1.value, p2.value)
|
121
120
|
|
122
|
-
assert
|
123
|
-
assert
|
124
|
-
assert
|
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))
|
125
124
|
end
|
126
125
|
|
127
126
|
def Test.boxed_string_invocations(test)
|
128
|
-
string1 =
|
129
|
-
string2 =
|
127
|
+
string1 = 'First-string'
|
128
|
+
string2 = 'Second-string'
|
130
129
|
|
131
130
|
# Establish that we have data setup correctly...
|
132
|
-
assert
|
133
|
-
assert
|
134
|
-
assert
|
131
|
+
assert 'boxed_string_invocations:0 failed', (string1 < string2)
|
132
|
+
assert 'boxed_string_invocations:0 failed', (string2 > string1)
|
133
|
+
assert 'boxed_string_invocations:0 failed', (string1 == string1)
|
135
134
|
|
136
135
|
# create valueboxes
|
137
136
|
vbstring1 = VBstring.new(string1.dup)
|
138
137
|
vbstring2 = VBstring.new(string1.dup)
|
139
138
|
|
140
139
|
# check valuebox correctness
|
141
|
-
assert
|
142
|
-
assert
|
140
|
+
assert 'boxed_string_invocations:1 failed', (vbstring1.value == string1)
|
141
|
+
assert 'boxed_string_invocations:1 failed', (vbstring2.value == string1)
|
143
142
|
|
144
143
|
# test value modifier
|
145
144
|
vbstring2.value = string2.dup
|
146
|
-
assert
|
145
|
+
assert 'boxed_string_invocations:2 failed', (vbstring2.value == string2)
|
147
146
|
|
148
147
|
# test invocation with value boxes
|
149
148
|
p1 = VBstring.new('string1')
|
150
149
|
p2 = VBstring.new('string2')
|
151
|
-
assert
|
152
|
-
assert
|
150
|
+
assert 'boxed_string_invocations:3 failed', (p1.value == 'string1')
|
151
|
+
assert 'boxed_string_invocations:3 failed', (p2.value == 'string2')
|
153
152
|
|
154
153
|
p2_out = nil
|
155
154
|
p3_out = nil
|
156
155
|
retval = nil
|
157
156
|
retval, p2_out, p3_out = test.string_op1(p1, p2)
|
158
157
|
|
159
|
-
assert
|
160
|
-
assert
|
161
|
-
assert
|
158
|
+
assert 'boxed_string_invocations:4 failed', (p2_out == '2string')
|
159
|
+
assert 'boxed_string_invocations:4 failed', (p3_out == '2string')
|
160
|
+
assert 'boxed_string_invocations:4 failed', (retval == '1string')
|
162
161
|
|
163
162
|
# test invocation with Ruby types using valuebox values
|
164
|
-
assert
|
165
|
-
assert
|
163
|
+
assert 'boxed_string_invocations:3 failed', (p1.value == 'string1')
|
164
|
+
assert 'boxed_string_invocations:3 failed', (p2.value == 'string2')
|
166
165
|
|
167
166
|
p2_out = nil
|
168
167
|
p3_out = nil
|
169
168
|
retval = nil
|
170
169
|
retval, p2_out, p3_out = test.string_op2(p1.value, p2.value)
|
171
170
|
|
172
|
-
assert
|
173
|
-
assert
|
174
|
-
assert
|
171
|
+
assert 'boxed_string_invocations:4 failed', (p2_out == '2string')
|
172
|
+
assert 'boxed_string_invocations:4 failed', (p3_out == '2string')
|
173
|
+
assert 'boxed_string_invocations:4 failed', (retval == '1string')
|
175
174
|
end
|
176
175
|
|
177
176
|
def Test.boxed_sequence_invocations(test)
|
178
177
|
# basic test
|
179
178
|
p1 = VBseqlong.new([101, 202, 303])
|
180
|
-
assert
|
179
|
+
assert 'boxed_sequence_invocations:0 failed', (p1.value[0] == 101 && p1.value[2] == 303)
|
181
180
|
|
182
181
|
# test invocation with value boxes
|
183
182
|
p1 = VBseqlong.new([10, 9, 8, 7])
|
184
183
|
p2 = VBseqlong.new([100, 99, 98])
|
185
|
-
assert
|
186
|
-
assert
|
184
|
+
assert 'boxed_sequence_invocations:1 failed', (p1.value[0] == 10 && p1.value[3] == 7)
|
185
|
+
assert 'boxed_sequence_invocations:1 failed', (p2.value[0] == 100 && p2.value[2] == 98)
|
187
186
|
|
188
187
|
p2_out = nil
|
189
188
|
p3_out = nil
|
@@ -191,13 +190,13 @@ module Test
|
|
191
190
|
retval, p2_out, p3_out = test.seq_op1(p1, p2)
|
192
191
|
|
193
192
|
p2.value().each_with_index do |e, i|
|
194
|
-
assert
|
193
|
+
assert 'boxed_sequence_invocations:2 failed', (p2_out[i] == e * 3)
|
195
194
|
end
|
196
195
|
p2.value().each_with_index do |e, i|
|
197
|
-
assert
|
196
|
+
assert 'boxed_sequence_invocations:2 failed', (p3_out[i] == e * 5)
|
198
197
|
end
|
199
198
|
p1.value().each_with_index do |e, i|
|
200
|
-
assert
|
199
|
+
assert 'boxed_sequence_invocations:2 failed', (retval[i] == e)
|
201
200
|
end
|
202
201
|
|
203
202
|
# test invocation with Ruby types using valuebox values
|
@@ -206,10 +205,10 @@ module Test
|
|
206
205
|
p2_out, p3_out = test.seq_op2(p1.value, p2.value)
|
207
206
|
|
208
207
|
p2.value().each_with_index do |e, i|
|
209
|
-
assert
|
208
|
+
assert 'boxed_sequence_invocations:3 failed', (p2_out[i] == e * 3)
|
210
209
|
end
|
211
210
|
p2.value().each_with_index do |e, i|
|
212
|
-
assert
|
211
|
+
assert 'boxed_sequence_invocations:3 failed', (p3_out[i] == e * 5)
|
213
212
|
end
|
214
213
|
end
|
215
214
|
|
@@ -217,96 +216,96 @@ module Test
|
|
217
216
|
# basic test
|
218
217
|
p1 = VBfixed_struct1.new(
|
219
218
|
Fixed_Struct1.new(29,
|
220
|
-
Fixed_Struct1::Bstruct.new(117,21)))
|
219
|
+
Fixed_Struct1::Bstruct.new(117, 21)))
|
221
220
|
|
222
|
-
assert
|
223
|
-
assert
|
224
|
-
assert
|
221
|
+
assert 'boxed_struct_invocations:0 failed', (p1.value.is_a?(Fixed_Struct1))
|
222
|
+
assert 'boxed_struct_invocations:0 failed', (p1.value.l == 29)
|
223
|
+
assert 'boxed_struct_invocations:0 failed', (p1.value.abstruct.s1 == 117 && p1.value.abstruct.s2 == 21)
|
225
224
|
|
226
225
|
# test invocation with valueboxes
|
227
226
|
p2 = VBfixed_struct1.new(
|
228
227
|
Fixed_Struct1.new(92,
|
229
|
-
Fixed_Struct1::Bstruct.new(171,12)))
|
228
|
+
Fixed_Struct1::Bstruct.new(171, 12)))
|
230
229
|
p2_out = nil
|
231
230
|
p3_out = nil
|
232
231
|
retval = nil
|
233
232
|
retval, p2_out, p3_out = test.struct_op1(p1, p2)
|
234
233
|
|
235
|
-
assert
|
236
|
-
assert
|
237
|
-
assert
|
238
|
-
p2_out.abstruct.s2 == (12*3))
|
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))
|
239
238
|
|
240
|
-
assert
|
241
|
-
assert
|
242
|
-
assert
|
243
|
-
p3_out.abstruct.s2 == (12*5))
|
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))
|
244
243
|
|
245
|
-
assert
|
246
|
-
assert
|
247
|
-
assert
|
244
|
+
assert 'boxed_struct_invocations:1 failed', (retval.is_a?(Fixed_Struct1))
|
245
|
+
assert 'boxed_struct_invocations:1 failed', (retval.l == p1.value.l)
|
246
|
+
assert 'boxed_struct_invocations:1 failed', (retval.abstruct.s1 == p1.value.abstruct.s1 &&
|
248
247
|
retval.abstruct.s2 == p1.value.abstruct.s2)
|
249
248
|
|
250
249
|
# test invocation with Ruby types using valuebox values
|
251
250
|
p2_out, p3_out = test.struct_op2(p1.value, p2_out)
|
252
251
|
|
253
|
-
assert
|
254
|
-
assert
|
255
|
-
assert
|
256
|
-
p2_out.abstruct.s2 == (12*3*3))
|
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))
|
257
256
|
|
258
|
-
assert
|
259
|
-
assert
|
260
|
-
assert
|
257
|
+
assert 'boxed_struct_invocations:2 failed', (p3_out.is_a?(Fixed_Struct1))
|
258
|
+
assert 'boxed_struct_invocations:2 failed', (p3_out.l == p1.value.l)
|
259
|
+
assert 'boxed_struct_invocations:2 failed', (p3_out.abstruct.s1 == p1.value.abstruct.s1 &&
|
261
260
|
p3_out.abstruct.s2 == p1.value.abstruct.s2)
|
262
261
|
|
263
262
|
# test invocation with valueboxes
|
264
263
|
p1 = VBvariable_struct1.new(Variable_Struct1.new(29, 'variable1'))
|
265
264
|
p2 = VBvariable_struct1.new(Variable_Struct1.new(37, 'variable2'))
|
266
265
|
|
267
|
-
assert
|
268
|
-
assert
|
269
|
-
assert
|
266
|
+
assert 'boxed_struct_invocations:3 failed', (p1.value.is_a?(Variable_Struct1))
|
267
|
+
assert 'boxed_struct_invocations:3 failed', (p1.value.l == 29)
|
268
|
+
assert 'boxed_struct_invocations:3 failed', (p1.value.str == 'variable1')
|
270
269
|
|
271
270
|
p2_out = nil
|
272
271
|
p3_out = nil
|
273
272
|
retval = nil
|
274
273
|
retval, p2_out, p3_out = test.struct_op3(p1, p2)
|
275
274
|
|
276
|
-
assert
|
277
|
-
assert
|
278
|
-
assert
|
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))
|
277
|
+
assert 'boxed_struct_invocations:4 failed', (p2_out.str == '2variable')
|
279
278
|
|
280
|
-
assert
|
281
|
-
assert
|
282
|
-
assert
|
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))
|
281
|
+
assert 'boxed_struct_invocations:4 failed', (p3_out.str == '2variable')
|
283
282
|
|
284
|
-
assert
|
285
|
-
assert
|
286
|
-
assert
|
283
|
+
assert 'boxed_struct_invocations:1 failed', (retval.is_a?(Variable_Struct1))
|
284
|
+
assert 'boxed_struct_invocations:1 failed', (retval.l == p1.value.l)
|
285
|
+
assert 'boxed_struct_invocations:1 failed', (retval.str == p1.value.str)
|
287
286
|
|
288
287
|
# test invocation with Ruby types using valuebox values
|
289
288
|
p2_out, p3_out = test.struct_op4(p1.value, p2_out)
|
290
289
|
|
291
|
-
assert
|
292
|
-
assert
|
293
|
-
assert
|
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))
|
292
|
+
assert 'boxed_struct_invocations:4 failed', (p2_out.str == 'e2variabl')
|
294
293
|
|
295
|
-
assert
|
296
|
-
assert
|
297
|
-
assert
|
294
|
+
assert 'boxed_struct_invocations:1 failed', (p3_out.is_a?(Variable_Struct1))
|
295
|
+
assert 'boxed_struct_invocations:1 failed', (p3_out.l == p1.value.l)
|
296
|
+
assert 'boxed_struct_invocations:1 failed', (p3_out.str == p1.value.str)
|
298
297
|
end
|
299
298
|
|
300
299
|
def Test.boxed_array_invocations(test)
|
301
300
|
# basic test
|
302
301
|
p1 = VBlongarray.new([101, 202, 303])
|
303
|
-
assert
|
302
|
+
assert 'boxed_array_invocations:0 failed', (p1.value[0] == 101 && p1.value[2] == 303)
|
304
303
|
|
305
304
|
# test invocation with value boxes
|
306
305
|
p1 = VBlongarray.new([10, 9, 8])
|
307
306
|
p2 = VBlongarray.new([100, 99, 98])
|
308
|
-
assert
|
309
|
-
assert
|
307
|
+
assert 'boxed_array_invocations:1 failed', (p1.value[0] == 10 && p1.value[2] == 8)
|
308
|
+
assert 'boxed_array_invocations:1 failed', (p2.value[0] == 100 && p2.value[2] == 98)
|
310
309
|
|
311
310
|
p2_out = nil
|
312
311
|
p3_out = nil
|
@@ -314,13 +313,13 @@ module Test
|
|
314
313
|
retval, p2_out, p3_out = test.array_op1(p1, p2)
|
315
314
|
|
316
315
|
p2.value().each_with_index do |e, i|
|
317
|
-
assert
|
316
|
+
assert 'boxed_array_invocations:2 failed', (p2_out[i] == e * 3)
|
318
317
|
end
|
319
318
|
p2.value().each_with_index do |e, i|
|
320
|
-
assert
|
319
|
+
assert 'boxed_array_invocations:2 failed', (p3_out[i] == e * 3)
|
321
320
|
end
|
322
321
|
p1.value().each_with_index do |e, i|
|
323
|
-
assert
|
322
|
+
assert 'boxed_array_invocations:2 failed', (retval[i] == e)
|
324
323
|
end
|
325
324
|
|
326
325
|
# test invocation with Ruby types using valuebox values
|
@@ -329,17 +328,17 @@ module Test
|
|
329
328
|
p2_out, p3_out = test.array_op2(p1.value, p2.value)
|
330
329
|
|
331
330
|
p2.value().each_with_index do |e, i|
|
332
|
-
assert
|
331
|
+
assert 'boxed_array_invocations:3 failed', (p2_out[i] == e * 3)
|
333
332
|
end
|
334
333
|
p1.value().each_with_index do |e, i|
|
335
|
-
assert
|
334
|
+
assert 'boxed_array_invocations:3 failed', (p3_out[i] == e)
|
336
335
|
end
|
337
336
|
|
338
337
|
# test invocation with value boxes
|
339
338
|
p1 = VBstringarray.new(['in string1', 'in string1'])
|
340
339
|
p2 = VBstringarray.new(['inout string1', 'inout string1'])
|
341
|
-
assert
|
342
|
-
assert
|
340
|
+
assert 'boxed_array_invocations:4 failed', (p1.value[0] == 'in string1' && p1.value[1] == 'in string1')
|
341
|
+
assert 'boxed_array_invocations:4 failed', (p2.value[0] == 'inout string1' && p2.value[1] == 'inout string1')
|
343
342
|
|
344
343
|
p2_out = nil
|
345
344
|
p3_out = nil
|
@@ -347,13 +346,13 @@ module Test
|
|
347
346
|
retval, p2_out, p3_out = test.array_op3(p1, p2)
|
348
347
|
|
349
348
|
p2.value().each_with_index do |e, i|
|
350
|
-
assert
|
349
|
+
assert 'boxed_array_invocations:5 failed', (p2_out[i] == '1inout string')
|
351
350
|
end
|
352
351
|
p2.value().each_with_index do |e, i|
|
353
|
-
assert
|
352
|
+
assert 'boxed_array_invocations:5 failed', (p3_out[i] == '1inout string')
|
354
353
|
end
|
355
354
|
p1.value().each_with_index do |e, i|
|
356
|
-
assert
|
355
|
+
assert 'boxed_array_invocations:5 failed', (retval[i] == e)
|
357
356
|
end
|
358
357
|
|
359
358
|
# test invocation with Ruby types using valuebox values
|
@@ -362,12 +361,13 @@ module Test
|
|
362
361
|
p2_out, p3_out = test.array_op4(p1.value, p2.value)
|
363
362
|
|
364
363
|
p2.value().each_with_index do |e, i|
|
365
|
-
assert
|
364
|
+
assert 'boxed_array_invocations:6 failed', (p2_out[i] == '1inout string')
|
366
365
|
end
|
367
366
|
p1.value().each_with_index do |e, i|
|
368
|
-
assert
|
367
|
+
assert 'boxed_array_invocations:6 failed', (p3_out[i] == e)
|
369
368
|
end
|
370
369
|
end
|
370
|
+
|
371
371
|
def Test.boxed_union_invocations(test)
|
372
372
|
# basic test
|
373
373
|
p1 = VBfixed_union1.new(Fixed_Union1.new)
|
@@ -375,13 +375,13 @@ module Test
|
|
375
375
|
p2 = VBfixed_union1.new(Fixed_Union1.new)
|
376
376
|
p2.value.m2 = 789
|
377
377
|
|
378
|
-
assert
|
379
|
-
assert
|
380
|
-
assert
|
378
|
+
assert 'boxed_union_invocations:0 failed', (p1.value.is_a?(Fixed_Union1))
|
379
|
+
assert 'boxed_union_invocations:0 failed', (p1.value._disc == 1)
|
380
|
+
assert 'boxed_union_invocations:0 failed', (p1.value.m1 == 321)
|
381
381
|
|
382
|
-
assert
|
383
|
-
assert
|
384
|
-
assert
|
382
|
+
assert 'boxed_union_invocations:0 failed', (p2.value.is_a?(Fixed_Union1))
|
383
|
+
assert 'boxed_union_invocations:0 failed', (p2.value._disc == 2)
|
384
|
+
assert 'boxed_union_invocations:0 failed', (p2.value.m1 == 789)
|
385
385
|
|
386
386
|
# test invocation with valueboxes
|
387
387
|
p2_out = nil
|
@@ -389,30 +389,30 @@ module Test
|
|
389
389
|
retval = nil
|
390
390
|
retval, p2_out, p3_out = test.union_op1(p1, p2)
|
391
391
|
|
392
|
-
assert
|
393
|
-
assert
|
394
|
-
assert
|
392
|
+
assert 'boxed_union_invocations:1 failed', (p2_out.is_a?(Fixed_Union1))
|
393
|
+
assert 'boxed_union_invocations:1 failed', (p2_out._disc == 2)
|
394
|
+
assert 'boxed_union_invocations:1 failed', (p2_out.m2 == 789 * 3)
|
395
395
|
|
396
|
-
assert
|
397
|
-
assert
|
398
|
-
assert
|
396
|
+
assert 'boxed_union_invocations:1 failed', (p3_out.is_a?(Fixed_Union1))
|
397
|
+
assert 'boxed_union_invocations:1 failed', (p3_out._disc == 1)
|
398
|
+
assert 'boxed_union_invocations:1 failed', (p3_out.m1 == 321 * 3)
|
399
399
|
|
400
|
-
assert
|
401
|
-
assert
|
402
|
-
assert
|
400
|
+
assert 'boxed_union_invocations:1 failed', (retval.is_a?(Fixed_Union1))
|
401
|
+
assert 'boxed_union_invocations:1 failed', (retval._disc == 1)
|
402
|
+
assert 'boxed_union_invocations:1 failed', (retval.m1 == 321 * 3)
|
403
403
|
|
404
404
|
# test invocation with Ruby types using valuebox values
|
405
405
|
p2_out = nil
|
406
406
|
p3_out = nil
|
407
407
|
p2_out, p3_out = test.union_op2(p1.value, p2.value)
|
408
408
|
|
409
|
-
assert
|
410
|
-
assert
|
411
|
-
assert
|
409
|
+
assert 'boxed_union_invocations:1 failed', (p2_out.is_a?(Fixed_Union1))
|
410
|
+
assert 'boxed_union_invocations:1 failed', (p2_out._disc == 2)
|
411
|
+
assert 'boxed_union_invocations:1 failed', (p2_out.m2 == 789 * 3)
|
412
412
|
|
413
|
-
assert
|
414
|
-
assert
|
415
|
-
assert
|
413
|
+
assert 'boxed_union_invocations:1 failed', (p3_out.is_a?(Fixed_Union1))
|
414
|
+
assert 'boxed_union_invocations:1 failed', (p3_out._disc == 1)
|
415
|
+
assert 'boxed_union_invocations:1 failed', (p3_out.m1 == 321)
|
416
416
|
|
417
417
|
# test invocation with valueboxes
|
418
418
|
p1 = VBvariable_union1.new(Variable_Union1.new)
|
@@ -420,50 +420,50 @@ module Test
|
|
420
420
|
p2 = VBvariable_union1.new(Variable_Union1.new)
|
421
421
|
p2.value.m2 = 'abracadabra'
|
422
422
|
|
423
|
-
assert
|
424
|
-
assert
|
425
|
-
assert
|
423
|
+
assert 'boxed_union_invocations:0 failed', (p1.value.is_a?(Variable_Union1))
|
424
|
+
assert 'boxed_union_invocations:0 failed', (p1.value._disc == 1)
|
425
|
+
assert 'boxed_union_invocations:0 failed', (p1.value.m1 == 321)
|
426
426
|
|
427
|
-
assert
|
428
|
-
assert
|
429
|
-
assert
|
427
|
+
assert 'boxed_union_invocations:0 failed', (p2.value.is_a?(Variable_Union1))
|
428
|
+
assert 'boxed_union_invocations:0 failed', (p2.value._disc == 2)
|
429
|
+
assert 'boxed_union_invocations:0 failed', (p2.value.m1 == 'abracadabra')
|
430
430
|
|
431
431
|
p2_out = nil
|
432
432
|
p3_out = nil
|
433
433
|
retval = nil
|
434
434
|
retval, p2_out, p3_out = test.union_op3(p1, p2)
|
435
435
|
|
436
|
-
assert
|
437
|
-
assert
|
438
|
-
assert
|
436
|
+
assert 'boxed_union_invocations:1 failed', (p2_out.is_a?(Variable_Union1))
|
437
|
+
assert 'boxed_union_invocations:1 failed', (p2_out._disc == 2)
|
438
|
+
assert 'boxed_union_invocations:1 failed', (p2_out.m2 == 'aabracadabr')
|
439
439
|
|
440
|
-
assert
|
441
|
-
assert
|
442
|
-
assert
|
440
|
+
assert 'boxed_union_invocations:1 failed', (p3_out.is_a?(Variable_Union1))
|
441
|
+
assert 'boxed_union_invocations:1 failed', (p3_out._disc == 1)
|
442
|
+
assert 'boxed_union_invocations:1 failed', (p3_out.m1 == 321)
|
443
443
|
|
444
|
-
assert
|
445
|
-
assert
|
446
|
-
assert
|
444
|
+
assert 'boxed_union_invocations:1 failed', (retval.is_a?(Variable_Union1))
|
445
|
+
assert 'boxed_union_invocations:1 failed', (retval._disc == 1)
|
446
|
+
assert 'boxed_union_invocations:1 failed', (retval.m1 == 321)
|
447
447
|
|
448
448
|
# test invocation with Ruby types using valuebox values
|
449
449
|
p2_out = nil
|
450
450
|
p3_out = nil
|
451
451
|
p2_out, p3_out = test.union_op4(p1.value, p2.value)
|
452
452
|
|
453
|
-
assert
|
454
|
-
assert
|
455
|
-
assert
|
453
|
+
assert 'boxed_union_invocations:1 failed', (p2_out.is_a?(Variable_Union1))
|
454
|
+
assert 'boxed_union_invocations:1 failed', (p2_out._disc == 2)
|
455
|
+
assert 'boxed_union_invocations:1 failed', (p2_out.m2 == 'aabracadabr')
|
456
456
|
|
457
|
-
assert
|
458
|
-
assert
|
459
|
-
assert
|
457
|
+
assert 'boxed_union_invocations:1 failed', (p3_out.is_a?(Variable_Union1))
|
458
|
+
assert 'boxed_union_invocations:1 failed', (p3_out._disc == 1)
|
459
|
+
assert 'boxed_union_invocations:1 failed', (p3_out.m1 == 321)
|
460
460
|
|
461
461
|
end
|
462
462
|
end
|
463
463
|
|
464
464
|
##
|
465
465
|
|
466
|
-
orb = CORBA.ORB_init([
|
466
|
+
orb = CORBA.ORB_init(['-ORBDebugLevel', OPTIONS[:orb_debuglevel]], 'myORB')
|
467
467
|
|
468
468
|
begin
|
469
469
|
obj = orb.string_to_object(OPTIONS[:iorfile])
|
@@ -7,7 +7,6 @@
|
|
7
7
|
# included with this program.
|
8
8
|
#
|
9
9
|
# Copyright (c) Remedy IT Expertise BV
|
10
|
-
# Chamber of commerce Rotterdam nr.276339, The Netherlands
|
11
10
|
#--------------------------------------------------------------------
|
12
11
|
|
13
12
|
OPTIONS = {
|
@@ -21,19 +20,19 @@ ARGV.options do |opts|
|
|
21
20
|
script_name = File.basename($0)
|
22
21
|
opts.banner = "Usage: ruby #{script_name} [options]"
|
23
22
|
|
24
|
-
opts.separator
|
23
|
+
opts.separator ''
|
25
24
|
|
26
|
-
opts.on(
|
27
|
-
|
28
|
-
|
29
|
-
opts.on(
|
30
|
-
|
31
|
-
|
25
|
+
opts.on('-d',
|
26
|
+
'Run with debugging output.',
|
27
|
+
'Default: false') { OPTIONS[:debug_opt] = '--d 10' }
|
28
|
+
opts.on('--use-stubs',
|
29
|
+
'Use stubs generated by RIDL.',
|
30
|
+
'Default: false (uses embedded IDL)') { OPTIONS[:use_implement] = '' }
|
32
31
|
|
33
|
-
opts.separator
|
32
|
+
opts.separator ''
|
34
33
|
|
35
|
-
opts.on(
|
36
|
-
|
34
|
+
opts.on('-h', '--help',
|
35
|
+
'Show this help message.') { puts opts; exit }
|
37
36
|
|
38
37
|
opts.parse!
|
39
38
|
end
|
@@ -60,7 +59,7 @@ end
|
|
60
59
|
|
61
60
|
exrc = clt.wait(400)
|
62
61
|
|
63
|
-
if exrc ==0
|
62
|
+
if exrc == 0
|
64
63
|
srv.wait(400)
|
65
64
|
else
|
66
65
|
srv.wait_term(400)
|