r2corba 1.5.4 → 1.6.1

data/test/OBV/Tree/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.",
-            "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('--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.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
@@ -84,7 +84,7 @@ def test_state(abs)
   dump_tree(abs)
 end
 
-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])

data/test/OBV/Tree/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
@@ -59,7 +59,7 @@ end
 
 exrc = clt.wait(400)
 
-if exrc ==0
+if exrc == 0
   srv.wait(400)
 else
   srv.wait_term(400)

data/test/OBV/Tree/server.rb

@@ -21,22 +21,22 @@ ARGV.options do |opts|
     script_name = File.basename($0)
     opts.banner = "Usage: ruby #{script_name} [options]"
 
-    opts.separator ""
+    opts.separator ''
 
-    opts.on("--o IORFILE",
-            "Set IOR filename.",
-            "Default: '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('--o IORFILE',
+            'Set IOR filename.',
+            "Default: '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.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
@@ -58,17 +58,17 @@ class Passer_i < POA::Passer
 
     # Create the root node.
     sn = StringNode.new
-    sn.name = "RootNode"
+    sn.name = 'RootNode'
     tc.root = sn
 
     # Create the left leaf.
     l_dummy = StringNode.new
-    l_dummy.name = "LeftNode"
+    l_dummy.name = 'LeftNode'
     sn.left = l_dummy
 
     # Create the right leaf.
     r_dummy = StringNode.new
-    r_dummy.name = "RightNode"
+    r_dummy.name = 'RightNode'
     sn.right = r_dummy
 
     [tc]
@@ -77,9 +77,9 @@ class Passer_i < POA::Passer
   def shutdown ()
     @orb.shutdown()
   end
-end #of servant Passer_i
+end # of servant Passer_i
 
-orb = CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel]], 'myORB')
+orb = CORBA.ORB_init(['-ORBDebugLevel', OPTIONS[:orb_debuglevel]], 'myORB')
 
 # make sure valuetype factories are registered
 BaseNodeFactory.get_factory(orb)
@@ -105,7 +105,7 @@ open(OPTIONS[:iorfile], 'w') { |io|
 }
 
 Signal.trap('INT') do
-  puts "SIGINT - shutting down ORB..."
+  puts 'SIGINT - shutting down ORB...'
   orb.shutdown()
 end
 

data/test/OBV/Truncatable/Truncatable_impl.rb

@@ -63,7 +63,7 @@ class Test_impl < POA::OBV_TruncatableTest::Test
     ov = ::OBV_TruncatableTest::TValue1.new
     iv = nil
     target = CORBA::Any.value_for_any(val)
-    if (target.nil?)
+    if target.nil?
       STDERR.puts "server:Test_impl::op5 extract failed\n"
       ov.basic_data = 101
       ov.data1 = 10101

data/test/OBV/Truncatable/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.",
-            "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('--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.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
@@ -50,7 +50,7 @@ else
   require 'ExtraC'
 end
 
-orb = CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel]], 'myORB')
+orb = CORBA.ORB_init(['-ORBDebugLevel', OPTIONS[:orb_debuglevel]], 'myORB')
 
 begin
   # make sure valuetype factories are registered
@@ -69,7 +69,7 @@ begin
   assert_not 'Object reference is nil.', CORBA::is_nil(tester)
 
   if defined?(JRUBY_VERSION)
-    STDERR.puts "Skipping. Value type truncation currently not properly supported by JacORB!"
+    STDERR.puts 'Skipping. Value type truncation currently not properly supported by JacORB!'
     tester.shutdown
     exit 0
   end
@@ -79,13 +79,13 @@ begin
   v1.basic_data = 9
   v1.data1 = 99
 
-  desc = "A<-tB, truncate B to A"
+  desc = 'A<-tB, truncate B to A'
   STDERR.print "Case 1: #{desc}: "
 
-  ov1, odesc = tester.op1("case1", v1, desc)
+  ov1, odesc = tester.op1('case1', v1, desc)
 
   assert '\nERROR: tester.op1 desc FAILED', odesc == "case1: #{desc}"
