r2corba 1.5.4 → 1.5.5

data/test/OBV/ValueBox/run_test.rb

@@ -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/ValueBox/server.rb

@@ -26,13 +26,13 @@ ARGV.options do |opts|
 
     opts.on("--o IORFILE",
             "Set IOR filename.",
-            "Default: 'server.ior'") { |v| OPTIONS[:iorfile]=v }
+            "Default: 'server.ior'") { |v| OPTIONS[:iorfile] = v }
     opts.on("--d LVL",
             "Set ORBDebugLevel value.",
-            "Default: 0") { |v| OPTIONS[:orb_debuglevel]=v }
+            "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 }
+            "Default: off") { |v| OPTIONS[:use_implement] = v }
 
     opts.separator ""
 
@@ -55,7 +55,7 @@ class Test_impl < POA::Test
   end
 
   def ros(s)
-    s.slice(s.size-1,1) << s.slice(0,s.size-1)
+    s.slice(s.size - 1, 1) << s.slice(0, s.size - 1)
   end
 
   def basic_op1(p1, p2)
@@ -94,25 +94,25 @@ class Test_impl < POA::Test
   end
 
   def seq_op1(p1, p2)
-    p3 = p2.collect {|e| e*5}
-    p2.collect! {|e| e*3}
+    p3 = p2.collect {|e| e * 5}
+    p2.collect! {|e| e * 3}
     retval = p1
     [retval, p2, p3]
   end
 
   def seq_op2(p1, p2)
-    p3 = p2.collect {|e| e*5}
-    p2.collect! {|e| e*3}
+    p3 = p2.collect {|e| e * 5}
+    p2.collect! {|e| e * 3}
     [p2, p3]
   end
 
   def struct_op1(p1, p2)
-    p3 = Fixed_Struct1.new(p2.l*5,
-                           Fixed_Struct1::Bstruct.new(p2.abstruct.s1*5,
-                                                      p2.abstruct.s2*5))
-    p2.l = p2.l*3
-    p2.abstruct.s1 = p2.abstruct.s1*3
-    p2.abstruct.s2 = p2.abstruct.s2*3
+    p3 = Fixed_Struct1.new(p2.l * 5,
+                           Fixed_Struct1::Bstruct.new(p2.abstruct.s1 * 5,
+                                                      p2.abstruct.s2 * 5))
+    p2.l = p2.l * 3
+    p2.abstruct.s1 = p2.abstruct.s1 * 3
+    p2.abstruct.s2 = p2.abstruct.s2 * 3
 
     retval = p1
     [retval, p2, p3]
@@ -121,9 +121,9 @@ class Test_impl < POA::Test
   def struct_op2(p1, p2)
     p3 = p1
 
-    p2.l = p2.l*3
-    p2.abstruct.s1 = p2.abstruct.s1*3
-    p2.abstruct.s2 = p2.abstruct.s2*3
+    p2.l = p2.l * 3
+    p2.abstruct.s1 = p2.abstruct.s1 * 3
+    p2.abstruct.s2 = p2.abstruct.s2 * 3
 
     [p2, p3]
   end
@@ -147,14 +147,14 @@ class Test_impl < POA::Test
   end
 
   def array_op1(p1, p2)
-    p2.collect! {|e| e*3}
+    p2.collect! {|e| e * 3}
     p3 = p2
     retval = p1
     [retval, p2, p3]
   end
 
   def array_op2(p1, p2)
-    p2.collect! {|e| e*3}
+    p2.collect! {|e| e * 3}
     p3 = p1
     [p2, p3]
   end
@@ -177,17 +177,17 @@ class Test_impl < POA::Test
     retval = VBfixed_union1.new(Fixed_Union1.new)
     case p1._disc
     when 1
-      p3.value.m1 = p1.m1*3
-      retval.value.m1 = p1.m1*3
+      p3.value.m1 = p1.m1 * 3
+      retval.value.m1 = p1.m1 * 3
     when 2
-      p3.value.m2 = p1.m2*3
-      retval.value.m2 = p1.m2*3
+      p3.value.m2 = p1.m2 * 3
+      retval.value.m2 = p1.m2 * 3
     end
     case p2._disc
     when 1
-      p2.m1 = p2.m1*3
+      p2.m1 = p2.m1 * 3
     when 2
-      p2.m2 = p2.m2*3
+      p2.m2 = p2.m2 * 3
     end
     [retval, p2, p3]
   end
@@ -196,9 +196,9 @@ class Test_impl < POA::Test
     p3 = p1
     case p2._disc
     when 1
-      p2.m1 = p2.m1*3
+      p2.m1 = p2.m1 * 3
     when 2
-      p2.m2 = p2.m2*3
+      p2.m2 = p2.m2 * 3
     end
     [p2, p3]
   end
@@ -216,7 +216,7 @@ class Test_impl < POA::Test
     end
     case p2._disc
     when 1
