r2corba 1.4.1 → 1.5.5

data/test/Multi_Threading/Multiple_ORB/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'
@@ -26,13 +25,13 @@ ARGV.options do |opts|
 
     opts.on("--o IORFILE",
             "Set IOR base filename.",
-            "Default: 'server'") { |v| OPTIONS[:iorfile]=v }
+            "Default: 'server'") { |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/Multi_Threading/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
@@ -16,7 +15,7 @@ module Test
   interface Hello
   {
     /// Return a simple string
-    string get_string ();
+    string get_string (in long tid);
 
     /// A method to shutdown the ORB
     /**

data/test/Multi_Threading/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'
@@ -28,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 ""
 
@@ -59,19 +58,24 @@ begin
 
   hello_obj = Test::Hello._narrow(obj)
 
-  clt_trds = (0..1).collect do |i|
-    Thread.new(i) do |i_|
-      10.times do
-        the_string = hello_obj.get_string()
+  unless defined?(JRUBY_VERSION) && CORBA::Native::Jacorb::MAJOR_VERSION == 3 &&
+      ([4, 5].include? CORBA::Native::Jacorb::MINOR_VERSION)
+    ## JacORB 3.4 introduced a bug which prevents this test from succeeding
+    ## JacORB 3.6 will be released with a fix for this
+    clt_trds = (0..1).collect do |i|
+      Thread.new(i) do |i_|
+        10.times do
+          the_string = hello_obj.get_string(i_)
 
-        puts "[thread \##{i_}] string returned <#{the_string}>"
+          puts "[thread \##{i_}] string returned <#{the_string}>"
 
-        Thread.pass
-      end
-   end
-  end
+          Thread.pass
+        end
+     end
+    end
 
-  clt_trds.each { |t| t.join }
+    clt_trds.each { |t| t.join }
+  end
 
   hello_obj.shutdown()
 

data/test/Multi_Threading/Simple/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 = {
@@ -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/Multi_Threading/Simple/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'
@@ -26,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 ""
 
@@ -54,8 +53,8 @@ class MyHello < POA::Test::Hello
     @orb = orb
   end
 
-  def get_string()
-    "[#{Thread.current}] Hello there!"
+  def get_string(tid)
+    "[server #{Thread.current}] Hello there thread \##{tid}!"
   end
 
   def shutdown()
@@ -115,4 +114,4 @@ else
   end
 
   orb_trds.each {|t| t.join }
-end
+end

data/test/Multi_Threading/Threads/Test.idl

@@ -1,7 +1,3 @@
-//
-// $Id: Test.idl 199 2011-01-14 16:53:02Z martin $
-//
-
 /// Put the interfaces in a module, to avoid global namespace pollution
 module Test
 {

data/test/Multi_Threading/Threads/client.rb

@@ -2,14 +2,11 @@
 #
 # Author: Martin Corino
 #
-# $Id: client.rb 279 2011-02-08 09:53:28Z martin $
-#
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the R2CORBA LICENSE which is
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 require 'optparse'
@@ -30,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 ""
 
@@ -56,25 +53,25 @@ end
 orb = CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel]], 'myORB')
 
 begin
-    
+
   obj = orb.string_to_object(OPTIONS[:iorfile])
-  
+
   hello_obj = Test::Hello._narrow(obj)
-  
+
   hello_strings = (1..10000).map {hello_obj.get_string}
 
   puts "Client - got #{hello_strings.length} strings."
 
   hello_obj.shutdown()
-  
+
   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)
 
 ensure
-    
+
   orb.destroy()
 
 end

data/test/Multi_Threading/Threads/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 = {
@@ -67,7 +66,7 @@ end
 
 exrc = clt.wait(400)
 
-if exrc ==0
+if exrc == 0
   srv.wait(400)
 else
   srv.wait_term(400)

data/test/Multi_Threading/Threads/server.rb

@@ -2,14 +2,11 @@
 #
 # Author: Martin Corino
 #
-# $Id: server.rb 279 2011-02-08 09:53:28Z martin $
-#
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the R2CORBA LICENSE which is
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 require 'optparse'
@@ -29,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("--w IORFILE",
             "Set Watchdog IOR filename.",
-            "Default: 'file://watchdog.ior'") { |v| OPTIONS[:watchdog_iorfile]=v }
+            "Default: 'file://watchdog.ior'") { |v| OPTIONS[:watchdog_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 ""
 
@@ -76,9 +73,9 @@ class MyHello < POA::Test::Hello
 
   def shutdown()
     @stop = true
+    @wdt.join
     @watchdog.shutdown()
     puts %Q{Server - pinged watchdog #{@count} times.}
-    @wdt.join
     @orb.shutdown()
   end
 end #of servant MyHello

data/test/Multi_Threading/Threads/watchdog.rb

@@ -16,13 +16,13 @@ ARGV.options do |opts|
 
     opts.on("--o IORFILE",
             "Set IOR filename.",
-            "Default: 'watchdog.ior'") { |v| OPTIONS[:iorfile]=v }
+            "Default: 'watchdog.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/Multiple_Servant_Interfaces/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/Multiple_Servant_Interfaces/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'
@@ -26,13 +25,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/Multiple_Servant_Interfaces/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 = {
@@ -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/Multiple_Servant_Interfaces/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'
@@ -26,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/Nil/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/Nil/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 = {

data/test/Nil/test.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'
@@ -17,7 +16,7 @@ include TestUtil::Assertions
 OPTIONS = {
   :use_implement => false,
   :orb_debuglevel => 0,
-  :ior => 'corbaname::foo'
+  :ior => 'foo'
 }
 
 ARGV.options do |opts|
@@ -28,13 +27,13 @@ ARGV.options do |opts|
 
     opts.on("--k IOR",
             "Set IOR.",
-            "Default: 'corbaname::foo'") { |v| OPTIONS[:ior]=v }
+            "Default: 'corbaname::foo'") { |v| OPTIONS[:ior] = 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 ""
 
@@ -54,11 +53,15 @@ end
 orb = CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel]], 'myORB')
 
 begin
-  tmp = orb.string_to_object(OPTIONS[:ior])
+  begin
+    tmp = orb.string_to_object(OPTIONS[:ior])
 
-  assert 'No Nil object reference returned on invalid IOR', CORBA.is_nil(tmp)
+    assert 'No Nil object reference returned on invalid IOR', CORBA.is_nil(tmp)
 
-  assert 'No Nil object returned on invalid IOR', tmp.nil?
+    assert 'No Nil object returned on invalid IOR', tmp.nil?
+  rescue CORBA::INV_OBJREF
+    tmp = nil
+  end
 
   assert 'No Nil object reference returned on #_narrow of nil', CORBA.is_nil(Test::Hello._narrow(tmp))
 
@@ -75,4 +78,3 @@ begin
 ensure
   orb.destroy()
 end
-