Remove supportsAMD from Ice/ami test (#3053)

zeroc-ice · Nov 4, 2024 · 9ea3eb1 · 9ea3eb1
1 parent be95bc0
commit 9ea3eb1
Show file tree

Hide file tree

Showing 19 changed files with 342 additions and 411 deletions.
diff --git a/cpp/test/Ice/ami/AllTests.cpp b/cpp/test/Ice/ami/AllTests.cpp
@@ -1075,7 +1075,7 @@ allTests(TestHelper* helper, bool collocated)
         }
         cout << "ok" << endl;
 
-        if (p->ice_getConnection() && protocol != "bt" && p->supportsAMD())
+        if (p->ice_getConnection() && protocol != "bt")
         {
             cout << "testing connection close... " << flush;
             {

diff --git a/cpp/test/Ice/ami/Test.ice b/cpp/test/Ice/ami/Test.ice
@@ -1,6 +1,4 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
+// Copyright (c) ZeroC, Inc.
 
 #pragma once
 
@@ -9,59 +7,54 @@
 
 module Test
 {
-
-exception TestIntfException
-{
-}
-
-interface PingReply
-{
-    void reply();
-}
-
-interface TestIntf
-{
-    void op();
-    void opWithPayload(Ice::ByteSeq seq);
-    int opWithResult();
-    void opWithUE()
-        throws TestIntfException;
-    int opWithResultAndUE()
-        throws TestIntfException;
-    void opBatch();
-
-    void opWithArgs(out int one, out int two, out int three, out int four, out int five, out int six, out int seven,
-                    out int eight, out int nine, out int ten, out int eleven);
-    int opBatchCount();
-    bool waitForBatch(int count);
-    void closeConnection();
-    void abortConnection();
-    void sleep(int ms);
-    ["amd"] void startDispatch();
-    void finishDispatch();
-    void shutdown();
-
-    bool supportsAMD();
-    bool supportsFunctionalTests();
-    bool supportsBackPressureTests();
-
-    ["amd"] void pingBiDir(PingReply* reply);
-}
-
-interface TestIntfController
-{
-    void holdAdapter();
-    void resumeAdapter();
-}
-
-module Outer::Inner
-{
-
-interface TestIntf
-{
-    int op(int i, out int j);
-}
-
-}
-
+    exception TestIntfException
+    {
+    }
+
+    interface PingReply
+    {
+        void reply();
+    }
+
+    interface TestIntf
+    {
+        void op();
+        void opWithPayload(Ice::ByteSeq seq);
+        int opWithResult();
+        void opWithUE()
+            throws TestIntfException;
+        int opWithResultAndUE()
+            throws TestIntfException;
+        void opBatch();
+
+        void opWithArgs(out int one, out int two, out int three, out int four, out int five, out int six, out int seven,
+                        out int eight, out int nine, out int ten, out int eleven);
+        int opBatchCount();
+        bool waitForBatch(int count);
+        void closeConnection();
+        void abortConnection();
+        void sleep(int ms);
+        ["amd"] void startDispatch();
+        void finishDispatch();
+        void shutdown();
+
+        bool supportsFunctionalTests();
+        bool supportsBackPressureTests();
+
+        ["amd"] void pingBiDir(PingReply* reply);
+    }
+
+    interface TestIntfController
+    {
+        void holdAdapter();
+        void resumeAdapter();
+    }
+
+    module Outer::Inner
+    {
+        interface TestIntf
+        {
+            int op(int i, out int j);
+        }
+    }
 }
diff --git a/cpp/test/Ice/ami/TestI.cpp b/cpp/test/Ice/ami/TestI.cpp
@@ -160,12 +160,6 @@ TestIntfI::shutdown(const Ice::Current& current)
     current.adapter->getCommunicator()->shutdown();
 }
 
-bool
-TestIntfI::supportsAMD(const Ice::Current&)
-{
-    return true;
-}
-
 bool
 TestIntfI::supportsFunctionalTests(const Ice::Current&)
 {

diff --git a/cpp/test/Ice/ami/TestI.h b/cpp/test/Ice/ami/TestI.h
@@ -44,7 +44,6 @@ class TestIntfI final : public Test::TestIntf
     void finishDispatch(const Ice::Current&) final;
     void shutdown(const Ice::Current&) final;
 
-    bool supportsAMD(const Ice::Current&) final;
     bool supportsFunctionalTests(const Ice::Current&) final;
     bool supportsBackPressureTests(const Ice::Current&) final;
 

diff --git a/csharp/test/Ice/ami/AllTests.cs b/csharp/test/Ice/ami/AllTests.cs
@@ -690,7 +690,7 @@ public static async Task allTestsAsync(global::Test.TestHelper helper, bool coll
                     output.WriteLine("ok");
                 }
 
-                if (p.ice_getConnection() != null && p.supportsAMD())
+                if (p.ice_getConnection() != null)
                 {
                     output.Write("testing connection close... ");
                     output.Flush();

diff --git a/csharp/test/Ice/ami/Test.ice b/csharp/test/Ice/ami/Test.ice
@@ -1,6 +1,4 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
+// Copyright (c) ZeroC, Inc.
 
 #pragma once
 
@@ -10,60 +8,55 @@
 ["cs:namespace:Ice.ami"]
 module Test
 {
-
-exception TestIntfException
-{
-}
-
-interface PingReply
-{
-    void reply();
-}
-
-interface TestIntf
-{
-    void op();
-    void opWithPayload(Ice::ByteSeq seq);
-    int opWithResult();
-    void opWithUE()
-        throws TestIntfException;
-    void opBatch();
-    int opBatchCount();
-    bool waitForBatch(int count);
-
-    void closeConnection();
-    void abortConnection();
-    void sleep(int ms);
-    ["amd"] void startDispatch();
-    void finishDispatch();
-    void shutdown();
-
-    bool supportsAMD();
-    bool supportsFunctionalTests();
-    bool supportsBackPressureTests();
-
-    ["amd"] void opAsyncDispatch();
-    ["amd"] int opWithResultAsyncDispatch();
-    ["amd"] void opWithUEAsyncDispatch()
-        throws TestIntfException;
-
-    ["amd"] void pingBiDir(PingReply* reply);
-}
-
-interface TestIntfController
-{
-    void holdAdapter();
-    void resumeAdapter();
-}
-
-module Outer::Inner
-{
-
-interface TestIntf
-{
-    int op(int i, out int j);
-}
-
-}
-
+    exception TestIntfException
+    {
+    }
+
+    interface PingReply
+    {
+        void reply();
+    }
+
+    interface TestIntf
+    {
+        void op();
+        void opWithPayload(Ice::ByteSeq seq);
+        int opWithResult();
+        void opWithUE()
+            throws TestIntfException;
+        void opBatch();
+        int opBatchCount();
+        bool waitForBatch(int count);
+
+        void closeConnection();
+        void abortConnection();
+        void sleep(int ms);
+        ["amd"] void startDispatch();
+        void finishDispatch();
+        void shutdown();
+
+        bool supportsFunctionalTests();
+        bool supportsBackPressureTests();
+
+        ["amd"] void opAsyncDispatch();
+        ["amd"] int opWithResultAsyncDispatch();
+        ["amd"] void opWithUEAsyncDispatch()
+            throws TestIntfException;
+
+        ["amd"] void pingBiDir(PingReply* reply);
+    }
+
+    interface TestIntfController
+    {
+        void holdAdapter();
+        void resumeAdapter();
+    }
+
+    module Outer::Inner
+    {
+        interface TestIntf
+        {
+            int op(int i, out int j);
+        }
+    }
 }
diff --git a/csharp/test/Ice/ami/TestI.cs b/csharp/test/Ice/ami/TestI.cs
@@ -109,12 +109,6 @@ public override void
                 }
             }
 
-            public override bool
-            supportsAMD(Ice.Current current)
-            {
-                return true;
-            }
-
             public override bool
             supportsFunctionalTests(Ice.Current current)
             {

diff --git a/java/test/src/main/java/test/Ice/ami/AllTests.java b/java/test/src/main/java/test/Ice/ami/AllTests.java
@@ -907,7 +907,7 @@ public static void allTests(test.TestHelper helper, boolean collocated) {
         }
         out.println("ok");
 
-        if (p.ice_getConnection() != null && p.supportsAMD() && !bluetooth) {
+        if (p.ice_getConnection() != null && !bluetooth) {
             out.print("testing connection close... ");
             out.flush();
             {