-  assert '\nERROR: tester.op1 ov FAILED' , v1.basic_data == ov1.basic_data
+  assert '\nERROR: tester.op1 ov FAILED', v1.basic_data == ov1.basic_data
 
   STDERR.puts 'passed'
 
@@ -95,23 +95,23 @@ begin
   v2.data1 = 99
   v2.data2 = 99 * 2
 
-  desc = "A<-tB<-tC, truncate C to A"
+  desc = 'A<-tB<-tC, truncate C to A'
   STDERR.print "Case 2: #{desc}: "
 
-  ov2, odesc = tester.op1("case2", v2, desc)
+  ov2, odesc = tester.op1('case2', v2, desc)
 
   assert '\nERROR: tester.op1 - 2 desc FAILED', odesc == "case2: #{desc}"
-  assert '\nERROR: tester.op1 - 2 ov FAILED' , v2.basic_data == ov2.basic_data
+  assert '\nERROR: tester.op1 - 2 ov FAILED', v2.basic_data == ov2.basic_data
   STDERR.puts 'passed'
 
-  desc = "A<-tB<-tC, truncate C to B"
+  desc = 'A<-tB<-tC, truncate C to B'
   STDERR.print "Case 2b: #{desc}: "
 
-  otv1, odesc = tester.op2(v2, "case2b", desc)
+  otv1, odesc = tester.op2(v2, 'case2b', desc)
 
   assert '\nERROR: tester.op2 - 2b desc FAILED', odesc == "case2b: #{desc}"
-  assert '\nERROR: tester.op2 - 2b otv1 FAILED' , v2.basic_data == otv1.basic_data
-  assert '\nERROR: tester.op2 - 2b otv1 FAILED' , v2.data1 == otv1.data1
+  assert '\nERROR: tester.op2 - 2b otv1 FAILED', v2.basic_data == otv1.basic_data
+  assert '\nERROR: tester.op2 - 2b otv1 FAILED', v2.data1 == otv1.data1
   STDERR.puts 'passed'
 
   # 3.
@@ -119,14 +119,14 @@ begin
   itv1b.basic_data = 7
   itv1b.data1 = 8
 
-  desc = "A<-tB, truncatable but no truncation"
+  desc = 'A<-tB, truncatable but no truncation'
   STDERR.print "Case 3: #{desc}: "
 
-  otv1b, odesc = tester.op2(itv1b, "case3", desc)
+  otv1b, odesc = tester.op2(itv1b, 'case3', desc)
 
   assert '\nERROR: tester.op2 - 3 desc FAILED', odesc == "case3: #{desc}"
-  assert '\nERROR: tester.op2 - 3 otv1b FAILED' , itv1b.basic_data == otv1b.basic_data
-  assert '\nERROR: tester.op2 - 3 otv1b FAILED' , itv1b.data1 == otv1b.data1
+  assert '\nERROR: tester.op2 - 3 otv1b FAILED', itv1b.basic_data == otv1b.basic_data
+  assert '\nERROR: tester.op2 - 3 otv1b FAILED', itv1b.data1 == otv1b.data1
   STDERR.puts 'passed'
 
   # 4.
@@ -136,9 +136,9 @@ begin
   v3.data3 = (99 * 3)
 
   begin
-    desc = "A<-tB<-C, try truncate C to A, MARSHAL exception"
+    desc = 'A<-tB<-C, try truncate C to A, MARSHAL exception'
     STDERR.print "Case 4: #{desc}: "
-    ov3, odesc = tester.op1("case4", v3, desc)
+    ov3, odesc = tester.op1('case4', v3, desc)
     STDERR.puts 'failed'
   rescue CORBA::MARSHAL
     STDERR.puts 'passed'
@@ -153,39 +153,39 @@ begin
   v5.basic_data = 9
   v5.nv4 = nv
   v5.data4 = (99 * 4)
-  v5.str1 = "str1"
+  v5.str1 = 'str1'
   v5.data5 = (99 * 5)
   v5.nv5 = nv
