extend tests to check THRIFT-1679 and THRIFT-1821
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/4a35d4c4 Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/4a35d4c4 Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/4a35d4c4 Branch: refs/heads/master Commit: 4a35d4c4d3655791e5b49cf43bb336e865c37deb Parents: 4e1ef5b Author: Henrique <henrique@henrique-vb.(none)> Authored: Sat May 11 12:08:35 2013 +0200 Committer: Henrique <henrique@henrique-vb.(none)> Committed: Sat May 11 12:08:35 2013 +0200 ---------------------------------------------------------------------- test/nodejs/client.js | 50 +++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 47 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/thrift/blob/4a35d4c4/test/nodejs/client.js ---------------------------------------------------------------------- diff --git a/test/nodejs/client.js b/test/nodejs/client.js index 3a90cac..8e19b88 100644 --- a/test/nodejs/client.js +++ b/test/nodejs/client.js @@ -17,11 +17,13 @@ * under the License. */ var thrift = require('thrift'); +//var ttransport = require('transport'); var assert = require('assert'); var ThriftTest = require('./gen-nodejs/ThriftTest'), ttypes = require('./gen-nodejs/ThriftTest_types'); +//var connection = thrift.createConnection('localhost', 9090, { 'transport': ttransport.TBufferedTransport }), var connection = thrift.createConnection('localhost', 9090), client = thrift.createClient(ThriftTest, connection); @@ -29,6 +31,18 @@ connection.on('error', function(err) { assert(false, err); }); + // deepEqual doesn't work for binary64 +function checkRecursively(map1, map2) { + if (typeof map1 !== 'function' && typeof map2 !== 'function') { + if (!map1 || typeof map1 !== 'object') { + assert.equal(map1, map2); + } else { + for (var key in map1) { + checkRecursively(map1[key], map2[key]); + } + } + } +} client.testVoid(function(err, response) { @@ -36,11 +50,35 @@ client.testVoid(function(err, response) { assert.equal(undefined, response); }); + client.testString("Test", function(err, response) { assert( ! err); assert.equal("Test", response); }); +client.testString("", function(err, response) { + assert( ! err); + assert.equal("", response); +}); + +// 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ú, ç²µèª"; +client.testString(stringTest, function(err, response) { + assert( ! err); + assert.equal(stringTest, response); +}); + +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: !@#$%&()(&%$#{}{}<><><'; +client.testString(specialCharacters, function(err, response) { + assert( ! err); + assert.equal(specialCharacters, response); +}); + + client.testByte(1, function(err, response) { assert( ! err); assert.equal(1, response); @@ -71,15 +109,21 @@ client.testDouble(-5.2098523, function(err, response) { assert.equal(-5.2098523, response); }); +client.testDouble(7.012052175215044, function(err, response) { + assert( ! err); + assert.equal(7.012052175215044, response); +}); + + var out = new ttypes.Xtruct({ string_thing: 'Zero', byte_thing: 1, i32_thing: -3, - //i64_thing: 1000000 + i64_thing: 1000000 }); client.testStruct(out, function(err, response) { assert( ! err); - assert.deepEqual(out, response); + checkRecursively(out, response); }); var out2 = new ttypes.Xtruct2(); @@ -88,7 +132,7 @@ out2.struct_thing = out; out2.i32_thing = 5; client.testNest(out2, function(err, response) { assert( ! err); - assert.deepEqual(out2, response); + checkRecursively(out2, response); }); var mapout = {};
