From 71e9d46db2d00fd6603d2f70c4bb4f4a03c2a96d Mon Sep 17 00:00:00 2001
From: Joyee Cheung <joyeec9h3@gmail.com>
Date: Thu, 20 Dec 2018 14:20:31 +0800
Subject: [PATCH 1/5] test: split test-whatwg-encoding-textdecoder.js

Split test-whatwg-encoding-textdecoder.js into:

- `test-whatwg-encoding-custom-textdecoder.js` which tests
  Node.js-specific behaviors
- `test-whatwg-encoding-custom-textdecoder-api-invalid-label.js` which is
  a customized version of the WPT counterpart
- `test-whatwg-encoding-custom-api-basics.js` which is the part of
  `test-whatwg-encoding-api-basics.js` that can be run without ICU
- `test-whatwg-encoding-api-basics.js` which can be replaced with WPT
  later.
---
 .../test-whatwg-encoding-api-basics.js        |  74 ++++++++++++
 .../test-whatwg-encoding-custom-api-basics.js |  61 ++++++++++
 ...ng-custom-textdecoder-api-invalid-label.js |  40 +++++++
 ...est-whatwg-encoding-custom-textdecoder.js} | 105 +-----------------
 4 files changed, 178 insertions(+), 102 deletions(-)
 create mode 100644 test/parallel/test-whatwg-encoding-api-basics.js
 create mode 100644 test/parallel/test-whatwg-encoding-custom-api-basics.js
 create mode 100644 test/parallel/test-whatwg-encoding-custom-textdecoder-api-invalid-label.js
 rename test/parallel/{test-whatwg-encoding-textdecoder.js => test-whatwg-encoding-custom-textdecoder.js} (69%)

