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

data/test/IDL_Test/Test.idl

@@ -1,113 +1,113 @@
-/*--------------------------------------------------------------------
- * 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
- *--------------------------------------------------------------------*/
-
-#ifndef TEST_IDL_DEFINED
-#define TEST_IDL_DEFINED
-
-#include "orb.idl"
-
-#pragma prefix "Remedy"
-
-#include "Test_inc.idl"
-
-// these unknown pragmas should just be ignore without causing problems
-#pragma whatever "bla bla bla"
-#pragma itsaninteger 10001
-
-module Test
-{
-};
-
-// superfluous second include
-#include "Test_inc.idl"
-
-# define ZERO 0
-# define FIRST ZERO
-# define SECOND 1
-
-#define VOID void
-
-#define NUMBER 12345
-
-#define STRING "hello"
-
-/// Put the interfaces in a module, to avoid global namespace pollution
-module Test
-{
-#if FIRST < SECOND
-  struct S1
-  {
-    long m_one;
-    double m_two;
-    string m_three;
-    struct S2 {
-      boolean m_b;
-    }      m_four;
-  };
-#endif
-
-  struct R1;
-
-  typedef sequence<R1> R1Seq;
-
-  struct R1
-  {
-    R1Seq m_recurseq;
-  };
-
-  const long MyNum = NUMBER;
-  const string MyString = STRING;
-
-  /// A very simple interface
-  interface Hello : ::Types::Noop
-  {
-    void super (); /// Ruby keyword
-
-    /// A method to shutdown the ORB
-    /**
-     * This method is used to simplify the test shutdown process
-     */
-    oneway VOID shutdown ();
-  };
-};
-
-#endif // TEST_IDL_DEFINED
-
-module i1
-{
-  interface if1
-  {
-    string getStr();
-  };
-};
-
-module i2
-{
-  typeprefix ::i2 "MyPrefix";
-
-  interface if2 : ::i1::if1
-  {
-    typeid if2 "IDL:MyIF2:0.1";
-
-    string getstr2();
-  };
-
-  interface if3 : ::i2::if2
-  {
-    string getstr3();
-  };
-};
-
-
-
-#pragma ID Test::S1 "IDL:Test_S1:1.1"
-#pragma version Test::S1::S2 1.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
+ *--------------------------------------------------------------------*/
+
+#ifndef TEST_IDL_DEFINED
+#define TEST_IDL_DEFINED
+
+#include "orb.idl"
+
+#pragma prefix "Remedy"
+
+#include "Test_inc.idl"
+
+// these unknown pragmas should just be ignore without causing problems
+#pragma whatever "bla bla bla"
+#pragma itsaninteger 10001
+
+module Test
+{
+};
+
+// superfluous second include
+#include "Test_inc.idl"
+
+# define ZERO 0
+# define FIRST ZERO
+# define SECOND 1
+
+#define VOID void
+
+#define NUMBER 12345
+
+#define STRING "hello"
+
+/// Put the interfaces in a module, to avoid global namespace pollution
+module Test
+{
+#if FIRST < SECOND
+  struct S1
+  {
+    long m_one;
+    double m_two;
+    string m_three;
+    struct S2 {
+      boolean m_b;
+    }      m_four;
+  };
+#endif
+
+  struct R1;
+
+  typedef sequence<R1> R1Seq;
+
+  struct R1
+  {
+    R1Seq m_recurseq;
+  };
+
+  const long MyNum = NUMBER;
+  const string MyString = STRING;
+
+  /// A very simple interface
+  interface Hello : ::Types::Noop
+  {
+    void super (); /// Ruby keyword
+
+    /// A method to shutdown the ORB
+    /**
+     * This method is used to simplify the test shutdown process
+     */
+    oneway VOID shutdown ();
+  };
+};
+
+#endif // TEST_IDL_DEFINED
+
+module i1
+{
+  interface if1
+  {
+    string getStr();
+  };
+};
+
+module i2
+{
+  typeprefix ::i2 "MyPrefix";
+
+  interface if2 : ::i1::if1
+  {
+    typeid if2 "IDL:MyIF2:0.1";
+
+    string getstr2();
+  };
+
+  interface if3 : ::i2::if2
+  {
+    string getstr3();
+  };
+};
+
+
+
+#pragma ID Test::S1 "IDL:Test_S1:1.1"
+#pragma version Test::S1::S2 1.0
+

