Fixed ICE-5535, WSS hang and other minor issues

- ICE-5535: added support for parsing TCP/SSL/WS/WSS endpoints even if the transport isn't supported
- WSS implementation could hang under Java/C# if the SSL transport read too much data
- The opaque endpoint un-marshalling code in Java/C# could raise an EncapsulationException where it should have raised an UnarmshalOutOfBoundsException if the marshalled endpoint was invalid.
- Cleaned up JavaScript run methods for tests
- Few other minor fixes

1 files changed, 35 insertions, 35 deletions

diff --git a/js/test/Ice/acm/Client.js b/js/test/Ice/acm/Client.js
index a02f9f182db..6710563141e 100644
--- a/js/test/Ice/acm/Client.js
+++ b/js/test/Ice/acm/Client.js
@@ -426,33 +426,37 @@
 
     var allTests = function(out, communicator)
     {
+        var ref = "communicator:default -p 12010";
+        var com = Test.RemoteCommunicatorPrx.uncheckedCast(communicator.stringToProxy(ref));
+        
+        var tests = [];
         //
-        // Skip this test with IE it open too many connections IE doesn't allow more 
-        // than 6 connections.
+        // Skip some tests with IE it opens too many connections and
+        // IE doesn't allow more than 6 connections.
         //
         if(typeof(navigator) !== "undefined" && 
            (navigator.userAgent.indexOf("MSIE") != -1 || navigator.userAgent.indexOf("Trident/7.0") != -1))
         {
-            return;
+            tests.push(new HeartbeatOnIdleTest(com, out));
+            tests.push(new HeartbeatAlwaysTest(com, out));
+            tests.push(new SetACMTest(com, out));
+        }
+        else
+        {
+            tests.push(new InvocationHeartbeatTest(com, out));
+            tests.push(new InvocationHeartbeatOnHoldTest(com, out));
+            tests.push(new InvocationNoHeartbeatTest(com, out));
+            tests.push(new InvocationHeartbeatCloseOnIdleTest(com, out));
+            
+            tests.push(new CloseOnIdleTest(com, out));
+            tests.push(new CloseOnInvocationTest(com, out));
+            tests.push(new CloseOnIdleAndInvocationTest(com, out));
+            tests.push(new ForcefullCloseOnIdleAndInvocationTest(com, out));
+            
+            tests.push(new HeartbeatOnIdleTest(com, out));
+            tests.push(new HeartbeatAlwaysTest(com, out));
+            tests.push(new SetACMTest(com, out));
         }
-
-        var ref = "communicator:default -p 12010";
-        var com = Test.RemoteCommunicatorPrx.uncheckedCast(communicator.stringToProxy(ref));
-        
-        var tests = [];
-        tests.push(new InvocationHeartbeatTest(com, out));
-        tests.push(new InvocationHeartbeatOnHoldTest(com, out));
-        tests.push(new InvocationNoHeartbeatTest(com, out));
-        tests.push(new InvocationHeartbeatCloseOnIdleTest(com, out));
-
-        tests.push(new CloseOnIdleTest(com, out));
-        tests.push(new CloseOnInvocationTest(com, out));
-        tests.push(new CloseOnIdleAndInvocationTest(com, out));
-        tests.push(new ForcefullCloseOnIdleAndInvocationTest(com, out));
-        
-        tests.push(new HeartbeatOnIdleTest(com, out));
-        tests.push(new HeartbeatAlwaysTest(com, out));
-        tests.push(new SetACMTest(com, out));
         
         var promises = [];
         for(var test in tests)
@@ -504,23 +508,19 @@
 
     var run = function(out, id)
     {
+        id.properties.setProperty("Ice.Warn.Connections", "0");
+        var c = Ice.initialize(id);
         return Promise.try(
             function()
             {
-                id.properties.setProperty("Ice.Warn.Connections", "0");
-                var c = Ice.initialize(id);
-                var p = allTests(out, c);
-                if(p !== undefined)
-                {
-                    p.finally(function()
-                    {
-                        if(c)
-                        {
-                            return c.destroy();
-                        }
-                    });
-                }
-            });
+                return allTests(out, c);
+            }
+        ).finally(
+            function()
+            {
+                return c.destroy();
+            }
+        );
     };
     exports.__test__ = run;
     exports.__runServer__ = true;