r2corba 1.6.2-universal-java → 1.7.0-universal-java

data/test/OBV/ValueBox/client.rb

@@ -14,9 +14,9 @@ require 'lib/assert.rb'
 include TestUtil::Assertions
 
 OPTIONS = {
-  :use_implement => false,
-  :orb_debuglevel => 0,
-  :iorfile => 'file://server.ior'
+  use_implement: false,
+  orb_debuglevel: 0,
+  iorfile: 'file://server.ior'
 }
 
 ARGV.options do |opts|
@@ -189,13 +189,13 @@ module Test
     retval = nil
     retval, p2_out, p3_out = test.seq_op1(p1, p2)
 
-    p2.value().each_with_index do |e, i|
+    p2.value.each_with_index do |e, i|
       assert 'boxed_sequence_invocations:2 failed', (p2_out[i] == e * 3)
     end
-    p2.value().each_with_index do |e, i|
+    p2.value.each_with_index do |e, i|
       assert 'boxed_sequence_invocations:2 failed', (p3_out[i] == e * 5)
     end
-    p1.value().each_with_index do |e, i|
+    p1.value.each_with_index do |e, i|
       assert 'boxed_sequence_invocations:2 failed', (retval[i] == e)
     end
 
@@ -204,10 +204,10 @@ module Test
     p3_out = nil
     p2_out, p3_out = test.seq_op2(p1.value, p2.value)
 
-    p2.value().each_with_index do |e, i|
+    p2.value.each_with_index do |e, i|
       assert 'boxed_sequence_invocations:3 failed', (p2_out[i] == e * 3)
     end
-    p2.value().each_with_index do |e, i|
+    p2.value.each_with_index do |e, i|
       assert 'boxed_sequence_invocations:3 failed', (p3_out[i] == e * 5)
     end
   end
@@ -312,13 +312,13 @@ module Test
     retval = nil
     retval, p2_out, p3_out = test.array_op1(p1, p2)
 
-    p2.value().each_with_index do |e, i|
+    p2.value.each_with_index do |e, i|
       assert 'boxed_array_invocations:2 failed', (p2_out[i] == e * 3)
     end
-    p2.value().each_with_index do |e, i|
+    p2.value.each_with_index do |e, i|
       assert 'boxed_array_invocations:2 failed', (p3_out[i] == e * 3)
     end
-    p1.value().each_with_index do |e, i|
+    p1.value.each_with_index do |e, i|
       assert 'boxed_array_invocations:2 failed', (retval[i] == e)
     end
 
@@ -327,10 +327,10 @@ module Test
     p3_out = nil
     p2_out, p3_out = test.array_op2(p1.value, p2.value)
 
-    p2.value().each_with_index do |e, i|
+    p2.value.each_with_index do |e, i|
       assert 'boxed_array_invocations:3 failed', (p2_out[i] == e * 3)
     end
-    p1.value().each_with_index do |e, i|
+    p1.value.each_with_index do |e, i|
       assert 'boxed_array_invocations:3 failed', (p3_out[i] == e)
     end
 
@@ -345,13 +345,13 @@ module Test
     retval = nil
     retval, p2_out, p3_out = test.array_op3(p1, p2)
 
-    p2.value().each_with_index do |e, i|
+    p2.value.each_with_index do |e, i|
       assert 'boxed_array_invocations:5 failed', (p2_out[i] == '1inout string')
     end
-    p2.value().each_with_index do |e, i|
+    p2.value.each_with_index do |e, i|
       assert 'boxed_array_invocations:5 failed', (p3_out[i] == '1inout string')
     end
-    p1.value().each_with_index do |e, i|
+    p1.value.each_with_index do |e, i|
       assert 'boxed_array_invocations:5 failed', (retval[i] == e)
     end
 
@@ -360,10 +360,10 @@ module Test
     p3_out = nil
     p2_out, p3_out = test.array_op4(p1.value, p2.value)
 
-    p2.value().each_with_index do |e, i|
+    p2.value.each_with_index do |e, i|
       assert 'boxed_array_invocations:6 failed', (p2_out[i] == '1inout string')
     end
