From 152966dbb5fc184a7cf12ce9e0ac0c0cbe8714d4 Mon Sep 17 00:00:00 2001
From: weewey <chuayewwee@gmail.com>
Date: Fri, 28 Apr 2017 11:21:01 +0800
Subject: [PATCH] test: refactoring test with common.mustCall

PR-URL: https://github.com/nodejs/node/pull/12702
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
---
 test/parallel/test-https-simple.js | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/test/parallel/test-https-simple.js b/test/parallel/test-https-simple.js
index 9f3482260e..3ad2806f6a 100644
--- a/test/parallel/test-https-simple.js
+++ b/test/parallel/test-https-simple.js
@@ -55,28 +55,31 @@ const serverCallback = common.mustCall(function(req, res) {
 
 const server = https.createServer(options, serverCallback);
 
-server.listen(0, function() {
+server.listen(0, common.mustCall(() => {
   // Do a request ignoring the unauthorized server certs
+  const port = server.address().port;
+
   const noCertCheckOptions = {
     hostname: '127.0.0.1',
-    port: this.address().port,
+    port: port,
     path: '/',
     method: 'GET',
     rejectUnauthorized: false
   };
+
   noCertCheckOptions.Agent = new https.Agent(noCertCheckOptions);
 
-  const req = https.request(noCertCheckOptions, function(res) {
+  const req = https.request(noCertCheckOptions, common.mustCall((res) => {
     let responseBody = '';
     res.on('data', function(d) {
       responseBody = responseBody + d;
     });
 
-    res.on('end', function() {
+    res.on('end', common.mustCall(() => {
       assert.strictEqual(responseBody, body);
       testSucceeded();
-    });
-  });
+    }));
+  }));
   req.end();
 
   req.on('error', function(e) {
@@ -86,7 +89,7 @@ server.listen(0, function() {
   // Do a request that throws error due to the invalid server certs
   const checkCertOptions = {
     hostname: '127.0.0.1',
-    port: this.address().port,
+    port: port,
     path: '/',
     method: 'GET'
   };
@@ -102,11 +105,11 @@ server.listen(0, function() {
   });
   checkCertReq.end();
 
-  checkCertReq.on('error', function(e) {
+  checkCertReq.on('error', common.mustCall((e) => {
     assert.strictEqual(e.code, 'UNABLE_TO_VERIFY_LEAF_SIGNATURE');
     testSucceeded();
-  });
-});
+  }));
+}));
 
 process.on('exit', function() {
   assert.strictEqual(successful, tests);