diff --git a/test/parallel/test-whatwg-encoding-api-basics.js b/test/parallel/test-whatwg-encoding-api-basics.js
new file mode 100644
index 00000000000000..8abaee817156f4
--- /dev/null
+++ b/test/parallel/test-whatwg-encoding-api-basics.js
@@ -0,0 +1,74 @@
+'use strict';
+
+// From: https://github.com/w3c/web-platform-tests/blob/master/encoding/api-basics.html
+// TODO(joyeecheung): replace this with WPT
+
+const common = require('../common');
+
+if (!common.hasIntl)
+  common.skip('missing Intl');
+
+const assert = require('assert');
+
+function testDecodeSample(encoding, string, bytes) {
+  assert.strictEqual(
+    new TextDecoder(encoding).decode(new Uint8Array(bytes)),
+    string);
+  assert.strictEqual(
+    new TextDecoder(encoding).decode(new Uint8Array(bytes).buffer),
+    string);
+}
+
+// `z` (ASCII U+007A), cent (Latin-1 U+00A2), CJK water (BMP U+6C34),
+// G-Clef (non-BMP U+1D11E), PUA (BMP U+F8FF), PUA (non-BMP U+10FFFD)
+// byte-swapped BOM (non-character U+FFFE)
+const sample = 'z\xA2\u6C34\uD834\uDD1E\uF8FF\uDBFF\uDFFD\uFFFE';
+
+{
+  const encoding = 'utf-8';
+  const string = sample;
+  const bytes = [
+    0x7A, 0xC2, 0xA2, 0xE6, 0xB0, 0xB4,
+    0xF0, 0x9D, 0x84, 0x9E, 0xEF, 0xA3,
+    0xBF, 0xF4, 0x8F, 0xBF, 0xBD, 0xEF,
+    0xBF, 0xBE
+  ];
+  const encoded = new TextEncoder().encode(string);
+  assert.deepStrictEqual([].slice.call(encoded), bytes);
+  assert.strictEqual(
+    new TextDecoder(encoding).decode(new Uint8Array(bytes)),
+    string);
+  assert.strictEqual(
+    new TextDecoder(encoding).decode(new Uint8Array(bytes).buffer),
+    string);
+}
+
+testDecodeSample(
+  'utf-16le',
+  sample,
+  [
+    0x7A, 0x00, 0xA2, 0x00, 0x34, 0x6C,
+    0x34, 0xD8, 0x1E, 0xDD, 0xFF, 0xF8,
+    0xFF, 0xDB, 0xFD, 0xDF, 0xFE, 0xFF
+  ]
+);
+
+testDecodeSample(
+  'utf-16be',
+  sample,
+  [
+    0x00, 0x7A, 0x00, 0xA2, 0x6C, 0x34,
+    0xD8, 0x34, 0xDD, 0x1E, 0xF8, 0xFF,
+    0xDB, 0xFF, 0xDF, 0xFD, 0xFF, 0xFE
+  ]
+);
+
+testDecodeSample(
+  'utf-16',
+  sample,
+  [
+    0x7A, 0x00, 0xA2, 0x00, 0x34, 0x6C,
+    0x34, 0xD8, 0x1E, 0xDD, 0xFF, 0xF8,
+    0xFF, 0xDB, 0xFD, 0xDF, 0xFE, 0xFF
+  ]
+);
diff --git a/test/parallel/test-whatwg-encoding-custom-api-basics.js b/test/parallel/test-whatwg-encoding-custom-api-basics.js
new file mode 100644
index 00000000000000..c39bce5d74ee99
--- /dev/null
+++ b/test/parallel/test-whatwg-encoding-custom-api-basics.js
@@ -0,0 +1,61 @@
+'use strict';
+
+// From: https://github.com/w3c/web-platform-tests/blob/master/encoding/api-basics.html
+// This is the part that can be run without ICU
+
+require('../common');
+
+const assert = require('assert');
+
+function testDecodeSample(encoding, string, bytes) {
+  assert.strictEqual(
+    new TextDecoder(encoding).decode(new Uint8Array(bytes)),
+    string);
+  assert.strictEqual(
+    new TextDecoder(encoding).decode(new Uint8Array(bytes).buffer),
+    string);
+}
+
+// `z` (ASCII U+007A), cent (Latin-1 U+00A2), CJK water (BMP U+6C34),
+// G-Clef (non-BMP U+1D11E), PUA (BMP U+F8FF), PUA (non-BMP U+10FFFD)
+// byte-swapped BOM (non-character U+FFFE)
+const sample = 'z\xA2\u6C34\uD834\uDD1E\uF8FF\uDBFF\uDFFD\uFFFE';
+
+{
+  const encoding = 'utf-8';
+  const string = sample;
+  const bytes = [
+    0x7A, 0xC2, 0xA2, 0xE6, 0xB0, 0xB4,
+    0xF0, 0x9D, 0x84, 0x9E, 0xEF, 0xA3,
+    0xBF, 0xF4, 0x8F, 0xBF, 0xBD, 0xEF,
+    0xBF, 0xBE
+  ];
+  const encoded = new TextEncoder().encode(string);
+  assert.deepStrictEqual([].slice.call(encoded), bytes);
+  assert.strictEqual(
+    new TextDecoder(encoding).decode(new Uint8Array(bytes)),
+    string);
+  assert.strictEqual(
+    new TextDecoder(encoding).decode(new Uint8Array(bytes).buffer),
+    string);
+}
+
+testDecodeSample(
+  'utf-16le',
+  sample,
+  [
+    0x7A, 0x00, 0xA2, 0x00, 0x34, 0x6C,
+    0x34, 0xD8, 0x1E, 0xDD, 0xFF, 0xF8,
+    0xFF, 0xDB, 0xFD, 0xDF, 0xFE, 0xFF
+  ]
+);
+
+testDecodeSample(
+  'utf-16',
+  sample,
+  [
+    0x7A, 0x00, 0xA2, 0x00, 0x34, 0x6C,
+    0x34, 0xD8, 0x1E, 0xDD, 0xFF, 0xF8,
+    0xFF, 0xDB, 0xFD, 0xDF, 0xFE, 0xFF
+  ]
+);
diff --git a/test/parallel/test-whatwg-encoding-custom-textdecoder-api-invalid-label.js b/test/parallel/test-whatwg-encoding-custom-textdecoder-api-invalid-label.js
new file mode 100644
index 00000000000000..aabd3fe5c4de5d
--- /dev/null
+++ b/test/parallel/test-whatwg-encoding-custom-textdecoder-api-invalid-label.js
@@ -0,0 +1,40 @@
+'use strict';
+// From: https://github.com/w3c/web-platform-tests/blob/master/encoding/api-invalid-label.html
+// With the twist that we specifically test for Node.js error codes
+
+const common = require('../common');
+
+[
+  'utf-8',
+  'unicode-1-1-utf-8',
+  'utf8',
+  'utf-16be',
+  'utf-16le',
+  'utf-16'
+].forEach((i) => {
+  ['\u0000', '\u000b', '\u00a0', '\u2028', '\u2029'].forEach((ws) => {
+    common.expectsError(
+      () => new TextDecoder(`${ws}${i}`),
+      {
+        code: 'ERR_ENCODING_NOT_SUPPORTED',
+        type: RangeError
+      }
+    );
+
+    common.expectsError(
+      () => new TextDecoder(`${i}${ws}`),
+      {
+        code: 'ERR_ENCODING_NOT_SUPPORTED',
+        type: RangeError
+      }
+    );
+
+    common.expectsError(
+      () => new TextDecoder(`${ws}${i}${ws}`),
+      {
+        code: 'ERR_ENCODING_NOT_SUPPORTED',
+        type: RangeError
+      }
+    );
+  });
+});
diff --git a/test/parallel/test-whatwg-encoding-textdecoder.js b/test/parallel/test-whatwg-encoding-custom-textdecoder.js
similarity index 69%
rename from test/parallel/test-whatwg-encoding-textdecoder.js
rename to test/parallel/test-whatwg-encoding-custom-textdecoder.js
index 55afd34a02b11e..ceee5b9cbbde30 100644
--- a/test/parallel/test-whatwg-encoding-textdecoder.js
+++ b/test/parallel/test-whatwg-encoding-custom-textdecoder.js
@@ -1,4 +1,7 @@
 // Flags: --expose-internals
