r2corba 1.5.1-universal-java → 1.5.5-universal-java

Sign up to get free protection for your applications and to get access to all the features.
Files changed (253) hide show
  1. checksums.yaml +5 -5
  2. data/LICENSE +5 -5
  3. data/README.rdoc +62 -0
  4. data/THANKS +4 -4
  5. data/lib/corba.rb +0 -1
  6. data/lib/corba/cbase/IORMap.rb +0 -1
  7. data/lib/corba/cbase/ORB.rb +7 -8
  8. data/lib/corba/cbase/Request.rb +1 -2
  9. data/lib/corba/cbase/Streams.rb +2 -3
  10. data/lib/corba/cbase/Stub.rb +0 -1
  11. data/lib/corba/cbase/Typecode.rb +6 -7
  12. data/lib/corba/cbase/Values.rb +0 -1
  13. data/lib/corba/cbase/exception.rb +2 -3
  14. data/lib/corba/cbase/poa.rb +0 -1
  15. data/lib/corba/cbase/policies.rb +2 -3
  16. data/lib/corba/cbase/post_require.rb +1 -2
  17. data/lib/corba/cbase/require.rb +2 -1
  18. data/lib/corba/cmds/base.rb +1 -2
  19. data/lib/corba/cmds/test.rb +0 -1
  20. data/lib/corba/common/Any.rb +1 -2
  21. data/lib/corba/common/IDL.rb +5 -9
  22. data/lib/corba/common/ORB.rb +1 -2
  23. data/lib/corba/common/Object.rb +4 -2
  24. data/lib/corba/common/Request.rb +1 -2
  25. data/lib/corba/common/Servant.rb +0 -1
  26. data/lib/corba/common/Struct.rb +1 -2
  27. data/lib/corba/common/Stub.rb +1 -2
  28. data/lib/corba/common/Typecode.rb +56 -57
  29. data/lib/corba/common/Union.rb +1 -2
  30. data/lib/corba/common/Values.rb +1 -2
  31. data/lib/corba/common/const.rb +2 -3
  32. data/lib/corba/common/exception.rb +0 -1
  33. data/lib/corba/common/require.rb +8 -1
  34. data/lib/corba/common/version.rb +3 -4
  35. data/lib/corba/idl/BiDirPolicyC.rb +2 -3
  36. data/lib/corba/idl/CosNamingC.rb +4 -5
  37. data/lib/corba/idl/CosNamingS.rb +2 -3
  38. data/lib/corba/idl/IDL.rb +0 -1
  39. data/lib/corba/idl/IORTable.pidl +0 -1
  40. data/lib/corba/idl/MessagingC.rb +2 -3
  41. data/lib/corba/idl/POAC.rb +10 -11
  42. data/lib/corba/idl/TAO_Ext.pidl +0 -1
  43. data/lib/corba/idl/r2c_orb.rb +5 -6
  44. data/lib/corba/idl/require.rb +0 -1
  45. data/lib/corba/jbase/Any.rb +24 -25
  46. data/lib/corba/jbase/IORMap.rb +1 -2
  47. data/lib/corba/jbase/ORB.rb +3 -4
  48. data/lib/corba/jbase/Object.rb +0 -1
  49. data/lib/corba/jbase/Request.rb +6 -7
  50. data/lib/corba/jbase/Servant.rb +11 -12
  51. data/lib/corba/jbase/ServerRequest.rb +8 -9
  52. data/lib/corba/jbase/Streams.rb +4 -5
  53. data/lib/corba/jbase/Stub.rb +0 -1
  54. data/lib/corba/jbase/Typecode.rb +14 -15
  55. data/lib/corba/jbase/Values.rb +0 -1
  56. data/lib/corba/jbase/exception.rb +1 -2
  57. data/lib/corba/jbase/poa.rb +3 -4
  58. data/lib/corba/jbase/policies.rb +4 -5
  59. data/lib/corba/jbase/post_require.rb +0 -1
  60. data/lib/corba/jbase/require.rb +1 -2
  61. data/lib/corba/naming.rb +0 -1
  62. data/lib/corba/naming_service.rb +0 -1
  63. data/lib/corba/poa.rb +1 -2
  64. data/lib/corba/policies.rb +1 -2
  65. data/lib/corba/require.rb +2 -3
  66. data/lib/corba/svcs/ins/cos_naming.rb +64 -67
  67. data/lib/corba/svcs/ins/ins.rb +24 -25
  68. data/lib/corba/svcs/ins/naming_service.rb +3 -4
  69. data/lib/ridlbe/ruby/config.rb +49 -52
  70. data/lib/ridlbe/ruby/orb.pidlc +0 -0
  71. data/lib/ridlbe/ruby/require.rb +0 -1
  72. data/lib/ridlbe/ruby/walker.rb +38 -38
  73. data/mkrf_conf_bingem.rb +0 -2
  74. data/rakelib/bin.rake +2 -3
  75. data/rakelib/bin.rb +4 -5
  76. data/rakelib/build.rake +21 -21
  77. data/rakelib/config.rake +1 -2
  78. data/rakelib/config.rb +23 -25
  79. data/rakelib/gem.rake +53 -38
  80. data/rakelib/gem.rb +8 -9
  81. data/rakelib/package.rake +1 -2
  82. data/rakelib/test.rake +0 -1
  83. data/test/BiDirectional/Test.idl +0 -1
  84. data/test/BiDirectional/client.rb +4 -5
  85. data/test/BiDirectional/run_test.rb +1 -2
  86. data/test/BiDirectional/server.rb +4 -6
  87. data/test/CORBA_Services/Naming/BindingIterator/Test.idl +0 -1
  88. data/test/CORBA_Services/Naming/BindingIterator/client.rb +5 -6
  89. data/test/CORBA_Services/Naming/BindingIterator/run_test.rb +1 -2
  90. data/test/CORBA_Services/Naming/BindingIterator/server.rb +4 -5
  91. data/test/CORBA_Services/Naming/Corbaname/Test.idl +0 -1
  92. data/test/CORBA_Services/Naming/Corbaname/client.rb +3 -4
  93. data/test/CORBA_Services/Naming/Corbaname/run_test.rb +1 -2
  94. data/test/CORBA_Services/Naming/Corbaname/server.rb +10 -11
  95. data/test/CORBA_Services/Naming/Simple/Test.idl +0 -1
  96. data/test/CORBA_Services/Naming/Simple/client.rb +4 -5
  97. data/test/CORBA_Services/Naming/Simple/run_test.rb +1 -2
  98. data/test/CORBA_Services/Naming/Simple/server.rb +4 -5
  99. data/test/Collocation/Diamond.idl +0 -1
  100. data/test/Collocation/run_test.rb +0 -1
  101. data/test/Collocation/test.rb +2 -3
  102. data/test/Connect_Timeout/Test.idl +0 -1
  103. data/test/Connect_Timeout/client.rb +3 -5
  104. data/test/Connect_Timeout/run_test.rb +0 -1
  105. data/test/DII/Test.idl +0 -1
  106. data/test/DII/client.rb +5 -6
  107. data/test/DII/run_test.rb +1 -2
  108. data/test/DII/server.rb +3 -4
  109. data/test/DSI/Test.idl +0 -1
  110. data/test/DSI/client.rb +3 -4
  111. data/test/DSI/run_test.rb +1 -2
  112. data/test/DSI/server.rb +3 -4
  113. data/test/Exceptions/Test.idl +0 -1
  114. data/test/Exceptions/client.rb +5 -6
  115. data/test/Exceptions/run_test.rb +1 -2
  116. data/test/Exceptions/server.rb +3 -4
  117. data/test/Hello/Test.idl +0 -1
  118. data/test/Hello/client.rb +3 -4
  119. data/test/Hello/run_test.rb +1 -2
  120. data/test/Hello/server.rb +3 -4
  121. data/test/IDL_Test/Test.idl +4 -1
  122. data/test/IDL_Test/client.rb +6 -5
  123. data/test/IDL_Test/run_test.rb +1 -2
  124. data/test/IDL_Test/server.rb +8 -4
  125. data/test/IORMap/Test.idl +0 -1
  126. data/test/IORMap/client.rb +3 -4
  127. data/test/IORMap/run_test.rb +1 -2
  128. data/test/IORMap/server.rb +4 -5
  129. data/test/IORTable/Test.idl +0 -1
  130. data/test/IORTable/client.rb +3 -4
  131. data/test/IORTable/run_test.rb +1 -2
  132. data/test/IORTable/server.rb +4 -5
  133. data/test/Implicit_Conversion/Test.idl +0 -1
  134. data/test/Implicit_Conversion/client.rb +4 -5
  135. data/test/Implicit_Conversion/run_test.rb +1 -2
  136. data/test/Implicit_Conversion/server.rb +3 -4
  137. data/test/Multi_Threading/Multiple_ORB/Test.idl +0 -1
  138. data/test/Multi_Threading/Multiple_ORB/client.rb +3 -4
  139. data/test/Multi_Threading/Multiple_ORB/run_test.rb +2 -3
  140. data/test/Multi_Threading/Multiple_ORB/server.rb +3 -4
  141. data/test/Multi_Threading/Simple/Test.idl +0 -1
  142. data/test/Multi_Threading/Simple/client.rb +4 -5
  143. data/test/Multi_Threading/Simple/run_test.rb +1 -2
  144. data/test/Multi_Threading/Simple/server.rb +4 -5
  145. data/test/Multi_Threading/Threads/Test.idl +0 -4
  146. data/test/Multi_Threading/Threads/client.rb +10 -13
  147. data/test/Multi_Threading/Threads/run_test.rb +1 -2
  148. data/test/Multi_Threading/Threads/server.rb +4 -7
  149. data/test/Multi_Threading/Threads/watchdog.rb +3 -3
  150. data/test/Multiple_Servant_Interfaces/Test.idl +0 -1
  151. data/test/Multiple_Servant_Interfaces/client.rb +3 -4
  152. data/test/Multiple_Servant_Interfaces/run_test.rb +1 -2
  153. data/test/Multiple_Servant_Interfaces/server.rb +3 -4
  154. data/test/Nil/Test.idl +0 -1
  155. data/test/Nil/run_test.rb +0 -1
  156. data/test/Nil/test.rb +11 -9
  157. data/test/OBV/AbstractInterface/client.rb +3 -4
  158. data/test/OBV/AbstractInterface/run_test.rb +1 -2
  159. data/test/OBV/AbstractInterface/server.rb +3 -4
  160. data/test/OBV/AbstractInterface/test.idl +0 -1
  161. data/test/OBV/Custom/OBV_impl.rb +0 -1
  162. data/test/OBV/Custom/client.rb +3 -4
  163. data/test/OBV/Custom/run_test.rb +1 -2
  164. data/test/OBV/Custom/server.rb +3 -4
  165. data/test/OBV/Simple/OBV_impl.rb +0 -1
  166. data/test/OBV/Simple/client.rb +3 -4
  167. data/test/OBV/Simple/run_test.rb +1 -2
  168. data/test/OBV/Simple/server.rb +3 -4
  169. data/test/OBV/Simple_Event/Event_impl.rb +0 -1
  170. data/test/OBV/Simple_Event/client.rb +3 -4
  171. data/test/OBV/Simple_Event/run_test.rb +1 -2
  172. data/test/OBV/Simple_Event/server.rb +3 -4
  173. data/test/OBV/Supports/client.rb +3 -4
  174. data/test/OBV/Supports/run_test.rb +1 -2
  175. data/test/OBV/Supports/server.rb +3 -4
  176. data/test/OBV/Supports/supports.idl +0 -1
  177. data/test/OBV/Supports/supports_impl.rb +0 -1
  178. data/test/OBV/Tree/client.rb +3 -4
  179. data/test/OBV/Tree/run_test.rb +1 -2
  180. data/test/OBV/Tree/server.rb +3 -4
  181. data/test/OBV/Tree/test.idl +0 -1
  182. data/test/OBV/Truncatable/Extra.idl +0 -1
  183. data/test/OBV/Truncatable/Truncatable_impl.rb +1 -2
  184. data/test/OBV/Truncatable/client.rb +4 -5
  185. data/test/OBV/Truncatable/run_test.rb +1 -2
  186. data/test/OBV/Truncatable/server.rb +3 -4
  187. data/test/OBV/ValueBox/client.rb +44 -45
  188. data/test/OBV/ValueBox/run_test.rb +1 -2
  189. data/test/OBV/ValueBox/server.rb +29 -29
  190. data/test/Object/Test.idl +0 -1
  191. data/test/Object/client.rb +4 -5
  192. data/test/Object/run_test.rb +1 -2
  193. data/test/Object/server.rb +3 -4
  194. data/test/POA/run_test.rb +0 -1
  195. data/test/POA/test.rb +4 -5
  196. data/test/Param_Test/client.rb +8 -9
  197. data/test/Param_Test/run_test.rb +1 -2
  198. data/test/Param_Test/server.rb +7 -8
  199. data/test/Performance/Simple/Test.idl +0 -1
  200. data/test/Performance/Simple/client.rb +3 -4
  201. data/test/Performance/Simple/run_test.rb +1 -2
  202. data/test/Performance/Simple/server.rb +3 -4
  203. data/test/Policies/Test.idl +0 -1
  204. data/test/Policies/run_test.rb +0 -1
  205. data/test/Policies/test.rb +2 -4
  206. data/test/Timeout/client.rb +6 -7
  207. data/test/Timeout/run_test.rb +1 -2
  208. data/test/Timeout/server.rb +4 -5
  209. data/test/Timeout/test.idl +0 -1
  210. data/test/lib/assert.rb +0 -2
  211. data/test/lib/test.rb +15 -17
  212. data/test/test_runner.rb +6 -8
  213. metadata +29 -66
  214. data/README +0 -62
  215. data/jacorb/lib/antlr-2.7.2.jar +0 -0
  216. data/jacorb/lib/jacorb-3.5.jar +0 -0
  217. data/jacorb/lib/jacorb-omgapi-3.5.jar +0 -0
  218. data/jacorb/lib/jacorb-services-3.5.jar +0 -0
  219. data/jacorb/lib/slf4j-api-1.7.6.jar +0 -0
  220. data/jacorb/lib/slf4j-jdk14-1.7.6.jar +0 -0
  221. data/test/BiDirectional/server.ior +0 -1
  222. data/test/CORBA_Services/Naming/BindingIterator/ins.ior +0 -1
  223. data/test/CORBA_Services/Naming/Corbaname/corbaname.ior +0 -1
  224. data/test/CORBA_Services/Naming/Corbaname/ins.ior +0 -1
  225. data/test/CORBA_Services/Naming/Simple/ins.ior +0 -1
  226. data/test/DII/server.ior +0 -1
  227. data/test/DSI/server.ior +0 -1
  228. data/test/Exceptions/server.ior +0 -1
  229. data/test/Hello/gateway.ior +0 -1
  230. data/test/IDL_Test/server.ior +0 -1
  231. data/test/IORMap/server.ior +0 -1
  232. data/test/IORTable/server.ior +0 -0
  233. data/test/Implicit_Conversion/server.ior +0 -1
  234. data/test/Multi_Threading/Multiple_ORB/server0.ior +0 -1
  235. data/test/Multi_Threading/Multiple_ORB/server1.ior +0 -1
  236. data/test/Multi_Threading/Simple/server.ior +0 -1
  237. data/test/Multi_Threading/Threads/server.ior +0 -1
  238. data/test/Multi_Threading/Threads/watchdog.ior +0 -1
  239. data/test/Multiple_Servant_Interfaces/server.ior +0 -1
  240. data/test/OBV/AbstractInterface/server.ior +0 -1
  241. data/test/OBV/Custom/server.ior +0 -1
  242. data/test/OBV/Simple/server.ior +0 -1
  243. data/test/OBV/Simple_Event/server.ior +0 -1
  244. data/test/OBV/Supports/server.ior +0 -1
  245. data/test/OBV/Tree/server.ior +0 -1
  246. data/test/OBV/Truncatable/server.ior +0 -1
  247. data/test/OBV/ValueBox/server.ior +0 -1
  248. data/test/Object/server.ior +0 -1
  249. data/test/Param_Test/server.ior +0 -1
  250. data/test/Performance/Simple/server.ior +0 -1
  251. data/test/Timeout/server.ior +0 -1
  252. data/test/test.log +0 -20
  253. 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'
