r2corba 1.5.1-universal-java → 1.6.1-universal-java

data/test/Param_Test/client.rb

@@ -7,7 +7,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 require 'optparse'
@@ -24,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
@@ -51,7 +50,7 @@ else
   require 'TestC.rb'
 end
 
-orb = CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel]], 'myORB')
+orb = CORBA.ORB_init(['-ORBDebugLevel', OPTIONS[:orb_debuglevel]], 'myORB')
 
 begin
 
@@ -61,20 +60,20 @@ begin
 
   ## integer max/min values test
 
-  [ :max_LongLong,
-    :min_LongLong,
-    :max_ULongLong,
-    :min_ULongLong,
-    :max_Long,
-    :min_Long,
-    :max_ULong,
-    :min_ULong,
-    :max_Short,
-    :min_Short,
-    :max_UShort,
-    :min_UShort,
-    :max_Octet,
-    :min_Octet ].each do |att|
+  [:max_LongLong,
+   :min_LongLong,
+   :max_ULongLong,
+   :min_ULongLong,
+   :max_Long,
+   :min_Long,
+   :max_ULong,
+   :min_ULong,
+   :max_Short,
+   :min_Short,
+   :max_UShort,
+   :min_UShort,
+   :max_Octet,
+   :min_Octet].each do |att|
     att_val = hello_obj.send(att)
     assert "ERROR: value of attribute #{att} (#{att_val}) does not match expected value #{Test.const_get(att.to_s.capitalize)}", Test.const_get(att.to_s.capitalize) == att_val
   end
@@ -87,23 +86,23 @@ begin
 
   hello_obj.message = str
 
-  assert "ERROR setting message attribute", str == hello_obj.message
+  assert 'ERROR setting message attribute', str == hello_obj.message
 
   ## sequence test
 
   nums = hello_obj.numbers
 
   begin
-    hello_obj.numbers = (0...11).to_a.collect { |i| i*3 }
+    hello_obj.numbers = (0...11).to_a.collect { |i| i * 3 }
   rescue CORBA::MARSHAL => ex
     ## expected exception since sequence can hold max. 10 elements
   end
 
   assert "ERROR numbers attribute changed while it shouldn't", nums == hello_obj.numbers
 
-  hello_obj.numbers = nums.collect { |i| i*3 }
+  hello_obj.numbers = nums.collect { |i| i * 3 }
 
-  assert_not "ERROR numbers attribute did not change while it should have", nums == hello_obj.numbers
+  assert_not 'ERROR numbers attribute did not change while it should have', nums == hello_obj.numbers
 
   doubles_list = hello_obj.list_of_doubles
 
@@ -117,14 +116,14 @@ begin
     sv.m_one += 1
     sv.m_two += 1.03
     sv.m_three.upcase!
-    sv.m_four.m_b = TRUE
+    sv.m_four.m_b = true
     sv.m_five = Test::TE_FIRST
   }
 
   hello_obj.structSeq = svseq
 
   ix = 0
