Python port, added tests to Ice/info

8 files changed, 41 insertions, 6 deletions

diff --git a/java/src/IceInternal/EndpointI.java b/java/src/IceInternal/EndpointI.java
index 2196d6b6684..0000be4a8fa 100644
--- a/java/src/IceInternal/EndpointI.java
+++ b/java/src/IceInternal/EndpointI.java
@@ -19,8 +19,8 @@ abstract public class EndpointI implements Ice.Endpoint, java.lang.Comparable<En
 
     public EndpointI()
     {
-        _protocol = (Ice.ProtocolVersion)Protocol.currentProtocol.clone();
-        _encoding = (Ice.EncodingVersion)Protocol.currentEncoding.clone();
+        _protocol = (Ice.ProtocolVersion)Protocol.currentProtocol;
+        _encoding = (Ice.EncodingVersion)Protocol.currentEncoding;
     }
 
     public String
diff --git a/java/src/IceInternal/ProtocolPluginFacade.java b/java/src/IceInternal/ProtocolPluginFacade.java
index b55b6a58824..717010b0312 100644
--- a/java/src/IceInternal/ProtocolPluginFacade.java
+++ b/java/src/IceInternal/ProtocolPluginFacade.java
@@ -28,6 +28,11 @@ public interface ProtocolPluginFacade
     int getProtocolSupport();
 
     //
+    // Get the default encoding to be used in endpoints.
+    //
+    Ice.EncodingVersion getDefaultEncoding();
+
+    //
     // Get the default hostname to be used in endpoints.
     //
     String getDefaultHost();
diff --git a/java/src/IceInternal/ProtocolPluginFacadeI.java b/java/src/IceInternal/ProtocolPluginFacadeI.java
index 2d219c36818..ca10a4f412c 100644
--- a/java/src/IceInternal/ProtocolPluginFacadeI.java
+++ b/java/src/IceInternal/ProtocolPluginFacadeI.java
@@ -45,6 +45,16 @@ public class ProtocolPluginFacadeI implements ProtocolPluginFacade
     {
         return _instance.protocolSupport();
     }    
+
+    //
+    // Get the default encoding to be used in endpoints.
+    //
+    public Ice.EncodingVersion
+    getDefaultEncoding()
+    {
+        return _instance.defaultsAndOverrides().defaultEncoding;
+    }
+
     //
     // Get the default hostname to be used in endpoints.
     //