@@ -28,13 +27,13 @@ ARGV.options do |opts|
28
27
 
29
28
  opts.on("--k IORFILE",
30
29
  "Set IOR.",
31
- "Default: 'file://server.ior'") { |v| OPTIONS[:iorfile]=v }
30
+ "Default: 'file://server.ior'") { |v| OPTIONS[:iorfile] = v }
32
31
  opts.on("--d LVL",
33
32
  "Set ORBDebugLevel value.",
34
- "Default: 0") { |v| OPTIONS[:orb_debuglevel]=v }
33
+ "Default: 0") { |v| OPTIONS[:orb_debuglevel] = v }
35
34
  opts.on("--use-implement",
36
35
  "Load IDL through CORBA.implement() instead of precompiled code.",
37
- "Default: off") { |v| OPTIONS[:use_implement]=v }
36
+ "Default: off") { |v| OPTIONS[:use_implement] = v }
38
37
 
39
38
  opts.separator ""
40
39
 
@@ -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 "basic_invocations:1 failed", (p2_out == (53*3))
69
- assert "basic_invocations:1 failed", (p3_out == (53*5))
70
- 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))
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 "basic_invocations:2 failed", (p2_out == (53*3))
83
- assert "basic_invocations:2 failed", (p3_out == (53*5))
84
- 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))
85
84
 
