More bi-dir testing (#2911)

zeroc-ice · Oct 17, 2024 · 9a6db1d · 9a6db1d
1 parent 32594ec
commit 9a6db1d
Show file tree

Hide file tree

Showing 15 changed files with 161 additions and 65 deletions.
diff --git a/cpp/test/Ice/ami/AllTests.cpp b/cpp/test/Ice/ami/AllTests.cpp
@@ -1279,11 +1279,13 @@ allTests(TestHelper* helper, bool collocated)
         }
         cout << "ok" << endl;
 
-        cout << "testing bidir... " << flush;
+        cout << "testing bi-dir... " << flush;
         auto adapter = communicator->createObjectAdapter("");
         auto replyI = make_shared<PingReplyI>();
-        auto reply = uncheckedCast<PingReplyPrx>(adapter->addWithUUID(replyI));
-        adapter->activate();
+        auto reply = adapter->addWithUUID<PingReplyPrx>(replyI);
+
+        map<string, string> context{{"ONE", ""}};
+        p->pingBiDir(reply, context);
 
         p->ice_getConnection()->setAdapter(adapter);
         p->pingBiDir(reply);

diff --git a/cpp/test/Ice/ami/Test.ice b/cpp/test/Ice/ami/Test.ice
@@ -44,7 +44,7 @@ interface TestIntf
     bool supportsAMD();
     bool supportsFunctionalTests();
 
-    void pingBiDir(PingReply* reply);
+    ["amd"] void pingBiDir(PingReply* reply);
 }
 
 interface TestIntfController

diff --git a/cpp/test/Ice/ami/TestI.cpp b/cpp/test/Ice/ami/TestI.cpp
@@ -173,9 +173,45 @@ TestIntfI::supportsFunctionalTests(const Ice::Current&)
 }
 
 void
-TestIntfI::pingBiDir(optional<Test::PingReplyPrx> reply, const Ice::Current& current)
-{
-    reply->ice_fixed(current.con)->replyAsync().get();
+TestIntfI::pingBiDirAsync(
+    optional<Test::PingReplyPrx> reply,
+    std::function<void()> response,
+    std::function<void(std::exception_ptr)> exception,
+    const Ice::Current& current)
+{
+    reply = reply->ice_fixed(current.con);
+    const bool expectSuccess = current.ctx.find("ONE") == current.ctx.end();
+
+    reply->ice_fixed(current.con)
+        ->replyAsync(
+            [expectSuccess, response, exception]()
+            {
+                try
+                {
+                    test(expectSuccess);
+                    response();
+                }
+                catch (...)
+                {
+                    exception(std::current_exception());
+                }
+            },
+            [expectSuccess, response, exception](exception_ptr ex)
+            {
+                try
+                {
+                    test(!expectSuccess);
+                    rethrow_exception(ex);
+                }
+                catch (const Ice::ObjectNotExistException&)
+                {
+                    response();
+                }
+                catch (...)
+                {
+                    exception(std::current_exception());
+                }
+            });
 }
 
 void

diff --git a/cpp/test/Ice/ami/TestI.h b/cpp/test/Ice/ami/TestI.h
@@ -47,7 +47,11 @@ class TestIntfI final : public Test::TestIntf
     bool supportsAMD(const Ice::Current&) final;
     bool supportsFunctionalTests(const Ice::Current&) final;
 
-    void pingBiDir(std::optional<Test::PingReplyPrx>, const Ice::Current&) final;
+    void pingBiDirAsync(
+        std::optional<Test::PingReplyPrx>,
+        std::function<void()>,
+        std::function<void(std::exception_ptr)>,
+        const Ice::Current&) final;
 
 private:
     int _batchCount;

diff --git a/csharp/test/Ice/ami/AllTests.cs b/csharp/test/Ice/ami/AllTests.cs
@@ -865,21 +865,26 @@ public static async Task allTestsAsync(global::Test.TestHelper helper, bool coll
                         s2.SetResult(1);
                         Task.WaitAll(t1, t2, t3, t4);
                     }
-
-                    if (!collocated)
-                    {
-                        ObjectAdapter adapter = communicator.createObjectAdapter("");
-                        var replyI = new PingReplyI();
-                        var reply = Test.PingReplyPrxHelper.uncheckedCast(adapter.addWithUUID(replyI));
-
-                        p.ice_getConnection().setAdapter(adapter);
-                        p.pingBiDir(reply);
-                        test(replyI.checkReceived());
-                        adapter.destroy();
-                    }
                 }
                 output.WriteLine("ok");
 
