r2corba 1.6.2 → 1.7.1

data/test/OBV/Simple_Event/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/Simple_Event/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|
@@ -60,7 +60,7 @@ class Checkpoint_i < POA::Checkpoint
   end
 
   def shutdown()
-    @orb.shutdown()
+    @orb.shutdown
   end
 end # of servant MyHello
 
@@ -79,17 +79,17 @@ poa_man.activate
 
 checkpoint = Checkpoint_i.new(orb)
 
-obj = checkpoint._this()
+obj = checkpoint._this
 
 ior = orb.object_to_string(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/OBV/Supports/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|
@@ -66,50 +66,50 @@ begin
 
   STDERR.puts '* get start balance'
 
-  balance = account.get_balance();
+  balance = account.get_balance;
 
-  balance.print_it()
+  balance.print_it
 
-  account.print_it()
+  account.print_it
 
   STDERR.puts '* local deposit'
 
   balance.deposit(10.5)
 
-  balance.print_it()
+  balance.print_it
 
-  account.print_it()
+  account.print_it
 
   STDERR.puts '* remote deposit'
 
   account.deposit(10.77)
 
-  balance.print_it()
+  balance.print_it
 
-  account.print_it()
+  account.print_it
 
   STDERR.puts '* remote withdrawal'
 
   account.withdraw(3.33)
 
-  balance.print_it()
+  balance.print_it
 
-  account.print_it()
+  account.print_it
 
   STDERR.puts '* update balance'
 
-  balance = account.get_balance();
+  balance = account.get_balance;
 
-  balance.print_it()
+  balance.print_it
 
-  account.print_it()
+  account.print_it
 
   # shutdown Account service
 
-  account.shutdown()
+  account.shutdown
 
 ensure
 
-  orb.destroy()
+  orb.destroy
 
 end

data/test/OBV/Supports/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/Supports/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|
@@ -59,7 +59,7 @@ class BalancedAccount_i < POA::BalancedAccount
   end
 
   def shutdown()
-    @orb.shutdown()
+    @orb.shutdown
   end
 
   def print_it()
@@ -82,17 +82,17 @@ poa_man.activate
 
 account = BalancedAccount_i.new(orb)
 
-obj = account._this()
+obj = account._this
 
 ior = orb.object_to_string(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/OBV/Tree/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|
@@ -98,7 +98,7 @@ begin
   StringNodeFactory.get_factory(orb)
   TreeControllerFactory.get_factory(orb)
 
-  package = passer.pass_tree()
+  package = passer.pass_tree
   if CORBA::is_nil(package)
     STDERR.puts "ERROR: passer.pass_state returned nil 'out' arg (#{package})"
   end
@@ -106,10 +106,10 @@ begin
   test_state(package)
   # shutdown passer service
 
-  passer.shutdown()
+  passer.shutdown
 
 ensure
 
-  orb.destroy()
+  orb.destroy
 
 end

data/test/OBV/Tree/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/Tree/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|
@@ -75,7 +75,7 @@ class Passer_i < POA::Passer
   end
 
   def shutdown ()
-    @orb.shutdown()
+    @orb.shutdown
   end
 end # of servant Passer_i
 
@@ -96,17 +96,17 @@ poa_man.activate
 
 passer = Passer_i.new(orb)
 
-obj = passer._this()
+obj = passer._this
 
 ior = orb.object_to_string(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/OBV/Truncatable/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|
@@ -269,10 +269,10 @@ begin
 
   # shutdown tester service
 
-  tester.shutdown()
+  tester.shutdown
 
 ensure
 
-  orb.destroy()
+  orb.destroy
 
 end

data/test/OBV/Truncatable/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/Truncatable/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|
@@ -68,17 +68,17 @@ poa_man.activate
 
 tester = Test_impl.new(orb)
 
-obj = tester._this()
+obj = tester._this
 
 ior = orb.object_to_string(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/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