+
+// This tests Node.js-specific behaviors of TextDecoder
+
 'use strict';
 
 const common = require('../common');
@@ -167,72 +170,6 @@ if (common.hasIntl) {
   });
 }
 
-// From: https://github.com/w3c/web-platform-tests/blob/master/encoding/api-basics.html
-function testDecodeSample(encoding, string, bytes) {
-  assert.strictEqual(
-    new TextDecoder(encoding).decode(new Uint8Array(bytes)),
-    string);
-  assert.strictEqual(
-    new TextDecoder(encoding).decode(new Uint8Array(bytes).buffer),
-    string);
-}
-
-// `z` (ASCII U+007A), cent (Latin-1 U+00A2), CJK water (BMP U+6C34),
-// G-Clef (non-BMP U+1D11E), PUA (BMP U+F8FF), PUA (non-BMP U+10FFFD)
-// byte-swapped BOM (non-character U+FFFE)
-const sample = 'z\xA2\u6C34\uD834\uDD1E\uF8FF\uDBFF\uDFFD\uFFFE';
-
-{
-  const encoding = 'utf-8';
-  const string = sample;
-  const bytes = [
-    0x7A, 0xC2, 0xA2, 0xE6, 0xB0, 0xB4,
-    0xF0, 0x9D, 0x84, 0x9E, 0xEF, 0xA3,
-    0xBF, 0xF4, 0x8F, 0xBF, 0xBD, 0xEF,
-    0xBF, 0xBE
-  ];
-  const encoded = new TextEncoder().encode(string);
-  assert.deepStrictEqual([].slice.call(encoded), bytes);
-  assert.strictEqual(
-    new TextDecoder(encoding).decode(new Uint8Array(bytes)),
-    string);
-  assert.strictEqual(
-    new TextDecoder(encoding).decode(new Uint8Array(bytes).buffer),
-    string);
-}
-
-testDecodeSample(
-  'utf-16le',
-  sample,
-  [
-    0x7A, 0x00, 0xA2, 0x00, 0x34, 0x6C,
-    0x34, 0xD8, 0x1E, 0xDD, 0xFF, 0xF8,
-    0xFF, 0xDB, 0xFD, 0xDF, 0xFE, 0xFF
-  ]
-);
-
-if (common.hasIntl) {
-  testDecodeSample(
-    'utf-16be',
-    sample,
-    [
-      0x00, 0x7A, 0x00, 0xA2, 0x6C, 0x34,
-      0xD8, 0x34, 0xDD, 0x1E, 0xF8, 0xFF,
-      0xDB, 0xFF, 0xDF, 0xFD, 0xFF, 0xFE
-    ]
-  );
-}
-
-testDecodeSample(
-  'utf-16',
-  sample,
-  [
-    0x7A, 0x00, 0xA2, 0x00, 0x34, 0x6C,
-    0x34, 0xD8, 0x1E, 0xDD, 0xFF, 0xF8,
-    0xFF, 0xDB, 0xFD, 0xDF, 0xFE, 0xFF
-  ]
-);
-
 {
   common.expectsError(
     () => new TextDecoder('utf-8', 1),
@@ -242,39 +179,3 @@ testDecodeSample(
     }
   );
 }