-  assert_not "ERROR setting attribute structSeq" do
+  assert_not 'ERROR setting attribute structSeq' do
     hello_obj.structSeq.any? { |sv|
       sv2 = svseq[ix]
       ix += 1
@@ -150,7 +149,7 @@ begin
 
   hello_obj.theCube = cube2
 
-  assert_not "ERROR setting attribute theCube" do
+  assert_not 'ERROR setting attribute theCube' do
     cube2 != hello_obj.theCube || cube == hello_obj.theCube
   end
 
@@ -158,7 +157,7 @@ begin
 
   self_obj = hello_obj.selfref
 
-  assert "ERROR with attribute selfref", self_obj.message == hello_obj.message
+  assert 'ERROR with attribute selfref', self_obj.message == hello_obj.message
 
   ## Any test
 
@@ -166,19 +165,19 @@ begin
 
   hello_obj.anyValue = 1
 
-  assert_not "ERROR with attribute anyValue" do
+  assert_not 'ERROR with attribute anyValue' do
     any == hello_obj.anyValue || 1 == hello_obj.anyValue
   end
 
   hello_obj.anyValue = 2
 
-  assert_not "ERROR with attribute anyValue" do
+  assert_not 'ERROR with attribute anyValue' do
     any == hello_obj.anyValue || 2 == hello_obj.anyValue
   end
 
   hello_obj.anyValue = 3
 
-  assert_not "ERROR with attribute anyValue" do
+  assert_not 'ERROR with attribute anyValue' do
     any == hello_obj.anyValue || 3 == hello_obj.anyValue
   end
 
@@ -191,7 +190,7 @@ begin
 
   hello_obj.unionValue = uv2
 
-  assert_not "ERROR with attribute unionValue" do
+  assert_not 'ERROR with attribute unionValue' do
     uv1._disc == hello_obj.unionValue._disc || uv1._value == hello_obj.unionValue._value
   end
 
@@ -202,47 +201,47 @@ begin
 
   hello_obj.unionValue2 = uv22
 
-  assert_not "ERROR with attribute unionValue2" do
+  assert_not 'ERROR with attribute unionValue2' do
     uv21._disc == hello_obj.unionValue2._disc || uv21._value == hello_obj.unionValue2._value
   end
 
-  assert_not "ERROR with attribute unionValue2" do
+  assert_not 'ERROR with attribute unionValue2' do
     uv21._disc == hello_obj.unionValue2._disc || uv21._value == hello_obj.unionValue2._value
   end
 
   uv3 = hello_obj.unionValue3
 
-  assert_except "ERROR with attribute unionValue3", CORBA::BAD_PARAM do
-    uv3._disc = FALSE
+  assert_except 'ERROR with attribute unionValue3', CORBA::BAD_PARAM do
+    uv3._disc = false
   end
 
   uv3._default  # set implicit default
 
-  assert "ERROR with implicit default union U3" do
+  assert 'ERROR with implicit default union U3' do
     uv3._disc == false
   end
 
   hello_obj.unionValue3 = uv3
 
-  assert "ERROR with implicit default attribute unionValue3" do
+  assert 'ERROR with implicit default attribute unionValue3' do
     hello_obj.unionValue3._disc == false
   end
 
   uv4 = hello_obj.unionValue4
 
-  assert_except "ERROR with attribute unionValue4", CORBA::BAD_PARAM do
+  assert_except 'ERROR with attribute unionValue4', CORBA::BAD_PARAM do
     uv4._disc = Test::TE_THIRD
   end
 
   uv4._default  # set implicit default
 
-  assert "ERROR with implicit default union U4" do
+  assert 'ERROR with implicit default union U4' do
     uv4._disc == Test::TE_THIRD
   end
 
   hello_obj.unionValue4 = uv4
 
-  assert "ERROR with implicit default attribute unionValue4" do
+  assert 'ERROR with implicit default attribute unionValue4' do
     hello_obj.unionValue4._disc == Test::TE_THIRD
   end
 
@@ -256,16 +255,16 @@ begin
 
   hello_obj.s3Value = s3val
 
-  assert_not "ERROR with attribute s3Value" do
+  assert_not 'ERROR with attribute s3Value' do
     s3val.m_seq.size != hello_obj.s3Value.m_seq.size || s3val.m_seq.first.m_has_more != hello_obj.s3Value.m_seq.first.m_has_more
   end
 
   ## in, inout, out test
 
-  reslen, resinoutstr, resoutstr = hello_obj.run_test(instr = Test::TString.new("This is instr"), inoutstr = "This is inoutstr")
+  reslen, resinoutstr, resoutstr = hello_obj.run_test(instr = Test::TString.new('This is instr'), inoutstr = 'This is inoutstr')
 
-  assert_not "ERROR with run_test" do
-    reslen != resoutstr.size || resinoutstr != instr || resoutstr != (instr+inoutstr)
+  assert_not 'ERROR with run_test' do
+    reslen != resoutstr.size || resinoutstr != instr || resoutstr != (instr + inoutstr)
   end
 
   hello_obj.shutdown()

data/test/Param_Test/run_test.rb

@@ -7,7 +7,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 OPTIONS = {
@@ -21,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
@@ -60,7 +59,7 @@ end
 
 exrc = clt.wait(400)
 
-if exrc ==0
+if exrc == 0
   srv.wait(400)
 else
   srv.wait_term(400)

data/test/Param_Test/server.rb

@@ -7,7 +7,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 require 'optparse'
@@ -22,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
@@ -54,18 +53,18 @@ class MyHello < POA::Test::Hello
   def initialize(orb)
     @orb = orb
     @msg = 'message'
-    @nums = Test::TShortSeq.new((0...10).collect { |i| i*2 })
+    @nums = Test::TShortSeq.new((0...10).collect { |i| i * 2 })
     s1 = Test::S1.new
     s1.m_one = 123
     s1.m_two = 2.54
-    s1.m_three = "field three"
+    s1.m_three = 'field three'
     s1.m_four = Test::S1::S2.new
     s1.m_four.m_b = false
     s1.m_five = ::Test::TE_ZEROTH
     @s1seq = Test::S1Seq.new << s1
     @cube = Test::TLongCube.new((0...3).collect {|x|
       (0...3).collect {|y|
-        (0...4).collect {|z| x+(y*10)+(z*100) }
+        (0...4).collect {|z| x + (y * 10) + (z * 100) }
       }
     })
     @anysel = 0
@@ -80,114 +79,114 @@ class MyHello < POA::Test::Hello
     @s3.m_seq << s3_
     @u1 = Test::U1.new
     @u1._disc = Test::TE_FIRST
-    @u1.m_str = "Hello world!"
+    @u1.m_str = 'Hello world!'
     @u2 = Test::U2.new
     @u2._disc = Test::U2::ONE
     @u2.l_ = 12345
     @u3 = Test::U3.new
-    @u3._disc = TRUE
+    @u3._disc = true
     @u3.lval = 123456
     @u4 = Test::U4.new
     @u4._disc = Test::TE_FIRST
-    @u4.m_str = "Hello world!"
+    @u4.m_str = 'Hello world!'
     @nex = 0
   end
 
   def max_LongLong()
     Test::Max_longlong
-  end #of attribute get_Max_LongLong
+  end # of attribute get_Max_LongLong
 
   def min_LongLong()
     Test::Min_longlong
-  end #of attribute get_Min_LongLong
+  end # of attribute get_Min_LongLong
 
   def max_ULongLong()
     Test::Max_ulonglong
-  end #of attribute get_Max_ULongLong
+  end # of attribute get_Max_ULongLong
 
   def min_ULongLong()
     Test::Min_ulonglong
-  end #of attribute get_Min_ULongLong
+  end # of attribute get_Min_ULongLong
 
   def max_Long()
     Test::Max_long
-  end #of attribute get_Max_Long
+  end # of attribute get_Max_Long
 
   def min_Long()
     Test::Min_long
-  end #of attribute get_Min_Long
+  end # of attribute get_Min_Long
 
   def max_ULong()
     Test::Max_ulong
-  end #of attribute get_Max_ULong
+  end # of attribute get_Max_ULong
 
   def min_ULong()
     Test::Min_ulong
-  end #of attribute get_Min_ULong
+  end # of attribute get_Min_ULong
 
   def max_Short()
     Test::Max_short
-  end #of attribute get_Max_Short
+  end # of attribute get_Max_Short
 
   def min_Short()
     Test::Min_short
-  end #of attribute get_Min_Short
+  end # of attribute get_Min_Short
 
   def max_UShort()
     Test::Max_ushort
-  end #of attribute get_Max_UShort
+  end # of attribute get_Max_UShort
 
   def min_UShort()
     Test::Min_ushort
-  end #of attribute get_Min_UShort
+  end # of attribute get_Min_UShort
 
   def max_Octet()
     Test::Max_octet
-  end #of attribute get_Max_Octet
+  end # of attribute get_Max_Octet
 
   def min_Octet()
     Test::Min_octet
-  end #of attribute get_Min_Octet
+  end # of attribute get_Min_Octet
 
   def get_string()
-    "Hello there!"
+    'Hello there!'
   end
 
   def message()
     @msg
-  end #of attribute get_message
+  end # of attribute get_message
 
   def message=(val)
     @msg = val.to_s
-  end #of attribute set_message
+  end # of attribute set_message
 
   def numbers()
     @nums
-  end #of attribute get_numbers
+  end # of attribute get_numbers
 
   def numbers=(val)
     @nums = val
-  end #of attribute set_numbers
+  end # of attribute set_numbers
 
   def list_of_doubles()
     [1.0, 1.1, 1.2, 1.3]
-  end #of attribute get_numbers
+  end # of attribute get_numbers
 
   def structSeq()
     @s1seq
-  end #of attribute get_structSeq
+  end # of attribute get_structSeq
 
   def structSeq=(val)
     @s1seq = val
-  end #of attribute set_structSeq
+  end # of attribute set_structSeq
 
   def theCube()
     @cube
-  end #of attribute get_theCube
+  end # of attribute get_theCube
 
   def theCube=(val)
     @cube = val
-  end #of attribute set_theCube
+  end # of attribute set_theCube
 
   def anyValue()
     case @anysel
@@ -196,59 +195,59 @@ class MyHello < POA::Test::Hello
     when 2
       @s1seq
     when 3
-      CORBA::Any.to_any([1,2,3,4,5], CORBA::TypeCode::Sequence.new(CORBA._tc_long))
+      CORBA::Any.to_any([1, 2, 3, 4, 5], CORBA::TypeCode::Sequence.new(CORBA._tc_long))
     else
       @anysel
     end
-  end #of attribute get_anyValue
+  end # of attribute get_anyValue
 
   def anyValue=(val)
     @anysel = val.to_i
-  end #of attribute set_anyValue
+  end # of attribute set_anyValue
 
   def selfref()
     self._this
-  end #of attribute get_selfref
+  end # of attribute get_selfref
 
   def s3Value()
     @s3
-  end #of attribute get_s3Value
+  end # of attribute get_s3Value
 
   def s3Value=(val)
     @s3 = val
-  end #of attribute set_s3Value
+  end # of attribute set_s3Value
 
   def unionValue()
     @u1
-  end #of attribute get_unionValue
+  end # of attribute get_unionValue
 
   def unionValue=(val)
     @u1 = val
-  end #of attribute set_unionValue
+  end # of attribute set_unionValue
 
   def unionValue2()
     @u2
-  end #of attribute get_unionValue2
+  end # of attribute get_unionValue2
 
   def unionValue2=(val)
     @u2 = val
-  end #of attribute set_unionValue2
+  end # of attribute set_unionValue2
 
   def unionValue3()
     @u3
-  end #of attribute get_unionValue3
+  end # of attribute get_unionValue3
 
   def unionValue3=(val)
     @u3 = val
-  end #of attribute set_unionValue3
+  end # of attribute set_unionValue3
 
   def unionValue4()
     @u4
-  end #of attribute get_unionValue4
+  end # of attribute get_unionValue4
 
   def unionValue4=(val)
     @u4 = val
-  end #of attribute set_unionValue4
+  end # of attribute set_unionValue4
 
   def run_test(instr, inoutstr)
     outstr = instr + inoutstr
@@ -259,10 +258,10 @@ class MyHello < POA::Test::Hello
   def shutdown()
     @orb.shutdown()
   end
-end #of servant Hello
+end # of servant Hello
 
 
-orb = CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel]], 'myORB')
+orb = CORBA.ORB_init(['-ORBDebugLevel', OPTIONS[:orb_debuglevel]], 'myORB')
 
 obj = orb.resolve_initial_references('RootPOA')
 
