r2corba 1.4.1-x86-mingw32 → 1.5.1-x86-mingw32

data/test/Exceptions/client.rb

@@ -1,118 +1,118 @@
-#--------------------------------------------------------------------
-#
-# Author: Martin Corino
-#
-# 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'
-require 'lib/assert.rb'
-include TestUtil::Assertions
-
-OPTIONS = {
-  :use_implement => false,
-  :orb_debuglevel => 0,
-  :iorfile => 'file://server.ior'
-}
-
-ARGV.options do |opts|
-    script_name = File.basename($0)
-    opts.banner = "Usage: ruby #{script_name} [options]"
-
-    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.separator ""
-
-    opts.on("-h", "--help",
-            "Show this help message.") { puts opts; exit }
-
-    opts.parse!
-end
-
-if OPTIONS[:use_implement]
-  require 'corba'
-  CORBA.implement('Test.idl', OPTIONS)
-else
-  require 'TestC.rb'
-end
-
-orb = CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel]], 'myORB')
-
-begin
-
-  obj = orb.string_to_object(OPTIONS[:iorfile])
-
-  hello_obj = Test::Hello._narrow(obj)
-
-  3.times { |i|
-    begin
-      hello_obj.test_exception
-    rescue Test::ExOne => ex1
-      assert "ERROR: got exception Test::ExOne when not expected" do
-        (i % 3) == 0 && ex1.code == (i+1)
-      end
-      puts "Caught expected exception Test::ExOne{why=#{ex1.why},code=#{ex1.code})"
-    rescue CORBA::UNKNOWN => exu
-      assert "ERROR: got unexpected unknown userexception" do
-        (i % 3) == 1
-      end
-      puts "Caught expected unknown userexception"
-    rescue Exception => ex
-      assert "ERROR: unknown exception caught\n#{ex}", false
-    else
-      assert_not "ERROR: no exception caught where one was expected" do
-        (i % 3) != 2
-      end
-    end
-  }
-
-  assert_except 'ERROR: expected exception', Test::ExOne do
-    hello_obj.myString
-  end
-
-  hello_obj.myString = 'test'
-
-  assert 'ERROR', 'test' == hello_obj.myString
-
-
-  assert_except 'ERROR: expected exception', Test::ExOne do
-    hello_obj.myCount = 200 # can be max 100
-  end
-
-
-  assert_except 'ERROR: expected exception', Test::ExOne do
-    hello_obj.myResult  # myCount needs to be set successfully first
-  end
-
-  hello_obj.myCount = 33
-
-  assert 'ERROR', 99 == hello_obj.myResult
-
-  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()
-
+#--------------------------------------------------------------------
+#
+# Author: Martin Corino
+#
+# 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'
+require 'lib/assert.rb'
+include TestUtil::Assertions
+
+OPTIONS = {
+  :use_implement => false,
+  :orb_debuglevel => 0,
+  :iorfile => 'file://server.ior'
+}
+
+ARGV.options do |opts|
+    script_name = File.basename($0)
+    opts.banner = "Usage: ruby #{script_name} [options]"
+
+    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.separator ""
+
+    opts.on("-h", "--help",
+            "Show this help message.") { puts opts; exit }
+
+    opts.parse!
+end
+
+if OPTIONS[:use_implement]
+  require 'corba'
+  CORBA.implement('Test.idl', OPTIONS)
+else
+  require 'TestC.rb'
+end
+
+orb = CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel]], 'myORB')
+
+begin
+
+  obj = orb.string_to_object(OPTIONS[:iorfile])
+
+  hello_obj = Test::Hello._narrow(obj)
+
+  3.times { |i|
+    begin
+      hello_obj.test_exception
+    rescue Test::ExOne => ex1
+      assert "ERROR: got exception Test::ExOne when not expected" do
+        (i % 3) == 0 && ex1.code == (i+1)
+      end
+      puts "Caught expected exception Test::ExOne{why=#{ex1.why},code=#{ex1.code})"
+    rescue CORBA::UNKNOWN => exu
+      assert "ERROR: got unexpected unknown userexception" do
+        (i % 3) == 1
+      end
+      puts "Caught expected unknown userexception"
+    rescue Exception => ex
+      assert "ERROR: unknown exception caught\n#{ex}", false
+    else
+      assert_not "ERROR: no exception caught where one was expected" do
+        (i % 3) != 2
+      end
+    end
+  }
+
+  assert_except 'ERROR: expected exception', Test::ExOne do
+    hello_obj.myString
+  end
+
+  hello_obj.myString = 'test'
+
+  assert 'ERROR', 'test' == hello_obj.myString
+
+
+  assert_except 'ERROR: expected exception', Test::ExOne do
+    hello_obj.myCount = 200 # can be max 100
+  end
+
+
+  assert_except 'ERROR: expected exception', Test::ExOne do
+    hello_obj.myResult  # myCount needs to be set successfully first
+  end
+
+  hello_obj.myCount = 33
+
+  assert 'ERROR', 99 == hello_obj.myResult
+
+  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/Exceptions/run_test.rb