-    p1.value().each_with_index do |e, i|
+    p1.value.each_with_index do |e, i|
       assert 'boxed_array_invocations:6 failed', (p3_out[i] == e)
     end
   end
@@ -488,10 +488,10 @@ begin
 
   # shutdown test service
 
-  test.shutdown()
+  test.shutdown
 
 ensure
 
-  orb.destroy()
+  orb.destroy
 
 end

data/test/OBV/ValueBox/run_test.rb

@@ -10,8 +10,8 @@
 #--------------------------------------------------------------------
 
 OPTIONS = {
-  :debug_opt => '',
-  :use_implement => '--use-implement'
+  debug_opt: '',
+  use_implement: '--use-implement'
 }
 
 require 'optparse'

data/test/OBV/ValueBox/server.rb

@@ -13,9 +13,9 @@
 require 'optparse'
 
 OPTIONS = {
-  :use_implement => false,
-  :orb_debuglevel => 0,
-  :iorfile => 'server.ior'
+  use_implement: false,
+  orb_debuglevel: 0,
+  iorfile: 'server.ior'
 }
 
 ARGV.options do |opts|
@@ -61,7 +61,7 @@ class Test_impl < POA::Test
   def basic_op1(p1, p2)
     p3 = p2 * 5
     p2 = p2 * 3
-    retval = p1.nil?() ? nil : p1 * 3
+    retval = p1.nil? ? nil : p1 * 3
     [retval, p2, p3]
   end
 
@@ -235,7 +235,7 @@ class Test_impl < POA::Test
   end
 
   def shutdown()
-    @orb.shutdown()
+    @orb.shutdown
   end
 end # of servant Test_impl
 
@@ -251,17 +251,17 @@ poa_man.activate
 
 test_srv = Test_impl.new(orb)
 
-test_obj = test_srv._this()
+test_obj = test_srv._this
 
 ior = orb.object_to_string(test_obj)
 