-
-// From: https://github.com/w3c/web-platform-tests/blob/master/encoding/api-invalid-label.html
-[
-  'utf-8',
-  'unicode-1-1-utf-8',
-  'utf8',
-  'utf-16be',
-  'utf-16le',
-  'utf-16'
-].forEach((i) => {
-  ['\u0000', '\u000b', '\u00a0', '\u2028', '\u2029'].forEach((ws) => {
-    common.expectsError(
-      () => new TextDecoder(`${ws}${i}`),
-      {
-        code: 'ERR_ENCODING_NOT_SUPPORTED',
-        type: RangeError
-      }
-    );
-
-    common.expectsError(
-      () => new TextDecoder(`${i}${ws}`),
-      {
-        code: 'ERR_ENCODING_NOT_SUPPORTED',
-        type: RangeError
-      }
-    );
-
-    common.expectsError(
-      () => new TextDecoder(`${ws}${i}${ws}`),
-      {
-        code: 'ERR_ENCODING_NOT_SUPPORTED',
-        type: RangeError
-      }
-    );
-  });
-});

From 7d141f83d292a755adf1b14c0289be23c01221df Mon Sep 17 00:00:00 2001
From: Joyee Cheung <joyeec9h3@gmail.com>
Date: Thu, 20 Dec 2018 14:29:13 +0800
Subject: [PATCH 2/5] test: split test-whatwg-encoding-textdecoder-fatal.js

Split `test-whatwg-encoding-textdecoder-fatal.js` into

- `test-whatwg-encoding-custom-textdecoder-fatal.js` which
  is a customized version of the WPT that tests for Node.js-specific
  error codes.
- `test-whatwg-encoding-custom-textdecoder-invalid-arg` which
  tests `ERR_INVALID_ARG_TYPE`
---
 ...hatwg-encoding-custom-textdecoder-fatal.js} | 14 ++------------
 ...-encoding-custom-textdecoder-invalid-arg.js | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+), 12 deletions(-)
 rename test/parallel/{test-whatwg-encoding-textdecoder-fatal.js => test-whatwg-encoding-custom-textdecoder-fatal.js} (92%)
 create mode 100644 test/parallel/test-whatwg-encoding-custom-textdecoder-invalid-arg.js

diff --git a/test/parallel/test-whatwg-encoding-textdecoder-fatal.js b/test/parallel/test-whatwg-encoding-custom-textdecoder-fatal.js
similarity index 92%
rename from test/parallel/test-whatwg-encoding-textdecoder-fatal.js
rename to test/parallel/test-whatwg-encoding-custom-textdecoder-fatal.js
index aa945b61b10e72..c5e4b9684b190f 100644
--- a/test/parallel/test-whatwg-encoding-textdecoder-fatal.js
+++ b/test/parallel/test-whatwg-encoding-custom-textdecoder-fatal.js
@@ -1,6 +1,7 @@
 'use strict';
 
 // From: https://github.com/w3c/web-platform-tests/blob/39a67e2fff/encoding/textdecoder-fatal.html
+// With the twist that we specifically test for Node.js error codes
 
 const common = require('../common');
 
@@ -82,21 +83,10 @@ bad.forEach((t) => {
   );
 });
 
+// TODO(joyeecheung): remove this when WPT is ported
 {
   assert('fatal' in new TextDecoder());
   assert.strictEqual(typeof new TextDecoder().fatal, 'boolean');
   assert(!new TextDecoder().fatal);
   assert(new TextDecoder('utf-8', { fatal: true }).fatal);
 }
