diff options
Diffstat (limited to 'js')
133 files changed, 296 insertions, 3360 deletions
diff --git a/js/.gitignore b/js/.gitignore index 8c6f8c5ae71..e5f51e30ba6 100644 --- a/js/.gitignore +++ b/js/.gitignore @@ -16,6 +16,4 @@ src/es5/IceGrid src/es5/IceMX src/es5/IceSSL src/es5/IceStorm -test/Glacier2/es5/ -test/Ice/es5/ -test/Common/es5 +test/es5 diff --git a/js/allTests.py b/js/allTests.py index 1af86e8a833..e4360c465d3 100755 --- a/js/allTests.py +++ b/js/allTests.py @@ -8,53 +8,9 @@ # # ********************************************************************** -import os, sys, re, getopt +import os, sys +sys.path.append(os.path.join(os.path.dirname(__file__), "..", "scripts")) -path = [ ".", "..", "../..", "../../..", "../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") +from Util import runTestsWithPath -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -# -# List of all basic tests. -# -tests = [ - ("Ice/acm", ["core"]), - ("Ice/ami", ["core"]), - ("Ice/binding", ["core"]), - ("Ice/defaultValue", ["once"]), - ("Ice/enums", ["once"]), - ("Ice/exceptions", ["core"]), - ("Ice/exceptionsBidir", ["once"]), - ("Ice/facets", ["core"]), - ("Ice/facetsBidir", ["core"]), - ("Ice/hashmap", ["once"]), - ("Ice/hold", ["core"]), - ("Ice/info", ["core"]), - ("Ice/inheritance", ["once"]), - ("Ice/inheritanceBidir", ["once"]), - ("Ice/location", ["once"]), - ("Ice/objects", ["core"]), - ("Ice/operations", ["core"]), - ("Ice/operationsBidir", ["once"]), - ("Ice/optional", ["core"]), - ("Ice/optionalBidir", ["once"]), - ("Ice/properties", ["once"]), - ("Ice/proxy", ["core"]), - ("Ice/retry", ["core"]), - ("Ice/slicing/exceptions", ["core"]), - ("Ice/slicing/objects", ["core"]), - ("Ice/timeout", ["core"]), - ("Ice/number", ["once"]), - ("Ice/import", ["once", "noes5"]), - ("Glacier2/router", ["service"]), - ] - -if __name__ == "__main__": - TestUtil.run(tests) +runTestsWithPath(__file__)
\ No newline at end of file diff --git a/js/bin/HttpServer.js b/js/bin/HttpServer.js index 12845731add..0f1cfef2ab5 100644 --- a/js/bin/HttpServer.js +++ b/js/bin/HttpServer.js @@ -27,9 +27,9 @@ function Init() }; var TestData = - { - languages: [{value: "cpp", name: "C++"}, {value: "java", name: "Java"}] - }; + { + languages: [{value: "cpp", name: "C++"}, {value: "java", name: "Java"}] + }; if(process.platform == "win32") { TestData.languages.push({value: "csharp", name: "C#"}); @@ -40,9 +40,9 @@ function Init() "/lib/IceStorm.js", "/lib/IceStorm.min.js", "/lib/IceGrid.js", "/lib/IceGrid.min.js",]; - TestData.TestCases = fs.readFileSync(path.join(__dirname, "..", "test", "Common", "TestCases.json"), "utf8"); - var TestCases = JSON.parse(TestData.TestCases); - TestData.tests = Object.keys(TestCases); + TestData.TestSuites = fs.readFileSync(path.join(__dirname, "..", "test", "Common", "TestSuites.json"), "utf8"); + var TestSuites = JSON.parse(TestData.TestSuites); + TestData.tests = Object.keys(TestSuites); var template = hogan.compile(fs.readFileSync(path.join(__dirname, "..", "test", "Common", "index.html"), "utf8")); var libraryMaps = libraries.map( function(f) @@ -60,12 +60,12 @@ function Init() var match = req.url.pathname.match("^\/test/(.*)/index\.html"); if(match) { - var es5 = match[1].indexOf("/es5/") !== -1; - var m = es5 ? match[1].replace("/es5/", "/") : match[1]; + var es5 = match[1].indexOf("es5/") !== -1; + var m = es5 ? match[1].replace("es5/", "") : match[1]; // That is a test case - var testCase = TestCases[m]; - if(testCase === undefined) + var testSuite = TestSuites[m]; + if(testSuite === undefined) { res.writeHead(404); res.end("404 Page Not Found"); @@ -76,7 +76,7 @@ function Init() TestData.current = m; if(req.url.query.next == "true") { - var testCase = TestData.tests[0]; + var testSuite = TestData.tests[0]; var language = req.url.query.language !== undefined ? req.url.query.language : "cpp"; var protocol = req.url.protocol; var i = TestData.tests.indexOf(TestData.current); @@ -84,7 +84,7 @@ function Init() if(i < TestData.tests.length - 1) { - testCase = TestData.tests[i + 1]; + testSuite = TestData.tests[i + 1]; } else if(!worker) { @@ -105,7 +105,7 @@ function Init() if(es5) { - testCase = testCase.replace("Ice/", "Ice/es5/"); + testSuite = "es5/" + testSuite; } var location = url.format( @@ -113,7 +113,7 @@ function Init() protocol: protocol, hostname: req.headers.host.split(":")[0], port: (protocol == "http" ? 8080 : 9090), - pathname: ("/test/" + testCase + "/index.html"), + pathname: ("/test/" + testSuite + "/index.html"), query:{loop: "true", language: language, worker: worker} }); @@ -126,7 +126,7 @@ function Init() if(req.url.query.worker != "true") { TestData.scripts = []; - + if(es5) { TestData.scripts = @@ -136,8 +136,8 @@ function Init() "/lib/es5/Ice.js", "/test/Common/TestRunner.js", "/test/Common/TestSuite.js", - "/test/Common/es5/Controller.js" - ].concat(testCase.files); + "/test/es5/Common/Controller.js" + ].concat(testSuite.files); } else { @@ -147,7 +147,7 @@ function Init() "/test/Common/TestRunner.js", "/test/Common/TestSuite.js", "/test/Common/Controller.js" - ].concat(testCase.files); + ].concat(testSuite.files); } } else @@ -172,6 +172,10 @@ function Init() path.resolve(path.join(require.resolve("ice"), "..", "..")) : this._basePath; var filePath = path.resolve(path.join(basePath, req.url.pathname)); + if(filePath.indexOf("es5/") !== -1 && path.extname(filePath) != "js") + { + filePath = filePath.replace("es5/", "") + } // // If OPTIMIZE is set resolve Ice libraries to the corresponding minified diff --git a/js/gulpfile.js b/js/gulpfile.js index e4e7fb82560..2beec425e0a 100644 --- a/js/gulpfile.js +++ b/js/gulpfile.js @@ -134,7 +134,7 @@ var common = { gulp.task("common:slice", [], function(){ - return gulp.src(["test/Common/Controller.ice"]) + return gulp.src(["../scripts/Controller.ice"]) .pipe(slice2js({dest: "test/Common"})) .pipe(gulp.dest("test/Common")); }); @@ -143,12 +143,12 @@ gulp.task("common:slice-babel", ["common:slice"], function(){ return gulp.src(["test/Common/Controller.js"]) .pipe(babel({compact: false})) - .pipe(gulp.dest("test/Common/es5")); + .pipe(gulp.dest("test/es5/Common")); }); gulp.task("common:slice:clean", [], function(){ - del(["test/Common/Controller.js", "test/Common/.depend", "test/Common/es5/Controller.js"]); + del(["test/Common/Controller.js", "test/Common/.depend", "test/es5/Common/Controller.js"]); }); gulp.task("common:js", ["bower"], @@ -177,7 +177,7 @@ gulp.task("common:js-babel", [], function(){ return gulp.src("test/Common/Common.js") .pipe(babel({compact: false})) - .pipe(gulp.dest("test/Common/es5/")); + .pipe(gulp.dest("test/es5/Common/")); }); gulp.task("common:clean", [], @@ -242,10 +242,9 @@ tests.forEach( gulp.task(testBabelTask(name), [testTask(name)], function(){ - return gulp.src([path.join(name, "*.js"), "!" + path.join(name, "run.js")]) + return gulp.src([path.join(name, "*.js")]) .pipe(babel({compact: false})) - .pipe(gulp.dest(name.replace("test/Ice/", "test/Ice/es5/") - .replace("test/Glacier2/", "test/Glacier2/es5/"))); + .pipe(gulp.dest(name.replace("test/", "test/es5/"))); }); gulp.task(testCleanDependTask(name), [], @@ -263,11 +262,8 @@ tests.forEach( gulp.task(testBabelCleanTask(name), [testCleanTask(name)], function(){ - var s = name.replace("test/Ice/", "test/Ice/es5/") - .replace("test/Glacier2/", "test/Glacier2/es5/"); - - return gulp.src([path.join(s, "*.js"), "!" + path.join(s, "run.js")]) - .pipe(paths(del)); + var s = name.replace("test/", "test/es5/"); + return gulp.src([path.join(s, "*.js")]).pipe(paths(del)); }); }); @@ -448,7 +444,7 @@ gulp.task("dist:clean", libs.map(libCleanTask)); function runTestsWithBrowser(url) { require("./bin/HttpServer")(); - var cmd = ["../scripts/TestController.py"]; + var cmd = ["../scripts/Controller.py", "--endpoints", "ws -p 15002:wss -p 15003", "-d"]; cmd = cmd.concat(process.argv.slice(3)); var p = require("child_process").spawn("python", cmd, {stdio: "inherit"}); p.on("error", function(err) @@ -482,7 +478,7 @@ gulp.task("test:run-with-browser", useBinDist ? ["test"] : ["build"], gulp.task("test:run-with-browser-es5", useBinDist ? ["test"] : ["build"], function(url){ - return runTestsWithBrowser("http://127.0.0.1:8080/test/Ice/es5/acm/index.html"); + return runTestsWithBrowser("http://127.0.0.1:8080/test/es5/Ice/acm/index.html"); }); gulp.task("test:run-with-node", (useBinDist ? ["test"] : ["build"]), @@ -530,7 +526,7 @@ gulp.task("lint:js", ["build"], "src/**/browser/*.js", "test/**/*.js", "!src/es5/**/*.js", - "!test/**/es5/**/*.js", + "!test/es5/**/**/*.js", "!**/Client.min.js"]) .pipe(jshint()) .pipe(jshint.reporter("default")); @@ -546,7 +542,7 @@ gulp.task("ice-module:package", ["dist"], function() { return gulp.src(['package.json']).pipe( - gulp.dest(path.join("node_modules", "ice"))); + gulp.dest(path.join("node_modules", "ice"))); }); gulp.task("ice-module", ["ice-module:package"], function() diff --git a/js/src/Ice/Ice.js b/js/src/Ice/Ice.js index 05b9e8d3aa5..27499437162 100644 --- a/js/src/Ice/Ice.js +++ b/js/src/Ice/Ice.js @@ -39,7 +39,8 @@ module.exports.Ice = __M.require(module, "../Ice/ArrayUtil", "../Ice/UnknownSlicedValue", "../Ice/Process", - "../Ice/MapUtil" + "../Ice/MapUtil", + "../Ice/ToStringMode" ]).Ice; module.exports.IceMX = require("../Ice/Metrics").IceMX; diff --git a/js/src/Ice/sources.json b/js/src/Ice/sources.json index 9a6c54ec217..4c095701515 100644 --- a/js/src/Ice/sources.json +++ b/js/src/Ice/sources.json @@ -94,6 +94,7 @@ "TcpEndpointFactory.js", "TcpEndpointI.js", "Timer.js", + "ToStringMode.js", "TraceLevels.js", "TraceUtil.js", "UnknownSlicedValue.js", diff --git a/js/test/Common/Common.js b/js/test/Common/Common.js deleted file mode 100644 index 3fb5b860cd8..00000000000 --- a/js/test/Common/Common.js +++ /dev/null @@ -1,41 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -/* globals -Ice*/ -var Ice = require("ice").Ice; - -var write = function(msg) -{ - process.stdout.write(msg); -}; - -var writeLine = function(msg) -{ - this.write(msg + "\n"); -}; - -var run = function(m) -{ - var id = new Ice.InitializationData(); - id.properties = Ice.createProperties(process.argv); - var test = m.require("./Client").__test__; - - test({write: write, writeLine: writeLine}, id).catch( - ex => - { - console.log(ex.toString()); - if(ex.stack) - { - console.log(ex.stack); - } - process.exit(1); - }); -}; - -exports.run = run; diff --git a/js/test/Common/Controller.ice b/js/test/Common/Controller.ice deleted file mode 100644 index edc11307013..00000000000 --- a/js/test/Common/Controller.ice +++ /dev/null @@ -1,38 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -module Test -{ - -module Common -{ - -exception ServerFailedException -{ - string reason; -}; - -interface Server -{ - void waitTestSuccess(); - void waitForServer() throws ServerFailedException; - void terminate(); -}; - -sequence<string> StringSeq; - -interface Controller -{ - Server* runServer(string lang, string name, string protocol, string host, bool winrt, string configName, - StringSeq options); -}; - -}; - -}; diff --git a/js/test/Common/TestRunner.js b/js/test/Common/TestRunner.js index 97732ce62d6..244d97ca6c4 100644 --- a/js/test/Common/TestRunner.js +++ b/js/test/Common/TestRunner.js @@ -9,8 +9,8 @@ /* global - __runEchoServerOptions__ : false, __test__ : false, + __testBidir__ : false, Test : false, */ @@ -38,7 +38,7 @@ function isWindows() return navigator.userAgent.indexOf("Windows") != -1; } -function runTest(name, language, defaultHost, protocol, configurations, out) +function runTest(testsuite, language, host, protocol, testcases, out) { // // This logger is setup to work with Web Workers and normal scripts using @@ -102,12 +102,14 @@ function runTest(name, language, defaultHost, protocol, configurations, out) return d.toLocaleString("en-US", this._dateformat) + "." + d.getMilliseconds(); } }; - - var server, communicator; + + var communicator; var id = new Ice.InitializationData(); + var port = protocol == "ws" ? 15002 : 15003; + var serverTestCase; id.logger = Logger; id.properties = Ice.createProperties(); - id.properties.setProperty("Ice.Default.Host", defaultHost); + id.properties.setProperty("Ice.Default.Host", host); id.properties.setProperty("Ice.Default.Protocol", protocol); //id.properties.setProperty("Ice.Trace.Protocol", "1"); //id.properties.setProperty("Ice.Trace.Network", "3"); @@ -115,100 +117,92 @@ function runTest(name, language, defaultHost, protocol, configurations, out) return Ice.Promise.try( function() { - if(typeof(__runServer__) !== "undefined" || typeof(__runEchoServer__) !== "undefined") + if(typeof(__runServer__) === "undefined" && typeof(__testBidir__) === "undefined") { - communicator = Ice.initialize(); - var str = protocol == "ws" ? "controller:ws -h " + defaultHost + " -p 15002" : - "controller:wss -h " + defaultHost + " -p 15003"; + return __test__(out, id); + } - var controller = Test.Common.ControllerPrx.uncheckedCast(communicator.stringToProxy(str)); + communicator = Ice.initialize(); + var str = "controller:" + protocol + " -h " + host + " -p " + port; + var controller = Test.Common.ControllerPrx.uncheckedCast(communicator.stringToProxy(str)); + if(testcases === undefined) + { + testcases = [ { name: "client/server" } ]; + } - var options = []; - var srv = typeof(__runEchoServer__) !== "undefined" ? "Ice/echo" : name; - if(typeof(__runEchoServerOptions__) !== "undefined") + run = function(testsuite, testcase, client) + { + if(testcase.langs && testcase.langs.indexOf(language) == -1) { - options = options.concat(__runEchoServerOptions__); + return; } - if(configurations === undefined) + if(typeof(__testBidir__) !== "undefined" && client == __testBidir__) { - configurations = [ { configName: "", desc: "default configuration" } ]; + out.writeLine("[ running bidir " + testcase.name + " test]"); } - - var prev = Ice.Promise.resolve(); - configurations.forEach( - function(config) + else + { + out.writeLine("[ running " + testcase.name + " test]"); + } + out.write("starting server side... "); + return controller.runTestCase(language, testsuite, testcase.name).then( + function(proxy) + { + proxy = controller.ice_getCachedConnection().createProxy(proxy.ice_getIdentity()) + serverTestCase = Test.Common.TestCasePrx.uncheckedCast(proxy); + var config = new Test.Common.Config(); + config.protocol = protocol; + return serverTestCase.startServerSide(config); + } + ).then( + function() { - if(config.langs && config.langs.indexOf(language) == -1) + out.writeLine("ok") + var initData = id.clone(); + if(testcase.args !== undefined) { - return prev; + initData.properties = Ice.createProperties(testcase.args, id.properties); } - prev = prev.then( - function() - { - out.write("starting " + srv + " server... "); - return controller.runServer(language, srv, protocol, defaultHost, false, - config.configName, options).then( - function(proxy) - { - var ref = proxy.ice_getIdentity().name + ":" + protocol + " -h " + - defaultHost + " -p " + (protocol == "ws" ? "15002" : "15003"); - out.writeLine("ok"); - server = Test.Common.ServerPrx.uncheckedCast(communicator.stringToProxy(ref)); - out.writeLine("Running test with " + config.desc + "."); - return server.waitForServer().then( - function() - { - var initData = id.clone(); - if(config.args !== undefined) - { - initData.properties = - Ice.createProperties(config.args, id.properties); - } - return __test__(out, initData); - }); - }, - function(ex) - { - out.writeLine("failed! (" + ex + ")"); - throw ex; - } - ).then( - function() - { - if(server) - { - return server.waitTestSuccess(); - } - } - ).catch( - function(ex) - { - if(server) - { - return server.terminate().then( - function() - { - throw ex; - }, - function() - { - throw ex; - }); - } - else - { - throw ex; - } - }); - }); - }); - return prev; + return client(out, initData); + } + ).then( + function() + { + return serverTestCase.stopServerSide(true); + } + ).catch( + function(ex) + { + out.writeLine("failed! (" + ex + ")"); + throw ex + } + ).finally( + function() + { + if(serverTestCase) + { + return serverTestCase.destroy(); + } + } + ); } - else + + var p = Ice.Promise.resolve(); + if(typeof(__runServer__) !== "undefined") { - return __test__(out, id); + testcases.forEach(function(testcase) { + p = p.then(function() { return run(testsuite, testcase, __test__); }) + }); + } + if(typeof(__testBidir__) !== "undefined" && language === "cpp") + { + testcases.forEach(function(testcase) { + options = typeof(__runEchoServerOptions__) !== "undefined" ? __runEchoServerOptions__ : [] + p = p.then(function() { return run("Ice/echo", testcase, __testBidir__); }) + }); } + return p; } ).finally( function() @@ -226,10 +220,10 @@ function runTest(name, language, defaultHost, protocol, configurations, out) function(ex) { out.writeLine(""); - if(ex instanceof Test.Common.ServerFailedException) + if(ex instanceof Test.Common.TestCaseFailedException) { - out.writeLine("Server failed to start:\n"); - out.writeLine(ex.reason); + out.writeLine("Server test case failed to start:\n"); + out.writeLine(ex.output); } else { diff --git a/js/test/Common/TestSuite.js b/js/test/Common/TestSuite.js index d0969154917..ce2a9c18742 100644 --- a/js/test/Common/TestSuite.js +++ b/js/test/Common/TestSuite.js @@ -13,13 +13,13 @@ Test : false, URI : false, current : false, - TestCases : false, + TestSuites : false, runTest: false */ $(document).foundation(); $(document).ready( - function(){ + function() { $("#console").height(120); var out = @@ -58,10 +58,9 @@ $(document).ready( function nextTest() { var path = $("#test").val(); - if(document.location.pathname.indexOf("/es5/") !== -1 && - path.indexOf("/es5/") === -1) + if(document.location.pathname.indexOf("/es5/") !== -1 && path.indexOf("/es5/") === -1) { - path = path.replace("/test/Ice/", "/test/Ice/es5/"); + path = path.replace("/test/", "/test/es5/"); } document.location.assign(new URI() @@ -115,10 +114,9 @@ $(document).ready( function updateLocation() { var path = $("#test").val(); - if(document.location.pathname.indexOf("/es5/") !== -1 && - path.indexOf("/es5/") === -1) + if(document.location.pathname.indexOf("/es5/") !== -1 && path.indexOf("/es5/") === -1) { - path = path.replace("/test/Ice/", "/test/Ice/es5/"); + path = path.replace("/test/", "/test/es5/"); } document.location.assign(new URI() @@ -166,8 +164,8 @@ $(document).ready( language: $("#language").val(), defaultHost: document.location.hostname || "127.0.0.1", protocol: $("#protocol").val(), - configurations: TestCases[current].configurations, - files: TestCases[current].files, + testcases: TestSuites[current].testcases, + files: TestSuites[current].files, es5: document.location.pathname.indexOf("/es5/") !== -1 } }); @@ -179,8 +177,12 @@ $(document).ready( } else { - runTest(current, $("#language").val(), document.location.hostname || "127.0.0.1", - $("#protocol").val(), TestCases[current].configurations, out + runTest(current, + $("#language").val(), + document.location.hostname || "127.0.0.1", + $("#protocol").val(), + TestSuites[current].testcases, + out ).finally( function() { diff --git a/js/test/Common/TestCases.json b/js/test/Common/TestSuites.json index ca8ecd1dfa1..74ccdc399a1 100644 --- a/js/test/Common/TestCases.json +++ b/js/test/Common/TestSuites.json @@ -18,51 +18,38 @@ "Ice/enums": { "files": ["Test.js", "Client.js"], - "configurations": + "testcases": [ { - "configName": "1.0", - "desc": "1.0 encoding", + "name": "client/server with 1.0 encoding", "args": ["--Ice.Default.EncodingVersion=1.0"] }, { - "configName": "1.1", - "desc": "1.1 encoding" + "name": "client/server with default encoding" } ] }, "Ice/exceptions": { - "files": ["Test.js", "Client.js"], - "configurations": + "files": ["Test.js", "Client.js", "ThrowerI.js", "AMDThrowerI.js", "ClientBidir.js"], + "testcases": [ { - "configName": "compact", - "desc": "compact (default) format" + "name": "client/server with compact format" }, { - "configName": "sliced", - "desc": "sliced format", + "name": "client/server with sliced format", "args": ["--Ice.Default.SlicedFormat"] }, { - "configName": "1.0", - "desc": "1.0 encoding", + "name": "client/server with 1.0 encoding", "args": ["--Ice.Default.EncodingVersion=1.0"] } ] }, - "Ice/exceptionsBidir": - { - "files": ["Test.js", "ThrowerI.js", "AMDThrowerI.js", "../exceptions/Client.js", "Client.js"] - }, "Ice/facets": { - "files": ["Test.js", "Client.js"] - }, - "Ice/facetsBidir": - { - "files": ["Test.js", "TestI.js", "../facets/Client.js", "Client.js"] + "files": ["Test.js", "Client.js", "TestI.js", "ClientBidir.js"] }, "Ice/hold": { @@ -74,67 +61,45 @@ }, "Ice/inheritance": { - "files": ["Test.js", "Client.js"] - }, - "Ice/inheritanceBidir": - { - "files": ["Test.js", "InitialI.js", "../inheritance/Client.js", "Client.js"] + "files": ["Test.js", "Client.js", "InitialI.js", "ClientBidir.js"] }, "Ice/operations": { - "files": ["Test.js", "Twoways.js", "Oneways.js", "BatchOneways.js", "Client.js"] - }, - "Ice/operationsBidir": - { - "files": ["Test.js", "../operations/Twoways.js", "../operations/Oneways.js", - "../operations/BatchOneways.js", "MyDerivedClassI.js", "AMDMyDerivedClassI.js", - "../operations/Client.js", "Client.js"] + "files": ["Test.js", "Twoways.js", "Oneways.js", "BatchOneways.js", "Client.js", + "MyDerivedClassI.js", "AMDMyDerivedClassI.js", "ClientBidir.js"] }, "Ice/objects": { "files": ["Test.js", "Client.js"], - "configurations": + "testcases": [ { - "configName": "compact", - "desc": "compact (default) format" + "name": "client/server with compact format" }, { - "configName": "sliced", - "desc": "sliced format", + "name": "client/server with sliced format", "args": ["--Ice.Default.SlicedFormat"] }, { - "configName": "1.0", - "desc": "1.0 encoding", + "name": "client/server with 1.0 encoding", "args": ["--Ice.Default.EncodingVersion=1.0"] } ] }, "Ice/optional": { - "files": ["Test.js", "Client.js", "ClientPrivate.js"], - "configurations": + "files": ["Test.js", "Client.js", "ClientPrivate.js", "InitialI.js", "AMDInitialI.js", "ClientBidir.js"], + "testcases": [ { - "configName": "compact", - "desc": "compact (default) format" + "name": "client/server with compact format" }, { - "configName": "sliced", - "desc": "sliced format", + "name": "client/server with sliced format", "args": ["--Ice.Default.SlicedFormat"] } ] }, - "Ice/optionalBidir": - { - "files": ["Test.js", "InitialI.js", "AMDInitialI.js", "../optional/Client.js", "../optional/ClientPrivate.js", "Client.js"] - }, - "Ice/promise": - { - "files": ["Client.js"] - }, "Ice/properties": { "files": ["Client.js"] @@ -150,15 +115,13 @@ "Ice/slicing/exceptions": { "files": ["Test.js", "Client.js"], - "configurations": + "testcases": [ { - "configName": "sliced", - "desc": "sliced format" + "name": "client/server" }, { - "configName": "1.0", - "desc": "1.0 encoding", + "name": "client/server with 1.0 encoding", "args": ["--Ice.Default.EncodingVersion=1.0"] } ] @@ -166,15 +129,13 @@ "Ice/slicing/objects": { "files": ["Test.js", "Client.js"], - "configurations": + "testcases": [ { - "configName": "sliced", - "desc": "sliced format" + "name": "client/server" }, { - "configName": "1.0", - "desc": "1.0 encoding", + "name": "client/server with 1.0 encoding", "args": ["--Ice.Default.EncodingVersion=1.0"] } ] diff --git a/js/test/Common/Worker.js b/js/test/Common/Worker.js index 25d761c0a1a..952f9e45484 100644 --- a/js/test/Common/Worker.js +++ b/js/test/Common/Worker.js @@ -34,7 +34,7 @@ self.onmessage = function(e) self.importScripts("/node_modules/babel-polyfill/dist/polyfill.js"); self.importScripts("/node_modules/regenerator-runtime/runtime.js"); self.importScripts("/lib/es5/Ice.js"); - self.importScripts("/test/Common/es5/Controller.js"); + self.importScripts("/test/es5/Common/Controller.js"); } else { diff --git a/js/test/Common/index.html b/js/test/Common/index.html index 2ca7e5cecfb..16eee2fba83 100644 --- a/js/test/Common/index.html +++ b/js/test/Common/index.html @@ -13,7 +13,7 @@ {{/scripts}} <script type="text/javascript"> var current = "{{current}}"; - var TestCases = {{{TestCases}}}; + var TestSuites = {{{TestSuites}}}; </script> </head> <body> diff --git a/js/test/Common/run.js b/js/test/Common/run.js new file mode 100755 index 00000000000..40d83aff47a --- /dev/null +++ b/js/test/Common/run.js @@ -0,0 +1,39 @@ +// ********************************************************************** +// +// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +// +// This copy of Ice is licensed to you under the terms described in the +// ICE_LICENSE file included in this distribution. +// +// ********************************************************************** + + + +var Ice = require(process.argv[2] === "--es5" ? "ice/src/es5" : "ice").Ice; + +var write = function(msg) +{ + process.stdout.write(msg); +}; + +var writeLine = function(msg) +{ + this.write(msg + "\n"); +}; + +var id = new Ice.InitializationData(); +id.properties = Ice.createProperties(process.argv); +exe = process.argv[2] === "--es5" ? process.argv[3] : process.argv[2] +var test = module.require(exe) +test = exe === "ClientBidir" ? test.__testBidir__ : test.__test__; + +test({write: write, writeLine: writeLine}, id).catch( + ex => + { + console.log(ex.toString()); + if(ex.stack) + { + console.log(ex.stack); + } + process.exit(1); + }); diff --git a/js/test/Glacier2/es5/router/run.js b/js/test/Glacier2/es5/router/run.js deleted file mode 100644 index 82c8656d3b0..00000000000 --- a/js/test/Glacier2/es5/router/run.js +++ /dev/null @@ -1,10 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -require("../../../Common/es5/Common").run(module); diff --git a/js/test/Glacier2/es5/router/run.py b/js/test/Glacier2/es5/router/run.py deleted file mode 100755 index 3e2bfeef34f..00000000000 --- a/js/test/Glacier2/es5/router/run.py +++ /dev/null @@ -1,50 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -router = os.path.join(TestUtil.getCppBinDir(), "glacier2router") - -# -# Generate the crypt passwords file -# -TestUtil.hashPasswords(os.path.join(os.getcwd(), "passwords"), {"userid": "abc123"}) - -args = ' --Ice.Warn.Dispatch=0' + \ - ' --Ice.Warn.Connections=0' + \ - ' --Glacier2.Filter.Category.Accept="c1 c2"' + \ - ' --Glacier2.Filter.Category.AcceptUser="2"' + \ - ' --Glacier2.SessionTimeout="30"' + \ - ' --Glacier2.Client.Endpoints="default -p 12347"' + \ - ' --Glacier2.Server.Endpoints="tcp -h 127.0.0.1"' \ - ' --Ice.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348"' + \ - ' --Ice.Admin.InstanceName=Glacier2' + \ - ' --Glacier2.CryptPasswords="' + os.path.join(os.getcwd(), "passwords") + '"' - -sys.stdout.write("starting router... ") -sys.stdout.flush() -routerConfig = TestUtil.DriverConfig("server") -routerConfig.lang = "cpp" -starterProc = TestUtil.startServer(router, args, count=2, config=routerConfig) -print("ok") - -TestUtil.clientServerTest() - -starterProc.waitTestSuccess() diff --git a/js/test/Glacier2/router/Client.js b/js/test/Glacier2/router/Client.js index c207321d37f..0ca42d37584 100644 --- a/js/test/Glacier2/router/Client.js +++ b/js/test/Glacier2/router/Client.js @@ -69,8 +69,7 @@ var failCB = function () { test(false); }; - var router, base, session, twoway, oneway, category, processBase, process, - adapter,callbackReceiverImpl, + var router, base, session, twoway, oneway, category, processBase, processPrx, adapter,callbackReceiverImpl, callbackReceiver, twowayR, onewayR, fakeTwowayR; @@ -79,7 +78,7 @@ function() { out.write("testing stringToProxy for router... "); - var routerBase = communicator.stringToProxy("Glacier2/router:default -p 12347"); + var routerBase = communicator.stringToProxy("Glacier2/router:default -p 12020"); test(routerBase !== null); out.writeLine("ok"); @@ -317,11 +316,14 @@ ).then( function() { - out.writeLine("ok"); - out.write("testing server shutdown... "); - return twoway.shutdown(); - // No ping, otherwise the router prints a warning message if it's - // started with --Ice.Warn.Connections. + if(process.argv.indexOf("--shutdown") > -1) + { + out.writeLine("ok"); + out.write("testing server shutdown... "); + return twoway.shutdown(); + // No ping, otherwise the router prints a warning message if it's + // started with --Ice.Warn.Connections. + } } ).then( function() @@ -346,38 +348,41 @@ test(ex instanceof Ice.ConnectionLostException); out.writeLine("ok"); - out.write("uninstalling router with communicator... "); - communicator.setDefaultRouter(null); - out.writeLine("ok"); + if(process.argv.indexOf("--shutdown") > -1) + { + out.write("uninstalling router with communicator... "); + communicator.setDefaultRouter(null); + out.writeLine("ok"); - out.write("testing stringToProxy for process object... "); - processBase = communicator.stringToProxy("Glacier2/admin -f Process:tcp -h 127.0.0.1 -p 12348"); - out.writeLine("ok"); + out.write("testing stringToProxy for process object... "); + processBase = communicator.stringToProxy("Glacier2/admin -f Process:tcp -h 127.0.0.1 -p 12021"); + out.writeLine("ok"); - out.write("testing checked cast for admin object... "); - return Ice.ProcessPrx.checkedCast(processBase); - } - ).then( - function(o) - { - process = o; - test(process !== null); - out.writeLine("ok"); + out.write("testing checked cast for admin object... "); + return Ice.ProcessPrx.checkedCast(processBase).then( + function(o) + { + processPrx = o; + test(processPrx !== null); + out.writeLine("ok"); - out.write("testing Glacier2 shutdown... "); - return process.shutdown(); - } - ).then( - function() - { - return process.ice_ping(); - } - ).then( - failCB, - function(ex) - { - test(ex instanceof Ice.LocalException); - out.writeLine("ok"); + out.write("testing Glacier2 shutdown... "); + return processPrx.shutdown(); + } + ).then( + function() + { + return processPrx.ice_ping(); + } + ).then( + failCB, + function(ex) + { + test(ex instanceof Ice.LocalException); + out.writeLine("ok"); + } + ); + } } ).catch(e => console.log(e)); }; diff --git a/js/test/Glacier2/router/run.py b/js/test/Glacier2/router/run.py deleted file mode 100755 index dcc00db1012..00000000000 --- a/js/test/Glacier2/router/run.py +++ /dev/null @@ -1,50 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -router = os.path.join(TestUtil.getCppBinDir(), "glacier2router") - -# -# Generate the crypt passwords file -# -TestUtil.hashPasswords(os.path.join(os.getcwd(), "passwords"), {"userid": "abc123"}) - -args = ' --Ice.Warn.Dispatch=0' + \ - ' --Ice.Warn.Connections=0' + \ - ' --Glacier2.Filter.Category.Accept="c1 c2"' + \ - ' --Glacier2.Filter.Category.AcceptUser="2"' + \ - ' --Glacier2.SessionTimeout="30"' + \ - ' --Glacier2.Client.Endpoints="default -p 12347"' + \ - ' --Glacier2.Server.Endpoints="tcp -h 127.0.0.1"' \ - ' --Ice.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348"' + \ - ' --Ice.Admin.InstanceName=Glacier2' + \ - ' --Glacier2.CryptPasswords="' + os.path.join(os.getcwd(), "passwords") + '"' - -sys.stdout.write("starting router... ") -sys.stdout.flush() -routerConfig = TestUtil.DriverConfig("server") -routerConfig.lang = "cpp" -starterProc = TestUtil.startServer(router, args, count=2, config=routerConfig) -print("ok") - -TestUtil.clientServerTest() - -starterProc.waitTestSuccess() diff --git a/js/test/Ice/acm/run.py b/js/test/Ice/acm/run.py deleted file mode 100755 index 543a6998430..00000000000 --- a/js/test/Ice/acm/run.py +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys, getopt - -path = [ ".", "..", "../..", "../../..", "../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -TestUtil.clientServerTest() diff --git a/js/test/Ice/ami/run.py b/js/test/Ice/ami/run.py deleted file mode 100755 index 7fcd284b757..00000000000 --- a/js/test/Ice/ami/run.py +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -print("tests with regular server.") -TestUtil.clientServerTest() diff --git a/js/test/Ice/binding/run.py b/js/test/Ice/binding/run.py deleted file mode 100755 index 3fc6200cd00..00000000000 --- a/js/test/Ice/binding/run.py +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -TestUtil.clientServerTest() diff --git a/js/test/Ice/defaultValue/run.py b/js/test/Ice/defaultValue/run.py deleted file mode 100755 index 286e60351b6..00000000000 --- a/js/test/Ice/defaultValue/run.py +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -TestUtil.simpleTest() diff --git a/js/test/Ice/enums/run.py b/js/test/Ice/enums/run.py deleted file mode 100755 index 3aac7a1c45a..00000000000 --- a/js/test/Ice/enums/run.py +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -print("Running test with 1.0 encoding.") -TestUtil.clientServerTest(additionalClientOptions="--Ice.Default.EncodingVersion=1.0", - additionalServerOptions="--Ice.Default.EncodingVersion=1.0") - -print("Running test with 1.1 encoding.") -TestUtil.clientServerTest() diff --git a/js/test/Ice/es5/acm/run.js b/js/test/Ice/es5/acm/run.js deleted file mode 100644 index 222f9f486f7..00000000000 --- a/js/test/Ice/es5/acm/run.js +++ /dev/null @@ -1,12 +0,0 @@ -"use strict"; - -// ********************************************************************** -// -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -require("../../../Common/es5/Common").run(module);
\ No newline at end of file diff --git a/js/test/Ice/es5/acm/run.py b/js/test/Ice/es5/acm/run.py deleted file mode 100755 index f4209d9cb60..00000000000 --- a/js/test/Ice/es5/acm/run.py +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys, getopt - -path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -TestUtil.clientServerTest() diff --git a/js/test/Ice/es5/ami/run.js b/js/test/Ice/es5/ami/run.js deleted file mode 100644 index a288c69ca80..00000000000 --- a/js/test/Ice/es5/ami/run.js +++ /dev/null @@ -1,12 +0,0 @@ -"use strict"; - -// ********************************************************************** -// -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -require("../../../Common/es5/Common").run(module); diff --git a/js/test/Ice/es5/ami/run.py b/js/test/Ice/es5/ami/run.py deleted file mode 100755 index 9d37fa4f702..00000000000 --- a/js/test/Ice/es5/ami/run.py +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -print("tests with regular server.") -TestUtil.clientServerTest() diff --git a/js/test/Ice/es5/binding/run.js b/js/test/Ice/es5/binding/run.js deleted file mode 100644 index a288c69ca80..00000000000 --- a/js/test/Ice/es5/binding/run.js +++ /dev/null @@ -1,12 +0,0 @@ -"use strict"; - -// ********************************************************************** -// -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -require("../../../Common/es5/Common").run(module); diff --git a/js/test/Ice/es5/binding/run.py b/js/test/Ice/es5/binding/run.py deleted file mode 100755 index 0f358870832..00000000000 --- a/js/test/Ice/es5/binding/run.py +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -TestUtil.clientServerTest() diff --git a/js/test/Ice/es5/defaultValue/run.js b/js/test/Ice/es5/defaultValue/run.js deleted file mode 100644 index a288c69ca80..00000000000 --- a/js/test/Ice/es5/defaultValue/run.js +++ /dev/null @@ -1,12 +0,0 @@ -"use strict"; - -// ********************************************************************** -// -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -require("../../../Common/es5/Common").run(module); diff --git a/js/test/Ice/es5/defaultValue/run.py b/js/test/Ice/es5/defaultValue/run.py deleted file mode 100755 index b2a1b316881..00000000000 --- a/js/test/Ice/es5/defaultValue/run.py +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -TestUtil.simpleTest() diff --git a/js/test/Ice/es5/enums/run.js b/js/test/Ice/es5/enums/run.js deleted file mode 100644 index a288c69ca80..00000000000 --- a/js/test/Ice/es5/enums/run.js +++ /dev/null @@ -1,12 +0,0 @@ -"use strict"; - -// ********************************************************************** -// -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -require("../../../Common/es5/Common").run(module); diff --git a/js/test/Ice/es5/enums/run.py b/js/test/Ice/es5/enums/run.py deleted file mode 100755 index 3aac7a1c45a..00000000000 --- a/js/test/Ice/es5/enums/run.py +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -print("Running test with 1.0 encoding.") -TestUtil.clientServerTest(additionalClientOptions="--Ice.Default.EncodingVersion=1.0", - additionalServerOptions="--Ice.Default.EncodingVersion=1.0") - -print("Running test with 1.1 encoding.") -TestUtil.clientServerTest() diff --git a/js/test/Ice/es5/exceptions/run.js b/js/test/Ice/es5/exceptions/run.js deleted file mode 100644 index a288c69ca80..00000000000 --- a/js/test/Ice/es5/exceptions/run.js +++ /dev/null @@ -1,12 +0,0 @@ -"use strict"; - -// ********************************************************************** -// -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -require("../../../Common/es5/Common").run(module); diff --git a/js/test/Ice/es5/exceptions/run.py b/js/test/Ice/es5/exceptions/run.py deleted file mode 100755 index 067ab2c9639..00000000000 --- a/js/test/Ice/es5/exceptions/run.py +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -print("Running test with compact (default) format.") -TestUtil.clientServerTest() - -print("Running test with sliced format.") -TestUtil.clientServerTest(additionalClientOptions="--Ice.Default.SlicedFormat", - additionalServerOptions="--Ice.Default.SlicedFormat") - -print("Running test with 1.0 encoding.") -TestUtil.clientServerTest(additionalClientOptions="--Ice.Default.EncodingVersion=1.0", - additionalServerOptions="--Ice.Default.EncodingVersion=1.0") - -print("Running test with compact (default) format and AMD server.") -TestUtil.clientServerTest(server="serveramd") - -print("Running test with sliced format and AMD server.") -TestUtil.clientServerTest(server="serveramd", - additionalClientOptions="--Ice.Default.SlicedFormat", - additionalServerOptions="--Ice.Default.SlicedFormat") - -print("Running test with 1.0 encoding and AMD server.") -TestUtil.clientServerTest(server="serveramd", - additionalClientOptions="--Ice.Default.EncodingVersion=1.0", - additionalServerOptions="--Ice.Default.EncodingVersion=1.0") diff --git a/js/test/Ice/es5/exceptionsBidir/run.js b/js/test/Ice/es5/exceptionsBidir/run.js deleted file mode 100644 index a288c69ca80..00000000000 --- a/js/test/Ice/es5/exceptionsBidir/run.js +++ /dev/null @@ -1,12 +0,0 @@ -"use strict"; - -// ********************************************************************** -// -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -require("../../../Common/es5/Common").run(module); diff --git a/js/test/Ice/es5/exceptionsBidir/run.py b/js/test/Ice/es5/exceptionsBidir/run.py deleted file mode 100755 index 6c823b0a75f..00000000000 --- a/js/test/Ice/es5/exceptionsBidir/run.py +++ /dev/null @@ -1,34 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -print("Running test with compact (default) format.") -TestUtil.clientEchoTest(additionalServerOptions="--Ice.Warn.Dispatch=0 --Ice.Warn.Connections=0") - -print("Running test with sliced format.") -TestUtil.clientEchoTest(additionalClientOptions="--Ice.Default.SlicedFormat", - additionalServerOptions="--Ice.Default.SlicedFormat" + - " --Ice.Warn.Dispatch=0 --Ice.Warn.Connections=0") - -print("Running test with 1.0 encoding.") -TestUtil.clientEchoTest(additionalClientOptions="--Ice.Default.EncodingVersion=1.0", - additionalServerOptions="--Ice.Default.EncodingVersion=1.0" + - " --Ice.Warn.Dispatch=0 --Ice.Warn.Connections=0") diff --git a/js/test/Ice/es5/facets/run.js b/js/test/Ice/es5/facets/run.js deleted file mode 100644 index a288c69ca80..00000000000 --- a/js/test/Ice/es5/facets/run.js +++ /dev/null @@ -1,12 +0,0 @@ -"use strict"; - -// ********************************************************************** -// -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -require("../../../Common/es5/Common").run(module); diff --git a/js/test/Ice/es5/facets/run.py b/js/test/Ice/es5/facets/run.py deleted file mode 100755 index 0f358870832..00000000000 --- a/js/test/Ice/es5/facets/run.py +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -TestUtil.clientServerTest() diff --git a/js/test/Ice/es5/facetsBidir/run.js b/js/test/Ice/es5/facetsBidir/run.js deleted file mode 100644 index a288c69ca80..00000000000 --- a/js/test/Ice/es5/facetsBidir/run.js +++ /dev/null @@ -1,12 +0,0 @@ -"use strict"; - -// ********************************************************************** -// -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -require("../../../Common/es5/Common").run(module); diff --git a/js/test/Ice/es5/facetsBidir/run.py b/js/test/Ice/es5/facetsBidir/run.py deleted file mode 100755 index ceff448049a..00000000000 --- a/js/test/Ice/es5/facetsBidir/run.py +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -TestUtil.clientEchoTest() diff --git a/js/test/Ice/es5/hold/run.js b/js/test/Ice/es5/hold/run.js deleted file mode 100644 index a288c69ca80..00000000000 --- a/js/test/Ice/es5/hold/run.js +++ /dev/null @@ -1,12 +0,0 @@ -"use strict"; - -// ********************************************************************** -// -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -require("../../../Common/es5/Common").run(module); diff --git a/js/test/Ice/es5/hold/run.py b/js/test/Ice/es5/hold/run.py deleted file mode 100755 index 53f97cc4b99..00000000000 --- a/js/test/Ice/es5/hold/run.py +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -TestUtil.clientServerTest() diff --git a/js/test/Ice/es5/info/run.js b/js/test/Ice/es5/info/run.js deleted file mode 100644 index 82c8656d3b0..00000000000 --- a/js/test/Ice/es5/info/run.js +++ /dev/null @@ -1,10 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -require("../../../Common/es5/Common").run(module); diff --git a/js/test/Ice/es5/info/run.py b/js/test/Ice/es5/info/run.py deleted file mode 100755 index 53f97cc4b99..00000000000 --- a/js/test/Ice/es5/info/run.py +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -TestUtil.clientServerTest() diff --git a/js/test/Ice/es5/inheritance/run.js b/js/test/Ice/es5/inheritance/run.js deleted file mode 100644 index a288c69ca80..00000000000 --- a/js/test/Ice/es5/inheritance/run.js +++ /dev/null @@ -1,12 +0,0 @@ -"use strict"; - -// ********************************************************************** -// -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -require("../../../Common/es5/Common").run(module); diff --git a/js/test/Ice/es5/inheritance/run.py b/js/test/Ice/es5/inheritance/run.py deleted file mode 100755 index 0f358870832..00000000000 --- a/js/test/Ice/es5/inheritance/run.py +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -TestUtil.clientServerTest() diff --git a/js/test/Ice/es5/inheritanceBidir/run.js b/js/test/Ice/es5/inheritanceBidir/run.js deleted file mode 100644 index a288c69ca80..00000000000 --- a/js/test/Ice/es5/inheritanceBidir/run.js +++ /dev/null @@ -1,12 +0,0 @@ -"use strict"; - -// ********************************************************************** -// -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -require("../../../Common/es5/Common").run(module); diff --git a/js/test/Ice/es5/inheritanceBidir/run.py b/js/test/Ice/es5/inheritanceBidir/run.py deleted file mode 100755 index ceff448049a..00000000000 --- a/js/test/Ice/es5/inheritanceBidir/run.py +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -TestUtil.clientEchoTest() diff --git a/js/test/Ice/es5/location/run.js b/js/test/Ice/es5/location/run.js deleted file mode 100644 index a288c69ca80..00000000000 --- a/js/test/Ice/es5/location/run.js +++ /dev/null @@ -1,12 +0,0 @@ -"use strict"; - -// ********************************************************************** -// -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -require("../../../Common/es5/Common").run(module); diff --git a/js/test/Ice/es5/location/run.py b/js/test/Ice/es5/location/run.py deleted file mode 100755 index 0f358870832..00000000000 --- a/js/test/Ice/es5/location/run.py +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -TestUtil.clientServerTest() diff --git a/js/test/Ice/es5/number/run.js b/js/test/Ice/es5/number/run.js deleted file mode 100644 index a288c69ca80..00000000000 --- a/js/test/Ice/es5/number/run.js +++ /dev/null @@ -1,12 +0,0 @@ -"use strict"; - -// ********************************************************************** -// -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -require("../../../Common/es5/Common").run(module); diff --git a/js/test/Ice/es5/number/run.py b/js/test/Ice/es5/number/run.py deleted file mode 100755 index b2a1b316881..00000000000 --- a/js/test/Ice/es5/number/run.py +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -TestUtil.simpleTest() diff --git a/js/test/Ice/es5/objects/run.js b/js/test/Ice/es5/objects/run.js deleted file mode 100644 index a288c69ca80..00000000000 --- a/js/test/Ice/es5/objects/run.js +++ /dev/null @@ -1,12 +0,0 @@ -"use strict"; - -// ********************************************************************** -// -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -require("../../../Common/es5/Common").run(module); diff --git a/js/test/Ice/es5/objects/run.py b/js/test/Ice/es5/objects/run.py deleted file mode 100755 index 7fc7ba63947..00000000000 --- a/js/test/Ice/es5/objects/run.py +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -print("Running test with compact (default) format.") -TestUtil.clientServerTest() - -print("Running test with sliced format.") -TestUtil.clientServerTest(additionalClientOptions="--Ice.Default.SlicedFormat", - additionalServerOptions="--Ice.Default.SlicedFormat") - -print("Running test with 1.0 encoding.") -TestUtil.clientServerTest(additionalClientOptions="--Ice.Default.EncodingVersion=1.0", - additionalServerOptions="--Ice.Default.EncodingVersion=1.0") diff --git a/js/test/Ice/es5/operations/run.js b/js/test/Ice/es5/operations/run.js deleted file mode 100644 index a288c69ca80..00000000000 --- a/js/test/Ice/es5/operations/run.js +++ /dev/null @@ -1,12 +0,0 @@ -"use strict"; - -// ********************************************************************** -// -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -require("../../../Common/es5/Common").run(module); diff --git a/js/test/Ice/es5/operations/run.py b/js/test/Ice/es5/operations/run.py deleted file mode 100755 index 92ecb40550d..00000000000 --- a/js/test/Ice/es5/operations/run.py +++ /dev/null @@ -1,27 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -print("tests with regular server.") -TestUtil.clientServerTest() -print("tests with AMD server.") -TestUtil.clientServerTest(server="serveramd") diff --git a/js/test/Ice/es5/operationsBidir/run.js b/js/test/Ice/es5/operationsBidir/run.js deleted file mode 100644 index a288c69ca80..00000000000 --- a/js/test/Ice/es5/operationsBidir/run.js +++ /dev/null @@ -1,12 +0,0 @@ -"use strict"; - -// ********************************************************************** -// -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -require("../../../Common/es5/Common").run(module); diff --git a/js/test/Ice/es5/operationsBidir/run.py b/js/test/Ice/es5/operationsBidir/run.py deleted file mode 100755 index 7dffdec6496..00000000000 --- a/js/test/Ice/es5/operationsBidir/run.py +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) - -operations = os.path.join(os.path.abspath(os.path.dirname(__file__)), "..", "operations") - -import TestUtil - -TestUtil.addPathToEnv("NODE_PATH", operations) -TestUtil.clientEchoTest() diff --git a/js/test/Ice/es5/optional/run.js b/js/test/Ice/es5/optional/run.js deleted file mode 100644 index a288c69ca80..00000000000 --- a/js/test/Ice/es5/optional/run.js +++ /dev/null @@ -1,12 +0,0 @@ -"use strict"; - -// ********************************************************************** -// -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -require("../../../Common/es5/Common").run(module); diff --git a/js/test/Ice/es5/optional/run.py b/js/test/Ice/es5/optional/run.py deleted file mode 100755 index 95f8e4badb7..00000000000 --- a/js/test/Ice/es5/optional/run.py +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -print("Running test with compact (default) format.") -TestUtil.clientServerTest() -print("Running test with sliced format.") -TestUtil.clientServerTest(additionalClientOptions="--Ice.Default.SlicedFormat", additionalServerOptions="--Ice.Default.SlicedFormat") diff --git a/js/test/Ice/es5/optionalBidir/run.js b/js/test/Ice/es5/optionalBidir/run.js deleted file mode 100644 index a288c69ca80..00000000000 --- a/js/test/Ice/es5/optionalBidir/run.js +++ /dev/null @@ -1,12 +0,0 @@ -"use strict"; - -// ********************************************************************** -// -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -require("../../../Common/es5/Common").run(module); diff --git a/js/test/Ice/es5/optionalBidir/run.py b/js/test/Ice/es5/optionalBidir/run.py deleted file mode 100755 index 1c6bcbb23f5..00000000000 --- a/js/test/Ice/es5/optionalBidir/run.py +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -print("Running test with compact (default) format.") -TestUtil.clientEchoTest() -print("Running test with sliced format.") -TestUtil.clientEchoTest(additionalClientOptions="--Ice.Default.SlicedFormat", additionalServerOptions="--Ice.Default.SlicedFormat") diff --git a/js/test/Ice/es5/properties/run.js b/js/test/Ice/es5/properties/run.js deleted file mode 100644 index a288c69ca80..00000000000 --- a/js/test/Ice/es5/properties/run.js +++ /dev/null @@ -1,12 +0,0 @@ -"use strict"; - -// ********************************************************************** -// -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -require("../../../Common/es5/Common").run(module); diff --git a/js/test/Ice/es5/properties/run.py b/js/test/Ice/es5/properties/run.py deleted file mode 100755 index b2a1b316881..00000000000 --- a/js/test/Ice/es5/properties/run.py +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -TestUtil.simpleTest() diff --git a/js/test/Ice/es5/proxy/run.js b/js/test/Ice/es5/proxy/run.js deleted file mode 100644 index a288c69ca80..00000000000 --- a/js/test/Ice/es5/proxy/run.js +++ /dev/null @@ -1,12 +0,0 @@ -"use strict"; - -// ********************************************************************** -// -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -require("../../../Common/es5/Common").run(module); diff --git a/js/test/Ice/es5/proxy/run.py b/js/test/Ice/es5/proxy/run.py deleted file mode 100755 index 92ecb40550d..00000000000 --- a/js/test/Ice/es5/proxy/run.py +++ /dev/null @@ -1,27 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -print("tests with regular server.") -TestUtil.clientServerTest() -print("tests with AMD server.") -TestUtil.clientServerTest(server="serveramd") diff --git a/js/test/Ice/es5/retry/run.js b/js/test/Ice/es5/retry/run.js deleted file mode 100644 index a288c69ca80..00000000000 --- a/js/test/Ice/es5/retry/run.js +++ /dev/null @@ -1,12 +0,0 @@ -"use strict"; - -// ********************************************************************** -// -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -require("../../../Common/es5/Common").run(module); diff --git a/js/test/Ice/es5/retry/run.py b/js/test/Ice/es5/retry/run.py deleted file mode 100755 index 53f97cc4b99..00000000000 --- a/js/test/Ice/es5/retry/run.py +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -TestUtil.clientServerTest() diff --git a/js/test/Ice/es5/slicing/exceptions/run.js b/js/test/Ice/es5/slicing/exceptions/run.js deleted file mode 100644 index e0fef9ed2f2..00000000000 --- a/js/test/Ice/es5/slicing/exceptions/run.js +++ /dev/null @@ -1,12 +0,0 @@ -"use strict"; - -// ********************************************************************** -// -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -require("../../../../Common/es5/Common").run(module); diff --git a/js/test/Ice/es5/slicing/exceptions/run.py b/js/test/Ice/es5/slicing/exceptions/run.py deleted file mode 100755 index 5e44d0f906d..00000000000 --- a/js/test/Ice/es5/slicing/exceptions/run.py +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -print("Running test with sliced format.") -TestUtil.clientServerTest() - -print("Running test with 1.0 encoding.") -TestUtil.clientServerTest(additionalClientOptions="--Ice.Default.EncodingVersion=1.0", - additionalServerOptions="--Ice.Default.EncodingVersion=1.0") diff --git a/js/test/Ice/es5/slicing/objects/run.js b/js/test/Ice/es5/slicing/objects/run.js deleted file mode 100644 index e0fef9ed2f2..00000000000 --- a/js/test/Ice/es5/slicing/objects/run.js +++ /dev/null @@ -1,12 +0,0 @@ -"use strict"; - -// ********************************************************************** -// -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -require("../../../../Common/es5/Common").run(module); diff --git a/js/test/Ice/es5/slicing/objects/run.py b/js/test/Ice/es5/slicing/objects/run.py deleted file mode 100755 index 5e44d0f906d..00000000000 --- a/js/test/Ice/es5/slicing/objects/run.py +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -print("Running test with sliced format.") -TestUtil.clientServerTest() - -print("Running test with 1.0 encoding.") -TestUtil.clientServerTest(additionalClientOptions="--Ice.Default.EncodingVersion=1.0", - additionalServerOptions="--Ice.Default.EncodingVersion=1.0") diff --git a/js/test/Ice/es5/timeout/run.js b/js/test/Ice/es5/timeout/run.js deleted file mode 100644 index a288c69ca80..00000000000 --- a/js/test/Ice/es5/timeout/run.js +++ /dev/null @@ -1,12 +0,0 @@ -"use strict"; - -// ********************************************************************** -// -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -require("../../../Common/es5/Common").run(module); diff --git a/js/test/Ice/es5/timeout/run.py b/js/test/Ice/es5/timeout/run.py deleted file mode 100755 index 53f97cc4b99..00000000000 --- a/js/test/Ice/es5/timeout/run.py +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -TestUtil.clientServerTest() diff --git a/js/test/Ice/exceptionsBidir/AMDThrowerI.js b/js/test/Ice/exceptions/AMDThrowerI.js index 0260adaa6b3..0260adaa6b3 100644 --- a/js/test/Ice/exceptionsBidir/AMDThrowerI.js +++ b/js/test/Ice/exceptions/AMDThrowerI.js diff --git a/js/test/Ice/exceptionsBidir/Client.js b/js/test/Ice/exceptions/ClientBidir.js index 8df9ed728dd..601437862a0 100644 --- a/js/test/Ice/exceptionsBidir/Client.js +++ b/js/test/Ice/exceptions/ClientBidir.js @@ -11,14 +11,12 @@ { var Ice = require("ice").Ice; var Test = require("Test").Test; - - var Promise = Ice.Promise; - - var Client = require("../exceptions/Client"); - + var Client = require("Client"); var ThrowerI = require("ThrowerI").ThrowerI; var AMDThrowerI = require("AMDThrowerI").AMDThrowerI; + var Promise = Ice.Promise; + var allTests = function(out, communicator, amd) { return Promise.try( @@ -95,8 +93,7 @@ } ); }; - exports.__test__ = run; - exports.__runEchoServer__ = true; + exports.__testBidir__ = run; exports.__runEchoServerOptions__ = ["Ice.Warn.Dispatch=0", "Ice.Warn.Connections=0"]; } (typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined, diff --git a/js/test/Ice/exceptions/Test.ice b/js/test/Ice/exceptions/Test.ice index ba079635bea..4e1fb6a9761 100644 --- a/js/test/Ice/exceptions/Test.ice +++ b/js/test/Ice/exceptions/Test.ice @@ -73,4 +73,11 @@ interface WrongOperation void noSuchOperation(); }; +interface Echo +{ + void startBatch(); + void flushBatch(); + void shutdown(); +}; + }; diff --git a/js/test/Ice/exceptionsBidir/ThrowerI.js b/js/test/Ice/exceptions/ThrowerI.js index 9d1a3492df7..9d1a3492df7 100644 --- a/js/test/Ice/exceptionsBidir/ThrowerI.js +++ b/js/test/Ice/exceptions/ThrowerI.js diff --git a/js/test/Ice/exceptions/run.py b/js/test/Ice/exceptions/run.py deleted file mode 100755 index c1354e11ce2..00000000000 --- a/js/test/Ice/exceptions/run.py +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -print("Running test with compact (default) format.") -TestUtil.clientServerTest() - -print("Running test with sliced format.") -TestUtil.clientServerTest(additionalClientOptions="--Ice.Default.SlicedFormat", - additionalServerOptions="--Ice.Default.SlicedFormat") - -print("Running test with 1.0 encoding.") -TestUtil.clientServerTest(additionalClientOptions="--Ice.Default.EncodingVersion=1.0", - additionalServerOptions="--Ice.Default.EncodingVersion=1.0") - -print("Running test with compact (default) format and AMD server.") -TestUtil.clientServerTest(server="serveramd") - -print("Running test with sliced format and AMD server.") -TestUtil.clientServerTest(server="serveramd", - additionalClientOptions="--Ice.Default.SlicedFormat", - additionalServerOptions="--Ice.Default.SlicedFormat") - -print("Running test with 1.0 encoding and AMD server.") -TestUtil.clientServerTest(server="serveramd", - additionalClientOptions="--Ice.Default.EncodingVersion=1.0", - additionalServerOptions="--Ice.Default.EncodingVersion=1.0") diff --git a/js/test/Ice/exceptionsBidir/.gitignore b/js/test/Ice/exceptionsBidir/.gitignore deleted file mode 100644 index 4b74460eef7..00000000000 --- a/js/test/Ice/exceptionsBidir/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -Test.js -TestAMD.js -index.html diff --git a/js/test/Ice/exceptionsBidir/Test.ice b/js/test/Ice/exceptionsBidir/Test.ice deleted file mode 100644 index 4e1fb6a9761..00000000000 --- a/js/test/Ice/exceptionsBidir/Test.ice +++ /dev/null @@ -1,83 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#pragma once - -#include <Ice/BuiltinSequences.ice> - -module Test -{ - -interface Empty -{ -}; - -interface Thrower; - -exception A -{ - int aMem; -}; - -exception B extends A -{ - int bMem; -}; - -exception C extends B -{ - int cMem; -}; - -exception D -{ - int dMem; -}; - -interface Thrower -{ - void shutdown(); - bool supportsUndeclaredExceptions(); - bool supportsAssertException(); - - void throwAasA(int a) throws A; - void throwAorDasAorD(int a) throws A, D; - void throwBasA(int a, int b) throws A; - void throwCasA(int a, int b, int c) throws A; - void throwBasB(int a, int b) throws B; - void throwCasB(int a, int b, int c) throws B; - void throwCasC(int a, int b, int c) throws C; - - void throwUndeclaredA(int a); - void throwUndeclaredB(int a, int b); - void throwUndeclaredC(int a, int b, int c); - void throwLocalException(); - void throwNonIceException(); - void throwAssertException(); - Ice::ByteSeq throwMemoryLimitException(Ice::ByteSeq seq); - - idempotent void throwLocalExceptionIdempotent(); - - void throwAfterResponse(); - void throwAfterException() throws A; -}; - -interface WrongOperation -{ - void noSuchOperation(); -}; - -interface Echo -{ - void startBatch(); - void flushBatch(); - void shutdown(); -}; - -}; diff --git a/js/test/Ice/exceptionsBidir/run.js b/js/test/Ice/exceptionsBidir/run.js deleted file mode 100644 index fc8c9a16e7c..00000000000 --- a/js/test/Ice/exceptionsBidir/run.js +++ /dev/null @@ -1,10 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -require("../../Common/Common").run(module); diff --git a/js/test/Ice/exceptionsBidir/run.py b/js/test/Ice/exceptionsBidir/run.py deleted file mode 100755 index 4a18001ae76..00000000000 --- a/js/test/Ice/exceptionsBidir/run.py +++ /dev/null @@ -1,34 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -print("Running test with compact (default) format.") -TestUtil.clientEchoTest(additionalServerOptions="--Ice.Warn.Dispatch=0 --Ice.Warn.Connections=0") - -print("Running test with sliced format.") -TestUtil.clientEchoTest(additionalClientOptions="--Ice.Default.SlicedFormat", - additionalServerOptions="--Ice.Default.SlicedFormat" + - " --Ice.Warn.Dispatch=0 --Ice.Warn.Connections=0") - -print("Running test with 1.0 encoding.") -TestUtil.clientEchoTest(additionalClientOptions="--Ice.Default.EncodingVersion=1.0", - additionalServerOptions="--Ice.Default.EncodingVersion=1.0" + - " --Ice.Warn.Dispatch=0 --Ice.Warn.Connections=0") diff --git a/js/test/Ice/facetsBidir/Client.js b/js/test/Ice/facets/ClientBidir.js index 296e3eb4590..3741b6f59d5 100644 --- a/js/test/Ice/facetsBidir/Client.js +++ b/js/test/Ice/facets/ClientBidir.js @@ -11,9 +11,7 @@ { var Ice = require("ice").Ice; var Test = require("Test").Test; - - var Client = require("../facets/Client"); - + var Client = require("Client"); var TestI = require("TestI"); var Promise = Ice.Promise; @@ -165,8 +163,7 @@ } ); }; - exports.__test__ = run; - exports.__runEchoServer__ = true; + exports.__testBidir__ = run; } (typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined, typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice.__require, diff --git a/js/test/Ice/facets/Test.ice b/js/test/Ice/facets/Test.ice index 62d52fe2381..1f50f2e4a2a 100644 --- a/js/test/Ice/facets/Test.ice +++ b/js/test/Ice/facets/Test.ice @@ -57,5 +57,12 @@ interface H extends G string callH(); }; +interface Echo +{ + void startBatch(); + void flushBatch(); + void shutdown(); +}; + }; diff --git a/js/test/Ice/facetsBidir/TestI.js b/js/test/Ice/facets/TestI.js index 90cf8a4fc8c..90cf8a4fc8c 100644 --- a/js/test/Ice/facetsBidir/TestI.js +++ b/js/test/Ice/facets/TestI.js diff --git a/js/test/Ice/facets/run.py b/js/test/Ice/facets/run.py deleted file mode 100755 index 3fc6200cd00..00000000000 --- a/js/test/Ice/facets/run.py +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -TestUtil.clientServerTest() diff --git a/js/test/Ice/facetsBidir/.gitignore b/js/test/Ice/facetsBidir/.gitignore deleted file mode 100644 index d158d9308ba..00000000000 --- a/js/test/Ice/facetsBidir/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -Test.js -index.html diff --git a/js/test/Ice/facetsBidir/Test.ice b/js/test/Ice/facetsBidir/Test.ice deleted file mode 100644 index 818c2ba878b..00000000000 --- a/js/test/Ice/facetsBidir/Test.ice +++ /dev/null @@ -1,67 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#pragma once - -module Test -{ - -interface Empty -{ -}; - -interface A -{ - string callA(); -}; - -interface B extends A -{ - string callB(); -}; - -interface C extends A -{ - string callC(); -}; - -interface D extends B, C -{ - string callD(); -}; - -interface E -{ - string callE(); -}; - -interface F extends E -{ - string callF(); -}; - -interface G -{ - void shutdown(); - string callG(); -}; - -interface H extends G -{ - string callH(); -}; - -interface Echo -{ - void startBatch(); - void flushBatch(); - void shutdown(); -}; - -}; diff --git a/js/test/Ice/facetsBidir/run.js b/js/test/Ice/facetsBidir/run.js deleted file mode 100644 index fc8c9a16e7c..00000000000 --- a/js/test/Ice/facetsBidir/run.js +++ /dev/null @@ -1,10 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -require("../../Common/Common").run(module); diff --git a/js/test/Ice/facetsBidir/run.py b/js/test/Ice/facetsBidir/run.py deleted file mode 100755 index 2647019ee91..00000000000 --- a/js/test/Ice/facetsBidir/run.py +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -TestUtil.clientEchoTest() diff --git a/js/test/Ice/hold/run.py b/js/test/Ice/hold/run.py deleted file mode 100755 index ea7ce7ad721..00000000000 --- a/js/test/Ice/hold/run.py +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -TestUtil.clientServerTest() diff --git a/js/test/Ice/import/run.py b/js/test/Ice/import/run.py deleted file mode 100755 index 286e60351b6..00000000000 --- a/js/test/Ice/import/run.py +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -TestUtil.simpleTest() diff --git a/js/test/Ice/info/run.py b/js/test/Ice/info/run.py deleted file mode 100755 index ea7ce7ad721..00000000000 --- a/js/test/Ice/info/run.py +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -TestUtil.clientServerTest() diff --git a/js/test/Ice/inheritanceBidir/Client.js b/js/test/Ice/inheritance/ClientBidir.js index 1b39fb22b1b..b06209be418 100644 --- a/js/test/Ice/inheritanceBidir/Client.js +++ b/js/test/Ice/inheritance/ClientBidir.js @@ -12,7 +12,7 @@ var Ice = require("ice").Ice; var Test = require("Test").Test; var InitialI = require("InitialI").InitialI; - var Client = require("../inheritance/Client"); + var Client = require("Client"); var Promise = Ice.Promise; @@ -68,8 +68,7 @@ } ); }; - exports.__test__ = run; - exports.__runEchoServer__ = true; + exports.__testBidir__ = run; } (typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined, typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice.__require, diff --git a/js/test/Ice/inheritanceBidir/InitialI.js b/js/test/Ice/inheritance/InitialI.js index d373cec8008..d373cec8008 100644 --- a/js/test/Ice/inheritanceBidir/InitialI.js +++ b/js/test/Ice/inheritance/InitialI.js diff --git a/js/test/Ice/inheritance/Test.ice b/js/test/Ice/inheritance/Test.ice index b563c607a49..7be1091796e 100644 --- a/js/test/Ice/inheritance/Test.ice +++ b/js/test/Ice/inheritance/Test.ice @@ -231,4 +231,11 @@ class D extends C }; +interface Echo +{ + void startBatch(); + void flushBatch(); + void shutdown(); +}; + }; diff --git a/js/test/Ice/inheritance/run.py b/js/test/Ice/inheritance/run.py deleted file mode 100755 index 3fc6200cd00..00000000000 --- a/js/test/Ice/inheritance/run.py +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -TestUtil.clientServerTest() diff --git a/js/test/Ice/inheritanceBidir/.gitignore b/js/test/Ice/inheritanceBidir/.gitignore deleted file mode 100644 index d158d9308ba..00000000000 --- a/js/test/Ice/inheritanceBidir/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -Test.js -index.html diff --git a/js/test/Ice/inheritanceBidir/Test.ice b/js/test/Ice/inheritanceBidir/Test.ice deleted file mode 100644 index 7be1091796e..00000000000 --- a/js/test/Ice/inheritanceBidir/Test.ice +++ /dev/null @@ -1,241 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#pragma once - -module Test -{ - -module MA -{ - -interface IA -{ - IA* iaop(IA* p); -}; - -class CA -{ - CA* caop(CA* p); -}; - -}; - -module MB -{ - -interface IB1 extends MA::IA -{ - IB1* ib1op(IB1* p); -}; - -interface IB2 extends MA::IA -{ - IB2* ib2op(IB2* p); -}; - -class CB extends MA::CA -{ - CB* cbop(CB* p); -}; - -}; - -module MA -{ - -interface IC extends MB::IB1, MB::IB2 -{ - IC* icop(IC* p); -}; - -class CC extends MB::CB -{ - CC* ccop(CC* p); -}; - -class CD extends CC implements MB::IB1, MB::IB2 -{ - CD* cdop(CD* p); -}; - -}; - -interface Initial -{ - void shutdown(); - MA::CA* caop(); - MB::CB* cbop(); - MA::CC* ccop(); - MA::CD* cdop(); - MA::IA* iaop(); - MB::IB1* ib1op(); - MB::IB2* ib2op(); - MA::IC* icop(); -}; - - -module MC -{ - -class A -{ - int aA; -}; - -class B extends A -{ - int bB; -}; - -class C extends B -{ - int cC; -}; - -class D extends C -{ - int dD; -}; - -}; - -module MD -{ - -class A -{ - int aA; -}; - -class B extends A -{ - int bB; -}; - -class C extends B -{ - int cC; -}; - -class D extends C -{ - int dD; -}; - -}; - -module ME -{ - -class A -{ - int aA; -}; - -class B extends A -{ - int bB; -}; - -class C extends B -{ - int cC; -}; - -class D extends C -{ - int dD; -}; - -}; - -module MF -{ - -class A -{ - int aA; -}; - -class B extends A -{ - int bB; -}; - -class C extends B -{ - int cC; -}; - -class D extends C -{ - int dD; -}; - -}; - -module MG -{ - -class A -{ - int aA; -}; - -class B extends A -{ - int bB; -}; - -class C extends B -{ - int cC; -}; - -class D extends C -{ - int dD; -}; - -}; - -module MH -{ - -class A -{ - int aA; -}; - -class B extends A -{ - int bB; -}; - -class C extends B -{ - int cC; -}; - -class D extends C -{ - int dD; -}; - -}; - -interface Echo -{ - void startBatch(); - void flushBatch(); - void shutdown(); -}; - -}; diff --git a/js/test/Ice/inheritanceBidir/run.js b/js/test/Ice/inheritanceBidir/run.js deleted file mode 100644 index fc8c9a16e7c..00000000000 --- a/js/test/Ice/inheritanceBidir/run.js +++ /dev/null @@ -1,10 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -require("../../Common/Common").run(module); diff --git a/js/test/Ice/inheritanceBidir/run.py b/js/test/Ice/inheritanceBidir/run.py deleted file mode 100755 index 2647019ee91..00000000000 --- a/js/test/Ice/inheritanceBidir/run.py +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -TestUtil.clientEchoTest() diff --git a/js/test/Ice/location/run.py b/js/test/Ice/location/run.py deleted file mode 100755 index 3fc6200cd00..00000000000 --- a/js/test/Ice/location/run.py +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -TestUtil.clientServerTest() diff --git a/js/test/Ice/number/run.py b/js/test/Ice/number/run.py deleted file mode 100755 index 286e60351b6..00000000000 --- a/js/test/Ice/number/run.py +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -TestUtil.simpleTest() diff --git a/js/test/Ice/objects/run.py b/js/test/Ice/objects/run.py deleted file mode 100755 index 1361b69d666..00000000000 --- a/js/test/Ice/objects/run.py +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -print("Running test with compact (default) format.") -TestUtil.clientServerTest() - -print("Running test with sliced format.") -TestUtil.clientServerTest(additionalClientOptions="--Ice.Default.SlicedFormat", - additionalServerOptions="--Ice.Default.SlicedFormat") - -print("Running test with 1.0 encoding.") -TestUtil.clientServerTest(additionalClientOptions="--Ice.Default.EncodingVersion=1.0", - additionalServerOptions="--Ice.Default.EncodingVersion=1.0") diff --git a/js/test/Ice/operationsBidir/AMDMyDerivedClassI.js b/js/test/Ice/operations/AMDMyDerivedClassI.js index dfc905c6d2c..dfc905c6d2c 100644 --- a/js/test/Ice/operationsBidir/AMDMyDerivedClassI.js +++ b/js/test/Ice/operations/AMDMyDerivedClassI.js diff --git a/js/test/Ice/operationsBidir/Client.js b/js/test/Ice/operations/ClientBidir.js index 93cb534711a..0ed0a1c14c8 100644 --- a/js/test/Ice/operationsBidir/Client.js +++ b/js/test/Ice/operations/ClientBidir.js @@ -13,7 +13,7 @@ var Test = require("Test").Test; var MyDerivedClassI = require("MyDerivedClassI").MyDerivedClassI; var AMDMyDerivedClassI = require("AMDMyDerivedClassI").AMDMyDerivedClassI; - var Client = require("../operations/Client.js"); + var Client = require("Client.js"); var Promise = Ice.Promise; @@ -63,8 +63,7 @@ ).then(prx => prx.shutdown() ).finally(() => communicator.destroy()); }; - exports.__test__ = run; - exports.__runEchoServer__ = true; + exports.__testBidir__ = run; } (typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined, typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice.__require, diff --git a/js/test/Ice/operationsBidir/MyDerivedClassI.js b/js/test/Ice/operations/MyDerivedClassI.js index a061a1a1dd2..a061a1a1dd2 100644 --- a/js/test/Ice/operationsBidir/MyDerivedClassI.js +++ b/js/test/Ice/operations/MyDerivedClassI.js diff --git a/js/test/Ice/operations/Test.ice b/js/test/Ice/operations/Test.ice index 290988d09a4..81caced8a0a 100644 --- a/js/test/Ice/operations/Test.ice +++ b/js/test/Ice/operations/Test.ice @@ -280,6 +280,13 @@ class MyDerivedClass extends MyClass MyStruct1 opMyStruct1(MyStruct1 opMyStruct1); }; +interface Echo +{ + void startBatch(); + void flushBatch(); + void shutdown(); +}; + // // String literals // diff --git a/js/test/Ice/operations/run.py b/js/test/Ice/operations/run.py deleted file mode 100755 index 0d7ea279a91..00000000000 --- a/js/test/Ice/operations/run.py +++ /dev/null @@ -1,27 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -print("tests with regular server.") -TestUtil.clientServerTest() -print("tests with AMD server.") -TestUtil.clientServerTest(server="serveramd") diff --git a/js/test/Ice/operationsBidir/.gitignore b/js/test/Ice/operationsBidir/.gitignore deleted file mode 100644 index 4b74460eef7..00000000000 --- a/js/test/Ice/operationsBidir/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -Test.js -TestAMD.js -index.html diff --git a/js/test/Ice/operationsBidir/Test.ice b/js/test/Ice/operationsBidir/Test.ice deleted file mode 100644 index d944e4c962d..00000000000 --- a/js/test/Ice/operationsBidir/Test.ice +++ /dev/null @@ -1,360 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#pragma once - -#include <Ice/Current.ice> - -module Test -{ - -enum MyEnum -{ - enum1, - enum2, - enum3 -}; - -class MyClass; - -struct AnotherStruct -{ - string s; -}; - -struct Structure -{ - MyClass* p; - MyEnum e; - AnotherStruct s; -}; - -sequence<byte> ByteS; -sequence<bool> BoolS; -sequence<short> ShortS; -sequence<int> IntS; -sequence<long> LongS; -sequence<float> FloatS; -sequence<double> DoubleS; -sequence<string> StringS; -sequence<MyEnum> MyEnumS; -sequence<MyClass*> MyClassS; - -sequence<ByteS> ByteSS; -sequence<BoolS> BoolSS; -sequence<ShortS> ShortSS; -sequence<IntS> IntSS; -sequence<LongS> LongSS; -sequence<FloatS> FloatSS; -sequence<DoubleS> DoubleSS; -sequence<StringS> StringSS; -sequence<MyEnumS> MyEnumSS; -sequence<MyClassS> MyClassSS; - -sequence<StringSS> StringSSS; - -struct MyStruct -{ - int i; - int j; -}; - -dictionary<byte, bool> ByteBoolD; -dictionary<short, int> ShortIntD; -dictionary<long, float> LongFloatD; -dictionary<string, string> StringStringD; -dictionary<string, MyEnum> StringMyEnumD; -dictionary<MyEnum, string> MyEnumStringD; -dictionary<MyStruct, MyEnum> MyStructMyEnumD; - -sequence<ByteBoolD> ByteBoolDS; -sequence<ShortIntD> ShortIntDS; -sequence<LongFloatD> LongFloatDS; -sequence<StringStringD> StringStringDS; -sequence<StringMyEnumD> StringMyEnumDS; -sequence<MyEnumStringD> MyEnumStringDS; -sequence<MyStructMyEnumD> MyStructMyEnumDS; - -dictionary<byte, ByteS> ByteByteSD; -dictionary<bool, BoolS> BoolBoolSD; -dictionary<short, ShortS> ShortShortSD; -dictionary<int, IntS> IntIntSD; -dictionary<long, LongS> LongLongSD; -dictionary<string, FloatS> StringFloatSD; -dictionary<string, DoubleS> StringDoubleSD; -dictionary<string, StringS> StringStringSD; -dictionary<MyEnum, MyEnumS> MyEnumMyEnumSD; - -class MyClass -{ - void shutdown(); - - ["amd"] void delay(int ms); - - void opVoid(); - - byte opByte(byte p1, byte p2, - out byte p3); - - bool opBool(bool p1, bool p2, - out bool p3); - - long opShortIntLong(short p1, int p2, long p3, - out short p4, out int p5, out long p6); - - double opFloatDouble(float p1, double p2, - out float p3, out double p4); - - string opString(string p1, string p2, - out string p3); - - MyEnum opMyEnum(MyEnum p1, out MyEnum p2); - - MyClass* opMyClass(MyClass* p1, out MyClass* p2, out MyClass* p3); - - Structure opStruct(Structure p1, Structure p2, - out Structure p3); - - ByteS opByteS(ByteS p1, ByteS p2, - out ByteS p3); - - BoolS opBoolS(BoolS p1, BoolS p2, - out BoolS p3); - - LongS opShortIntLongS(Test::ShortS p1, IntS p2, LongS p3, - out ::Test::ShortS p4, out IntS p5, out LongS p6); - - DoubleS opFloatDoubleS(FloatS p1, DoubleS p2, - out FloatS p3, out DoubleS p4); - - StringS opStringS(StringS p1, StringS p2, - out StringS p3); - - ByteSS opByteSS(ByteSS p1, ByteSS p2, - out ByteSS p3); - - BoolSS opBoolSS(BoolSS p1, BoolSS p2, - out BoolSS p3); - - LongSS opShortIntLongSS(ShortSS p1, IntSS p2, LongSS p3, - out ShortSS p4, out IntSS p5, out LongSS p6); - - - DoubleSS opFloatDoubleSS(FloatSS p1, DoubleSS p2, - out FloatSS p3, out DoubleSS p4); - - StringSS opStringSS(StringSS p1, StringSS p2, - out StringSS p3); - - StringSSS opStringSSS(StringSSS p1, StringSSS p2, - out StringSSS p3); - - ByteBoolD opByteBoolD(ByteBoolD p1, ByteBoolD p2, - out ByteBoolD p3); - - ShortIntD opShortIntD(ShortIntD p1, ShortIntD p2, - out ShortIntD p3); - - LongFloatD opLongFloatD(LongFloatD p1, LongFloatD p2, - out LongFloatD p3); - - StringStringD opStringStringD(StringStringD p1, StringStringD p2, - out StringStringD p3); - - StringMyEnumD opStringMyEnumD(StringMyEnumD p1, StringMyEnumD p2, - out StringMyEnumD p3); - - MyEnumStringD opMyEnumStringD(MyEnumStringD p1, MyEnumStringD p2, - out MyEnumStringD p3); - - MyStructMyEnumD opMyStructMyEnumD(MyStructMyEnumD p1, MyStructMyEnumD p2, - out MyStructMyEnumD p3); - - ByteBoolDS opByteBoolDS(ByteBoolDS p1, ByteBoolDS p2, - out ByteBoolDS p3); - - ShortIntDS opShortIntDS(ShortIntDS p1, ShortIntDS p2, - out ShortIntDS p3); - - LongFloatDS opLongFloatDS(LongFloatDS p1, LongFloatDS p2, - out LongFloatDS p3); - - StringStringDS opStringStringDS(StringStringDS p1, StringStringDS p2, - out StringStringDS p3); - - StringMyEnumDS opStringMyEnumDS(StringMyEnumDS p1, StringMyEnumDS p2, - out StringMyEnumDS p3); - - MyEnumStringDS opMyEnumStringDS(MyEnumStringDS p1, MyEnumStringDS p2, - out MyEnumStringDS p3); - - MyStructMyEnumDS opMyStructMyEnumDS(MyStructMyEnumDS p1, MyStructMyEnumDS p2, - out MyStructMyEnumDS p3); - - ByteByteSD opByteByteSD(ByteByteSD p1, ByteByteSD p2, - out ByteByteSD p3); - - BoolBoolSD opBoolBoolSD(BoolBoolSD p1, BoolBoolSD p2, - out BoolBoolSD p3); - - ShortShortSD opShortShortSD(ShortShortSD p1, ShortShortSD p2, - out ShortShortSD p3); - - IntIntSD opIntIntSD(IntIntSD p1, IntIntSD p2, - out IntIntSD p3); - - LongLongSD opLongLongSD(LongLongSD p1, LongLongSD p2, - out LongLongSD p3); - - StringFloatSD opStringFloatSD(StringFloatSD p1, StringFloatSD p2, - out StringFloatSD p3); - - StringDoubleSD opStringDoubleSD(StringDoubleSD p1, StringDoubleSD p2, - out StringDoubleSD p3); - - StringStringSD opStringStringSD(StringStringSD p1, StringStringSD p2, - out StringStringSD p3); - - MyEnumMyEnumSD opMyEnumMyEnumSD(MyEnumMyEnumSD p1, MyEnumMyEnumSD p2, - out MyEnumMyEnumSD p3); - - IntS opIntS(IntS s); - - void opByteSOneway(ByteS s); - int opByteSOnewayCallCount(); - - Ice::Context opContext(); - - void opDoubleMarshaling(double p1, DoubleS p2); - - idempotent void opIdempotent(); - - ["nonmutating"] idempotent void opNonmutating(); - - byte opByte1(byte opByte1); - short opShort1(short opShort1); - int opInt1(int opInt1); - long opLong1(long opLong1); - float opFloat1(float opFloat1); - double opDouble1(double opDouble1); - string opString1(string opString1); - StringS opStringS1(StringS opStringS1); - ByteBoolD opByteBoolD1(ByteBoolD opByteBoolD1); - StringS opStringS2(StringS stringS); - ByteBoolD opByteBoolD2(ByteBoolD byteBoolD); - - StringS opStringLiterals(); - - ["marshaled-result"] Structure opMStruct1(); - ["marshaled-result"] Structure opMStruct2(Structure p1, out Structure p2); - - ["marshaled-result"] StringS opMSeq1(); - ["marshaled-result"] StringS opMSeq2(StringS p1, out StringS p2); - - ["marshaled-result"] StringStringD opMDict1(); - ["marshaled-result"] StringStringD opMDict2(StringStringD p1, out StringStringD p2); -}; - -struct MyStruct1 -{ - string tesT; // Same name as the enclosing module - MyClass myClass; // Same name as an already defined class - string myStruct1; // Same name as the enclosing struct -}; - -class MyClass1 -{ - string tesT; // Same name as the enclosing module - MyClass myClass; // Same name as an already defined class - string myClass1; // Same name as the enclosing class -}; - -class MyDerivedClass extends MyClass -{ - void opDerived(); - MyClass1 opMyClass1(MyClass1 opMyClass1); - MyStruct1 opMyStruct1(MyStruct1 opMyStruct1); -}; - -interface Echo -{ - void startBatch(); - void flushBatch(); - void shutdown(); -}; - -// -// String literals -// - -const string s0 = "\u005c"; // backslash -const string s1 = "\u0041"; // A -const string s2 = "\u0049\u0063\u0065"; // Ice -const string s3 = "\u004121"; // A21 -const string s4 = "\\u0041 \\U00000041"; // \\u0041 \\U00000041 -const string s5 = "\u00FF"; // ÿ -const string s6 = "\u03FF"; // GREEK CAPITAL REVERSED DOTTED LUNATE SIGMA SYMBOL (U+03FF) -const string s7 = "\u05F0"; // HEBREW LIGATURE YIDDISH DOUBLE VAV (U+05F0) -const string s8 = "\U00010000"; // LINEAR B SYLLABLE B008 A (U+10000) -const string s9 = "\U0001F34C"; // BANANA (U+1F34C) -const string s10 = "\u0DA7"; // Sinhala Letter Alpapraana Ttayanna - -const string sw0 = "\U0000005c"; // backslash -const string sw1 = "\U00000041"; // A -const string sw2 = "\U00000049\U00000063\U00000065"; // Ice -const string sw3 = "\U0000004121"; // A21 -const string sw4 = "\\u0041 \\U00000041"; // \\u0041 \\U00000041 -const string sw5 = "\U000000FF"; // ÿ -const string sw6 = "\U000003FF"; // GREEK CAPITAL REVERSED DOTTED LUNATE SIGMA SYMBOL (U+03FF) -const string sw7 = "\U000005F0"; // HEBREW LIGATURE YIDDISH DOUBLE VAV (U+05F0) -const string sw8 = "\U00010000"; // LINEAR B SYLLABLE B008 A (U+10000) -const string sw9 = "\U0001F34C"; // BANANA (U+1F34C) -const string sw10 = "\U00000DA7"; // Sinhala Letter Alpapraana Ttayanna - -/** -\' single quote byte 0x27 in ASCII encoding -\" double quote byte 0x22 in ASCII encoding -\? question mark byte 0x3f in ASCII encoding -\\ backslash byte 0x5c in ASCII encoding -\a audible bell byte 0x07 in ASCII encoding -\b backspace byte 0x08 in ASCII encoding -\f form feed - new page byte 0x0c in ASCII encoding -\n line feed - new line byte 0x0a in ASCII encoding -\r carriage return byte 0x0d in ASCII encoding -\t horizontal tab byte 0x09 in ASCII encoding -\v vertical tab byte 0x0b in ASCII encoding -**/ - -const string ss0 = "\'\"\?\\\a\b\f\n\r\t\v\6"; -const string ss1 = "\u0027\u0022\u003f\u005c\u0007\u0008\u000c\u000a\u000d\u0009\u000b\u0006"; -const string ss2 = "\U00000027\U00000022\U0000003f\U0000005c\U00000007\U00000008\U0000000c\U0000000a\U0000000d\U00000009\U0000000b\U00000006"; - -const string ss3 = "\\\\U\\u\\"; /* \\U\u\ */ -const string ss4 = "\\\u0041\\"; /* \A\ */ -const string ss5 = "\\u0041\\"; /* \u0041\ */ - -// -// Ĩ - Unicode Character 'LATIN CAPITAL LETTER I WITH TILDE' (U+0128) -// Ÿ - Unicode Character 'LATIN CAPITAL LETTER Y WITH DIAERESIS' (U+0178) -// ÿ - Unicode Character 'LATIN SMALL LETTER Y WITH DIAERESIS' (U+00FF) -// Ā - Unicode Character 'LATIN CAPITAL LETTER A WITH MACRON' (U+0100) -// ἀ - Unicode Character 'GREEK SMALL LETTER ALPHA WITH PSILI' (U+1F00) -// 𐆔 - Unicode Character 'ROMAN DIMIDIA SEXTULA SIGN' (U+10194) -// 𐅪 - Unicode Character 'GREEK ACROPHONIC THESPIAN ONE HUNDRED' (U+1016A) -// 𐆘 - Unicode Character 'ROMAN SESTERTIUS SIGN' (U+10198) -// 🍀 - Unicode Character 'FOUR LEAF CLOVER' (U+1F340) -// 🍁 - Unicode Character 'MAPLE LEAF' (U+1F341) -// 🍂 - Unicode Character 'FALLEN LEAF' (U+1F342) -// 🍃 - Unicode Character 'LEAF FLUTTERING IN WIND' (U+1F343) -// -const string su0 = "ĨŸÿĀἀ𐆔𐅪𐆘🍀🍁🍂🍃"; -const string su1 = "\u0128\u0178\u00FF\u0100\u1F00\U00010194\U0001016A\U00010198\U0001F340\U0001F341\U0001F342\U0001F343"; -const string su2 = "\U00000128\U00000178\U000000FF\U00000100\U00001F00\U00010194\U0001016A\U00010198\U0001F340\U0001F341\U0001F342\U0001F343"; - -}; diff --git a/js/test/Ice/operationsBidir/run.js b/js/test/Ice/operationsBidir/run.js deleted file mode 100644 index fc8c9a16e7c..00000000000 --- a/js/test/Ice/operationsBidir/run.js +++ /dev/null @@ -1,10 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -require("../../Common/Common").run(module); diff --git a/js/test/Ice/operationsBidir/run.py b/js/test/Ice/operationsBidir/run.py deleted file mode 100755 index 5b8edd102aa..00000000000 --- a/js/test/Ice/operationsBidir/run.py +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) - -operations = os.path.join(os.path.abspath(os.path.dirname(__file__)), "..", "operations") - -import TestUtil - -TestUtil.addPathToEnv("NODE_PATH", operations) -TestUtil.clientEchoTest() diff --git a/js/test/Ice/optionalBidir/AMDInitialI.js b/js/test/Ice/optional/AMDInitialI.js index c86014914e2..c86014914e2 100644 --- a/js/test/Ice/optionalBidir/AMDInitialI.js +++ b/js/test/Ice/optional/AMDInitialI.js diff --git a/js/test/Ice/optionalBidir/Client.js b/js/test/Ice/optional/ClientBidir.js index ae9c478c503..92ad845369d 100644 --- a/js/test/Ice/optionalBidir/Client.js +++ b/js/test/Ice/optional/ClientBidir.js @@ -13,7 +13,7 @@ var Test = require("Test").Test; var InitialI = require("InitialI").InitialI; var AMDInitialI = require("AMDInitialI").AMDInitialI; - var Client = require("../optional/Client"); + var Client = require("Client"); var Promise = Ice.Promise; var ArrayUtil = Ice.ArrayUtil; @@ -76,8 +76,7 @@ } }); }; - exports.__test__ = run; - exports.__runEchoServer__ = true; + exports.__testBidir__ = run; } (typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined, typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice.__require, diff --git a/js/test/Ice/optionalBidir/InitialI.js b/js/test/Ice/optional/InitialI.js index 99b326a45bd..99b326a45bd 100644 --- a/js/test/Ice/optionalBidir/InitialI.js +++ b/js/test/Ice/optional/InitialI.js diff --git a/js/test/Ice/optional/Test.ice b/js/test/Ice/optional/Test.ice index c527ba9e0f9..1822644faad 100644 --- a/js/test/Ice/optional/Test.ice +++ b/js/test/Ice/optional/Test.ice @@ -301,4 +301,11 @@ class Initial bool supportsNullOptional(); }; +interface Echo +{ + void startBatch(); + void flushBatch(); + void shutdown(); +}; + }; diff --git a/js/test/Ice/optional/run.py b/js/test/Ice/optional/run.py deleted file mode 100755 index 95f8e4badb7..00000000000 --- a/js/test/Ice/optional/run.py +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -print("Running test with compact (default) format.") -TestUtil.clientServerTest() -print("Running test with sliced format.") -TestUtil.clientServerTest(additionalClientOptions="--Ice.Default.SlicedFormat", additionalServerOptions="--Ice.Default.SlicedFormat") diff --git a/js/test/Ice/optionalBidir/.gitignore b/js/test/Ice/optionalBidir/.gitignore deleted file mode 100644 index 4b74460eef7..00000000000 --- a/js/test/Ice/optionalBidir/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -Test.js -TestAMD.js -index.html diff --git a/js/test/Ice/optionalBidir/Test.ice b/js/test/Ice/optionalBidir/Test.ice deleted file mode 100644 index 02d39135380..00000000000 --- a/js/test/Ice/optionalBidir/Test.ice +++ /dev/null @@ -1,309 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#pragma once - -module Test -{ - -class OneOptional -{ - optional(1) int a; -}; - -enum MyEnum -{ - MyEnumMember -}; - -struct SmallStruct -{ - byte m; -}; - -struct FixedStruct -{ - int m; -}; - -struct VarStruct -{ - string m; -}; - -struct ClassVarStruct -{ - int a; -}; - -sequence<byte> ByteSeq; -sequence<bool> BoolSeq; -sequence<short> ShortSeq; -sequence<int> IntSeq; -sequence<long> LongSeq; -sequence<float> FloatSeq; -sequence<double> DoubleSeq; -sequence<string> StringSeq; -sequence<MyEnum> MyEnumSeq; -sequence<SmallStruct> SmallStructSeq; -sequence<SmallStruct> SmallStructList; -sequence<FixedStruct> FixedStructSeq; -sequence<FixedStruct> FixedStructList; -sequence<VarStruct> VarStructSeq; -sequence<OneOptional> OneOptionalSeq; -sequence<OneOptional*> OneOptionalPrxSeq; - -sequence<byte> Serializable; - -dictionary<int, int> IntIntDict; -dictionary<string, int> StringIntDict; -dictionary<int, MyEnum> IntEnumDict; -dictionary<int, FixedStruct> IntFixedStructDict; -dictionary<int, VarStruct> IntVarStructDict; -dictionary<int, OneOptional> IntOneOptionalDict; -dictionary<int, OneOptional*> IntOneOptionalPrxDict; - -class MultiOptional -{ - optional(1) byte a; - optional(2) bool b; - optional(3) short c; - optional(4) int d; - optional(5) long e; - optional(6) float f; - optional(7) double g; - optional(8) string h; - optional(9) MyEnum i; - optional(10) MultiOptional* j; - optional(11) MultiOptional k; - optional(12) ByteSeq bs; - optional(13) StringSeq ss; - optional(14) IntIntDict iid; - optional(15) StringIntDict sid; - optional(16) FixedStruct fs; - optional(17) VarStruct vs; - - optional(18) ShortSeq shs; - optional(19) MyEnumSeq es; - optional(20) FixedStructSeq fss; - optional(21) VarStructSeq vss; - optional(22) OneOptionalSeq oos; - optional(23) OneOptionalPrxSeq oops; - - optional(24) IntEnumDict ied; - optional(25) IntFixedStructDict ifsd; - optional(26) IntVarStructDict ivsd; - optional(27) IntOneOptionalDict iood; - optional(28) IntOneOptionalPrxDict ioopd; - - optional(29) BoolSeq bos; - - optional(30) Serializable ser; -}; - -class A -{ - int requiredA; - optional(1) int ma; - optional(50) int mb; - optional(500) int mc; -}; - -["preserve-slice"] -class B extends A -{ - int requiredB; - optional(10) int md; -}; - -class C extends B -{ - string ss; - optional(890) string ms; -}; - -class WD -{ - optional(1) int a = 5; - optional(2) string s = "test"; -}; - -exception OptionalException -{ - bool req = false; - optional(1) int a = 5; - optional(2) string b; - optional(50) OneOptional o; -}; - -exception DerivedException extends OptionalException -{ - optional(600) string ss = "test"; - optional(601) OneOptional o2; -}; - -exception RequiredException extends OptionalException -{ - string ss = "test"; - OneOptional o2; -}; - -class OptionalWithCustom -{ - optional(1) SmallStructList l; - ["protected"] optional(2) SmallStructList lp; - optional(3) ClassVarStruct s; -}; - -class E -{ - A ae; -}; - -class F extends E -{ - optional(1) A af; -}; - -class G1 -{ - string a; -}; - -class G2 -{ - long a; -}; - -class G -{ - optional(1) G1 gg1Opt; - G2 gg2; - optional(0) G2 gg2Opt; - G1 gg1; -}; - -class Initial -{ - void shutdown(); - - Object pingPong(Object o); - - void opOptionalException(optional(1) int a, optional(2) string b, optional(3) OneOptional o) - throws OptionalException; - - void opDerivedException(optional(1) int a, optional(2) string b, optional(3) OneOptional o) - throws OptionalException; - - void opRequiredException(optional(1) int a, optional(2) string b, optional(3) OneOptional o) - throws OptionalException; - - optional(1) byte opByte(optional(2) byte p1, out optional(3) byte p3); - - optional(1) bool opBool(optional(2) bool p1, out optional(3) bool p3); - - optional(1) short opShort(optional(2) short p1, out optional(3) short p3); - - optional(1) int opInt(optional(2) int p1, out optional(3) int p3); - - optional(3) long opLong(optional(1) long p1, out optional(2) long p3); - - optional(1) float opFloat(optional(2) float p1, out optional(3) float p3); - - optional(1) double opDouble(optional(2) double p1, out optional(3) double p3); - - optional(1) string opString(optional(2) string p1, out optional(3) string p3); - - optional(1) MyEnum opMyEnum(optional(2) MyEnum p1, out optional(3) MyEnum p3); - - optional(1) SmallStruct opSmallStruct(optional(2) SmallStruct p1, out optional(3) SmallStruct p3); - - optional(1) FixedStruct opFixedStruct(optional(2) FixedStruct p1, out optional(3) FixedStruct p3); - - optional(1) VarStruct opVarStruct(optional(2) VarStruct p1, out optional(3) VarStruct p3); - - optional(1) OneOptional opOneOptional(optional(2) OneOptional p1, out optional(3) OneOptional p3); - - optional(1) OneOptional* opOneOptionalProxy(optional(2) OneOptional* p1, out optional(3) OneOptional* p3); - - optional(1) ByteSeq opByteSeq(optional(2) ByteSeq p1, out optional(3) ByteSeq p3); - - optional(1) BoolSeq opBoolSeq(optional(2) BoolSeq p1, out optional(3) BoolSeq p3); - - optional(1) ShortSeq opShortSeq(optional(2) ShortSeq p1, out optional(3) ShortSeq p3); - - optional(1) IntSeq opIntSeq(optional(2) IntSeq p1, out optional(3) IntSeq p3); - - optional(1) LongSeq opLongSeq(optional(2) LongSeq p1, out optional(3) LongSeq p3); - - optional(1) FloatSeq opFloatSeq(optional(2) FloatSeq p1, out optional(3) FloatSeq p3); - - optional(1) DoubleSeq opDoubleSeq(optional(2) DoubleSeq p1, out optional(3) DoubleSeq p3); - - optional(1) StringSeq opStringSeq(optional(2) StringSeq p1, out optional(3) StringSeq p3); - - optional(1) SmallStructSeq opSmallStructSeq(optional(2) SmallStructSeq p1, out optional(3) SmallStructSeq p3); - - optional(1) SmallStructList opSmallStructList(optional(2) SmallStructList p1, out optional(3) SmallStructList p3); - - optional(1) FixedStructSeq opFixedStructSeq(optional(2) FixedStructSeq p1, out optional(3) FixedStructSeq p3); - - optional(1) FixedStructList opFixedStructList(optional(2) FixedStructList p1, out optional(3) FixedStructList p3); - - optional(1) VarStructSeq opVarStructSeq(optional(2) VarStructSeq p1, out optional(3) VarStructSeq p3); - - optional(1) Serializable opSerializable(optional(2) Serializable p1, out optional(3) Serializable p3); - - optional(1) IntIntDict opIntIntDict(optional(2) IntIntDict p1, out optional(3) IntIntDict p3); - - optional(1) StringIntDict opStringIntDict(optional(2) StringIntDict p1, out optional(3) StringIntDict p3); - - optional(1) IntOneOptionalDict opIntOneOptionalDict(optional(2) IntOneOptionalDict p1, - out optional(3) IntOneOptionalDict p3); - - void opClassAndUnknownOptional(A p); - - void sendOptionalClass(bool req, optional(1) OneOptional o); - - void returnOptionalClass(bool req, out optional(1) OneOptional o); - - G opG(G g); - - void opVoid(); - - ["marshaled-result"] optional(1) SmallStruct opMStruct1(); - ["marshaled-result"] optional(1) SmallStruct opMStruct2(optional(2) SmallStruct p1, - out optional(3)SmallStruct p2); - - ["marshaled-result"] optional(1) StringSeq opMSeq1(); - ["marshaled-result"] optional(1) StringSeq opMSeq2(optional(2) StringSeq p1, - out optional(3) StringSeq p2); - - ["marshaled-result"] optional(1) StringIntDict opMDict1(); - ["marshaled-result"] optional(1) StringIntDict opMDict2(optional(2) StringIntDict p1, - out optional(3) StringIntDict p2); - - ["marshaled-result"] optional(1) G opMG1(); - ["marshaled-result"] optional(1) G opMG2(optional(2) G p1, out optional(3) G p2); - - bool supportsRequiredParams(); - - bool supportsJavaSerializable(); - - bool supportsCsharpSerializable(); -}; - -interface Echo -{ - void startBatch(); - void flushBatch(); - void shutdown(); -}; - -}; diff --git a/js/test/Ice/optionalBidir/run.js b/js/test/Ice/optionalBidir/run.js deleted file mode 100644 index fc8c9a16e7c..00000000000 --- a/js/test/Ice/optionalBidir/run.js +++ /dev/null @@ -1,10 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -require("../../Common/Common").run(module); diff --git a/js/test/Ice/optionalBidir/run.py b/js/test/Ice/optionalBidir/run.py deleted file mode 100755 index 1c6bcbb23f5..00000000000 --- a/js/test/Ice/optionalBidir/run.py +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -print("Running test with compact (default) format.") -TestUtil.clientEchoTest() -print("Running test with sliced format.") -TestUtil.clientEchoTest(additionalClientOptions="--Ice.Default.SlicedFormat", additionalServerOptions="--Ice.Default.SlicedFormat") diff --git a/js/test/Ice/properties/Client.js b/js/test/Ice/properties/Client.js index 86adc5287eb..9af3b7beb49 100644 --- a/js/test/Ice/properties/Client.js +++ b/js/test/Ice/properties/Client.js @@ -56,7 +56,7 @@ // // We are runing with NodeJS we load the properties file from the file system. // - properties.parse(require("fs").readFileSync("escapes.cfg", {encoding: "utf8"})); + properties.parse(require("fs").readFileSync("config/escapes.cfg", {encoding: "utf8"})); for(var key in props) { test(props[key] == properties.getProperty(key)); @@ -77,7 +77,7 @@ /*jshint jquery: true */ $.ajax( { - url: "escapes.cfg", + url: "config/escapes.cfg", // // Use text data type to avoid problems interpreting the data. // diff --git a/js/test/Ice/es5/properties/escapes.cfg b/js/test/Ice/properties/config/escapes.cfg index f438d2b59c8..f438d2b59c8 100644 --- a/js/test/Ice/es5/properties/escapes.cfg +++ b/js/test/Ice/properties/config/escapes.cfg diff --git a/js/test/Ice/properties/escapes.cfg b/js/test/Ice/properties/escapes.cfg deleted file mode 100644 index f438d2b59c8..00000000000 --- a/js/test/Ice/properties/escapes.cfg +++ /dev/null @@ -1,35 +0,0 @@ -Foo Bar=3 #tab -Foo\tBar=4 # embedded\t -Escape\\ Space=2 - -# -# From Ice manual: -# - -Prop1 = 1 # Key is "Prop1" - Prop2 = 2 # Key is "Prop2" -\ Prop3 \ = 3 # Key is "Prop3" -My Prop1 = 1 # Key is "My Prop1" -My\ Prop2 = 2 # Key is "My Prop2" - -My.Prop1 = a property # Value is "a property" -My.Prop2 = a property # Value is "a property" -My.Prop3 = \ \ a property\ \ # Value is " a property " -My.Prop4 = \ \ a \ \ property\ \ # Value is " a property " -My.Prop5 = a \\ property # Value is "a \ property" - -foo\=bar=1 # Name is "foo=bar", value is "1" -foo\#bar = 2 # Name is "foo#bar", value is "2" -foo bar =3 # Name is "foo bar", value is "3" - - -A=1 # Name is "A", value is "1" -B= 2 3 4 # Name is "B", value is "2 3 4" -C=5=\#6 # 7 # Name is "C", value is "5=#6" - -AServer=\\\\server\dir # Value is "\\server\dir" -BServer=\\server\\dir # Value is "\server\dir" - - - - diff --git a/js/test/Ice/properties/run.py b/js/test/Ice/properties/run.py deleted file mode 100755 index 286e60351b6..00000000000 --- a/js/test/Ice/properties/run.py +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -TestUtil.simpleTest() diff --git a/js/test/Ice/proxy/run.py b/js/test/Ice/proxy/run.py deleted file mode 100755 index 9a426f0bb1e..00000000000 --- a/js/test/Ice/proxy/run.py +++ /dev/null @@ -1,27 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -print("tests with regular server.") -TestUtil.clientServerTest() -print("tests with AMD server.") -TestUtil.clientServerTest(server="serveramd")
\ No newline at end of file diff --git a/js/test/Ice/retry/run.py b/js/test/Ice/retry/run.py deleted file mode 100755 index ea7ce7ad721..00000000000 --- a/js/test/Ice/retry/run.py +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -TestUtil.clientServerTest() diff --git a/js/test/Ice/slicing/exceptions/run.py b/js/test/Ice/slicing/exceptions/run.py deleted file mode 100755 index 63d54803ea0..00000000000 --- a/js/test/Ice/slicing/exceptions/run.py +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -print("Running test with sliced format.") -TestUtil.clientServerTest() - -print("Running test with 1.0 encoding.") -TestUtil.clientServerTest(additionalClientOptions="--Ice.Default.EncodingVersion=1.0", - additionalServerOptions="--Ice.Default.EncodingVersion=1.0") diff --git a/js/test/Ice/slicing/objects/run.py b/js/test/Ice/slicing/objects/run.py deleted file mode 100755 index 63d54803ea0..00000000000 --- a/js/test/Ice/slicing/objects/run.py +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -print("Running test with sliced format.") -TestUtil.clientServerTest() - -print("Running test with 1.0 encoding.") -TestUtil.clientServerTest(additionalClientOptions="--Ice.Default.EncodingVersion=1.0", - additionalServerOptions="--Ice.Default.EncodingVersion=1.0") diff --git a/js/test/Ice/timeout/run.py b/js/test/Ice/timeout/run.py deleted file mode 100755 index ea7ce7ad721..00000000000 --- a/js/test/Ice/timeout/run.py +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -TestUtil.clientServerTest() |