-  v5.str2 = "str2"
+  v5.str2 = 'str2'
 
-  desc = "A<-tB<-tC, B & C have nested value type, truncate C to A"
+  desc = 'A<-tB<-tC, B & C have nested value type, truncate C to A'
   STDERR.print "Case 5: #{desc}: "
-  ov5, odesc = tester.op1("case5", v5, desc)
+  ov5, odesc = tester.op1('case5', v5, desc)
 
   assert '\nERROR: tester.op1 - 5 desc FAILED', odesc == "case5: #{desc}"
-  assert '\nERROR: tester.op1 - 5 ov5 FAILED' , v5.basic_data == ov5.basic_data
+  assert '\nERROR: tester.op1 - 5 ov5 FAILED', v5.basic_data == ov5.basic_data
   STDERR.puts 'passed'
 
-  desc = "A<-tB<-tC, B & C have nested value type, truncate C to B"
+  desc = 'A<-tB<-tC, B & C have nested value type, truncate C to B'
   STDERR.print "Case 5b: #{desc}: "
-  otv4, odesc = tester.op3("case5b", v5, desc)
+  otv4, odesc = tester.op3('case5b', v5, desc)
 
   assert '\nERROR: tester.op3 - 5b desc FAILED', odesc == "case5b: #{desc}"
-  assert '\nERROR: tester.op3 - 5b otv4 FAILED' , v5.basic_data == otv4.basic_data
-  assert '\nERROR: tester.op3 - 5b otv4.nv4 FAILED' , v5.nv4.data == otv4.nv4.data
-  assert '\nERROR: tester.op3 - 5b otv4.data4 FAILED' , v5.data4 == otv4.data4
+  assert '\nERROR: tester.op3 - 5b otv4 FAILED', v5.basic_data == otv4.basic_data
+  assert '\nERROR: tester.op3 - 5b otv4.nv4 FAILED', v5.nv4.data == otv4.nv4.data
+  assert '\nERROR: tester.op3 - 5b otv4.data4 FAILED', v5.data4 == otv4.data4
   STDERR.puts 'passed'
 
   # 6.
   iv = OBV_TruncatableTest::TValue6.new
   iv.basic_data = 9
 
-  desc = "A<-tB, B has no data, truncate B to A"
+  desc = 'A<-tB, B has no data, truncate B to A'
   STDERR.print "Case 6: #{desc}: "
-  ov, odesc = tester.op1("case6", iv, desc)
+  ov, odesc = tester.op1('case6', iv, desc)
 
   assert '\nERROR: tester.op1 - 6 desc FAILED', odesc == "case6: #{desc}"
-  assert '\nERROR: tester.op1 - 6 ov FAILED' , iv.basic_data == ov.basic_data
+  assert '\nERROR: tester.op1 - 6 ov FAILED', iv.basic_data == ov.basic_data
   STDERR.puts 'passed'
 
   # 7.
@@ -210,15 +210,15 @@ begin
   v3.nv4 = nv
   v3.data4 = 66
 
-  desc = "multiple IN truncatable valuetype parameters"+
-         " and return truncatable valuetype"
+  desc = 'multiple IN truncatable valuetype parameters' +
+         ' and return truncatable valuetype'
   STDERR.print "Case 7: #{desc}: "
-  ov, odesc = tester.op4("case7", v1, 5, v2, v3, v4, desc)
+  ov, odesc = tester.op4('case7', v1, 5, v2, v3, v4, desc)
 
   assert '\nERROR: tester.op4 - 7 desc FAILED', odesc == "case7: #{desc}"
   total = 5 * (v1.basic_data + v2.basic_data +
                v3.basic_data + v4.basic_data)
-  assert '\nERROR: tester.op4 - 7 ov FAILED' ,  total == ov.basic_data
+  assert '\nERROR: tester.op4 - 7 ov FAILED',  total == ov.basic_data
   STDERR.puts 'passed'
 
   # 8.
