@@ -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 ( ) ;
0 commit comments