Additional test for default OA - Fix #3348 (#3356)

zeroc-ice · Jan 14, 2025 · 40af868 · 40af868
1 parent e570ced
commit 40af868
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 3 deletions.
diff --git a/cpp/test/Ice/adapterDeactivation/AllTests.cpp b/cpp/test/Ice/adapterDeactivation/AllTests.cpp
@@ -224,12 +224,19 @@ allTests(Test::TestHelper* helper)
         obj->ice_ping();
 
         test(obj->ice_getCachedConnection()->getAdapter() == adapter);
+
+        // Ensure destroying the OA doesn't affect the ability to send outgoing requests.
+        adapter->destroy();
+        obj->ice_getCachedConnection()->close().get();
+        obj->ice_ping();
+
         communicator->setDefaultObjectAdapter(nullptr);
 
         // create new connection
         obj->ice_getCachedConnection()->close().get();
         obj->ice_ping();
 
+        adapter = communicator->createObjectAdapter("");
         test(obj->ice_getCachedConnection()->getAdapter() == nullptr);
         obj->ice_getCachedConnection()->setAdapter(adapter);
         test(obj->ice_getCachedConnection()->getAdapter() == adapter);

diff --git a/csharp/test/Ice/adapterDeactivation/AllTests.cs b/csharp/test/Ice/adapterDeactivation/AllTests.cs
@@ -232,12 +232,19 @@ static EndpointInfo getUnderlying(EndpointInfo endpointInfo) =>
                     await obj.ice_pingAsync();
 
                     test(obj.ice_getCachedConnection().getAdapter() == adapter);
+
+                    // Ensure destroying the OA doesn't affect the ability to send outgoing requests.
+                    adapter.destroy();
+                    await obj.ice_getCachedConnection().closeAsync();
+                    obj.ice_ping();
+
                     communicator.setDefaultObjectAdapter(null);
 
                     // create new connection
                     await obj.ice_getCachedConnection().closeAsync();
                     await obj.ice_pingAsync();
 
+                    adapter = communicator.createObjectAdapter("");
                     test(obj.ice_getCachedConnection().getAdapter() is null);
                     obj.ice_getCachedConnection().setAdapter(adapter);
                     test(obj.ice_getCachedConnection().getAdapter() == adapter);

diff --git a/java/test/src/main/java/test/Ice/adapterDeactivation/AllTests.java b/java/test/src/main/java/test/Ice/adapterDeactivation/AllTests.java
@@ -266,13 +266,20 @@ public static TestIntfPrx allTests(test.TestHelper helper) {
             obj.ice_ping();
 
             test(obj.ice_getCachedConnection().getAdapter() == adapter);
+
+            // Ensure destroying the OA doesn't affect the ability to send outgoing requests.
+            adapter.destroy();
+            obj.ice_getCachedConnection().close();
+            obj.ice_ping();
+
             communicator.setDefaultObjectAdapter(null);
 
             // create new connection
             obj.ice_getCachedConnection().close();
             obj.ice_ping();
-
             test(obj.ice_getCachedConnection().getAdapter() == null);
+
+            adapter = communicator.createObjectAdapter("");
             obj.ice_getCachedConnection().setAdapter(adapter);
             test(obj.ice_getCachedConnection().getAdapter() == adapter);
             obj.ice_getCachedConnection().setAdapter(null);

diff --git a/js/test/Ice/adapterDeactivation/Client.ts b/js/test/Ice/adapterDeactivation/Client.ts
@@ -72,7 +72,7 @@ export class Client extends TestHelper {
             test(communicator.getDefaultObjectAdapter() === null);
             test(obj.ice_getCachedConnection().getAdapter() === null);
 
-            const adapter = await communicator.createObjectAdapter("");
+            let adapter = await communicator.createObjectAdapter("");
 
             communicator.setDefaultObjectAdapter(adapter);
             test(communicator.getDefaultObjectAdapter() === adapter);
@@ -82,13 +82,20 @@ export class Client extends TestHelper {
             await obj.ice_ping();
 
             test(obj.ice_getCachedConnection().getAdapter() === adapter);
+
+            // Ensure destroying the OA doesn't affect the ability to send outgoing requests.
+            adapter.destroy();
+            await obj.ice_getCachedConnection().close();
+            await obj.ice_ping();
+
             communicator.setDefaultObjectAdapter(null);
 
             // create new connection
             await obj.ice_getCachedConnection().close();
             await obj.ice_ping();
-
             test(obj.ice_getCachedConnection().getAdapter() === null);
+
+            adapter = await communicator.createObjectAdapter("");
             obj.ice_getCachedConnection().setAdapter(adapter);
             test(obj.ice_getCachedConnection().getAdapter() === adapter);
             obj.ice_getCachedConnection().setAdapter(null);