diff options
Diffstat (limited to 'csharp/test/Ice/metrics/Collocated.cs')
| -rw-r--r-- | csharp/test/Ice/metrics/Collocated.cs | 85 |
1 files changed, 26 insertions, 59 deletions
diff --git a/csharp/test/Ice/metrics/Collocated.cs b/csharp/test/Ice/metrics/Collocated.cs index 58e6a6f00d3..3284eac8aa3 100644 --- a/csharp/test/Ice/metrics/Collocated.cs +++ b/csharp/test/Ice/metrics/Collocated.cs @@ -17,77 +17,44 @@ using System.Reflection; [assembly: AssemblyDescription("Ice test")] [assembly: AssemblyCompany("ZeroC, Inc.")] -public class Collocated +public class Collocated : TestCommon.Application { - private static int run(string[] args, Ice.Communicator communicator) + public override int run(string[] args) { - Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - adapter.add(new MetricsI(), communicator.stringToIdentity("metrics")); + Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter"); + adapter.add(new MetricsI(), Ice.Util.stringToIdentity("metrics")); //adapter.activate(); // Don't activate OA to ensure collocation is used. - communicator.getProperties().setProperty("ControllerAdapter.Endpoints", "default -p 12011"); - Ice.ObjectAdapter controllerAdapter = communicator.createObjectAdapter("ControllerAdapter"); - controllerAdapter.add(new ControllerI(adapter), communicator.stringToIdentity("controller")); + communicator().getProperties().setProperty("ControllerAdapter.Endpoints", getTestEndpoint(1)); + Ice.ObjectAdapter controllerAdapter = communicator().createObjectAdapter("ControllerAdapter"); + controllerAdapter.add(new ControllerI(adapter), Ice.Util.stringToIdentity("controller")); //controllerAdapter.activate(); // Don't activate OA to ensure collocation is used. - Test.MetricsPrx metrics = AllTests.allTests(communicator, _observer); + Test.MetricsPrx metrics = AllTests.allTests(this, _observer); metrics.shutdown(); return 0; } - public static int Main(string[] args) + protected override Ice.InitializationData getInitData(ref string[] args) { - int status = 0; - Ice.Communicator communicator = null; - -#if !COMPACT && !UNITY - Debug.Listeners.Add(new ConsoleTraceListener()); -#endif - - try - { - Ice.InitializationData initData = new Ice.InitializationData(); - initData.properties = Ice.Util.createProperties(ref args); - initData.properties.setProperty("Ice.Package.Test", "test.Ice.metrics"); - initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010"); - initData.properties.setProperty("Ice.Admin.Endpoints", "tcp"); - initData.properties.setProperty("Ice.Admin.InstanceName", "client"); - initData.properties.setProperty("Ice.Admin.DelayCreation", "1"); - initData.properties.setProperty("Ice.Warn.Connections", "0"); - initData.properties.setProperty("Ice.Warn.Dispatch", "0"); - initData.properties.setProperty("Ice.MessageSizeMax", "50000"); - initData.properties.setProperty("Ice.Default.Host", "127.0.0.1"); -#if COMPACT - // - // When using Ice for .NET Compact Framework, we need to specify - // the assembly so that Ice can locate classes and exceptions. - // - initData.properties.setProperty("Ice.FactoryAssemblies", "collocated"); -#endif - initData.observer = _observer; - communicator = Ice.Util.initialize(ref args, initData); - status = run(args, communicator); - } - catch(System.Exception ex) - { - Console.Error.WriteLine(ex); - status = 1; - } - - if(communicator != null) - { - try - { - communicator.destroy(); - } - catch(Ice.LocalException ex) - { - Console.Error.WriteLine(ex); - status = 1; - } - } + Ice.InitializationData initData = base.getInitData(ref args); + initData.observer = _observer; + initData.properties.setProperty("Ice.Package.Test", "test.Ice.metrics"); + initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0)); + initData.properties.setProperty("Ice.Admin.Endpoints", "tcp"); + initData.properties.setProperty("Ice.Admin.InstanceName", "client"); + initData.properties.setProperty("Ice.Admin.DelayCreation", "1"); + initData.properties.setProperty("Ice.Warn.Connections", "0"); + initData.properties.setProperty("Ice.Warn.Dispatch", "0"); + initData.properties.setProperty("Ice.MessageSizeMax", "50000"); + initData.properties.setProperty("Ice.Default.Host", "127.0.0.1"); + return initData; + } - return status; + public static int Main(string[] args) + { + Collocated app = new Collocated(); + return app.runmain(args); } static CommunicatorObserverI _observer = new CommunicatorObserverI(); |