86
85
  # test boxed value using nil
87
86
  p1 = nil
@@ -93,8 +92,8 @@ 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 "basic_invocations:2 failed", (p2_out == (53*3))
97
- 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))
98
97
  assert "basic_invocations:2 failed", (retval.nil?)
99
98
 
100
99
  # test boxed value from nested module
@@ -106,9 +105,9 @@ module Test
106
105
 
107
106
  retval, p2_out, p3_out = test.basic_op2(p1, p2)
108
107
 
109
- assert "basic_invocations:3 failed", (p2_out == (53*3))
110
- assert "basic_invocations:3 failed", (p3_out == (53*5))
111
- 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))
112
111
 
113
112
  # test regular Ruby types using values from valueboxes
114
113
  p1 = VBlong.new(25)
@@ -119,9 +118,9 @@ module Test
119
118
 
120
119
  retval, p2_out, p3_out = test.basic_op3(p1.value, p2.value)
121
120
 
122
- assert "basic_invocations:4 failed", (p2_out == (53*3))
123
- assert "basic_invocations:4 failed", (p3_out == (53*5))
124
- 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))
125
124
  end
126
125
 
127
126
  def Test.boxed_string_invocations(test)
@@ -177,7 +176,7 @@ module Test
177
176
  def Test.boxed_sequence_invocations(test)
