r2corba 1.5.5 → 1.6.0

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

@@ -23,22 +23,22 @@ ARGV.options do |opts|
     script_name = File.basename($0)
     opts.banner = "Usage: ruby #{script_name} [options]"
 
-    opts.separator ""
+    opts.separator ''
 
-    opts.on("--k IORFILE",
-            "Set IOR.",
+    opts.on('--k IORFILE',
+            'Set IOR.',
             "Default: 'file://ins.ior'") { |v| OPTIONS[:iorfile] = v }
-    opts.on("--d LVL",
-            "Set ORBDebugLevel value.",
-            "Default: 0") { |v| OPTIONS[:orb_debuglevel] = v }
-    opts.on("--use-implement",
-            "Load IDL through CORBA.implement() instead of precompiled code.",
-            "Default: off") { |v| OPTIONS[:use_implement] = v }
+    opts.on('--d LVL',
+            'Set ORBDebugLevel value.',
+            'Default: 0') { |v| OPTIONS[:orb_debuglevel] = v }
+    opts.on('--use-implement',
+            'Load IDL through CORBA.implement() instead of precompiled code.',
+            'Default: off') { |v| OPTIONS[:use_implement] = v }
 
-    opts.separator ""
+    opts.separator ''
 
-    opts.on("-h", "--help",
-            "Show this help message.") { puts opts; exit }
+    opts.on('-h', '--help',
+            'Show this help message.') { puts opts; exit }
 
     opts.parse!
 end
@@ -51,7 +51,7 @@ else
 end
 require 'corba/naming'
 
-orb = CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel]], 'myORB')
+orb = CORBA.ORB_init(['-ORBDebugLevel', OPTIONS[:orb_debuglevel]], 'myORB')
 
 begin
 
@@ -60,7 +60,7 @@ begin
 
   nc = CosNaming::NamingContextExt._narrow(obj)
 
-  assert_not "ERROR: INS IOR resolved to nil object!", CORBA::is_nil(nc)
+  assert_not 'ERROR: INS IOR resolved to nil object!', CORBA::is_nil(nc)
 
   # retrieve object reference for servant from Naming service
   name = [CosNaming::NameComponent.new('Hello', 'ior')]

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

@@ -20,19 +20,19 @@ ARGV.options do |opts|
     script_name = File.basename($0)
     opts.banner = "Usage: ruby #{script_name} [options]"
 
-    opts.separator ""
+    opts.separator ''
 
-    opts.on("-d",
-            "Run with debugging output.",
-            "Default: false") { OPTIONS[:debug_opt] = '--d 10' }
-    opts.on("--use-stubs",
-            "Use stubs generated by RIDL.",
-            "Default: false (uses embedded IDL)") { OPTIONS[:use_implement] = '' }
+    opts.on('-d',
+            'Run with debugging output.',
+            'Default: false') { OPTIONS[:debug_opt] = '--d 10' }
+    opts.on('--use-stubs',
+            'Use stubs generated by RIDL.',
+            'Default: false (uses embedded IDL)') { OPTIONS[:use_implement] = '' }
 
-    opts.separator ""
+    opts.separator ''
 
-    opts.on("-h", "--help",
-            "Show this help message.") { puts opts; exit }
+    opts.on('-h', '--help',
+            'Show this help message.') { puts opts; exit }
 
     opts.parse!
 end
@@ -42,7 +42,7 @@ include TestUtil
 
 def do_exit(rc)
   ins_stop = Test.new
-  ins_stop.run("-e \'require \"corba/svcs/ins/ins.rb\"\' -e \'R2CORBA::INS.run\'", "-- stop --no-daemon")
+  ins_stop.run("-e \'require \"corba/svcs/ins/ins.rb\"\' -e \'R2CORBA::INS.run\'", '-- stop --no-daemon')
   ins_stop.wait(50)
   exit(rc)
 end
@@ -53,7 +53,7 @@ TestUtil.remove_file(ior_file)
 
 ins = Test.new
 
-exit(255) if !ins.run("-e \'require \"corba/svcs/ins/ins.rb\"\' -e \'R2CORBA::INS.run\'", "-- start")
+exit(255) if !ins.run("-e \'require \"corba/svcs/ins/ins.rb\"\' -e \'R2CORBA::INS.run\'", '-- start')
 
 do_exit(255) if !TestUtil.wait_for_file(ior_file, 400)
 

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

@@ -23,22 +23,22 @@ ARGV.options do |opts|
     script_name = File.basename($0)
     opts.banner = "Usage: ruby #{script_name} [options]"
 
-    opts.separator ""
+    opts.separator ''
 
