test: refactor and fix test-dns

* More precise length assertion. * Fix incorrect use of string instead of RegExp in `throws` assertions. * Add missing RegExp to `throws` assertions. PR-URL: #9811 Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Rich Trott <[email protected]> Reviewed-By: Luigi Pinca <[email protected]>

Author: targos

test/parallel/test-dns.js

@@ -5,7 +5,7 @@ const assert = require('assert');
 constdns=require('dns');
 
 constexisting=dns.getServers();
-assert(existing.length);
+assert(existing.length>0);
 
 // Verify that setServers() handles arrays with holes and other oddities
 assert.doesNotThrow(()=>{
@@ -42,7 +42,8 @@ const goog = [
 ];
 assert.doesNotThrow(()=>dns.setServers(goog));
 assert.deepStrictEqual(dns.getServers(),goog);
-assert.throws(()=>dns.setServers(['foobar']));
+assert.throws(()=>dns.setServers(['foobar']),
+/^Error:IPaddressisnotproperlyformatted:foobar$/);
 assert.deepStrictEqual(dns.getServers(),goog);
 
 constgoog6=[
@@ -77,20 +78,18 @@ assert.throws(() =>{
 },'Unexpected error');
 
 // dns.lookup should accept falsey and string values
-assert.throws(()=>dns.lookup({},noop),
-'invalid arguments: hostname must be a string or falsey');
+consterrorReg=
+/^TypeError:Invalidarguments:hostnamemustbeastringorfalsey$/;
 
-assert.throws(()=>dns.lookup([],noop),
-'invalid arguments: hostname must be a string or falsey');
+assert.throws(()=>dns.lookup({},noop),errorReg);
 
-assert.throws(()=>dns.lookup(true,noop),
-'invalid arguments: hostname must be a string or falsey');
+assert.throws(()=>dns.lookup([],noop),errorReg);
 
-assert.throws(()=>dns.lookup(1,noop),
-'invalid arguments: hostname must be a string or falsey');
+assert.throws(()=>dns.lookup(true,noop),errorReg);
 
-assert.throws(()=>dns.lookup(noop,noop),
-'invalid arguments: hostname must be a string or falsey');
+assert.throws(()=>dns.lookup(1,noop),errorReg);
+
+assert.throws(()=>dns.lookup(noop,noop),errorReg);
 
 assert.doesNotThrow(()=>dns.lookup('',noop));
 
@@ -114,13 +113,13 @@ assert.doesNotThrow(() => dns.lookup(NaN, noop));
 assert.throws(()=>{
 dns.lookup('www.google.com',{hints: (dns.V4MAPPED|dns.ADDRCONFIG)+1},
 noop);
-});
+},/^TypeError:Invalidargument:hintsmustusevalidflags$/);
 
 assert.throws(()=>dns.lookup('www.google.com'),
-'invalid arguments: callback must be passed');
+/^TypeError:Invalidarguments:callbackmustbepassed$/);
 
 assert.throws(()=>dns.lookup('www.google.com',4),
-'invalid arguments: callback must be passed');
+/^TypeError:Invalidarguments:callbackmustbepassed$/);
 
 assert.doesNotThrow(()=>dns.lookup('www.google.com',6,noop));
 
@@ -143,26 +142,29 @@ assert.doesNotThrow(() =>{
 },noop);
 });
 
-assert.throws(()=>dns.lookupService('0.0.0.0'),/Invalidarguments/);
+assert.throws(()=>dns.lookupService('0.0.0.0'),
+/^Error:Invalidarguments$/);
 
 assert.throws(()=>dns.lookupService('fasdfdsaf',0,noop),
-/"host"argumentneedstobeavalidIPaddress/);
+/^TypeError:"host"argumentneedstobeavalidIPaddress$/);
 
 assert.doesNotThrow(()=>dns.lookupService('0.0.0.0','0',noop));
 
 assert.doesNotThrow(()=>dns.lookupService('0.0.0.0',0,noop));
 
 assert.throws(()=>dns.lookupService('0.0.0.0',null,noop),
-/"port"shouldbe>=0and<65536,got"null"/);
+/^TypeError:"port"shouldbe>=0and<65536,got"null"$/);
 
-assert.throws(()=>dns.lookupService('0.0.0.0',undefined,noop),
-/"port"shouldbe>=0and<65536,got"undefined"/);
+assert.throws(
+()=>dns.lookupService('0.0.0.0',undefined,noop),
+/^TypeError:"port"shouldbe>=0and<65536,got"undefined"$/
+);
 
 assert.throws(()=>dns.lookupService('0.0.0.0',65538,noop),
-/"port"shouldbe>=0and<65536,got"65538"/);
+/^TypeError:"port"shouldbe>=0and<65536,got"65538"$/);
 
 assert.throws(()=>dns.lookupService('0.0.0.0','test',noop),
-/"port"shouldbe>=0and<65536,got"test"/);
+/^TypeError:"port"shouldbe>=0and<65536,got"test"$/);
 
 assert.throws(()=>dns.lookupService('0.0.0.0',80,null),
 /^TypeError:"callback"argumentmustbeafunction$/);