+                if (!collocated)
+                {
+                    output.Write("testing bi-dir... ");
+                    ObjectAdapter adapter = communicator.createObjectAdapter("");
+                    var replyI = new PingReplyI();
+                    var reply = Test.PingReplyPrxHelper.uncheckedCast(adapter.addWithUUID(replyI));
+
+                    var context = new Dictionary<string, string> { ["ONE"] = "" };
+                    await p.pingBiDirAsync(reply, context);
+
+                    p.ice_getConnection().setAdapter(adapter);
+                    await p.pingBiDirAsync(reply);
+                    test(replyI.checkReceived());
+                    adapter.destroy();
+                    output.WriteLine("ok");
+                }
+
                 output.Write("testing result struct... ");
                 output.Flush();
                 {

diff --git a/csharp/test/Ice/ami/Test.ice b/csharp/test/Ice/ami/Test.ice
@@ -46,7 +46,7 @@ interface TestIntf
     ["amd"] void opWithUEAsyncDispatch()
         throws TestIntfException;
 
-    void pingBiDir(PingReply* reply);
+    ["amd"] void pingBiDir(PingReply* reply);
 }
 
 interface TestIntfController

diff --git a/csharp/test/Ice/ami/TestI.cs b/csharp/test/Ice/ami/TestI.cs
@@ -145,19 +145,20 @@ public override async Task
                 await self(current).opWithUEAsync();
             }
 
-            public override void
-            pingBiDir(Test.PingReplyPrx reply, Ice.Current current)
+            public override async Task pingBiDirAsync(Test.PingReplyPrx reply, Ice.Current current)
             {
                 reply = Test.PingReplyPrxHelper.uncheckedCast(reply.ice_fixed(current.con));
-                Thread dispatchThread = Thread.CurrentThread;
-                reply.replyAsync().ContinueWith(
-                   (t) =>
-                    {
-                        Thread callbackThread = Thread.CurrentThread;
-                        test(dispatchThread != callbackThread);
-                        test(callbackThread.Name.Contains("Ice.ThreadPool.Server"));
-                    },
-                    reply.ice_scheduler()).Wait();
+                bool expectSuccess = !current.ctx.ContainsKey("ONE");
+
+                try
+                {
+                    await reply.replyAsync();
+                    test(expectSuccess);
+                }
+                catch (ObjectNotExistException)
+                {
+                    test(!expectSuccess);
+                }
             }
 
             private Test.TestIntfPrx

diff --git a/java/test/src/main/java/test/Ice/ami/AllTests.java b/java/test/src/main/java/test/Ice/ami/AllTests.java
@@ -1043,21 +1043,25 @@ public static void allTests(test.TestHelper helper, boolean collocated) {
                             },
                             p.ice_executor())
                     .join();
-
-            if (!collocated) {
-                com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("");
-                PingReplyI replyI = new PingReplyI();
-                PingReplyPrx reply = PingReplyPrx.uncheckedCast(adapter.addWithUUID(replyI));
-                adapter.activate();
-
-                p.ice_getConnection().setAdapter(adapter);
-                p.pingBiDir(reply);
-                test(replyI.checkReceived());
-                adapter.destroy();
-            }
         }
         out.println("ok");
 
+        if (!collocated) {
+            out.print("testing bi-dir... ");
+            com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("");
+            PingReplyI replyI = new PingReplyI();
+            PingReplyPrx reply = PingReplyPrx.uncheckedCast(adapter.addWithUUID(replyI));
+
+            var context = java.util.Map.of("ONE", "");
+            p.pingBiDir(reply, context);
+
+            p.ice_getConnection().setAdapter(adapter);
+            p.pingBiDir(reply);
+            test(replyI.checkReceived());
+            adapter.destroy();
+            out.println("ok");
+        }
+
         out.print("testing result struct... ");
         out.flush();
         {

diff --git a/java/test/src/main/java/test/Ice/ami/Test.ice b/java/test/src/main/java/test/Ice/ami/Test.ice
@@ -47,7 +47,7 @@ interface TestIntf
     float opFloat(float f);
     double opDouble(double d);
 
-    void pingBiDir(PingReply* reply);
+    ["amd"] void pingBiDir(PingReply* reply);
 }
 
 interface TestIntfController

diff --git a/java/test/src/main/java/test/Ice/ami/TestI.java b/java/test/src/main/java/test/Ice/ami/TestI.java
@@ -96,18 +96,19 @@ public double opDouble(double d, com.zeroc.Ice.Current current) {
     }
 
     @Override