-    opts.on("--k IORFILE",
-            "Set INS IOR filename.",
+    opts.on('--k IORFILE',
+            'Set INS IOR filename.',
             "Default: 'file://ins.ior'") { |v| OPTIONS[:iorfile] = v }
-    opts.on("--d LVL",
-            "Set ORBDebugLevel value.",
-            "Default: 0") { |v| OPTIONS[:orb_debuglevel] = v }
-    opts.on("--use-implement",
-            "Load IDL through CORBA.implement() instead of precompiled code.",
-            "Default: off") { |v| OPTIONS[:use_implement] = v }
+    opts.on('--d LVL',
+            'Set ORBDebugLevel value.',
+            'Default: 0') { |v| OPTIONS[:orb_debuglevel] = v }
+    opts.on('--use-implement',
+            'Load IDL through CORBA.implement() instead of precompiled code.',
+            'Default: off') { |v| OPTIONS[:use_implement] = v }
 
-    opts.separator ""
+    opts.separator ''
 
-    opts.on("-h", "--help",
-            "Show this help message.") { puts opts; exit }
+    opts.on('-h', '--help',
+            'Show this help message.') { puts opts; exit }
 
     opts.parse!
 end
@@ -57,23 +57,23 @@ class MyHello < POA::Test::Hello
   end
 
   def get_string()
-    "Hello there!"
+    'Hello there!'
   end
 
   def shutdown()
     @orb.shutdown()
   end
-end #of servant MyHello
+end # of servant MyHello
 
 # initialize ORB
-orb = CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel]], 'myORB')
+orb = CORBA.ORB_init(['-ORBDebugLevel', OPTIONS[:orb_debuglevel]], 'myORB')
 
 # resolve NamingContext
 obj = orb.string_to_object(OPTIONS[:iorfile])
 
 nc = CosNaming::NamingContextExt._narrow(obj)
 
-assert_not "ERROR: INS IOR resolved to nil object!", CORBA::is_nil(nc)
+assert_not 'ERROR: INS IOR resolved to nil object!', CORBA::is_nil(nc)
 
 # initialize POA
 obj = orb.resolve_initial_references('RootPOA')
@@ -96,7 +96,7 @@ nc.bind(name, hello_obj)
 
 # initialize signal handling
 Signal.trap('INT') do
-  puts "SIGINT - shutting down ORB..."
+  puts 'SIGINT - shutting down ORB...'
   orb.shutdown()
 end
 

data/test/Collocation/run_test.rb

@@ -20,19 +20,19 @@ ARGV.options do |opts|
     script_name = File.basename($0)
     opts.banner = "Usage: ruby #{script_name} [options]"
 
-    opts.separator ""
+    opts.separator ''
 
-    opts.on("-d",
-            "Run with debugging output.",
-            "Default: false") { OPTIONS[:debug_opt] = '--d 10' }
-    opts.on("--use-stubs",
-            "Use stubs generated by RIDL.",
-            "Default: false (uses embedded IDL)") { OPTIONS[:use_implement] = '' }
+    opts.on('-d',
+            'Run with debugging output.',
+            'Default: false') { OPTIONS[:debug_opt] = '--d 10' }
+    opts.on('--use-stubs',
+            'Use stubs generated by RIDL.',
+            'Default: false (uses embedded IDL)') { OPTIONS[:use_implement] = '' }
 
-    opts.separator ""
+    opts.separator ''
 
-    opts.on("-h", "--help",
-            "Show this help message.") { puts opts; exit }
+    opts.on('-h', '--help',
+            'Show this help message.') { puts opts; exit }
 
     opts.parse!
 end

data/test/Collocation/test.rb

@@ -36,19 +36,19 @@ ARGV.options do |opts|
     script_name = File.basename($0)
     opts.banner = "Usage: ruby #{script_name} [options]"
 
-    opts.separator ""
+    opts.separator ''
 
-    opts.on("--d LVL",
-            "Set ORBDebugLevel value.",
-            "Default: 0") { |dlvl| ORB_ARG << "-ORBDebugLevel" << dlvl }
-    opts.on("--use-implement",
-            "Load IDL through CORBA.implement() instead of precompiled code.",
-            "Default: off") { |v| OPTIONS[:use_implement] = v }
+    opts.on('--d LVL',
+            'Set ORBDebugLevel value.',
+            'Default: 0') { |dlvl| ORB_ARG << '-ORBDebugLevel' << dlvl }
+    opts.on('--use-implement',
+            'Load IDL through CORBA.implement() instead of precompiled code.',
+            'Default: off') { |v| OPTIONS[:use_implement] = v }
 
-    opts.separator ""
+    opts.separator ''
 