-
-{
-  const notArrayBufferViewExamples = [false, {}, 1, '', new Error()];
-  notArrayBufferViewExamples.forEach((invalidInputType) => {
-    common.expectsError(() => {
-      new TextDecoder(undefined, null).decode(invalidInputType);
-    }, {
-      code: 'ERR_INVALID_ARG_TYPE',
-      type: TypeError
-    });
-  });
-}
diff --git a/test/parallel/test-whatwg-encoding-custom-textdecoder-invalid-arg.js b/test/parallel/test-whatwg-encoding-custom-textdecoder-invalid-arg.js
new file mode 100644
index 00000000000000..a2b56ad9577271
--- /dev/null
+++ b/test/parallel/test-whatwg-encoding-custom-textdecoder-invalid-arg.js
@@ -0,0 +1,18 @@
+'use strict';
+
+// This tests that ERR_INVALID_ARG_TYPE are thrown when
+// invalid arguments are passed to TextDecoder.
+
+const common = require('../common');
+
+{
+  const notArrayBufferViewExamples = [false, {}, 1, '', new Error()];
+  notArrayBufferViewExamples.forEach((invalidInputType) => {
+    common.expectsError(() => {
+      new TextDecoder(undefined, null).decode(invalidInputType);
+    }, {
+      code: 'ERR_INVALID_ARG_TYPE',
+      type: TypeError
+    });
+  });
+}

From 6a9da1651d293d6b06a56c848623c7bce574c1f4 Mon Sep 17 00:00:00 2001
From: Joyee Cheung <joyeec9h3@gmail.com>
Date: Thu, 20 Dec 2018 14:31:35 +0800
Subject: [PATCH 3/5] test: split encoding tests where some cases can be run
 without ICU

Split the following tests:

- `test-whatwg-encoding-textdecoder-utf16-surrogates.js`
- `test-whatwg-encoding-textdecoder-ignorebom.js`
- `test-whatwg-encoding-textdecoder-streaming.js`

Each into two files: one that can be run without ICU and one that has
to be run with ICU. The latter can be replaced with WPT later.
---
 ...g-encoding-custom-textdecoder-ignorebom.js | 30 +++++++++++++++
 ...g-encoding-custom-textdecoder-streaming.js | 38 +++++++++++++++++++
 ...ng-custom-textdecoder-utf16-surrogates.js} |  3 +-
 ...t-whatwg-encoding-textdecoder-ignorebom.js | 17 ++++-----
 ...t-whatwg-encoding-textdecoder-streaming.js |  4 ++
 ...g-encoding-textencoder-utf16-surrogates.js |  1 +
 6 files changed, 82 insertions(+), 11 deletions(-)
 create mode 100644 test/parallel/test-whatwg-encoding-custom-textdecoder-ignorebom.js
 create mode 100644 test/parallel/test-whatwg-encoding-custom-textdecoder-streaming.js
 rename test/parallel/{test-whatwg-encoding-textdecoder-utf16-surrogates.js => test-whatwg-encoding-custom-textdecoder-utf16-surrogates.js} (91%)

