summaryrefslogtreecommitdiff
path: root/csharp/test/Ice/interceptor
diff options
context:
space:
mode:
Diffstat (limited to 'csharp/test/Ice/interceptor')
-rw-r--r--csharp/test/Ice/interceptor/Client.cs414
-rw-r--r--csharp/test/Ice/interceptor/msbuild/client/client.csproj3
-rwxr-xr-xcsharp/test/Ice/interceptor/run.py31
3 files changed, 204 insertions, 244 deletions
diff --git a/csharp/test/Ice/interceptor/Client.cs b/csharp/test/Ice/interceptor/Client.cs
index e50b0e34cd8..00ca5d77d1e 100644
--- a/csharp/test/Ice/interceptor/Client.cs
+++ b/csharp/test/Ice/interceptor/Client.cs
@@ -16,227 +16,215 @@ using System.Reflection;
[assembly: AssemblyDescription("Ice test")]
[assembly: AssemblyCompany("ZeroC, Inc.")]
-public class Client
+public class Client : TestCommon.Application
{
- public class App : Ice.Application
+ private int run(Test.MyObjectPrx prx, InterceptorI interceptor)
{
- private static void test(bool b)
- {
- if(!b)
- {
- throw new Exception();
- }
- }
-
- private int run(Test.MyObjectPrx prx, InterceptorI interceptor)
- {
- Console.Out.Write("testing simple interceptor... ");
- Console.Out.Flush();
- test(interceptor.getLastOperation() == null);
- test(!interceptor.getLastStatus());
- prx.ice_ping();
- test(interceptor.getLastOperation().Equals("ice_ping"));
- test(!interceptor.getLastStatus());
- String typeId = prx.ice_id();
- test(interceptor.getLastOperation().Equals("ice_id"));
- test(!interceptor.getLastStatus());
- test(prx.ice_isA(typeId));
- test(interceptor.getLastOperation().Equals("ice_isA"));
- test(!interceptor.getLastStatus());
- test(prx.add(33, 12) == 45);
- test(interceptor.getLastOperation().Equals("add"));
- test(!interceptor.getLastStatus());
- Console.WriteLine("ok");
- Console.Out.Write("testing retry... ");
- Console.Out.Flush();
- test(prx.addWithRetry(33, 12) == 45);
- test(interceptor.getLastOperation().Equals("addWithRetry"));
- test(!interceptor.getLastStatus());
- Console.WriteLine("ok");
- Console.Out.Write("testing user exception... ");
- Console.Out.Flush();
- try
- {
- prx.badAdd(33, 12);
- test(false);
- }
- catch(Test.InvalidInputException)
- {
- // expected
- }
- test(interceptor.getLastOperation().Equals("badAdd"));
- test(!interceptor.getLastStatus());
- Console.WriteLine("ok");
- Console.Out.Write("testing ONE... ");
- Console.Out.Flush();
- interceptor.clear();
- try
- {
- prx.notExistAdd(33, 12);
- test(false);
- }
- catch(Ice.ObjectNotExistException)
- {
- // expected
- }
- test(interceptor.getLastOperation().Equals("notExistAdd"));
- test(!interceptor.getLastStatus());
- Console.WriteLine("ok");
- Console.Out.Write("testing system exception... ");
- Console.Out.Flush();
- interceptor.clear();
- try
- {
- prx.badSystemAdd(33, 12);
- test(false);
- }
- catch(Ice.UnknownException)
- {
- test(!prx.ice_isCollocationOptimized());
- }
- catch(MySystemException)
- {
- test(prx.ice_isCollocationOptimized());
- }
- catch(Exception)
- {
- test(false);
- }
- test(interceptor.getLastOperation().Equals("badSystemAdd"));
- test(!interceptor.getLastStatus());
- Console.WriteLine("ok");
-
- return 0;
- }
-
- private int runAmd(Test.MyObjectPrx prx, InterceptorI interceptor)
- {
- Console.Out.Write("testing simple interceptor... ");
- Console.Out.Flush();
- test(interceptor.getLastOperation() == null);
- test(!interceptor.getLastStatus());
- test(prx.amdAdd(33, 12) == 45);
- test(interceptor.getLastOperation().Equals("amdAdd"));
- test(interceptor.getLastStatus());
- Console.WriteLine("ok");
-
- Console.Out.Write("testing retry... ");
- Console.Out.Flush();
- test(prx.amdAddWithRetry(33, 12) == 45);
- test(interceptor.getLastOperation().Equals("amdAddWithRetry"));
- test(interceptor.getLastStatus());
- Console.WriteLine("ok");
-
- Console.Out.Write("testing user exception... ");
- Console.Out.Flush();
- try
- {
- prx.amdBadAdd(33, 12);
- test(false);
- }
- catch(Test.InvalidInputException)
- {
- // expected
- }
- test(interceptor.getLastOperation().Equals("amdBadAdd"));
- test(interceptor.getLastStatus());
- Console.WriteLine("ok");
-
- Console.Out.Write("testing ONE... ");
- Console.Out.Flush();
- interceptor.clear();
- try
- {
- prx.amdNotExistAdd(33, 12);
- test(false);
- }
- catch(Ice.ObjectNotExistException)
- {
- // expected
- }
- test(interceptor.getLastOperation().Equals("amdNotExistAdd"));
- test(interceptor.getLastStatus());
- Console.WriteLine("ok");
-
- Console.Out.Write("testing system exception... ");
- Console.Out.Flush();
- interceptor.clear();
- try
- {
- prx.amdBadSystemAdd(33, 12);
- test(false);
- }
- catch(Ice.UnknownException)
- {
- test(!prx.ice_isCollocationOptimized());
- }
- catch(MySystemException)
- {
- test(prx.ice_isCollocationOptimized());
- }
- catch(Exception)
- {
- test(false);
- }
- test(interceptor.getLastOperation().Equals("amdBadSystemAdd"));
- test(interceptor.getLastStatus());
- Console.WriteLine("ok");
- return 0;
- }
-
- public override int run(string[] args)
- {
- //
- // Create OA and servants
- //
-
- communicator().getProperties().setProperty("MyOA.AdapterId", "myOA");
-
- Ice.ObjectAdapter oa = communicator().createObjectAdapterWithEndpoints("MyOA2", "tcp -h localhost");
-
- Ice.Object servant = new MyObjectI();
- InterceptorI interceptor = new InterceptorI(servant);
-
- Test.MyObjectPrx prx = Test.MyObjectPrxHelper.uncheckedCast(oa.addWithUUID(interceptor));
-
- Console.WriteLine("Collocation optimization on");
- int rs = run(prx, interceptor);
- if(rs != 0)
- {
- return rs;
- }
-
- Console.WriteLine("Now with AMD");
- interceptor.clear();
- rs = runAmd(prx, interceptor);
- if(rs != 0)
- {
- return rs;
- }
-
- oa.activate(); // Only necessary for non-collocation optimized tests
-
- Console.WriteLine("Collocation optimization off");
- interceptor.clear();
- prx = Test.MyObjectPrxHelper.uncheckedCast(prx.ice_collocationOptimized(false));
- rs = run(prx, interceptor);
- if(rs != 0)
- {
- return rs;
- }
-
- Console.WriteLine("Now with AMD");
- interceptor.clear();
- rs = runAmd(prx, interceptor);
+ Console.Out.Write("testing simple interceptor... ");
+ Console.Out.Flush();
+ test(interceptor.getLastOperation() == null);
+ test(!interceptor.getLastStatus());
+ prx.ice_ping();
+ test(interceptor.getLastOperation().Equals("ice_ping"));
+ test(!interceptor.getLastStatus());
+ String typeId = prx.ice_id();
+ test(interceptor.getLastOperation().Equals("ice_id"));
+ test(!interceptor.getLastStatus());
+ test(prx.ice_isA(typeId));
+ test(interceptor.getLastOperation().Equals("ice_isA"));
+ test(!interceptor.getLastStatus());
+ test(prx.add(33, 12) == 45);
+ test(interceptor.getLastOperation().Equals("add"));
+ test(!interceptor.getLastStatus());
+ Console.WriteLine("ok");
+ Console.Out.Write("testing retry... ");
+ Console.Out.Flush();
+ test(prx.addWithRetry(33, 12) == 45);
+ test(interceptor.getLastOperation().Equals("addWithRetry"));
+ test(!interceptor.getLastStatus());
+ Console.WriteLine("ok");
+ Console.Out.Write("testing user exception... ");
+ Console.Out.Flush();
+ try
+ {
+ prx.badAdd(33, 12);
+ test(false);
+ }
+ catch(Test.InvalidInputException)
+ {
+ // expected
+ }
+ test(interceptor.getLastOperation().Equals("badAdd"));
+ test(!interceptor.getLastStatus());
+ Console.WriteLine("ok");
+ Console.Out.Write("testing ONE... ");
+ Console.Out.Flush();
+ interceptor.clear();
+ try
+ {
+ prx.notExistAdd(33, 12);
+ test(false);
+ }
+ catch(Ice.ObjectNotExistException)
+ {
+ // expected
+ }
+ test(interceptor.getLastOperation().Equals("notExistAdd"));
+ test(!interceptor.getLastStatus());
+ Console.WriteLine("ok");
+ Console.Out.Write("testing system exception... ");
+ Console.Out.Flush();
+ interceptor.clear();
+ try
+ {
+ prx.badSystemAdd(33, 12);
+ test(false);
+ }
+ catch(Ice.UnknownException)
+ {
+ test(!prx.ice_isCollocationOptimized());
+ }
+ catch(MySystemException)
+ {
+ test(prx.ice_isCollocationOptimized());
+ }
+ catch(Exception)
+ {
+ test(false);
+ }
+ test(interceptor.getLastOperation().Equals("badSystemAdd"));
+ test(!interceptor.getLastStatus());
+ Console.WriteLine("ok");
+
+ return 0;
+ }
+ private int runAmd(Test.MyObjectPrx prx, InterceptorI interceptor)
+ {
+ Console.Out.Write("testing simple interceptor... ");
+ Console.Out.Flush();
+ test(interceptor.getLastOperation() == null);
+ test(!interceptor.getLastStatus());
+ test(prx.amdAdd(33, 12) == 45);
+ test(interceptor.getLastOperation().Equals("amdAdd"));
+ test(interceptor.getLastStatus());
+ Console.WriteLine("ok");
+
+ Console.Out.Write("testing retry... ");
+ Console.Out.Flush();
+ test(prx.amdAddWithRetry(33, 12) == 45);
+ test(interceptor.getLastOperation().Equals("amdAddWithRetry"));
+ test(interceptor.getLastStatus());
+ Console.WriteLine("ok");
+
+ Console.Out.Write("testing user exception... ");
+ Console.Out.Flush();
+ try
+ {
+ prx.amdBadAdd(33, 12);
+ test(false);
+ }
+ catch(Test.InvalidInputException)
+ {
+ // expected
+ }
+ test(interceptor.getLastOperation().Equals("amdBadAdd"));
+ test(interceptor.getLastStatus());
+ Console.WriteLine("ok");
+
+ Console.Out.Write("testing ONE... ");
+ Console.Out.Flush();
+ interceptor.clear();
+ try
+ {
+ prx.amdNotExistAdd(33, 12);
+ test(false);
+ }
+ catch(Ice.ObjectNotExistException)
+ {
+ // expected
+ }
+ test(interceptor.getLastOperation().Equals("amdNotExistAdd"));
+ test(interceptor.getLastStatus());
+ Console.WriteLine("ok");
+
+ Console.Out.Write("testing system exception... ");
+ Console.Out.Flush();
+ interceptor.clear();
+ try
+ {
+ prx.amdBadSystemAdd(33, 12);
+ test(false);
+ }
+ catch(Ice.UnknownException)
+ {
+ test(!prx.ice_isCollocationOptimized());
+ }
+ catch(MySystemException)
+ {
+ test(prx.ice_isCollocationOptimized());
+ }
+ catch(Exception)
+ {
+ test(false);
+ }
+ test(interceptor.getLastOperation().Equals("amdBadSystemAdd"));
+ test(interceptor.getLastStatus());
+ Console.WriteLine("ok");
+ return 0;
+ }
+
+ public override int run(string[] args)
+ {
+ //
+ // Create OA and servants
+ //
+
+ communicator().getProperties().setProperty("MyOA.AdapterId", "myOA");
+
+ Ice.ObjectAdapter oa = communicator().createObjectAdapterWithEndpoints("MyOA2", "tcp -h localhost");
+
+ Ice.Object servant = new MyObjectI();
+ InterceptorI interceptor = new InterceptorI(servant);
+
+ Test.MyObjectPrx prx = Test.MyObjectPrxHelper.uncheckedCast(oa.addWithUUID(interceptor));
+
+ Console.WriteLine("Collocation optimization on");
+ int rs = run(prx, interceptor);
+ if(rs != 0)
+ {
return rs;
}
+
+ Console.WriteLine("Now with AMD");
+ interceptor.clear();
+ rs = runAmd(prx, interceptor);
+ if(rs != 0)
+ {
+ return rs;
+ }
+
+ oa.activate(); // Only necessary for non-collocation optimized tests
+
+ Console.WriteLine("Collocation optimization off");
+ interceptor.clear();
+ prx = Test.MyObjectPrxHelper.uncheckedCast(prx.ice_collocationOptimized(false));
+ rs = run(prx, interceptor);
+ if(rs != 0)
+ {
+ return rs;
+ }
+
+ Console.WriteLine("Now with AMD");
+ interceptor.clear();
+ rs = runAmd(prx, interceptor);
+
+ return rs;
}
public static int Main(string[] args)
{
- App app = new App();
- Ice.InitializationData data = new Ice.InitializationData();
- return app.main(args, data);
+ Client app = new Client();
+ return app.runmain(args);
}
}
diff --git a/csharp/test/Ice/interceptor/msbuild/client/client.csproj b/csharp/test/Ice/interceptor/msbuild/client/client.csproj
index b5c54a6f110..e85673c996f 100644
--- a/csharp/test/Ice/interceptor/msbuild/client/client.csproj
+++ b/csharp/test/Ice/interceptor/msbuild/client/client.csproj
@@ -39,6 +39,9 @@
<Folder Include="Properties\" />
</ItemGroup>
<ItemGroup>
+ <Compile Include="..\..\..\..\TestCommon\TestApp.cs">
+ <Link>TestApp.cs</Link>
+ </Compile>
<Compile Include="..\..\Client.cs">
<Link>Client.cs</Link>
</Compile>
diff --git a/csharp/test/Ice/interceptor/run.py b/csharp/test/Ice/interceptor/run.py
deleted file mode 100755
index 81357cdeec4..00000000000
--- a/csharp/test/Ice/interceptor/run.py
+++ /dev/null
@@ -1,31 +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
-
-client = os.path.join(os.getcwd(), "client")
-
-sys.stdout.write("starting client...")
-sys.stdout.flush()
-clientProc = TestUtil.startClient(client, " --Ice.Warn.Dispatch=0", startReader = False)
-print("ok")
-clientProc.startReader()
-
-clientProc.waitTestSuccess()
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 23:06:52 +0000