r2corba 1.6.2 → 1.7.0

data/test/BiDirectional/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|
@@ -73,16 +73,16 @@ class Simple_Server_i < POA::Simple_Server
   end
 
   def shutdown()
-    @orb.shutdown()
+    @orb.shutdown
   end
 
   def call_client()
     if @flag
       @iter_num.times do
-        @callback.callback_method()
+        @callback.callback_method
       end
 
-      @callback.shutdown()
+      @callback.shutdown
       @flag = false
 
       return 1
@@ -122,7 +122,7 @@ child_poa = root_poa.create_POA('childPOA', poa_man, policies)
 
 puts 'child_poa created'
 
-policies.each { |pol| pol.destroy() }
+policies.each { |pol| pol.destroy }
 
 puts 'policies destroyed'
 
@@ -138,13 +138,13 @@ ior = orb.object_to_string(obj)
 
 puts "Activated as <#{ior}>"
 
-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')
@@ -153,13 +153,13 @@ end
 
 retval = 0
 while retval == 0
-  pending = orb.work_pending()
+  pending = orb.work_pending
 
   if pending
-    orb.perform_work()
+    orb.perform_work
   end
 
-  retval = simple_srv.call_client()
+  retval = simple_srv.call_client
 end
 
 puts 'event loop finished'

data/test/CORBA_Services/Naming/BindingIterator/client.rb

@@ -14,9 +14,9 @@ require 'lib/assert.rb'
 include TestUtil::Assertions
 
 OPTIONS = {
-  :use_implement => false,
-  :orb_debuglevel => 0,
-  :iorfile => 'file://ins.ior'
+  use_implement: false,
+  orb_debuglevel: 0,
+  iorfile: 'file://ins.ior'
 }
 
 ARGV.options do |opts|
@@ -71,7 +71,7 @@ begin
   n = binding_list.first.binding_name.first
   puts "first binding: id=#{n.r_id}, kind=#{n.kind}"
 
-  has_one, binding = binding_iterator.next_one()
+  has_one, binding = binding_iterator.next_one
 
   assert 'ERROR: INS BindingIterator#next_one() does not function',
          (has_one && binding) &&
@@ -93,11 +93,11 @@ begin
     puts "#{counts.shift} binding: id=#{n.r_id}, kind=#{n.kind}"
   end
 
-  has_one, binding = binding_iterator.next_one()
+  has_one, binding = binding_iterator.next_one
 
   assert_not 'ERROR: INS BindingIterator#next_one() does not function (2)', has_one
 
-  binding_iterator.destroy()
+  binding_iterator.destroy
 
   # retrieve object reference for servant from Naming service
   name = binding_list.last.binding_name
@@ -107,14 +107,14 @@ begin
   # narrow object ref and call
   hello_obj = Test::Hello._narrow(obj)
 
-  the_string = hello_obj.get_string()
+  the_string = hello_obj.get_string
 
   puts "string returned <#{the_string}>"
 
-  hello_obj.shutdown()
+  hello_obj.shutdown
 
 ensure
 
-  orb.destroy()
+  orb.destroy
 
 end

data/test/CORBA_Services/Naming/BindingIterator/run_test.rb

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

data/test/CORBA_Services/Naming/BindingIterator/server.rb

@@ -14,9 +14,9 @@ require 'lib/assert.rb'
 include TestUtil::Assertions
 
 OPTIONS = {
-  :use_implement => false,
-  :orb_debuglevel => 0,
-  :iorfile => 'file://ins.ior'
+  use_implement: false,
+  orb_debuglevel: 0,
+  iorfile: 'file://ins.ior'
 }
 
 ARGV.options do |opts|
@@ -61,7 +61,7 @@ class MyHello < POA::Test::Hello
   end
 
   def shutdown()
-    @orb.shutdown()
+    @orb.shutdown
   end
 end # of servant MyHello
 
@@ -87,7 +87,7 @@ poa_man.activate
 # create and activate servant
 hello_srv = MyHello.new(orb)
 
-hello_obj = hello_srv._this()
+hello_obj = hello_srv._this
 
 # register 5 object references with Naming service
 5.times do |i|
@@ -97,7 +97,7 @@ end
 # initialize signal handling
 Signal.trap('INT') do
   puts 'SIGINT - shutting down ORB...'
-  orb.shutdown()
+  orb.shutdown
 end
 
 if Signal.list.has_key?('USR2')

data/test/CORBA_Services/Naming/Corbaname/client.rb