-      p2.m1 = p2.m1*3
+      p2.m1 = p2.m1 * 3
     when 2
       p2.m2 = ros(p2.m2)
     end
@@ -227,7 +227,7 @@ class Test_impl < POA::Test
     p3 = p1
     case p2._disc
     when 1
-      p2.m1 = p2.m1*3
+      p2.m1 = p2.m1 * 3
     when 2
       p2.m2 = ros(p2.m2)
     end

data/test/Object/client.rb

@@ -27,13 +27,13 @@ ARGV.options do |opts|
 
     opts.on("--k IORFILE",
             "Set IOR.",
-            "Default: 'file://server.ior'") { |v| OPTIONS[:iorfile]=v }
+            "Default: 'file://server.ior'") { |v| OPTIONS[:iorfile] = v }
     opts.on("--d LVL",
             "Set ORBDebugLevel value.",
-            "Default: 0") { |v| OPTIONS[:orb_debuglevel]=v }
+            "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 }
+            "Default: off") { |v| OPTIONS[:use_implement] = v }
 
     opts.separator ""
 
@@ -57,7 +57,7 @@ begin
   obj = orb.string_to_object(OPTIONS[:iorfile])
 
   unless defined?(JRUBY_VERSION) && CORBA::Native::Jacorb::MAJOR_VERSION == 3 &&
-      ([4,5].include? CORBA::Native::Jacorb::MINOR_VERSION)
+      ([4, 5].include? CORBA::Native::Jacorb::MINOR_VERSION)
     ## JacORB 3.4 introduced an optimization which *requires* use of the Java endorsed dirs
     ## mechanism to replace standard JDK CORBA stubs with the JacORB version in order to
     ## have JacORB process these base methods correctly with DSI servants

data/test/Object/run_test.rb

@@ -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/Object/server.rb

@@ -25,13 +25,13 @@ ARGV.options do |opts|
 
     opts.on("--o IORFILE",
             "Set IOR filename.",
-            "Default: 'server.ior'") { |v| OPTIONS[:iorfile]=v }
+            "Default: 'server.ior'") { |v| OPTIONS[:iorfile] = v }
     opts.on("--d LVL",
             "Set ORBDebugLevel value.",
-            "Default: 0") { |v| OPTIONS[:orb_debuglevel]=v }
+            "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 }
+            "Default: off") { |v| OPTIONS[:use_implement] = v }
 
     opts.separator ""
 

data/test/POA/test.rb

@@ -27,13 +27,13 @@ ARGV.options do |opts|
 
     opts.on("--o IORFILE",
             "Set IOR filename.",
-            "Default: 'server.ior'") { |v| OPTIONS[:iorfile]=v }
+            "Default: 'server.ior'") { |v| OPTIONS[:iorfile] = v }
     opts.on("--d LVL",
             "Set ORBDebugLevel value.",
-            "Default: 0") { |v| OPTIONS[:orb_debuglevel]=v }
+            "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 }
+            "Default: off") { |v| OPTIONS[:use_implement] = v }
 
     opts.separator ""
 

data/test/Param_Test/client.rb

@@ -27,13 +27,13 @@ ARGV.options do |opts|
 
     opts.on("--k IORFILE",
             "Set IOR.",
-            "Default: 'file://server.ior'") { |v| OPTIONS[:iorfile]=v }
+            "Default: 'file://server.ior'") { |v| OPTIONS[:iorfile] = v }
     opts.on("--d LVL",
             "Set ORBDebugLevel value.",
-            "Default: 0") { |v| OPTIONS[:orb_debuglevel]=v }
+            "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 }
+            "Default: off") { |v| OPTIONS[:use_implement] = v }
 
     opts.separator ""
 
@@ -93,14 +93,14 @@ begin
   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
 
@@ -264,7 +264,7 @@ begin
   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)
+    reslen != resoutstr.size || resinoutstr != instr || resoutstr != (instr + inoutstr)
   end
 
   hello_obj.shutdown()

data/test/Param_Test/run_test.rb

@@ -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/Param_Test/server.rb

@@ -25,13 +25,13 @@ ARGV.options do |opts|
 
     opts.on("--o IORFILE",
             "Set IOR filename.",
-            "Default: 'server.ior'") { |v| OPTIONS[:iorfile]=v }
+            "Default: 'server.ior'") { |v| OPTIONS[:iorfile] = v }
     opts.on("--d LVL",
             "Set ORBDebugLevel value.",
-            "Default: 0") { |v| OPTIONS[:orb_debuglevel]=v }
+            "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 }
+            "Default: off") { |v| OPTIONS[:use_implement] = v }
 
     opts.separator ""
 
@@ -53,7 +53,7 @@ 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
@@ -64,7 +64,7 @@ class MyHello < POA::Test::Hello
     @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
@@ -195,7 +195,7 @@ 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

