test: clean up typecast through type assertions

package.json

@@ -67,7 +67,6 @@
     "@commitlint/travis-cli": "^16.2.4",
     "@types/async": "^3.2.13",
     "@types/bl": "^5.0.2",
-    "@types/chai": "^4.3.1",
     "@types/depd": "^1.1.32",
     "@types/lru-cache": "^5.1.0",
     "@types/mocha": "^9.1.1",

test/integration/bulk-load-test.js

@@ -129,7 +129,7 @@ describe('BulkLoad', function() {
   it('fails if the column definition does not match the target table format', function(done) {
     const bulkLoad = connection.newBulkLoad('#tmpTestTable2', (err, rowCount) => {
       assert.instanceOf(err, RequestError, 'An error should have been thrown to indicate the incorrect table format.');
-      assert.strictEqual(/** @type {RequestError} */(err).message, 'An unknown error has occurred. This is likely because the schema of the BulkLoad does not match the schema of the table you are attempting to insert into.');
+      assert.strictEqual(err.message, 'An unknown error has occurred. This is likely because the schema of the BulkLoad does not match the schema of the table you are attempting to insert into.');
 
       assert.isUndefined(rowCount);
 
@@ -376,7 +376,7 @@ describe('BulkLoad', function() {
         ].join(' ');
 
         assert.instanceOf(err, RequestError);
-        assert.strictEqual(/** @type {RequestError} */(err).message, expectedMessage);
+        assert.strictEqual(err.message, expectedMessage);
 
         assert.strictEqual(rowCount, 0);
 
@@ -486,7 +486,7 @@ describe('BulkLoad', function() {
   it('does not insert any rows if `cancel` is called immediately after executing the bulk load', function(done) {
     const bulkLoad = connection.newBulkLoad('#tmpTestTable5', { keepNulls: true }, (err, rowCount) => {
       assert.instanceOf(err, RequestError);
-      assert.strictEqual(/** @type {RequestError} */(err).message, 'Canceled.');
+      assert.strictEqual(err.message, 'Canceled.');
 
       assert.isUndefined(rowCount);
 
@@ -1154,7 +1154,7 @@ describe('BulkLoad', function() {
      */
     function completeBulkLoad(err, rowCount) {
       assert.instanceOf(err, RequestError);
-      assert.strictEqual(/** @type {RequestError} */(err).message, 'Canceled.');
+      assert.strictEqual(err.message, 'Canceled.');
 
       assert.strictEqual(rowCount, 0);
       startVerifyTableContent();
@@ -1199,7 +1199,7 @@ describe('BulkLoad', function() {
 
       const bulkLoad = connection.newBulkLoad('#stream_test', (err, rowCount) => {
         assert.instanceOf(err, RequestError);
-        assert.strictEqual(/** @type {RequestError} */(err).message, 'Canceled.');
+        assert.strictEqual(err.message, 'Canceled.');
 
         assert.strictEqual(rowCount, 0);
       });
@@ -1238,7 +1238,7 @@ describe('BulkLoad', function() {
   it('cancels any bulk load that takes longer than the given timeout', function(done) {
     const bulkLoad = connection.newBulkLoad('#tmpTestTable5', { keepNulls: true }, (err, rowCount) => {
       assert.instanceOf(err, RequestError);
-      assert.strictEqual(/** @type {RequestError} */(err).message, 'Timeout: Request failed to complete in 10ms');
+      assert.strictEqual(err.message, 'Timeout: Request failed to complete in 10ms');
 
       done();
     });
@@ -1339,7 +1339,7 @@ describe('BulkLoad', function() {
      */
     function completeBulkLoad(err, rowCount) {
       assert.instanceOf(err, RequestError);
-      assert.strictEqual(/** @type {RequestError} */(err).message, 'Timeout: Request failed to complete in 200ms');
+      assert.strictEqual(err.message, 'Timeout: Request failed to complete in 200ms');
 
       assert.strictEqual(rowCount, 0);
 
@@ -1526,7 +1526,7 @@ describe('BulkLoad', function() {
        */
       function completeBulkLoad(err, rowCount) {
         assert.instanceOf(err, TypeError);
-        assert.strictEqual(/** @type {TypeError} */(err).message, 'Invalid date.');
+        assert.strictEqual(err.message, 'Invalid date.');
 
         done();
       }
@@ -1546,7 +1546,7 @@ describe('BulkLoad', function() {
        */
       function completeBulkLoad(err, rowCount) {
         assert.instanceOf(err, TypeError);
-        assert.strictEqual(/** @type {TypeError} */(err).message, 'Invalid date.');
+        assert.strictEqual(err.message, 'Invalid date.');
 
         assert.strictEqual(rowCount, 0);
 

test/integration/connection-test.js

@@ -290,7 +290,7 @@ describe('Initiate Connect Test', function() {
     const connection = new Connection(config);
     connection.connect(function(err) {
       assert.instanceOf(err, ConnectionError);
-      assert.strictEqual(/** @type {ConnectionError} */(err).code, 'ESOCKET');
+      assert.strictEqual(err.code, 'ESOCKET');
     });
 
     connection.on('end', function() {
@@ -385,7 +385,7 @@ describe('Initiate Connect Test', function() {
       conn.close();
 
       assert.instanceOf(err, Error);
-      assert.strictEqual(/** @type {Error} */(err).message, 'Failed to connect to 192.0.2.1:1433 in 3000ms');
+      assert.strictEqual(err.message, 'Failed to connect to 192.0.2.1:1433 in 3000ms');
 
       done();
     });
@@ -867,7 +867,7 @@ describe('Insertion Tests', function() {
 
     const request = new Request('select 8 as C1', function(err, rowCount) {
       assert.instanceOf(err, RequestError);
-      assert.strictEqual(/** @type {RequestError} */(err).code, 'ECLOSE');
+      assert.strictEqual(err.code, 'ECLOSE');
     });
 
     const connection = new Connection(config);
@@ -1202,7 +1202,7 @@ describe('Insertion Tests', function() {
 
     const request = new Request("select 1 as C1; waitfor delay '00:00:05'; select 2 as C2", (err, rowCount, rows) => {
       assert.instanceOf(err, Error);
-      assert.strictEqual(/** @type {Error} */(err).message, 'Canceled.');
+      assert.strictEqual(err.message, 'Canceled.');
 
       assert.isUndefined(rowCount);
 
@@ -1274,7 +1274,8 @@ describe('Insertion Tests', function() {
     const request = new Request(
       "select 1 as C1;waitfor delay '00:00:05';select 2 as C2",
       function(err, rowCount, rows) {
-        assert.equal(/** @type {Error} */(err).message, 'Timeout: Request failed to complete in 1000ms');
+        assert.instanceOf(err, RequestError);
+        assert.equal(err.message, 'Timeout: Request failed to complete in 1000ms');
 
         connection.close();
       }
@@ -1369,9 +1370,9 @@ describe('Advanced Input Test', function() {
     const config = getConfig();
     config.options.enableAnsiNullDefault = false;
 
-    runSqlBatch(done, config, sql, function(/** @type {Error | null | undefined} */err) {
+    runSqlBatch(done, config, sql, function(err) {
       assert.instanceOf(err, RequestError);
-      assert.strictEqual(/** @type {RequestError} */(err).number, 515);
+      assert.strictEqual(err.number, 515);
     }); // Cannot insert the value NULL
   });
 });

test/integration/errors-test.js

@@ -70,8 +70,8 @@ describe('Errors Test', function() {
   `;
 
     execSql(done, sql, function(err) {
-      assert.ok(err instanceof RequestError);
-      assert.strictEqual(/** @type {RequestError} */(err).number, 2627);
+      assert.instanceOf(err, RequestError);
+      assert.strictEqual(err.number, 2627);
     });
   });
 
@@ -83,8 +83,8 @@ describe('Errors Test', function() {
   `;
 
     execSql(done, sql, function(err) {
-      assert.ok(err instanceof RequestError);
-      assert.strictEqual(/** @type {RequestError} */(err).number, 515);
+      assert.instanceOf(err, RequestError);
+      assert.strictEqual(err.number, 515);
     });
   });
 
@@ -94,8 +94,8 @@ describe('Errors Test', function() {
   ';
 
     execSql(done, sql, function(err) {
-      assert.ok(err instanceof RequestError);
-      assert.strictEqual(/** @type {RequestError} */(err).number, 3701);
+      assert.instanceOf(err, RequestError);
+      assert.strictEqual(err.number, 3701);
     });
   });
 
@@ -108,24 +108,20 @@ describe('Errors Test', function() {
     const connection = new Connection(config);
 
     const execProc = new Request('#testExtendedErrorInfo', function(err) {
-      if (!err) {
-        assert.fail('Expected `err` to not be undefined');
-      }
-
-      const requestError = /** @type {RequestError} */(err);
+      assert.instanceOf(err, RequestError);
 
-      assert.strictEqual(requestError.number, 50000);
-      assert.strictEqual(requestError.state, 42);
-      assert.strictEqual(requestError.class, 14);
+      assert.strictEqual(err.number, 50000);
+      assert.strictEqual(err.state, 42);
+      assert.strictEqual(err.class, 14);
 
-      assert.exists(requestError.serverName);
-      assert.exists(requestError.procName);
+      assert.exists(err.serverName);
+      assert.exists(err.procName);
 
       // The procedure name will actually be padded to 128 chars with underscores and
       // some random hexadecimal digits.
-      assert.match(/** @type {string} */(requestError.procName), /^#testExtendedErrorInfo/);
+      assert.match(err.procName, /^#testExtendedErrorInfo/);
 
-      assert.strictEqual(requestError.lineNumber, 1);
+      assert.strictEqual(err.lineNumber, 1);
 
       connection.close();
     });

test/integration/invalid-packet-stream-test.js

@@ -60,7 +60,7 @@ describe('Connecting to a server that sends invalid packet data', function() {
 
     connection.connect((err) => {
       assert.instanceOf(err, ConnectionError);
-      assert.equal(/** @type {ConnectionError} */(err).message, 'Connection lost - Unable to process incoming packet');
+      assert.equal(err.message, 'Connection lost - Unable to process incoming packet');
 
       done();
     });

test/integration/pause-resume-test.js

@@ -119,7 +119,7 @@ describe('Pause-Resume Test', function() {
 
       const request = new Request(sql, (error) => {
         assert.instanceOf(error, RequestError);
-        assert.strictEqual(/** @type {RequestError} */(error).code, 'ECANCEL');
+        assert.strictEqual(error.code, 'ECANCEL');
 
         next();
       });