178
177
  # basic test
179
178
  p1 = VBseqlong.new([101, 202, 303])
180
- 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)
181
180
 
182
181
  # test invocation with value boxes
183
182
  p1 = VBseqlong.new([10, 9, 8, 7])
@@ -191,10 +190,10 @@ 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 "boxed_sequence_invocations:2 failed", (p2_out[i] == e*3)
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 "boxed_sequence_invocations:2 failed", (p3_out[i] == e*5)
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
199
  assert "boxed_sequence_invocations:2 failed", (retval[i] == e)
@@ -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 "boxed_sequence_invocations:3 failed", (p2_out[i] == e*3)
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 "boxed_sequence_invocations:3 failed", (p3_out[i] == e*5)
211
+ assert "boxed_sequence_invocations:3 failed", (p3_out[i] == e * 5)
213
212
  end
214
213
  end
215
214
 
@@ -217,7 +216,7 @@ 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
221
  assert "boxed_struct_invocations:0 failed", (p1.value.is_a?(Fixed_Struct1))
223
222
  assert "boxed_struct_invocations:0 failed", (p1.value.l == 29)
@@ -226,21 +225,21 @@ module Test
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
234
  assert "boxed_struct_invocations:1 failed", (p2_out.is_a?(Fixed_Struct1))