@@ -1,69 +1,69 @@
-#--------------------------------------------------------------------
-#
-# Author: Martin Corino
-#
-# 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
-#--------------------------------------------------------------------
-
-OPTIONS = {
-  :debug_opt => '',
-  :use_implement => '--use-implement'
-}
-
-require 'optparse'
-
-ARGV.options do |opts|
-    script_name = File.basename($0)
-    opts.banner = "Usage: ruby #{script_name} [options]"
-
-    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.separator ""
-
-    opts.on("-h", "--help",
-            "Show this help message.") { puts opts; exit }
-
-    opts.parse!
-end
-
-require 'lib/test.rb'
-include TestUtil
-
-ior_file = 'server.ior'
-
-TestUtil.remove_file(ior_file)
-
-srv = Test.new
-
-exit(255) if !srv.run('server.rb', "--o #{ior_file} #{OPTIONS[:debug_opt]} #{OPTIONS[:use_implement]}")
-
-TestUtil.wait_for_file(ior_file, 400)
-
-clt = Test.new
-
-if !clt.run('client.rb', "--k file://#{ior_file} #{OPTIONS[:debug_opt]} #{OPTIONS[:use_implement]}")
-  srv.kill(100)
-  exit(255)
-end
-
-exrc = clt.wait(400)
-
-if exrc ==0
-  srv.wait(400)
-else
-  srv.wait_term(400)
-end
-
-exit(exrc)
+#--------------------------------------------------------------------
+#
+# Author: Martin Corino
+#
+# 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
+#--------------------------------------------------------------------
+
+OPTIONS = {
+  :debug_opt => '',
+  :use_implement => '--use-implement'
+}
+
+require 'optparse'
+
+ARGV.options do |opts|
+    script_name = File.basename($0)
+    opts.banner = "Usage: ruby #{script_name} [options]"
+
+    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.separator ""
+
+    opts.on("-h", "--help",
+            "Show this help message.") { puts opts; exit }
+
+    opts.parse!
+end
+
+require 'lib/test.rb'
+include TestUtil
+
+ior_file = 'server.ior'
+
+TestUtil.remove_file(ior_file)
+
+srv = Test.new
+
+exit(255) if !srv.run('server.rb', "--o #{ior_file} #{OPTIONS[:debug_opt]} #{OPTIONS[:use_implement]}")
+
+TestUtil.wait_for_file(ior_file, 400)
+
+clt = Test.new
+
+if !clt.run('client.rb', "--k file://#{ior_file} #{OPTIONS[:debug_opt]} #{OPTIONS[:use_implement]}")
+  srv.kill(100)
+  exit(255)
+end
+
+exrc = clt.wait(400)
+
+if exrc ==0
+  srv.wait(400)
+else
+  srv.wait_term(400)
+end
+
+exit(exrc)

data/test/Exceptions/server.ior

@@ -1 +1 @@
-IOR:010000001300000049444c3a546573742f48656c6c6f3a312e30000001000000000000006c000000010102650d0000003137322e31362e372e323438002085051b00000014010f005253545bfe045220a107000000000001000000010000005202000000000000000800000001032300004f41540100000018000000010000000100010001000000010001050901010000000000
+IOR:010000001300000049444c3a546573742f48656c6c6f3a312e30000001000000000000006c000000010102000d0000003137322e31362e362e3137380000d2dc1b00000014010f0052535463b2d354309503000000000001000000010000000002000000000000000800000001c7cd01004f4154010000001800000001c7cd010100010001000000010001050901010000000000

data/test/Exceptions/server.rb