diff --git a/java/src/IceInternal/TcpEndpointI.java b/java/src/IceInternal/TcpEndpointI.java
index 328c34a05b7..0d2ab229193 100644
--- a/java/src/IceInternal/TcpEndpointI.java
+++ b/java/src/IceInternal/TcpEndpointI.java
@@ -28,6 +28,7 @@ final class TcpEndpointI extends EndpointI
     public
     TcpEndpointI(Instance instance, String str, boolean oaEndpoint)
     {
+        super(Protocol.currentProtocol, instance.defaultsAndOverrides().defaultEncoding);
         _instance = instance;
         _host = null;
         _port = 0;
@@ -171,6 +172,7 @@ final class TcpEndpointI extends EndpointI
     public
     TcpEndpointI(BasicStream s)
     {
+        super(new Ice.ProtocolVersion(), new Ice.EncodingVersion());
         _instance = s.instance();
         s.startReadEncaps();
         _host = s.readString();
@@ -179,7 +181,9 @@ final class TcpEndpointI extends EndpointI
         _compress = s.readBool();
         if(!s.getReadEncoding().equals(Ice.Util.Encoding_1_0))
         {
+            _protocol = new Ice.ProtocolVersion();
             _protocol.__read(s);
+            _encoding = new Ice.EncodingVersion();
             _encoding.__read(s);
         }
         else
diff --git a/java/src/IceInternal/UdpEndpointI.java b/java/src/IceInternal/UdpEndpointI.java
index aa675437c86..d3a8c23f27f 100644
--- a/java/src/IceInternal/UdpEndpointI.java
+++ b/java/src/IceInternal/UdpEndpointI.java
@@ -30,6 +30,7 @@ final class UdpEndpointI extends EndpointI
     public
     UdpEndpointI(Instance instance, String str, boolean oaEndpoint)
     {
+        super(Protocol.currentProtocol, instance.defaultsAndOverrides().defaultEncoding);
         _instance = instance;
         _host = null;
         _port = 0;
@@ -187,6 +188,7 @@ final class UdpEndpointI extends EndpointI
     public
     UdpEndpointI(BasicStream s)
     {
+        super(new Ice.ProtocolVersion(), new Ice.EncodingVersion());
         _instance = s.instance();
         s.startReadEncaps();
         _host = s.readString();
diff --git a/java/src/IceSSL/EndpointI.java b/java/src/IceSSL/EndpointI.java
index 8a5f29fd40a..8ccd13656fc 100644
--- a/java/src/IceSSL/EndpointI.java
+++ b/java/src/IceSSL/EndpointI.java
@@ -28,6 +28,7 @@ final class EndpointI extends IceInternal.EndpointI
     public
     EndpointI(Instance instance, String str, boolean oaEndpoint)
     {
+        super(IceInternal.Protocol.currentProtocol, instance.defaultEncoding());
         _instance = instance;
         _host = null;
         _port = 0;
@@ -170,6 +171,7 @@ final class EndpointI extends IceInternal.EndpointI
     public
     EndpointI(Instance instance, IceInternal.BasicStream s)
     {
+        super(new Ice.ProtocolVersion(), new Ice.EncodingVersion());
         _instance = instance;
         s.startReadEncaps();
         _host = s.readString();
diff --git a/java/src/IceSSL/Instance.java b/java/src/IceSSL/Instance.java
index 8c0f5934c3a..4a8c1d3638b 100644
--- a/java/src/IceSSL/Instance.java
+++ b/java/src/IceSSL/Instance.java
@@ -647,6 +647,12 @@ class Instance
         return _facade.getProtocolSupport();
     }
 
+    Ice.EncodingVersion
+    defaultEncoding()
+    {
+        return _facade.getDefaultEncoding();
+    }
+
     String
     defaultHost()
     {
diff --git a/java/test/Ice/info/AllTests.java b/java/test/Ice/info/AllTests.java
index 656059952e9..6a0ac187232 100644
--- a/java/test/Ice/info/AllTests.java
+++ b/java/test/Ice/info/AllTests.java
@@ -31,14 +31,17 @@ public class AllTests
         out.print("testing proxy endpoint information... ");
         out.flush();
         {
-            Ice.ObjectPrx p1 = communicator.stringToProxy("test -t:default -h tcphost -p 10000 -t 1200 -z:" +
-                                                          "udp -h udphost -p 10001 --interface eth0 --ttl 5:" +
-                                                          "opaque -t 100 -v ABCD");
-
+            Ice.ObjectPrx p1 = communicator.stringToProxy(
+                "test -t:default -v 1.4 -e 1.3 -h tcphost -p 10000 -t 1200 -z:" +
+                "udp -h udphost -p 10001 --interface eth0 --ttl 5:" +
+                "opaque -e 1.8 -t 100 -v ABCD");
+            
             Ice.Endpoint[] endps = p1.ice_getEndpoints();
 
 
             Ice.IPEndpointInfo ipEndpoint = (Ice.IPEndpointInfo)endps[0].getInfo();
+            test(ipEndpoint.protocol.equals(new Ice.ProtocolVersion((byte)1, (byte)4)));
+            test(ipEndpoint.encoding.equals(new Ice.EncodingVersion((byte)1, (byte)3)));
             test(ipEndpoint.host.equals("tcphost"));
             test(ipEndpoint.port == 10000);
             test(ipEndpoint.timeout == 1200);
@@ -51,6 +54,8 @@ public class AllTests
                  ipEndpoint.type() == IceSSL.EndpointType.value && ipEndpoint instanceof IceSSL.EndpointInfo);
         
             Ice.UDPEndpointInfo udpEndpoint = (Ice.UDPEndpointInfo)endps[1].getInfo();
+            test(udpEndpoint.protocol.equals(Ice.Util.currentProtocol()));
+            test(udpEndpoint.encoding.equals(Ice.Util.currentEncoding()));
             test(udpEndpoint.host.equals("udphost"));
             test(udpEndpoint.port == 10001);
             test(udpEndpoint.mcastInterface.equals("eth0"));
@@ -62,6 +67,7 @@ public class AllTests
             test(udpEndpoint.type() == Ice.UDPEndpointType.value);
         
             Ice.OpaqueEndpointInfo opaqueEndpoint = (Ice.OpaqueEndpointInfo)endps[2].getInfo();
+            test(opaqueEndpoint.rawEncoding.equals(new Ice.EncodingVersion((byte)1, (byte)8)));
         }
         out.println("ok");