236
- assert "boxed_struct_invocations:1 failed", (p2_out.l == (92*3))
237
- assert "boxed_struct_invocations:1 failed", (p2_out.abstruct.s1 == (171*3) &&
238
- 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))
239
238
 
240
239
  assert "boxed_struct_invocations:1 failed", (p3_out.is_a?(Fixed_Struct1))
241
- assert "boxed_struct_invocations:1 failed", (p3_out.l == (92*5))
242
- assert "boxed_struct_invocations:1 failed", (p3_out.abstruct.s1 == (171*5) &&
243
- 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))
244
243
 
245
244
  assert "boxed_struct_invocations:1 failed", (retval.is_a?(Fixed_Struct1))
246
245
  assert "boxed_struct_invocations:1 failed", (retval.l == p1.value.l)
@@ -251,9 +250,9 @@ module Test
251
250
  p2_out, p3_out = test.struct_op2(p1.value, p2_out)
252
251
 
253
252
  assert "boxed_struct_invocations:2 failed", (p2_out.is_a?(Fixed_Struct1))
254
- assert "boxed_struct_invocations:2 failed", (p2_out.l == (92*3*3))
255
- assert "boxed_struct_invocations:2 failed", (p2_out.abstruct.s1 == (171*3*3) &&
256
- 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))
257
256
 
258
257
  assert "boxed_struct_invocations:2 failed", (p3_out.is_a?(Fixed_Struct1))
