diff options
| author | Jose <jose@zeroc.com> | 2015-01-23 09:56:00 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2015-01-23 09:56:00 +0100 |
| commit | 709ff7a6514bfdff201e0a8ad3d64928de63a8cc (patch) | |
| tree | d93685065705bf5c74da363fd26c14cd2fbc5319 /js/test | |
| parent | Port test controller server to Java (diff) | |
| download | ice-709ff7a6514bfdff201e0a8ad3d64928de63a8cc.tar.bz2 ice-709ff7a6514bfdff201e0a8ad3d64928de63a8cc.tar.xz ice-709ff7a6514bfdff201e0a8ad3d64928de63a8cc.zip | |
Java test controller server fixes
Diffstat (limited to 'js/test')
| -rw-r--r-- | js/test/Common/Controller.ice | 2 | ||||
| -rw-r--r-- | js/test/Common/TestSuite.js | 6 | ||||
| -rw-r--r-- | js/test/Ice/exceptionsBidir/Client.js | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/js/test/Common/Controller.ice b/js/test/Common/Controller.ice index 5f89858a42d..536e42895d9 100644 --- a/js/test/Common/Controller.ice +++ b/js/test/Common/Controller.ice @@ -10,7 +10,7 @@ module test { -module common +module Common { interface Server diff --git a/js/test/Common/TestSuite.js b/js/test/Common/TestSuite.js index 78c533d38cd..cfd27964fd6 100644 --- a/js/test/Common/TestSuite.js +++ b/js/test/Common/TestSuite.js @@ -73,7 +73,7 @@ $(document).ready( { str = "controller:wss -h " + defaultHost + " -p 12008"; } - var controller = test.common.ControllerPrx.uncheckedCast(communicator.stringToProxy(str)); + var controller = test.Common.ControllerPrx.uncheckedCast(communicator.stringToProxy(str)); var p; var server; @@ -84,7 +84,7 @@ $(document).ready( if(typeof(__runEchoServer__) !== "undefined") { srv = "Ice/echo"; - if(typeof(__runEchoServerOptions__) === "Array") + if(typeof(__runEchoServerOptions__) !== "undefined") { options = options.concat(__runEchoServerOptions__); } @@ -101,7 +101,7 @@ $(document).ready( var ref = proxy.ice_getIdentity().name + ":" + protocol + " -h " + defaultHost + " -p " + (protocol == "ws" ? "12009" : "12008"); out.writeLine("ok"); - server = test.common.ServerPrx.uncheckedCast(communicator.stringToProxy(ref)); + server = test.Common.ServerPrx.uncheckedCast(communicator.stringToProxy(ref)); var testCase = TestCases[current]; if(testCase.configurations === undefined) diff --git a/js/test/Ice/exceptionsBidir/Client.js b/js/test/Ice/exceptionsBidir/Client.js index 61a4a319054..67ba6a1ce67 100644 --- a/js/test/Ice/exceptionsBidir/Client.js +++ b/js/test/Ice/exceptionsBidir/Client.js @@ -98,7 +98,7 @@ }; exports.__test__ = run; exports.__runEchoServer__ = true; - exports.__runEchoServerOptions__ = ["--Ice.Warn.Dispatch=0", "--Ice.Warn.Connections=0"]; + exports.__runEchoServerOptions__ = ["Ice.Warn.Dispatch=0", "Ice.Warn.Connections=0"]; } (typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined, typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : window.Ice.__require, |