-open(OPTIONS[:iorfile], 'w') { |io|
+File.open(OPTIONS[:iorfile], 'w') { |io|
   io.write ior
 }
 
 Signal.trap('INT') do
   puts 'SIGINT - shutting down ORB...'
-  orb.shutdown()
+  orb.shutdown
 end
 
 if Signal.list.has_key?('USR2')

data/test/Object/client.rb

@@ -14,9 +14,9 @@ require 'lib/assert.rb'
 include TestUtil::Assertions
 
 OPTIONS = {
-  :use_implement => false,
-  :orb_debuglevel => 0,
-  :iorfile => 'file://server.ior'
+  use_implement: false,
+  orb_debuglevel: 0,
+  iorfile: 'file://server.ior'
 }
 
 ARGV.options do |opts|
@@ -76,7 +76,7 @@ begin
 
     assert 'incorrect repository id returned (2)', id == Test::Hello._tc.id
 
-    the_string = hello_obj.get_string()
+    the_string = hello_obj.get_string
 
     puts "string returned <#{the_string}>"
 
@@ -102,10 +102,10 @@ begin
     hello2_obj = Test::Hello._narrow(obj)
   end
 
-  hello2_obj.shutdown()
+  hello2_obj.shutdown
 
 ensure
 
-  orb.destroy()
+  orb.destroy
 
 end

data/test/Object/run_test.rb

@@ -10,8 +10,8 @@
 #--------------------------------------------------------------------
 
 OPTIONS = {
-  :debug_opt => '',
-  :use_implement => '--use-implement'
+  debug_opt: '',
+  use_implement: '--use-implement'
 }
 
 require 'optparse'

data/test/Object/server.rb

@@ -12,9 +12,9 @@
 require 'optparse'
 
 OPTIONS = {
-  :use_implement => false,
-  :orb_debuglevel => 0,
-  :iorfile => 'server.ior'
+  use_implement: false,
+  orb_debuglevel: 0,
+  iorfile: 'server.ior'
 }
 
 ARGV.options do |opts|
@@ -58,7 +58,7 @@ class MyHello < POA::Test::Hello
   end
 
   def shutdown()
-    @orb.shutdown()
+    @orb.shutdown
   end
 
   ## overrides for standard CORBA::Object methods
@@ -67,7 +67,7 @@ class MyHello < POA::Test::Hello
     # create second servant and
     hello_srv = MyHello2.new(@orb)
     # activate and return object ref
-    hello_srv._this()
+    hello_srv._this
   end
 end # of servant MyHello
 
@@ -81,7 +81,7 @@ class MyHello2 < POA::Test::Hello
   end
 
   def shutdown()
-    @orb.shutdown()
+    @orb.shutdown
   end
 
   ## overrides for standard CORBA::Object methods
@@ -105,17 +105,17 @@ poa_man.activate
 
 hello_srv = MyHello.new(orb)
 
-hello_obj = hello_srv._this()
+hello_obj = hello_srv._this
 
 hello_ior = orb.object_to_string(hello_obj)
 
-open(OPTIONS[:iorfile], 'w') { |io|
+File.open(OPTIONS[:iorfile], 'w') { |io|
   io.write hello_ior
 }
 
 Signal.trap('INT') do
   puts 'SIGINT - shutting down ORB...'
-  orb.shutdown()
+  orb.shutdown
 end
 
 if Signal.list.has_key?('USR2')

data/test/POA/run_test.rb

@@ -10,8 +10,8 @@
 #--------------------------------------------------------------------
 
 OPTIONS = {
-  :debug_opt => '',
-  :use_implement => '--use-implement'
+  debug_opt: '',
+  use_implement: '--use-implement'
 }
 
 require 'optparse'

data/test/POA/test.rb

@@ -14,9 +14,9 @@ require 'lib/assert'
 include TestUtil::Assertions
 
 OPTIONS = {
-  :use_implement => false,
-  :orb_debuglevel => 0,
-  :iorfile => 'server.ior'
+  use_implement: false,
+  orb_debuglevel: 0,
+  iorfile: 'server.ior'
 }
 
 ARGV.options do |opts|
@@ -60,7 +60,7 @@ class MyHello < POA::Test::Hello
   end
 
   def shutdown()
-    @orb.shutdown()
+    @orb.shutdown
   end
 end # of servant MyHello
 

data/test/Param_Test/client.rb

@@ -14,9 +14,9 @@ require 'lib/assert.rb'
 include TestUtil::Assertions
 
 OPTIONS = {
-  :use_implement => false,
-  :orb_debuglevel => 0,
-  :iorfile => 'file://server.ior'
+  use_implement: false,
+  orb_debuglevel: 0,
+  iorfile: 'file://server.ior'
 }
 
 ARGV.options do |opts|
@@ -80,7 +80,7 @@ begin
 
   ## string test
 
-  str = hello_obj.get_string()
+  str = hello_obj.get_string
 
   msg = hello_obj.message
 
@@ -267,10 +267,10 @@ begin
     reslen != resoutstr.size || resinoutstr != instr || resoutstr != (instr + inoutstr)
   end
 
-  hello_obj.shutdown()
+  hello_obj.shutdown
 
 ensure
 
-  orb.destroy()
+  orb.destroy
 
 end

data/test/Param_Test/run_test.rb

@@ -10,8 +10,8 @@
 #--------------------------------------------------------------------
 
 OPTIONS = {
-  :debug_opt => '',
-  :use_implement => '--use-implement'
+  debug_opt: '',
+  use_implement: '--use-implement'
 }
 
 require 'optparse'

data/test/Param_Test/server.rb

@@ -12,9 +12,9 @@
 require 'optparse'
 
 OPTIONS = {
-  :use_implement => false,
-  :orb_debuglevel => 0,
-  :iorfile => 'server.ior'
+  use_implement: false,
+  orb_debuglevel: 0,
+  iorfile: 'server.ior'
 }
 
 ARGV.options do |opts|
@@ -256,7 +256,7 @@ class MyHello < POA::Test::Hello
   end
 
   def shutdown()
-    @orb.shutdown()
+    @orb.shutdown
   end
 end # of servant Hello
 
@@ -279,13 +279,13 @@ hello_obj = root_poa.id_to_reference(hello_oid)
 
 hello_ior = orb.object_to_string(hello_obj)
 
-open(OPTIONS[:iorfile], 'w') { |io|
+File.open(OPTIONS[:iorfile], 'w') { |io|
   io.write hello_ior
 }
 
 Signal.trap('INT') do
   puts 'SIGINT - shutting down ORB...'
-  orb.shutdown()
+  orb.shutdown
 end
 
 if Signal.list.has_key?('USR2')

data/test/Performance/Simple/client.rb

@@ -14,9 +14,9 @@ require 'lib/assert.rb'
 include TestUtil::Assertions
 
 OPTIONS = {
-  :use_implement => false,
-  :orb_debuglevel => 0,
-  :iorfile => 'file://server.ior'
+  use_implement: false,
+  orb_debuglevel: 0,
+  iorfile: 'file://server.ior'
 }
 
 ARGV.options do |opts|
@@ -74,16 +74,16 @@ begin
 
   STDERR.puts "*** Avg turnaround time per invocation = #{'%.2f' % (t_diff / 10)} msec"
 
-  hello_obj.shutdown()
+  hello_obj.shutdown
 
   assert_not 'ERROR: Object is reported nil!', CORBA::is_nil(hello_obj)
 
-  hello_obj._free_ref()
+  hello_obj._free_ref
 
   assert 'ERROR: Object is reported non-nil!', CORBA::is_nil(hello_obj)
 
 ensure
 
-  orb.destroy()
+  orb.destroy
 
 end

data/test/Performance/Simple/run_test.rb

@@ -10,8 +10,8 @@
 #--------------------------------------------------------------------
 
 OPTIONS = {
-  :debug_opt => '',
-  :use_implement => '--use-implement'
+  debug_opt: '',
+  use_implement: '--use-implement'
 }
 
 require 'optparse'

data/test/Performance/Simple/server.rb

@@ -12,9 +12,9 @@
 require 'optparse'
 
 OPTIONS = {
-  :use_implement => false,
-  :orb_debuglevel => 0,
-  :iorfile => 'server.ior'
+  use_implement: false,
+  orb_debuglevel: 0,
+  iorfile: 'server.ior'
 }
 
 ARGV.options do |opts|
@@ -58,7 +58,7 @@ class MyHello < POA::Test::Hello
   end
 
   def shutdown()
-    @orb.shutdown()
+    @orb.shutdown
   end
 end # of servant MyHello
 
@@ -74,17 +74,17 @@ poa_man.activate
 
 hello_srv = MyHello.new(orb)
 
-hello_obj = hello_srv._this()
+hello_obj = hello_srv._this
 
 hello_ior = orb.object_to_string(hello_obj)
 
-open(OPTIONS[:iorfile], 'w') { |io|
+File.open(OPTIONS[:iorfile], 'w') { |io|
   io.write hello_ior
 }
 
 Signal.trap('INT') do
   puts 'SIGINT - shutting down ORB...'
-  orb.shutdown()
+  orb.shutdown
 end
 
 if Signal.list.has_key?('USR2')

data/test/Policies/run_test.rb

@@ -10,8 +10,8 @@
 #--------------------------------------------------------------------
 
 OPTIONS = {
-  :debug_opt => '',
-  :use_implement => '--use-implement'
+  debug_opt: '',
+  use_implement: '--use-implement'
 }
 
 require 'optparse'

data/test/Policies/test.rb

@@ -14,8 +14,8 @@ require 'lib/assert.rb'
 include TestUtil::Assertions
 
 OPTIONS = {
-  :use_implement => false,
-  :orb_debuglevel => 0
+  use_implement: false,
+  orb_debuglevel: 0
 }
 
 ARGV.options do |opts|
@@ -57,7 +57,7 @@ class MyHello < POA::Test::Hello
   end
 
   def shutdown()
-    @orb.shutdown()
+    @orb.shutdown
   end
 end # of servant MyHello
 
@@ -138,5 +138,5 @@ begin
          obj._get_policy_overrides([BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE, Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE]).size == 1
 
 ensure
-  orb.destroy()
+  orb.destroy
 end

data/test/Timeout/client.rb

@@ -14,9 +14,9 @@ require 'lib/assert.rb'
 include TestUtil::Assertions
 
 OPTIONS = {
-  :use_implement => false,
-  :orb_debuglevel => 0,
-  :iorfile => 'file://server.ior'
+  use_implement: false,
+  orb_debuglevel: 0,
+  iorfile: 'file://server.ior'
 }
 
 ARGV.options do |opts|
@@ -123,7 +123,7 @@ begin
 
   simple_timeout_srv = Simple_Server._narrow(obj)
 
-  policies[0].destroy()
+  policies[0].destroy
   policies[0] = nil
 
   puts "client (#{Process.pid}) testing from #{Min_timeout} to #{Max_timeout} milliseconds"
@@ -135,7 +135,7 @@ begin
 
     puts "client (#{Process.pid}) Cleanup ORB/Thread/Object policies"
 
-    policies.clear()
+    policies.clear
     pol_man.set_policy_overrides(policies, CORBA::SET_OVERRIDE)
     pol_cur.set_policy_overrides(policies, CORBA::SET_OVERRIDE) if pol_cur
 
@@ -150,12 +150,12 @@ begin
 
     send_echo(Orb1, orb, simple_srv, t)
 
-    policies[0].destroy()
+    policies[0].destroy
 
     if pol_cur
       puts "client (#{Process.pid}) Set the thread policies"
 
-      policies.clear()
+      policies.clear
       policies << orb.create_policy(Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE,
                                     any_thread)
 
@@ -163,7 +163,7 @@ begin
 
       send_echo(Thread1, orb, simple_srv, t)
 
-      policies[0].destroy()
+      policies[0].destroy
     end
 
     puts "client (#{Process.pid}) Use the object policies"
@@ -174,13 +174,13 @@ begin
   puts "\n\n"
   puts "client (#{Process.pid}) Test completed, resynch with server"
 
-  policies.clear()
+  policies.clear
   pol_man.set_policy_overrides(policies, CORBA::SET_OVERRIDE)
   pol_cur.set_policy_overrides(policies, CORBA::SET_OVERRIDE) if pol_cur
 
   send_echo(None, orb, simple_srv, 0)
 
-  simple_srv.shutdown()
+  simple_srv.shutdown
 
   timeout_count_total = 0
   in_time_count_total = 0
@@ -201,6 +201,6 @@ begin
 
 ensure
 
-  orb.destroy()
+  orb.destroy
 
 end

data/test/Timeout/run_test.rb

@@ -10,8 +10,8 @@
 #--------------------------------------------------------------------
 
 OPTIONS = {
-  :debug_opt => '',
-  :use_implement => '--use-implement'
+  debug_opt: '',
+  use_implement: '--use-implement'
 }
 
 require 'optparse'

data/test/Timeout/server.rb

@@ -12,10 +12,10 @@
 require 'optparse'
 
 OPTIONS = {
-  :use_implement => false,
-  :orb_debuglevel => 0,
-  :iorfile => 'server.ior',
-  :iter_num => 10
+  use_implement: false,
+  orb_debuglevel: 0,
+  iorfile: 'server.ior',
+  iter_num: 10
 }
 
 ARGV.options do |opts|
@@ -72,7 +72,7 @@ class Simple_Server_i < POA::Simple_Server
 
   def shutdown()
     puts "server (#{Process.pid}) received shutdown request from client"
-    @orb.shutdown()
+    @orb.shutdown
   end
 end # of servant Simple_Server_i
 
@@ -88,21 +88,21 @@ poa_man.activate
 
 simple_srv = Simple_Server_i.new(orb)
 
-simple_ref = simple_srv._this()
+simple_ref = simple_srv._this
 
 ior = orb.object_to_string(simple_ref)
 
-open(OPTIONS[:iorfile], 'w') { |io|
+File.open(OPTIONS[:iorfile], 'w') { |io|
   io.write ior
 }
 
 Signal.trap('INT') do
   puts 'SIGINT - shutting down ORB...'
-  orb.shutdown()
+  orb.shutdown
 end
 
 if Signal.list.has_key?('USR2')
   Signal.trap('USR2', 'EXIT')
 end
 
-orb.run()
+orb.run