259
258
  assert "boxed_struct_invocations:2 failed", (p3_out.l == p1.value.l)
@@ -274,11 +273,11 @@ module Test
274
273
  retval, p2_out, p3_out = test.struct_op3(p1, p2)
275
274
 
276
275
  assert "boxed_struct_invocations:4 failed", (p2_out.is_a?(Variable_Struct1))
277
- assert "boxed_struct_invocations:4 failed", (p2_out.l == (37*3))
276
+ assert "boxed_struct_invocations:4 failed", (p2_out.l == (37 * 3))
278
277
  assert "boxed_struct_invocations:4 failed", (p2_out.str == '2variable')
279
278
 
280
279
  assert "boxed_struct_invocations:4 failed", (p3_out.is_a?(Variable_Struct1))
281
- assert "boxed_struct_invocations:4 failed", (p3_out.l == (37*3))
280
+ assert "boxed_struct_invocations:4 failed", (p3_out.l == (37 * 3))
282
281
  assert "boxed_struct_invocations:4 failed", (p3_out.str == '2variable')
283
282
 
284
283
  assert "boxed_struct_invocations:1 failed", (retval.is_a?(Variable_Struct1))
@@ -289,7 +288,7 @@ module Test
289
288
  p2_out, p3_out = test.struct_op4(p1.value, p2_out)
290
289
 
291
290
  assert "boxed_struct_invocations:4 failed", (p2_out.is_a?(Variable_Struct1))
292
- 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))
293
292
  assert "boxed_struct_invocations:4 failed", (p2_out.str == 'e2variabl')
294
293
 
295
294
  assert "boxed_struct_invocations:1 failed", (p3_out.is_a?(Variable_Struct1))
@@ -300,7 +299,7 @@ module Test
300
299
  def Test.boxed_array_invocations(test)
301
300
  # basic test
302
301
  p1 = VBlongarray.new([101, 202, 303])
303
- 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)
304
303
 
305
304
  # test invocation with value boxes
306
305
  p1 = VBlongarray.new([10, 9, 8])
@@ -314,10 +313,10 @@ 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 "boxed_array_invocations:2 failed", (p2_out[i] == e*3)
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 "boxed_array_invocations:2 failed", (p3_out[i] == e*3)
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
322
  assert "boxed_array_invocations:2 failed", (retval[i] == e)
@@ -329,7 +328,7 @@ 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 "boxed_array_invocations:3 failed", (p2_out[i] == e*3)
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
334
  assert "boxed_array_invocations:3 failed", (p3_out[i] == e)
@@ -391,15 +390,15 @@ module Test
391
390
 
392
391
  assert "boxed_union_invocations:1 failed", (p2_out.is_a?(Fixed_Union1))
393
392
  assert "boxed_union_invocations:1 failed", (p2_out._disc == 2)
394
- assert "boxed_union_invocations:1 failed", (p2_out.m2 == 789*3)
393
+ assert "boxed_union_invocations:1 failed", (p2_out.m2 == 789 * 3)
395
394
 
396
395
  assert "boxed_union_invocations:1 failed", (p3_out.is_a?(Fixed_Union1))
397
396
  assert "boxed_union_invocations:1 failed", (p3_out._disc == 1)
398
- assert "boxed_union_invocations:1 failed", (p3_out.m1 == 321*3)
397
+ assert "boxed_union_invocations:1 failed", (p3_out.m1 == 321 * 3)
399
398
 
400
399
  assert "boxed_union_invocations:1 failed", (retval.is_a?(Fixed_Union1))
401
400
  assert "boxed_union_invocations:1 failed", (retval._disc == 1)
402
- assert "boxed_union_invocations:1 failed", (retval.m1 == 321*3)
401
+ assert "boxed_union_invocations:1 failed", (retval.m1 == 321 * 3)
403
402
 
404
403
  # test invocation with Ruby types using valuebox values
405
404
  p2_out = nil
@@ -408,7 +407,7 @@ module Test
408
407
 
409
408
  assert "boxed_union_invocations:1 failed", (p2_out.is_a?(Fixed_Union1))
410
409
  assert "boxed_union_invocations:1 failed", (p2_out._disc == 2)
411
- assert "boxed_union_invocations:1 failed", (p2_out.m2 == 789*3)
410
+ assert "boxed_union_invocations:1 failed", (p2_out.m2 == 789 * 3)
412
411
 
413
412
  assert "boxed_union_invocations:1 failed", (p3_out.is_a?(Fixed_Union1))
