r2corba 1.5.5 → 1.6.0

data/test/Policies/test.rb

@@ -22,19 +22,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") { |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
@@ -53,24 +53,24 @@ 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
 
 if defined?(JRUBY_VERSION)
   ## JacORB needs explicit activation of this option
   props = {
-    "org.omg.PortableInterceptor.ORBInitializerClass.bidir_init" =>
-               "org.jacorb.orb.giop.BiDirConnectionInitializer"
+    'org.omg.PortableInterceptor.ORBInitializerClass.bidir_init' =>
+               'org.jacorb.orb.giop.BiDirConnectionInitializer'
   }
 else
   props = {}
 end
-orb = CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel]], 'myORB', props)
+orb = CORBA.ORB_init(['-ORBDebugLevel', OPTIONS[:orb_debuglevel]], 'myORB', props)
 
 begin
 
@@ -81,31 +81,31 @@ begin
   assert_not 'Failed to resolve RootPOA', CORBA.is_nil(rootpoa) || !rootpoa.is_a?(PortableServer::POA)
 
   pol = rootpoa.create_thread_policy(PortableServer::SINGLE_THREAD_MODEL)
-  assert 'Failed to create correct policy'  ,
+  assert 'Failed to create correct policy',
          !pol.nil? and pol.is_a?(PortableServer::ThreadPolicy) and pol.value == PortableServer::SINGLE_THREAD_MODEL
 
   pol = rootpoa.create_lifespan_policy(PortableServer::PERSISTENT)
-  assert 'Failed to create correct policy'  ,
+  assert 'Failed to create correct policy',
          !pol.nil? and pol.is_a?(PortableServer::LifespanPolicy) and pol.value == PortableServer::PERSISTENT
 
   pol = rootpoa.create_id_uniqueness_policy(PortableServer::UNIQUE_ID)
-  assert 'Failed to create correct policy'  ,
+  assert 'Failed to create correct policy',
          !pol.nil? and pol.is_a?(PortableServer::IdUniquenessPolicy) and pol.value == PortableServer::UNIQUE_ID
 
   pol = rootpoa.create_id_assignment_policy(PortableServer::USER_ID)
-  assert 'Failed to create correct policy'  ,
+  assert 'Failed to create correct policy',
          !pol.nil? and pol.is_a?(PortableServer::IdAssignmentPolicy) and pol.value == PortableServer::USER_ID
 
   pol = rootpoa.create_implicit_activation_policy(PortableServer::NO_IMPLICIT_ACTIVATION)
-  assert 'Failed to create correct policy'  ,
+  assert 'Failed to create correct policy',
          !pol.nil? and pol.is_a?(PortableServer::ImplicitActivationPolicy) and pol.value == PortableServer::NO_IMPLICIT_ACTIVATION
 
   pol = rootpoa.create_servant_retention_policy(PortableServer::RETAIN)
-  assert 'Failed to create correct policy'  ,
+  assert 'Failed to create correct policy',
          !pol.nil? and pol.is_a?(PortableServer::ServantRetentionPolicy) and pol.value == PortableServer::RETAIN
 
   pol = rootpoa.create_request_processing_policy(PortableServer::USE_DEFAULT_SERVANT)
-  assert 'Failed to create correct policy'  ,
+  assert 'Failed to create correct policy',
          !pol.nil? and pol.is_a?(PortableServer::RequestProcessingPolicy) and pol.value == PortableServer::USE_DEFAULT_SERVANT
 
   assert_except('orb.create_policy should have thrown a PolicyError',
@@ -113,7 +113,7 @@ begin
 
   pol = orb.create_policy(BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE,
                           CORBA::Any.to_any(BiDirPolicy::BOTH, BiDirPolicy::BidirectionalPolicyValue._tc))
-  assert 'Failed to create correct policy'  ,
+  assert 'Failed to create correct policy',
          !pol.nil? and pol.is_a?(BiDirPolicy) and pol.value == BiDirPolicy::BOTH
 
   poa_man = rootpoa.the_POAManager

data/test/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 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", 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 }
+    opts.on('--d LVL',
+            'Set ORBDebugLevel value.',
+            '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 }
 
-    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
@@ -55,7 +55,7 @@ Min_timeout = 0
 Max_timeout = 20
 
 None, Orb1, Thread1, Object1 = (0..3).to_a
-To_type_names = [ "none", "orb", "thread", "object" ]
+To_type_names = ['none', 'orb', 'thread', 'object']
 
 Timeout_count = [0, 0, 0, 0]
 In_time_count = [0, 0, 0, 0]
@@ -69,7 +69,7 @@ def send_echo (ctype, orb, server, t)
       Timeout_count[ctype] += 1
 
       # Trap this exception and continue...
-      puts "==> Trapped a TIMEOUT exception (expected)"
+      puts '==> Trapped a TIMEOUT exception (expected)'
 
       # Sleep so the server can send the reply...
       tv = Max_timeout / 1000.0  # max_timeout is in msec, so get seconds
@@ -82,12 +82,12 @@ def send_echo (ctype, orb, server, t)
       # This is a non-standard TAO call that's used to give the
       # client ORB a chance to cleanup the reply that's come back
       # from the server.
-#orb.run(tv)
+# orb.run(tv)
   end
 end
 
 
-orb = CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel]], 'myORB')
+orb = CORBA.ORB_init(['-ORBDebugLevel', OPTIONS[:orb_debuglevel]], 'myORB')
 
 begin
 