@@ -227,12 +227,12 @@ begin
   v1.data1 = 99
   v1.edata1 = 1234
 
-  desc = "A<-tB, truncate unknown B to A"
+  desc = 'A<-tB, truncate unknown B to A'
   STDERR.print "Case 8: #{desc}: "
-  ov1, odesc = tester.op2(v1, "case8", desc)
+  ov1, odesc = tester.op2(v1, 'case8', desc)
 
   assert '\nERROR: tester.op2 - 8 desc FAILED', odesc == "case8: #{desc}"
-  assert '\nERROR: tester.op2 - 8 ov1 FAILED' , v1.basic_data == ov1.basic_data &&
+  assert '\nERROR: tester.op2 - 8 ov1 FAILED', v1.basic_data == ov1.basic_data &&
                                                 v1.data1 == ov1.data1
   STDERR.puts 'passed'
 
@@ -242,12 +242,12 @@ begin
   v1.data1 = 99
 
   a = CORBA::Any.to_any(v1)
-  desc = "A<-tB, known truncatable via Any"
+  desc = 'A<-tB, known truncatable via Any'
   STDERR.print "Case 9: #{desc}: "
-  ov1, odesc = tester.op5(a, "case9", desc)
+  ov1, odesc = tester.op5(a, 'case9', desc)
 
   assert '\nERROR: tester.op5 - 9 desc FAILED', odesc == "case9: #{desc}"
-  assert '\nERROR: tester.op5 - 9 ov1 FAILED' , v1.basic_data == ov1.basic_data &&
+  assert '\nERROR: tester.op5 - 9 ov1 FAILED', v1.basic_data == ov1.basic_data &&
                                                 v1.data1 == ov1.data1
   STDERR.puts 'passed'
 
@@ -258,12 +258,12 @@ begin
   v1.edata1 = 1234
 
   a = CORBA::Any.to_any(v1)
-  desc = "A<-tB, unknown truncatable via Any"
+  desc = 'A<-tB, unknown truncatable via Any'
   STDERR.print "Case 10: #{desc}: "
-  ov1, odesc = tester.op5(a, "case10", desc)
+  ov1, odesc = tester.op5(a, 'case10', desc)
 
   assert '\nERROR: tester.op5 - 10 desc FAILED', odesc == "case10: #{desc}"
-  assert '\nERROR: tester.op5 - 10 ov1 FAILED' , v1.basic_data == ov1.basic_data &&
+  assert '\nERROR: tester.op5 - 10 ov1 FAILED', v1.basic_data == ov1.basic_data &&
                                                  v1.data1 == ov1.data1
   STDERR.puts 'passed'
 

data/test/OBV/Truncatable/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
@@ -59,7 +59,7 @@ end
 
 exrc = clt.wait(400)
 
-if exrc ==0
+if exrc == 0
   srv.wait(400)
 else
   srv.wait_term(400)

data/test/OBV/Truncatable/server.rb

@@ -21,22 +21,22 @@ ARGV.options do |opts|
     script_name = File.basename($0)
     opts.banner = "Usage: ruby #{script_name} [options]"
 
-    opts.separator ""
+    opts.separator ''
 
-    opts.on("--o IORFILE",
-            "Set IOR filename.",
-            "Default: '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('--o IORFILE',
+            'Set IOR filename.',
+            "Default: '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.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
@@ -50,7 +50,7 @@ end
 
 require 'Truncatable_impl'
 
-orb = CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel]], 'myORB')
+orb = CORBA.ORB_init(['-ORBDebugLevel', OPTIONS[:orb_debuglevel]], 'myORB')
 
 # make sure valuetype factories are registered
 OBV_TruncatableTest::BaseValueFactory.get_factory(orb)
@@ -77,7 +77,7 @@ open(OPTIONS[:iorfile], 'w') { |io|
 }
 
 Signal.trap('INT') do
-  puts "SIGINT - shutting down ORB..."
+  puts 'SIGINT - shutting down ORB...'
   orb.shutdown()
 end