data/test/Performance/Simple/client.rb

@@ -27,13 +27,13 @@ ARGV.options do |opts|
 
     opts.on("--k IORFILE",
             "Set IOR.",
-            "Default: 'file://server.ior'") { |v| OPTIONS[:iorfile]=v }
+            "Default: 'file://server.ior'") { |v| OPTIONS[:iorfile] = v }
     opts.on("--d LVL",
             "Set ORBDebugLevel value.",
-            "Default: 0") { |v| OPTIONS[:orb_debuglevel]=v }
+            "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 }
+            "Default: off") { |v| OPTIONS[:use_implement] = v }
 
     opts.separator ""
 

data/test/Performance/Simple/run_test.rb

@@ -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/Performance/Simple/server.rb

@@ -25,13 +25,13 @@ ARGV.options do |opts|
 
     opts.on("--o IORFILE",
             "Set IOR filename.",
-            "Default: 'server.ior'") { |v| OPTIONS[:iorfile]=v }
+            "Default: 'server.ior'") { |v| OPTIONS[:iorfile] = v }
     opts.on("--d LVL",
             "Set ORBDebugLevel value.",
-            "Default: 0") { |v| OPTIONS[:orb_debuglevel]=v }
+            "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 }
+            "Default: off") { |v| OPTIONS[:use_implement] = v }
 
     opts.separator ""
 

data/test/Policies/test.rb

@@ -26,10 +26,10 @@ ARGV.options do |opts|
 
     opts.on("--d LVL",
             "Set ORBDebugLevel value.",
-            "Default: 0") { |v| OPTIONS[:orb_debuglevel]=v }
+            "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 }
+            "Default: off") { |v| OPTIONS[:use_implement] = v }
 
     opts.separator ""
 
@@ -140,4 +140,3 @@ begin
 ensure
   orb.destroy()
 end
-

data/test/Timeout/client.rb

@@ -27,13 +27,13 @@ ARGV.options do |opts|
 
     opts.on("--k IORFILE",
             "Set IOR.",
-            "Default: 'file://server.ior'") { |v| OPTIONS[:iorfile]=v }
+            "Default: 'file://server.ior'") { |v| OPTIONS[:iorfile] = v }
     opts.on("--d LVL",
             "Set ORBDebugLevel value.",
-            "Default: 0", Integer) { |v| OPTIONS[:orb_debuglevel]=v }
+            "Default: 0", Integer) { |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 }
+            "Default: off") { |v| OPTIONS[:use_implement] = v }
 
     opts.separator ""
 
@@ -113,8 +113,8 @@ begin
   mid_value = 10000 * (Min_timeout + Max_timeout) / 2   # convert from msec to "TimeT" (0.1 usec units)
 
   any_orb = CORBA::Any.to_any(mid_value, TimeBase::TimeT._tc)
-  any_thread = CORBA::Any.to_any(mid_value+10000, TimeBase::TimeT._tc) # midvalue + 1 msec
-  any_object = CORBA::Any.to_any(mid_value+20000, TimeBase::TimeT._tc) # midvalue + 2 msec
+  any_thread = CORBA::Any.to_any(mid_value + 10000, TimeBase::TimeT._tc) # midvalue + 1 msec
+  any_object = CORBA::Any.to_any(mid_value + 20000, TimeBase::TimeT._tc) # midvalue + 2 msec
 
   policies = []
   policies << orb.create_policy(Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE, any_object)
@@ -187,7 +187,7 @@ begin
   for i in 0..3
     timeout_count_total += Timeout_count[i]
     in_time_count_total += In_time_count[i]
-    puts "client (#{Process.pid}) in_time_count[#{To_type_names[i]}]= #{In_time_count[i]} "+
+    puts "client (#{Process.pid}) in_time_count[#{To_type_names[i]}]= #{In_time_count[i]} " +
                                 "timeout_count[#{To_type_names[i]}]= #{Timeout_count[i]}"
   end
 

data/test/Timeout/run_test.rb

@@ -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/Timeout/server.rb

@@ -26,16 +26,16 @@ ARGV.options do |opts|
 
     opts.on("--o IORFILE",
             "Set IOR filename.",
-            "Default: 'server.ior'") { |v| OPTIONS[:iorfile]=v }
+            "Default: 'server.ior'") { |v| OPTIONS[:iorfile] = v }
     opts.on("--d LVL",
             "Set ORBDebugLevel value.",
-            "Default: 0") { |v| OPTIONS[:orb_debuglevel]=v }
+            "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 }
+            "Default: off") { |v| OPTIONS[:use_implement] = v }
     opts.on("--i ITERATIONS",
             "Set number of iterations.",
-            "Default: 10", Integer) { |v| OPTIONS[:iter_num]=v }
+            "Default: 10", Integer) { |v| OPTIONS[:iter_num] = v }
 
     opts.separator ""