414
413
  assert "boxed_union_invocations:1 failed", (p3_out._disc == 1)
data/test/OBV/ValueBox/run_test.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
  OPTIONS = {
@@ -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)
data/test/OBV/ValueBox/server.rb CHANGED
@@ -26,13 +26,13 @@ ARGV.options do |opts|
26
26
 
27
27
  opts.on("--o IORFILE",
28
28
  "Set IOR filename.",
29
- "Default: 'server.ior'") { |v| OPTIONS[:iorfile]=v }
29
+ "Default: 'server.ior'") { |v| OPTIONS[:iorfile] = v }
30
30
  opts.on("--d LVL",
31
31
  "Set ORBDebugLevel value.",
32
- "Default: 0") { |v| OPTIONS[:orb_debuglevel]=v }
32
+ "Default: 0") { |v| OPTIONS[:orb_debuglevel] = v }
33
33
  opts.on("--use-implement",
34
34
  "Load IDL through CORBA.implement() instead of precompiled code.",
35
- "Default: off") { |v| OPTIONS[:use_implement]=v }
35
+ "Default: off") { |v| OPTIONS[:use_implement] = v }
36
36
 
37
37
  opts.separator ""
38
38
 
@@ -55,7 +55,7 @@ class Test_impl < POA::Test
55
55
  end
56
56
 
57
57
  def ros(s)
58
- s.slice(s.size-1,1) << s.slice(0,s.size-1)
58
+ s.slice(s.size - 1, 1) << s.slice(0, s.size - 1)
59
59
  end
60
60
 
61
61
  def basic_op1(p1, p2)
@@ -94,25 +94,25 @@ class Test_impl < POA::Test
94
94
  end
95
95
 
96
96
  def seq_op1(p1, p2)
97
- p3 = p2.collect {|e| e*5}
98
- p2.collect! {|e| e*3}
97
+ p3 = p2.collect {|e| e * 5}
98
+ p2.collect! {|e| e * 3}
99
99
  retval = p1
100
100
  [retval, p2, p3]
101
101
  end
102
102
 
103
103
  def seq_op2(p1, p2)
104
- p3 = p2.collect {|e| e*5}
105
- p2.collect! {|e| e*3}
104
+ p3 = p2.collect {|e| e * 5}
105
+ p2.collect! {|e| e * 3}
106
106
  [p2, p3]
107
107
  end
108
108
 
109
109
  def struct_op1(p1, p2)
110
- p3 = Fixed_Struct1.new(p2.l*5,
111
- Fixed_Struct1::Bstruct.new(p2.abstruct.s1*5,
112
- p2.abstruct.s2*5))
113
- p2.l = p2.l*3
114
- p2.abstruct.s1 = p2.abstruct.s1*3
115
- p2.abstruct.s2 = p2.abstruct.s2*3
110
+ p3 = Fixed_Struct1.new(p2.l * 5,
111
+ Fixed_Struct1::Bstruct.new(p2.abstruct.s1 * 5,
112
+ p2.abstruct.s2 * 5))
113
+ p2.l = p2.l * 3
114
+ p2.abstruct.s1 = p2.abstruct.s1 * 3
115
+ p2.abstruct.s2 = p2.abstruct.s2 * 3
116
116
 
117
117
  retval = p1
118
118
  [retval, p2, p3]
@@ -121,9 +121,9 @@ class Test_impl < POA::Test
121
121
  def struct_op2(p1, p2)
122
122
  p3 = p1
123
123
 
124
- p2.l = p2.l*3
125
- p2.abstruct.s1 = p2.abstruct.s1*3
126
- p2.abstruct.s2 = p2.abstruct.s2*3
124
+ p2.l = p2.l * 3
125
+ p2.abstruct.s1 = p2.abstruct.s1 * 3
126
+ p2.abstruct.s2 = p2.abstruct.s2 * 3
127
127
 
128
128
  [p2, p3]
129
129
  end
@@ -147,14 +147,14 @@ class Test_impl < POA::Test
147
147
  end
148
148
 
149
149
  def array_op1(p1, p2)
150
- p2.collect! {|e| e*3}
150
+ p2.collect! {|e| e * 3}
151
151
  p3 = p2
152
152
  retval = p1
153
153
  [retval, p2, p3]
154
154
  end
155
155
 
156
156
  def array_op2(p1, p2)