@@ -129,7 +129,7 @@ begin
   puts "client (#{Process.pid}) testing from #{Min_timeout} to #{Max_timeout} milliseconds"
 
   for t in Min_timeout...Max_timeout
-    puts ""
+    puts ''
     puts "client (#{Process.pid}) ================================"
     puts "client (#{Process.pid}) Trying with timeout = #{t} msec"
 

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

@@ -22,25 +22,25 @@ 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.",
+    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("--i ITERATIONS",
-            "Set number of iterations.",
-            "Default: 10", Integer) { |v| OPTIONS[:iter_num] = 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('--i ITERATIONS',
+            'Set number of iterations.',
+            'Default: 10', Integer) { |v| OPTIONS[:iter_num] = 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
@@ -74,9 +74,9 @@ class Simple_Server_i < POA::Simple_Server
     puts "server (#{Process.pid}) received shutdown request from client"
     @orb.shutdown()
   end
-end #of servant Simple_Server_i
+end # of servant Simple_Server_i
 
-orb = CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel]], 'myORB')
+orb = CORBA.ORB_init(['-ORBDebugLevel', OPTIONS[:orb_debuglevel]], 'myORB')
 
 obj = orb.resolve_initial_references('RootPOA')
 
@@ -97,7 +97,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/lib/test.rb

@@ -160,7 +160,7 @@ if defined?(JRUBY_VERSION)
           begin
             tmp, status = ::Process.waitpid2(pid, ::Process::WNOHANG)
             if tmp == pid and status.success? != nil
-              return [pid, status.success?() ? 0 : status.exitstatus ]
+              return [pid, status.success?() ? 0 : status.exitstatus]
             end
             return [nil, 0]
           rescue Errno::ECHILD
@@ -185,6 +185,7 @@ if defined?(JRUBY_VERSION)
         end
       end
     end
+
     def initialize(cmd_, arg_)
       @pid = nil
       @exitstatus = nil
@@ -237,6 +238,7 @@ if defined?(JRUBY_VERSION)
     end
 
     def is_running?; @exitstatus.nil?; end
+
     def has_error? ; @trd.status.nil? or (!self.is_running? and self.exitstatus != 0) ;end
 
     def stop
@@ -264,7 +266,7 @@ elsif is_win32? && TestUtil::RBVersion[0] < 2 && TestUtil::RBVersion[1] < 9
 
     protected
       # Used by Process.create