diff --git a/test/parallel/test-whatwg-encoding-custom-textdecoder-ignorebom.js b/test/parallel/test-whatwg-encoding-custom-textdecoder-ignorebom.js
new file mode 100644
index 00000000000000..9f6368dcd5e93f
--- /dev/null
+++ b/test/parallel/test-whatwg-encoding-custom-textdecoder-ignorebom.js
@@ -0,0 +1,30 @@
+'use strict';
+
+// From: https://github.com/w3c/web-platform-tests/blob/7f567fa29c/encoding/textdecoder-ignorebom.html
+// This is the part that can be run without ICU
+
+require('../common');
+
+const assert = require('assert');
+
+const cases = [
+  {
+    encoding: 'utf-8',
+    bytes: [0xEF, 0xBB, 0xBF, 0x61, 0x62, 0x63]
+  },
+  {
+    encoding: 'utf-16le',
+    bytes: [0xFF, 0xFE, 0x61, 0x00, 0x62, 0x00, 0x63, 0x00]
+  }
+];
+
+cases.forEach((testCase) => {
+  const BOM = '\uFEFF';
+  let decoder = new TextDecoder(testCase.encoding, { ignoreBOM: true });
+  const bytes = new Uint8Array(testCase.bytes);
+  assert.strictEqual(decoder.decode(bytes), `${BOM}abc`);
+  decoder = new TextDecoder(testCase.encoding, { ignoreBOM: false });
+  assert.strictEqual(decoder.decode(bytes), 'abc');
+  decoder = new TextDecoder(testCase.encoding);
+  assert.strictEqual(decoder.decode(bytes), 'abc');
+});
diff --git a/test/parallel/test-whatwg-encoding-custom-textdecoder-streaming.js b/test/parallel/test-whatwg-encoding-custom-textdecoder-streaming.js
new file mode 100644
index 00000000000000..5484929326254d
--- /dev/null
+++ b/test/parallel/test-whatwg-encoding-custom-textdecoder-streaming.js
@@ -0,0 +1,38 @@
+'use strict';
+
+// From: https://github.com/w3c/web-platform-tests/blob/fa9436d12c/encoding/textdecoder-streaming.html
+// This is the part that can be run without ICU
+
+require('../common');
+
+const assert = require('assert');
+
+const string =
+  '\x00123ABCabc\x80\xFF\u0100\u1000\uFFFD\uD800\uDC00\uDBFF\uDFFF';
+const octets = {
+  'utf-8': [
+    0x00, 0x31, 0x32, 0x33, 0x41, 0x42, 0x43, 0x61, 0x62, 0x63, 0xc2, 0x80,
+    0xc3, 0xbf, 0xc4, 0x80, 0xe1, 0x80, 0x80, 0xef, 0xbf, 0xbd, 0xf0, 0x90,
+    0x80, 0x80, 0xf4, 0x8f, 0xbf, 0xbf],
+  'utf-16le': [
+    0x00, 0x00, 0x31, 0x00, 0x32, 0x00, 0x33, 0x00, 0x41, 0x00, 0x42, 0x00,
+    0x43, 0x00, 0x61, 0x00, 0x62, 0x00, 0x63, 0x00, 0x80, 0x00, 0xFF, 0x00,
+    0x00, 0x01, 0x00, 0x10, 0xFD, 0xFF, 0x00, 0xD8, 0x00, 0xDC, 0xFF, 0xDB,
+    0xFF, 0xDF]
+};
+
+Object.keys(octets).forEach((encoding) => {
+  for (let len = 1; len <= 5; ++len) {
+    const encoded = octets[encoding];
+    const decoder = new TextDecoder(encoding);
+    let out = '';
+    for (let i = 0; i < encoded.length; i += len) {
+      const sub = [];
+      for (let j = i; j < encoded.length && j < i + len; ++j)
+        sub.push(encoded[j]);
+      out += decoder.decode(new Uint8Array(sub), { stream: true });
+    }
+    out += decoder.decode();
+    assert.strictEqual(out, string);
+  }
+});
diff --git a/test/parallel/test-whatwg-encoding-textdecoder-utf16-surrogates.js b/test/parallel/test-whatwg-encoding-custom-textdecoder-utf16-surrogates.js
similarity index 91%
rename from test/parallel/test-whatwg-encoding-textdecoder-utf16-surrogates.js
rename to test/parallel/test-whatwg-encoding-custom-textdecoder-utf16-surrogates.js
index 163cccf9bb2b88..3af83e01b0450d 100644
--- a/test/parallel/test-whatwg-encoding-textdecoder-utf16-surrogates.js
+++ b/test/parallel/test-whatwg-encoding-custom-textdecoder-utf16-surrogates.js
@@ -1,6 +1,7 @@
 'use strict';
 
 // From: https://github.com/w3c/web-platform-tests/blob/39a67e2fff/encoding/textdecoder-utf16-surrogates.html
+// With the twist that we specifically test for Node.js error codes
 
 const common = require('../common');
 