@@ -14,9 +14,9 @@ require 'lib/assert.rb'
 include TestUtil::Assertions
 
 OPTIONS = {
-  :use_implement => false,
-  :orb_debuglevel => 0,
-  :iorfile => 'corbaname.ior'
+  use_implement: false,
+  orb_debuglevel: 0,
+  iorfile: 'corbaname.ior'
 }
 
 ARGV.options do |opts|
@@ -71,14 +71,14 @@ begin
 
   assert_not 'ERROR: corbaname resolved to nil object!', CORBA::is_nil(hello_obj)
 
-  the_string = hello_obj.get_string()
+  the_string = hello_obj.get_string
 
   puts "client: string returned <#{the_string}>"
 
-  hello_obj.shutdown()
+  hello_obj.shutdown
 
 ensure
 
-  orb.destroy()
+  orb.destroy
 
 end

data/test/CORBA_Services/Naming/Corbaname/run_test.rb

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

data/test/CORBA_Services/Naming/Corbaname/server.rb

@@ -14,10 +14,10 @@ require 'lib/assert.rb'
 include TestUtil::Assertions
 
 OPTIONS = {
-  :iorfile => 'corbaname.ior',
-  :use_implement => false,
-  :orb_debuglevel => 0,
-  :ins_port => 2345
+  iorfile: 'corbaname.ior',
+  use_implement: false,
+  orb_debuglevel: 0,
+  ins_port: 2345
 }
 
 ARGV.options do |opts|
@@ -65,7 +65,7 @@ class MyHello < POA::Test::Hello
   end
 
   def shutdown()
-    @orb.shutdown()
+    @orb.shutdown
   end
 end # of servant MyHello
 
@@ -104,7 +104,7 @@ poa_man.activate
 # create and activate servant
 hello_srv = MyHello.new(orb)
 
-hello_obj = hello_srv._this()
+hello_obj = hello_srv._this
 
 # register object reference with Naming service
 name = full_name
@@ -116,14 +116,14 @@ sn = nc.to_string(name)             # stringify name
 corbaname = nc.to_url(ins_url, sn)  # corbaname url
 
 # write corbaname to file
-open(OPTIONS[:iorfile], 'w') { |io|
+File.open(OPTIONS[:iorfile], 'w') { |io|
   io.write corbaname
 }
 
 # initialize signal handling
 Signal.trap('INT') do
   puts 'SIGINT - shutting down ORB...'
-  orb.shutdown()
+  orb.shutdown
 end
 
 if Signal.list.has_key?('USR2')

data/test/CORBA_Services/Naming/Simple/client.rb

@@ -14,9 +14,9 @@ require 'lib/assert.rb'
 include TestUtil::Assertions
 
 OPTIONS = {
-  :use_implement => false,
-  :orb_debuglevel => 0,
-  :iorfile => 'file://ins.ior'
+  use_implement: false,
+  orb_debuglevel: 0,
+  iorfile: 'file://ins.ior'
 }
 
 ARGV.options do |opts|
@@ -70,14 +70,14 @@ begin
   # narrow object ref and call
   hello_obj = Test::Hello._narrow(obj)
 
-  the_string = hello_obj.get_string()
+  the_string = hello_obj.get_string
 
   puts "string returned <#{the_string}>"
 
-  hello_obj.shutdown()
+  hello_obj.shutdown
 
 ensure
 
-  orb.destroy()
+  orb.destroy
 
 end

data/test/CORBA_Services/Naming/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/CORBA_Services/Naming/Simple/server.rb

@@ -14,9 +14,9 @@ require 'lib/assert.rb'
 include TestUtil::Assertions
 
 OPTIONS = {
-  :use_implement => false,
-  :orb_debuglevel => 0,
-  :iorfile => 'file://ins.ior'
+  use_implement: false,
+  orb_debuglevel: 0,
+  iorfile: 'file://ins.ior'
 }
 
 ARGV.options do |opts|
@@ -61,7 +61,7 @@ class MyHello < POA::Test::Hello
   end
 
   def shutdown()
-    @orb.shutdown()
+    @orb.shutdown
   end
 end # of servant MyHello
 
@@ -87,7 +87,7 @@ poa_man.activate
 # create and activate servant
 hello_srv = MyHello.new(orb)
 
-hello_obj = hello_srv._this()
+hello_obj = hello_srv._this
 
 # register object reference with Naming service
 name = [CosNaming::NameComponent.new('Hello', 'ior')]
@@ -97,7 +97,7 @@ nc.bind(name, hello_obj)
 # initialize signal handling
 Signal.trap('INT') do
   puts 'SIGINT - shutting down ORB...'
-  orb.shutdown()
+  orb.shutdown
 end
 
 if Signal.list.has_key?('USR2')

data/test/Collocation/run_test.rb

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

data/test/Collocation/test.rb

@@ -12,7 +12,7 @@
 require 'optparse'
 
 OPTIONS = {
-  :use_implement => false
+  use_implement: false
 }
 
 ORB_ARG = []

data/test/Connect_Timeout/client.rb

@@ -14,9 +14,9 @@ require 'lib/assert.rb'
 include TestUtil::Assertions
 
 OPTIONS = {
-  :use_implement => false,
-  :orb_debuglevel => 0,
-  :ior => 'corbaloc:iiop:192.3.47.5/10007/RandomObject'
+  use_implement: false,
+  orb_debuglevel: 0,
+  ior: 'corbaloc:iiop:192.3.47.5/10007/RandomObject'
 }
 
 ARGV.options do |opts|
@@ -65,11 +65,11 @@ def test_timeout(object)
 
     assert_not 'Nil Test::Hello reference', CORBA::is_nil(hello)
 
-    the_string = hello.get_string()
+    the_string = hello.get_string
 
     puts "string returned <#{the_string}>"
 
-    hello.shutdown()
+    hello.shutdown
   rescue CORBA::Exception
     # Get the elampsed time
     el = Time.now - profile_timer
@@ -101,9 +101,9 @@ begin
   policy_current.set_policy_overrides(policy_list,
                                         CORBA::ADD_OVERRIDE)
 
-  policy_list.each { |p| p.destroy() }
+  policy_list.each { |p| p.destroy }
 
   test_timeout(tmp)
 ensure
-  orb.destroy()
+  orb.destroy
 end

data/test/Connect_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/DII/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|
@@ -59,7 +59,7 @@ begin
   ]
   req.set_return_type(CORBA::_tc_string)
 
