Skip to content

Commit aad79d7

Browse files
refactor(tests): replace generic assertions with specific ones
- Replace assert.ok(boolean) / assert.isOk(boolean) with assert.isTrue() - Replace assert.ok(!boolean) with assert.isFalse() - Replace assert.ok(value) for existence checks with assert.isDefined() - Replace assert.ok(false) with assert.fail() - Replace assert.ok(x instanceof Y) with assert.instanceOf(x, Y) - Replace assert.ok(~str.indexOf(x)) with assert.include(str, x) - Replace assert.isOk(/regex/.test(str)) with assert.match(str, /regex/) - Replace assert.isTrue(buf.equals(x)) with assert.deepEqual(buf, x) 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
1 parent 810ca0c commit aad79d7

22 files changed

+117
-120
lines changed

test/integration/bulk-load-test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ describe('BulkLoad', function() {
142142

143143
it('checks constraints if the `checkConstraints` option is set to `true`', function(done) {
144144
const bulkLoad = connection.newBulkLoad('#tmpTestTable3', { checkConstraints: true }, (err, rowCount) => {
145-
assert.ok(err, 'An error should have been thrown to indicate the conflict with the CHECK constraint.');
145+
assert.isDefined(err, 'An error should have been thrown to indicate the conflict with the CHECK constraint.');
146146

147147
assert.strictEqual(rowCount, 0);
148148

test/integration/connection-test.ts

Lines changed: 26 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -87,15 +87,15 @@ describe('Initiate Connect Test', function() {
8787

8888
connection.on('errorMessage', function(error) {
8989
// console.log(`${error.number} : ${error.message}`)
90-
return assert.ok(~error.message.indexOf('failed') || ~error.message.indexOf('登录失败'));
90+
assert.isTrue(error.message.includes('failed') || error.message.includes('登录失败'));
9191
});
9292

9393
if (process.env.TEDIOUS_DEBUG) {
9494
connection.on('debug', console.log);
9595
}
9696

9797
connection.connect(function(err) {
98-
assert.ok(err);
98+
assert.isDefined(err);
9999

100100
connection.close();
101101
});
@@ -154,7 +154,7 @@ describe('Initiate Connect Test', function() {
154154
});
155155

156156
connection.connect(function(err) {
157-
assert.ok(err);
157+
assert.isDefined(err);
158158

159159
connection.close();
160160
});
@@ -427,7 +427,7 @@ describe('Ntlm Test', function() {
427427

428428
break;
429429
default:
430-
assert.ok(false, 'Unexpected value for domainCase: ' + domainCase);
430+
assert.fail('Unexpected value for domainCase: ' + domainCase);
431431
}
432432

433433
let row = 0;
@@ -706,7 +706,7 @@ describe('Insertion Tests', function() {
706706
});
707707

708708
request.on('doneInProc', function(rowCount, more) {
709-
assert.ok(more);
709+
assert.isTrue(more);
710710
assert.strictEqual(rowCount, 1);
711711
});
712712

@@ -905,7 +905,7 @@ describe('Insertion Tests', function() {
905905
});
906906

907907
request.on('doneInProc', function(rowCount, more) {
908-
assert.ok(more);
908+
assert.isTrue(more);
909909
assert.strictEqual(rowCount, 1);
910910
});
911911

@@ -953,7 +953,7 @@ describe('Insertion Tests', function() {
953953
});
954954

955955
request.on('doneInProc', function(rowCount, more) {
956-
assert.ok(more);
956+
assert.isTrue(more);
957957
assert.strictEqual(rowCount, 2);
958958
});
959959

@@ -998,7 +998,7 @@ describe('Insertion Tests', function() {
998998
const config = getConfig();
999999

10001000
const request = new Request('bad syntax here', function(err) {
1001-
assert.ok(err);
1001+
assert.isDefined(err);
10021002

10031003
connection.close();
10041004
});
@@ -1015,7 +1015,7 @@ describe('Insertion Tests', function() {
10151015

10161016
connection.on('errorMessage', function(error) {
10171017
// console.log("#{error.number} : #{error.message}")
1018-
assert.ok(error);
1018+
assert.isDefined(error);
10191019
});
10201020

10211021
if (process.env.TEDIOUS_DEBUG) {
@@ -1248,16 +1248,16 @@ update #tab1 set name = 'a3' where name like 'a%'\
12481248
});
12491249

12501250
request.on('doneProc', function(rowCount, more, returnStatus) {
1251-
assert.ok(!more);
1251+
assert.isFalse(more);
12521252
assert.strictEqual(returnStatus, 0);
12531253
});
12541254

12551255
request.on('doneInProc', function(rowCount, more) {
1256-
assert.ok(more);
1256+
assert.isTrue(more);
12571257
});
12581258

1259-
request.on('row', function(columns) {
1260-
assert.ok(true);
1259+
request.on('row', function(_columns) {
1260+
// Row received as expected
12611261
});
12621262

12631263
let connection = new Connection(config);
@@ -1314,7 +1314,7 @@ update #tab1 set name = 'a3' where name like 'a%'\
13141314
let connection = new Connection(config);
13151315

13161316
connection.on('resetConnection', function() {
1317-
assert.ok(true);
1317+
// Reset connection event received as expected
13181318
});
13191319

13201320
connection.connect(function(err) {
@@ -1324,11 +1324,8 @@ update #tab1 set name = 'a3' where name like 'a%'\
13241324
testAnsiNullsOptionOff,
13251325
function(callback) {
13261326
connection.reset(function(err) {
1327-
if (connection.config.options.tdsVersion < '7_2') {
1328-
// TDS 7_1 doesnt send RESETCONNECTION acknowledgement packet
1329-
assert.ok(true);
1330-
}
1331-
1327+
// TDS 7_1 doesnt send RESETCONNECTION acknowledgement packet
1328+
// For 7_2+ the resetConnection event handler confirms receipt
13321329
callback(err);
13331330
});
13341331
},
@@ -1382,23 +1379,23 @@ update #tab1 set name = 'a3' where name like 'a%'\
13821379
});
13831380

13841381
request.on('doneInProc', (rowCount, more) => {
1385-
assert.ok(false);
1382+
assert.fail('Expected no doneInProc event');
13861383
});
13871384

13881385
request.on('doneProc', (rowCount, more) => {
1389-
assert.ok(false);
1386+
assert.fail('Expected no doneProc event');
13901387
});
13911388

13921389
request.on('done', (rowCount, more, rows) => {
1393-
assert.ok(false);
1390+
assert.fail('Expected no done event');
13941391
});
13951392

13961393
request.on('columnMetadata', (columnsMetadata) => {
1397-
assert.ok(false);
1394+
assert.fail('Expected no columnMetadata event');
13981395
});
13991396

14001397
request.on('row', (columns) => {
1401-
assert.ok(false);
1398+
assert.fail('Expected no row event');
14021399
});
14031400

14041401
const connection = new Connection({
@@ -1442,23 +1439,23 @@ update #tab1 set name = 'a3' where name like 'a%'\
14421439
);
14431440

14441441
request.on('doneInProc', function(rowCount, more) {
1445-
assert.ok(false);
1442+
assert.fail('Expected no doneInProc event');
14461443
});
14471444

14481445
request.on('doneProc', function(rowCount, more) {
1449-
assert.ok(false);
1446+
assert.fail('Expected no doneProc event');
14501447
});
14511448

14521449
request.on('done', function(rowCount, more, rows) {
1453-
assert.ok(false);
1450+
assert.fail('Expected no done event');
14541451
});
14551452

14561453
request.on('columnMetadata', function(columnsMetadata) {
1457-
assert.ok(false);
1454+
assert.fail('Expected no columnMetadata event');
14581455
});
14591456

14601457
request.on('row', function(columns) {
1461-
assert.ok(false);
1458+
assert.fail('Expected no row event');
14621459
});
14631460

14641461
const config = getConfig();

test/integration/errors-test.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ describe('Errors Test', function() {
5050
`;
5151

5252
execSql(done, sql, function(err) {
53-
assert.ok(err instanceof RequestError);
53+
assert.instanceOf(err, RequestError);
5454
assert.strictEqual((err as RequestError).number, 2627);
5555
});
5656
});
@@ -63,7 +63,7 @@ describe('Errors Test', function() {
6363
`;
6464

6565
execSql(done, sql, function(err) {
66-
assert.ok(err instanceof RequestError);
66+
assert.instanceOf(err, RequestError);
6767
assert.strictEqual((err as RequestError).number, 515);
6868
});
6969
});
@@ -74,7 +74,7 @@ describe('Errors Test', function() {
7474
';
7575

7676
execSql(done, sql, function(err) {
77-
assert.ok(err instanceof RequestError);
77+
assert.instanceOf(err, RequestError);
7878
assert.strictEqual((err as RequestError).number, 3701);
7979
});
8080
});

test/integration/instance-lookup-test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ describe('Instance Lookup Test', function() {
2929
signal: controller.signal
3030
});
3131

32-
assert.ok(port);
32+
assert.isDefined(port);
3333
});
3434

3535
it('should test bad Instance', async function() {

test/integration/parameterised-statements-test.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ function execSql(
5151
request.addParameter('param', type, value, options);
5252

5353
request.on('doneInProc', function(rowCount, more) {
54-
assert.ok(more);
54+
assert.isTrue(more);
5555
assert.strictEqual(rowCount, 1);
5656
});
5757

@@ -117,7 +117,7 @@ function execSqlOutput(
117117
request.addOutputParameter('paramOut', type);
118118

119119
request.on('doneInProc', function(rowCount, more) {
120-
assert.ok(more);
120+
assert.isTrue(more);
121121
assert.strictEqual(rowCount, 1);
122122
});
123123

@@ -138,7 +138,7 @@ function execSqlOutput(
138138
assert.strictEqual(returnValue, expectedValue);
139139
}
140140

141-
assert.ok(metadata);
141+
assert.isDefined(metadata);
142142
});
143143

144144
const connectionConfig = Object.assign({}, config, { options: Object.assign({}, config.options, connectionOptions) });
@@ -1097,7 +1097,7 @@ describe('Parameterised Statements Test', function() {
10971097
});
10981098

10991099
request.on('doneInProc', function(rowCount, more) {
1100-
assert.ok(more);
1100+
assert.isTrue(more);
11011101
assert.strictEqual(rowCount, 1);
11021102
});
11031103

@@ -1140,7 +1140,7 @@ describe('Parameterised Statements Test', function() {
11401140
request.addParameter('param2', TYPES.VarChar, 'qwerty');
11411141

11421142
request.on('doneInProc', function(rowCount, more) {
1143-
assert.ok(more);
1143+
assert.isTrue(more);
11441144
assert.strictEqual(rowCount, 1);
11451145
});
11461146

@@ -1216,7 +1216,7 @@ end')\
12161216

12171217
request.on('doneInProc', function(rowCount, more) {
12181218
assert.strictEqual(rowCount, undefined);
1219-
assert.ok(more);
1219+
assert.isTrue(more);
12201220
});
12211221

12221222
request.on('row', function(columns) {

test/integration/pause-resume-test.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ describe('Pause-Resume Test', function() {
8888
});
8989

9090
request.on('row', (columns) => {
91-
assert.ok(!paused);
91+
assert.isFalse(paused);
9292

9393
rowsReceived++;
9494

@@ -135,7 +135,7 @@ describe('Pause-Resume Test', function() {
135135
connection.cancel();
136136
}, 200);
137137
} else if (columns[0].value > 1000) {
138-
assert.ok(false, 'Received rows after pause');
138+
assert.fail('Received rows after pause');
139139
}
140140
});
141141

@@ -170,7 +170,7 @@ describe('Pause-Resume Test', function() {
170170
request.pause();
171171

172172
request.on('row', (columns) => {
173-
assert.ok(!paused);
173+
assert.isFalse(paused);
174174

175175
assert.strictEqual(columns[0].value, 1);
176176
});

test/integration/prepare-execute-statements-test.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ describe('Prepare Execute Statement', function() {
3535
const connection = new Connection(config);
3636

3737
request.on('prepared', function() {
38-
assert.ok(request.handle);
38+
assert.isDefined(request.handle);
3939
connection.execute(request, { param: value });
4040
});
4141

@@ -84,7 +84,7 @@ describe('Prepare Execute Statement', function() {
8484
request.addParameter('param', TYPES.Int);
8585

8686
request.on('prepared', function() {
87-
assert.ok(request.handle);
87+
assert.isDefined(request.handle);
8888

8989
assert.lengthOf(returnValues, 1);
9090
assert.strictEqual(returnValues[0].parameterName, 'handle');
@@ -166,7 +166,7 @@ describe('Prepare Execute Statement', function() {
166166
const connection = new Connection(config);
167167

168168
request.on('prepared', function() {
169-
assert.ok(request.handle);
169+
assert.isDefined(request.handle);
170170
connection.unprepare(request);
171171
});
172172

0 commit comments

Comments
 (0)