@@ -43,7 +44,7 @@ const bad = [
 ];
 
 bad.forEach((t) => {
-
+  // TODO(joyeecheung): remove this when WPT is ported
   assert.strictEqual(
     new TextDecoder(t.encoding).decode(new Uint8Array(t.input)),
     t.expected);
diff --git a/test/parallel/test-whatwg-encoding-textdecoder-ignorebom.js b/test/parallel/test-whatwg-encoding-textdecoder-ignorebom.js
index 72fe498cd056d9..7421965c9fb517 100644
--- a/test/parallel/test-whatwg-encoding-textdecoder-ignorebom.js
+++ b/test/parallel/test-whatwg-encoding-textdecoder-ignorebom.js
@@ -1,34 +1,31 @@
 'use strict';
 
 // From: https://github.com/w3c/web-platform-tests/blob/7f567fa29c/encoding/textdecoder-ignorebom.html
+// TODO(joyeecheung): replace this with WPT
 
 const common = require('../common');
 
+if (!common.hasIntl)
+  common.skip('missing Intl');
+
 const assert = require('assert');
 
 const cases = [
   {
     encoding: 'utf-8',
-    bytes: [0xEF, 0xBB, 0xBF, 0x61, 0x62, 0x63],
-    skipNoIntl: false
+    bytes: [0xEF, 0xBB, 0xBF, 0x61, 0x62, 0x63]
   },
   {
     encoding: 'utf-16le',
-    bytes: [0xFF, 0xFE, 0x61, 0x00, 0x62, 0x00, 0x63, 0x00],
-    skipNoIntl: false
+    bytes: [0xFF, 0xFE, 0x61, 0x00, 0x62, 0x00, 0x63, 0x00]
   },
   {
     encoding: 'utf-16be',
-    bytes: [0xFE, 0xFF, 0x00, 0x61, 0x00, 0x62, 0x00, 0x63],
-    skipNoIntl: true
+    bytes: [0xFE, 0xFF, 0x00, 0x61, 0x00, 0x62, 0x00, 0x63]
   }
 ];
 
 cases.forEach((testCase) => {
-  if (testCase.skipNoIntl && !common.hasIntl) {
-    console.log(`skipping ${testCase.encoding} because missing Intl`);
-    return; // skipping
-  }
   const BOM = '\uFEFF';
   let decoder = new TextDecoder(testCase.encoding, { ignoreBOM: true });
   const bytes = new Uint8Array(testCase.bytes);
diff --git a/test/parallel/test-whatwg-encoding-textdecoder-streaming.js b/test/parallel/test-whatwg-encoding-textdecoder-streaming.js
index 69186accb5770d..acc39a74e5cf56 100644
--- a/test/parallel/test-whatwg-encoding-textdecoder-streaming.js
+++ b/test/parallel/test-whatwg-encoding-textdecoder-streaming.js
@@ -1,9 +1,13 @@
 'use strict';
 
 // From: https://github.com/w3c/web-platform-tests/blob/fa9436d12c/encoding/textdecoder-streaming.html
+// TODO(joyeecheung): replace this with WPT
 
 const common = require('../common');
 
+if (!common.hasIntl)
+  common.skip('missing Intl');
+
 const assert = require('assert');
 
 const string =
diff --git a/test/parallel/test-whatwg-encoding-textencoder-utf16-surrogates.js b/test/parallel/test-whatwg-encoding-textencoder-utf16-surrogates.js
index 808acf31eb134b..453b49e5b92730 100644
--- a/test/parallel/test-whatwg-encoding-textencoder-utf16-surrogates.js
+++ b/test/parallel/test-whatwg-encoding-textencoder-utf16-surrogates.js
@@ -1,6 +1,7 @@
 'use strict';
 
 // From: https://github.com/w3c/web-platform-tests/blob/fa9436d12c/encoding/textencoder-utf16-surrogates.html
+// TODO(joyeecheung): replace this with WPT
 
 require('../common');
 

From d70ad5f91733eaa9bf5583106dd303dafb35636e Mon Sep 17 00:00:00 2001
From: Joyee Cheung <joyeec9h3@gmail.com>
Date: Thu, 20 Dec 2018 14:35:58 +0800
Subject: [PATCH 4/5] test: rename custom encoding tests that cannot be
 replaced by WPT

---
 ...ming.js => test-whatwg-encoding-custom-fatal-streaming.js} | 4 ++++
 ...-internals.js => test-whatwg-encoding-custom-internals.js} | 2 ++
 ...-textencoder.js => test-whatwg-encoding-custom-interop.js} | 4 ++++
 3 files changed, 10 insertions(+)
 rename test/parallel/{test-whatwg-encoding-fatal-streaming.js => test-whatwg-encoding-custom-fatal-streaming.js} (88%)
 rename test/parallel/{test-whatwg-encoding-internals.js => test-whatwg-encoding-custom-internals.js} (98%)
 rename test/parallel/{test-whatwg-encoding-textencoder.js => test-whatwg-encoding-custom-interop.js} (93%)

diff --git a/test/parallel/test-whatwg-encoding-fatal-streaming.js b/test/parallel/test-whatwg-encoding-custom-fatal-streaming.js
similarity index 88%
rename from test/parallel/test-whatwg-encoding-fatal-streaming.js
rename to test/parallel/test-whatwg-encoding-custom-fatal-streaming.js
index ddedb483624331..d1199874871133 100644
--- a/test/parallel/test-whatwg-encoding-fatal-streaming.js
+++ b/test/parallel/test-whatwg-encoding-custom-fatal-streaming.js
@@ -1,6 +1,7 @@
 'use strict';
 
 // From: https://github.com/w3c/web-platform-tests/blob/d74324b53c/encoding/textdecoder-fatal-streaming.html
+// With the twist that we specifically test for Node.js error codes
 
 const common = require('../common');
 
@@ -28,6 +29,7 @@ const assert = require('assert');
       }
     );
 