-    public void pingBiDir(PingReplyPrx reply, com.zeroc.Ice.Current current) {
+    public CompletionStage<Void> pingBiDirAsync(PingReplyPrx reply, com.zeroc.Ice.Current current) {
         reply = reply.ice_fixed(current.con);
-        final Thread dispatchThread = Thread.currentThread();
-        reply.replyAsync()
-                .whenCompleteAsync(
-                        (result, ex) -> {
-                            Thread callbackThread = Thread.currentThread();
-                            test(callbackThread != dispatchThread);
-                            test(callbackThread.getName().indexOf("Ice.ThreadPool.Server") != -1);
-                        },
-                        reply.ice_executor())
-                .join();
+        boolean expectSuccess = !current.ctx.containsKey("ONE");
+        return reply.replyAsync()
+                .handle(
+                        (r, ex) -> {
+                            if (expectSuccess) {
+                                test(ex == null);
+                            } else {
+                                test(ex instanceof com.zeroc.Ice.ObjectNotExistException);
+                            }
+                            return null; // means success
+                        });
     }
 
     @Override

diff --git a/python/test/Ice/ami/AllTests.py b/python/test/Ice/ami/AllTests.py
@@ -629,12 +629,14 @@ def allTestsFuture(helper, communicator, collocated):
     print("ok")
 
     if not collocated:
-        sys.stdout.write("testing bidir invocation... ")
+        sys.stdout.write("testing bi-dir... ")
         sys.stdout.flush()
         adapter = communicator.createObjectAdapter("")
         replyI = PingReplyI()
         reply = Test.PingReplyPrx.uncheckedCast(adapter.addWithUUID(replyI))
-        adapter.activate()
+
+        context = { "ONE": "" }
+        p.pingBiDir(reply, context)
 
         p.ice_getConnection().setAdapter(adapter)
         p.pingBiDir(reply)

diff --git a/python/test/Ice/ami/Test.ice b/python/test/Ice/ami/Test.ice
@@ -39,7 +39,7 @@ interface TestIntf
     bool supportsAMD();
     bool supportsFunctionalTests();
 
-    void pingBiDir(PingReply* reply);
+    ["amd"] void pingBiDir(PingReply* reply);
 }
 
 interface TestIntfController

diff --git a/python/test/Ice/ami/TestI.py b/python/test/Ice/ami/TestI.py
@@ -90,10 +90,15 @@ def supportsAMD(self, current):
     def supportsFunctionalTests(self, current):
         return False
 
-    def pingBiDir(self, reply, current):
-        # TODO: verify correct thread with add_done_callback_async
-        reply.ice_fixed(current.con).replyAsync().result()
-
+    async def pingBiDir(self, reply, current):
+        expectSuccess = "ONE" not in current.ctx
+        try:
+            await reply.ice_fixed(current.con).replyAsync()
+            if not expectSuccess:
+                raise Test.TestIntfException()
+        except Ice.ObjectNotExistException:
+            if expectSuccess:
+                raise Test.TestIntfException()
 
 class TestIntfII(Test.Outer.Inner.TestIntf):
     def op(self, i, current):

diff --git a/swift/test/Ice/ami/AllTests.swift b/swift/test/Ice/ami/AllTests.swift
@@ -317,6 +317,22 @@ func allTests(_ helper: TestHelper, collocated: Bool = false) async throws {
 
         output.writeLine("ok")
 
+        if (!collocated) {
+            output.write("testing bi-dir... ");
+            let adapter = try communicator.createObjectAdapter("")
+            let replyI = PingReplyI()
+            let reply = try uncheckedCast(prx: adapter.addWithUUID(PingReplyDisp(replyI)), type: PingReplyPrx.self)
+
+            let context: [String: String] = ["ONE": ""]
+            try await p.pingBiDir(reply, context: context);
+
+            try await p.ice_getConnection()!.setAdapter(adapter)
+            try await p.pingBiDir(reply);
+            try test(replyI.checkReceived())
+            adapter.destroy()
+            output.writeLine("ok")
+        }
+
         output.write("testing connection abort... ")
         do {
             //
@@ -351,3 +367,15 @@ func allTests(_ helper: TestHelper, collocated: Bool = false) async throws {
     }
     try await p.shutdown()
 }
+
+class PingReplyI: PingReply {
+    private var _received = false
+
+    func checkReceived() -> Bool {
+        return _received
+    }
+
+    func reply(current: Ice.Current) throws {
+        _received = true
+    }
+}
diff --git a/swift/test/Ice/ami/TestI.swift b/swift/test/Ice/ami/TestI.swift
@@ -102,8 +102,16 @@ class TestI: TestIntf {
     }
 
     func pingBiDir(reply: PingReplyPrx?, current: Current) async throws {
-        if let reply = reply {
-            try await reply.ice_fixed(current.con!).reply()
+        let expectSuccess = !current.ctx.keys.contains("ONE")
+        do {
+            try await reply!.ice_fixed(current.con!).reply()
+            if !expectSuccess {
+                throw TestIntfException()
+            }
+        } catch is ObjectNotExistException {
+            if expectSuccess {
+                throw TestIntfException()
+            }
         }
     }