diff options
| author | Michi Henning <michi@zeroc.com> | 2004-09-01 04:21:34 +0000 |
|---|---|---|
| committer | Michi Henning <michi@zeroc.com> | 2004-09-01 04:21:34 +0000 |
| commit | d05fc9fb6693969569d887620feb877da61bcd6d (patch) | |
| tree | 97f6718e86d9a08d415dc6f8811c983a8fe78dc7 | |
| parent | Changed generated code to make it impossible for a client to receive an (diff) | |
| download | ice-d05fc9fb6693969569d887620feb877da61bcd6d.tar.bz2 ice-d05fc9fb6693969569d887620feb877da61bcd6d.tar.xz ice-d05fc9fb6693969569d887620feb877da61bcd6d.zip | |
Deprecation of global Slice definitions.
106 files changed, 498 insertions, 295 deletions
diff --git a/cs/CHANGES b/cs/CHANGES index a3ed21d9ac3..26a82007bfa 100644 --- a/cs/CHANGES +++ b/cs/CHANGES @@ -1,6 +1,18 @@ Changes since version 1.5.1 --------------------------- +- The documentation has always stated that same-named constructs + cannot be directly nested inside each other. (For example, a + module `M' cannot contain a constant named `M'. The slice2cs + compiler did not enforce this correctly up to now for modules + containing constructs with the same name as the enclosing module. + This has been fixed and now results in a diagnostic. + +- The slice2cs compiler now disallows Slice definitions at global + scope: only modules can be defined at global scope. Everything else + (constants, classes, interfaces, etc.) must be defined inside a + module. + - Several demos used Slice classes where interface were more appropriate. This has been fixed. diff --git a/cs/demo/Glacier/session/Client.cs b/cs/demo/Glacier/session/Client.cs index 7576c7a96e2..2484357ce89 100755 --- a/cs/demo/Glacier/session/Client.cs +++ b/cs/demo/Glacier/session/Client.cs @@ -9,6 +9,7 @@ using System;
using System.Diagnostics;
+using Demo;
public class Client
{
diff --git a/cs/demo/Glacier/session/HelloSession.ice b/cs/demo/Glacier/session/HelloSession.ice index b4c1723bd94..140ee60222d 100644 --- a/cs/demo/Glacier/session/HelloSession.ice +++ b/cs/demo/Glacier/session/HelloSession.ice @@ -12,9 +12,14 @@ #include <Glacier/Session.ice> +module Demo +{ + interface HelloSession extends Glacier::Session { void hello(); }; +}; + #endif diff --git a/cs/demo/Glacier/session/HelloSessionI.cs b/cs/demo/Glacier/session/HelloSessionI.cs index 2e6dffc1356..7c600981695 100755 --- a/cs/demo/Glacier/session/HelloSessionI.cs +++ b/cs/demo/Glacier/session/HelloSessionI.cs @@ -7,6 +7,8 @@ //
// **********************************************************************
+using Demo;
+
sealed class HelloSessionI : _HelloSessionDisp
{
public HelloSessionI(string userId, HelloSessionManagerI manager)
diff --git a/cs/demo/Ice/callback/Callback.ice b/cs/demo/Ice/callback/Callback.ice index 6138731b5c0..5041acad7c2 100644 --- a/cs/demo/Ice/callback/Callback.ice +++ b/cs/demo/Ice/callback/Callback.ice @@ -10,6 +10,9 @@ #ifndef CALLBACK_ICE #define CALLBACK_ICE +module Demo +{ + interface CallbackReceiver { void callback(); @@ -21,4 +24,6 @@ interface Callback void shutdown(); }; +}; + #endif diff --git a/cs/demo/Ice/callback/CallbackClient.cs b/cs/demo/Ice/callback/CallbackClient.cs index f573b8d3283..db5b1944b5c 100755 --- a/cs/demo/Ice/callback/CallbackClient.cs +++ b/cs/demo/Ice/callback/CallbackClient.cs @@ -7,8 +7,8 @@ // // ********************************************************************** - using System; +using Demo; class CallbackClient : Ice.Application { diff --git a/cs/demo/Ice/callback/CallbackI.cs b/cs/demo/Ice/callback/CallbackI.cs index 987e5cd618f..79860850768 100755 --- a/cs/demo/Ice/callback/CallbackI.cs +++ b/cs/demo/Ice/callback/CallbackI.cs @@ -7,6 +7,8 @@ // // ********************************************************************** +using Demo; + public sealed class CallbackI : _CallbackDisp { public override void initiateCallback(CallbackReceiverPrx proxy, Ice.Current current) diff --git a/cs/demo/Ice/callback/CallbackReceiverI.cs b/cs/demo/Ice/callback/CallbackReceiverI.cs index 2a628284929..c895747e420 100755 --- a/cs/demo/Ice/callback/CallbackReceiverI.cs +++ b/cs/demo/Ice/callback/CallbackReceiverI.cs @@ -7,6 +7,7 @@ // // ********************************************************************** +using Demo; public sealed class CallbackReceiverI : _CallbackReceiverDisp { diff --git a/cs/demo/Ice/callback/CallbackServer.cs b/cs/demo/Ice/callback/CallbackServer.cs index 437474eb66e..b40a4483a49 100755 --- a/cs/demo/Ice/callback/CallbackServer.cs +++ b/cs/demo/Ice/callback/CallbackServer.cs @@ -7,6 +7,7 @@ // // ********************************************************************** +using Demo; class CallbackServer : Ice.Application { diff --git a/cs/demo/Ice/hello/Client.cs b/cs/demo/Ice/hello/Client.cs index de46ee53b96..4dca7325603 100755 --- a/cs/demo/Ice/hello/Client.cs +++ b/cs/demo/Ice/hello/Client.cs @@ -8,6 +8,7 @@ // ********************************************************************** using System; +using Demo; public class Client { diff --git a/cs/demo/Ice/hello/Hello.ice b/cs/demo/Ice/hello/Hello.ice index 9b532a2e9a8..4ce83cbc4c1 100644 --- a/cs/demo/Ice/hello/Hello.ice +++ b/cs/demo/Ice/hello/Hello.ice @@ -10,10 +10,15 @@ #ifndef HELLO_ICE #define HELLO_ICE +module Demo +{ + interface Hello { nonmutating void sayHello(); idempotent void shutdown(); }; +}; + #endif diff --git a/cs/demo/Ice/hello/HelloI.cs b/cs/demo/Ice/hello/HelloI.cs index 20b3a0730ac..fe7ef3d63bc 100755 --- a/cs/demo/Ice/hello/HelloI.cs +++ b/cs/demo/Ice/hello/HelloI.cs @@ -7,6 +7,7 @@ // // ********************************************************************** +using Demo; public class HelloI : _HelloDisp { diff --git a/cs/demo/Ice/latency/Client.cs b/cs/demo/Ice/latency/Client.cs index 5a36c0e7432..d2b703cd0e8 100755 --- a/cs/demo/Ice/latency/Client.cs +++ b/cs/demo/Ice/latency/Client.cs @@ -7,8 +7,8 @@ // // ********************************************************************** - using System; +using Demo; public class Client { diff --git a/cs/demo/Ice/latency/Latency.ice b/cs/demo/Ice/latency/Latency.ice index 04c9673ec48..ba5af7216c7 100644 --- a/cs/demo/Ice/latency/Latency.ice +++ b/cs/demo/Ice/latency/Latency.ice @@ -10,8 +10,13 @@ #ifndef LATENCY_ICE #define LATENCY_ICE +module Demo +{ + class Ping { }; +}; + #endif diff --git a/cs/demo/Ice/latency/Server.cs b/cs/demo/Ice/latency/Server.cs index d94207874c5..4f18f5bcc3c 100755 --- a/cs/demo/Ice/latency/Server.cs +++ b/cs/demo/Ice/latency/Server.cs @@ -7,8 +7,8 @@ // // ********************************************************************** - using System; +using Demo; public class Server { diff --git a/cs/demo/Ice/nested/Nested.ice b/cs/demo/Ice/nested/Nested.ice index 916d80d0a12..4216d412f11 100644 --- a/cs/demo/Ice/nested/Nested.ice +++ b/cs/demo/Ice/nested/Nested.ice @@ -10,9 +10,14 @@ #ifndef NESTED_ICE #define NESTED_ICE +module Demo +{ + interface Nested { void nestedCall(int level, Nested* proxy); }; +}; + #endif diff --git a/cs/demo/Ice/nested/NestedClient.cs b/cs/demo/Ice/nested/NestedClient.cs index 1fd42685567..46d1b84b2b3 100755 --- a/cs/demo/Ice/nested/NestedClient.cs +++ b/cs/demo/Ice/nested/NestedClient.cs @@ -7,8 +7,8 @@ // // ********************************************************************** - using System; +using Demo; class NestedClient : Ice.Application { diff --git a/cs/demo/Ice/nested/NestedI.cs b/cs/demo/Ice/nested/NestedI.cs index 4442ccf468d..6c649edd0d5 100755 --- a/cs/demo/Ice/nested/NestedI.cs +++ b/cs/demo/Ice/nested/NestedI.cs @@ -7,6 +7,7 @@ // // ********************************************************************** +using Demo; class NestedI : _NestedDisp { diff --git a/cs/demo/Ice/nested/NestedServer.cs b/cs/demo/Ice/nested/NestedServer.cs index 94377194e4a..33dfc216ac5 100755 --- a/cs/demo/Ice/nested/NestedServer.cs +++ b/cs/demo/Ice/nested/NestedServer.cs @@ -7,6 +7,7 @@ // // ********************************************************************** +using Demo; class NestedServer : Ice.Application { diff --git a/cs/demo/Ice/throughput/Client.cs b/cs/demo/Ice/throughput/Client.cs index db21e17f746..6d419d98798 100755 --- a/cs/demo/Ice/throughput/Client.cs +++ b/cs/demo/Ice/throughput/Client.cs @@ -7,8 +7,8 @@ // // ********************************************************************** - using System; +using Demo; public class Client { diff --git a/cs/demo/Ice/throughput/Throughput.ice b/cs/demo/Ice/throughput/Throughput.ice index 20195e9924e..d0346f0dfd9 100644 --- a/cs/demo/Ice/throughput/Throughput.ice +++ b/cs/demo/Ice/throughput/Throughput.ice @@ -10,6 +10,9 @@ #ifndef THROUGHPUT_ICE #define THROUGHPUT_ICE +module Demo +{ + const int seqSize = 500000; sequence<byte> ByteSeq; @@ -21,4 +24,6 @@ interface Throughput ByteSeq echoByteSeq(ByteSeq seq); }; +}; + #endif diff --git a/cs/demo/Ice/throughput/ThroughputI.cs b/cs/demo/Ice/throughput/ThroughputI.cs index 6cbc3a53f51..e9423cad2df 100755 --- a/cs/demo/Ice/throughput/ThroughputI.cs +++ b/cs/demo/Ice/throughput/ThroughputI.cs @@ -7,6 +7,7 @@ // // ********************************************************************** +using Demo; public sealed class ThroughputI : _ThroughputDisp { diff --git a/cs/demo/Ice/value/Client.cs b/cs/demo/Ice/value/Client.cs index d521f5aed0a..5b06f0e292b 100755 --- a/cs/demo/Ice/value/Client.cs +++ b/cs/demo/Ice/value/Client.cs @@ -7,9 +7,9 @@ // // ********************************************************************** - using System; using System.Diagnostics; +using Demo; public class Client { diff --git a/cs/demo/Ice/value/DerivedPrinterI.cs b/cs/demo/Ice/value/DerivedPrinterI.cs index 99fa35b5313..d78dd7ed468 100755 --- a/cs/demo/Ice/value/DerivedPrinterI.cs +++ b/cs/demo/Ice/value/DerivedPrinterI.cs @@ -7,6 +7,7 @@ // // ********************************************************************** +using Demo; class DerivedPrinterI : DerivedPrinter { diff --git a/cs/demo/Ice/value/InitialI.cs b/cs/demo/Ice/value/InitialI.cs index c0500b4ec6f..0f8caadb9fa 100755 --- a/cs/demo/Ice/value/InitialI.cs +++ b/cs/demo/Ice/value/InitialI.cs @@ -7,6 +7,7 @@ // // ********************************************************************** +using Demo; class InitialI : Initial { diff --git a/cs/demo/Ice/value/PrinterI.cs b/cs/demo/Ice/value/PrinterI.cs index 5c6d51d4c74..dff9da73502 100755 --- a/cs/demo/Ice/value/PrinterI.cs +++ b/cs/demo/Ice/value/PrinterI.cs @@ -7,6 +7,7 @@ // // ********************************************************************** +using Demo; class PrinterI : Printer { diff --git a/cs/demo/Ice/value/Value.ice b/cs/demo/Ice/value/Value.ice index b8f03f2448b..22fbecbcf17 100644 --- a/cs/demo/Ice/value/Value.ice +++ b/cs/demo/Ice/value/Value.ice @@ -10,6 +10,9 @@ #ifndef VALUE_ICE #define VALUE_ICE +module Demo +{ + class Simple { string message; @@ -41,4 +44,6 @@ class Initial void throwDerivedPrinter() throws DerivedPrinterException; }; +}; + #endif diff --git a/cs/test/Glacier/starter/Callback.ice b/cs/test/Glacier/starter/Callback.ice index fb56ee553d1..7fe414331e9 100644 --- a/cs/test/Glacier/starter/Callback.ice +++ b/cs/test/Glacier/starter/Callback.ice @@ -10,6 +10,9 @@ #ifndef CALLBACK_ICE #define CALLBACK_ICE +module Test +{ + exception CallbackException { double someValue; @@ -34,4 +37,6 @@ class Callback void shutdown(); }; +}; + #endif diff --git a/cs/test/Glacier/starter/CallbackClient.cs b/cs/test/Glacier/starter/CallbackClient.cs index 062140ca559..11b74e7aa03 100755 --- a/cs/test/Glacier/starter/CallbackClient.cs +++ b/cs/test/Glacier/starter/CallbackClient.cs @@ -8,6 +8,7 @@ // **********************************************************************
using System;
+using Test;
class CallbackClient : Ice.Application
{
diff --git a/cs/test/Glacier/starter/CallbackI.cs b/cs/test/Glacier/starter/CallbackI.cs index eca86490cc7..d722e02c3b4 100755 --- a/cs/test/Glacier/starter/CallbackI.cs +++ b/cs/test/Glacier/starter/CallbackI.cs @@ -7,6 +7,8 @@ //
// **********************************************************************
+using Test;
+
sealed class CallbackI : Callback
{
internal CallbackI(Ice.Communicator communicator)
diff --git a/cs/test/Glacier/starter/CallbackReceiverI.cs b/cs/test/Glacier/starter/CallbackReceiverI.cs index fdcece66c57..0ea3f82dbf5 100755 --- a/cs/test/Glacier/starter/CallbackReceiverI.cs +++ b/cs/test/Glacier/starter/CallbackReceiverI.cs @@ -9,6 +9,7 @@ using System.Diagnostics;
using System.Threading;
+using Test;
sealed class CallbackReceiverI:CallbackReceiver
{
diff --git a/cs/test/Glacier/starter/CallbackServer.cs b/cs/test/Glacier/starter/CallbackServer.cs index ee7ae845ba8..81983939e30 100755 --- a/cs/test/Glacier/starter/CallbackServer.cs +++ b/cs/test/Glacier/starter/CallbackServer.cs @@ -7,6 +7,8 @@ //
// **********************************************************************
+using Test;
+
class CallbackServer : Ice.Application
{
public override int run(string[] args)
diff --git a/cs/test/Ice/adapterDeactivation/AllTests.cs b/cs/test/Ice/adapterDeactivation/AllTests.cs index 9ca3d373331..e2a494e65a9 100755 --- a/cs/test/Ice/adapterDeactivation/AllTests.cs +++ b/cs/test/Ice/adapterDeactivation/AllTests.cs @@ -7,8 +7,8 @@ // // ********************************************************************** - using System; +using Test; public class AllTests { @@ -20,7 +20,7 @@ public class AllTests } } - public static TestPrx allTests(Ice.Communicator communicator) + public static TestIntfPrx allTests(Ice.Communicator communicator) { Console.Out.Write("testing stringToProxy... "); Console.Out.Flush(); @@ -31,7 +31,7 @@ public class AllTests Console.Out.Write("testing checked cast... "); Console.Out.Flush(); - TestPrx obj = TestPrxHelper.checkedCast(@base); + TestIntfPrx obj = TestIntfPrxHelper.checkedCast(@base); test(obj != null); test(obj.Equals(@base)); Console.Out.WriteLine("ok"); diff --git a/cs/test/Ice/adapterDeactivation/Client.cs b/cs/test/Ice/adapterDeactivation/Client.cs index 1906e60c359..10593a12034 100755 --- a/cs/test/Ice/adapterDeactivation/Client.cs +++ b/cs/test/Ice/adapterDeactivation/Client.cs @@ -7,6 +7,7 @@ // // ********************************************************************** +using Test; public class Client { @@ -14,7 +15,7 @@ public class Client { public override int run(string[] args) { - TestPrx obj = AllTests.allTests(communicator()); + TestIntfPrx obj = AllTests.allTests(communicator()); return 0; } } diff --git a/cs/test/Ice/adapterDeactivation/Collocated.cs b/cs/test/Ice/adapterDeactivation/Collocated.cs index 3f0f855eaef..11ea57930d1 100755 --- a/cs/test/Ice/adapterDeactivation/Collocated.cs +++ b/cs/test/Ice/adapterDeactivation/Collocated.cs @@ -7,6 +7,7 @@ // // ********************************************************************** +using Test; public class Collocated { @@ -19,7 +20,7 @@ public class Collocated Ice.ServantLocator locator = new ServantLocatorI(); adapter.addServantLocator(locator, ""); - TestPrx obj = AllTests.allTests(communicator()); + TestIntfPrx obj = AllTests.allTests(communicator()); adapter.waitForDeactivate(); return 0; diff --git a/cs/test/Ice/adapterDeactivation/CookieI.cs b/cs/test/Ice/adapterDeactivation/CookieI.cs index 682e64e5b6a..f0ac8a59091 100755 --- a/cs/test/Ice/adapterDeactivation/CookieI.cs +++ b/cs/test/Ice/adapterDeactivation/CookieI.cs @@ -7,6 +7,7 @@ // // ********************************************************************** +using Test; public sealed class CookieI : Cookie { diff --git a/cs/test/Ice/adapterDeactivation/ServantLocatorI.cs b/cs/test/Ice/adapterDeactivation/ServantLocatorI.cs index b25a51c25ec..4e611dde594 100755 --- a/cs/test/Ice/adapterDeactivation/ServantLocatorI.cs +++ b/cs/test/Ice/adapterDeactivation/ServantLocatorI.cs @@ -7,8 +7,8 @@ // // ********************************************************************** - using System; +using Test; public sealed class ServantLocatorI : Ice.LocalObjectImpl, Ice.ServantLocator { diff --git a/cs/test/Ice/adapterDeactivation/Test.ice b/cs/test/Ice/adapterDeactivation/Test.ice index ca5e8103f04..96c306d46a7 100755 --- a/cs/test/Ice/adapterDeactivation/Test.ice +++ b/cs/test/Ice/adapterDeactivation/Test.ice @@ -10,7 +10,10 @@ #ifndef TEST_ICE #define TEST_ICE -interface Test +module Test +{ + +interface TestIntf { void transient(); void deactivate(); @@ -21,4 +24,6 @@ local class Cookie nonmutating string message(); }; +}; + #endif diff --git a/cs/test/Ice/adapterDeactivation/TestI.cs b/cs/test/Ice/adapterDeactivation/TestI.cs index 017916184f3..ac42eecba3a 100755 --- a/cs/test/Ice/adapterDeactivation/TestI.cs +++ b/cs/test/Ice/adapterDeactivation/TestI.cs @@ -7,8 +7,9 @@ // // ********************************************************************** +using Test; -public sealed class TestI : _TestDisp +public sealed class TestI : _TestIntfDisp { public override void transient(Ice.Current current) { diff --git a/cs/test/Ice/checksum/client/Types.ice b/cs/test/Ice/checksum/client/Types.ice index 5162f718775..1fd712e3963 100644 --- a/cs/test/Ice/checksum/client/Types.ice +++ b/cs/test/Ice/checksum/client/Types.ice @@ -10,6 +10,9 @@ #ifndef CLASS_ICE #define CLASS_ICE +module Test +{ + // // TEST: Same // @@ -432,4 +435,6 @@ local class LocalClass { }; +}; + #endif diff --git a/cs/test/Ice/checksum/server/Types.ice b/cs/test/Ice/checksum/server/Types.ice index 0dd61483918..3f848504eb3 100644 --- a/cs/test/Ice/checksum/server/Types.ice +++ b/cs/test/Ice/checksum/server/Types.ice @@ -10,6 +10,9 @@ #ifndef CLASS_ICE #define CLASS_ICE +module Test +{ + // // TEST: Same // @@ -427,4 +430,6 @@ local class LocalClass { }; +}; + #endif diff --git a/cs/test/Ice/exceptions/AllTests.cs b/cs/test/Ice/exceptions/AllTests.cs index efaab93fdd3..57dc79257da 100755 --- a/cs/test/Ice/exceptions/AllTests.cs +++ b/cs/test/Ice/exceptions/AllTests.cs @@ -11,6 +11,7 @@ using System; using System.Diagnostics; using System.Threading; +using Test; public class AllTests { diff --git a/cs/test/Ice/exceptions/Client.cs b/cs/test/Ice/exceptions/Client.cs index 9c1dfc86680..55de7a45ce0 100755 --- a/cs/test/Ice/exceptions/Client.cs +++ b/cs/test/Ice/exceptions/Client.cs @@ -7,6 +7,7 @@ // // ********************************************************************** +using Test; public class Client { diff --git a/cs/test/Ice/exceptions/EmptyI.cs b/cs/test/Ice/exceptions/EmptyI.cs index 35d48b9dd88..cb72fb7e3aa 100755 --- a/cs/test/Ice/exceptions/EmptyI.cs +++ b/cs/test/Ice/exceptions/EmptyI.cs @@ -7,7 +7,6 @@ // // ********************************************************************** - -public sealed class EmptyI : _EmptyDisp +public sealed class EmptyI : Test._EmptyDisp { } diff --git a/cs/test/Ice/exceptions/Test.ice b/cs/test/Ice/exceptions/Test.ice index 6367e6d8ef8..8a4cde9b559 100755 --- a/cs/test/Ice/exceptions/Test.ice +++ b/cs/test/Ice/exceptions/Test.ice @@ -10,6 +10,9 @@ #ifndef TEST_ICE #define TEST_ICE +module Test +{ + interface Empty { }; @@ -62,4 +65,6 @@ exception D void noSuchOperation(); }; +}; + #endif diff --git a/cs/test/Ice/exceptions/TestAMD.ice b/cs/test/Ice/exceptions/TestAMD.ice index 986612b5c77..f350213b897 100755 --- a/cs/test/Ice/exceptions/TestAMD.ice +++ b/cs/test/Ice/exceptions/TestAMD.ice @@ -10,6 +10,9 @@ #ifndef TEST_ICE #define TEST_ICE +module Test +{ + interface Empty { }; @@ -62,4 +65,6 @@ exception D void noSuchOperation(); }; +}; + #endif diff --git a/cs/test/Ice/exceptions/ThrowerAMDI.cs b/cs/test/Ice/exceptions/ThrowerAMDI.cs index 886d047ad5b..a5eaf170310 100644 --- a/cs/test/Ice/exceptions/ThrowerAMDI.cs +++ b/cs/test/Ice/exceptions/ThrowerAMDI.cs @@ -8,6 +8,7 @@ // ********************************************************************** using System.Diagnostics; +using Test; public class ThrowerI : _ThrowerDisp { diff --git a/cs/test/Ice/exceptions/ThrowerI.cs b/cs/test/Ice/exceptions/ThrowerI.cs index 356d2905bf3..494367f2275 100755 --- a/cs/test/Ice/exceptions/ThrowerI.cs +++ b/cs/test/Ice/exceptions/ThrowerI.cs @@ -9,6 +9,7 @@ using System; using System.Diagnostics; +using Test; public sealed class ThrowerI : _ThrowerDisp { diff --git a/cs/test/Ice/facets/AI.cs b/cs/test/Ice/facets/AI.cs index 2fdf8b170e9..498d0979ba7 100755 --- a/cs/test/Ice/facets/AI.cs +++ b/cs/test/Ice/facets/AI.cs @@ -7,6 +7,7 @@ // // ********************************************************************** +using Test; public sealed class AI : _ADisp { diff --git a/cs/test/Ice/facets/AllTests.cs b/cs/test/Ice/facets/AllTests.cs index 444ae570e37..4720a726766 100755 --- a/cs/test/Ice/facets/AllTests.cs +++ b/cs/test/Ice/facets/AllTests.cs @@ -7,8 +7,8 @@ // // ********************************************************************** - using System; +using Test; public class AllTests { diff --git a/cs/test/Ice/facets/BI.cs b/cs/test/Ice/facets/BI.cs index d5a37e3bd37..d0a2a5df554 100755 --- a/cs/test/Ice/facets/BI.cs +++ b/cs/test/Ice/facets/BI.cs @@ -7,6 +7,7 @@ // // ********************************************************************** +using Test; public sealed class BI : _BDisp { diff --git a/cs/test/Ice/facets/CI.cs b/cs/test/Ice/facets/CI.cs index 8c98515572f..1a1fd6c7ce3 100755 --- a/cs/test/Ice/facets/CI.cs +++ b/cs/test/Ice/facets/CI.cs @@ -7,6 +7,7 @@ // // ********************************************************************** +using Test; public sealed class CI : _CDisp { diff --git a/cs/test/Ice/facets/Client.cs b/cs/test/Ice/facets/Client.cs index f98c6ad5748..63ba4bb7d05 100755 --- a/cs/test/Ice/facets/Client.cs +++ b/cs/test/Ice/facets/Client.cs @@ -7,6 +7,7 @@ // // ********************************************************************** +using Test; public class Collocated { diff --git a/cs/test/Ice/facets/DI.cs b/cs/test/Ice/facets/DI.cs index 83c32bbdb4b..bcdb771e93b 100755 --- a/cs/test/Ice/facets/DI.cs +++ b/cs/test/Ice/facets/DI.cs @@ -7,6 +7,7 @@ // // ********************************************************************** +using Test; public sealed class DI : _DDisp { diff --git a/cs/test/Ice/facets/EI.cs b/cs/test/Ice/facets/EI.cs index 9d4a62a13ab..a827772121e 100755 --- a/cs/test/Ice/facets/EI.cs +++ b/cs/test/Ice/facets/EI.cs @@ -7,6 +7,7 @@ // // ********************************************************************** +using Test; public sealed class EI : _EDisp { diff --git a/cs/test/Ice/facets/EmptyI.cs b/cs/test/Ice/facets/EmptyI.cs index 35d48b9dd88..cb72fb7e3aa 100755 --- a/cs/test/Ice/facets/EmptyI.cs +++ b/cs/test/Ice/facets/EmptyI.cs @@ -7,7 +7,6 @@ // // ********************************************************************** - -public sealed class EmptyI : _EmptyDisp +public sealed class EmptyI : Test._EmptyDisp { } diff --git a/cs/test/Ice/facets/FI.cs b/cs/test/Ice/facets/FI.cs index 8778d95b1ae..f9caec1dcf2 100755 --- a/cs/test/Ice/facets/FI.cs +++ b/cs/test/Ice/facets/FI.cs @@ -7,6 +7,7 @@ // // ********************************************************************** +using Test; public sealed class FI : _FDisp { diff --git a/cs/test/Ice/facets/GI.cs b/cs/test/Ice/facets/GI.cs index 3db63aef3e1..0f9d63df63e 100755 --- a/cs/test/Ice/facets/GI.cs +++ b/cs/test/Ice/facets/GI.cs @@ -7,6 +7,7 @@ // // ********************************************************************** +using Test; public sealed class GI : _GDisp { diff --git a/cs/test/Ice/facets/HI.cs b/cs/test/Ice/facets/HI.cs index ac35c51c30c..a68e1a2cc99 100755 --- a/cs/test/Ice/facets/HI.cs +++ b/cs/test/Ice/facets/HI.cs @@ -7,6 +7,7 @@ // // ********************************************************************** +using Test; public sealed class HI : _HDisp { diff --git a/cs/test/Ice/facets/Test.ice b/cs/test/Ice/facets/Test.ice index adfcb0b9c31..3ee6b51a8f1 100644 --- a/cs/test/Ice/facets/Test.ice +++ b/cs/test/Ice/facets/Test.ice @@ -10,6 +10,9 @@ #ifndef TEST_ICE #define TEST_ICE +module Test +{ + interface Empty { }; @@ -55,4 +58,6 @@ interface H extends G string callH(); }; +}; + #endif diff --git a/cs/test/Ice/faultTolerance/AllTests.cs b/cs/test/Ice/faultTolerance/AllTests.cs index cbd80472e66..f3d1d5f55dd 100755 --- a/cs/test/Ice/faultTolerance/AllTests.cs +++ b/cs/test/Ice/faultTolerance/AllTests.cs @@ -7,10 +7,10 @@ // // ********************************************************************** - using System; using System.Diagnostics; using System.Threading; +using Test; public class AllTests { @@ -61,7 +61,7 @@ public class AllTests private bool _called; } - private class AMI_Test_pidI : AMI_Test_pid + private class AMI_Test_pidI : AMI_TestIntf_pid { public override void ice_response(int pid) { @@ -89,7 +89,7 @@ public class AllTests private Callback callback = new Callback(); } - private class AMI_Test_shutdownI : AMI_Test_shutdown + private class AMI_Test_shutdownI : AMI_TestIntf_shutdown { public override void ice_response() { @@ -109,7 +109,7 @@ public class AllTests private Callback callback = new Callback(); } - private class AMI_Test_abortI : AMI_Test_abort + private class AMI_Test_abortI : AMI_TestIntf_abort { public override void ice_response() { @@ -146,7 +146,7 @@ public class AllTests private Callback callback = new Callback(); } - private class AMI_Test_idempotentAbortI : AMI_Test_idempotentAbort + private class AMI_Test_idempotentAbortI : AMI_TestIntf_idempotentAbort { public override void ice_response() { @@ -166,7 +166,7 @@ public class AllTests private AMI_Test_abortI @delegate = new AMI_Test_abortI(); } - private class AMI_Test_nonmutatingAbortI : AMI_Test_nonmutatingAbort + private class AMI_Test_nonmutatingAbortI : AMI_TestIntf_nonmutatingAbort { public override void ice_response() { @@ -201,7 +201,7 @@ public class AllTests Console.Out.Write("testing checked cast... "); Console.Out.Flush(); - TestPrx obj = TestPrxHelper.checkedCast(basePrx); + TestIntfPrx obj = TestIntfPrxHelper.checkedCast(basePrx); test(obj != null); test(obj.Equals(basePrx)); Console.Out.WriteLine("ok"); diff --git a/cs/test/Ice/faultTolerance/Test.ice b/cs/test/Ice/faultTolerance/Test.ice index 38f995a0104..eff30bae3b0 100755 --- a/cs/test/Ice/faultTolerance/Test.ice +++ b/cs/test/Ice/faultTolerance/Test.ice @@ -10,7 +10,10 @@ #ifndef TEST_ICE #define TEST_ICE -["ami"] interface Test +module Test +{ + +["ami"] interface TestIntf { void shutdown(); void abort(); @@ -24,4 +27,6 @@ interface Cleaner void cleanup(); }; +}; + #endif diff --git a/cs/test/Ice/faultTolerance/TestI.cs b/cs/test/Ice/faultTolerance/TestI.cs index c48f8b9f836..9bb67bb91fa 100755 --- a/cs/test/Ice/faultTolerance/TestI.cs +++ b/cs/test/Ice/faultTolerance/TestI.cs @@ -7,8 +7,9 @@ // // ********************************************************************** +using Test; -public sealed class TestI : _TestDisp +public sealed class TestI : _TestIntfDisp { public TestI(Ice.ObjectAdapter adapter) { diff --git a/cs/test/Ice/inheritance/AllTests.cs b/cs/test/Ice/inheritance/AllTests.cs index c38627f09f2..2356deb34e5 100755 --- a/cs/test/Ice/inheritance/AllTests.cs +++ b/cs/test/Ice/inheritance/AllTests.cs @@ -7,8 +7,8 @@ // // ********************************************************************** - using System; +using Test; public class AllTests { @@ -38,10 +38,10 @@ public class AllTests Console.Out.Write("getting proxies for class hierarchy... "); Console.Out.Flush(); - MA.CAPrx ca = initial.caop(); - MB.CBPrx cb = initial.cbop(); - MA.CCPrx cc = initial.ccop(); - MA.CDPrx cd = initial.cdop(); + Test.MA.CAPrx ca = initial.caop(); + Test.MB.CBPrx cb = initial.cbop(); + Test.MA.CCPrx cc = initial.ccop(); + Test.MA.CDPrx cd = initial.cdop(); test(ca != cb); test(ca != cc); test(ca != cd); @@ -52,10 +52,10 @@ public class AllTests Console.Out.Write("getting proxies for interface hierarchy... "); Console.Out.Flush(); - MA.IAPrx ia = initial.iaop(); - MB.IB1Prx ib1 = initial.ib1op(); - MB.IB2Prx ib2 = initial.ib2op(); - MA.ICPrx ic = initial.icop(); + Test.MA.IAPrx ia = initial.iaop(); + Test.MB.IB1Prx ib1 = initial.ib1op(); + Test.MB.IB2Prx ib2 = initial.ib2op(); + Test.MA.ICPrx ic = initial.icop(); test(ia != ib1); test(ia != ib2); test(ia != ic); @@ -65,9 +65,9 @@ public class AllTests Console.Out.Write("invoking proxy operations on class hierarchy... "); Console.Out.Flush(); - MA.CAPrx cao; - MB.CBPrx cbo; - MA.CCPrx cco; + Test.MA.CAPrx cao; + Test.MB.CBPrx cbo; + Test.MA.CCPrx cco; cao = ca.caop(ca); test(cao.Equals(ca)); @@ -115,10 +115,10 @@ public class AllTests Console.Out.Write("ditto, but for interface hierarchy... "); Console.Out.Flush(); - MA.IAPrx iao; - MB.IB1Prx ib1o; - MB.IB2Prx ib2o; - MA.ICPrx ico; + Test.MA.IAPrx iao; + Test.MB.IB1Prx ib1o; + Test.MB.IB2Prx ib2o; + Test.MA.ICPrx ico; iao = ia.iaop(ia); test(iao.Equals(ia)); diff --git a/cs/test/Ice/inheritance/CAI.cs b/cs/test/Ice/inheritance/CAI.cs index cdbdfc9ea84..e8de96e501f 100755 --- a/cs/test/Ice/inheritance/CAI.cs +++ b/cs/test/Ice/inheritance/CAI.cs @@ -7,14 +7,13 @@ // // ********************************************************************** - -public sealed class CAI : MA.CA +public sealed class CAI : Test.MA.CA { public CAI() { } - public override MA.CAPrx caop(MA.CAPrx p, Ice.Current current) + public override Test.MA.CAPrx caop(Test.MA.CAPrx p, Ice.Current current) { return p; } diff --git a/cs/test/Ice/inheritance/CBI.cs b/cs/test/Ice/inheritance/CBI.cs index e8601d92f21..ebb6602d8f1 100755 --- a/cs/test/Ice/inheritance/CBI.cs +++ b/cs/test/Ice/inheritance/CBI.cs @@ -7,19 +7,18 @@ // // ********************************************************************** - -public sealed class CBI : MB.CB +public sealed class CBI : Test.MB.CB { public CBI() { } - public override MA.CAPrx caop(MA.CAPrx p, Ice.Current current) + public override Test.MA.CAPrx caop(Test.MA.CAPrx p, Ice.Current current) { return p; } - public override MB.CBPrx cbop(MB.CBPrx p, Ice.Current current) + public override Test.MB.CBPrx cbop(Test.MB.CBPrx p, Ice.Current current) { return p; } diff --git a/cs/test/Ice/inheritance/CCI.cs b/cs/test/Ice/inheritance/CCI.cs index 977de760784..d17b98f1d94 100755 --- a/cs/test/Ice/inheritance/CCI.cs +++ b/cs/test/Ice/inheritance/CCI.cs @@ -7,24 +7,23 @@ // // ********************************************************************** - -public sealed class CCI : MA.CC +public sealed class CCI : Test.MA.CC { public CCI() { } - public override MA.CAPrx caop(MA.CAPrx p, Ice.Current current) + public override Test.MA.CAPrx caop(Test.MA.CAPrx p, Ice.Current current) { return p; } - public override MA.CCPrx ccop(MA.CCPrx p, Ice.Current current) + public override Test.MA.CCPrx ccop(Test.MA.CCPrx p, Ice.Current current) { return p; } - public override MB.CBPrx cbop(MB.CBPrx p, Ice.Current current) + public override Test.MB.CBPrx cbop(Test.MB.CBPrx p, Ice.Current current) { return p; } diff --git a/cs/test/Ice/inheritance/CDI.cs b/cs/test/Ice/inheritance/CDI.cs index bcb99de3d16..8fdb36b9c09 100755 --- a/cs/test/Ice/inheritance/CDI.cs +++ b/cs/test/Ice/inheritance/CDI.cs @@ -7,44 +7,43 @@ // // ********************************************************************** - -public sealed class CDI : MA.CD +public sealed class CDI : Test.MA.CD { public CDI() { } - public override MA.CAPrx caop(MA.CAPrx p, Ice.Current current) + public override Test.MA.CAPrx caop(Test.MA.CAPrx p, Ice.Current current) { return p; } - public override MA.CCPrx ccop(MA.CCPrx p, Ice.Current current) + public override Test.MA.CCPrx ccop(Test.MA.CCPrx p, Ice.Current current) { return p; } - public override MA.CDPrx cdop(MA.CDPrx p, Ice.Current current) + public override Test.MA.CDPrx cdop(Test.MA.CDPrx p, Ice.Current current) { return p; } - public override MA.IAPrx iaop(MA.IAPrx p, Ice.Current current) + public override Test.MA.IAPrx iaop(Test.MA.IAPrx p, Ice.Current current) { return p; } - public override MB.CBPrx cbop(MB.CBPrx p, Ice.Current current) + public override Test.MB.CBPrx cbop(Test.MB.CBPrx p, Ice.Current current) { return p; } - public override MB.IB1Prx ib1op(MB.IB1Prx p, Ice.Current current) + public override Test.MB.IB1Prx ib1op(Test.MB.IB1Prx p, Ice.Current current) { return p; } - public override MB.IB2Prx ib2op(MB.IB2Prx p, Ice.Current current) + public override Test.MB.IB2Prx ib2op(Test.MB.IB2Prx p, Ice.Current current) { return p; } diff --git a/cs/test/Ice/inheritance/Client.cs b/cs/test/Ice/inheritance/Client.cs index e7a9679b9c1..aeed3099abe 100755 --- a/cs/test/Ice/inheritance/Client.cs +++ b/cs/test/Ice/inheritance/Client.cs @@ -7,6 +7,7 @@ // // ********************************************************************** +using Test; public class Client { diff --git a/cs/test/Ice/inheritance/IAI.cs b/cs/test/Ice/inheritance/IAI.cs index fa24d940d4c..f78baabf852 100755 --- a/cs/test/Ice/inheritance/IAI.cs +++ b/cs/test/Ice/inheritance/IAI.cs @@ -7,14 +7,13 @@ // // ********************************************************************** - -public sealed class IAI : MA._IADisp +public sealed class IAI : Test.MA._IADisp { public IAI() { } - public override MA.IAPrx iaop(MA.IAPrx p, Ice.Current current) + public override Test.MA.IAPrx iaop(Test.MA.IAPrx p, Ice.Current current) { return p; } diff --git a/cs/test/Ice/inheritance/IB1I.cs b/cs/test/Ice/inheritance/IB1I.cs index defc3d8456d..8def1334237 100755 --- a/cs/test/Ice/inheritance/IB1I.cs +++ b/cs/test/Ice/inheritance/IB1I.cs @@ -7,19 +7,18 @@ // // ********************************************************************** - -public sealed class IB1I : MB._IB1Disp +public sealed class IB1I : Test.MB._IB1Disp { public IB1I() { } - public override MA.IAPrx iaop(MA.IAPrx p, Ice.Current current) + public override Test.MA.IAPrx iaop(Test.MA.IAPrx p, Ice.Current current) { return p; } - public override MB.IB1Prx ib1op(MB.IB1Prx p, Ice.Current current) + public override Test.MB.IB1Prx ib1op(Test.MB.IB1Prx p, Ice.Current current) { return p; } diff --git a/cs/test/Ice/inheritance/IB2I.cs b/cs/test/Ice/inheritance/IB2I.cs index dcfc2f11d3f..e6f69c616f4 100755 --- a/cs/test/Ice/inheritance/IB2I.cs +++ b/cs/test/Ice/inheritance/IB2I.cs @@ -7,19 +7,18 @@ // // ********************************************************************** - -public sealed class IB2I : MB._IB2Disp +public sealed class IB2I : Test.MB._IB2Disp { public IB2I() { } - public override MA.IAPrx iaop(MA.IAPrx p, Ice.Current current) + public override Test.MA.IAPrx iaop(Test.MA.IAPrx p, Ice.Current current) { return p; } - public override MB.IB2Prx ib2op(MB.IB2Prx p, Ice.Current current) + public override Test.MB.IB2Prx ib2op(Test.MB.IB2Prx p, Ice.Current current) { return p; } diff --git a/cs/test/Ice/inheritance/ICI.cs b/cs/test/Ice/inheritance/ICI.cs index d8780d77f24..3b70bd8d848 100755 --- a/cs/test/Ice/inheritance/ICI.cs +++ b/cs/test/Ice/inheritance/ICI.cs @@ -7,29 +7,28 @@ // // ********************************************************************** - -public sealed class ICI : MA._ICDisp +public sealed class ICI : Test.MA._ICDisp { public ICI() { } - public override MA.IAPrx iaop(MA.IAPrx p, Ice.Current current) + public override Test.MA.IAPrx iaop(Test.MA.IAPrx p, Ice.Current current) { return p; } - public override MA.ICPrx icop(MA.ICPrx p, Ice.Current current) + public override Test.MA.ICPrx icop(Test.MA.ICPrx p, Ice.Current current) { return p; } - public override MB.IB1Prx ib1op(MB.IB1Prx p, Ice.Current current) + public override Test.MB.IB1Prx ib1op(Test.MB.IB1Prx p, Ice.Current current) { return p; } - public override MB.IB2Prx ib2op(MB.IB2Prx p, Ice.Current current) + public override Test.MB.IB2Prx ib2op(Test.MB.IB2Prx p, Ice.Current current) { return p; } diff --git a/cs/test/Ice/inheritance/InitialI.cs b/cs/test/Ice/inheritance/InitialI.cs index a38d5f1b828..52a31be9600 100755 --- a/cs/test/Ice/inheritance/InitialI.cs +++ b/cs/test/Ice/inheritance/InitialI.cs @@ -7,58 +7,57 @@ // // ********************************************************************** - -public sealed class InitialI : _InitialDisp +public sealed class InitialI : Test._InitialDisp { public InitialI(Ice.ObjectAdapter adapter) { _adapter = adapter; - _ca = MA.CAPrxHelper.uncheckedCast(_adapter.addWithUUID(new CAI())); - _cb = MB.CBPrxHelper.uncheckedCast(_adapter.addWithUUID(new CBI())); - _cc = MA.CCPrxHelper.uncheckedCast(_adapter.addWithUUID(new CCI())); - _cd = MA.CDPrxHelper.uncheckedCast(_adapter.addWithUUID(new CDI())); - _ia = MA.IAPrxHelper.uncheckedCast(_adapter.addWithUUID(new IAI())); - _ib1 = MB.IB1PrxHelper.uncheckedCast(_adapter.addWithUUID(new IB1I())); - _ib2 = MB.IB2PrxHelper.uncheckedCast(_adapter.addWithUUID(new IB2I())); - _ic = MA.ICPrxHelper.uncheckedCast(_adapter.addWithUUID(new ICI())); + _ca = Test.MA.CAPrxHelper.uncheckedCast(_adapter.addWithUUID(new CAI())); + _cb = Test.MB.CBPrxHelper.uncheckedCast(_adapter.addWithUUID(new CBI())); + _cc = Test.MA.CCPrxHelper.uncheckedCast(_adapter.addWithUUID(new CCI())); + _cd = Test.MA.CDPrxHelper.uncheckedCast(_adapter.addWithUUID(new CDI())); + _ia = Test.MA.IAPrxHelper.uncheckedCast(_adapter.addWithUUID(new IAI())); + _ib1 = Test.MB.IB1PrxHelper.uncheckedCast(_adapter.addWithUUID(new IB1I())); + _ib2 = Test.MB.IB2PrxHelper.uncheckedCast(_adapter.addWithUUID(new IB2I())); + _ic = Test.MA.ICPrxHelper.uncheckedCast(_adapter.addWithUUID(new ICI())); } - public override MA.CAPrx caop(Ice.Current current) + public override Test.MA.CAPrx caop(Ice.Current current) { return _ca; } - public override MB.CBPrx cbop(Ice.Current current) + public override Test.MB.CBPrx cbop(Ice.Current current) { return _cb; } - public override MA.CCPrx ccop(Ice.Current current) + public override Test.MA.CCPrx ccop(Ice.Current current) { return _cc; } - public override MA.CDPrx cdop(Ice.Current current) + public override Test.MA.CDPrx cdop(Ice.Current current) { return _cd; } - public override MA.IAPrx iaop(Ice.Current current) + public override Test.MA.IAPrx iaop(Ice.Current current) { return _ia; } - public override MB.IB1Prx ib1op(Ice.Current current) + public override Test.MB.IB1Prx ib1op(Ice.Current current) { return _ib1; } - public override MB.IB2Prx ib2op(Ice.Current current) + public override Test.MB.IB2Prx ib2op(Ice.Current current) { return _ib2; } - public override MA.ICPrx icop(Ice.Current current) + public override Test.MA.ICPrx icop(Ice.Current current) { return _ic; } @@ -69,12 +68,12 @@ public sealed class InitialI : _InitialDisp } private Ice.ObjectAdapter _adapter; - private MA.CAPrx _ca; - private MB.CBPrx _cb; - private MA.CCPrx _cc; - private MA.CDPrx _cd; - private MA.IAPrx _ia; - private MB.IB1Prx _ib1; - private MB.IB2Prx _ib2; - private MA.ICPrx _ic; + private Test.MA.CAPrx _ca; + private Test.MB.CBPrx _cb; + private Test.MA.CCPrx _cc; + private Test.MA.CDPrx _cd; + private Test.MA.IAPrx _ia; + private Test.MB.IB1Prx _ib1; + private Test.MB.IB2Prx _ib2; + private Test.MA.ICPrx _ic; } diff --git a/cs/test/Ice/inheritance/Test.ice b/cs/test/Ice/inheritance/Test.ice index 3c532e6e855..47e5ec41820 100755 --- a/cs/test/Ice/inheritance/Test.ice +++ b/cs/test/Ice/inheritance/Test.ice @@ -10,6 +10,9 @@ #ifndef TESTICE #define TESTICE +module Test +{ + module MA { @@ -78,4 +81,6 @@ interface Initial MA::IC* icop(); }; +}; + #endif diff --git a/cs/test/Ice/location/AllTests.cs b/cs/test/Ice/location/AllTests.cs index b1e514340f1..25c0e3068c8 100755 --- a/cs/test/Ice/location/AllTests.cs +++ b/cs/test/Ice/location/AllTests.cs @@ -7,8 +7,8 @@ // // ********************************************************************** - using System; +using Test; public class AllTests { @@ -46,11 +46,11 @@ public class AllTests Console.Out.Write("testing checked cast... "); Console.Out.Flush(); - TestPrx obj = TestPrxHelper.checkedCast(@base); + TestIntfPrx obj = TestIntfPrxHelper.checkedCast(@base); test(obj != null); - TestPrx obj2 = TestPrxHelper.checkedCast(base2); + TestIntfPrx obj2 = TestIntfPrxHelper.checkedCast(base2); test(obj2 != null); - TestPrx obj3 = TestPrxHelper.checkedCast(base3); + TestIntfPrx obj3 = TestIntfPrxHelper.checkedCast(base3); test(obj3 != null); ServerManagerPrx obj4 = ServerManagerPrxHelper.checkedCast(base4); test(obj4 != null); diff --git a/cs/test/Ice/location/HelloI.cs b/cs/test/Ice/location/HelloI.cs index c454104e0ab..48b813c6ac2 100755 --- a/cs/test/Ice/location/HelloI.cs +++ b/cs/test/Ice/location/HelloI.cs @@ -7,6 +7,7 @@ // // ********************************************************************** +using Test; public class HelloI : _HelloDisp { diff --git a/cs/test/Ice/location/ServerManagerI.cs b/cs/test/Ice/location/ServerManagerI.cs index 29470d1d9cc..56b29847efc 100755 --- a/cs/test/Ice/location/ServerManagerI.cs +++ b/cs/test/Ice/location/ServerManagerI.cs @@ -8,6 +8,7 @@ // ********************************************************************** using System.Collections; +using Test; public class ServerManagerI : _ServerManagerDisp { diff --git a/cs/test/Ice/location/Test.ice b/cs/test/Ice/location/Test.ice index 03f7b371bf9..53e0a2fc2a9 100755 --- a/cs/test/Ice/location/Test.ice +++ b/cs/test/Ice/location/Test.ice @@ -10,6 +10,9 @@ #ifndef TEST_ICE #define TEST_ICE +module Test +{ + interface ServerManager { void startServer(); @@ -21,11 +24,13 @@ interface Hello void sayHello(); }; -interface Test +interface TestIntf { void shutdown(); Hello* getHello(); }; +}; + #endif diff --git a/cs/test/Ice/location/TestI.cs b/cs/test/Ice/location/TestI.cs index 6c4edf1b5a7..c2d800bb35f 100755 --- a/cs/test/Ice/location/TestI.cs +++ b/cs/test/Ice/location/TestI.cs @@ -7,8 +7,9 @@ // // ********************************************************************** +using Test; -public class TestI : _TestDisp +public class TestI : _TestIntfDisp { internal TestI(Ice.ObjectAdapter adapter) { diff --git a/cs/test/Ice/objects/AllTests.cs b/cs/test/Ice/objects/AllTests.cs index 7cb0038f277..39d70edfdb8 100755 --- a/cs/test/Ice/objects/AllTests.cs +++ b/cs/test/Ice/objects/AllTests.cs @@ -7,8 +7,8 @@ // // ********************************************************************** - using System; +using Test; public class AllTests { diff --git a/cs/test/Ice/objects/BI.cs b/cs/test/Ice/objects/BI.cs index eae88d6c6f3..329ee0127bf 100644 --- a/cs/test/Ice/objects/BI.cs +++ b/cs/test/Ice/objects/BI.cs @@ -7,6 +7,8 @@ // // ********************************************************************** +using Test; + public sealed class BI : B { public BI() diff --git a/cs/test/Ice/objects/CI.cs b/cs/test/Ice/objects/CI.cs index 1cc7fb7da2b..97051717855 100644 --- a/cs/test/Ice/objects/CI.cs +++ b/cs/test/Ice/objects/CI.cs @@ -7,6 +7,8 @@ // // ********************************************************************** +using Test; + public sealed class CI : C { public CI() diff --git a/cs/test/Ice/objects/Client.cs b/cs/test/Ice/objects/Client.cs index 426722745ea..b2682a655f5 100755 --- a/cs/test/Ice/objects/Client.cs +++ b/cs/test/Ice/objects/Client.cs @@ -8,6 +8,7 @@ // ********************************************************************** using System.Diagnostics; +using Test; public class Client { @@ -15,15 +16,15 @@ public class Client { public Ice.Object create(string type) { - if(type.Equals("::B")) + if(type.Equals("::Test::B")) { return new BI(); } - else if(type.Equals("::C")) + else if(type.Equals("::Test::C")) { return new CI(); } - else if(type.Equals("::D")) + else if(type.Equals("::Test::D")) { return new DI(); } @@ -41,9 +42,9 @@ public class Client private static int run(string[] args, Ice.Communicator communicator) { Ice.ObjectFactory factory = new MyObjectFactory(); - communicator.addObjectFactory(factory, "::B"); - communicator.addObjectFactory(factory, "::C"); - communicator.addObjectFactory(factory, "::D"); + communicator.addObjectFactory(factory, "::Test::B"); + communicator.addObjectFactory(factory, "::Test::C"); + communicator.addObjectFactory(factory, "::Test::D"); InitialPrx initial = AllTests.allTests(communicator, false); initial.shutdown(); diff --git a/cs/test/Ice/objects/Collocated.cs b/cs/test/Ice/objects/Collocated.cs index 8794af821fd..d5feed02daa 100755 --- a/cs/test/Ice/objects/Collocated.cs +++ b/cs/test/Ice/objects/Collocated.cs @@ -7,6 +7,7 @@ // // ********************************************************************** +using Test; public class Client { diff --git a/cs/test/Ice/objects/DI.cs b/cs/test/Ice/objects/DI.cs index c501b9df7f7..ebd99cd436d 100644 --- a/cs/test/Ice/objects/DI.cs +++ b/cs/test/Ice/objects/DI.cs @@ -7,6 +7,8 @@ // // ********************************************************************** +using Test; + public sealed class DI : D { public DI() diff --git a/cs/test/Ice/objects/InitialI.cs b/cs/test/Ice/objects/InitialI.cs index ff509226082..57e2caf5b23 100755 --- a/cs/test/Ice/objects/InitialI.cs +++ b/cs/test/Ice/objects/InitialI.cs @@ -7,6 +7,7 @@ // // ********************************************************************** +using Test; public sealed class InitialI : Initial { diff --git a/cs/test/Ice/objects/Test.ice b/cs/test/Ice/objects/Test.ice index 3f57616f160..90af1dacd63 100644 --- a/cs/test/Ice/objects/Test.ice +++ b/cs/test/Ice/objects/Test.ice @@ -10,6 +10,9 @@ #ifndef TEST_ICE #define TEST_ICE +module Test +{ + class B; class C; @@ -55,4 +58,6 @@ class Initial void getAll(out B b1, out B b2, out C theC, out D theD); }; +}; + #endif diff --git a/cs/test/Ice/slicing/exceptions/AllTests.cs b/cs/test/Ice/slicing/exceptions/AllTests.cs index cedb7ab7c14..476a573a797 100755 --- a/cs/test/Ice/slicing/exceptions/AllTests.cs +++ b/cs/test/Ice/slicing/exceptions/AllTests.cs @@ -7,10 +7,10 @@ // // ********************************************************************** - using System; using System.Diagnostics; using System.Threading; +using Test; public class AllTests { @@ -61,7 +61,7 @@ public class AllTests private bool _called; } - private class AMI_Test_baseAsBaseI : AMI_Test_baseAsBase + private class AMI_Test_baseAsBaseI : AMI_TestIntf_baseAsBase { public override void ice_response() { @@ -94,7 +94,7 @@ public class AllTests private Callback callback = new Callback(); } - private class AMI_Test_unknownDerivedAsBaseI : AMI_Test_unknownDerivedAsBase + private class AMI_Test_unknownDerivedAsBaseI : AMI_TestIntf_unknownDerivedAsBase { public override void ice_response() { @@ -127,7 +127,7 @@ public class AllTests private Callback callback = new Callback(); } - private class AMI_Test_knownDerivedAsBaseI : AMI_Test_knownDerivedAsBase + private class AMI_Test_knownDerivedAsBaseI : AMI_TestIntf_knownDerivedAsBase { public override void ice_response() { @@ -161,7 +161,7 @@ public class AllTests private Callback callback = new Callback(); } - private class AMI_Test_knownDerivedAsKnownDerivedI : AMI_Test_knownDerivedAsKnownDerived + private class AMI_Test_knownDerivedAsKnownDerivedI : AMI_TestIntf_knownDerivedAsKnownDerived { public override void ice_response() { @@ -195,7 +195,7 @@ public class AllTests private Callback callback = new Callback(); } - private class AMI_Test_unknownIntermediateAsBaseI : AMI_Test_unknownIntermediateAsBase + private class AMI_Test_unknownIntermediateAsBaseI : AMI_TestIntf_unknownIntermediateAsBase { public override void ice_response() { @@ -228,7 +228,7 @@ public class AllTests private Callback callback = new Callback(); } - private class AMI_Test_knownIntermediateAsBaseI : AMI_Test_knownIntermediateAsBase + private class AMI_Test_knownIntermediateAsBaseI : AMI_TestIntf_knownIntermediateAsBase { public override void ice_response() { @@ -262,7 +262,7 @@ public class AllTests private Callback callback = new Callback(); } - private class AMI_Test_knownMostDerivedAsBaseI : AMI_Test_knownMostDerivedAsBase + private class AMI_Test_knownMostDerivedAsBaseI : AMI_TestIntf_knownMostDerivedAsBase { public override void ice_response() { @@ -297,7 +297,7 @@ public class AllTests private Callback callback = new Callback(); } - private class AMI_Test_knownIntermediateAsKnownIntermediateI : AMI_Test_knownIntermediateAsKnownIntermediate + private class AMI_Test_knownIntermediateAsKnownIntermediateI : AMI_TestIntf_knownIntermediateAsKnownIntermediate { public override void ice_response() { @@ -331,7 +331,7 @@ public class AllTests private Callback callback = new Callback(); } - private class AMI_Test_knownMostDerivedAsKnownIntermediateI : AMI_Test_knownMostDerivedAsKnownIntermediate + private class AMI_Test_knownMostDerivedAsKnownIntermediateI : AMI_TestIntf_knownMostDerivedAsKnownIntermediate { public override void ice_response() { @@ -366,7 +366,7 @@ public class AllTests private Callback callback = new Callback(); } - private class AMI_Test_knownMostDerivedAsKnownMostDerivedI : AMI_Test_knownMostDerivedAsKnownMostDerived + private class AMI_Test_knownMostDerivedAsKnownMostDerivedI : AMI_TestIntf_knownMostDerivedAsKnownMostDerived { public override void ice_response() { @@ -401,7 +401,7 @@ public class AllTests private Callback callback = new Callback(); } - private class AMI_Test_unknownMostDerived1AsBaseI : AMI_Test_unknownMostDerived1AsBase + private class AMI_Test_unknownMostDerived1AsBaseI : AMI_TestIntf_unknownMostDerived1AsBase { public override void ice_response() { @@ -435,7 +435,7 @@ public class AllTests private Callback callback = new Callback(); } - private class AMI_Test_unknownMostDerived1AsKnownIntermediateI : AMI_Test_unknownMostDerived1AsKnownIntermediate + private class AMI_Test_unknownMostDerived1AsKnownIntermediateI : AMI_TestIntf_unknownMostDerived1AsKnownIntermediate { public override void ice_response() { @@ -469,7 +469,7 @@ public class AllTests private Callback callback = new Callback(); } - private class AMI_Test_unknownMostDerived2AsBaseI : AMI_Test_unknownMostDerived2AsBase + private class AMI_Test_unknownMostDerived2AsBaseI : AMI_TestIntf_unknownMostDerived2AsBase { public override void ice_response() { @@ -502,7 +502,7 @@ public class AllTests private Callback callback = new Callback(); } - public static TestPrx allTests(Ice.Communicator communicator, bool collocated) + public static TestIntfPrx allTests(Ice.Communicator communicator, bool collocated) { Console.Out.Write("testing stringToProxy... "); Console.Out.Flush(); @@ -513,7 +513,7 @@ public class AllTests Console.Out.Write("testing checked cast... "); Console.Out.Flush(); - TestPrx testPrx = TestPrxHelper.checkedCast(@base); + TestIntfPrx testPrx = TestIntfPrxHelper.checkedCast(@base); test(testPrx != null); test(testPrx.Equals(@base)); Console.Out.WriteLine("ok"); @@ -529,7 +529,7 @@ public class AllTests catch(Base b) { test(b.b.Equals("Base.b")); - test(b.GetType().FullName.Equals("Base")); + test(b.GetType().FullName.Equals("Test.Base")); gotException = true; } catch(Exception) @@ -560,7 +560,7 @@ public class AllTests catch(Base b) { test(b.b.Equals("UnknownDerived.b")); - test(b.GetType().FullName.Equals("Base")); + test(b.GetType().FullName.Equals("Test.Base")); gotException = true; } catch(Exception) @@ -592,7 +592,7 @@ public class AllTests { test(k.b.Equals("KnownDerived.b")); test(k.kd.Equals("KnownDerived.kd")); - test(k.GetType().FullName.Equals("KnownDerived")); + test(k.GetType().FullName.Equals("Test.KnownDerived")); gotException = true; } catch(Exception) @@ -624,7 +624,7 @@ public class AllTests { test(k.b.Equals("KnownDerived.b")); test(k.kd.Equals("KnownDerived.kd")); - test(k.GetType().FullName.Equals("KnownDerived")); + test(k.GetType().FullName.Equals("Test.KnownDerived")); gotException = true; } catch(Exception) @@ -655,7 +655,7 @@ public class AllTests catch(Base b) { test(b.b.Equals("UnknownIntermediate.b")); - test(b.GetType().FullName.Equals("Base")); + test(b.GetType().FullName.Equals("Test.Base")); gotException = true; } catch(Exception) @@ -687,7 +687,7 @@ public class AllTests { test(ki.b.Equals("KnownIntermediate.b")); test(ki.ki.Equals("KnownIntermediate.ki")); - test(ki.GetType().FullName.Equals("KnownIntermediate")); + test(ki.GetType().FullName.Equals("Test.KnownIntermediate")); gotException = true; } catch(Exception) @@ -720,7 +720,7 @@ public class AllTests test(kmd.b.Equals("KnownMostDerived.b")); test(kmd.ki.Equals("KnownMostDerived.ki")); test(kmd.kmd.Equals("KnownMostDerived.kmd")); - test(kmd.GetType().FullName.Equals("KnownMostDerived")); + test(kmd.GetType().FullName.Equals("Test.KnownMostDerived")); gotException = true; } catch(Exception) @@ -752,7 +752,7 @@ public class AllTests { test(ki.b.Equals("KnownIntermediate.b")); test(ki.ki.Equals("KnownIntermediate.ki")); - test(ki.GetType().FullName.Equals("KnownIntermediate")); + test(ki.GetType().FullName.Equals("Test.KnownIntermediate")); gotException = true; } catch(Exception) @@ -785,7 +785,7 @@ public class AllTests test(kmd.b.Equals("KnownMostDerived.b")); test(kmd.ki.Equals("KnownMostDerived.ki")); test(kmd.kmd.Equals("KnownMostDerived.kmd")); - test(kmd.GetType().FullName.Equals("KnownMostDerived")); + test(kmd.GetType().FullName.Equals("Test.KnownMostDerived")); gotException = true; } catch(Exception) @@ -818,7 +818,7 @@ public class AllTests test(kmd.b.Equals("KnownMostDerived.b")); test(kmd.ki.Equals("KnownMostDerived.ki")); test(kmd.kmd.Equals("KnownMostDerived.kmd")); - test(kmd.GetType().FullName.Equals("KnownMostDerived")); + test(kmd.GetType().FullName.Equals("Test.KnownMostDerived")); gotException = true; } catch(Exception) @@ -850,7 +850,7 @@ public class AllTests { test(ki.b.Equals("UnknownMostDerived1.b")); test(ki.ki.Equals("UnknownMostDerived1.ki")); - test(ki.GetType().FullName.Equals("KnownIntermediate")); + test(ki.GetType().FullName.Equals("Test.KnownIntermediate")); gotException = true; } catch(Exception) @@ -882,7 +882,7 @@ public class AllTests { test(ki.b.Equals("UnknownMostDerived1.b")); test(ki.ki.Equals("UnknownMostDerived1.ki")); - test(ki.GetType().FullName.Equals("KnownIntermediate")); + test(ki.GetType().FullName.Equals("Test.KnownIntermediate")); gotException = true; } catch(Exception) @@ -913,7 +913,7 @@ public class AllTests catch(Base b) { test(b.b.Equals("UnknownMostDerived2.b")); - test(b.GetType().FullName.Equals("Base")); + test(b.GetType().FullName.Equals("Test.Base")); gotException = true; } catch(Exception) diff --git a/cs/test/Ice/slicing/exceptions/Client.cs b/cs/test/Ice/slicing/exceptions/Client.cs index cf776eb8591..a64dfd51204 100755 --- a/cs/test/Ice/slicing/exceptions/Client.cs +++ b/cs/test/Ice/slicing/exceptions/Client.cs @@ -7,12 +7,13 @@ // // ********************************************************************** +using Test; public class Client { private static int run(string[] args, Ice.Communicator communicator) { - TestPrx test = AllTests.allTests(communicator, false); + TestIntfPrx test = AllTests.allTests(communicator, false); test.shutdown(); return 0; } diff --git a/cs/test/Ice/slicing/exceptions/ServerPrivate.ice b/cs/test/Ice/slicing/exceptions/ServerPrivate.ice index 7fb5f592869..49c3f3a81d0 100755 --- a/cs/test/Ice/slicing/exceptions/ServerPrivate.ice +++ b/cs/test/Ice/slicing/exceptions/ServerPrivate.ice @@ -12,6 +12,9 @@ #include <Test.ice> +module Test +{ + exception UnknownDerived extends Base { string ud; @@ -32,4 +35,6 @@ exception UnknownMostDerived2 extends UnknownIntermediate string umd2; }; +}; + #endif diff --git a/cs/test/Ice/slicing/exceptions/ServerPrivateAMD.ice b/cs/test/Ice/slicing/exceptions/ServerPrivateAMD.ice index 6d9bc64514b..c5245f6c759 100644 --- a/cs/test/Ice/slicing/exceptions/ServerPrivateAMD.ice +++ b/cs/test/Ice/slicing/exceptions/ServerPrivateAMD.ice @@ -12,6 +12,9 @@ #include <TestAMD.ice> +module Test +{ + exception UnknownDerived extends Base { string ud; @@ -32,4 +35,6 @@ exception UnknownMostDerived2 extends UnknownIntermediate string umd2; }; +}; + #endif diff --git a/cs/test/Ice/slicing/exceptions/Test.ice b/cs/test/Ice/slicing/exceptions/Test.ice index cc3e8b3f85f..1bf3f61f5b5 100755 --- a/cs/test/Ice/slicing/exceptions/Test.ice +++ b/cs/test/Ice/slicing/exceptions/Test.ice @@ -10,6 +10,9 @@ #ifndef TEST_ICE #define TEST_ICE +module Test +{ + exception Base { string b; @@ -30,7 +33,7 @@ exception KnownMostDerived extends KnownIntermediate string kmd; }; -["ami"] interface Test +["ami"] interface TestIntf { void baseAsBase() throws Base; void unknownDerivedAsBase() throws Base; @@ -51,4 +54,6 @@ exception KnownMostDerived extends KnownIntermediate void shutdown(); }; +}; + #endif diff --git a/cs/test/Ice/slicing/exceptions/TestAMD.ice b/cs/test/Ice/slicing/exceptions/TestAMD.ice index 54f3dca65ec..989f71eb4b0 100644 --- a/cs/test/Ice/slicing/exceptions/TestAMD.ice +++ b/cs/test/Ice/slicing/exceptions/TestAMD.ice @@ -10,6 +10,9 @@ #ifndef TEST_AMD_ICE #define TEST_AMD_ICE +module Test +{ + exception Base { string b; @@ -30,7 +33,7 @@ exception KnownMostDerived extends KnownIntermediate string kmd; }; -["ami", "amd"] interface Test +["ami", "amd"] interface TestIntf { void baseAsBase() throws Base; void unknownDerivedAsBase() throws Base; @@ -51,4 +54,6 @@ exception KnownMostDerived extends KnownIntermediate void shutdown(); }; +}; + #endif diff --git a/cs/test/Ice/slicing/exceptions/TestAMDI.cs b/cs/test/Ice/slicing/exceptions/TestAMDI.cs index 0e3509e237c..11bde867cd3 100755 --- a/cs/test/Ice/slicing/exceptions/TestAMDI.cs +++ b/cs/test/Ice/slicing/exceptions/TestAMDI.cs @@ -8,28 +8,29 @@ // ********************************************************************** using System; +using Test; -public sealed class TestI : _TestDisp +public sealed class TestI : _TestIntfDisp { public TestI(Ice.ObjectAdapter adapter) { _adapter = adapter; } - public override void shutdown_async(AMD_Test_shutdown cb, Ice.Current current) + public override void shutdown_async(AMD_TestIntf_shutdown cb, Ice.Current current) { _adapter.getCommunicator().shutdown(); cb.ice_response(); } - public override void baseAsBase_async(AMD_Test_baseAsBase cb, Ice.Current current) + public override void baseAsBase_async(AMD_TestIntf_baseAsBase cb, Ice.Current current) { Base b = new Base(); b.b = "Base.b"; cb.ice_exception(b); } - public override void unknownDerivedAsBase_async(AMD_Test_unknownDerivedAsBase cb, Ice.Current current) + public override void unknownDerivedAsBase_async(AMD_TestIntf_unknownDerivedAsBase cb, Ice.Current current) { UnknownDerived d = new UnknownDerived(); d.b = "UnknownDerived.b"; @@ -37,7 +38,7 @@ public sealed class TestI : _TestDisp cb.ice_exception(d); } - public override void knownDerivedAsBase_async(AMD_Test_knownDerivedAsBase cb, Ice.Current current) + public override void knownDerivedAsBase_async(AMD_TestIntf_knownDerivedAsBase cb, Ice.Current current) { KnownDerived d = new KnownDerived(); d.b = "KnownDerived.b"; @@ -45,7 +46,8 @@ public sealed class TestI : _TestDisp cb.ice_exception(d); } - public override void knownDerivedAsKnownDerived_async(AMD_Test_knownDerivedAsKnownDerived cb, Ice.Current current) + public override void knownDerivedAsKnownDerived_async(AMD_TestIntf_knownDerivedAsKnownDerived cb, + Ice.Current current) { KnownDerived d = new KnownDerived(); d.b = "KnownDerived.b"; @@ -53,7 +55,7 @@ public sealed class TestI : _TestDisp cb.ice_exception(d); } - public override void unknownIntermediateAsBase_async(AMD_Test_unknownIntermediateAsBase cb, Ice.Current current) + public override void unknownIntermediateAsBase_async(AMD_TestIntf_unknownIntermediateAsBase cb, Ice.Current current) { UnknownIntermediate ui = new UnknownIntermediate(); ui.b = "UnknownIntermediate.b"; @@ -61,7 +63,7 @@ public sealed class TestI : _TestDisp cb.ice_exception(ui); } - public override void knownIntermediateAsBase_async(AMD_Test_knownIntermediateAsBase cb, Ice.Current current) + public override void knownIntermediateAsBase_async(AMD_TestIntf_knownIntermediateAsBase cb, Ice.Current current) { KnownIntermediate ki = new KnownIntermediate(); ki.b = "KnownIntermediate.b"; @@ -69,7 +71,7 @@ public sealed class TestI : _TestDisp cb.ice_exception(ki); } - public override void knownMostDerivedAsBase_async(AMD_Test_knownMostDerivedAsBase cb, Ice.Current current) + public override void knownMostDerivedAsBase_async(AMD_TestIntf_knownMostDerivedAsBase cb, Ice.Current current) { KnownMostDerived kmd = new KnownMostDerived(); kmd.b = "KnownMostDerived.b"; @@ -78,7 +80,8 @@ public sealed class TestI : _TestDisp cb.ice_exception(kmd); } - public override void knownIntermediateAsKnownIntermediate_async(AMD_Test_knownIntermediateAsKnownIntermediate cb, Ice.Current current) + public override void knownIntermediateAsKnownIntermediate_async( + AMD_TestIntf_knownIntermediateAsKnownIntermediate cb, Ice.Current current) { KnownIntermediate ki = new KnownIntermediate(); ki.b = "KnownIntermediate.b"; @@ -86,7 +89,8 @@ public sealed class TestI : _TestDisp cb.ice_exception(ki); } - public override void knownMostDerivedAsKnownIntermediate_async(AMD_Test_knownMostDerivedAsKnownIntermediate cb, Ice.Current current) + public override void knownMostDerivedAsKnownIntermediate_async(AMD_TestIntf_knownMostDerivedAsKnownIntermediate cb, + Ice.Current current) { KnownMostDerived kmd = new KnownMostDerived(); kmd.b = "KnownMostDerived.b"; @@ -95,7 +99,8 @@ public sealed class TestI : _TestDisp cb.ice_exception(kmd); } - public override void knownMostDerivedAsKnownMostDerived_async(AMD_Test_knownMostDerivedAsKnownMostDerived cb, Ice.Current current) + public override void knownMostDerivedAsKnownMostDerived_async(AMD_TestIntf_knownMostDerivedAsKnownMostDerived cb, + Ice.Current current) { KnownMostDerived kmd = new KnownMostDerived(); kmd.b = "KnownMostDerived.b"; @@ -104,7 +109,7 @@ public sealed class TestI : _TestDisp cb.ice_exception(kmd); } - public override void unknownMostDerived1AsBase_async(AMD_Test_unknownMostDerived1AsBase cb, Ice.Current current) + public override void unknownMostDerived1AsBase_async(AMD_TestIntf_unknownMostDerived1AsBase cb, Ice.Current current) { UnknownMostDerived1 umd1 = new UnknownMostDerived1(); umd1.b = "UnknownMostDerived1.b"; @@ -113,7 +118,8 @@ public sealed class TestI : _TestDisp cb.ice_exception(umd1); } - public override void unknownMostDerived1AsKnownIntermediate_async(AMD_Test_unknownMostDerived1AsKnownIntermediate cb, Ice.Current current) + public override void unknownMostDerived1AsKnownIntermediate_async( + AMD_TestIntf_unknownMostDerived1AsKnownIntermediate cb, Ice.Current current) { UnknownMostDerived1 umd1 = new UnknownMostDerived1(); umd1.b = "UnknownMostDerived1.b"; @@ -122,7 +128,7 @@ public sealed class TestI : _TestDisp cb.ice_exception(umd1); } - public override void unknownMostDerived2AsBase_async(AMD_Test_unknownMostDerived2AsBase cb, Ice.Current current) + public override void unknownMostDerived2AsBase_async(AMD_TestIntf_unknownMostDerived2AsBase cb, Ice.Current current) { UnknownMostDerived2 umd2 = new UnknownMostDerived2(); umd2.b = "UnknownMostDerived2.b"; diff --git a/cs/test/Ice/slicing/exceptions/TestI.cs b/cs/test/Ice/slicing/exceptions/TestI.cs index 41e04e8eefe..92a960fca99 100755 --- a/cs/test/Ice/slicing/exceptions/TestI.cs +++ b/cs/test/Ice/slicing/exceptions/TestI.cs @@ -7,8 +7,9 @@ // // ********************************************************************** +using Test; -public sealed class TestI : _TestDisp +public sealed class TestI : _TestIntfDisp { public TestI(Ice.ObjectAdapter adapter) { diff --git a/cs/test/Ice/slicing/objects/AllTests.cs b/cs/test/Ice/slicing/objects/AllTests.cs index 676e3f8ccfd..f76815c424b 100755 --- a/cs/test/Ice/slicing/objects/AllTests.cs +++ b/cs/test/Ice/slicing/objects/AllTests.cs @@ -7,10 +7,10 @@ // // ********************************************************************** - using System; using System.Diagnostics; using System.Threading; +using Test; public class AllTests { @@ -61,12 +61,12 @@ public class AllTests private bool _called; } - private class AMI_Test_SBaseAsObjectI : AMI_Test_SBaseAsObject + private class AMI_Test_SBaseAsObjectI : AMI_TestIntf_SBaseAsObject { public override void ice_response(Ice.Object o) { AllTests.test(o != null); - AllTests.test(o.ice_id().Equals("::SBase")); + AllTests.test(o.ice_id().Equals("::Test::SBase")); SBase sb = (SBase) o; AllTests.test(sb != null); AllTests.test(sb.sb.Equals("SBase.sb")); @@ -86,7 +86,7 @@ public class AllTests private Callback callback = new Callback(); } - private class AMI_Test_SBaseAsSBaseI : AMI_Test_SBaseAsSBase + private class AMI_Test_SBaseAsSBaseI : AMI_TestIntf_SBaseAsSBase { public override void ice_response(SBase sb) { @@ -107,7 +107,7 @@ public class AllTests private Callback callback = new Callback(); } - private class AMI_Test_SBSKnownDerivedAsSBaseI : AMI_Test_SBSKnownDerivedAsSBase + private class AMI_Test_SBSKnownDerivedAsSBaseI : AMI_TestIntf_SBSKnownDerivedAsSBase { public override void ice_response(SBase sb) { @@ -131,7 +131,7 @@ public class AllTests private Callback callback = new Callback(); } - private class AMI_Test_SBSKnownDerivedAsSBSKnownDerivedI : AMI_Test_SBSKnownDerivedAsSBSKnownDerived + private class AMI_Test_SBSKnownDerivedAsSBSKnownDerivedI : AMI_TestIntf_SBSKnownDerivedAsSBSKnownDerived { public override void ice_response(SBSKnownDerived sbskd) { @@ -152,7 +152,7 @@ public class AllTests private Callback callback = new Callback(); } - private class AMI_Test_SBSUnknownDerivedAsSBaseI : AMI_Test_SBSUnknownDerivedAsSBase + private class AMI_Test_SBSUnknownDerivedAsSBaseI : AMI_TestIntf_SBSUnknownDerivedAsSBase { public override void ice_response(SBase sb) { @@ -173,7 +173,7 @@ public class AllTests private Callback callback = new Callback(); } - private class AMI_Test_SUnknownAsObjectI : AMI_Test_SUnknownAsObject + private class AMI_Test_SUnknownAsObjectI : AMI_TestIntf_SUnknownAsObject { public override void ice_response(Ice.Object o) { @@ -194,12 +194,12 @@ public class AllTests private Callback callback = new Callback(); } - private class AMI_Test_oneElementCycleI : AMI_Test_oneElementCycle + private class AMI_Test_oneElementCycleI : AMI_TestIntf_oneElementCycle { public override void ice_response(B b) { AllTests.test(b != null); - AllTests.test(b.ice_id().Equals("::B")); + AllTests.test(b.ice_id().Equals("::Test::B")); AllTests.test(b.sb.Equals("B1.sb")); AllTests.test(b.pb == b); callback.called(); @@ -218,17 +218,17 @@ public class AllTests private Callback callback = new Callback(); } - private class AMI_Test_twoElementCycleI : AMI_Test_twoElementCycle + private class AMI_Test_twoElementCycleI : AMI_TestIntf_twoElementCycle { public override void ice_response(B b1) { AllTests.test(b1 != null); - AllTests.test(b1.ice_id().Equals("::B")); + AllTests.test(b1.ice_id().Equals("::Test::B")); AllTests.test(b1.sb.Equals("B1.sb")); B b2 = b1.pb; AllTests.test(b2 != null); - AllTests.test(b2.ice_id().Equals("::B")); + AllTests.test(b2.ice_id().Equals("::Test::B")); AllTests.test(b2.sb.Equals("B2.sb")); AllTests.test(b2.pb == b1); callback.called(); @@ -247,12 +247,12 @@ public class AllTests private Callback callback = new Callback(); } - private class AMI_Test_D1AsBI : AMI_Test_D1AsB + private class AMI_Test_D1AsBI : AMI_TestIntf_D1AsB { public override void ice_response(B b1) { AllTests.test(b1 != null); - AllTests.test(b1.ice_id().Equals("::D1")); + AllTests.test(b1.ice_id().Equals("::Test::D1")); AllTests.test(b1.sb.Equals("D1.sb")); AllTests.test(b1.pb != null); AllTests.test(b1.pb != b1); @@ -267,7 +267,7 @@ public class AllTests AllTests.test(b2 != null); AllTests.test(b2.pb == b1); AllTests.test(b2.sb.Equals("D2.sb")); - AllTests.test(b2.ice_id().Equals("::B")); + AllTests.test(b2.ice_id().Equals("::Test::B")); callback.called(); } @@ -284,19 +284,19 @@ public class AllTests private Callback callback = new Callback(); } - private class AMI_Test_D1AsD1I : AMI_Test_D1AsD1 + private class AMI_Test_D1AsD1I : AMI_TestIntf_D1AsD1 { public override void ice_response(D1 d1) { AllTests.test(d1 != null); - AllTests.test(d1.ice_id().Equals("::D1")); + AllTests.test(d1.ice_id().Equals("::Test::D1")); AllTests.test(d1.sb.Equals("D1.sb")); AllTests.test(d1.pb != null); AllTests.test(d1.pb != d1); B b2 = d1.pb; AllTests.test(b2 != null); - AllTests.test(b2.ice_id().Equals("::B")); + AllTests.test(b2.ice_id().Equals("::Test::B")); AllTests.test(b2.sb.Equals("D2.sb")); AllTests.test(b2.pb == d1); callback.called(); @@ -315,19 +315,19 @@ public class AllTests private Callback callback = new Callback(); } - private class AMI_Test_D2AsBI : AMI_Test_D2AsB + private class AMI_Test_D2AsBI : AMI_TestIntf_D2AsB { public override void ice_response(B b2) { AllTests.test(b2 != null); - AllTests.test(b2.ice_id().Equals("::B")); + AllTests.test(b2.ice_id().Equals("::Test::B")); AllTests.test(b2.sb.Equals("D2.sb")); AllTests.test(b2.pb != null); AllTests.test(b2.pb != b2); B b1 = b2.pb; AllTests.test(b1 != null); - AllTests.test(b1.ice_id().Equals("::D1")); + AllTests.test(b1.ice_id().Equals("::Test::D1")); AllTests.test(b1.sb.Equals("D1.sb")); AllTests.test(b1.pb == b2); D1 d1 = (D1) b1; @@ -350,12 +350,12 @@ public class AllTests private Callback callback = new Callback(); } - private class AMI_Test_paramTest1I : AMI_Test_paramTest1 + private class AMI_Test_paramTest1I : AMI_TestIntf_paramTest1 { public override void ice_response(B b1, B b2) { AllTests.test(b1 != null); - AllTests.test(b1.ice_id().Equals("::D1")); + AllTests.test(b1.ice_id().Equals("::Test::D1")); AllTests.test(b1.sb.Equals("D1.sb")); AllTests.test(b1.pb == b2); D1 d1 = (D1) b1; @@ -364,7 +364,7 @@ public class AllTests AllTests.test(d1.pd1 == b2); AllTests.test(b2 != null); - AllTests.test(b2.ice_id().Equals("::B")); // No factory, must be sliced + AllTests.test(b2.ice_id().Equals("::Test::B")); // No factory, must be sliced AllTests.test(b2.sb.Equals("D2.sb")); AllTests.test(b2.pb == b1); callback.called(); @@ -383,12 +383,12 @@ public class AllTests private Callback callback = new Callback(); } - private class AMI_Test_paramTest2I : AMI_Test_paramTest2 + private class AMI_Test_paramTest2I : AMI_TestIntf_paramTest2 { public override void ice_response(B b2, B b1) { AllTests.test(b1 != null); - AllTests.test(b1.ice_id().Equals("::D1")); + AllTests.test(b1.ice_id().Equals("::Test::D1")); AllTests.test(b1.sb.Equals("D1.sb")); AllTests.test(b1.pb == b2); D1 d1 = (D1) b1; @@ -397,7 +397,7 @@ public class AllTests AllTests.test(d1.pd1 == b2); AllTests.test(b2 != null); - AllTests.test(b2.ice_id().Equals("::B")); // No factory, must be sliced + AllTests.test(b2.ice_id().Equals("::Test::B")); // No factory, must be sliced AllTests.test(b2.sb.Equals("D2.sb")); AllTests.test(b2.pb == b1); callback.called(); @@ -416,7 +416,7 @@ public class AllTests private Callback callback = new Callback(); } - private class AMI_Test_returnTest1I : AMI_Test_returnTest1 + private class AMI_Test_returnTest1I : AMI_TestIntf_returnTest1 { public override void ice_response(B r, B p1, B p2) { @@ -437,7 +437,7 @@ public class AllTests private Callback callback = new Callback(); } - private class AMI_Test_returnTest2I : AMI_Test_returnTest2 + private class AMI_Test_returnTest2I : AMI_TestIntf_returnTest2 { public override void ice_response(B r, B p1, B p2) { @@ -458,7 +458,7 @@ public class AllTests private Callback callback = new Callback(); } - private class AMI_Test_returnTest3I : AMI_Test_returnTest3 + private class AMI_Test_returnTest3I : AMI_TestIntf_returnTest3 { public override void ice_response(B b) { @@ -481,24 +481,24 @@ public class AllTests public B r; } - private class AMI_Test_paramTest3I : AMI_Test_paramTest3 + private class AMI_Test_paramTest3I : AMI_TestIntf_paramTest3 { public override void ice_response(B ret, B p1, B p2) { AllTests.test(p1 != null); AllTests.test(p1.sb.Equals("D2.sb (p1 1)")); AllTests.test(p1.pb == null); - AllTests.test(p1.ice_id().Equals("::B")); + AllTests.test(p1.ice_id().Equals("::Test::B")); AllTests.test(p2 != null); AllTests.test(p2.sb.Equals("D2.sb (p2 1)")); AllTests.test(p2.pb == null); - AllTests.test(p2.ice_id().Equals("::B")); + AllTests.test(p2.ice_id().Equals("::Test::B")); AllTests.test(ret != null); AllTests.test(ret.sb.Equals("D1.sb (p2 2)")); AllTests.test(ret.pb == null); - AllTests.test(ret.ice_id().Equals("::D1")); + AllTests.test(ret.ice_id().Equals("::Test::D1")); callback.called(); } @@ -515,19 +515,19 @@ public class AllTests private Callback callback = new Callback(); } - private class AMI_Test_paramTest4I : AMI_Test_paramTest4 + private class AMI_Test_paramTest4I : AMI_TestIntf_paramTest4 { public override void ice_response(B ret, B b) { AllTests.test(b != null); AllTests.test(b.sb.Equals("D4.sb (1)")); AllTests.test(b.pb == null); - AllTests.test(b.ice_id().Equals("::B")); + AllTests.test(b.ice_id().Equals("::Test::B")); AllTests.test(ret != null); AllTests.test(ret.sb.Equals("B.sb (2)")); AllTests.test(ret.pb == null); - AllTests.test(ret.ice_id().Equals("::B")); + AllTests.test(ret.ice_id().Equals("::Test::B")); callback.called(); } @@ -544,7 +544,7 @@ public class AllTests private Callback callback = new Callback(); } - private class AMI_Test_sequenceTestI : AMI_Test_sequenceTest + private class AMI_Test_sequenceTestI : AMI_TestIntf_sequenceTest { public override void ice_response(SS ss) { @@ -567,7 +567,7 @@ public class AllTests public SS r; } - private class AMI_Test_dictionaryTestI : AMI_Test_dictionaryTest + private class AMI_Test_dictionaryTestI : AMI_TestIntf_dictionaryTest { public override void ice_response(BDict r, BDict bout) { @@ -592,7 +592,7 @@ public class AllTests public BDict bout; } - private class AMI_Test_throwBaseAsBaseI : AMI_Test_throwBaseAsBase + private class AMI_Test_throwBaseAsBaseI : AMI_TestIntf_throwBaseAsBase { public override void ice_response() { @@ -624,7 +624,7 @@ public class AllTests private Callback callback = new Callback(); } - private class AMI_Test_throwDerivedAsBaseI : AMI_Test_throwDerivedAsBase + private class AMI_Test_throwDerivedAsBaseI : AMI_TestIntf_throwDerivedAsBase { public override void ice_response() { @@ -662,7 +662,7 @@ public class AllTests private Callback callback = new Callback(); } - private class AMI_Test_throwDerivedAsDerivedI : AMI_Test_throwDerivedAsDerived + private class AMI_Test_throwDerivedAsDerivedI : AMI_TestIntf_throwDerivedAsDerived { public override void ice_response() { @@ -700,7 +700,7 @@ public class AllTests private Callback callback = new Callback(); } - private class AMI_Test_throwUnknownDerivedAsBaseI : AMI_Test_throwUnknownDerivedAsBase + private class AMI_Test_throwUnknownDerivedAsBaseI : AMI_TestIntf_throwUnknownDerivedAsBase { public override void ice_response() { @@ -732,7 +732,7 @@ public class AllTests private Callback callback = new Callback(); } - private class AMI_Test_useForwardI : AMI_Test_useForward + private class AMI_Test_useForwardI : AMI_TestIntf_useForward { public override void ice_response(Forward f) { @@ -753,7 +753,7 @@ public class AllTests private Callback callback = new Callback(); } - public static TestPrx allTests(Ice.Communicator communicator, bool collocated) + public static TestIntfPrx allTests(Ice.Communicator communicator, bool collocated) { Console.Out.Write("testing stringToProxy... "); Console.Out.Flush(); @@ -764,7 +764,7 @@ public class AllTests Console.Out.Write("testing checked cast... "); Console.Out.Flush(); - TestPrx testPrx = TestPrxHelper.checkedCast(basePrx); + TestIntfPrx testPrx = TestIntfPrxHelper.checkedCast(basePrx); test(testPrx != null); test(testPrx.Equals(basePrx)); Console.Out.WriteLine("ok"); @@ -778,7 +778,7 @@ public class AllTests { o = testPrx.SBaseAsObject(); test(o != null); - test(o.ice_id().Equals("::SBase")); + test(o.ice_id().Equals("::Test::SBase")); sb = (SBase) o; } catch(Exception) @@ -935,7 +935,7 @@ public class AllTests { B b = testPrx.oneElementCycle(); test(b != null); - test(b.ice_id().Equals("::B")); + test(b.ice_id().Equals("::Test::B")); test(b.sb.Equals("B1.sb")); test(b.pb == b); } @@ -962,12 +962,12 @@ public class AllTests { B b1 = testPrx.twoElementCycle(); test(b1 != null); - test(b1.ice_id().Equals("::B")); + test(b1.ice_id().Equals("::Test::B")); test(b1.sb.Equals("B1.sb")); B b2 = b1.pb; test(b2 != null); - test(b2.ice_id().Equals("::B")); + test(b2.ice_id().Equals("::Test::B")); test(b2.sb.Equals("B2.sb")); test(b2.pb == b1); } @@ -995,7 +995,7 @@ public class AllTests B b1; b1 = testPrx.D1AsB(); test(b1 != null); - test(b1.ice_id().Equals("::D1")); + test(b1.ice_id().Equals("::Test::D1")); test(b1.sb.Equals("D1.sb")); test(b1.pb != null); test(b1.pb != b1); @@ -1010,7 +1010,7 @@ public class AllTests test(b2 != null); test(b2.pb == b1); test(b2.sb.Equals("D2.sb")); - test(b2.ice_id().Equals("::B")); + test(b2.ice_id().Equals("::Test::B")); } catch(Exception) { @@ -1036,14 +1036,14 @@ public class AllTests D1 d1; d1 = testPrx.D1AsD1(); test(d1 != null); - test(d1.ice_id().Equals("::D1")); + test(d1.ice_id().Equals("::Test::D1")); test(d1.sb.Equals("D1.sb")); test(d1.pb != null); test(d1.pb != d1); B b2 = d1.pb; test(b2 != null); - test(b2.ice_id().Equals("::B")); + test(b2.ice_id().Equals("::Test::B")); test(b2.sb.Equals("D2.sb")); test(b2.pb == d1); } @@ -1071,14 +1071,14 @@ public class AllTests B b2; b2 = testPrx.D2AsB(); test(b2 != null); - test(b2.ice_id().Equals("::B")); + test(b2.ice_id().Equals("::Test::B")); test(b2.sb.Equals("D2.sb")); test(b2.pb != null); test(b2.pb != b2); B b1 = b2.pb; test(b1 != null); - test(b1.ice_id().Equals("::D1")); + test(b1.ice_id().Equals("::Test::D1")); test(b1.sb.Equals("D1.sb")); test(b1.pb == b2); D1 d1 = (D1) b1; @@ -1112,7 +1112,7 @@ public class AllTests testPrx.paramTest1(out b1, out b2); test(b1 != null); - test(b1.ice_id().Equals("::D1")); + test(b1.ice_id().Equals("::Test::D1")); test(b1.sb.Equals("D1.sb")); test(b1.pb == b2); D1 d1 = (D1) b1; @@ -1121,7 +1121,7 @@ public class AllTests test(d1.pd1 == b2); test(b2 != null); - test(b2.ice_id().Equals("::B")); // No factory, must be sliced + test(b2.ice_id().Equals("::Test::B")); // No factory, must be sliced test(b2.sb.Equals("D2.sb")); test(b2.pb == b1); } @@ -1151,7 +1151,7 @@ public class AllTests testPrx.paramTest2(out b2, out b1); test(b1 != null); - test(b1.ice_id().Equals("::D1")); + test(b1.ice_id().Equals("::Test::D1")); test(b1.sb.Equals("D1.sb")); test(b1.pb == b2); D1 d1 = (D1) b1; @@ -1160,7 +1160,7 @@ public class AllTests test(d1.pd1 == b2); test(b2 != null); - test(b2.ice_id().Equals("::B")); // No factory, must be sliced + test(b2.ice_id().Equals("::Test::B")); // No factory, must be sliced test(b2.sb.Equals("D2.sb")); test(b2.pb == b1); } @@ -1252,7 +1252,7 @@ public class AllTests test(b1 != null); test(b1.sb.Equals("D1.sb")); - test(b1.ice_id().Equals("::D1")); + test(b1.ice_id().Equals("::Test::D1")); D1 p1 = (D1) b1; test(p1 != null); test(p1.sd1.Equals("D1.sd1")); @@ -1261,7 +1261,7 @@ public class AllTests B b2 = b1.pb; test(b2 != null); test(b2.sb.Equals("D3.sb")); - test(b2.ice_id().Equals("::B")); // Sliced by server + test(b2.ice_id().Equals("::Test::B")); // Sliced by server test(b2.pb == b1); bool gotException = false; try @@ -1307,7 +1307,7 @@ public class AllTests test(b1 != null); test(b1.sb.Equals("D1.sb")); - test(b1.ice_id().Equals("::D1")); + test(b1.ice_id().Equals("::Test::D1")); D1 p1 = (D1) b1; test(p1 != null); test(p1.sd1.Equals("D1.sd1")); @@ -1316,7 +1316,7 @@ public class AllTests B b2 = b1.pb; test(b2 != null); test(b2.sb.Equals("D3.sb")); - test(b2.ice_id().Equals("::B")); // Sliced by server + test(b2.ice_id().Equals("::Test::B")); // Sliced by server test(b2.pb == b1); bool gotException = false; try @@ -1356,7 +1356,7 @@ public class AllTests test(b1 != null); test(b1.sb.Equals("D3.sb")); - test(b1.ice_id().Equals("::B")); // Sliced by server + test(b1.ice_id().Equals("::Test::B")); // Sliced by server bool gotException = false; try @@ -1372,7 +1372,7 @@ public class AllTests B b2 = b1.pb; test(b2 != null); test(b2.sb.Equals("D1.sb")); - test(b2.ice_id().Equals("::D1")); + test(b2.ice_id().Equals("::Test::D1")); test(b2.pb == b1); D1 p3 = (D1) b2; test(p3 != null); @@ -1412,7 +1412,7 @@ public class AllTests test(b1 != null); test(b1.sb.Equals("D3.sb")); - test(b1.ice_id().Equals("::B")); // Sliced by server + test(b1.ice_id().Equals("::Test::B")); // Sliced by server bool gotException = false; try @@ -1428,7 +1428,7 @@ public class AllTests B b2 = b1.pb; test(b2 != null); test(b2.sb.Equals("D1.sb")); - test(b2.ice_id().Equals("::D1")); + test(b2.ice_id().Equals("::Test::D1")); test(b2.pb == b1); D1 p3 = (D1) b2; test(p3 != null); @@ -1454,17 +1454,17 @@ public class AllTests test(p1 != null); test(p1.sb.Equals("D2.sb (p1 1)")); test(p1.pb == null); - test(p1.ice_id().Equals("::B")); + test(p1.ice_id().Equals("::Test::B")); test(p2 != null); test(p2.sb.Equals("D2.sb (p2 1)")); test(p2.pb == null); - test(p2.ice_id().Equals("::B")); + test(p2.ice_id().Equals("::Test::B")); test(ret != null); test(ret.sb.Equals("D1.sb (p2 2)")); test(ret.pb == null); - test(ret.ice_id().Equals("::D1")); + test(ret.ice_id().Equals("::Test::D1")); } catch(Exception) { @@ -1493,12 +1493,12 @@ public class AllTests test(b != null); test(b.sb.Equals("D4.sb (1)")); test(b.pb == null); - test(b.ice_id().Equals("::B")); + test(b.ice_id().Equals("::Test::B")); test(ret != null); test(ret.sb.Equals("B.sb (2)")); test(ret.pb == null); - test(ret.ice_id().Equals("::B")); + test(ret.ice_id().Equals("::Test::B")); } catch(Exception) { @@ -1538,7 +1538,7 @@ public class AllTests B ret = testPrx.returnTest3(d3, b2); test(ret != null); - test(ret.ice_id().Equals("::B")); + test(ret.ice_id().Equals("::Test::B")); test(ret.sb.Equals("D3.sb")); test(ret.pb == ret); } @@ -1572,7 +1572,7 @@ public class AllTests B rv = cb.r; test(rv != null); - test(rv.ice_id().Equals("::B")); + test(rv.ice_id().Equals("::Test::B")); test(rv.sb.Equals("D3.sb")); test(rv.pb == rv); } @@ -1602,7 +1602,7 @@ public class AllTests B ret = testPrx.returnTest3(d3, d12); test(ret != null); - test(ret.ice_id().Equals("::B")); + test(ret.ice_id().Equals("::Test::B")); test(ret.sb.Equals("D3.sb")); test(ret.pb == ret); } @@ -1639,7 +1639,7 @@ public class AllTests B rv = cb.r; test(rv != null); - test(rv.ice_id().Equals("::B")); + test(rv.ice_id().Equals("::Test::B")); test(rv.sb.Equals("D3.sb")); test(rv.pb == rv); } @@ -1720,13 +1720,13 @@ public class AllTests test(ss2d2.pb == ss2b2); test(ss2d4.pb == ss2b2); - test(ss1b2.ice_id().Equals("::B")); - test(ss1d2.ice_id().Equals("::D1")); - test(ss1d4.ice_id().Equals("::B")); + test(ss1b2.ice_id().Equals("::Test::B")); + test(ss1d2.ice_id().Equals("::Test::D1")); + test(ss1d4.ice_id().Equals("::Test::B")); - test(ss2b2.ice_id().Equals("::B")); - test(ss2d2.ice_id().Equals("::D1")); - test(ss2d4.ice_id().Equals("::B")); + test(ss2b2.ice_id().Equals("::Test::B")); + test(ss2d2.ice_id().Equals("::Test::D1")); + test(ss2d4.ice_id().Equals("::Test::B")); } catch(Exception) { @@ -1810,13 +1810,13 @@ public class AllTests test(ss2d6.pb == ss2b3); test(ss2d6.pb == ss2b3); - test(ss1b3.ice_id().Equals("::B")); - test(ss1d5.ice_id().Equals("::D1")); - test(ss1d6.ice_id().Equals("::B")); + test(ss1b3.ice_id().Equals("::Test::B")); + test(ss1d5.ice_id().Equals("::Test::D1")); + test(ss1d6.ice_id().Equals("::Test::B")); - test(ss2b3.ice_id().Equals("::B")); - test(ss2d5.ice_id().Equals("::D1")); - test(ss2d6.ice_id().Equals("::B")); + test(ss2b3.ice_id().Equals("::Test::B")); + test(ss2d5.ice_id().Equals("::Test::D1")); + test(ss2d6.ice_id().Equals("::Test::B")); } Console.Out.WriteLine("ok"); @@ -1937,7 +1937,7 @@ public class AllTests } catch(BaseException e) { - test(e.GetType().FullName.Equals("BaseException")); + test(e.GetType().FullName.Equals("Test.BaseException")); test(e.sbe.Equals("sbe")); test(e.pb != null); test(e.pb.sb.Equals("sb")); @@ -1969,7 +1969,7 @@ public class AllTests } catch(DerivedException e) { - test(e.GetType().FullName.Equals("DerivedException")); + test(e.GetType().FullName.Equals("Test.DerivedException")); test(e.sbe.Equals("sbe")); test(e.pb != null); test(e.pb.sb.Equals("sb1")); @@ -2007,7 +2007,7 @@ public class AllTests } catch(DerivedException e) { - test(e.GetType().FullName.Equals("DerivedException")); + test(e.GetType().FullName.Equals("Test.DerivedException")); test(e.sbe.Equals("sbe")); test(e.pb != null); test(e.pb.sb.Equals("sb1")); @@ -2045,7 +2045,7 @@ public class AllTests } catch(BaseException e) { - test(e.GetType().FullName.Equals("BaseException")); + test(e.GetType().FullName.Equals("Test.BaseException")); test(e.sbe.Equals("sbe")); test(e.pb != null); test(e.pb.sb.Equals("sb d2")); diff --git a/cs/test/Ice/slicing/objects/Client.cs b/cs/test/Ice/slicing/objects/Client.cs index dd9df0bb842..a8fb026bc8f 100755 --- a/cs/test/Ice/slicing/objects/Client.cs +++ b/cs/test/Ice/slicing/objects/Client.cs @@ -7,12 +7,13 @@ // // ********************************************************************** +using Test; public class Client { private static int run(string[] args, Ice.Communicator communicator) { - TestPrx test = AllTests.allTests(communicator, false); + TestIntfPrx test = AllTests.allTests(communicator, false); test.shutdown(); return 0; } diff --git a/cs/test/Ice/slicing/objects/ClientPrivate.ice b/cs/test/Ice/slicing/objects/ClientPrivate.ice index c32c2495f52..6ee187eeba5 100755 --- a/cs/test/Ice/slicing/objects/ClientPrivate.ice +++ b/cs/test/Ice/slicing/objects/ClientPrivate.ice @@ -12,10 +12,15 @@ #include <Test.ice> +module Test +{ + class D3 extends B { string sd3; B pd3; }; +}; + #endif diff --git a/cs/test/Ice/slicing/objects/Forward.ice b/cs/test/Ice/slicing/objects/Forward.ice index 74ae4b8c7e0..b4a01e4aab8 100755 --- a/cs/test/Ice/slicing/objects/Forward.ice +++ b/cs/test/Ice/slicing/objects/Forward.ice @@ -10,6 +10,9 @@ #ifndef FORWARD_ICE #define FORWARD_ICE +module Test +{ + class Forward; class Hidden @@ -22,4 +25,6 @@ class Forward Hidden h; }; +}; + #endif diff --git a/cs/test/Ice/slicing/objects/ServerPrivate.ice b/cs/test/Ice/slicing/objects/ServerPrivate.ice index b963d10122d..ecd2228876e 100755 --- a/cs/test/Ice/slicing/objects/ServerPrivate.ice +++ b/cs/test/Ice/slicing/objects/ServerPrivate.ice @@ -12,6 +12,9 @@ #include <Test.ice> +module Test +{ + class SBSUnknownDerived extends SBase { string sbsud; @@ -40,4 +43,6 @@ exception UnknownDerivedException extends BaseException D2 pd2; }; +}; + #endif diff --git a/cs/test/Ice/slicing/objects/ServerPrivateAMD.ice b/cs/test/Ice/slicing/objects/ServerPrivateAMD.ice index 07e05c6a76b..8c9a5ec3d13 100644 --- a/cs/test/Ice/slicing/objects/ServerPrivateAMD.ice +++ b/cs/test/Ice/slicing/objects/ServerPrivateAMD.ice @@ -12,6 +12,9 @@ #include <TestAMD.ice> +module Test +{ + class SBSUnknownDerived extends SBase { string sbsud; @@ -40,4 +43,6 @@ exception UnknownDerivedException extends BaseException D2 pd2; }; +}; + #endif diff --git a/cs/test/Ice/slicing/objects/Test.ice b/cs/test/Ice/slicing/objects/Test.ice index e044aba5358..92dd4e96fea 100755 --- a/cs/test/Ice/slicing/objects/Test.ice +++ b/cs/test/Ice/slicing/objects/Test.ice @@ -10,6 +10,9 @@ #ifndef TEST_ICE #define TEST_ICE +module Test +{ + class SBase { string sb; @@ -66,7 +69,7 @@ exception DerivedException extends BaseException class Forward; // Forward-declared class defined in another compilation unit -["ami"] interface Test +["ami"] interface TestIntf { Object SBaseAsObject(); SBase SBaseAsSBase(); @@ -106,4 +109,6 @@ class Forward; // Forward-declared class defined in another compilation unit void shutdown(); }; +}; + #endif diff --git a/cs/test/Ice/slicing/objects/TestAMD.ice b/cs/test/Ice/slicing/objects/TestAMD.ice index c7372c19053..ab36efb2764 100644 --- a/cs/test/Ice/slicing/objects/TestAMD.ice +++ b/cs/test/Ice/slicing/objects/TestAMD.ice @@ -10,6 +10,9 @@ #ifndef TEST_AMD_ICE #define TEST_AMD_ICE +module Test +{ + class SBase { string sb; @@ -66,7 +69,7 @@ exception DerivedException extends BaseException class Forward; // Forward-declared class defined in another compilation unit -["ami", "amd"] interface Test +["ami", "amd"] interface TestIntf { Object SBaseAsObject(); SBase SBaseAsSBase(); @@ -106,4 +109,6 @@ class Forward; // Forward-declared class defined in another compilation unit void shutdown(); }; +}; + #endif diff --git a/cs/test/Ice/slicing/objects/TestAMDI.cs b/cs/test/Ice/slicing/objects/TestAMDI.cs index 47fc2c96a98..39dd8a845b2 100755 --- a/cs/test/Ice/slicing/objects/TestAMDI.cs +++ b/cs/test/Ice/slicing/objects/TestAMDI.cs @@ -8,35 +8,36 @@ // ********************************************************************** using System; +using Test; -public sealed class TestI : _TestDisp +public sealed class TestI : _TestIntfDisp { public TestI(Ice.ObjectAdapter adapter) { _adapter = adapter; } - public override void shutdown_async(AMD_Test_shutdown cb, Ice.Current current) + public override void shutdown_async(AMD_TestIntf_shutdown cb, Ice.Current current) { _adapter.getCommunicator().shutdown(); cb.ice_response(); } - public override void SBaseAsObject_async(AMD_Test_SBaseAsObject cb, Ice.Current current) + public override void SBaseAsObject_async(AMD_TestIntf_SBaseAsObject cb, Ice.Current current) { SBase sb = new SBase(); sb.sb = "SBase.sb"; cb.ice_response(sb); } - public override void SBaseAsSBase_async(AMD_Test_SBaseAsSBase cb, Ice.Current current) + public override void SBaseAsSBase_async(AMD_TestIntf_SBaseAsSBase cb, Ice.Current current) { SBase sb = new SBase(); sb.sb = "SBase.sb"; cb.ice_response(sb); } - public override void SBSKnownDerivedAsSBase_async(AMD_Test_SBSKnownDerivedAsSBase cb, Ice.Current current) + public override void SBSKnownDerivedAsSBase_async(AMD_TestIntf_SBSKnownDerivedAsSBase cb, Ice.Current current) { SBSKnownDerived sbskd = new SBSKnownDerived(); sbskd.sb = "SBSKnownDerived.sb"; @@ -44,7 +45,7 @@ public sealed class TestI : _TestDisp cb.ice_response(sbskd); } - public override void SBSKnownDerivedAsSBSKnownDerived_async(AMD_Test_SBSKnownDerivedAsSBSKnownDerived cb, Ice.Current current) + public override void SBSKnownDerivedAsSBSKnownDerived_async(AMD_TestIntf_SBSKnownDerivedAsSBSKnownDerived cb, Ice.Current current) { SBSKnownDerived sbskd = new SBSKnownDerived(); sbskd.sb = "SBSKnownDerived.sb"; @@ -52,7 +53,7 @@ public sealed class TestI : _TestDisp cb.ice_response(sbskd); } - public override void SBSUnknownDerivedAsSBase_async(AMD_Test_SBSUnknownDerivedAsSBase cb, Ice.Current current) + public override void SBSUnknownDerivedAsSBase_async(AMD_TestIntf_SBSUnknownDerivedAsSBase cb, Ice.Current current) { SBSUnknownDerived sbsud = new SBSUnknownDerived(); sbsud.sb = "SBSUnknownDerived.sb"; @@ -60,14 +61,14 @@ public sealed class TestI : _TestDisp cb.ice_response(sbsud); } - public override void SUnknownAsObject_async(AMD_Test_SUnknownAsObject cb, Ice.Current current) + public override void SUnknownAsObject_async(AMD_TestIntf_SUnknownAsObject cb, Ice.Current current) { SUnknown su = new SUnknown(); su.su = "SUnknown.su"; cb.ice_response(su); } - public override void oneElementCycle_async(AMD_Test_oneElementCycle cb, Ice.Current current) + public override void oneElementCycle_async(AMD_TestIntf_oneElementCycle cb, Ice.Current current) { B b = new B(); b.sb = "B1.sb"; @@ -75,7 +76,7 @@ public sealed class TestI : _TestDisp cb.ice_response(b); } - public override void twoElementCycle_async(AMD_Test_twoElementCycle cb, Ice.Current current) + public override void twoElementCycle_async(AMD_TestIntf_twoElementCycle cb, Ice.Current current) { B b1 = new B(); b1.sb = "B1.sb"; @@ -86,7 +87,7 @@ public sealed class TestI : _TestDisp cb.ice_response(b1); } - public override void D1AsB_async(AMD_Test_D1AsB cb, Ice.Current current) + public override void D1AsB_async(AMD_TestIntf_D1AsB cb, Ice.Current current) { D1 d1 = new D1(); d1.sb = "D1.sb"; @@ -101,7 +102,7 @@ public sealed class TestI : _TestDisp cb.ice_response(d1); } - public override void D1AsD1_async(AMD_Test_D1AsD1 cb, Ice.Current current) + public override void D1AsD1_async(AMD_TestIntf_D1AsD1 cb, Ice.Current current) { D1 d1 = new D1(); d1.sb = "D1.sb"; @@ -116,7 +117,7 @@ public sealed class TestI : _TestDisp cb.ice_response(d1); } - public override void D2AsB_async(AMD_Test_D2AsB cb, Ice.Current current) + public override void D2AsB_async(AMD_TestIntf_D2AsB cb, Ice.Current current) { D2 d2 = new D2(); d2.sb = "D2.sb"; @@ -131,7 +132,7 @@ public sealed class TestI : _TestDisp cb.ice_response(d2); } - public override void paramTest1_async(AMD_Test_paramTest1 cb, Ice.Current current) + public override void paramTest1_async(AMD_TestIntf_paramTest1 cb, Ice.Current current) { D1 d1 = new D1(); d1.sb = "D1.sb"; @@ -146,7 +147,7 @@ public sealed class TestI : _TestDisp cb.ice_response(d1, d2); } - public override void paramTest2_async(AMD_Test_paramTest2 cb, Ice.Current current) + public override void paramTest2_async(AMD_TestIntf_paramTest2 cb, Ice.Current current) { D1 d1 = new D1(); d1.sb = "D1.sb"; @@ -161,7 +162,7 @@ public sealed class TestI : _TestDisp cb.ice_response(d2, d1); } - public override void paramTest3_async(AMD_Test_paramTest3 cb, Ice.Current current) + public override void paramTest3_async(AMD_TestIntf_paramTest3 cb, Ice.Current current) { D2 d2 = new D2(); d2.sb = "D2.sb (p1 1)"; @@ -189,7 +190,7 @@ public sealed class TestI : _TestDisp cb.ice_response(d3, d2, d4); } - public override void paramTest4_async(AMD_Test_paramTest4 cb, Ice.Current current) + public override void paramTest4_async(AMD_TestIntf_paramTest4 cb, Ice.Current current) { D4 d4 = new D4(); d4.sb = "D4.sb (1)"; @@ -201,7 +202,7 @@ public sealed class TestI : _TestDisp cb.ice_response(d4.p2, d4); } - public override void returnTest1_async(AMD_Test_returnTest1 cb, Ice.Current current) + public override void returnTest1_async(AMD_TestIntf_returnTest1 cb, Ice.Current current) { D1 d1 = new D1(); d1.sb = "D1.sb"; @@ -216,7 +217,7 @@ public sealed class TestI : _TestDisp cb.ice_response(d2, d2, d1); } - public override void returnTest2_async(AMD_Test_returnTest2 cb, Ice.Current current) + public override void returnTest2_async(AMD_TestIntf_returnTest2 cb, Ice.Current current) { D1 d1 = new D1(); d1.sb = "D1.sb"; @@ -231,12 +232,12 @@ public sealed class TestI : _TestDisp cb.ice_response(d1, d1, d2); } - public override void returnTest3_async(AMD_Test_returnTest3 cb, B p1, B p2, Ice.Current current) + public override void returnTest3_async(AMD_TestIntf_returnTest3 cb, B p1, B p2, Ice.Current current) { cb.ice_response(p1); } - public override void sequenceTest_async(AMD_Test_sequenceTest cb, SS1 p1, SS2 p2, Ice.Current current) + public override void sequenceTest_async(AMD_TestIntf_sequenceTest cb, SS1 p1, SS2 p2, Ice.Current current) { SS ss = new SS(); ss.c1 = p1; @@ -244,7 +245,7 @@ public sealed class TestI : _TestDisp cb.ice_response(ss); } - public override void dictionaryTest_async(AMD_Test_dictionaryTest cb, BDict bin, Ice.Current current) + public override void dictionaryTest_async(AMD_TestIntf_dictionaryTest cb, BDict bin, Ice.Current current) { BDict bout = new BDict(); int i; @@ -272,7 +273,7 @@ public sealed class TestI : _TestDisp cb.ice_response(r, bout); } - public override void throwBaseAsBase_async(AMD_Test_throwBaseAsBase cb, Ice.Current current) + public override void throwBaseAsBase_async(AMD_TestIntf_throwBaseAsBase cb, Ice.Current current) { BaseException be = new BaseException(); be.sbe = "sbe"; @@ -282,7 +283,7 @@ public sealed class TestI : _TestDisp cb.ice_exception(be); } - public override void throwDerivedAsBase_async(AMD_Test_throwDerivedAsBase cb, Ice.Current current) + public override void throwDerivedAsBase_async(AMD_TestIntf_throwDerivedAsBase cb, Ice.Current current) { DerivedException de = new DerivedException(); de.sbe = "sbe"; @@ -298,7 +299,7 @@ public sealed class TestI : _TestDisp cb.ice_exception(de); } - public override void throwDerivedAsDerived_async(AMD_Test_throwDerivedAsDerived cb, Ice.Current current) + public override void throwDerivedAsDerived_async(AMD_TestIntf_throwDerivedAsDerived cb, Ice.Current current) { DerivedException de = new DerivedException(); de.sbe = "sbe"; @@ -314,7 +315,7 @@ public sealed class TestI : _TestDisp cb.ice_exception(de); } - public override void throwUnknownDerivedAsBase_async(AMD_Test_throwUnknownDerivedAsBase cb, Ice.Current current) + public override void throwUnknownDerivedAsBase_async(AMD_TestIntf_throwUnknownDerivedAsBase cb, Ice.Current current) { D2 d2 = new D2(); d2.sb = "sb d2"; @@ -330,7 +331,7 @@ public sealed class TestI : _TestDisp cb.ice_exception(ude); } - public override void useForward_async(AMD_Test_useForward cb, Ice.Current current) + public override void useForward_async(AMD_TestIntf_useForward cb, Ice.Current current) { Forward f = new Forward(); f = new Forward(); diff --git a/cs/test/Ice/slicing/objects/TestI.cs b/cs/test/Ice/slicing/objects/TestI.cs index dc5699901e2..fd9fbf0a321 100755 --- a/cs/test/Ice/slicing/objects/TestI.cs +++ b/cs/test/Ice/slicing/objects/TestI.cs @@ -7,10 +7,10 @@ // // ********************************************************************** - using System; +using Test; -public sealed class TestI : _TestDisp +public sealed class TestI : _TestIntfDisp { public TestI(Ice.ObjectAdapter adapter) { |