diff options
| author | Bernard Normier <bernard@zeroc.com> | 2018-10-18 12:01:54 -0400 |
|---|---|---|
| committer | Jose <pepone@users.noreply.github.com> | 2018-10-18 18:01:53 +0200 |
| commit | 456001e3e4dbb3f15396c0598b6ddb5436ac3a2a (patch) | |
| tree | facb9db494f91b066a1c0b5e29c371ec523a82e7 /csharp/test | |
| parent | Update Xamarin test instructions (diff) | |
| download | ice-456001e3e4dbb3f15396c0598b6ddb5436ac3a2a.tar.bz2 ice-456001e3e4dbb3f15396c0598b6ddb5436ac3a2a.tar.xz ice-456001e3e4dbb3f15396c0598b6ddb5436ac3a2a.zip | |
Rework cs:namespace implementation (fix issue #239) (#249)
* Rework the cs:namespace implementation
No longer rely on Ice.Packages. Fixes #239.
* Renamed Ice/packagemd to Ice/namespacemd (C#)
* Removed Ice.Package property from C# tests
* Switched to get-only attribute, fixed Xamarin test
Diffstat (limited to 'csharp/test')
137 files changed, 479 insertions, 644 deletions
diff --git a/csharp/test/Ice/acm/Client.cs b/csharp/test/Ice/acm/Client.cs index 14776a3a372..f0103fb79bf 100644 --- a/csharp/test/Ice/acm/Client.cs +++ b/csharp/test/Ice/acm/Client.cs @@ -18,7 +18,6 @@ namespace Ice override public void run(string[] args) { var properties = createTestProperties(ref args); - properties.setProperty("Ice.Package.Test", "Ice.acm"); properties.setProperty("Ice.Warn.Connections", "0"); using(var communicator = initialize(properties)) { diff --git a/csharp/test/Ice/acm/Server.cs b/csharp/test/Ice/acm/Server.cs index e66f1d70143..3ac6dcd514a 100644 --- a/csharp/test/Ice/acm/Server.cs +++ b/csharp/test/Ice/acm/Server.cs @@ -20,7 +20,6 @@ namespace Ice var properties = createTestProperties(ref args); properties.setProperty("Ice.Warn.Connections", "0"); properties.setProperty("Ice.ACM.Timeout", "1"); - properties.setProperty("Ice.Package.Test", "Ice.acm"); using(var communicator = initialize(properties)) { communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0)); diff --git a/csharp/test/Ice/acm/Test.ice b/csharp/test/Ice/acm/Test.ice index 1f87b261e4f..ce87ab906f8 100644 --- a/csharp/test/Ice/acm/Test.ice +++ b/csharp/test/Ice/acm/Test.ice @@ -9,7 +9,7 @@ #pragma once -[["cs:namespace:Ice.acm"]] +["cs:namespace:Ice.acm"] module Test { diff --git a/csharp/test/Ice/adapterDeactivation/Client.cs b/csharp/test/Ice/adapterDeactivation/Client.cs index 5490d4a8f55..bdfb5be0ed7 100644 --- a/csharp/test/Ice/adapterDeactivation/Client.cs +++ b/csharp/test/Ice/adapterDeactivation/Client.cs @@ -17,9 +17,7 @@ namespace Ice { public override void run(string[] args) { - var properties = createTestProperties(ref args); - properties.setProperty("Ice.Package.Test", "Ice.adapterDeactivation"); - using(var communicator = initialize(properties)) + using(var communicator = initialize(ref args)) { AllTests.allTests(this); } diff --git a/csharp/test/Ice/adapterDeactivation/Collocated.cs b/csharp/test/Ice/adapterDeactivation/Collocated.cs index 3483c5b4187..3dd00450169 100644 --- a/csharp/test/Ice/adapterDeactivation/Collocated.cs +++ b/csharp/test/Ice/adapterDeactivation/Collocated.cs @@ -17,9 +17,7 @@ namespace Ice { public override void run(string[] args) { - Ice.Properties properties = createTestProperties(ref args); - properties.setProperty("Ice.Package.Test", "Ice.adapterDeactivation"); - using(var communicator = initialize(properties)) + using(var communicator = initialize(ref args)) { communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0)); diff --git a/csharp/test/Ice/adapterDeactivation/Server.cs b/csharp/test/Ice/adapterDeactivation/Server.cs index b5d336d569d..c466d1451df 100644 --- a/csharp/test/Ice/adapterDeactivation/Server.cs +++ b/csharp/test/Ice/adapterDeactivation/Server.cs @@ -17,9 +17,7 @@ namespace Ice { public override void run(string[] args) { - Ice.Properties properties = createTestProperties(ref args); - properties.setProperty("Ice.Package.Test", "Ice.adapterDeactivation"); - using(var communicator = initialize(properties)) + using(var communicator = initialize(ref args)) { communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0)); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); diff --git a/csharp/test/Ice/adapterDeactivation/Test.ice b/csharp/test/Ice/adapterDeactivation/Test.ice index 538d3973ac3..3714101ee5c 100644 --- a/csharp/test/Ice/adapterDeactivation/Test.ice +++ b/csharp/test/Ice/adapterDeactivation/Test.ice @@ -9,7 +9,7 @@ #pragma once -[["cs:namespace:Ice.adapterDeactivation"]] +["cs:namespace:Ice.adapterDeactivation"] module Test { diff --git a/csharp/test/Ice/admin/Client.cs b/csharp/test/Ice/admin/Client.cs index 6bc31610895..e39a4774f4a 100644 --- a/csharp/test/Ice/admin/Client.cs +++ b/csharp/test/Ice/admin/Client.cs @@ -17,9 +17,7 @@ namespace Ice { public override void run(string[] args) { - Ice.Properties properties = createTestProperties(ref args); - properties.setProperty("Ice.Package.Test", "Ice.admin"); - using(var communicator = initialize(properties)) + using(var communicator = initialize(ref args)) { AllTests.allTests(this); } diff --git a/csharp/test/Ice/admin/Server.cs b/csharp/test/Ice/admin/Server.cs index a56e84507c6..c779ec971f1 100644 --- a/csharp/test/Ice/admin/Server.cs +++ b/csharp/test/Ice/admin/Server.cs @@ -17,9 +17,7 @@ namespace Ice { public override void run(string[] args) { - Ice.Properties properties = createTestProperties(ref args); - properties.setProperty("Ice.Package.Test", "Ice.admin"); - using(var communicator = initialize(properties)) + using(var communicator = initialize(ref args)) { communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0) + " -t 10000"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); diff --git a/csharp/test/Ice/admin/Test.ice b/csharp/test/Ice/admin/Test.ice index 99e0120a395..a71dffc038a 100644 --- a/csharp/test/Ice/admin/Test.ice +++ b/csharp/test/Ice/admin/Test.ice @@ -12,7 +12,7 @@ #include <Ice/Properties.ice> -[["cs:namespace:Ice.admin"]] +["cs:namespace:Ice.admin"] module Test { diff --git a/csharp/test/Ice/ami/Client.cs b/csharp/test/Ice/ami/Client.cs index d77f2ad6cb5..e588d4e68d2 100644 --- a/csharp/test/Ice/ami/Client.cs +++ b/csharp/test/Ice/ami/Client.cs @@ -21,8 +21,6 @@ namespace Ice properties.setProperty("Ice.Warn.AMICallback", "0"); properties.setProperty("Ice.Warn.Connections", "0"); - properties.setProperty("Ice.Package.Test", "Ice.ami"); - // // We use a client thread pool with more than one thread to test // that task inlining works. diff --git a/csharp/test/Ice/ami/Collocated.cs b/csharp/test/Ice/ami/Collocated.cs index dee6131c808..553926887a4 100644 --- a/csharp/test/Ice/ami/Collocated.cs +++ b/csharp/test/Ice/ami/Collocated.cs @@ -30,7 +30,6 @@ namespace Ice // that task inlining works. // properties.setProperty("Ice.ThreadPool.Client.Size", "5"); - properties.setProperty("Ice.Package.Test", "Ice.ami"); using(var communicator = initialize(properties)) { communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0)); diff --git a/csharp/test/Ice/ami/Server.cs b/csharp/test/Ice/ami/Server.cs index ff97f24ca3e..8707d1385b7 100644 --- a/csharp/test/Ice/ami/Server.cs +++ b/csharp/test/Ice/ami/Server.cs @@ -34,7 +34,6 @@ namespace Ice // send() blocking after sending a given amount of data. // properties.setProperty("Ice.TCP.RcvSize", "50000"); - properties.setProperty("Ice.Package.Test", "Ice.ami"); using(var communicator = initialize(properties)) { diff --git a/csharp/test/Ice/ami/Test.ice b/csharp/test/Ice/ami/Test.ice index 814015ecb22..3c36f84e5cc 100644 --- a/csharp/test/Ice/ami/Test.ice +++ b/csharp/test/Ice/ami/Test.ice @@ -12,7 +12,7 @@ #include <Ice/BuiltinSequences.ice> #include <Ice/Identity.ice> -[["cs:namespace:Ice.ami"]] +["cs:namespace:Ice.ami"] module Test { diff --git a/csharp/test/Ice/binding/Client.cs b/csharp/test/Ice/binding/Client.cs index 21544124074..3e1bcb8c5fb 100644 --- a/csharp/test/Ice/binding/Client.cs +++ b/csharp/test/Ice/binding/Client.cs @@ -17,9 +17,7 @@ namespace Ice { public override void run(string[] args) { - var properties = createTestProperties(ref args); - properties.setProperty("Ice.Package.Test", "Ice.binding"); - using(var communicator = initialize(properties)) + using(var communicator = initialize(ref args)) { AllTests.allTests(this); } diff --git a/csharp/test/Ice/binding/Server.cs b/csharp/test/Ice/binding/Server.cs index 940c7c81a8f..4046031b934 100644 --- a/csharp/test/Ice/binding/Server.cs +++ b/csharp/test/Ice/binding/Server.cs @@ -19,7 +19,6 @@ namespace Ice { Ice.Properties properties = createTestProperties(ref args); properties.setProperty("Ice.ServerIdleTime", "30"); - properties.setProperty("Ice.Package.Test", "Ice.binding"); using(var communicator = initialize(properties)) { communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0)); diff --git a/csharp/test/Ice/binding/Test.ice b/csharp/test/Ice/binding/Test.ice index a9843836d95..94b88fee36c 100644 --- a/csharp/test/Ice/binding/Test.ice +++ b/csharp/test/Ice/binding/Test.ice @@ -9,7 +9,7 @@ #pragma once -[["cs:namespace:Ice.binding"]] +["cs:namespace:Ice.binding"] module Test { diff --git a/csharp/test/Ice/checksum/Client.cs b/csharp/test/Ice/checksum/Client.cs index 2dce5e4bf07..3f002778309 100644 --- a/csharp/test/Ice/checksum/Client.cs +++ b/csharp/test/Ice/checksum/Client.cs @@ -17,9 +17,7 @@ namespace Ice { public override void run(string[] args) { - var properties = createTestProperties(ref args); - properties.setProperty("Ice.Package.Test", "Ice.checksum"); - using(var communicator = initialize(properties)) + using(var communicator = initialize(ref args)) { var checksum = AllTests.allTests(this, false); checksum.shutdown(); diff --git a/csharp/test/Ice/checksum/Server.cs b/csharp/test/Ice/checksum/Server.cs index d9c08e7b1a2..525b8b12552 100644 --- a/csharp/test/Ice/checksum/Server.cs +++ b/csharp/test/Ice/checksum/Server.cs @@ -17,9 +17,7 @@ namespace Ice { public override void run(string[] args) { - var properties = createTestProperties(ref args); - properties.setProperty("Ice.Package.Test", "Ice.checksum"); - using(var communicator = initialize(properties)) + using(var communicator = initialize(ref args)) { communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0) + " -t 2000"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); diff --git a/csharp/test/Ice/checksum/Test.ice b/csharp/test/Ice/checksum/Test.ice index 1f910936dc0..642bf769a13 100644 --- a/csharp/test/Ice/checksum/Test.ice +++ b/csharp/test/Ice/checksum/Test.ice @@ -11,7 +11,7 @@ #include <Ice/SliceChecksumDict.ice> -[["cs:namespace:Ice.checksum"]] +["cs:namespace:Ice.checksum"] module Test { diff --git a/csharp/test/Ice/defaultServant/Client.cs b/csharp/test/Ice/defaultServant/Client.cs index 980df00cc5c..53cf576a3fe 100644 --- a/csharp/test/Ice/defaultServant/Client.cs +++ b/csharp/test/Ice/defaultServant/Client.cs @@ -17,9 +17,7 @@ namespace Ice { public override void run(string[] args) { - var properties = createTestProperties(ref args); - properties.setProperty("Ice.Package.Test", "Ice.defaultServant"); - using(var communicator = initialize(properties)) + using(var communicator = initialize(ref args)) { AllTests.allTests(this); } diff --git a/csharp/test/Ice/defaultServant/Test.ice b/csharp/test/Ice/defaultServant/Test.ice index a941e0872d9..092e3c36246 100644 --- a/csharp/test/Ice/defaultServant/Test.ice +++ b/csharp/test/Ice/defaultServant/Test.ice @@ -9,7 +9,7 @@ #pragma once -[["cs:namespace:Ice.defaultServant"]] +["cs:namespace:Ice.defaultServant"] module Test { diff --git a/csharp/test/Ice/defaultValue/Test.ice b/csharp/test/Ice/defaultValue/Test.ice index 4ccbdfa0eeb..69e48d8af62 100644 --- a/csharp/test/Ice/defaultValue/Test.ice +++ b/csharp/test/Ice/defaultValue/Test.ice @@ -12,8 +12,8 @@ // // Suppress warnings // -[["suppress-warning:invalid-metadata, deprecated"]] -[["cs:namespace:Ice.defaultValue"]] +[["suppress-warning:invalid-metadata, deprecated", "cs:typeid-namespace:Ice.defaultValue.TypeId"]] +["cs:namespace:Ice.defaultValue"] module Test { diff --git a/csharp/test/Ice/dictMapping/Client.cs b/csharp/test/Ice/dictMapping/Client.cs index a5a2a1186a8..cd73921a928 100644 --- a/csharp/test/Ice/dictMapping/Client.cs +++ b/csharp/test/Ice/dictMapping/Client.cs @@ -17,9 +17,7 @@ namespace Ice { public override void run(string[] args) { - var properties = createTestProperties(ref args); - properties.setProperty("Ice.Package.Test", "Ice.dictMapping"); - using(var communicator = initialize(properties)) + using(var communicator = initialize(ref args)) { var output = getWriter(); var myClass = AllTests.allTests(this, false); diff --git a/csharp/test/Ice/dictMapping/Collocated.cs b/csharp/test/Ice/dictMapping/Collocated.cs index 74071c5087c..a4e687b5954 100644 --- a/csharp/test/Ice/dictMapping/Collocated.cs +++ b/csharp/test/Ice/dictMapping/Collocated.cs @@ -17,9 +17,7 @@ namespace Ice { public override void run(string[] args) { - var properties = createTestProperties(ref args); - properties.setProperty("Ice.Package.Test", "Ice.dictMapping"); - using(var communicator = initialize(properties)) + using(var communicator = initialize(ref args)) { communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0)); var adapter = communicator.createObjectAdapter("TestAdapter"); diff --git a/csharp/test/Ice/dictMapping/Server.cs b/csharp/test/Ice/dictMapping/Server.cs index 36b7276c344..d599867dc2c 100644 --- a/csharp/test/Ice/dictMapping/Server.cs +++ b/csharp/test/Ice/dictMapping/Server.cs @@ -17,9 +17,7 @@ namespace Ice { public override void run(string[] args) { - var properties = createTestProperties(ref args); - properties.setProperty("Ice.Package.Test", "Ice.dictMapping"); - using(var communicator = initialize(properties)) + using(var communicator = initialize(ref args)) { communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0)); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); diff --git a/csharp/test/Ice/dictMapping/ServerAMD.cs b/csharp/test/Ice/dictMapping/ServerAMD.cs index 6a1a8381e01..69e641caf66 100644 --- a/csharp/test/Ice/dictMapping/ServerAMD.cs +++ b/csharp/test/Ice/dictMapping/ServerAMD.cs @@ -19,9 +19,7 @@ namespace Ice { public override void run(string[] args) { - var properties = createTestProperties(ref args); - properties.setProperty("Ice.Package.Test", "Ice.dictMapping.AMD"); - using(var communicator = initialize(properties)) + using(var communicator = initialize(ref args)) { communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0)); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); diff --git a/csharp/test/Ice/dictMapping/Test.ice b/csharp/test/Ice/dictMapping/Test.ice index 28458d1dd0f..142269273fd 100644 --- a/csharp/test/Ice/dictMapping/Test.ice +++ b/csharp/test/Ice/dictMapping/Test.ice @@ -9,7 +9,7 @@ #pragma once -[["cs:namespace:Ice.dictMapping"]] +["cs:namespace:Ice.dictMapping"] module Test { diff --git a/csharp/test/Ice/dictMapping/TestAMD.ice b/csharp/test/Ice/dictMapping/TestAMD.ice index c84d040dfb0..5e9644b02d4 100644 --- a/csharp/test/Ice/dictMapping/TestAMD.ice +++ b/csharp/test/Ice/dictMapping/TestAMD.ice @@ -9,7 +9,7 @@ #pragma once -[["cs:namespace:Ice.dictMapping.AMD"]] +["cs:namespace:Ice.dictMapping.AMD"] module Test { diff --git a/csharp/test/Ice/enums/Client.cs b/csharp/test/Ice/enums/Client.cs index 238ffd41aed..b5116c866fc 100644 --- a/csharp/test/Ice/enums/Client.cs +++ b/csharp/test/Ice/enums/Client.cs @@ -17,9 +17,7 @@ namespace Ice { public override void run(string[] args) { - var properties = createTestProperties(ref args); - properties.setProperty("Ice.Package.Test", "Ice.enums"); - using(var communicator = initialize(properties)) + using(var communicator = initialize(ref args)) { var proxy = AllTests.allTests(this); proxy.shutdown(); diff --git a/csharp/test/Ice/enums/Server.cs b/csharp/test/Ice/enums/Server.cs index 1b847db5611..eacb87d108e 100644 --- a/csharp/test/Ice/enums/Server.cs +++ b/csharp/test/Ice/enums/Server.cs @@ -19,7 +19,6 @@ namespace Ice { Ice.Properties properties = createTestProperties(ref args); properties.setProperty("Ice.ServerIdleTime", "30"); - properties.setProperty("Ice.Package.Test", "Ice.enums"); using(var communicator = initialize(properties)) { communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0)); diff --git a/csharp/test/Ice/enums/Test.ice b/csharp/test/Ice/enums/Test.ice index 0155e84bc4a..a343a030ac6 100644 --- a/csharp/test/Ice/enums/Test.ice +++ b/csharp/test/Ice/enums/Test.ice @@ -9,7 +9,7 @@ #pragma once -[["cs:namespace:Ice.enums"]] +["cs:namespace:Ice.enums"] module Test { diff --git a/csharp/test/Ice/exceptions/Client.cs b/csharp/test/Ice/exceptions/Client.cs index f08c2816bee..30d217346eb 100644 --- a/csharp/test/Ice/exceptions/Client.cs +++ b/csharp/test/Ice/exceptions/Client.cs @@ -17,11 +17,12 @@ namespace Ice { public override void run(string[] args) { - Ice.Properties properties = createTestProperties(ref args); - properties.setProperty("Ice.Warn.Connections", "0"); - properties.setProperty("Ice.MessageSizeMax", "10"); // 10KB max - properties.setProperty("Ice.Package.Test", "Ice.exceptions"); - using(var communicator = initialize(properties)) + var initData = new InitializationData(); + initData.typeIdNamespaces = new string[]{"Ice.exceptions.TypeId"}; + initData.properties = createTestProperties(ref args); + initData.properties.setProperty("Ice.Warn.Connections", "0"); + initData.properties.setProperty("Ice.MessageSizeMax", "10"); // 10KB max + using(var communicator = initialize(initData)) { communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0)); var thrower = AllTests.allTests(this); diff --git a/csharp/test/Ice/exceptions/Collocated.cs b/csharp/test/Ice/exceptions/Collocated.cs index 1ad522e9b81..7c3a97684c6 100644 --- a/csharp/test/Ice/exceptions/Collocated.cs +++ b/csharp/test/Ice/exceptions/Collocated.cs @@ -17,12 +17,13 @@ namespace Ice { public override void run(string[] args) { - Ice.Properties properties = createTestProperties(ref args); - properties.setProperty("Ice.Warn.Connections", "0"); - properties.setProperty("Ice.Warn.Dispatch", "0"); - properties.setProperty("Ice.MessageSizeMax", "10"); // 10KB max - properties.setProperty("Ice.Package.Test", "Ice.exceptions"); - using(var communicator = initialize(properties)) + var initData = new InitializationData(); + initData.typeIdNamespaces = new string[]{"Ice.exceptions.TypeId"}; + initData.properties = createTestProperties(ref args); + initData.properties.setProperty("Ice.Warn.Connections", "0"); + initData.properties.setProperty("Ice.Warn.Dispatch", "0"); + initData.properties.setProperty("Ice.MessageSizeMax", "10"); // 10KB max + using(var communicator = initialize(initData)) { communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0)); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); diff --git a/csharp/test/Ice/exceptions/Server.cs b/csharp/test/Ice/exceptions/Server.cs index 53293f3fae9..b0c4be2d57f 100644 --- a/csharp/test/Ice/exceptions/Server.cs +++ b/csharp/test/Ice/exceptions/Server.cs @@ -46,11 +46,10 @@ namespace Ice { public override void run(string[] args) { - Ice.Properties properties = createTestProperties(ref args); + var properties = createTestProperties(ref args); properties.setProperty("Ice.Warn.Dispatch", "0"); properties.setProperty("Ice.Warn.Connections", "0"); properties.setProperty("Ice.MessageSizeMax", "10"); // 10KB max - properties.setProperty("Ice.Package.Test", "Ice.exceptions"); using(var communicator = initialize(properties)) { communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0)); diff --git a/csharp/test/Ice/exceptions/ServerAMD.cs b/csharp/test/Ice/exceptions/ServerAMD.cs index 9266289fc4a..27d539da922 100644 --- a/csharp/test/Ice/exceptions/ServerAMD.cs +++ b/csharp/test/Ice/exceptions/ServerAMD.cs @@ -52,7 +52,6 @@ namespace Ice properties.setProperty("Ice.Warn.Dispatch", "0"); properties.setProperty("Ice.Warn.Connections", "0"); properties.setProperty("Ice.MessageSizeMax", "10"); // 10KB max - properties.setProperty("Ice.Package.Test", "Ice.exceptions.AMD"); using(var communicator = initialize(properties)) { communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0)); diff --git a/csharp/test/Ice/exceptions/Test.ice b/csharp/test/Ice/exceptions/Test.ice index b154e6293a0..b8f3f1011b6 100644 --- a/csharp/test/Ice/exceptions/Test.ice +++ b/csharp/test/Ice/exceptions/Test.ice @@ -11,7 +11,9 @@ #include <Ice/BuiltinSequences.ice> -[["cs:namespace:Ice.exceptions"]] +[["cs:typeid-namespace:Ice.exceptions.TypeId"]] + +["cs:namespace:Ice.exceptions"] module Test { diff --git a/csharp/test/Ice/exceptions/TestAMD.ice b/csharp/test/Ice/exceptions/TestAMD.ice index b5252ea12ce..b5dafe31e65 100644 --- a/csharp/test/Ice/exceptions/TestAMD.ice +++ b/csharp/test/Ice/exceptions/TestAMD.ice @@ -11,7 +11,9 @@ #include <Ice/BuiltinSequences.ice> -[["cs:namespace:Ice.exceptions.AMD"]] +[["cs:typeid-namespace:Ice.exceptions.AMD.TypeId"]] + +["cs:namespace:Ice.exceptions.AMD"] module Test { diff --git a/csharp/test/Ice/facets/Client.cs b/csharp/test/Ice/facets/Client.cs index aa66471522f..227af0be7ba 100644 --- a/csharp/test/Ice/facets/Client.cs +++ b/csharp/test/Ice/facets/Client.cs @@ -17,9 +17,7 @@ namespace Ice { public override void run(string[] args) { - var properties = createTestProperties(ref args); - properties.setProperty("Ice.Package.Test", "Ice.facets"); - using(var communicator = initialize(properties)) + using(var communicator = initialize(ref args)) { var g = AllTests.allTests(this); g.shutdown(); diff --git a/csharp/test/Ice/facets/Collocated.cs b/csharp/test/Ice/facets/Collocated.cs index a0606b1a1f5..c4357d2417f 100644 --- a/csharp/test/Ice/facets/Collocated.cs +++ b/csharp/test/Ice/facets/Collocated.cs @@ -17,9 +17,7 @@ namespace Ice { public override void run(string[] args) { - var properties = createTestProperties(ref args); - properties.setProperty("Ice.Package.Test", "Ice.facets"); - using(var communicator = initialize(properties)) + using(var communicator = initialize(ref args)) { communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0)); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); diff --git a/csharp/test/Ice/facets/Server.cs b/csharp/test/Ice/facets/Server.cs index 5f87c388689..e42b3567c73 100644 --- a/csharp/test/Ice/facets/Server.cs +++ b/csharp/test/Ice/facets/Server.cs @@ -17,9 +17,7 @@ namespace Ice { public override void run(string[] args) { - var properties = createTestProperties(ref args); - properties.setProperty("Ice.Package.Test", "Ice.facets"); - using(var communicator = initialize(properties)) + using(var communicator = initialize(ref args)) { communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0)); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); diff --git a/csharp/test/Ice/facets/Test.ice b/csharp/test/Ice/facets/Test.ice index 8453829883e..014fe58de40 100644 --- a/csharp/test/Ice/facets/Test.ice +++ b/csharp/test/Ice/facets/Test.ice @@ -9,7 +9,7 @@ #pragma once -[["cs:namespace:Ice.facets"]] +["cs:namespace:Ice.facets"] module Test { diff --git a/csharp/test/Ice/hold/Client.cs b/csharp/test/Ice/hold/Client.cs index 0fc4ab436c7..d9032f9b1a7 100644 --- a/csharp/test/Ice/hold/Client.cs +++ b/csharp/test/Ice/hold/Client.cs @@ -17,9 +17,7 @@ namespace Ice { public override void run(string[] args) { - var properties = createTestProperties(ref args); - properties.setProperty("Ice.Package.Test", "Ice.hold"); - using(var communicator = initialize(properties)) + using(var communicator = initialize(ref args)) { AllTests.allTests(this); } diff --git a/csharp/test/Ice/hold/Server.cs b/csharp/test/Ice/hold/Server.cs index f21ce59b9d7..5504dff6322 100644 --- a/csharp/test/Ice/hold/Server.cs +++ b/csharp/test/Ice/hold/Server.cs @@ -17,9 +17,7 @@ namespace Ice { public override void run(string[] args) { - var properties = createTestProperties(ref args); - properties.setProperty("Ice.Package.Test", "Ice.hold"); - using(var communicator = initialize(properties)) + using(var communicator = initialize(ref args)) { Timer timer = new Timer(); diff --git a/csharp/test/Ice/hold/Test.ice b/csharp/test/Ice/hold/Test.ice index 4a001bda241..12a86d9ff0e 100644 --- a/csharp/test/Ice/hold/Test.ice +++ b/csharp/test/Ice/hold/Test.ice @@ -9,7 +9,7 @@ #pragma once -[["cs:namespace:Ice.hold"]] +["cs:namespace:Ice.hold"] module Test { diff --git a/csharp/test/Ice/info/Client.cs b/csharp/test/Ice/info/Client.cs index 7a42e67febe..1a342e90988 100644 --- a/csharp/test/Ice/info/Client.cs +++ b/csharp/test/Ice/info/Client.cs @@ -17,9 +17,7 @@ namespace Ice { public override void run(string[] args) { - var properties = createTestProperties(ref args); - properties.setProperty("Ice.Package.Test", "Ice.info"); - using(var communicator = initialize(properties)) + using(var communicator = initialize(ref args)) { AllTests.allTests(this); } diff --git a/csharp/test/Ice/info/Server.cs b/csharp/test/Ice/info/Server.cs index 042d2f8e83a..12d7cfebf4f 100644 --- a/csharp/test/Ice/info/Server.cs +++ b/csharp/test/Ice/info/Server.cs @@ -17,9 +17,7 @@ namespace Ice { public override void run(string[] args) { - var properties = createTestProperties(ref args); - properties.setProperty("Ice.Package.Test", "Ice.info"); - using(var communicator = initialize(properties)) + using(var communicator = initialize(ref args)) { communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0) + ":" + getTestEndpoint(0, "udp")); diff --git a/csharp/test/Ice/info/Test.ice b/csharp/test/Ice/info/Test.ice index b7e9d36608e..c1c8cebb81b 100644 --- a/csharp/test/Ice/info/Test.ice +++ b/csharp/test/Ice/info/Test.ice @@ -11,7 +11,7 @@ #include <Ice/Current.ice> -[["cs:namespace:Ice.info"]] +["cs:namespace:Ice.info"] module Test { diff --git a/csharp/test/Ice/inheritance/Client.cs b/csharp/test/Ice/inheritance/Client.cs index e130771d7b9..1e4ff663149 100644 --- a/csharp/test/Ice/inheritance/Client.cs +++ b/csharp/test/Ice/inheritance/Client.cs @@ -17,9 +17,7 @@ namespace Ice { public override void run(string[] args) { - var properties = createTestProperties(ref args); - properties.setProperty("Ice.Package.Test", "Ice.inheritance"); - using(var communicator = initialize(properties)) + using(var communicator = initialize(ref args)) { var initial = AllTests.allTests(this); initial.shutdown(); diff --git a/csharp/test/Ice/inheritance/Collocated.cs b/csharp/test/Ice/inheritance/Collocated.cs index 86501fdac63..4136f3737e4 100644 --- a/csharp/test/Ice/inheritance/Collocated.cs +++ b/csharp/test/Ice/inheritance/Collocated.cs @@ -17,9 +17,7 @@ namespace Ice { public override void run(string[] args) { - var properties = createTestProperties(ref args); - properties.setProperty("Ice.Package.Test", "Ice.inheritance"); - using(var communicator = initialize(properties)) + using(var communicator = initialize(ref args)) { communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0)); var adapter = communicator.createObjectAdapter("TestAdapter"); diff --git a/csharp/test/Ice/inheritance/Server.cs b/csharp/test/Ice/inheritance/Server.cs index b421f26b0e9..9e48cdb7277 100644 --- a/csharp/test/Ice/inheritance/Server.cs +++ b/csharp/test/Ice/inheritance/Server.cs @@ -17,9 +17,7 @@ namespace Ice { public override void run(string[] args) { - var properties = createTestProperties(ref args); - properties.setProperty("Ice.Package.Test", "Ice.inheritance"); - using(var communicator = initialize(properties)) + using(var communicator = initialize(ref args)) { communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0)); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); diff --git a/csharp/test/Ice/inheritance/Test.ice b/csharp/test/Ice/inheritance/Test.ice index db7c6947f8c..f11c0867bf3 100644 --- a/csharp/test/Ice/inheritance/Test.ice +++ b/csharp/test/Ice/inheritance/Test.ice @@ -10,7 +10,7 @@ #pragma once [["suppress-warning:deprecated"]] // For classes with operations -[["cs:namespace:Ice.inheritance"]] +["cs:namespace:Ice.inheritance"] module Test { diff --git a/csharp/test/Ice/interceptor/Client.cs b/csharp/test/Ice/interceptor/Client.cs index 12bad466b72..09537470f63 100644 --- a/csharp/test/Ice/interceptor/Client.cs +++ b/csharp/test/Ice/interceptor/Client.cs @@ -172,9 +172,7 @@ namespace Ice public override void run(string[] args) { - var properties = createTestProperties(ref args); - properties.setProperty("Ice.Package.Test", "Ice.interceptor"); - using(var communicator = initialize(properties)) + using(var communicator = initialize(ref args)) { // // Create OA and servants diff --git a/csharp/test/Ice/interceptor/Test.ice b/csharp/test/Ice/interceptor/Test.ice index efe54f1db49..0ef16a0fc5b 100644 --- a/csharp/test/Ice/interceptor/Test.ice +++ b/csharp/test/Ice/interceptor/Test.ice @@ -9,7 +9,7 @@ #pragma once -[["cs:namespace:Ice.interceptor"]] +["cs:namespace:Ice.interceptor"] module Test { diff --git a/csharp/test/Ice/invoke/Client.cs b/csharp/test/Ice/invoke/Client.cs index d62374833e9..5ce2aa75669 100644 --- a/csharp/test/Ice/invoke/Client.cs +++ b/csharp/test/Ice/invoke/Client.cs @@ -17,9 +17,7 @@ namespace Ice { public override void run(string[] args) { - var properties = createTestProperties(ref args); - properties.setProperty("Ice.Package.Test", "Ice.invoke"); - using(var communicator = initialize(properties)) + using(var communicator = initialize(ref args)) { var myClass = AllTests.allTests(this); myClass.shutdown(); diff --git a/csharp/test/Ice/invoke/Server.cs b/csharp/test/Ice/invoke/Server.cs index df4ce64f989..46ee9dd13a4 100644 --- a/csharp/test/Ice/invoke/Server.cs +++ b/csharp/test/Ice/invoke/Server.cs @@ -53,9 +53,7 @@ namespace Ice public override void run(string[] args) { bool async = args.Any(v => v.Equals("--async")); - var properties = createTestProperties(ref args); - properties.setProperty("Ice.Package.Test", "Ice.invoke"); - using(var communicator = initialize(properties)) + using(var communicator = initialize(ref args)) { communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0)); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); diff --git a/csharp/test/Ice/invoke/Test.ice b/csharp/test/Ice/invoke/Test.ice index 94338fa15e1..dd9c534c8e9 100644 --- a/csharp/test/Ice/invoke/Test.ice +++ b/csharp/test/Ice/invoke/Test.ice @@ -9,7 +9,7 @@ #pragma once -[["cs:namespace:Ice.invoke"]] +["cs:namespace:Ice.invoke"] module Test { diff --git a/csharp/test/Ice/location/Client.cs b/csharp/test/Ice/location/Client.cs index e379ffe932f..64670cbcb77 100644 --- a/csharp/test/Ice/location/Client.cs +++ b/csharp/test/Ice/location/Client.cs @@ -19,7 +19,6 @@ namespace Ice { Ice.Properties properties = createTestProperties(ref args); properties.setProperty("Ice.Default.Locator", "locator:" + getTestEndpoint(properties, 0)); - properties.setProperty("Ice.Package.Test", "Ice.location"); using(var communicator = initialize(properties)) { AllTests.allTests(this); diff --git a/csharp/test/Ice/location/Server.cs b/csharp/test/Ice/location/Server.cs index dc8540ec509..da40500bccd 100644 --- a/csharp/test/Ice/location/Server.cs +++ b/csharp/test/Ice/location/Server.cs @@ -24,7 +24,6 @@ namespace Ice // Ice.Properties properties = createTestProperties(ref args); properties.setProperty("Ice.ThreadPool.Server.Size", "2"); - properties.setProperty("Ice.Package.Test", "Ice.location"); using(var communicator = initialize(properties)) { diff --git a/csharp/test/Ice/location/Test.ice b/csharp/test/Ice/location/Test.ice index 75e04e83dc0..3fa46fe1106 100644 --- a/csharp/test/Ice/location/Test.ice +++ b/csharp/test/Ice/location/Test.ice @@ -11,7 +11,7 @@ #include <Ice/Locator.ice> -[["cs:namespace:Ice.location"]] +["cs:namespace:Ice.location"] module Test { diff --git a/csharp/test/Ice/packagemd/.gitignore b/csharp/test/Ice/namespacemd/.gitignore index 67872faa673..67872faa673 100644 --- a/csharp/test/Ice/packagemd/.gitignore +++ b/csharp/test/Ice/namespacemd/.gitignore diff --git a/csharp/test/Ice/namespacemd/AllTests.cs b/csharp/test/Ice/namespacemd/AllTests.cs new file mode 100644 index 00000000000..b1c31202fab --- /dev/null +++ b/csharp/test/Ice/namespacemd/AllTests.cs @@ -0,0 +1,108 @@ +// ********************************************************************** +// +// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved. +// +// This copy of Ice is licensed to you under the terms described in the +// ICE_LICENSE file included in this distribution. +// +// ********************************************************************** + +using Test; + +namespace Ice +{ + namespace namespacemd + { + public class AllTests : global::Test.AllTests + { + public static Test.InitialPrx allTests(TestHelper helper) + { + var communicator = helper.communicator(); + var output = helper.getWriter(); + output.Write("testing stringToProxy... "); + output.Flush(); + var @base = communicator.stringToProxy("initial:" + helper.getTestEndpoint(0)); + test(@base != null); + output.WriteLine("ok"); + + output.Write("testing checked cast... "); + output.Flush(); + var initial = Test.InitialPrxHelper.checkedCast(@base); + test(initial != null); + test(initial.Equals(@base)); + output.WriteLine("ok"); + + { + output.Write("testing types without package... "); + output.Flush(); + NoNamespace.C1 c1 = initial.getNoNamespaceC2AsC1(); + test(c1 != null); + test(c1 is NoNamespace.C2); + NoNamespace.C2 c2 = initial.getNoNamespaceC2AsC2(); + test(c2 != null); + try + { + initial.throwNoNamespaceE2AsE1(); + test(false); + } + catch(NoNamespace.E1 ex) + { + test(ex is NoNamespace.E2); + } + try + { + initial.throwNoNamespaceE2AsE2(); + test(false); + } + catch(NoNamespace.E2) + { + // Expected + } + try + { + initial.throwNoNamespaceNotify(); + test(false); + } + catch(NoNamespace.@notify) + { + // Expected + } + output.WriteLine("ok"); + } + + { + output.Write("testing types with package... "); + output.Flush(); + + { + WithNamespace.C1 c1 = initial.getWithNamespaceC2AsC1(); + test(c1 != null); + test(c1 is WithNamespace.C2); + WithNamespace.C2 c2 = initial.getWithNamespaceC2AsC2(); + test(c2 != null); + try + { + initial.throwWithNamespaceE2AsE1(); + test(false); + } + catch(WithNamespace.E1 ex) + { + test(ex is WithNamespace.E2); + } + try + { + initial.throwWithNamespaceE2AsE2(); + test(false); + } + catch(WithNamespace.E2) + { + // Expected + } + output.WriteLine("ok"); + } + } + return initial; + } + } + } +} diff --git a/csharp/test/Ice/packagemd/Client.cs b/csharp/test/Ice/namespacemd/Client.cs index 1d7267e3b8d..397a2e261ec 100644 --- a/csharp/test/Ice/packagemd/Client.cs +++ b/csharp/test/Ice/namespacemd/Client.cs @@ -11,7 +11,7 @@ using Test; namespace Ice { - namespace packagemd + namespace namespacemd { public class Client : TestHelper { @@ -19,8 +19,6 @@ namespace Ice { var properties = createTestProperties(ref args); properties.setProperty("Ice.Warn.Dispatch", "0"); - properties.setProperty("Ice.Package.Test", "Ice.packagemd"); - properties.setProperty("Ice.Package.Test1", "Ice.packagemd"); using(var communicator = initialize(properties)) { var initial = AllTests.allTests(this); diff --git a/csharp/test/Ice/namespacemd/InitialI.cs b/csharp/test/Ice/namespacemd/InitialI.cs new file mode 100644 index 00000000000..ad9ef6d21db --- /dev/null +++ b/csharp/test/Ice/namespacemd/InitialI.cs @@ -0,0 +1,67 @@ +// ********************************************************************** +// +// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved. +// +// This copy of Ice is licensed to you under the terms described in the +// ICE_LICENSE file included in this distribution. +// +// ********************************************************************** + +namespace Ice +{ + namespace namespacemd + { + public class InitialI : Test.InitialDisp_ + { + public override NoNamespace.C1 getNoNamespaceC2AsC1(Current current = null) + { + return new NoNamespace.C2(); + } + + public override NoNamespace.C2 getNoNamespaceC2AsC2(Current current = null) + { + return new NoNamespace.C2(); + } + + public override WithNamespace.C1 getWithNamespaceC2AsC1(Current current = null) + { + return new WithNamespace.C2(); + } + + public override WithNamespace.C2 getWithNamespaceC2AsC2(Current current = null) + { + return new WithNamespace.C2(); + } + + public override void shutdown(Current current = null) + { + current.adapter.getCommunicator().shutdown(); + } + + public override void throwNoNamespaceE2AsE1(Current current = null) + { + throw new NoNamespace.E2(); + } + + public override void throwNoNamespaceE2AsE2(Current current = null) + { + throw new NoNamespace.E2(); + } + + public override void throwNoNamespaceNotify(Current current = null) + { + throw new NoNamespace.@notify(); + } + + public override void throwWithNamespaceE2AsE1(Current current = null) + { + throw new WithNamespace.E2(); + } + + public override void throwWithNamespaceE2AsE2(Current current = null) + { + throw new WithNamespace.E2(); + } + } + } +} diff --git a/csharp/test/Ice/packagemd/Package.ice b/csharp/test/Ice/namespacemd/Namespace.ice index 97bcebb2a51..71a7be612d7 100644 --- a/csharp/test/Ice/packagemd/Package.ice +++ b/csharp/test/Ice/namespacemd/Namespace.ice @@ -9,33 +9,8 @@ #pragma once -[["cs:namespace:Ice.packagemd.testpkg"]] - -module Test2 -{ -class C1 -{ - int i; -} - -class C2 extends C1 -{ - long l; -} - -exception E1 -{ - int i; -} - -exception E2 extends E1 -{ - long l; -} -} - -["cs:namespace:Ice.packagemd.modpkg"] -module Test3 +["cs:namespace:Ice.namespacemd"] +module WithNamespace { class C1 { diff --git a/csharp/test/Ice/packagemd/NoPackage.ice b/csharp/test/Ice/namespacemd/NoNamespace.ice index 8a26f5f1894..b523d825cc7 100644 --- a/csharp/test/Ice/packagemd/NoPackage.ice +++ b/csharp/test/Ice/namespacemd/NoNamespace.ice @@ -9,8 +9,7 @@ #pragma once -[["cs:namespace:Ice.packagemd"]] -module Test1 +module NoNamespace { class C1 { diff --git a/csharp/test/Ice/packagemd/Server.cs b/csharp/test/Ice/namespacemd/Server.cs index 5cb6e6a6f7c..ce7de2bf359 100644 --- a/csharp/test/Ice/packagemd/Server.cs +++ b/csharp/test/Ice/namespacemd/Server.cs @@ -11,18 +11,15 @@ using Test; namespace Ice { - namespace packagemd + namespace namespacemd { public class Server : TestHelper { public override void run(string[] args) { - var properties = createTestProperties(ref args); - properties.setProperty("Ice.Package.Test", "Ice.packagemd"); - properties.setProperty("Ice.Package.Test1", "Ice.packagemd"); - using(var communicator = initialize(properties)) + using(var communicator = initialize(ref args)) { - properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(0)); + communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0)); var adapter = communicator.createObjectAdapter("TestAdapter"); adapter.add(new InitialI(), Ice.Util.stringToIdentity("initial")); adapter.activate(); diff --git a/csharp/test/Ice/namespacemd/Test.ice b/csharp/test/Ice/namespacemd/Test.ice new file mode 100644 index 00000000000..a50f528d47c --- /dev/null +++ b/csharp/test/Ice/namespacemd/Test.ice @@ -0,0 +1,35 @@ +// ********************************************************************** +// +// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved. +// +// This copy of Ice is licensed to you under the terms described in the +// ICE_LICENSE file included in this distribution. +// +// ********************************************************************** + +#pragma once + +#include <Namespace.ice> +#include <NoNamespace.ice> + +["cs:namespace:Ice.namespacemd"] +module Test +{ + +interface Initial +{ + NoNamespace::C1 getNoNamespaceC2AsC1(); + NoNamespace::C2 getNoNamespaceC2AsC2(); + void throwNoNamespaceE2AsE1() throws NoNamespace::E1; + void throwNoNamespaceE2AsE2() throws NoNamespace::E2; + void throwNoNamespaceNotify() throws NoNamespace::notify; + + WithNamespace::C1 getWithNamespaceC2AsC1(); + WithNamespace::C2 getWithNamespaceC2AsC2(); + void throwWithNamespaceE2AsE1() throws WithNamespace::E1; + void throwWithNamespaceE2AsE2() throws WithNamespace::E2; + + void shutdown(); +} + +} diff --git a/csharp/test/Ice/packagemd/msbuild/client/net45/client.csproj b/csharp/test/Ice/namespacemd/msbuild/client/net45/client.csproj index dfb65a2dcc6..a62a68b2436 100644 --- a/csharp/test/Ice/packagemd/msbuild/client/net45/client.csproj +++ b/csharp/test/Ice/namespacemd/msbuild/client/net45/client.csproj @@ -69,11 +69,11 @@ <Compile Include="..\..\..\Client.cs"> <Link>Client.cs</Link> </Compile> - <Compile Include="generated\NoPackage.cs"> - <SliceCompileSource>..\..\..\NoPackage.ice</SliceCompileSource> + <Compile Include="generated\NoNamespace.cs"> + <SliceCompileSource>..\..\..\NoNamespace.ice</SliceCompileSource> </Compile> - <Compile Include="generated\Package.cs"> - <SliceCompileSource>..\..\..\Package.ice</SliceCompileSource> + <Compile Include="generated\Namespace.cs"> + <SliceCompileSource>..\..\..\Namespace.ice</SliceCompileSource> </Compile> <Compile Include="generated\Test.cs" /> </ItemGroup> @@ -87,11 +87,11 @@ </None> </ItemGroup> <ItemGroup> - <SliceCompile Include="..\..\..\NoPackage.ice"> - <Link>NoPackage.ice</Link> + <SliceCompile Include="..\..\..\NoNamespace.ice"> + <Link>NoNamespace.ice</Link> </SliceCompile> - <SliceCompile Include="..\..\..\Package.ice"> - <Link>Package.ice</Link> + <SliceCompile Include="..\..\..\Namespace.ice"> + <Link>Namespace.ice</Link> </SliceCompile> </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> @@ -105,4 +105,4 @@ <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/packagemd/msbuild/client/net45/client.exe.config b/csharp/test/Ice/namespacemd/msbuild/client/net45/client.exe.config index 418bdc2f8b2..418bdc2f8b2 100644 --- a/csharp/test/Ice/packagemd/msbuild/client/net45/client.exe.config +++ b/csharp/test/Ice/namespacemd/msbuild/client/net45/client.exe.config diff --git a/csharp/test/Ice/packagemd/msbuild/client/net45/packages.config b/csharp/test/Ice/namespacemd/msbuild/client/net45/packages.config index 91f1d232e55..91f1d232e55 100644 --- a/csharp/test/Ice/packagemd/msbuild/client/net45/packages.config +++ b/csharp/test/Ice/namespacemd/msbuild/client/net45/packages.config diff --git a/csharp/test/Ice/packagemd/msbuild/client/netstandard2.0/client.csproj b/csharp/test/Ice/namespacemd/msbuild/client/netstandard2.0/client.csproj index 2335eaae90f..4dca623d3f9 100644 --- a/csharp/test/Ice/packagemd/msbuild/client/netstandard2.0/client.csproj +++ b/csharp/test/Ice/namespacemd/msbuild/client/netstandard2.0/client.csproj @@ -26,19 +26,19 @@ <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../AllTests.cs" /> <Compile Include="../../../Client.cs" /> - <Compile Include="generated\NoPackage.cs"> - <SliceCompileSource>../../../NoPackage.ice</SliceCompileSource> + <Compile Include="generated\NoNamespace.cs"> + <SliceCompileSource>../../../NoNamespace.ice</SliceCompileSource> </Compile> - <Compile Include="generated\Package.cs"> - <SliceCompileSource>../../../Package.ice</SliceCompileSource> + <Compile Include="generated\Namespace.cs"> + <SliceCompileSource>../../../Namespace.ice</SliceCompileSource> </Compile> <Compile Include="generated\Test.cs"> <SliceCompileSource>../../../Test.ice</SliceCompileSource> </Compile> <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" /> <SliceCompile Include="../../../Test.ice" /> - <SliceCompile Include="../../../Package.ice" /> - <SliceCompile Include="../../../NoPackage.ice" /> + <SliceCompile Include="../../../Namespace.ice" /> + <SliceCompile Include="../../../NoNamespace.ice" /> </ItemGroup> <Choose> <When Condition="'$(ICE_BIN_DIST)' == 'all'"> diff --git a/csharp/test/Ice/packagemd/msbuild/server/net45/packages.config b/csharp/test/Ice/namespacemd/msbuild/server/net45/packages.config index 91f1d232e55..91f1d232e55 100644 --- a/csharp/test/Ice/packagemd/msbuild/server/net45/packages.config +++ b/csharp/test/Ice/namespacemd/msbuild/server/net45/packages.config diff --git a/csharp/test/Ice/packagemd/msbuild/server/net45/server.csproj b/csharp/test/Ice/namespacemd/msbuild/server/net45/server.csproj index 80b929a9c6e..7023e44b1f5 100644 --- a/csharp/test/Ice/packagemd/msbuild/server/net45/server.csproj +++ b/csharp/test/Ice/namespacemd/msbuild/server/net45/server.csproj @@ -69,11 +69,11 @@ <Compile Include="..\..\..\Server.cs"> <Link>Server.cs</Link> </Compile> - <Compile Include="generated\NoPackage.cs"> - <SliceCompileSource>..\..\..\NoPackage.ice</SliceCompileSource> + <Compile Include="generated\NoNamespace.cs"> + <SliceCompileSource>..\..\..\NoNamespace.ice</SliceCompileSource> </Compile> - <Compile Include="generated\Package.cs"> - <SliceCompileSource>..\..\..\Package.ice</SliceCompileSource> + <Compile Include="generated\Namespace.cs"> + <SliceCompileSource>..\..\..\Namespace.ice</SliceCompileSource> </Compile> <Compile Include="generated\Test.cs" /> </ItemGroup> @@ -85,11 +85,11 @@ </SliceCompile> </ItemGroup> <ItemGroup> - <SliceCompile Include="..\..\..\NoPackage.ice"> - <Link>NoPackage.ice</Link> + <SliceCompile Include="..\..\..\NoNamespace.ice"> + <Link>NoNamespace.ice</Link> </SliceCompile> - <SliceCompile Include="..\..\..\Package.ice"> - <Link>Package.ice</Link> + <SliceCompile Include="..\..\..\Namespace.ice"> + <Link>Namespace.ice</Link> </SliceCompile> </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> @@ -103,4 +103,4 @@ <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/packagemd/msbuild/server/net45/server.exe.config b/csharp/test/Ice/namespacemd/msbuild/server/net45/server.exe.config index 418bdc2f8b2..418bdc2f8b2 100644 --- a/csharp/test/Ice/packagemd/msbuild/server/net45/server.exe.config +++ b/csharp/test/Ice/namespacemd/msbuild/server/net45/server.exe.config diff --git a/csharp/test/Ice/packagemd/msbuild/server/netstandard2.0/server.csproj b/csharp/test/Ice/namespacemd/msbuild/server/netstandard2.0/server.csproj index 383e1d52829..8ff24a41326 100644 --- a/csharp/test/Ice/packagemd/msbuild/server/netstandard2.0/server.csproj +++ b/csharp/test/Ice/namespacemd/msbuild/server/netstandard2.0/server.csproj @@ -26,19 +26,19 @@ <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../InitialI.cs" /> <Compile Include="../../../Server.cs" /> - <Compile Include="generated\NoPackage.cs"> - <SliceCompileSource>../../../NoPackage.ice</SliceCompileSource> + <Compile Include="generated\NoNamespace.cs"> + <SliceCompileSource>../../../NoNamespace.ice</SliceCompileSource> </Compile> - <Compile Include="generated\Package.cs"> - <SliceCompileSource>../../../Package.ice</SliceCompileSource> + <Compile Include="generated\Namespace.cs"> + <SliceCompileSource>../../../Namespace.ice</SliceCompileSource> </Compile> <Compile Include="generated\Test.cs"> <SliceCompileSource>../../../Test.ice</SliceCompileSource> </Compile> <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" /> <SliceCompile Include="../../../Test.ice" /> - <SliceCompile Include="../../../Package.ice" /> - <SliceCompile Include="../../../NoPackage.ice" /> + <SliceCompile Include="../../../Namespace.ice" /> + <SliceCompile Include="../../../NoNamespace.ice" /> </ItemGroup> <Choose> <When Condition="'$(ICE_BIN_DIST)' == 'all'"> diff --git a/csharp/test/Ice/packagemd/msbuild/test/netstandard2.0/test.csproj b/csharp/test/Ice/namespacemd/msbuild/test/netstandard2.0/test.csproj index dcefa3fff45..cf31b2e5388 100644 --- a/csharp/test/Ice/packagemd/msbuild/test/netstandard2.0/test.csproj +++ b/csharp/test/Ice/namespacemd/msbuild/test/netstandard2.0/test.csproj @@ -2,7 +2,7 @@ <Project Sdk="Microsoft.NET.Sdk"> <Import Project="../../../../../../msbuild/ice.common.props" /> <PropertyGroup> - <AssemblyName>Ice.packagemd</AssemblyName> + <AssemblyName>Ice.namespacemd</AssemblyName> <TargetFramework>netstandard2.0</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> @@ -21,20 +21,20 @@ <Compile Include="../../../Client.cs" /> <Compile Include="../../../InitialI.cs" /> <Compile Include="../../../Server.cs" /> - <Compile Include="generated/NoPackage.cs"> - <SliceCompileSource>../../../NoPackage.ice</SliceCompileSource> + <Compile Include="generated/NoNamespace.cs"> + <SliceCompileSource>../../../NoNamespace.ice</SliceCompileSource> </Compile> - <Compile Include="generated/Package.cs"> - <SliceCompileSource>../../../Package.ice</SliceCompileSource> + <Compile Include="generated/Namespace.cs"> + <SliceCompileSource>../../../Namespace.ice</SliceCompileSource> </Compile> <Compile Include="generated/Test.cs"> <SliceCompileSource>../../../Test.ice</SliceCompileSource> </Compile> - <SliceCompile Include="../../../NoPackage.ice" /> - <SliceCompile Include="../../../Package.ice" /> + <SliceCompile Include="../../../NoNamespace.ice" /> + <SliceCompile Include="../../../Namespace.ice" /> <SliceCompile Include="../../../Test.ice" /> <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" /> diff --git a/csharp/test/Ice/objects/Client.cs b/csharp/test/Ice/objects/Client.cs index fba1ecb97cb..6b82de21a9c 100644 --- a/csharp/test/Ice/objects/Client.cs +++ b/csharp/test/Ice/objects/Client.cs @@ -17,9 +17,10 @@ namespace Ice { public override void run(string[] args) { - var properties = createTestProperties(ref args); - properties.setProperty("Ice.Package.Test", "Ice.objects"); - using(var communicator = initialize(properties)) + var initData = new InitializationData(); + initData.typeIdNamespaces = new string[]{"Ice.objects.TypeId"}; + initData.properties = createTestProperties(ref args); + using(var communicator = initialize(initData)) { var initial = Test.AllTests.allTests(this); initial.shutdown(); diff --git a/csharp/test/Ice/objects/Collocated.cs b/csharp/test/Ice/objects/Collocated.cs index e5a4575f172..816065c8ae9 100644 --- a/csharp/test/Ice/objects/Collocated.cs +++ b/csharp/test/Ice/objects/Collocated.cs @@ -17,10 +17,11 @@ namespace Ice { public override void run(string[] args) { - Ice.Properties properties = createTestProperties(ref args); - properties.setProperty("Ice.Warn.Dispatch", "0"); - properties.setProperty("Ice.Package.Test", "Ice.objects"); - using(var communicator = initialize(properties)) + var initData = new InitializationData(); + initData.typeIdNamespaces = new string[]{"Ice.objects.TypeId"}; + initData.properties = createTestProperties(ref args); + initData.properties.setProperty("Ice.Warn.Dispatch", "0"); + using(var communicator = initialize(initData)) { communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0)); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); diff --git a/csharp/test/Ice/objects/Server.cs b/csharp/test/Ice/objects/Server.cs index 42b12ac461a..60ec8512fa7 100644 --- a/csharp/test/Ice/objects/Server.cs +++ b/csharp/test/Ice/objects/Server.cs @@ -36,10 +36,11 @@ namespace Ice public override void run(string[] args) { - Ice.Properties properties = createTestProperties(ref args); - properties.setProperty("Ice.Warn.Dispatch", "0"); - properties.setProperty("Ice.Package.Test", "Ice.objects"); - using(var communicator = initialize(properties)) + var initData = new InitializationData(); + initData.typeIdNamespaces = new string[]{"Ice.objects.TypeId"}; + initData.properties = createTestProperties(ref args); + initData.properties.setProperty("Ice.Warn.Dispatch", "0"); + using(var communicator = initialize(initData)) { communicator.getValueFactoryManager().add(MyValueFactory, "::Test::I"); communicator.getValueFactoryManager().add(MyValueFactory, "::Test::J"); diff --git a/csharp/test/Ice/objects/Test.ice b/csharp/test/Ice/objects/Test.ice index 3f505e409c8..215b9e2a262 100644 --- a/csharp/test/Ice/objects/Test.ice +++ b/csharp/test/Ice/objects/Test.ice @@ -9,8 +9,8 @@ #pragma once -[["suppress-warning:deprecated"]] // For classes with operations -[["cs:namespace:Ice.objects"]] +[["cs:typeid-namespace:Ice.objects.TypeId", "suppress-warning:deprecated"]] // For classes with operations +["cs:namespace:Ice.objects"] module Test { diff --git a/csharp/test/Ice/operations/Client.cs b/csharp/test/Ice/operations/Client.cs index 6bcb3ee8f8f..a3018af0c13 100644 --- a/csharp/test/Ice/operations/Client.cs +++ b/csharp/test/Ice/operations/Client.cs @@ -18,12 +18,13 @@ namespace Ice { public override void run(string[] args) { - Ice.Properties properties = createTestProperties(ref args); - properties.setProperty("Ice.ThreadPool.Client.Size", "2"); - properties.setProperty("Ice.ThreadPool.Client.SizeWarn", "0"); - properties.setProperty("Ice.BatchAutoFlushSize", "100"); - properties.setProperty("Ice.Package.Test", "Ice.operations"); - using (var communicator = initialize(properties)) + var initData = new InitializationData(); + initData.typeIdNamespaces = new string[]{"Ice.operations.TypeId"}; + initData.properties = createTestProperties(ref args); + initData.properties.setProperty("Ice.ThreadPool.Client.Size", "2"); + initData.properties.setProperty("Ice.ThreadPool.Client.SizeWarn", "0"); + initData.properties.setProperty("Ice.BatchAutoFlushSize", "100"); + using(var communicator = initialize(initData)) { var myClass = AllTests.allTests(this); diff --git a/csharp/test/Ice/operations/Collocated.cs b/csharp/test/Ice/operations/Collocated.cs index 1015858d192..6d9a9900a08 100644 --- a/csharp/test/Ice/operations/Collocated.cs +++ b/csharp/test/Ice/operations/Collocated.cs @@ -18,12 +18,13 @@ namespace Ice { public override void run(string[] args) { - Ice.Properties properties = createTestProperties(ref args); - properties.setProperty("Ice.ThreadPool.Client.Size", "2"); - properties.setProperty("Ice.ThreadPool.Client.SizeWarn", "0"); - properties.setProperty("Ice.BatchAutoFlushSize", "100"); - properties.setProperty("Ice.Package.Test", "Ice.operations"); - using (var communicator = initialize(properties)) + var initData = new InitializationData(); + initData.typeIdNamespaces = new string[]{"Ice.operations.TypeId"}; + initData.properties = createTestProperties(ref args); + initData.properties.setProperty("Ice.ThreadPool.Client.Size", "2"); + initData.properties.setProperty("Ice.ThreadPool.Client.SizeWarn", "0"); + initData.properties.setProperty("Ice.BatchAutoFlushSize", "100"); + using(var communicator = initialize(initData)) { communicator.getProperties().setProperty("TestAdapter.AdapterId", "test"); communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0)); @@ -31,7 +32,7 @@ namespace Ice Ice.ObjectPrx prx = adapter.add(new MyDerivedClassI(), Ice.Util.stringToIdentity("test")); //adapter.activate(); // Don't activate OA to ensure collocation is used. - if (prx.ice_getConnection() != null) + if(prx.ice_getConnection() != null) { throw new System.Exception(); } diff --git a/csharp/test/Ice/operations/Server.cs b/csharp/test/Ice/operations/Server.cs index 305ec01d108..a318a7b277b 100644 --- a/csharp/test/Ice/operations/Server.cs +++ b/csharp/test/Ice/operations/Server.cs @@ -17,19 +17,20 @@ namespace Ice { public override void run(string[] args) { - Ice.Properties properties = createTestProperties(ref args); + var initData = new InitializationData(); + initData.typeIdNamespaces = new string[]{"Ice.operations.TypeId"}; + initData.properties = createTestProperties(ref args); // // Its possible to have batch oneway requests dispatched // after the adapter is deactivated due to thread // scheduling so we supress this warning. // - properties.setProperty("Ice.Warn.Dispatch", "0"); + initData.properties.setProperty("Ice.Warn.Dispatch", "0"); // // We don't want connection warnings because of the timeout test. // - properties.setProperty("Ice.Warn.Connections", "0"); - properties.setProperty("Ice.Package.Test", "Ice.operations"); - using (var communicator = initialize(properties)) + initData.properties.setProperty("Ice.Warn.Connections", "0"); + using(var communicator = initialize(initData)) { communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0)); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); diff --git a/csharp/test/Ice/operations/ServerAMD.cs b/csharp/test/Ice/operations/ServerAMD.cs index 23f79440da7..bdb55bf9d01 100644 --- a/csharp/test/Ice/operations/ServerAMD.cs +++ b/csharp/test/Ice/operations/ServerAMD.cs @@ -19,19 +19,21 @@ namespace Ice { public override void run(string[] args) { - Ice.Properties properties = createTestProperties(ref args); + var initData = new InitializationData(); + initData.typeIdNamespaces = new string[]{"Ice.operations.AMD.TypeId"}; + initData.properties = createTestProperties(ref args); + // // Its possible to have batch oneway requests dispatched // after the adapter is deactivated due to thread // scheduling so we supress this warning. // - properties.setProperty("Ice.Warn.Dispatch", "0"); + initData.properties.setProperty("Ice.Warn.Dispatch", "0"); // // We don't want connection warnings because of the timeout test. // - properties.setProperty("Ice.Warn.Connections", "0"); - properties.setProperty("Ice.Package.Test", "Ice.operations.AMD"); - using (var communicator = initialize(properties)) + initData.properties.setProperty("Ice.Warn.Connections", "0"); + using(var communicator = initialize(initData)) { communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0)); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); diff --git a/csharp/test/Ice/operations/ServerAMDTie.cs b/csharp/test/Ice/operations/ServerAMDTie.cs index 4fa6ac835c0..b32991e27ea 100644 --- a/csharp/test/Ice/operations/ServerAMDTie.cs +++ b/csharp/test/Ice/operations/ServerAMDTie.cs @@ -21,19 +21,21 @@ namespace Ice { public override void run(string[] args) { - Ice.Properties properties = createTestProperties(ref args); + var initData = new InitializationData(); + initData.typeIdNamespaces = new string[]{"Ice.operations.AMD.TypeId"}; + + initData.properties = createTestProperties(ref args); // // Its possible to have batch oneway requests dispatched // after the adapter is deactivated due to thread // scheduling so we supress this warning. // - properties.setProperty("Ice.Warn.Dispatch", "0"); + initData.properties.setProperty("Ice.Warn.Dispatch", "0"); // // We don't want connection warnings because of the timeout test. // - properties.setProperty("Ice.Warn.Connections", "0"); - properties.setProperty("Ice.Package.Test", "Ice.operations.AMD"); - using (var communicator = initialize(properties)) + initData.properties.setProperty("Ice.Warn.Connections", "0"); + using (var communicator = initialize(initData)) { communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0)); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); diff --git a/csharp/test/Ice/operations/ServerTie.cs b/csharp/test/Ice/operations/ServerTie.cs index 84d17a3cfb1..2d189e30f1d 100644 --- a/csharp/test/Ice/operations/ServerTie.cs +++ b/csharp/test/Ice/operations/ServerTie.cs @@ -19,19 +19,20 @@ namespace Ice { public override void run(string[] args) { - Ice.Properties properties = createTestProperties(ref args); + var initData = new InitializationData(); + initData.typeIdNamespaces = new string[]{"Ice.operations.TypeId"}; + initData.properties = createTestProperties(ref args); // // Its possible to have batch oneway requests dispatched // after the adapter is deactivated due to thread // scheduling so we supress this warning. // - properties.setProperty("Ice.Warn.Dispatch", "0"); + initData.properties.setProperty("Ice.Warn.Dispatch", "0"); // // We don't want connection warnings because of the timeout test. // - properties.setProperty("Ice.Warn.Connections", "0"); - properties.setProperty("Ice.Package.Test", "Ice.operations"); - using (var communicator = initialize(properties)) + initData.properties.setProperty("Ice.Warn.Connections", "0"); + using(var communicator = initialize(initData)) { communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0)); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); diff --git a/csharp/test/Ice/operations/Test.ice b/csharp/test/Ice/operations/Test.ice index 292c9ccf621..e9d2c9d7697 100644 --- a/csharp/test/Ice/operations/Test.ice +++ b/csharp/test/Ice/operations/Test.ice @@ -11,7 +11,9 @@ #include <Ice/Current.ice> -[["cs:namespace:Ice.operations"]] +[["cs:typeid-namespace:Ice.operations.TypeId"]] + +["cs:namespace:Ice.operations"] module Test { diff --git a/csharp/test/Ice/operations/TestAMD.ice b/csharp/test/Ice/operations/TestAMD.ice index f5b8a8c82c7..41741eec639 100644 --- a/csharp/test/Ice/operations/TestAMD.ice +++ b/csharp/test/Ice/operations/TestAMD.ice @@ -11,7 +11,9 @@ #include <Ice/Current.ice> -[["cs:namespace:Ice.operations.AMD"]] +[["cs:typeid-namespace:Ice.operations.AMD.TypeId"]] + +["cs:namespace:Ice.operations.AMD"] module Test { diff --git a/csharp/test/Ice/optional/Client.cs b/csharp/test/Ice/optional/Client.cs index 5fa604b35ab..4c1828233ff 100644 --- a/csharp/test/Ice/optional/Client.cs +++ b/csharp/test/Ice/optional/Client.cs @@ -17,9 +17,10 @@ namespace Ice { public override void run(string[] args) { - var properties = createTestProperties(ref args); - properties.setProperty("Ice.Package.Test", "Ice.optional"); - using(var communicator = initialize(properties)) + var initData = new InitializationData(); + initData.typeIdNamespaces = new string[]{"Ice.optional.TypeId"}; + initData.properties = createTestProperties(ref args); + using(var communicator = initialize(initData)) { var initial = AllTests.allTests(this); initial.shutdown(); diff --git a/csharp/test/Ice/optional/Server.cs b/csharp/test/Ice/optional/Server.cs index 7d98f2c8822..c8cdef5a470 100644 --- a/csharp/test/Ice/optional/Server.cs +++ b/csharp/test/Ice/optional/Server.cs @@ -17,9 +17,10 @@ namespace Ice { public override void run(string[] args) { - var properties = createTestProperties(ref args); - properties.setProperty("Ice.Package.Test", "Ice.optional"); - using(var communicator = initialize(properties)) + var initData = new InitializationData(); + initData.typeIdNamespaces = new string[]{"Ice.optional.TypeId"}; + initData.properties = createTestProperties(ref args); + using(var communicator = initialize(initData)) { communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0)); var adapter = communicator.createObjectAdapter("TestAdapter"); diff --git a/csharp/test/Ice/optional/ServerAMD.cs b/csharp/test/Ice/optional/ServerAMD.cs index 19efc461a95..eebfae4adf3 100644 --- a/csharp/test/Ice/optional/ServerAMD.cs +++ b/csharp/test/Ice/optional/ServerAMD.cs @@ -19,9 +19,10 @@ namespace Ice { public override void run(string[] args) { - var properties = createTestProperties(ref args); - properties.setProperty("Ice.Package.Test", "Ice.optional.AMD"); - using(var communicator = initialize(properties)) + var initData = new InitializationData(); + initData.typeIdNamespaces = new string[]{"Ice.optional.AMD.TypeId"}; + initData.properties = createTestProperties(ref args); + using(var communicator = initialize(initData)) { communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0)); var adapter = communicator.createObjectAdapter("TestAdapter"); diff --git a/csharp/test/Ice/optional/Test.ice b/csharp/test/Ice/optional/Test.ice index 076844b0531..479387e0e52 100644 --- a/csharp/test/Ice/optional/Test.ice +++ b/csharp/test/Ice/optional/Test.ice @@ -9,8 +9,8 @@ #pragma once -[["suppress-warning:deprecated"]] -[["cs:namespace:Ice.optional"]] +[["cs:typeid-namespace:Ice.optional.TypeId", "suppress-warning:deprecated"]] +["cs:namespace:Ice.optional"] module Test { diff --git a/csharp/test/Ice/optional/TestAMD.ice b/csharp/test/Ice/optional/TestAMD.ice index 53df2a33815..d2f92b90fd1 100644 --- a/csharp/test/Ice/optional/TestAMD.ice +++ b/csharp/test/Ice/optional/TestAMD.ice @@ -9,8 +9,8 @@ #pragma once -[["suppress-warning:deprecated"]] -[["cs:namespace:Ice.optional.AMD"]] +[["cs:typeid-namespace:Ice.optional.AMD.TypeId", "suppress-warning:deprecated"]] +["cs:namespace:Ice.optional.AMD"] module Test { diff --git a/csharp/test/Ice/packagemd/AllTests.cs b/csharp/test/Ice/packagemd/AllTests.cs deleted file mode 100644 index bf44bb8dfd9..00000000000 --- a/csharp/test/Ice/packagemd/AllTests.cs +++ /dev/null @@ -1,182 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -using Test; - -namespace Ice -{ - namespace packagemd - { - public class AllTests : global::Test.AllTests - { - public static Test.InitialPrx allTests(TestHelper helper) - { - var communicator = helper.communicator(); - var output = helper.getWriter(); - output.Write("testing stringToProxy... "); - output.Flush(); - var @base = communicator.stringToProxy("initial:" + helper.getTestEndpoint(0)); - test(@base != null); - output.WriteLine("ok"); - - output.Write("testing checked cast... "); - output.Flush(); - var initial = Test.InitialPrxHelper.checkedCast(@base); - test(initial != null); - test(initial.Equals(@base)); - output.WriteLine("ok"); - - { - output.Write("testing types without package... "); - output.Flush(); - Test1.C1 c1 = initial.getTest1C2AsC1(); - test(c1 != null); - test(c1 is Test1.C2); - Test1.C2 c2 = initial.getTest1C2AsC2(); - test(c2 != null); - try - { - initial.throwTest1E2AsE1(); - test(false); - } - catch(Test1.E1 ex) - { - test(ex is Test1.E2); - } - try - { - initial.throwTest1E2AsE2(); - test(false); - } - catch(Test1.E2) - { - // Expected - } - try - { - initial.throwTest1Notify(); - test(false); - } - catch(Test1.@notify) - { - // Expected - } - output.WriteLine("ok"); - } - - { - output.Write("testing types with package... "); - output.Flush(); - - { - try - { - initial.throwTest2E2AsE1(); - test(false); - } - catch(Ice.UnknownUserException) - { - // Expected - } - catch(Ice.MarshalException) - { - // Expected - } - catch(Ice.packagemd.testpkg.Test2.E1) - { - test(false); - } - try - { - initial.throwTest2E2AsE2(); - test(false); - } - catch(Ice.UnknownUserException) - { - // Expected - } - catch(Ice.MarshalException) - { - // Expected - } - catch(testpkg.Test2.E1) - { - test(false); - } - } - - { - // - // Define Ice.Package.Test2=testpkg and try again. - // - communicator.getProperties().setProperty("Ice.Package.Test2", "Ice.packagemd.testpkg"); - testpkg.Test2.C1 c1 = initial.getTest2C2AsC1(); - test(c1 != null); - test(c1 is testpkg.Test2.C2); - testpkg.Test2.C2 c2 = initial.getTest2C2AsC2(); - test(c2 != null); - try - { - initial.throwTest2E2AsE1(); - test(false); - } - catch(testpkg.Test2.E1 ex) - { - test(ex is testpkg.Test2.E2); - } - try - { - initial.throwTest2E2AsE2(); - test(false); - } - catch(testpkg.Test2.E2) - { - // Expected - } - } - - { - // - // Define Ice.Default.Package=testpkg and try again. We can't retrieve - // the Test2.* types again(with this communicator) because factories - // have already been cached for them, so now we use the Test3.* types. - // - communicator.getProperties().setProperty("Ice.Default.Package", "Ice.packagemd.modpkg"); - modpkg.Test3.C1 c1 = initial.getTest3C2AsC1(); - test(c1 != null); - test(c1 is modpkg.Test3.C2); - modpkg.Test3.C2 c2 = initial.getTest3C2AsC2(); - test(c2 != null); - try - { - initial.throwTest3E2AsE1(); - test(false); - } - catch(modpkg.Test3.E1 ex) - { - test(ex is modpkg.Test3.E2); - } - try - { - initial.throwTest3E2AsE2(); - test(false); - } - catch(modpkg.Test3.E2) - { - // Expected - } - } - - output.WriteLine("ok"); - } - return initial; - } - } - } -} diff --git a/csharp/test/Ice/packagemd/InitialI.cs b/csharp/test/Ice/packagemd/InitialI.cs deleted file mode 100644 index 785b6e5da17..00000000000 --- a/csharp/test/Ice/packagemd/InitialI.cs +++ /dev/null @@ -1,87 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -namespace Ice -{ - namespace packagemd - { - public class InitialI : Test.InitialDisp_ - { - public override Test1.C1 getTest1C2AsC1(Current current = null) - { - return new Test1.C2(); - } - - public override Test1.C2 getTest1C2AsC2(Current current = null) - { - return new Test1.C2(); - } - - public override testpkg.Test2.C1 getTest2C2AsC1(Current current = null) - { - return new testpkg.Test2.C2(); - } - - public override testpkg.Test2.C2 getTest2C2AsC2(Current current = null) - { - return new testpkg.Test2.C2(); - } - - public override modpkg.Test3.C1 getTest3C2AsC1(Current current = null) - { - return new modpkg.Test3.C2(); - } - - public override modpkg.Test3.C2 getTest3C2AsC2(Current current = null) - { - return new modpkg.Test3.C2(); - } - - public override void shutdown(Current current = null) - { - current.adapter.getCommunicator().shutdown(); - } - - public override void throwTest1E2AsE1(Current current = null) - { - throw new Test1.E2(); - } - - public override void throwTest1E2AsE2(Current current = null) - { - throw new Test1.E2(); - } - - public override void throwTest1Notify(Current current = null) - { - throw new Test1.@notify(); - } - - public override void throwTest2E2AsE1(Current current = null) - { - throw new testpkg.Test2.E2(); - } - - public override void throwTest2E2AsE2(Current current = null) - { - throw new testpkg.Test2.E2(); - } - - public override void throwTest3E2AsE1(Current current = null) - { - throw new modpkg.Test3.E2(); - } - - public override void throwTest3E2AsE2(Current current = null) - { - throw new modpkg.Test3.E2(); - } - } - } -} diff --git a/csharp/test/Ice/packagemd/Test.ice b/csharp/test/Ice/packagemd/Test.ice deleted file mode 100644 index 7d273f904a8..00000000000 --- a/csharp/test/Ice/packagemd/Test.ice +++ /dev/null @@ -1,40 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#pragma once - -#include <Package.ice> -#include <NoPackage.ice> - -[["cs:namespace:Ice.packagemd"]] -module Test -{ - -interface Initial -{ - Test1::C1 getTest1C2AsC1(); - Test1::C2 getTest1C2AsC2(); - void throwTest1E2AsE1() throws Test1::E1; - void throwTest1E2AsE2() throws Test1::E2; - void throwTest1Notify() throws Test1::notify; - - Test2::C1 getTest2C2AsC1(); - Test2::C2 getTest2C2AsC2(); - void throwTest2E2AsE1() throws Test2::E1; - void throwTest2E2AsE2() throws Test2::E2; - - Test3::C1 getTest3C2AsC1(); - Test3::C2 getTest3C2AsC2(); - void throwTest3E2AsE1() throws Test3::E1; - void throwTest3E2AsE2() throws Test3::E2; - - void shutdown(); -} - -} diff --git a/csharp/test/Ice/proxy/Client.cs b/csharp/test/Ice/proxy/Client.cs index 3a34ae485d4..bc9d6462131 100644 --- a/csharp/test/Ice/proxy/Client.cs +++ b/csharp/test/Ice/proxy/Client.cs @@ -17,9 +17,7 @@ namespace Ice { public override void run(string[] args) { - var properties = createTestProperties(ref args); - properties.setProperty("Ice.Package.Test", "Ice.proxy"); - using(var communicator = initialize(properties)) + using(var communicator = initialize(ref args)) { var myClass = AllTests.allTests(this); myClass.shutdown(); diff --git a/csharp/test/Ice/proxy/Collocated.cs b/csharp/test/Ice/proxy/Collocated.cs index 616219c0fe3..5e388ad36b2 100644 --- a/csharp/test/Ice/proxy/Collocated.cs +++ b/csharp/test/Ice/proxy/Collocated.cs @@ -22,7 +22,6 @@ namespace Ice properties.setProperty("Ice.ThreadPool.Client.Size", "2"); // For nested AMI. properties.setProperty("Ice.ThreadPool.Client.SizeWarn", "0"); properties.setProperty("Ice.Warn.Dispatch", "0"); - properties.setProperty("Ice.Package.Test", "Ice.proxy"); using(var communicator = initialize(properties)) { diff --git a/csharp/test/Ice/proxy/Server.cs b/csharp/test/Ice/proxy/Server.cs index fbde39fc50a..10be79ebc08 100644 --- a/csharp/test/Ice/proxy/Server.cs +++ b/csharp/test/Ice/proxy/Server.cs @@ -23,7 +23,6 @@ namespace Ice // properties.setProperty("Ice.Warn.Connections", "0"); properties.setProperty("Ice.Warn.Dispatch", "0"); - properties.setProperty("Ice.Package.Test", "Ice.proxy"); using(var communicator = initialize(properties)) { diff --git a/csharp/test/Ice/proxy/ServerAMD.cs b/csharp/test/Ice/proxy/ServerAMD.cs index 5bda4da4baa..d061ca372d6 100644 --- a/csharp/test/Ice/proxy/ServerAMD.cs +++ b/csharp/test/Ice/proxy/ServerAMD.cs @@ -23,7 +23,6 @@ namespace Ice // properties.setProperty("Ice.Warn.Connections", "0"); properties.setProperty("Ice.Warn.Dispatch", "0"); - properties.setProperty("Ice.Package.Test", "Ice.proxy"); using(var communicator = initialize(properties)) { communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0)); diff --git a/csharp/test/Ice/proxy/Test.ice b/csharp/test/Ice/proxy/Test.ice index a49110e4fcc..9026c9174b9 100644 --- a/csharp/test/Ice/proxy/Test.ice +++ b/csharp/test/Ice/proxy/Test.ice @@ -11,7 +11,7 @@ #include <Ice/Current.ice> -[["cs:namespace:Ice.proxy"]] +["cs:namespace:Ice.proxy"] module Test { diff --git a/csharp/test/Ice/proxy/TestAMD.ice b/csharp/test/Ice/proxy/TestAMD.ice index 2d1dcdf815a..c55ab9bd863 100644 --- a/csharp/test/Ice/proxy/TestAMD.ice +++ b/csharp/test/Ice/proxy/TestAMD.ice @@ -11,7 +11,7 @@ #include <Ice/Current.ice> -[["cs:namespace:Ice.proxy.AMD"]] +["cs:namespace:Ice.proxy.AMD"] module Test { diff --git a/csharp/test/Ice/retry/Client.cs b/csharp/test/Ice/retry/Client.cs index 796faaf98a9..49cf5bc0151 100644 --- a/csharp/test/Ice/retry/Client.cs +++ b/csharp/test/Ice/retry/Client.cs @@ -27,7 +27,6 @@ namespace Ice // This test kills connections, so we don't want warnings. // initData.properties.setProperty("Ice.Warn.Connections", "0"); - initData.properties.setProperty("Ice.Package.Test", "Ice.retry"); using(var communicator = initialize(initData)) { // diff --git a/csharp/test/Ice/retry/Collocated.cs b/csharp/test/Ice/retry/Collocated.cs index 0f68acb7b74..0b601e3fbdd 100644 --- a/csharp/test/Ice/retry/Collocated.cs +++ b/csharp/test/Ice/retry/Collocated.cs @@ -28,7 +28,6 @@ namespace Ice // This test kills connections, so we don't want warnings. // initData.properties.setProperty("Ice.Warn.Connections", "0"); - initData.properties.setProperty("Ice.Package.Test", "Ice.retry"); using(var communicator = initialize(initData)) { // diff --git a/csharp/test/Ice/retry/Server.cs b/csharp/test/Ice/retry/Server.cs index 22413bd18d7..359b89ea045 100644 --- a/csharp/test/Ice/retry/Server.cs +++ b/csharp/test/Ice/retry/Server.cs @@ -19,7 +19,6 @@ namespace Ice { var properties = createTestProperties(ref args); properties.setProperty("Ice.Warn.Dispatch", "0"); - properties.setProperty("Ice.Package.Test", "Ice.retry"); using(var communicator = initialize(properties)) { communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0)); diff --git a/csharp/test/Ice/retry/Test.ice b/csharp/test/Ice/retry/Test.ice index 50ebd5b20a5..5fc86952026 100644 --- a/csharp/test/Ice/retry/Test.ice +++ b/csharp/test/Ice/retry/Test.ice @@ -9,7 +9,7 @@ #pragma once -[["cs:namespace:Ice.retry"]] +["cs:namespace:Ice.retry"] module Test { diff --git a/csharp/test/Ice/scope/Client.cs b/csharp/test/Ice/scope/Client.cs index 77afc462eee..164ed236bea 100644 --- a/csharp/test/Ice/scope/Client.cs +++ b/csharp/test/Ice/scope/Client.cs @@ -17,9 +17,10 @@ namespace Ice { public override void run(string[] args) { - var properties = createTestProperties(ref args); - properties.setProperty("Ice.Package.Test", "Ice.scope"); - using(var communicator = initialize(properties)) + var initData = new InitializationData(); + initData.typeIdNamespaces = new string[]{"Ice.scope.TypeId"}; + initData.properties = createTestProperties(ref args); + using(var communicator = initialize(initData)) { var output = getWriter(); output.Write("test same Slice type name in different scopes... "); diff --git a/csharp/test/Ice/scope/Server.cs b/csharp/test/Ice/scope/Server.cs index 32824923b80..edeb767cf55 100644 --- a/csharp/test/Ice/scope/Server.cs +++ b/csharp/test/Ice/scope/Server.cs @@ -228,9 +228,10 @@ namespace Ice public override void run(string[] args) { - Ice.Properties properties = createTestProperties(ref args); - properties.setProperty("Ice.Package.Test", "Ice.scope"); - using(var communicator = initialize(properties)) + var initData = new InitializationData(); + initData.typeIdNamespaces = new string[]{"Ice.scope.TypeId"}; + initData.properties = createTestProperties(ref args); + using(var communicator = initialize(initData)) { communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0)); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); diff --git a/csharp/test/Ice/scope/Test.ice b/csharp/test/Ice/scope/Test.ice index ac08ce5db18..4506df48c31 100644 --- a/csharp/test/Ice/scope/Test.ice +++ b/csharp/test/Ice/scope/Test.ice @@ -9,7 +9,8 @@ #pragma once -[["cs:namespace:Ice.scope"]] +[["cs:typeid-namespace:Ice.scope.TypeId"]] +["cs:namespace:Ice.scope"] module Test { struct S diff --git a/csharp/test/Ice/seqMapping/Client.cs b/csharp/test/Ice/seqMapping/Client.cs index 046b85cdb3b..ad1902d006d 100644 --- a/csharp/test/Ice/seqMapping/Client.cs +++ b/csharp/test/Ice/seqMapping/Client.cs @@ -18,9 +18,10 @@ namespace Ice { public override void run(string[] args) { - var properties = createTestProperties(ref args); - properties.setProperty("Ice.Package.Test", "Ice.seqMapping"); - using(var communicator = initialize(properties)) + var initData = new InitializationData(); + initData.typeIdNamespaces = new string[]{"Ice.seqMapping.TypeId"}; + initData.properties = createTestProperties(ref args); + using(var communicator = initialize(initData)) { var myClass = AllTests.allTests(this, false); Console.Out.Write("shutting down server... "); diff --git a/csharp/test/Ice/seqMapping/Collocated.cs b/csharp/test/Ice/seqMapping/Collocated.cs index 4e56d98cd2d..37598e82143 100644 --- a/csharp/test/Ice/seqMapping/Collocated.cs +++ b/csharp/test/Ice/seqMapping/Collocated.cs @@ -17,9 +17,10 @@ namespace Ice { public override void run(string[] args) { - var properties = createTestProperties(ref args); - properties.setProperty("Ice.Package.Test", "Ice.seqMapping"); - using(var communicator = initialize(properties)) + var initData = new InitializationData(); + initData.typeIdNamespaces = new string[]{"Ice.seqMapping.TypeId"}; + initData.properties = createTestProperties(ref args); + using(var communicator = initialize(initData)) { communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0)); var adapter = communicator.createObjectAdapter("TestAdapter"); diff --git a/csharp/test/Ice/seqMapping/Server.cs b/csharp/test/Ice/seqMapping/Server.cs index fd20e050b0c..4487cd66fab 100644 --- a/csharp/test/Ice/seqMapping/Server.cs +++ b/csharp/test/Ice/seqMapping/Server.cs @@ -17,9 +17,10 @@ namespace Ice { public override void run(string[] args) { - var properties = createTestProperties(ref args); - properties.setProperty("Ice.Package.Test", "Ice.seqMapping"); - using(var communicator = initialize(properties)) + var initData = new InitializationData(); + initData.typeIdNamespaces = new string[]{"Ice.seqMapping.TypeId"}; + initData.properties = createTestProperties(ref args); + using(var communicator = initialize(initData)) { communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0)); var adapter = communicator.createObjectAdapter("TestAdapter"); diff --git a/csharp/test/Ice/seqMapping/ServerAMD.cs b/csharp/test/Ice/seqMapping/ServerAMD.cs index 821a6d6db9d..23155db6e8b 100644 --- a/csharp/test/Ice/seqMapping/ServerAMD.cs +++ b/csharp/test/Ice/seqMapping/ServerAMD.cs @@ -19,9 +19,10 @@ namespace Ice { public override void run(string[] args) { - var properties = createTestProperties(ref args); - properties.setProperty("Ice.Package.Test", "Ice.seqMapping.AMD"); - using(var communicator = initialize(properties)) + var initData = new InitializationData(); + initData.typeIdNamespaces = new string[]{"Ice.seqMapping.AMD.TypeId"}; + initData.properties = createTestProperties(ref args); + using(var communicator = initialize(initData)) { communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0)); var adapter = communicator.createObjectAdapter("TestAdapter"); diff --git a/csharp/test/Ice/seqMapping/Test.ice b/csharp/test/Ice/seqMapping/Test.ice index 5d1f43b2b16..36919996e33 100644 --- a/csharp/test/Ice/seqMapping/Test.ice +++ b/csharp/test/Ice/seqMapping/Test.ice @@ -9,7 +9,9 @@ #pragma once -[["cs:namespace:Ice.seqMapping"]] +[["cs:typeid-namespace:Ice.seqMapping.TypeId"]] + +["cs:namespace:Ice.seqMapping"] module Test { diff --git a/csharp/test/Ice/seqMapping/TestAMD.ice b/csharp/test/Ice/seqMapping/TestAMD.ice index 0aefd6693fd..f80a0e1f6a7 100644 --- a/csharp/test/Ice/seqMapping/TestAMD.ice +++ b/csharp/test/Ice/seqMapping/TestAMD.ice @@ -9,7 +9,9 @@ #pragma once -[["cs:namespace:Ice.seqMapping.AMD"]] +[["cs:typeid-namespace:Ice.seqMapping.AMD.TypeId"]] + +["cs:namespace:Ice.seqMapping.AMD"] module Test { diff --git a/csharp/test/Ice/serialize/Client.cs b/csharp/test/Ice/serialize/Client.cs index e12e8e0db37..0efb4797989 100644 --- a/csharp/test/Ice/serialize/Client.cs +++ b/csharp/test/Ice/serialize/Client.cs @@ -17,9 +17,10 @@ namespace Ice { public override void run(string[] args) { - var properties = createTestProperties(ref args); - properties.setProperty("Ice.Package.Test", "Ice.serialize"); - using(var communicator = initialize(properties)) + var initData = new InitializationData(); + initData.typeIdNamespaces = new string[]{"Ice.serialize.TypeId"}; + initData.properties = createTestProperties(ref args); + using(var communicator = initialize(initData)) { AllTests.allTests(this); } diff --git a/csharp/test/Ice/serialize/Test.ice b/csharp/test/Ice/serialize/Test.ice index 296b1ba4897..7ac6fee7d08 100644 --- a/csharp/test/Ice/serialize/Test.ice +++ b/csharp/test/Ice/serialize/Test.ice @@ -11,7 +11,9 @@ #include <Ice/BuiltinSequences.ice> -[["cs:namespace:Ice.serialize"]] +[["cs:typeid-namespace:Ice.serialize.TypeId"]] + +["cs:namespace:Ice.serialize"] module Test { diff --git a/csharp/test/Ice/servantLocator/Client.cs b/csharp/test/Ice/servantLocator/Client.cs index 012a703cf71..905523bd0e4 100644 --- a/csharp/test/Ice/servantLocator/Client.cs +++ b/csharp/test/Ice/servantLocator/Client.cs @@ -17,9 +17,10 @@ namespace Ice { public override void run(string[] args) { - var properties = createTestProperties(ref args); - properties.setProperty("Ice.Package.Test", "Ice.servantLocator"); - using(var communicator = initialize(properties)) + var initData = new InitializationData(); + initData.typeIdNamespaces = new string[]{"Ice.servantLocator.TypeId"}; + initData.properties = createTestProperties(ref args); + using(var communicator = initialize(initData)) { var obj = AllTests.allTests(this); obj.shutdown(); diff --git a/csharp/test/Ice/servantLocator/Collocated.cs b/csharp/test/Ice/servantLocator/Collocated.cs index e68caa7f50b..fc6da1dd04c 100644 --- a/csharp/test/Ice/servantLocator/Collocated.cs +++ b/csharp/test/Ice/servantLocator/Collocated.cs @@ -17,9 +17,10 @@ namespace Ice { public override void run(string[] args) { - var properties = createTestProperties(ref args); - properties.setProperty("Ice.Package.Test", "Ice.servantLocator"); - using(var communicator = initialize(properties)) + var initData = new InitializationData(); + initData.typeIdNamespaces = new string[]{"Ice.servantLocator.TypeId"}; + initData.properties = createTestProperties(ref args); + using(var communicator = initialize(initData)) { communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0)); communicator.getProperties().setProperty("Ice.Warn.Dispatch", "0"); diff --git a/csharp/test/Ice/servantLocator/Server.cs b/csharp/test/Ice/servantLocator/Server.cs index 7a1de5ad03e..badace3a3af 100644 --- a/csharp/test/Ice/servantLocator/Server.cs +++ b/csharp/test/Ice/servantLocator/Server.cs @@ -17,9 +17,10 @@ namespace Ice { public override void run(string[] args) { - var properties = createTestProperties(ref args); - properties.setProperty("Ice.Package.Test", "Ice.servantLocator"); - using(var communicator = initialize(properties)) + var initData = new InitializationData(); + initData.typeIdNamespaces = new string[]{"Ice.servantLocator.TypeId"}; + initData.properties = createTestProperties(ref args); + using(var communicator = initialize(initData)) { communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0)); communicator.getProperties().setProperty("Ice.Warn.Dispatch", "0"); diff --git a/csharp/test/Ice/servantLocator/ServerAMD.cs b/csharp/test/Ice/servantLocator/ServerAMD.cs index 02af2037637..3614fdf3020 100644 --- a/csharp/test/Ice/servantLocator/ServerAMD.cs +++ b/csharp/test/Ice/servantLocator/ServerAMD.cs @@ -19,9 +19,10 @@ namespace Ice { public override void run(string[] args) { - var properties = createTestProperties(ref args); - properties.setProperty("Ice.Package.Test", "Ice.servantLocator.AMD"); - using(var communicator = initialize(properties)) + var initData = new InitializationData(); + initData.typeIdNamespaces = new string[]{"Ice.servantLocator.AMD.TypeId"}; + initData.properties = createTestProperties(ref args); + using(var communicator = initialize(initData)) { communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0)); communicator.getProperties().setProperty("Ice.Warn.Dispatch", "0"); diff --git a/csharp/test/Ice/servantLocator/Test.ice b/csharp/test/Ice/servantLocator/Test.ice index aacbe376dd4..3d6f2c25856 100644 --- a/csharp/test/Ice/servantLocator/Test.ice +++ b/csharp/test/Ice/servantLocator/Test.ice @@ -9,7 +9,9 @@ #pragma once -[["cs:namespace:Ice.servantLocator"]] +[["cs:typeid-namespace:Ice.servantLocator.TypeId"]] + +["cs:namespace:Ice.servantLocator"] module Test { diff --git a/csharp/test/Ice/servantLocator/TestAMD.ice b/csharp/test/Ice/servantLocator/TestAMD.ice index fb7409e0108..3e9d924c485 100644 --- a/csharp/test/Ice/servantLocator/TestAMD.ice +++ b/csharp/test/Ice/servantLocator/TestAMD.ice @@ -9,7 +9,9 @@ #pragma once -[["cs:namespace:Ice.servantLocator.AMD"]] +[["cs:typeid-namespace:Ice.servantLocator.AMD.TypeId"]] + +["cs:namespace:Ice.servantLocator.AMD"] module Test { diff --git a/csharp/test/Ice/stream/Client.cs b/csharp/test/Ice/stream/Client.cs index e2a7837781b..8c5f5c846fa 100644 --- a/csharp/test/Ice/stream/Client.cs +++ b/csharp/test/Ice/stream/Client.cs @@ -15,9 +15,10 @@ namespace Ice { public override void run(string[] args) { - var properties = createTestProperties(ref args); - properties.setProperty("Ice.Package.Test", "Ice.stream"); - using(var communicator = initialize(properties)) + var initData = new InitializationData(); + initData.typeIdNamespaces = new string[]{"Ice.stream.TypeId"}; + initData.properties = createTestProperties(ref args); + using(var communicator = initialize(initData)) { AllTests.allTests(this); } diff --git a/csharp/test/Ice/stream/Test.ice b/csharp/test/Ice/stream/Test.ice index f1e191ca631..752efa16fd4 100644 --- a/csharp/test/Ice/stream/Test.ice +++ b/csharp/test/Ice/stream/Test.ice @@ -12,12 +12,11 @@ // // Suppress invalid metadata warnings // -[["suppress-warning:invalid-metadata, deprecated"]] - -[["cs:namespace:Ice.stream"]] +[["cs:typeid-namespace:Ice.stream.TypeId", "suppress-warning:invalid-metadata, deprecated"]] #include <Ice/BuiltinSequences.ice> +["cs:namespace:Ice.stream"] module Test { diff --git a/csharp/test/Ice/threadPoolPriority/Client.cs b/csharp/test/Ice/threadPoolPriority/Client.cs index e0b54ac4939..695fe7fe715 100644 --- a/csharp/test/Ice/threadPoolPriority/Client.cs +++ b/csharp/test/Ice/threadPoolPriority/Client.cs @@ -15,9 +15,7 @@ namespace Ice { public override void run(string[] args) { - var properties = createTestProperties(ref args); - properties.setProperty("Ice.Package.Test", "Ice.threadPoolPriority"); - using(var communicator = initialize(properties)) + using(var communicator = initialize(ref args)) { var output = getWriter(); output.Write("testing server priority... "); diff --git a/csharp/test/Ice/threadPoolPriority/Server.cs b/csharp/test/Ice/threadPoolPriority/Server.cs index 866eaf1ca9a..0324d2e930a 100644 --- a/csharp/test/Ice/threadPoolPriority/Server.cs +++ b/csharp/test/Ice/threadPoolPriority/Server.cs @@ -17,7 +17,6 @@ namespace Ice { var properties = createTestProperties(ref args); properties.setProperty("Ice.ThreadPool.Server.ThreadPriority", "AboveNormal"); - properties.setProperty("Ice.Package.Test", "Ice.threadPoolPriority"); using(var communicator = initialize(properties)) { communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0)); diff --git a/csharp/test/Ice/threadPoolPriority/Test.ice b/csharp/test/Ice/threadPoolPriority/Test.ice index 651adc19877..3551059a4ee 100644 --- a/csharp/test/Ice/threadPoolPriority/Test.ice +++ b/csharp/test/Ice/threadPoolPriority/Test.ice @@ -9,7 +9,7 @@ #pragma once -[["cs:namespace:Ice.threadPoolPriority"]] +["cs:namespace:Ice.threadPoolPriority"] module Test { diff --git a/csharp/test/Ice/timeout/Client.cs b/csharp/test/Ice/timeout/Client.cs index 4e635fbd1ba..accea863f65 100644 --- a/csharp/test/Ice/timeout/Client.cs +++ b/csharp/test/Ice/timeout/Client.cs @@ -32,7 +32,6 @@ namespace Ice // send() blocking after sending a given amount of data. // properties.setProperty("Ice.TCP.SndSize", "50000"); - properties.setProperty("Ice.Package.Test", "Ice.timeout"); using(var communicator = initialize(properties)) { AllTests.allTests(this); diff --git a/csharp/test/Ice/timeout/Server.cs b/csharp/test/Ice/timeout/Server.cs index e787c0dfbc8..5119dfe0395 100644 --- a/csharp/test/Ice/timeout/Server.cs +++ b/csharp/test/Ice/timeout/Server.cs @@ -32,7 +32,6 @@ namespace Ice // send() blocking after sending a given amount of data. // properties.setProperty("Ice.TCP.RcvSize", "50000"); - properties.setProperty("Ice.Package.Test", "Ice.timeout"); using(var communicator = initialize(properties)) { communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0)); diff --git a/csharp/test/Ice/timeout/Test.ice b/csharp/test/Ice/timeout/Test.ice index 4efc3f10943..5a829b019ac 100644 --- a/csharp/test/Ice/timeout/Test.ice +++ b/csharp/test/Ice/timeout/Test.ice @@ -9,7 +9,7 @@ #pragma once -[["cs:namespace:Ice.timeout"]] +["cs:namespace:Ice.timeout"] module Test { diff --git a/csharp/test/Ice/udp/Client.cs b/csharp/test/Ice/udp/Client.cs index fe80ee8e2fd..26f75f2bacc 100644 --- a/csharp/test/Ice/udp/Client.cs +++ b/csharp/test/Ice/udp/Client.cs @@ -20,7 +20,6 @@ namespace Ice var properties = createTestProperties(ref args); properties.setProperty("Ice.Warn.Connections", "0"); properties.setProperty("Ice.UDP.SndSize", "16384"); - properties.setProperty("Ice.Package.Test", "Ice.udp"); using(var communicator = initialize(properties)) { AllTests.allTests(this); diff --git a/csharp/test/Ice/udp/Server.cs b/csharp/test/Ice/udp/Server.cs index 8f7b5bb6f93..3ba45ca2b9f 100644 --- a/csharp/test/Ice/udp/Server.cs +++ b/csharp/test/Ice/udp/Server.cs @@ -21,7 +21,6 @@ namespace Ice Ice.Properties properties = createTestProperties(ref args); properties.setProperty("Ice.Warn.Connections", "0"); properties.setProperty("Ice.UDP.RcvSize", "16384"); - properties.setProperty("Ice.Package.Test", "Ice.udp"); if(IceInternal.AssemblyUtil.isMacOS && properties.getPropertyAsInt("Ice.IPv6") > 0) { // Disable dual mode sockets on macOS, see https://github.com/dotnet/corefx/issues/31182 diff --git a/csharp/test/Ice/udp/Test.ice b/csharp/test/Ice/udp/Test.ice index 8607eb6a677..c7399739865 100644 --- a/csharp/test/Ice/udp/Test.ice +++ b/csharp/test/Ice/udp/Test.ice @@ -11,7 +11,7 @@ #include <Ice/Identity.ice> -[["cs:namespace:Ice.udp"]] +["cs:namespace:Ice.udp"] module Test { diff --git a/csharp/test/xamarin/controller/MainPage.xaml.cs b/csharp/test/xamarin/controller/MainPage.xaml.cs index bb34df2be02..279c01a98f8 100644 --- a/csharp/test/xamarin/controller/MainPage.xaml.cs +++ b/csharp/test/xamarin/controller/MainPage.xaml.cs @@ -263,13 +263,13 @@ namespace controller return new Ice.optional.AMD.Server(); } - else if(type.Equals("Ice.packagemd.Client")) + else if(type.Equals("Ice.namespacemd.Client")) { - return new Ice.packagemd.Client(); + return new Ice.namespacemd.Client(); } - else if(type.Equals("Ice.packagemd.Server")) + else if(type.Equals("Ice.namespacemd.Server")) { - return new Ice.packagemd.Server(); + return new Ice.namespacemd.Server(); } else if(type.Equals("Ice.proxy.Client")) diff --git a/csharp/test/xamarin/controller/controller.csproj b/csharp/test/xamarin/controller/controller.csproj index 2a4684d6e5c..ffbd80f6f3e 100644 --- a/csharp/test/xamarin/controller/controller.csproj +++ b/csharp/test/xamarin/controller/controller.csproj @@ -76,7 +76,7 @@ <ProjectReference Include="..\..\Ice\objects\msbuild\test\netstandard2.0\test.csproj" /> <ProjectReference Include="..\..\Ice\operations\msbuild\test\netstandard2.0\test.csproj" /> <ProjectReference Include="..\..\Ice\optional\msbuild\test\netstandard2.0\test.csproj" /> - <ProjectReference Include="..\..\Ice\packagemd\msbuild\test\netstandard2.0\test.csproj" /> + <ProjectReference Include="..\..\Ice\namespacemd\msbuild\test\netstandard2.0\test.csproj" /> <ProjectReference Include="..\..\Ice\proxy\msbuild\test\netstandard2.0\test.csproj" /> <ProjectReference Include="..\..\Ice\retry\msbuild\test\netstandard2.0\test.csproj" /> <ProjectReference Include="..\..\Ice\scope\msbuild\test\netstandard2.0\test.csproj" /> |