-    opts.on("-h", "--help",
-            "Show this help message.") { puts opts; exit }
+    opts.on('-h', '--help',
+            'Show this help message.') { puts opts; exit }
 
     opts.parse!
 end
@@ -63,26 +63,29 @@ end
 
 class Top < POA::Diamond::Top
   def shape
-    "a point."
+    'a point.'
   end
 end
 
 class Left < POA::Diamond::Left
   def shape
-    "the left line"
+    'the left line'
   end
+
   def color
-    "black"
+    'black'
   end
 end
 
 class Right < POA::Diamond::Right
   def shape
-    "the right line"
+    'the right line'
   end
+
   def color
-    "red"
+    'red'
   end
+
   def width
     0
   end
@@ -90,17 +93,21 @@ end
 
 class Buttom < POA::Diamond::Buttom
   def shape
-    "a diamond"
+    'a diamond'
   end
+
   def color
-    "translucent"
+    'translucent'
   end
+
   def name
-    "Jubilee"
+    'Jubilee'
   end
+
   def width
     100
   end
+
   def area(unit)
     case unit
       when Diamond::Buttom::MM
@@ -125,7 +132,7 @@ class Collocation_Test
   end
 
   def init(args = [])
-    @orb = CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel]], 'myORB')
+    @orb = CORBA.ORB_init(['-ORBDebugLevel', OPTIONS[:orb_debuglevel]], 'myORB')
 
     obj = @orb.resolve_initial_references('RootPOA')
 

data/test/Connect_Timeout/client.rb

@@ -23,22 +23,22 @@ ARGV.options do |opts|
     script_name = File.basename($0)
     opts.banner = "Usage: ruby #{script_name} [options]"
 
-    opts.separator ""
+    opts.separator ''
 
-    opts.on("--k IOR",
-            "Set IOR.",
+    opts.on('--k IOR',
+            'Set IOR.',
             "Default: 'corbaloc:iiop:192.3.47/10007/RandomObject'") { |v| OPTIONS[:ior] = v }
-    opts.on("--d LVL",
-            "Set ORBDebugLevel value.",
-            "Default: 0") { |v| OPTIONS[:orb_debuglevel] = v }
-    opts.on("--use-implement",
-            "Load IDL through CORBA.implement() instead of precompiled code.",
-            "Default: off") { |v| OPTIONS[:use_implement] = v }
+    opts.on('--d LVL',
+            'Set ORBDebugLevel value.',
+            'Default: 0') { |v| OPTIONS[:orb_debuglevel] = v }
+    opts.on('--use-implement',
+            'Load IDL through CORBA.implement() instead of precompiled code.',
+            'Default: off') { |v| OPTIONS[:use_implement] = v }
 
-    opts.separator ""
+    opts.separator ''
 
-    opts.on("-h", "--help",
-            "Show this help message.") { puts opts; exit }
+    opts.on('-h', '--help',
+            'Show this help message.') { puts opts; exit }
 
     opts.parse!
 end
@@ -63,7 +63,7 @@ def test_timeout(object)
     # First connection happens here..
     hello = Test::Hello._narrow(object)
 
-    assert_not "Nil Test::Hello reference", CORBA::is_nil(hello)
+    assert_not 'Nil Test::Hello reference', CORBA::is_nil(hello)
 
     the_string = hello.get_string()
 
@@ -85,12 +85,12 @@ def test_timeout(object)
 end
 
 
-orb = CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel]], 'myORB')
+orb = CORBA.ORB_init(['-ORBDebugLevel', OPTIONS[:orb_debuglevel]], 'myORB')
 
 begin
   tmp = orb.string_to_object(OPTIONS[:ior])
 
-  object = orb.resolve_initial_references("PolicyCurrent")
+  object = orb.resolve_initial_references('PolicyCurrent')
 
   policy_current = CORBA::PolicyCurrent::_narrow(object)
 

data/test/Connect_Timeout/run_test.rb

@@ -20,19 +20,19 @@ ARGV.options do |opts|
     script_name = File.basename($0)
     opts.banner = "Usage: ruby #{script_name} [options]"
 
-    opts.separator ""
+    opts.separator ''
 
-    opts.on("-d",
-            "Run with debugging output.",
-            "Default: false") { OPTIONS[:debug_opt] = '--d 10' }
-    opts.on("--use-stubs",
-            "Use stubs generated by RIDL.",
-            "Default: false (uses embedded IDL)") { OPTIONS[:use_implement] = '' }
+    opts.on('-d',
+            'Run with debugging output.',
+            'Default: false') { OPTIONS[:debug_opt] = '--d 10' }
+    opts.on('--use-stubs',
+            'Use stubs generated by RIDL.',
+            'Default: false (uses embedded IDL)') { OPTIONS[:use_implement] = '' }
 