+    // TODO(joyeecheung): remove this when WPT is ported
     assert.strictEqual(
       new TextDecoder(testCase.encoding).decode(data),
       '\uFFFD'
@@ -40,6 +42,7 @@ const assert = require('assert');
   const odd = new Uint8Array([0x00]);
   const even = new Uint8Array([0x00, 0x00]);
 
+  // TODO(joyeecheung): remove this when WPT is ported
   assert.strictEqual(decoder.decode(odd, { stream: true }), '');
   assert.strictEqual(decoder.decode(odd), '\u0000');
 
@@ -67,6 +70,7 @@ const assert = require('assert');
     }
   );
 
+  // TODO(joyeecheung): remove this when WPT is ported
   assert.strictEqual(decoder.decode(even, { stream: true }), '\u0000');
   assert.strictEqual(decoder.decode(even), '\u0000');
 }
diff --git a/test/parallel/test-whatwg-encoding-internals.js b/test/parallel/test-whatwg-encoding-custom-internals.js
similarity index 98%
rename from test/parallel/test-whatwg-encoding-internals.js
rename to test/parallel/test-whatwg-encoding-custom-internals.js
index d025642365ff73..64bf6abe0d97be 100644
--- a/test/parallel/test-whatwg-encoding-internals.js
+++ b/test/parallel/test-whatwg-encoding-custom-internals.js
@@ -1,6 +1,8 @@
 // Flags: --expose-internals
 'use strict';
 
+// This tests internal mapping of the Node.js encoding implementation
+
 require('../common');
 
 const assert = require('assert');
diff --git a/test/parallel/test-whatwg-encoding-textencoder.js b/test/parallel/test-whatwg-encoding-custom-interop.js
similarity index 93%
rename from test/parallel/test-whatwg-encoding-textencoder.js
rename to test/parallel/test-whatwg-encoding-custom-interop.js
index 9022477229c0de..0ea732a03d765b 100644
--- a/test/parallel/test-whatwg-encoding-textencoder.js
+++ b/test/parallel/test-whatwg-encoding-custom-interop.js
@@ -1,4 +1,8 @@
 // Flags: --expose-internals
+
+// This tests interoperability between TextEncoder and TextDecoder with
+// Node.js util.inspect and Buffer APIs
+
 'use strict';
 
 const common = require('../common');

From 48c74f1ec6f22360d1c6fcb3696ddb45c21edaea Mon Sep 17 00:00:00 2001
From: Joyee Cheung <joyeec9h3@gmail.com>
Date: Thu, 20 Dec 2018 14:36:28 +0800
Subject: [PATCH 5/5] test: add TODO to encoding tests that can be replaced
 with WPT

---
 test/parallel/test-whatwg-encoding-surrogates-utf8.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/parallel/test-whatwg-encoding-surrogates-utf8.js b/test/parallel/test-whatwg-encoding-surrogates-utf8.js
index fd66a1e02e50a8..7a155cdc537a9c 100644
--- a/test/parallel/test-whatwg-encoding-surrogates-utf8.js
+++ b/test/parallel/test-whatwg-encoding-surrogates-utf8.js
@@ -1,6 +1,7 @@
 'use strict';
 
 // From: https://github.com/w3c/web-platform-tests/blob/fa9436d12c/encoding/api-surrogates-utf8.html
+// TODO(joyeecheung): replace this with WPT
 
 require('../common');