data/test/IDL_Test/Test_inc.idl

@@ -1,17 +1,17 @@
-
-#ifndef R2C_TEST_INC_IDL
-#define R2C_TEST_INC_IDL
-
-module Types
-{
-
-  typedef string TString;
-
-  interface Noop
-  {
-    /// Return a simple string
-    string get_string ();
-  };
-};
-
-#endif
+
+#ifndef R2C_TEST_INC_IDL
+#define R2C_TEST_INC_IDL
+
+module Types
+{
+
+  typedef string TString;
+
+  interface Noop
+  {
+    /// Return a simple string
+    string get_string ();
+  };
+};
+
+#endif

data/test/IDL_Test/client.rb

@@ -1,102 +1,102 @@
-#--------------------------------------------------------------------
-#
-# 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
-
-# tests to test preprocessor processing
-
-assert "ERROR: struct Test::S1 not defined (correctly)!" do
-  Test.const_defined?('S1') and Test::S1.ancestors.include?(CORBA::Portable::Struct)
-end
-
-assert "ERROR: Test::MyNum constant not defined (correctly)!" do
-  Test.const_defined?('MyNum') and Test::MyNum == 12345
-end
-
-assert "ERROR: Test::MyString constant not defined (correctly)!" do
-  Test.const_defined?('MyString') and Test::MyString == 'hello'
-end
-
-# test results of 'typeprefix' and 'typeid'
-
-assert "ERROR: typeprefix not correctly handled", I2::If3._tc.id == "IDL:MyPrefix/i2/if3:1.0"
-
-assert "ERROR: typeid not correctly handled", I2::If2._tc.id == "IDL:MyIF2:0.1"
-
-# CORBA IDL tests
-
-orb = CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel]], 'myORB')
-
-begin
-
-  obj = orb.string_to_object(OPTIONS[:iorfile])
-
-  hello_obj = Test::Hello._narrow(obj)
-
-  hello_obj.r_super()
-
-  the_string = hello_obj.get_string()
-
-  puts "string returned <#{the_string}>"
-
-  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
+#--------------------------------------------------------------------
+#
+# 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
+
+# tests to test preprocessor processing
+
+assert "ERROR: struct Test::S1 not defined (correctly)!" do
+  Test.const_defined?('S1') and Test::S1.ancestors.include?(CORBA::Portable::Struct)
+end
+
+assert "ERROR: Test::MyNum constant not defined (correctly)!" do
+  Test.const_defined?('MyNum') and Test::MyNum == 12345
+end
+
+assert "ERROR: Test::MyString constant not defined (correctly)!" do
+  Test.const_defined?('MyString') and Test::MyString == 'hello'
+end
+
+# test results of 'typeprefix' and 'typeid'
+
+assert "ERROR: typeprefix not correctly handled", I2::If3._tc.id == "IDL:MyPrefix/i2/if3:1.0"
+
+assert "ERROR: typeid not correctly handled", I2::If2._tc.id == "IDL:MyIF2:0.1"
+
+# CORBA IDL tests
+
+orb = CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel]], 'myORB')
+
+begin
+
+  obj = orb.string_to_object(OPTIONS[:iorfile])
+
+  hello_obj = Test::Hello._narrow(obj)
+
+  hello_obj.r_super()
+
+  the_string = hello_obj.get_string()
+
+  puts "string returned <#{the_string}>"
+
+  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