extend tests to check THRIFT-1679 and THRIFT-1821
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 @@
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 @@
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 @@
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.i32_thing = 5;
client.testNest(out2, function(err, response) {
assert( ! err);
- assert.deepEqual(out2, response);
+ checkRecursively(out2, response);
});
var mapout = {};