-    opts.separator ""
+    opts.separator ''
 
-    opts.on("-h", "--help",
-            "Show this help message.") { puts opts; exit }
+    opts.on('-h', '--help',
+            'Show this help message.') { puts opts; exit }
 
     opts.parse!
 end

data/test/DII/client.rb

@@ -23,39 +23,39 @@ ARGV.options do |opts|
     script_name = File.basename($0)
     opts.banner = "Usage: ruby #{script_name} [options]"
 
-    opts.separator ""
+    opts.separator ''
 
-    opts.on("--k IORFILE",
-            "Set IOR.",
+    opts.on('--k IORFILE',
+            'Set IOR.',
             "Default: 'file://server.ior'") { |v| OPTIONS[:iorfile] = v }
-    opts.on("--d LVL",
-            "Set ORBDebugLevel value.",
-            "Default: 0") { |v| OPTIONS[:orb_debuglevel] = v }
-    opts.on("--use-implement",
-            "Load IDL through CORBA.implement() instead of precompiled code.",
-            "Default: off") { |v| OPTIONS[:use_implement] = v }
+    opts.on('--d LVL',
+            'Set ORBDebugLevel value.',
+            'Default: 0') { |v| OPTIONS[:orb_debuglevel] = v }
+    opts.on('--use-implement',
+            'Load IDL through CORBA.implement() instead of precompiled code.',
+            'Default: off') { |v| OPTIONS[:use_implement] = v }
 
-    opts.separator ""
+    opts.separator ''
 
-    opts.on("-h", "--help",
-            "Show this help message.") { puts opts; exit }
+    opts.on('-h', '--help',
+            'Show this help message.') { puts opts; exit }
 
     opts.parse!
 end
 
 require 'corba'
 
-orb = CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel]], 'myORB')
+orb = CORBA.ORB_init(['-ORBDebugLevel', OPTIONS[:orb_debuglevel]], 'myORB')
 
 begin
 
   obj = orb.string_to_object(OPTIONS[:iorfile])
 
-  puts "***** Synchronous twoway DII"
-  req = obj._request("echo")
+  puts '***** Synchronous twoway DII'
+  req = obj._request('echo')
   req.arguments = [
-    ['method', CORBA::ARG_IN, CORBA::_tc_string, "sync twoway"],
-    ['message', CORBA::ARG_IN, CORBA::_tc_string, "Hello world!"]
+    ['method', CORBA::ARG_IN, CORBA::_tc_string, 'sync twoway'],
+    ['message', CORBA::ARG_IN, CORBA::_tc_string, 'Hello world!']
   ]
   req.set_return_type(CORBA::_tc_string)
 
@@ -64,11 +64,11 @@ begin
   puts "string returned <#{the_string}>"
   puts
 
-  puts "***** Deferred twoway DII (using get_response())"
-  req = obj._request("echo")
+  puts '***** Deferred twoway DII (using get_response())'
+  req = obj._request('echo')
   req.arguments = [
-    ['method', CORBA::ARG_IN, CORBA::_tc_string, "deferred twoway (1)"],
-    ['message', CORBA::ARG_IN, CORBA::_tc_string, "Hello world!"]
+    ['method', CORBA::ARG_IN, CORBA::_tc_string, 'deferred twoway (1)'],
+    ['message', CORBA::ARG_IN, CORBA::_tc_string, 'Hello world!']
   ]
   req.set_return_type(CORBA::_tc_string)
 
@@ -84,11 +84,11 @@ begin
     (TAO::MAJOR_VERSION == 1 &&
         (TAO::MINOR_VERSION > 5 ||
           (TAO::MINOR_VERSION == 5 && TAO::MICRO_VERSION > 9)))
-    puts "***** Deferred twoway DII (using poll_response())"
-    req = obj._request("echo")
+    puts '***** Deferred twoway DII (using poll_response())'
+    req = obj._request('echo')
     req.arguments = [
-      ['method', CORBA::ARG_IN, CORBA::_tc_string, "deferred twoway (2)"],
-      ['message', CORBA::ARG_IN, CORBA::_tc_string, "Hello world!"]
+      ['method', CORBA::ARG_IN, CORBA::_tc_string, 'deferred twoway (2)'],
+      ['message', CORBA::ARG_IN, CORBA::_tc_string, 'Hello world!']
     ]
     req.set_return_type(CORBA::_tc_string)
 
@@ -103,8 +103,8 @@ begin
     puts
   end
 
-  puts "***** Oneway shutdown"
-  req = obj._request("shutdown")
+  puts '***** Oneway shutdown'
+  req = obj._request('shutdown')
   req.send_oneway()
 
 ensure