-      ProcessInfo = Struct.new("ProcessInfo",
+      ProcessInfo = Struct.new('ProcessInfo',
           :process_handle,
           :thread_handle,
           :process_id,
@@ -305,7 +307,7 @@ elsif is_win32? && TestUtil::RBVersion[0] < 2 && TestUtil::RBVersion[1] < 9
         )
 
         unless bool
-           raise ProcessError, "CreateProcess() failed: ", get_last_error
+           raise ProcessError, 'CreateProcess() failed: ', get_last_error
         end
 
         ProcessInfo.new(
@@ -324,7 +326,7 @@ elsif is_win32? && TestUtil::RBVersion[0] < 2 && TestUtil::RBVersion[1] < 9
         else
           CloseHandle(pi_.process_handle) unless pi_.process_handle == INVALID_HANDLE_VALUE
           pi_.process_handle = INVALID_HANDLE_VALUE
-          raise ProcessError, "GetExitCodeProcess failed: ", get_last_error
+          raise ProcessError, 'GetExitCodeProcess failed: ', get_last_error
         end
       end
 
@@ -395,6 +397,7 @@ elsif is_win32? && TestUtil::RBVersion[0] < 2 && TestUtil::RBVersion[1] < 9
       def exitstatus; @exitstatus; end
 
       def is_running?; @exitstatus.nil?; end
+
       def has_error?; !@exitstatus.nil? and (@exitstatus != 0); end
 
       def stop
@@ -457,6 +460,7 @@ else # !win32
     end
 
     def is_running?; @exitstatus.nil?; end
+
     def has_error?; !@status.nil? and (@status.success? == false); end
 
     def stop
@@ -472,7 +476,7 @@ end
   class Test
     def initialize
       @proc = nil
-      @cmd = ""
+      @cmd = ''
     end
 
     def run(cmd_, arg_)
@@ -487,10 +491,12 @@ end
     end
 
     def pid; @proc.pid; end
+
     def is_running?; @proc.is_running?; end
+
     def exit_status; @proc.exitstatus; end
 
-    def wait(timeout, check_exit=true)
+    def wait(timeout, check_exit = true)
       t = Time.now
       begin
         if @proc.check_status
@@ -523,7 +529,7 @@ end
 
   def TestUtil.wait_for_file(filename, timeout)
     t = Time.now
-    while !File.readable?(filename) do
+    while !File.readable?(filename)
       sleep(0.1)
       if (Time.now() - t) >= timeout.to_f
         STDERR.puts "ERROR: could not find file '#{filename}'"

data/test/test_runner.rb

@@ -49,23 +49,23 @@ else
   ENV['RUBYLIB'] = incdirs.join(File::PATH_SEPARATOR)
   if is_win32
     ENV['PATH'] = [
-      File.directory?(ace_root) ? File.join(ENV['ACE_ROOT'], 'lib') : nil,
+      File.directory?(ace_root) ? File.join(ace_root, 'lib') : nil,
       File.expand_path(File.join(root_path, 'ext')),
       ENV['PATH']
       ].compact.join(File::PATH_SEPARATOR)
   elsif RUBY_PLATFORM =~ /darwin/
       ENV['DYLD_LIBRARY_PATH'] = [
-          File.directory?(ace_root) ? File.join(ENV['ACE_ROOT'], 'lib') : nil,
+          File.directory?(ace_root) ? File.join(ace_root, 'lib') : nil,
           ENV['DYLD_LIBRARY_PATH']
         ].compact.join(File::PATH_SEPARATOR)
       ENV['DYLD_FALLBACK_LIBRARY_PATH'] = [
-          File.directory?(ace_root) ? File.join(ENV['ACE_ROOT'], 'lib') : nil,
+          File.directory?(ace_root) ? File.join(ace_root, 'lib') : nil,
           File.expand_path(File.join(root_path, 'ext')),
           ENV['DYLD_FALLBACK_LIBRARY_PATH']
         ].compact.join(File::PATH_SEPARATOR)
   else
     ENV['LD_LIBRARY_PATH'] = [
-        File.directory?(ace_root) ? File.join(ENV['ACE_ROOT'], 'lib') : nil,
+        File.directory?(ace_root) ? File.join(ace_root, 'lib') : nil,
         ENV['LD_LIBRARY_PATH']
       ].compact.join(File::PATH_SEPARATOR)
   end
@@ -126,7 +126,7 @@ module TestFinder
           puts dir
         end
       else
-        Dir.glob(File.join(path, "*")) {|psub| self.process_directory(psub)}
+        Dir.glob(File.join(path, '*')) {|psub| self.process_directory(psub)}
       end
     end
   end
@@ -136,25 +136,25 @@ module TestFinder
     script_name = File.basename($0)
     opts.banner = "Usage: #{script_name} #{/r2corba/ =~ script_name ? 'test ' : nil}[options]"
 
-    opts.separator ""
+    opts.separator ''
 
-    opts.on("-x MATCH", "--exclude=MATCH",
-            "Do not run tests matching MATCH.",
-            "Default: nil") { |v| (OPTIONS[:exclude] ||= []) << v.to_s }
-    opts.on("-r MATCH", "--run=MATCH",
-            "Only run tests matching MATCH.",
-            "Default: nil (run all)") { |v| (OPTIONS[:runonly] ||= []) << v.to_s }
+    opts.on('-x MATCH', '--exclude=MATCH',
+            'Do not run tests matching MATCH.',
+            'Default: nil') { |v| (OPTIONS[:exclude] ||= []) << v.to_s }
+    opts.on('-r MATCH', '--run=MATCH',
+            'Only run tests matching MATCH.',
+            'Default: nil (run all)') { |v| (OPTIONS[:runonly] ||= []) << v.to_s }
     opts.on('-l', '--list',
             'List tests, do not run.',
-            "Default: off") { OPTIONS[:listonly] = true }
-    opts.on("-d",
-            "Run with debugging output.",
+            'Default: off') { OPTIONS[:listonly] = true }
+    opts.on('-d',
+            'Run with debugging output.',
             "Default: ENV['R2CORBA_DEBUG'].nil? ? false : true") { OPTIONS[:debug] = true }
 
-    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!(argv)
 
@@ -170,7 +170,7 @@ module TestFinder
     end
 
     if OPTIONS[:runonly].nil?
-      Dir.glob(File.join(TestFinder::ROOT, "*")) do |p|
+      Dir.glob(File.join(TestFinder::ROOT, '*')) do |p|
         TestFinder.process_directory(p)
       end
     else