@@ -1,131 +1,131 @@
-#--------------------------------------------------------------------
-#
-# Author: Martin Corino
-#
-# 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'
-
-OPTIONS = {
-  :use_implement => false,
-  :orb_debuglevel => 0,
-  :iorfile => 'server.ior'
-}
-
-ARGV.options do |opts|
-    script_name = File.basename($0)
-    opts.banner = "Usage: ruby #{script_name} [options]"
-
-    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.separator ""
-
-    opts.on("-h", "--help",
-            "Show this help message.") { puts opts; exit }
-
-    opts.parse!
-end
-
-if OPTIONS[:use_implement]
-  require 'corba/poa'
-  CORBA.implement('Test.idl', OPTIONS, CORBA::IDL::SERVANT_INTF)
-else
-  require 'TestS.rb'
-end
-
-class MyHello < POA::Test::Hello
-  def initialize(orb)
-    @orb = orb
-    @nex = 0
-  end
-
-  def test_exception()
-    @nex += 1
-    case (@nex % 3)
-    when 1
-      x = Test::ExOne.new
-      x.why = 'Because I want it'
-      x.code = @nex
-      raise x
-    when 2
-      raise Test::ExBoo.new(Test::ExBoo::LOUD)
-    else
-    end
-  end
-
-  def myString
-    raise Test::ExOne.new('Need to set string first.', 1) unless @mystr
-    @mystr
-  end
-
-  def myString=(s)
-    @mystr = s.to_s
-  end
-
-  def myCount
-    @mycnt || 0
-  end
-
-  def myCount=(c)
-    raise Test::ExOne.new('Value out of bounds', 2) unless c.to_i < 100
-    @mycnt = c.to_i
-  end
-
-  def myResult
-    raise Test::ExOne.new('Need to set myCount first.', 1) unless @mycnt
-    @mycnt * 3
-  end
-
-  def shutdown()
-    @orb.shutdown()
-  end
-end #of servant MyHello
-
-orb = CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel]], 'myORB')
-
-obj = orb.resolve_initial_references('RootPOA')
-
-root_poa = PortableServer::POA._narrow(obj)
-
-poa_man = root_poa.the_POAManager
-
-poa_man.activate
-
-hello_srv = MyHello.new(orb)
-
-hello_obj = hello_srv._this()
-
-hello_ior = orb.object_to_string(hello_obj)
-
-open(OPTIONS[:iorfile], 'w') { |io|
-  io.write hello_ior
-}
-
-Signal.trap('INT') do
-  puts "SIGINT - shutting down ORB..."
-  orb.shutdown()
-end
-
-if Signal.list.has_key?('USR2')
-  Signal.trap('USR2', 'EXIT')
-end
-
-orb.run
-
-exit 0
+#--------------------------------------------------------------------
+#
+# Author: Martin Corino
+#
+# 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'
+
+OPTIONS = {
+  :use_implement => false,
+  :orb_debuglevel => 0,
+  :iorfile => 'server.ior'
+}
+
+ARGV.options do |opts|
+    script_name = File.basename($0)
+    opts.banner = "Usage: ruby #{script_name} [options]"
+
+    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.separator ""
+
+    opts.on("-h", "--help",
+            "Show this help message.") { puts opts; exit }
+
+    opts.parse!
+end
+
+if OPTIONS[:use_implement]
+  require 'corba/poa'
+  CORBA.implement('Test.idl', OPTIONS, CORBA::IDL::SERVANT_INTF)
+else
+  require 'TestS.rb'
+end
+
+class MyHello < POA::Test::Hello
+  def initialize(orb)
+    @orb = orb
+    @nex = 0
+  end
+
+  def test_exception()
+    @nex += 1
+    case (@nex % 3)
+    when 1
+      x = Test::ExOne.new
+      x.why = 'Because I want it'
+      x.code = @nex
+      raise x
+    when 2
+      raise Test::ExBoo.new(Test::ExBoo::LOUD)
+    else
+    end
+  end
+
+  def myString
+    raise Test::ExOne.new('Need to set string first.', 1) unless @mystr
+    @mystr
+  end
+
+  def myString=(s)
+    @mystr = s.to_s
+  end
+
+  def myCount
+    @mycnt || 0
+  end
+
+  def myCount=(c)
+    raise Test::ExOne.new('Value out of bounds', 2) unless c.to_i < 100
+    @mycnt = c.to_i
+  end
+
+  def myResult
+    raise Test::ExOne.new('Need to set myCount first.', 1) unless @mycnt
+    @mycnt * 3
+  end
+
+  def shutdown()
+    @orb.shutdown()
+  end
+end #of servant MyHello
+
+orb = CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel]], 'myORB')
+
+obj = orb.resolve_initial_references('RootPOA')
+
+root_poa = PortableServer::POA._narrow(obj)
+
+poa_man = root_poa.the_POAManager
+
+poa_man.activate
+
+hello_srv = MyHello.new(orb)
+
+hello_obj = hello_srv._this()
+
+hello_ior = orb.object_to_string(hello_obj)
+
+open(OPTIONS[:iorfile], 'w') { |io|
+  io.write hello_ior
+}
+
+Signal.trap('INT') do
+  puts "SIGINT - shutting down ORB..."
+  orb.shutdown()
+end
+
+if Signal.list.has_key?('USR2')
+  Signal.trap('USR2', 'EXIT')
+end
+
+orb.run
+
+exit 0