r2corba 1.6.2 → 1.7.0

data/test/Multi_Threading/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')
@@ -108,7 +108,7 @@ else
   #       cooperative ORB event loop allowing multiple Ruby threads executing
   #       ORB#run to operate in parallel.
   orb_trds = (0..1).collect do
-    Thread.new() do
+    Thread.new do
       orb.run
     end
   end

data/test/Multi_Threading/Threads/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|
@@ -62,16 +62,16 @@ begin
 
   puts "Client - got #{hello_strings.length} strings."
 
-  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/Multi_Threading/Threads/run_test.rb

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

data/test/Multi_Threading/Threads/server.rb

@@ -12,10 +12,10 @@
 require 'optparse'
 
 OPTIONS = {
-  :use_implement => false,
-  :orb_debuglevel => 0,
-  :iorfile => 'server.ior',
-  :watchdog_iorfile => 'file://watchdog.ior'
+  use_implement: false,
+  orb_debuglevel: 0,
+  iorfile: 'server.ior',
+  watchdog_iorfile: 'file://watchdog.ior'
 }
 
 ARGV.options do |opts|
@@ -74,9 +74,9 @@ class MyHello < POA::Test::Hello
   def shutdown()
     @stop = true
     @wdt.join
-    @watchdog.shutdown()
+    @watchdog.shutdown
     puts %Q{Server - pinged watchdog #{@count} times.}
-    @orb.shutdown()
+    @orb.shutdown
   end
 end # of servant MyHello
 
@@ -96,17 +96,17 @@ watchdog_obj = Test::Watchdog._narrow(obj)
 
 hello_srv = MyHello.new(orb, watchdog_obj)
 
-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/Multi_Threading/Threads/watchdog.rb

@@ -3,9 +3,9 @@
 require 'optparse'
 
 OPTIONS = {
-  :use_implement => false,
-  :orb_debuglevel => 0,
-  :iorfile => 'watchdog.ior'
+  use_implement: false,
+  orb_debuglevel: 0,
+  iorfile: 'watchdog.ior'
 }
 
 ARGV.options do |opts|
@@ -51,7 +51,7 @@ class MyWatchdog < POA::Test::Watchdog
 
   def shutdown()
     puts %Q{Watchdog - received #{@count} pings}
-    @orb.shutdown()
+    @orb.shutdown
   end
 end # of servant MyWatchdog
 
@@ -67,17 +67,17 @@ poa_man.activate
 
 srv = MyWatchdog.new(orb)
 
-obj = srv._this()
+obj = srv._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/Multiple_Servant_Interfaces/client.rb

@@ -12,9 +12,9 @@
 require 'optparse'
 
 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|
@@ -56,14 +56,14 @@ hello_obj = Test::Hello._narrow(obj)
 
 hello_2_obj = Test::Hello_2._narrow(obj)
 
-the_string = hello_obj.get_string()
+the_string = hello_obj.get_string
 
 puts "string returned from Test::Hello <#{the_string}>"
 
-the_string = hello_2_obj.get_string_2()
+the_string = hello_2_obj.get_string_2
 
 puts "string returned from Test::Hello_2 <#{the_string}>"
 
-hello_obj.shutdown()
+hello_obj.shutdown
 
-orb.destroy()
+orb.destroy

data/test/Multiple_Servant_Interfaces/run_test.rb

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

data/test/Multiple_Servant_Interfaces/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|
@@ -65,7 +65,7 @@ class MyHello < PortableServer::Servant
   end
 
   def shutdown()
-    @orb.shutdown()
+    @orb.shutdown
   end
 end # of servant MyHello
 
@@ -81,17 +81,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/Nil/run_test.rb

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

data/test/Nil/test.rb

@@ -14,9 +14,9 @@ require 'lib/assert.rb'
 include TestUtil::Assertions
 
 OPTIONS = {
-  :use_implement => false,
-  :orb_debuglevel => 0,
-  :ior => 'foo'
+  use_implement: false,
+  orb_debuglevel: 0,
+  ior: 'foo'
 }
 
 ARGV.options do |opts|
@@ -76,5 +76,5 @@ begin
   assert 'Not nil returned for RootPOA.the_parent', CORBA.is_nil(rootpoa.the_parent) && rootpoa.the_parent.nil?
 
 ensure
-  orb.destroy()
+  orb.destroy
 end

data/test/OBV/AbstractInterface/client.rb

@@ -19,10 +19,10 @@ TEST_OPERATION = 2
 TEST_EXCEPTION = 3
 
 OPTIONS = {
-  :use_implement => false,
-  :orb_debuglevel => 0,
-  :iorfile => 'file://server.ior',
-  :test => TEST_ALL
+  use_implement: false,
+  orb_debuglevel: 0,
+  iorfile: 'file://server.ior',
+  test: TEST_ALL
 }
 
 ARGV.options do |opts|
@@ -137,7 +137,7 @@ begin
     StringNodeFactory.get_factory(orb)
     TreeControllerFactory.get_factory(orb)
 
-    package = passer.pass_state()
+    package = passer.pass_state
     if CORBA::is_nil(package)
       STDERR.puts "ERROR: passer.pass_state returned nil 'out' arg (#{package})"
     end
@@ -146,7 +146,7 @@ begin
   end
 
   if OPTIONS[:test] != TEST_STATE
-    package = passer.pass_ops()
+    package = passer.pass_ops
     if CORBA::is_nil(package)
       STDERR.puts "ERROR: passer.pass_ops returned nil 'out' arg (#{package})"
     end
@@ -161,7 +161,7 @@ begin
   end
 
   if OPTIONS[:test] == TEST_ALL
-    package = passer.pass_nil()
+    package = passer.pass_nil
     unless CORBA::is_nil(package)
       STDERR.puts "ERROR: passer.pass_state did NOT return nil 'out' arg (#{package})"
     end
@@ -169,10 +169,10 @@ begin
 
   # shutdown passer service
 
-  passer.shutdown()
+  passer.shutdown
 
 ensure
 
-  orb.destroy()
+  orb.destroy
 
 end

data/test/OBV/AbstractInterface/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/AbstractInterface/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|
@@ -106,7 +106,7 @@ class Passer_i < POA::Passer
   end
 
   def shutdown ()
-    @orb.shutdown()
+    @orb.shutdown
   end
 end # of servant Passer_i
 
@@ -127,17 +127,17 @@ poa_man.activate
 
 passer = Passer_i.new(orb, root_poa)
 
-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/Custom/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,10 +76,10 @@ begin
 
   # shutdown checkpoint service
 
-  checkpoint.shutdown()
+  checkpoint.shutdown
 
 ensure
 
-  orb.destroy()
+  orb.destroy
 
 end

data/test/OBV/Custom/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/Custom/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/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|
@@ -76,10 +76,10 @@ begin
 
   # shutdown checkpoint service
 
-  checkpoint.shutdown()
+  checkpoint.shutdown
 
 ensure
 
-  orb.destroy()
+  orb.destroy
 
 end

data/test/OBV/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/OBV/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|
@@ -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/Simple_Event/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,10 +76,10 @@ begin
 
   # shutdown checkpoint service
 
-  checkpoint.shutdown()
+  checkpoint.shutdown
 
 ensure
 
-  orb.destroy()
+  orb.destroy
 
 end

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')