157
- p2.collect! {|e| e*3}
157
+ p2.collect! {|e| e * 3}
158
158
  p3 = p1
159
159
  [p2, p3]
160
160
  end
@@ -177,17 +177,17 @@ class Test_impl < POA::Test
177
177
  retval = VBfixed_union1.new(Fixed_Union1.new)
178
178
  case p1._disc
179
179
  when 1
180
- p3.value.m1 = p1.m1*3
181
- retval.value.m1 = p1.m1*3
180
+ p3.value.m1 = p1.m1 * 3
181
+ retval.value.m1 = p1.m1 * 3
182
182
  when 2
183
- p3.value.m2 = p1.m2*3
184
- retval.value.m2 = p1.m2*3
183
+ p3.value.m2 = p1.m2 * 3
184
+ retval.value.m2 = p1.m2 * 3
185
185
  end
186
186
  case p2._disc
187
187
  when 1
188
- p2.m1 = p2.m1*3
188
+ p2.m1 = p2.m1 * 3
189
189
  when 2
190
- p2.m2 = p2.m2*3
190
+ p2.m2 = p2.m2 * 3
191
191
  end
192
192
  [retval, p2, p3]
193
193
  end
@@ -196,9 +196,9 @@ class Test_impl < POA::Test
196
196
  p3 = p1
197
197
  case p2._disc
198
198
  when 1
199
- p2.m1 = p2.m1*3
199
+ p2.m1 = p2.m1 * 3
200
200
  when 2
201
- p2.m2 = p2.m2*3
201
+ p2.m2 = p2.m2 * 3
202
202
  end
203
203
  [p2, p3]
204
204
  end
@@ -216,7 +216,7 @@ class Test_impl < POA::Test
216
216
  end
217
217
  case p2._disc
218
218
  when 1
219
- p2.m1 = p2.m1*3
219
+ p2.m1 = p2.m1 * 3
220
220
  when 2
221
221
  p2.m2 = ros(p2.m2)
222
222
  end
@@ -227,7 +227,7 @@ class Test_impl < POA::Test
227
227
  p3 = p1
228
228
  case p2._disc
229
229
  when 1
230
- p2.m1 = p2.m1*3
230
+ p2.m1 = p2.m1 * 3
231
231
  when 2
232
232
  p2.m2 = ros(p2.m2)
233
233
  end
data/test/Object/Test.idl CHANGED
@@ -6,7 +6,6 @@
6
6
  * included with this program.
7
7
  *
8
8
  * Copyright (c) Remedy IT Expertise BV
9
- * Chamber of commerce Rotterdam nr.276339, The Netherlands
10
9
  *--------------------------------------------------------------------*/
11
10
 
12
11
  /// Put the interfaces in a module, to avoid global namespace pollution
data/test/Object/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'
@@ -28,13 +27,13 @@ ARGV.options do |opts|
28
27
 
29
28
  opts.on("--k IORFILE",
30
29
  "Set IOR.",
31
- "Default: 'file://server.ior'") { |v| OPTIONS[:iorfile]=v }
30
+ "Default: 'file://server.ior'") { |v| OPTIONS[:iorfile] = v }
32
31
  opts.on("--d LVL",
33
32
  "Set ORBDebugLevel value.",
34
- "Default: 0") { |v| OPTIONS[:orb_debuglevel]=v }
33
+ "Default: 0") { |v| OPTIONS[:orb_debuglevel] = v }
35
34
  opts.on("--use-implement",
36
35
  "Load IDL through CORBA.implement() instead of precompiled code.",
37
- "Default: off") { |v| OPTIONS[:use_implement]=v }
36
+ "Default: off") { |v| OPTIONS[:use_implement] = v }
38
37
 
39
38
  opts.separator ""
40
39
 
@@ -58,7 +57,7 @@ begin
58
57
  obj = orb.string_to_object(OPTIONS[:iorfile])
59
58
 
60
59
  unless defined?(JRUBY_VERSION) && CORBA::Native::Jacorb::MAJOR_VERSION == 3 &&
61
- ([4,5].include? CORBA::Native::Jacorb::MINOR_VERSION)
60
+ ([4, 5].include? CORBA::Native::Jacorb::MINOR_VERSION)
62
61
  ## JacORB 3.4 introduced an optimization which *requires* use of the Java endorsed dirs
63
62
  ## mechanism to replace standard JDK CORBA stubs with the JacORB version in order to
64
63
  ## have JacORB process these base methods correctly with DSI servants