assert: fix EOL issue in messages on Windows

PR-URL: #20754
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>

Author: BridgeAR

lib/assert.js

@@ -119,12 +119,12 @@ assert.fail = fail;
 assert.AssertionError=AssertionError;
 
 functiongetBuffer(fd,assertLine){
-varlines=0;
+letlines=0;
 // Prevent blocking the event loop by limiting the maximum amount of
 // data that may be read.
-varmaxReads=64;// bytesPerRead * maxReads = 512 kb
-varbytesRead=0;
-varstartBuffer=0;// Start reading from that char on
+letmaxReads=64;// bytesPerRead * maxReads = 512 kb
+letbytesRead=0;
+letstartBuffer=0;// Start reading from that char on
 constbytesPerRead=8192;
 constbuffers=[];
 do{
@@ -167,7 +167,7 @@ function getErrMessage(call) {
 return;
 }
 
-varfd;
+letfd,message;
 try{
 fd=openSync(filename,'r',0o666);
 constbuffers=getBuffer(fd,line);
@@ -186,11 +186,14 @@ function getErrMessage(call) {
 // not user defined function names.
 constok=name==='ok' ? '.ok' : '';
 constargs=node.arguments;
-varmessage=code
+message=code
 .slice(args[0].start,args[args.length-1].end)
 .replace(escapeSequencesRegExp,escapeFn);
+if(EOL==='\r\n'){
+message=message.replace(/\r\n/g,'\n');
+}
 message='The expression evaluated to a falsy value:'+
-`${EOL}${EOL} assert${ok}(${message})${EOL}`;
+`\n\n assert${ok}(${message})\n`;
 }
 // Make sure to always set the cache! No matter if the message is
 // undefined or not

test/parallel/test-assert.js

@@ -27,7 +27,6 @@
 
 constcommon=require('../common');
 constassert=require('assert');
-const{EOL}=require('os');
 constEventEmitter=require('events');
 const{ errorCache }=require('internal/assert');
 const{ writeFileSync, unlinkSync }=require('fs');
@@ -462,8 +461,8 @@ assert.throws(
 {
 code: 'ERR_ASSERTION',
 type: assert.AssertionError,
-message: `The expression evaluated to a falsy value:${EOL}${EOL} `+
-`assert.ok(typeof 123 === 'string')${EOL}`
+message: 'The expression evaluated to a falsy value:\n\n '+
+"assert.ok(typeof 123 === 'string')\n"
 }
 );
 Error.stackTraceLimit=tmpLimit;
@@ -625,8 +624,8 @@ common.expectsError(
 code: 'ERR_ASSERTION',
 type: assert.AssertionError,
 generatedMessage: true,
-message: `The expression evaluated to a falsy value:${EOL}${EOL} `+
-`assert.ok(null)${EOL}`
+message: 'The expression evaluated to a falsy value:\n\n '+
+'assert.ok(null)\n'
 }
 );
 common.expectsError(
@@ -635,8 +634,8 @@ common.expectsError(
 code: 'ERR_ASSERTION',
 type: assert.AssertionError,
 generatedMessage: true,
-message: `The expression evaluated to a falsy value:${EOL}${EOL} `+
-`assert(typeof 123 === 'string')${EOL}`
+message: 'The expression evaluated to a falsy value:\n\n '+
+"assert(typeof 123 === 'string')\n"
 }
 );
 
@@ -666,17 +665,17 @@ common.expectsError(
 {
 code: 'ERR_ASSERTION',
 type: assert.AssertionError,
-message: `The expression evaluated to a falsy value:${EOL}${EOL} `+
-`assert(Buffer.from('test') instanceof Error)${EOL}`
+message: 'The expression evaluated to a falsy value:\n\n '+
+"assert(Buffer.from('test') instanceof Error)\n"
 }
 );
 common.expectsError(
 ()=>throwErr(),
 {
 code: 'ERR_ASSERTION',
 type: assert.AssertionError,
-message: `The expression evaluated to a falsy value:${EOL}${EOL} `+
-`assert(Buffer.from('test') instanceof Error)${EOL}`
+message: 'The expression evaluated to a falsy value:\n\n '+
+"assert(Buffer.from('test') instanceof Error)\n"
 }
 );
 fs.close=tmp;
@@ -695,12 +694,12 @@ common.expectsError(
 {
 code: 'ERR_ASSERTION',
 type: assert.AssertionError,
-message: `The expression evaluated to a falsy value:${EOL}${EOL} `+
-`assert((() => 'string')()${EOL}`+
-` // eslint-disable-next-line${EOL}`+
-` ===${EOL}`+
-` 123 instanceof${EOL}`+
-` Buffer)${EOL}`
+message: 'The expression evaluated to a falsy value:\n\n '+
+"assert((() => 'string')()\n"+
+' // eslint-disable-next-line\n'+
+' ===\n'+
+' 123 instanceof\n'+
+' Buffer)\n'
 }
 );
 
@@ -709,8 +708,8 @@ common.expectsError(
 {
 code: 'ERR_ASSERTION',
 type: assert.AssertionError,
-message: `The expression evaluated to a falsy value:${EOL}${EOL} `+
-`assert(null, undefined)${EOL}`
+message: 'The expression evaluated to a falsy value:\n\n '+
+'assert(null, undefined)\n'
 }
 );