summaryrefslogtreecommitdiff
path: root/csharp/test/Ice/inheritance
diff options
context:
space:
mode:
Diffstat (limited to 'csharp/test/Ice/inheritance')
-rw-r--r--csharp/test/Ice/inheritance/AllTests.cs41
-rw-r--r--csharp/test/Ice/inheritance/Client.cs37
-rw-r--r--csharp/test/Ice/inheritance/Collocated.cs40
-rw-r--r--csharp/test/Ice/inheritance/Server.cs40
-rw-r--r--csharp/test/Ice/inheritance/msbuild/server/server.csproj3
-rwxr-xr-xcsharp/test/Ice/inheritance/run.py25
6 files changed, 43 insertions, 143 deletions
diff --git a/csharp/test/Ice/inheritance/AllTests.cs b/csharp/test/Ice/inheritance/AllTests.cs
index a3e48def188..6c2b4fd088c 100644
--- a/csharp/test/Ice/inheritance/AllTests.cs
+++ b/csharp/test/Ice/inheritance/AllTests.cs
@@ -9,24 +9,25 @@
using Test;
-public class AllTests : TestCommon.TestApp
+public class AllTests : TestCommon.AllTests
{
- public static InitialPrx allTests(Ice.Communicator communicator)
+ public static InitialPrx allTests(TestCommon.Application app)
{
+ Ice.Communicator communicator = app.communicator();
Write("testing stringToProxy... ");
Flush();
- string ref_Renamed = "initial:default -p 12010";
+ string ref_Renamed = "initial:" + app.getTestEndpoint(0);
Ice.ObjectPrx @base = communicator.stringToProxy(ref_Renamed);
test(@base != null);
WriteLine("ok");
-
+
Write("testing checked cast... ");
Flush();
InitialPrx initial = InitialPrxHelper.checkedCast(@base);
test(initial != null);
test(initial.Equals(@base));
WriteLine("ok");
-
+
Write("getting proxies for class hierarchy... ");
Flush();
Test.MA.CAPrx ca = initial.caop();
@@ -40,7 +41,7 @@ public class AllTests : TestCommon.TestApp
test(cb != cd);
test(cc != cd);
WriteLine("ok");
-
+
Write("getting proxies for interface hierarchy... ");
Flush();
Test.MA.IAPrx ia = initial.iaop();
@@ -53,13 +54,13 @@ public class AllTests : TestCommon.TestApp
test(ib1 != ic);
test(ib2 != ic);
WriteLine("ok");
-
+
Write("invoking proxy operations on class hierarchy... ");
Flush();
Test.MA.CAPrx cao;
Test.MB.CBPrx cbo;
Test.MA.CCPrx cco;
-
+
cao = ca.caop(ca);
test(cao.Equals(ca));
cao = ca.caop(cb);
@@ -78,7 +79,7 @@ public class AllTests : TestCommon.TestApp
test(cao.Equals(cb));
cao = cc.caop(cc);
test(cao.Equals(cc));
-
+
cao = cb.cbop(cb);
test(cao.Equals(cb));
cbo = cb.cbop(cb);
@@ -95,7 +96,7 @@ public class AllTests : TestCommon.TestApp
test(cao.Equals(cc));
cbo = cc.cbop(cc);
test(cbo.Equals(cc));
-
+
cao = cc.ccop(cc);
test(cao.Equals(cc));
cbo = cc.ccop(cc);
@@ -103,14 +104,14 @@ public class AllTests : TestCommon.TestApp
cco = cc.ccop(cc);
test(cco.Equals(cc));
WriteLine("ok");
-
+
Write("ditto, but for interface hierarchy... ");
Flush();
Test.MA.IAPrx iao;
Test.MB.IB1Prx ib1o;
Test.MB.IB2Prx ib2o;
Test.MA.ICPrx ico;
-
+
iao = ia.iaop(ia);
test(iao.Equals(ia));
iao = ia.iaop(ib1);
@@ -143,7 +144,7 @@ public class AllTests : TestCommon.TestApp
test(iao.Equals(ib2));
iao = ic.iaop(ic);
test(iao.Equals(ic));
-
+
iao = ib1.ib1op(ib1);
test(iao.Equals(ib1));
ib1o = ib1.ib1op(ib1);
@@ -160,7 +161,7 @@ public class AllTests : TestCommon.TestApp
test(iao.Equals(ic));
ib1o = ic.ib1op(ic);
test(ib1o.Equals(ic));
-
+
iao = ib2.ib2op(ib2);
test(iao.Equals(ib2));
ib2o = ib2.ib2op(ib2);
@@ -177,7 +178,7 @@ public class AllTests : TestCommon.TestApp
test(iao.Equals(ic));
ib2o = ic.ib2op(ic);
test(ib2o.Equals(ic));
-
+
iao = ic.icop(ic);
test(iao.Equals(ic));
ib1o = ic.icop(ic);
@@ -187,31 +188,31 @@ public class AllTests : TestCommon.TestApp
ico = ic.icop(ic);
test(ico.Equals(ic));
WriteLine("ok");
-
+
Write("ditto, but for class implementing interfaces... ");
Flush();
-
+
cao = cd.caop(cd);
test(cao.Equals(cd));
cbo = cd.cbop(cd);
test(cbo.Equals(cd));
cco = cd.ccop(cd);
test(cco.Equals(cd));
-
+
iao = cd.iaop(cd);
test(iao.Equals(cd));
ib1o = cd.ib1op(cd);
test(ib1o.Equals(cd));
ib2o = cd.ib2op(cd);
test(ib2o.Equals(cd));
-
+
cao = cd.cdop(cd);
test(cao.Equals(cd));
cbo = cd.cdop(cd);
test(cbo.Equals(cd));
cco = cd.cdop(cd);
test(cco.Equals(cd));
-
+
iao = cd.cdop(cd);
test(iao.Equals(cd));
ib1o = cd.cdop(cd);
diff --git a/csharp/test/Ice/inheritance/Client.cs b/csharp/test/Ice/inheritance/Client.cs
index 805670012c6..3ffaca65c44 100644
--- a/csharp/test/Ice/inheritance/Client.cs
+++ b/csharp/test/Ice/inheritance/Client.cs
@@ -17,45 +17,18 @@ using System.Reflection;
[assembly: AssemblyDescription("Ice test")]
[assembly: AssemblyCompany("ZeroC, Inc.")]
-public class Client
+public class Client : TestCommon.Application
{
- private static int run(string[] args, Ice.Communicator communicator)
+ public override int run(string[] args)
{
- InitialPrx initial = AllTests.allTests(communicator);
+ InitialPrx initial = AllTests.allTests(this);
initial.shutdown();
return 0;
}
public static int Main(string[] args)
{
- int status = 0;
- Ice.Communicator communicator = null;
-
- try
- {
- Ice.InitializationData data = new Ice.InitializationData();
- communicator = Ice.Util.initialize(ref args, data);
- status = run(args, communicator);
- }
- catch(Exception ex)
- {
- Console.Error.WriteLine(ex);
- status = 1;
- }
-
- if(communicator != null)
- {
- try
- {
- communicator.destroy();
- }
- catch(Ice.LocalException ex)
- {
- Console.Error.WriteLine(ex);
- status = 1;
- }
- }
-
- return status;
+ Client app = new Client();
+ return app.runmain(args);
}
}
diff --git a/csharp/test/Ice/inheritance/Collocated.cs b/csharp/test/Ice/inheritance/Collocated.cs
index ab0cfc4951f..df775566080 100644
--- a/csharp/test/Ice/inheritance/Collocated.cs
+++ b/csharp/test/Ice/inheritance/Collocated.cs
@@ -17,47 +17,21 @@ 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)
{
- communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010");
- Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+ communicator().getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+ Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
Ice.Object obj = new InitialI(adapter);
adapter.add(obj, Ice.Util.stringToIdentity("initial"));
- AllTests.allTests(communicator);
+ AllTests.allTests(this);
return 0;
}
public static int Main(string[] args)
{
- int status = 0;
- Ice.Communicator communicator = null;
-
- try
- {
- communicator = Ice.Util.initialize(ref args);
- status = run(args, communicator);
- }
- catch(System.Exception ex)
- {
- System.Console.WriteLine(ex);
- status = 1;
- }
-
- if(communicator != null)
- {
- try
- {
- communicator.destroy();
- }
- catch(Ice.LocalException ex)
- {
- System.Console.WriteLine(ex);
- status = 1;
- }
- }
-
- return status;
+ Collocated app = new Collocated();
+ return app.runmain(args);
}
}
diff --git a/csharp/test/Ice/inheritance/Server.cs b/csharp/test/Ice/inheritance/Server.cs
index d4988c372b9..2844a25ff3d 100644
--- a/csharp/test/Ice/inheritance/Server.cs
+++ b/csharp/test/Ice/inheritance/Server.cs
@@ -16,48 +16,22 @@ using System.Reflection;
[assembly: AssemblyDescription("Ice test")]
[assembly: AssemblyCompany("ZeroC, Inc.")]
-public class Server
+public class Server : TestCommon.Application
{
- private static int run(string[] args, Ice.Communicator communicator)
+ public override int run(string[] args)
{
- communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010");
- Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+ communicator().getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+ Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
Ice.Object @object = new InitialI(adapter);
adapter.add(@object, Ice.Util.stringToIdentity("initial"));
adapter.activate();
- communicator.waitForShutdown();
+ communicator().waitForShutdown();
return 0;
}
public static int Main(string[] args)
{
- int status = 0;
- Ice.Communicator communicator = null;
-
- try
- {
- communicator = Ice.Util.initialize(ref args);
- status = run(args, communicator);
- }
- catch(Exception ex)
- {
- Console.Error.WriteLine(ex);
- status = 1;
- }
-
- if(communicator != null)
- {
- try
- {
- communicator.destroy();
- }
- catch(Ice.LocalException ex)
- {
- Console.Error.WriteLine(ex);
- status = 1;
- }
- }
-
- return status;
+ Server app = new Server();
+ return app.runmain(args);
}
}
diff --git a/csharp/test/Ice/inheritance/msbuild/server/server.csproj b/csharp/test/Ice/inheritance/msbuild/server/server.csproj
index 03cb5b53388..683ce6ed690 100644
--- a/csharp/test/Ice/inheritance/msbuild/server/server.csproj
+++ b/csharp/test/Ice/inheritance/msbuild/server/server.csproj
@@ -65,6 +65,9 @@
<Folder Include="Properties\" />
</ItemGroup>
<ItemGroup>
+ <Compile Include="..\..\..\..\TestCommon\TestApp.cs">
+ <Link>TestApp.cs</Link>
+ </Compile>
<Compile Include="..\..\CAI.cs">
<Link>CAI.cs</Link>
</Compile>
diff --git a/csharp/test/Ice/inheritance/run.py b/csharp/test/Ice/inheritance/run.py
deleted file mode 100755
index df7bc2b4ac3..00000000000
--- a/csharp/test/Ice/inheritance/run.py
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env python
-# **********************************************************************
-#
-# Copyright (c) 2003-2016 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.
-#
-# **********************************************************************
-
-import os, sys, getopt
-
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
-head = os.path.dirname(sys.argv[0])
-if len(head) > 0:
- path = [os.path.join(head, p) for p in path]
-path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ]
-if len(path) == 0:
- raise RuntimeError("can't find toplevel directory!")
-sys.path.append(os.path.join(path[0], "scripts"))
-import TestUtil
-
-TestUtil.queueClientServerTest()
-TestUtil.queueCollocatedTest()
-TestUtil.runQueuedTests()
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 21:08:43 +0000