r2corba 1.6.2 → 1.7.0

data/test/Param_Test/server.rb

@@ -12,9 +12,9 @@
 require 'optparse'
 
 OPTIONS = {
-  :use_implement => false,
-  :orb_debuglevel => 0,
-  :iorfile => 'server.ior'
+  use_implement: false,
+  orb_debuglevel: 0,
+  iorfile: 'server.ior'
 }
 
 ARGV.options do |opts|
@@ -256,7 +256,7 @@ class MyHello < POA::Test::Hello
   end
 
   def shutdown()
-    @orb.shutdown()
+    @orb.shutdown
   end
 end # of servant Hello
 
@@ -279,13 +279,13 @@ hello_obj = root_poa.id_to_reference(hello_oid)
 
 hello_ior = orb.object_to_string(hello_obj)
 
-open(OPTIONS[:iorfile], 'w') { |io|
+File.open(OPTIONS[:iorfile], 'w') { |io|
   io.write hello_ior
 }
 
 Signal.trap('INT') do
   puts 'SIGINT - shutting down ORB...'
-  orb.shutdown()
+  orb.shutdown
 end
 
 if Signal.list.has_key?('USR2')

data/test/Performance/Simple/client.rb

@@ -14,9 +14,9 @@ require 'lib/assert.rb'
 include TestUtil::Assertions
 
 OPTIONS = {
-  :use_implement => false,
-  :orb_debuglevel => 0,
-  :iorfile => 'file://server.ior'
+  use_implement: false,
+  orb_debuglevel: 0,
+  iorfile: 'file://server.ior'
 }
 
 ARGV.options do |opts|
@@ -74,16 +74,16 @@ begin
 
   STDERR.puts "*** Avg turnaround time per invocation = #{'%.2f' % (t_diff / 10)} msec"
 
-  hello_obj.shutdown()
+  hello_obj.shutdown
 
   assert_not 'ERROR: Object is reported nil!', CORBA::is_nil(hello_obj)
 
-  hello_obj._free_ref()
+  hello_obj._free_ref
 
   assert 'ERROR: Object is reported non-nil!', CORBA::is_nil(hello_obj)
 
 ensure
 
-  orb.destroy()
+  orb.destroy
 
 end

data/test/Performance/Simple/run_test.rb

@@ -10,8 +10,8 @@
 #--------------------------------------------------------------------
 
 OPTIONS = {
-  :debug_opt => '',
-  :use_implement => '--use-implement'
+  debug_opt: '',
+  use_implement: '--use-implement'
 }
 
 require 'optparse'

data/test/Performance/Simple/server.rb

@@ -12,9 +12,9 @@
 require 'optparse'
 
 OPTIONS = {
-  :use_implement => false,
-  :orb_debuglevel => 0,
-  :iorfile => 'server.ior'
+  use_implement: false,
+  orb_debuglevel: 0,
+  iorfile: 'server.ior'
 }
 
 ARGV.options do |opts|
@@ -58,7 +58,7 @@ class MyHello < POA::Test::Hello
   end
 
   def shutdown()
-    @orb.shutdown()
+    @orb.shutdown
   end
 end # of servant MyHello
 
@@ -74,17 +74,17 @@ poa_man.activate
 
 hello_srv = MyHello.new(orb)
 
-hello_obj = hello_srv._this()
+hello_obj = hello_srv._this
 
 hello_ior = orb.object_to_string(hello_obj)
 
-open(OPTIONS[:iorfile], 'w') { |io|
+File.open(OPTIONS[:iorfile], 'w') { |io|
   io.write hello_ior
 }
 
 Signal.trap('INT') do
   puts 'SIGINT - shutting down ORB...'
-  orb.shutdown()
+  orb.shutdown
 end
 
 if Signal.list.has_key?('USR2')

data/test/Policies/run_test.rb

@@ -10,8 +10,8 @@
 #--------------------------------------------------------------------
 
 OPTIONS = {
-  :debug_opt => '',
-  :use_implement => '--use-implement'
+  debug_opt: '',
+  use_implement: '--use-implement'
 }
 
 require 'optparse'

data/test/Policies/test.rb

@@ -14,8 +14,8 @@ require 'lib/assert.rb'
 include TestUtil::Assertions
 
 OPTIONS = {
-  :use_implement => false,
-  :orb_debuglevel => 0
+  use_implement: false,
+  orb_debuglevel: 0
 }
 
 ARGV.options do |opts|
@@ -57,7 +57,7 @@ class MyHello < POA::Test::Hello
   end
 
   def shutdown()
-    @orb.shutdown()
+    @orb.shutdown
   end
 end # of servant MyHello
 
@@ -138,5 +138,5 @@ begin
          obj._get_policy_overrides([BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE, Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE]).size == 1
 
 ensure
-  orb.destroy()
+  orb.destroy
 end

data/test/Timeout/client.rb

@@ -14,9 +14,9 @@ require 'lib/assert.rb'
 include TestUtil::Assertions
 
 OPTIONS = {
-  :use_implement => false,
-  :orb_debuglevel => 0,
-  :iorfile => 'file://server.ior'
+  use_implement: false,
+  orb_debuglevel: 0,
+  iorfile: 'file://server.ior'
 }
 
 ARGV.options do |opts|
@@ -123,7 +123,7 @@ begin
 
   simple_timeout_srv = Simple_Server._narrow(obj)
 
-  policies[0].destroy()
+  policies[0].destroy
   policies[0] = nil
 
   puts "client (#{Process.pid}) testing from #{Min_timeout} to #{Max_timeout} milliseconds"
@@ -135,7 +135,7 @@ begin
 
     puts "client (#{Process.pid}) Cleanup ORB/Thread/Object policies"
 
-    policies.clear()
+    policies.clear
     pol_man.set_policy_overrides(policies, CORBA::SET_OVERRIDE)
     pol_cur.set_policy_overrides(policies, CORBA::SET_OVERRIDE) if pol_cur
 
@@ -150,12 +150,12 @@ begin
 
     send_echo(Orb1, orb, simple_srv, t)
 
-    policies[0].destroy()
+    policies[0].destroy
 
     if pol_cur
       puts "client (#{Process.pid}) Set the thread policies"
 
-      policies.clear()
+      policies.clear
       policies << orb.create_policy(Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE,
                                     any_thread)
 
@@ -163,7 +163,7 @@ begin
 
       send_echo(Thread1, orb, simple_srv, t)
 
-      policies[0].destroy()
+      policies[0].destroy
     end
 
     puts "client (#{Process.pid}) Use the object policies"
@@ -174,13 +174,13 @@ begin
   puts "\n\n"
   puts "client (#{Process.pid}) Test completed, resynch with server"
 
-  policies.clear()
+  policies.clear
   pol_man.set_policy_overrides(policies, CORBA::SET_OVERRIDE)
   pol_cur.set_policy_overrides(policies, CORBA::SET_OVERRIDE) if pol_cur
 
   send_echo(None, orb, simple_srv, 0)
 
-  simple_srv.shutdown()
+  simple_srv.shutdown
 
   timeout_count_total = 0
   in_time_count_total = 0
@@ -201,6 +201,6 @@ begin
 
 ensure
 
-  orb.destroy()
+  orb.destroy
 
 end

data/test/Timeout/run_test.rb

@@ -10,8 +10,8 @@
 #--------------------------------------------------------------------
 
 OPTIONS = {
-  :debug_opt => '',
-  :use_implement => '--use-implement'
+  debug_opt: '',
+  use_implement: '--use-implement'
 }
 
 require 'optparse'

data/test/Timeout/server.rb

@@ -12,10 +12,10 @@
 require 'optparse'
 
 OPTIONS = {
-  :use_implement => false,
-  :orb_debuglevel => 0,
-  :iorfile => 'server.ior',
-  :iter_num => 10
+  use_implement: false,
+  orb_debuglevel: 0,
+  iorfile: 'server.ior',
+  iter_num: 10
 }
 
 ARGV.options do |opts|
@@ -72,7 +72,7 @@ class Simple_Server_i < POA::Simple_Server
 
   def shutdown()
     puts "server (#{Process.pid}) received shutdown request from client"
-    @orb.shutdown()
+    @orb.shutdown
   end
 end # of servant Simple_Server_i
 
@@ -88,21 +88,21 @@ poa_man.activate
 
 simple_srv = Simple_Server_i.new(orb)
 
-simple_ref = simple_srv._this()
+simple_ref = simple_srv._this
 
 ior = orb.object_to_string(simple_ref)
 
-open(OPTIONS[:iorfile], 'w') { |io|
+File.open(OPTIONS[:iorfile], 'w') { |io|
   io.write ior
 }
 
 Signal.trap('INT') do
   puts 'SIGINT - shutting down ORB...'
-  orb.shutdown()
+  orb.shutdown
 end
 
 if Signal.list.has_key?('USR2')
   Signal.trap('USR2', 'EXIT')
 end
 
-orb.run()
+orb.run

data/test/lib/test.rb

@@ -106,7 +106,7 @@ if defined?(JRUBY_VERSION)
           stat_ptr = FFI::MemoryPointer.new(:int, 1)
           tmp_pid = _wait(stat_ptr, pid, 0)
           if tmp_pid == pid
-            return [pid, stat_ptr.get_int()]
+            return [pid, stat_ptr.get_int]
           else
             return [pid, 0]
           end
@@ -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
@@ -189,7 +189,7 @@ if defined?(JRUBY_VERSION)
     def initialize(cmd_, arg_)
       @pid = nil
       @exitstatus = nil
-      @trd = Thread.start() do
+      @trd = Thread.start do
         exit_status = 0
         @pid = Exec.run(cmd_, arg_)
         if @pid
@@ -500,7 +500,7 @@ end
       t = Time.now
       begin
         if @proc.check_status
-          if (Time.now() - t) >= timeout.to_f
+          if (Time.now - t) >= timeout.to_f
             STDERR.puts "ERROR: KILLING #{@cmd}"
             @proc.kill
             return 255
@@ -531,7 +531,7 @@ end
     t = Time.now
     while !File.readable?(filename)
       sleep(0.1)
-      if (Time.now() - t) >= timeout.to_f
+      if (Time.now - t) >= timeout.to_f
         STDERR.puts "ERROR: could not find file '#{filename}'"
         return false
       end

data/test/test_runner.rb

@@ -23,12 +23,13 @@ is_win32 = (RB_CONFIG['target_os'] =~ /win32/ || RB_CONFIG['target_os'] =~ /ming
 
 root_path = File.expand_path(File.join(File.dirname(__FILE__), '..'))
 
-has_local_ridl = File.directory?(File.join(root_path, 'ridl'))
+ENV['RIDL_ROOT'] ||= File.expand_path(File.join(root_path, 'ridl'))
+has_local_ridl = File.directory?(ENV['RIDL_ROOT'])
 
 if defined?(JRUBY_VERSION)
   ENV['JACORB_HOME'] ||= File.expand_path(File.join(root_path, 'jacorb'))
   incdirs = [
-      has_local_ridl ? File.expand_path(File.join(root_path, 'ridl', 'lib')) : nil,
+      has_local_ridl ? File.expand_path(File.join(ENV['RIDL_ROOT'], 'lib')) : nil,
       File.expand_path(File.join(root_path, 'lib')),
       File.expand_path(File.join(root_path, 'ext')),
       File.expand_path(File.join(ENV['JACORB_HOME'], 'lib')),
@@ -40,7 +41,7 @@ else
   ace_root = ENV['ACE_ROOT'] || File.expand_path(File.join(root_path, 'ACE', 'ACE_wrappers'))
   ## setup the right environment for running tests
   incdirs = [
-      has_local_ridl ? File.expand_path(File.join(root_path, 'ridl', 'lib')) : nil,
+      has_local_ridl ? File.expand_path(File.join(ENV['RIDL_ROOT'], 'lib')) : nil,
       File.expand_path(File.join(root_path, 'lib')),
       File.expand_path(File.join(root_path, 'ext')),
       ENV['RUBYLIB'],
@@ -73,10 +74,10 @@ end
 
 module TestFinder
   OPTIONS = {
-    :exclude => nil,
-    :runonly => nil,
-    :listonly => false,
-    :debug => !ENV['R2CORBA_DEBUG'].nil?
+    exclude: nil,
+    runonly: nil,
+    listonly: false,
+    debug: !ENV['R2CORBA_DEBUG'].nil?
     }
 
   ROOT = File.expand_path(File.dirname(__FILE__))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: r2corba
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.7.0
 platform: ruby
 authors:
 - Martin Corino
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-21 00:00:00.000000000 Z
+date: 2023-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ridl