Updated Branches: refs/heads/master 7bb44a33b -> 2f51f327e
THRIFT-2350 Add async calls to normal JavaScript Patch: Randy Abernethy Project: http://git-wip-us.apache.org/repos/asf/thrift/repo Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/2f51f327 Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/2f51f327 Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/2f51f327 Branch: refs/heads/master Commit: 2f51f327e3b6d22e578a84a037d1a9094c64dd9b Parents: 7bb44a3 Author: henrique <[email protected]> Authored: Fri Feb 7 14:12:56 2014 +0100 Committer: henrique <[email protected]> Committed: Sun Feb 9 11:21:33 2014 +0100 ---------------------------------------------------------------------- lib/js/test/server_http.js | 53 +++++ lib/js/test/test_handler.js | 195 +++++++++++++++++ lib/nodejs/test/server_http.js | 52 ----- lib/nodejs/test/test.html | 51 ----- lib/nodejs/test/test.js | 420 ------------------------------------ 5 files changed, 248 insertions(+), 523 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/thrift/blob/2f51f327/lib/js/test/server_http.js ---------------------------------------------------------------------- diff --git a/lib/js/test/server_http.js b/lib/js/test/server_http.js new file mode 100644 index 0000000..623a979 --- /dev/null +++ b/lib/js/test/server_http.js @@ -0,0 +1,53 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +//This HTTP server is designed to server the test.html browser +// based JavaScript test page (which must be in the current directory). +// This server also supplies the Thrift based test service, which depends +// on the standard ThriftTest.thrift IDL service (which must be compiled +// for Node and browser based JavaScript in ./gen-nodejs and ./gen-js +// respectively). The current directory must also include the browser +// support libraries for test.html (jquery.js, qunit.js and qunit.css +// in ./build/js/lib). + +var thrift = require('../../nodejs/lib/thrift'); +var TBufferedTransport = require('../../nodejs/lib/thrift/transport').TBufferedTransport; +var TJSONProtocol = require('../../nodejs/lib/thrift/protocol').TJSONProtocol; +var ThriftTestSvc = require('./gen-nodejs/ThriftTest.js'); +var ThriftTestHandler = require('./test_handler').ThriftTestHandler; + +var ThriftTestSvcOpt = { + transport: TBufferedTransport, + protocol: TJSONProtocol, + cls: ThriftTestSvc, + handler: ThriftTestHandler +}; + +var StaticHttpThriftServerOptions = { + staticFilePath: ".", + services: { + "/service": ThriftTestSvcOpt + } +}; + +var server = thrift.createStaticHttpThriftServer(StaticHttpThriftServerOptions); +var port = 8088; +server.listen(port); +console.log("Serving files from: " + __dirname); +console.log("Http/Thrift Server running on port: " + port); http://git-wip-us.apache.org/repos/asf/thrift/blob/2f51f327/lib/js/test/test_handler.js ---------------------------------------------------------------------- diff --git a/lib/js/test/test_handler.js b/lib/js/test/test_handler.js new file mode 100644 index 0000000..33c8941 --- /dev/null +++ b/lib/js/test/test_handler.js @@ -0,0 +1,195 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * 'License'); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +//This is the server side Node test handler for the standard +// Apache Thrift test service. + +var ttypes = require('./gen-nodejs/ThriftTest_types'); +var TException = require('thrift/thrift').TException; + +var ThriftTestHandler = exports.ThriftTestHandler = { + testVoid: function(result) { + console.log('testVoid()'); + result(null); + }, + testString: function(thing, result) { + console.log('testString(\'' + thing + '\')'); + result(null, thing); + }, + testByte: function(thing, result) { + console.log('testByte(' + thing + ')'); + result(null, thing); + }, + testI32: function(thing, result) { + console.log('testI32(' + thing + ')'); + result(null, thing); + }, + testI64: function(thing, result) { + console.log('testI64(' + thing + ')'); + result(null, thing); + }, + testDouble: function(thing, result) { + console.log('testDouble(' + thing + ')'); + result(null, thing); + }, + testStruct: function(thing, result) { + console.log('testStruct('); + console.log(thing); + console.log(')'); + result(null, thing); + }, + testNest: function(nest, result) { + console.log('testNest('); + console.log(nest); + console.log(')'); + result(null, nest); + }, + testMap: function(thing, result) { + console.log('testMap('); + console.log(thing); + console.log(')'); + result(null, thing); + }, + testStringMap: function(thing, result) { + console.log('testStringMap('); + console.log(thing); + console.log(')'); + result(null, thing); + }, + testSet: function(thing, result) { + console.log('testSet('); + console.log(thing); + console.log(')'); + result(null, thing); + }, + testList: function(thing, result) { + console.log('testList('); + console.log(thing); + console.log(')'); + result(null, thing); + }, + testEnum: function(thing, result) { + console.log('testEnum(' + thing + ')'); + result(null, thing); + }, + testTypedef: function(thing, result) { + console.log('testTypedef(' + thing + ')'); + result(null, thing); + }, + testMapMap: function(hello, result) { + console.log('testMapMap(' + hello + ')'); + + var mapmap = []; + var pos = []; + var neg = []; + for (var i = 1; i < 5; i++) { + pos[i] = i; + neg[-i] = -i; + } + mapmap[4] = pos; + mapmap[-4] = neg; + + result(null, mapmap); + }, + testInsanity: function(argument, result) { + console.log('testInsanity('); + console.log(argument); + console.log(')'); + + var hello = new ttypes.Xtruct(); + hello.string_thing = 'Hello2'; + hello.byte_thing = 2; + hello.i32_thing = 2; + hello.i64_thing = 2; + + var goodbye = new ttypes.Xtruct(); + goodbye.string_thing = 'Goodbye4'; + goodbye.byte_thing = 4; + goodbye.i32_thing = 4; + goodbye.i64_thing = 4; + + var crazy = new ttypes.Insanity(); + crazy.userMap = []; + crazy.userMap[ttypes.Numberz.EIGHT] = 8; + crazy.userMap[ttypes.Numberz.FIVE] = 5; + crazy.xtructs = [goodbye, hello]; + + var first_map = []; + var second_map = []; + + first_map[ttypes.Numberz.TWO] = crazy; + first_map[ttypes.Numberz.THREE] = crazy; + + var looney = new ttypes.Insanity(); + second_map[ttypes.Numberz.SIX] = looney; + + var insane = []; + insane[1] = first_map; + insane[2] = second_map; + + console.log('insane result:'); + console.log(insane); + result(null, insane); + }, + testMulti: function(arg0, arg1, arg2, arg3, arg4, arg5, result) { + console.log('testMulti()'); + + var hello = new ttypes.Xtruct(); + hello.string_thing = 'Hello2'; + hello.byte_thing = arg0; + hello.i32_thing = arg1; + hello.i64_thing = arg2; + result(null, hello); + }, + testException: function(arg, result) { + console.log('testException('+arg+')'); + if (arg === 'Xception') { + var x = new ttypes.Xception(); + x.errorCode = 1001; + x.message = arg; + result(x); + } else if (arg === 'TException') { + result(new TException(arg)); + } else { + result(null); + } + }, + testMultiException: function(arg0, arg1, result) { + console.log('testMultiException(' + arg0 + ', ' + arg1 + ')'); + if (arg0 === ('Xception')) { + var x = new ttypes.Xception(); + x.errorCode = 1001; + x.message = 'This is an Xception'; + result(x); + } else if (arg0 === ('Xception2')) { + var x2 = new ttypes.Xception2(); + x2.errorCode = 2002; + x2.struct_thing = new ttypes.Xtruct(); + x2.struct_thing.string_thing = 'This is an Xception2'; + result(x2); + } + + var res = new ttypes.Xtruct(); + res.string_thing = arg1; + result(null, res); + }, + testOneway: function(sleepFor, result) { + console.log('testOneway(' + sleepFor + ') => JavaScript (like Rust) never sleeps!'); + } +}; //ThriftTestSvcHandler http://git-wip-us.apache.org/repos/asf/thrift/blob/2f51f327/lib/nodejs/test/server_http.js ---------------------------------------------------------------------- diff --git a/lib/nodejs/test/server_http.js b/lib/nodejs/test/server_http.js deleted file mode 100644 index 4366943..0000000 --- a/lib/nodejs/test/server_http.js +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -//This HTTP server is designed to server the test.html browser -// based JavaScript test page (which must be in the current directory). -// This server also supplies the Thrift based test service, which depends -// on the standard ThriftTest.thrift IDL service (which must be compiled -// for Node and browser based JavaScript in ./gen-nodejs and ./gen-js -// respectively). The current directory must also include the browser -// support libraries for test.html (jquery.js, qunit.js and qunit.css -// in ./build/js/lib). - -var thrift = require('thrift'); -var TBufferedTransport = require('thrift/transport').TBufferedTransport; -var TJSONProtocol = require('thrift/protocol').TJSONProtocol; -var ThriftTestSvc = require('./gen-nodejs/ThriftTest.js'); -var ThriftTestHandler = require('./test_handler').ThriftTestHandler; - -var ThriftTestSvcOpt = { - transport: TBufferedTransport, - protocol: TJSONProtocol, - cls: ThriftTestSvc, - handler: ThriftTestHandler -}; - -var StaticHttpThriftServerOptions = { - staticFilePath: ".", - services: { - "/service": ThriftTestSvcOpt - } -} - -var server = thrift.createStaticHttpThriftServer(StaticHttpThriftServerOptions); -var port = 8088; -server.listen(port); -console.log("Http/Thrift Server running on port: " + port); http://git-wip-us.apache.org/repos/asf/thrift/blob/2f51f327/lib/nodejs/test/test.html ---------------------------------------------------------------------- diff --git a/lib/nodejs/test/test.html b/lib/nodejs/test/test.html deleted file mode 100644 index fe0e52b..0000000 --- a/lib/nodejs/test/test.html +++ /dev/null @@ -1,51 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";> -<!-- - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. ---> -<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"> -<head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>Thrift Javascript Bindings: Unit Test</title> - - <script src="/thrift.js" type="text/javascript" charset="utf-8"></script> - <script src="gen-js/ThriftTest_types.js" type="text/javascript" charset="utf-8"></script> - <script src="gen-js/ThriftTest.js" type="text/javascript" charset="utf-8"></script> - - <!-- jQuery --> - <script type="text/javascript" src="build/js/lib/jquery-1.7.2.js" charset="utf-8"></script> - - <!-- QUnit Test framework--> - <script type="text/javascript" src="build/js/lib/qunit.js" charset="utf-8"></script> - <link rel="stylesheet" href="build/js/lib/qunit.css" type="text/css" media="screen" /> - - <!-- the Test Suite--> - <script type="text/javascript" src="test.js" charset="utf-8"></script> -</head> -<body> - <h1 id="qunit-header">Thrift Javascript Bindings: Unit Test (<a href="https://git-wip-us.apache.org/repos/asf?p=thrift.git;a=blob;f=test/ThriftTest.thrift;hb=HEAD";>ThriftTest.thrift</a>)</h1> - <h2 id="qunit-banner"></h2> - <div id="qunit-testrunner-toolbar"></div> - <h2 id="qunit-userAgent"></h2> - <ol id="qunit-tests"><li><!-- get valid xhtml strict--></li></ol> - <p> - <a href="http://validator.w3.org/check/referer";><img - src="http://www.w3.org/Icons/valid-xhtml10"; - alt="Valid XHTML 1.0!" height="31" width="88" /></a> - </p> -</body> -</html> http://git-wip-us.apache.org/repos/asf/thrift/blob/2f51f327/lib/nodejs/test/test.js ---------------------------------------------------------------------- diff --git a/lib/nodejs/test/test.js b/lib/nodejs/test/test.js deleted file mode 100644 index 91ba4d1..0000000 --- a/lib/nodejs/test/test.js +++ /dev/null @@ -1,420 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - /* jshint -W100 */ - -/* - * JavaScript test suite - */ - -var transport = new Thrift.Transport("/service"); -var protocol = new Thrift.Protocol(transport); -var client = new ThriftTest.ThriftTestClient(protocol); - -// all Languages in UTF-8 -var stringTest = "Afrikaans, Alemannisch, Aragonés, اÙعربÙØ©, ٠صرÙ, Asturianu, Aymar aru, AzÉrbaycan, ÐаÑҡоÑÑ, Boarisch, ŽemaitÄÅ¡ka, ÐелаÑÑÑкаÑ, ÐелаÑÑÑÐºÐ°Ñ (ÑаÑаÑкевÑÑа), ÐÑлгаÑÑки, Bamanankan, বাà¦à¦²à¦¾, Brezhoneg, Bosanski, Català , Mìng-dÄ̤ng-ngá¹³Ì, ÐÐ¾Ñ Ñийн, Cebuano, á£á³á©, Äesky, СловѣÌнÑÑÐºÑ / â°â°â°â°â°¡â°â° â°â°â°, ЧÓваÑла, Cymraeg, Dansk, Zazaki, ÞÞ¨ÞÞ¬ÞÞ¨ÞÞ¦ÞÞ°, Îλληνικά, Emilià n e rumagnòl, English, Esperanto, Español, Eesti, Euskara, ÙارسÛ, Suomi, Võro, Føroyskt, Français, Arpetan, Furlan, Frysk, Gaeilge, è´èª, Gà idhlig, Galego, Avañe'ẽ, àªà«àªàª°àª¾àª¤à«, Gaelg, ×¢×ר×ת, हिनà¥à¤¦à¥, Fiji Hindi, Hrvatski, Kreyòl ayisyen, Magyar, ÕÕ¡ÕµÕ¥ÖÕ¥Õ¶, Interlingua, Bahasa Indonesia, Ilokano, Ido, Ãslenska, Italiano, æ¥æ¬èª, Lojban, Basa Jawa, á¥áá áá£áá, Kongo, Kalaallisut, à²à²¨à³à²¨à²¡, íêµì´, ÐÑаÑа Ñай-ÐалкÑаÑ, Ripoarisch, Kurdî, Ðоми, Kernewek, ÐÑÑгÑзÑа, Latina, Ladino, Lëtzebuergesch, Limburgs, Lingála, ລາວ, Lietuvių, LatvieÅ¡u, Basa Banyumasan, Malagasy, ÐакедонÑки, മലയാളà´, मराठà¥, Bahasa Melayu, ٠ازÙرÙÙÛ, Nnapulitano, Nedersaksisch, नà¥à¤ªà¤¾à¤² à¤à¤¾à¤·à¤¾, Nederlands, âªNorsk (nynorsk)â¬, âªNorsk (bokmÃ¥l)â¬, Nouormand, Diné bizaad, Occitan, ÐÑонаÑ, Papiamentu, Deitsch, Norfuk / Pitkern, Polski, Ù¾ÙجابÛ, Ù¾ÚتÙ, Português, Runa Simi, Rumantsch, Romani, RomânÄ, Ð ÑÑÑкий, Ð¡Ð°Ñ Ð° ÑÑла, Sardu, Sicilianu, Scots, Sámegiella, Simple English, SlovenÄina, SlovenÅ¡Äina, СÑпÑки / Srpski, Seeltersk, Svenska, Kiswahili, தமிழà¯, à°¤à±à°²à±à°à±, Тоҷикӣ, à¹à¸à¸¢, Türkmençe, Tagalog, Türkçe, ТаÑаÑÑа/Tatarça, УкÑаÑнÑÑка, اردÙ, Tiếng Viá»t, Volapük, Walon, Winaray, å´è¯, isiXhosa, ××Ö´××ש, Yorùbá, Zeêuws, ä¸æ, B ân-lâm-gú, ç²µèª"; - -function checkRecursively(map1, map2) { - if (typeof map1 !== 'function' && typeof map2 !== 'function') { - if (!map1 || typeof map1 !== 'object') { - equal(map1, map2); - } else { - for (var key in map1) { - checkRecursively(map1[key], map2[key]); - } - } - } -} - -module("Base Types"); - - test("Void", function() { - equal(client.testVoid(), undefined); - }); - test("String", function() { - equal(client.testString(''), ''); - equal(client.testString(stringTest), stringTest); - - var specialCharacters = 'quote: \" backslash:' + - ' forwardslash-escaped: \/ ' + - ' backspace: \b formfeed: \f newline: \n return: \r tab: ' + - ' now-all-of-them-together: "\\\/\b\n\r\t' + - ' now-a-bunch-of-junk: !@#$%&()(&%$#{}{}<><><'; - equal(client.testString(specialCharacters),specialCharacters); - }); - test("Double", function() { - equal(client.testDouble(0), 0); - equal(client.testDouble(-1), -1); - equal(client.testDouble(3.14), 3.14); - equal(client.testDouble(Math.pow(2,60)), Math.pow(2,60)); - }); - test("Byte", function() { - equal(client.testByte(0), 0); - equal(client.testByte(0x01), 0x01); - }); - test("I32", function() { - equal(client.testI32(0), 0); - equal(client.testI32(Math.pow(2,30)), Math.pow(2,30)); - equal(client.testI32(-Math.pow(2,30)), -Math.pow(2,30)); - }); - test("I64", function() { - equal(client.testI64(0), 0); - //This is usually 2^60 but JS cannot represent anything over 2^52 accurately - equal(client.testI64(Math.pow(2,52)), Math.pow(2,52)); - equal(client.testI64(-Math.pow(2,52)), -Math.pow(2,52)); - }); - - -module("Structured Types"); - - test("Struct", function() { - var structTestInput = new ThriftTest.Xtruct(); - structTestInput.string_thing = 'worked'; - structTestInput.byte_thing = 0x01; - structTestInput.i32_thing = Math.pow(2,30); - //This is usually 2^60 but JS cannot represent anything over 2^52 accurately - structTestInput.i64_thing = Math.pow(2,52); - - var structTestOutput = client.testStruct(structTestInput); - - equal(structTestOutput.string_thing, structTestInput.string_thing); - equal(structTestOutput.byte_thing, structTestInput.byte_thing); - equal(structTestOutput.i32_thing, structTestInput.i32_thing); - equal(structTestOutput.i64_thing, structTestInput.i64_thing); - - equal(JSON.stringify(structTestOutput), JSON.stringify(structTestInput)); - }); - - test("Nest", function() { - var xtrTestInput = new ThriftTest.Xtruct(); - xtrTestInput.string_thing = 'worked'; - xtrTestInput.byte_thing = 0x01; - xtrTestInput.i32_thing = Math.pow(2,30); - //This is usually 2^60 but JS cannot represent anything over 2^52 accurately - xtrTestInput.i64_thing = Math.pow(2,52); - - var nestTestInput = new ThriftTest.Xtruct2(); - nestTestInput.byte_thing = 0x02; - nestTestInput.struct_thing = xtrTestInput; - nestTestInput.i32_thing = Math.pow(2,15); - - var nestTestOutput = client.testNest(nestTestInput); - - equal(nestTestOutput.byte_thing, nestTestInput.byte_thing); - equal(nestTestOutput.struct_thing.string_thing, nestTestInput.struct_thing.string_thing); - equal(nestTestOutput.struct_thing.byte_thing, nestTestInput.struct_thing.byte_thing); - equal(nestTestOutput.struct_thing.i32_thing, nestTestInput.struct_thing.i32_thing); - equal(nestTestOutput.struct_thing.i64_thing, nestTestInput.struct_thing.i64_thing); - equal(nestTestOutput.i32_thing, nestTestInput.i32_thing); - - equal(JSON.stringify(nestTestOutput), JSON.stringify(nestTestInput)); - }); - - test("Map", function() { - var mapTestInput = {7:77, 8:88, 9:99}; - - var mapTestOutput = client.testMap(mapTestInput); - - for (var key in mapTestOutput) { - equal(mapTestOutput[key], mapTestInput[key]); - } - }); - - test("StringMap", function() { - var mapTestInput = { - "a":"123", "a b":"with spaces ", "same":"same", "0":"numeric key", - "longValue":stringTest, stringTest:"long key" - }; - - var mapTestOutput = client.testStringMap(mapTestInput); - - for (var key in mapTestOutput) { - equal(mapTestOutput[key], mapTestInput[key]); - } - }); - - test("Set", function() { - var setTestInput = [1,2,3]; - ok(client.testSet(setTestInput), setTestInput); - }); - - test("List", function() { - var listTestInput = [1,2,3]; - ok(client.testList(listTestInput), listTestInput); - }); - - test("Enum", function() { - equal(client.testEnum(ThriftTest.Numberz.ONE), ThriftTest.Numberz.ONE); - }); - - test("TypeDef", function() { - equal(client.testTypedef(69), 69); - }); - - -module("deeper!"); - - test("MapMap", function() { - var mapMapTestExpectedResult = { - "4":{"1":1,"2":2,"3":3,"4":4}, - "-4":{"-4":-4, "-3":-3, "-2":-2, "-1":-1} - }; - - var mapMapTestOutput = client.testMapMap(1); - - - for (var key in mapMapTestOutput) { - for (var key2 in mapMapTestOutput[key]) { - equal(mapMapTestOutput[key][key2], mapMapTestExpectedResult[key][key2]); - } - } - - checkRecursively(mapMapTestOutput, mapMapTestExpectedResult); - }); - - -module("Exception"); - - test("Xception", function() { - expect(2); - try{ - client.testException("Xception"); - }catch(e){ - equal(e.errorCode, 1001); - equal(e.message, "Xception"); - } - }); - - test("no Exception", 0, function() { - try{ - client.testException("no Exception"); - }catch(e){ - ok(false); - } - }); - - test("TException", function() { - //ThriftTest does not list TException as a legal exception so it will - // generate an exception on the server that does not propagate back to - // the client. This test has been modified to equate to "no exception" - expect(1); - try{ - client.testException("TException"); - } catch(e) { - //ok(false); - } - ok(true); - }); - - -module("Insanity"); - - test("testInsanity", function() { - var insanity = { - "1":{ - "2":{ - "userMap":{ "5":5, "8":8 }, - "xtructs":[{ - "string_thing":"Goodbye4", - "byte_thing":4, - "i32_thing":4, - "i64_thing":4 - }, - { - "string_thing":"Hello2", - "byte_thing":2, - "i32_thing":2, - "i64_thing":2 - } - ] - }, - "3":{ - "userMap":{ "5":5, "8":8 }, - "xtructs":[{ - "string_thing":"Goodbye4", - "byte_thing":4, - "i32_thing":4, - "i64_thing":4 - }, - { - "string_thing":"Hello2", - "byte_thing":2, - "i32_thing":2, - "i64_thing":2 - } - ] - } - }, - "2":{ "6":{ "userMap":null, "xtructs":null } } - }; - var res = client.testInsanity(new ThriftTest.Insanity()); - ok(res, JSON.stringify(res)); - ok(insanity, JSON.stringify(insanity)); - - checkRecursively(res, insanity); - }); - - -////////////////////////////////// -//Run same tests asynchronously -jQuery.ajaxSetup({ timeout: 0 }); -$(document).ajaxError( function() { QUnit.start(); } ); - -module("Async Manual"); - - test("testI32", function() { - expect( 2 ); - QUnit.stop(); - - var transport = new Thrift.Transport(); - var protocol = new Thrift.Protocol(transport); - var client = new ThriftTest.ThriftTestClient(protocol); - - var jqxhr = jQuery.ajax({ - url: "/service", - data: client.send_testI32(Math.pow(-2,31)), - type: "POST", - cache: false, - dataType: "text", - success: function(res){ - transport.setRecvBuffer( res ); - equal(client.recv_testI32(), Math.pow(-2,31)); - }, - error: function() { ok(false); }, - complete: function() { - ok(true); - QUnit.start(); - } - }); - }); - - - test("testI64", function() { - expect( 2 ); - QUnit.stop(); - - var transport = new Thrift.Transport(); - var protocol = new Thrift.Protocol(transport); - var client = new ThriftTest.ThriftTestClient(protocol); - - jQuery.ajax({ - url: "/service", - //This is usually 2^61 but JS cannot represent anything over 2^52 accurately - data: client.send_testI64(Math.pow(-2,52)), - type: "POST", - cache: false, - dataType: "text", - success: function(res){ - transport.setRecvBuffer( res ); - //This is usually 2^61 but JS cannot represent anything over 2^52 accurately - equal(client.recv_testI64(), Math.pow(-2,52)); - }, - error: function() { ok(false); }, - complete: function() { - ok(true); - QUnit.start(); - } - }); - }); - - -module("Async"); - - test("Double", function() { - expect( 1 ); - - QUnit.stop(); - client.testDouble(3.14159265, function(result) { - equal(result, 3.14159265); - QUnit.start(); - }); - }); - - test("Byte", function() { - expect( 1 ); - - QUnit.stop(); - client.testByte(0x01, function(result) { - equal(result, 0x01); - QUnit.start(); - }); - }); - - test("I32", function() { - expect( 3 ); - - QUnit.stop(); - client.testI32(Math.pow(2,30), function(result) { - equal(result, Math.pow(2,30)); - QUnit.start(); - }); - - QUnit.stop(); - var jqxhr = client.testI32(Math.pow(-2,31), function(result) { - equal(result, Math.pow(-2,31)); - }); - - jqxhr.success(function(result) { - equal(result, Math.pow(-2,31)); - QUnit.start(); - }); - }); - - test("I64", function() { - expect( 4 ); - - QUnit.stop(); - //This is usually 2^60 but JS cannot represent anything over 2^52 accurately - client.testI64(Math.pow(2,52), function(result) { - equal(result, Math.pow(2,52)); - QUnit.start(); - }); - - QUnit.stop(); - //This is usually 2^60 but JS cannot represent anything over 2^52 accurately - client.testI64(Math.pow(-2,52), function(result) { - equal(result, Math.pow(-2,52)); - }) - .error( function(xhr, status, e) { ok(false, e.message); } ) - .success(function(result) { - //This is usually 2^60 but JS cannot represent anything over 2^52 accurately - equal(result, Math.pow(-2,52)); - }) - .complete(function() { - ok(true); - QUnit.start(); - }); - }); - - test("Xception", function() { - expect( 2 ); - - QUnit.stop(); - - var dfd = client.testException("Xception", function(result) { - ok(false); - QUnit.start(); - }) - .error(function(xhr, status, e){ - equal(e.errorCode, 1001); - equal(e.message, "Xception"); - //QUnit.start(); - //Note start is not required here because: - //$(document).ajaxError( function() { QUnit.start(); } ); - }); - });
