THRIFT-5811: Update eslint & prettier
Client: js
Patch: Cameron Martin
This closes #3087
diff --git a/lib/nodets/test/test_driver.ts b/lib/nodets/test/test_driver.ts
index 2c41526..604d5e5 100644
--- a/lib/nodets/test/test_driver.ts
+++ b/lib/nodets/test/test_driver.ts
@@ -17,14 +17,14 @@
* under the License.
*/
- // This is the Node.js test driver for the standard Apache Thrift
- // test service. The driver invokes every function defined in the
- // Thrift Test service with a representative range of parameters.
- //
- // The ThriftTestDriver function requires a client object
- // connected to a server hosting the Thrift Test service and
- // supports an optional callback function which is called with
- // a status message when the test is complete.
+// This is the Node.js test driver for the standard Apache Thrift
+// test service. The driver invokes every function defined in the
+// Thrift Test service with a representative range of parameters.
+//
+// The ThriftTestDriver function requires a client object
+// connected to a server hosting the Thrift Test service and
+// supports an optional callback function which is called with
+// a status message when the test is complete.
import test = require("tape");
import ttypes = require("./gen-nodejs/ThriftTest_types");
@@ -35,107 +35,118 @@
var Int64 = require("node-int64");
import testCases = require("./test-cases");
-export function ThriftTestDriver(client: ThriftTest.Client, callback: (status: string) => void) {
-
- test("NodeJS Style Callback Client Tests", function(assert) {
-
+export function ThriftTestDriver(
+ client: ThriftTest.Client,
+ callback: (status: string) => void,
+) {
+ test("NodeJS Style Callback Client Tests", function (assert) {
var checkRecursively = makeRecursiveCheck(assert);
function makeAsserter(assertionFn: (a: any, b: any, msg?: string) => void) {
- return function(c: (string | any)[]) {
+ return function (c: (string | any)[]) {
var fnName = c[0];
var expected = c[1];
- (<any>client)[fnName](expected, function(err: any, actual: any) {
+ (<any>client)[fnName](expected, function (err: any, actual: any) {
assert.error(err, fnName + ": no callback error");
assertionFn(actual, expected, fnName);
- })
+ });
};
}
testCases.simple.forEach(makeAsserter(assert.equal));
- testCases.simpleLoose.forEach(makeAsserter(function(a, e, m){
- assert.ok(a == e, m);
- }));
+ testCases.simpleLoose.forEach(
+ makeAsserter(function (a, e, m) {
+ assert.ok(a == e, m);
+ }),
+ );
testCases.deep.forEach(makeAsserter(assert.deepEqual));
- client.testMapMap(42, function(err, response) {
+ client.testMapMap(42, function (err, response) {
var expected: typeof response = {
- "4": {"1":1, "2":2, "3":3, "4":4},
- "-4": {"-4":-4, "-3":-3, "-2":-2, "-1":-1}
+ "4": { "1": 1, "2": 2, "3": 3, "4": 4 },
+ "-4": { "-4": -4, "-3": -3, "-2": -2, "-1": -1 },
};
- assert.error(err, 'testMapMap: no callback error');
+ assert.error(err, "testMapMap: no callback error");
assert.deepEqual(expected, response, "testMapMap");
});
- client.testStruct(testCases.out, function(err, response) {
+ client.testStruct(testCases.out, function (err, response) {
assert.error(err, "testStruct: no callback error");
checkRecursively(testCases.out, response, "testStruct");
});
- client.testNest(testCases.out2, function(err, response) {
+ client.testNest(testCases.out2, function (err, response) {
assert.error(err, "testNest: no callback error");
checkRecursively(testCases.out2, response, "testNest");
});
- client.testInsanity(testCases.crazy, function(err, response) {
+ client.testInsanity(testCases.crazy, function (err, response) {
assert.error(err, "testInsanity: no callback error");
checkRecursively(testCases.insanity, response, "testInsanity");
});
- client.testException("TException", function(err, response) {
- assert.ok(err instanceof TException, 'testException: correct error type');
- assert.ok(!Boolean(response), 'testException: no response');
+ client.testException("TException", function (err, response) {
+ assert.ok(err instanceof TException, "testException: correct error type");
+ assert.ok(!Boolean(response), "testException: no response");
});
- client.testException("Xception", function(err, response) {
- assert.ok(err instanceof ttypes.Xception, 'testException: correct error type');
- assert.ok(!Boolean(response), 'testException: no response');
- assert.equal(err.errorCode, 1001, 'testException: correct error code');
- assert.equal('Xception', err.message, 'testException: correct error message');
+ client.testException("Xception", function (err, response) {
+ assert.ok(
+ err instanceof ttypes.Xception,
+ "testException: correct error type",
+ );
+ assert.ok(!Boolean(response), "testException: no response");
+ assert.equal(err.errorCode, 1001, "testException: correct error code");
+ assert.equal(
+ "Xception",
+ err.message,
+ "testException: correct error message",
+ );
});
- client.testException("no Exception", function(err, response) {
- assert.error(err, 'testException: no callback error');
- assert.ok(!Boolean(response), 'testException: no response');
+ client.testException("no Exception", function (err, response) {
+ assert.error(err, "testException: no callback error");
+ assert.ok(!Boolean(response), "testException: no response");
});
- client.testOneway(0, function(err, response) {
- assert.error(err, 'testOneway: no callback error');
- assert.strictEqual(response, undefined, 'testOneway: void response');
+ client.testOneway(0, function (err, response) {
+ assert.error(err, "testOneway: no callback error");
+ assert.strictEqual(response, undefined, "testOneway: void response");
});
- checkOffByOne(function(done) {
- client.testI32(-1, function(err, response) {
+ checkOffByOne(function (done) {
+ client.testI32(-1, function (err, response) {
assert.error(err, "checkOffByOne: no callback error");
assert.equal(-1, response);
assert.end();
done();
});
}, callback);
-
});
-};
+}
-export function ThriftTestDriverPromise(client: ThriftTest.Client, callback: (status: string) => void) {
-
- test("Q Promise Client Tests", function(assert) {
-
+export function ThriftTestDriverPromise(
+ client: ThriftTest.Client,
+ callback: (status: string) => void,
+) {
+ test("Q Promise Client Tests", function (assert) {
var checkRecursively = makeRecursiveCheck(assert);
function fail(msg: string) {
- return function(error, response) {
+ return function (error, response) {
if (error !== null) {
assert.fail(msg);
}
- }
+ };
}
function makeAsserter(assertionFn: (a: any, b: any, msg?: string) => void) {
- return function(c: (string | any)[]) {
+ return function (c: (string | any)[]) {
var fnName = c[0];
var expected = c[1];
- (<any>client)[fnName](expected)
- .then(function(actual: any) {
+ (<any>client)
+ [fnName](expected)
+ .then(function (actual: any) {
assertionFn(actual, expected, fnName);
})
.fail(fail("fnName"));
@@ -143,73 +154,73 @@
}
testCases.simple.forEach(makeAsserter(assert.equal));
- testCases.simpleLoose.forEach(makeAsserter(function(a, e, m){
- assert.ok(a == e, m);
- }));
+ testCases.simpleLoose.forEach(
+ makeAsserter(function (a, e, m) {
+ assert.ok(a == e, m);
+ }),
+ );
testCases.deep.forEach(makeAsserter(assert.deepEqual));
Q.resolve(client.testStruct(testCases.out))
- .then(function(response) {
+ .then(function (response) {
checkRecursively(testCases.out, response, "testStruct");
})
.fail(fail("testStruct"));
Q.resolve(client.testNest(testCases.out2))
- .then(function(response) {
+ .then(function (response) {
checkRecursively(testCases.out2, response, "testNest");
})
.fail(fail("testNest"));
Q.resolve(client.testInsanity(testCases.crazy))
- .then(function(response) {
+ .then(function (response) {
checkRecursively(testCases.insanity, response, "testInsanity");
})
.fail(fail("testInsanity"));
Q.resolve(client.testException("TException"))
- .then(function(response) {
+ .then(function (response) {
fail("testException: TException");
})
- .fail(function(err) {
+ .fail(function (err) {
assert.ok(err instanceof TException);
});
Q.resolve(client.testException("Xception"))
- .then(function(response) {
+ .then(function (response) {
fail("testException: Xception");
})
- .fail(function(err) {
+ .fail(function (err) {
assert.ok(err instanceof ttypes.Xception);
assert.equal(err.errorCode, 1001);
assert.equal("Xception", err.message);
});
Q.resolve(client.testException("no Exception"))
- .then(function(response) {
+ .then(function (response) {
assert.equal(undefined, response); //void
})
.fail(fail("testException"));
client.testOneway(0, fail("testOneway: should not answer"));
- checkOffByOne(function(done) {
+ checkOffByOne(function (done) {
Q.resolve(client.testI32(-1))
- .then(function(response) {
- assert.equal(-1, response);
- assert.end();
- done();
+ .then(function (response) {
+ assert.equal(-1, response);
+ assert.end();
+ done();
})
.fail(fail("checkOffByOne"));
}, callback);
});
-};
-
+}
// Helper Functions
// =========================================================
function makeRecursiveCheck(assert: test.Test) {
-
return function (map1: any, map2: any, msg: string) {
var equal = true;
@@ -218,30 +229,37 @@
assert.ok(equal, msg);
// deepEqual doesn't work with fields using node-int64
- function checkRecursively(map1: any, map2: any) : boolean {
+ function checkRecursively(map1: any, map2: any): boolean {
if (!(typeof map1 !== "function" && typeof map2 !== "function")) {
return false;
}
if (!map1 || typeof map1 !== "object") {
//Handle int64 types (which use node-int64 in Node.js JavaScript)
- if ((typeof map1 === "number") && (typeof map2 === "object") &&
- (map2.buffer) && (map2.buffer instanceof Buffer) && (map2.buffer.length === 8)) {
+ if (
+ typeof map1 === "number" &&
+ typeof map2 === "object" &&
+ map2.buffer &&
+ map2.buffer instanceof Buffer &&
+ map2.buffer.length === 8
+ ) {
var n = new Int64(map2.buffer);
return map1 === n.toNumber();
} else {
return map1 == map2;
}
} else {
- return Object.keys(map1).every(function(key) {
+ return Object.keys(map1).every(function (key) {
return checkRecursively(map1[key], map2[key]);
});
}
}
- }
+ };
}
-function checkOffByOne(done: (callback: () => void) => void, callback: (message: string) => void) {
-
+function checkOffByOne(
+ done: (callback: () => void) => void,
+ callback: (message: string) => void,
+) {
var retry_limit = 30;
var retry_interval = 100;
var test_complete = false;
@@ -256,20 +274,23 @@
* Because this is the last test against the server, when it completes
* the entire suite is complete by definition (the tests run serially).
*/
- done(function() {
+ done(function () {
test_complete = true;
});
//We wait up to retry_limit * retry_interval for the test suite to complete
function TestForCompletion() {
- if(test_complete && callback) {
+ if (test_complete && callback) {
callback("Server successfully tested!");
} else {
if (++retrys < retry_limit) {
setTimeout(TestForCompletion, retry_interval);
} else if (callback) {
- callback("Server test failed to complete after " +
- (retry_limit * retry_interval / 1000) + " seconds");
+ callback(
+ "Server test failed to complete after " +
+ (retry_limit * retry_interval) / 1000 +
+ " seconds",
+ );
}
}
}