-  the_string = req.invoke()
+  the_string = req.invoke
 
   puts "string returned <#{the_string}>"
   puts
@@ -72,9 +72,9 @@ begin
   ]
   req.set_return_type(CORBA::_tc_string)
 
-  req.send_deferred()
+  req.send_deferred
   puts 'getting response...'
-  req.get_response()
+  req.get_response
 
   puts "string returned <#{req.return_value}>"
   puts
@@ -92,12 +92,12 @@ begin
     ]
     req.set_return_type(CORBA::_tc_string)
 
-    req.send_deferred()
+    req.send_deferred
     begin
       puts 'sleeping...'
       sleep(0.01)
       puts 'polling for response...'
-    end while !req.poll_response()
+    end while !req.poll_response
 
     puts "string returned <#{req.return_value}>"
     puts
@@ -105,10 +105,10 @@ begin
 
   puts '***** Oneway shutdown'
   req = obj._request('shutdown')
-  req.send_oneway()
+  req.send_oneway
 
 ensure
 
-  orb.destroy()
+  orb.destroy
 
 end

data/test/DII/run_test.rb

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

data/test/DII/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/DSI/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|
@@ -50,7 +50,7 @@ end
 
 orb = CORBA.ORB_init(['-ORBDebugLevel', OPTIONS[:orb_debuglevel]], 'myORB')
 
-# #s = open(OPTIONS[:iorfile], 'r').read
+# #s = File.open(OPTIONS[:iorfile], 'r').read
 
 obj = orb.string_to_object(OPTIONS[:iorfile])
 
@@ -60,6 +60,6 @@ the_string, the_length = hello_obj.echo('Hello world!')
 
 puts "string returned <#{the_string}>; length = #{the_length}"
 
-hello_obj.shutdown()
+hello_obj.shutdown
 
-orb.destroy()
+orb.destroy

data/test/DSI/run_test.rb

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

data/test/DSI/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|
@@ -51,8 +51,8 @@ class MyHello < PortableServer::DynamicImplementation
 
   OPTABLE = {
     'echo' => {
-        :result_type => CORBA._tc_string,
-        :arg_list => [
+        result_type: CORBA._tc_string,
+        arg_list: [
         ['message', CORBA::ARG_IN, CORBA._tc_string],
         ['msglen', CORBA::ARG_OUT, CORBA._tc_long]] }
   }
@@ -69,7 +69,7 @@ class MyHello < PortableServer::DynamicImplementation
   end
 
   def shutdown()
-    @orb.shutdown()
+    @orb.shutdown
   end
 end # of servant MyHello
 
@@ -85,17 +85,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/Exceptions/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|
@@ -102,16 +102,16 @@ begin
 
   assert 'ERROR', 99 == hello_obj.myResult
 
-  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