From c000010aa9c38ba3c67e4e16a389435003065c56 Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Mon, 26 Mar 2018 21:08:24 -0700
Subject: [PATCH] test: refactor test-http-expect-continue

Use common.mustCall() where appropriate. Remove some logic that is not
required when common.mustCall() is used (incrementor/decrementor to make
sure everything is called the same number of times).
---
 test/parallel/test-http-expect-continue.js | 47 +++++++++-------------
 1 file changed, 20 insertions(+), 27 deletions(-)

diff --git a/test/parallel/test-http-expect-continue.js b/test/parallel/test-http-expect-continue.js
index 7f97ce35927e99..7d910f0778e88a 100644
--- a/test/parallel/test-http-expect-continue.js
+++ b/test/parallel/test-http-expect-continue.js
@@ -20,70 +20,63 @@
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 'use strict';
-require('../common');
+const common = require('../common');
 const assert = require('assert');
 const http = require('http');
 
-let outstanding_reqs = 0;
 const test_req_body = 'some stuff...\n';
 const test_res_body = 'other stuff!\n';
 let sent_continue = false;
 let got_continue = false;
 
-function handler(req, res) {
-  assert.strictEqual(sent_continue, true,
-                     'Full response sent before 100 Continue');
+const handler = common.mustCall((req, res) => {
+  assert.ok(sent_continue, 'Full response sent before 100 Continue');
   console.error('Server sending full response...');
   res.writeHead(200, {
     'Content-Type': 'text/plain',
     'ABCD': '1'
   });
   res.end(test_res_body);
-}
+});
 
-const server = http.createServer(handler);
-server.on('checkContinue', function(req, res) {
+const server = http.createServer();
+server.on('checkContinue', common.mustCall((req, res) => {
   console.error('Server got Expect: 100-continue...');
   res.writeContinue();
   sent_continue = true;
   setTimeout(function() {
     handler(req, res);
   }, 100);
-});
+}));
 server.listen(0);
 
 
-server.on('listening', function() {
+server.on('listening', common.mustCall(() => {
   const req = http.request({
-    port: this.address().port,
+    port: server.address().port,
     method: 'POST',
     path: '/world',
     headers: { 'Expect': '100-continue' }
   });
   console.error('Client sending request...');
-  outstanding_reqs++;
   let body = '';
-  req.on('continue', function() {
+  req.on('continue', common.mustCall(() => {
     console.error('Client got 100 Continue...');
     got_continue = true;
     req.end(test_req_body);
-  });
-  req.on('response', function(res) {
-    assert.strictEqual(got_continue, true,
-                       'Full response received before 100 Continue');
+  }));
+  req.on('response', common.mustCall((res) => {
+    assert.ok(got_continue, 'Full response received before 100 Continue');
     assert.strictEqual(200, res.statusCode,
                        `Final status code was ${res.statusCode}, not 200.`);
     res.setEncoding('utf8');
     res.on('data', function(chunk) { body += chunk; });
-    res.on('end', function() {
+    res.on('end', common.mustCall(() => {
       console.error('Got full response.');
-      assert.strictEqual(body, test_res_body, 'Response body doesn\'t match.');
+      assert.strictEqual(body, test_res_body);
       assert.ok('abcd' in res.headers, 'Response headers missing.');
-      outstanding_reqs--;
-      if (outstanding_reqs === 0) {
-        server.close();
-        process.exit();
-      }
-    });
-  });
-});
+      server.close();
+      process.exit();
+    }));
+  }));
+}));