From 328a47cd555a27160e06f65d2a11e6180ba69d38 Mon Sep 17 00:00:00 2001
From: Bernard Normier <bernard@zeroc.com>
Date: Thu, 21 Mar 2024 18:12:05 -0400
Subject: [PATCH] Fix test failures

---
 matlab/test/Ice/proxy/AllTests.m    |  6 ------
 php/test/Ice/proxy/Client.php       |  7 -------
 python/test/Ice/proxy/AllTests.py   |  6 ------
 ruby/test/Ice/proxy/AllTests.rb     |  6 ------
 swift/test/Ice/proxy/AllTests.swift | 13 -------------
 5 files changed, 38 deletions(-)

diff --git a/matlab/test/Ice/proxy/AllTests.m b/matlab/test/Ice/proxy/AllTests.m
index 1dd4d1aa51f..60ee8820a3b 100644
--- a/matlab/test/Ice/proxy/AllTests.m
+++ b/matlab/test/Ice/proxy/AllTests.m
@@ -741,12 +741,6 @@
             cl10.ice_encodingVersion(Ice.EncodingVersion(1, 0)).ice_ping();
             cl.ice_encodingVersion(Ice.EncodingVersion(1, 0)).ice_ping();
 
-            % 1.3 isn't supported but since a 1.3 proxy supports 1.1, the
-            % call will use the 1.1 encoding
-            ref13 = 'test -e 1.3:default -p 12010';
-            cl13 = MyClassPrx.uncheckedCast(communicator.stringToProxy(ref13));
-            cl13.ice_ping();
-
             fprintf('ok\n');
 
             fprintf('testing opaque endpoints... ');
diff --git a/php/test/Ice/proxy/Client.php b/php/test/Ice/proxy/Client.php
index 27ba8372602..48b9a93ed57 100644
--- a/php/test/Ice/proxy/Client.php
+++ b/php/test/Ice/proxy/Client.php
@@ -520,13 +520,6 @@ function allTests($helper)
     $cl10->ice_encodingVersion($Ice_Encoding_1_0)->ice_ping();
     $cl->ice_encodingVersion($Ice_Encoding_1_0)->ice_ping();
 
-    // 1.3 isn't supported but since a 1.3 proxy supports 1.1, the
-    // call will use the 1.1 encoding
-    $ref13 = sprintf("test -e 1.3:%s", $helper->getTestEndpoint());
-    $cl13 = $communicator->stringToProxy($ref13)->ice_uncheckedCast("::Test::MyClass");
-    $cl13->ice_ping();
-    echo "ok\n";
-
     echo "testing opaque endpoints... ";
     flush();
 
diff --git a/python/test/Ice/proxy/AllTests.py b/python/test/Ice/proxy/AllTests.py
index 6e5c9377fac..f608ae7971c 100644
--- a/python/test/Ice/proxy/AllTests.py
+++ b/python/test/Ice/proxy/AllTests.py
@@ -903,12 +903,6 @@ def allTests(helper, communicator, collocated):
     cl10.ice_encodingVersion(Ice.Encoding_1_0).ice_ping()
     cl.ice_encodingVersion(Ice.Encoding_1_0).ice_ping()
 
-    # 1.3 isn't supported but since a 1.3 proxy supports 1.1, the
-    # call will use the 1.1 encoding
-    ref13 = "test -e 1.3:{0}".format(helper.getTestEndpoint())
-    cl13 = Test.MyClassPrx.uncheckedCast(communicator.stringToProxy(ref13))
-    cl13.ice_ping()
-
     print("ok")
 
     sys.stdout.write("testing opaque endpoints... ")
diff --git a/ruby/test/Ice/proxy/AllTests.rb b/ruby/test/Ice/proxy/AllTests.rb
index e764887cfe1..c54df1d0e78 100644
--- a/ruby/test/Ice/proxy/AllTests.rb
+++ b/ruby/test/Ice/proxy/AllTests.rb
@@ -711,12 +711,6 @@ def allTests(helper, communicator)
     cl10.ice_encodingVersion(Ice::Encoding_1_0).ice_ping()
     cl.ice_encodingVersion(Ice::Encoding_1_0).ice_ping()
 
-    # 1.3 isn't supported but since a 1.3 proxy supports 1.1, the
-    # call will use the 1.1 encoding
-    ref13 = "test -e 1.3:#{helper.getTestEndpoint()}"
-    cl13 = Test::MyClassPrx::uncheckedCast(communicator.stringToProxy(ref13))
-    cl13.ice_ping()
-
     puts "ok"
 
     print "testing opaque endpoints... "
diff --git a/swift/test/Ice/proxy/AllTests.swift b/swift/test/Ice/proxy/AllTests.swift
index 556c68a685e..146a4ab0918 100644
--- a/swift/test/Ice/proxy/AllTests.swift
+++ b/swift/test/Ice/proxy/AllTests.swift
@@ -742,12 +742,6 @@ public func allTests(_ helper: TestHelper) throws -> MyClassPrx {
     try cl10.ice_encodingVersion(Ice.Encoding_1_0).ice_ping()
     try cl.ice_encodingVersion(Ice.Encoding_1_0).ice_ping()
 
-    // 1.3 isn't supported but since a 1.3 proxy supports 1.1, the
-    // call will use the 1.1 encoding
-    var ref13 = "test -e 1.3:\(helper.getTestEndpoint(num: 0))"
-    var cl13 = try uncheckedCast(prx: communicator.stringToProxy(ref13)!, type: MyClassPrx.self)
-    try cl13.ice_ping()
-
     do {
         // Send request with bogus 1.2 encoding.
         let version = Ice.EncodingVersion(major: 1, minor: 2)
@@ -796,13 +790,6 @@ public func allTests(_ helper: TestHelper) throws -> MyClassPrx {
     cl10 = try uncheckedCast(prx: communicator.stringToProxy(ref10)!, type: MyClassPrx.self)
     try cl10.ice_ping()
 
-    // 1.3 isn't supported but since a 1.3 proxy supports 1.1, the
-    // call will use the 1.1 protocol
-    ref13 = "test -p 1.3:\(helper.getTestEndpoint(num: 0))"
-    cl13 = try uncheckedCast(prx: communicator.stringToProxy(ref13)!, type: MyClassPrx.self)
-    try cl13.ice_ping()
-    writer.writeLine("ok")
-
     writer.write("testing opaque endpoints... ")
     do {
         // Invalid -x option