@@ -285,7 +284,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/Performance/Simple/Test.idl

@@ -6,7 +6,6 @@
  * included with this program.
  *
  * Copyright (c) Remedy IT Expertise BV
- * Chamber of commerce Rotterdam nr.276339, The Netherlands
  *--------------------------------------------------------------------*/
 
 /// Put the interfaces in a module, to avoid global namespace pollution

data/test/Performance/Simple/client.rb

@@ -7,7 +7,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 require 'optparse'
@@ -24,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
@@ -51,7 +50,7 @@ else
   require 'TestC.rb'
 end
 
-orb = CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel]], 'myORB')
+orb = CORBA.ORB_init(['-ORBDebugLevel', OPTIONS[:orb_debuglevel]], 'myORB')
 
 DATA = 'Hello world! 0123456789012345678901234567890123456789012345678901234567890123456789'
 
@@ -77,11 +76,11 @@ begin
 
   hello_obj.shutdown()
 
-  assert_not "ERROR: Object is reported nil!", CORBA::is_nil(hello_obj)
+  assert_not 'ERROR: Object is reported nil!', CORBA::is_nil(hello_obj)
 
   hello_obj._free_ref()
 
-  assert "ERROR: Object is reported non-nil!", CORBA::is_nil(hello_obj)
+  assert 'ERROR: Object is reported non-nil!', CORBA::is_nil(hello_obj)
 
 ensure