Test262: using default prepare_args() where appropriate.

diff --git a/test/buffer.t.js b/test/buffer.t.js
index 8e3f4ca9f6f240c26e270ce10bde1ecc01be1035..01e25beda177d1d3a96d0e4b280420706257228f 100644 (file)
--- a/test/buffer.t.js
+++ b/test/buffer.t.js
@@ -3,13 +3,6 @@ includes: [compatBuffer.js, runTsuite.js, compareArray.js]
 flags: [async]
 ---*/
 
-function p(args, default_opts) {
-    let params = merge({}, default_opts);
-    params = merge(params, args);
-
-    return params;
-}
-
 let alloc_tsuite = {
     name: "Buffer.alloc() tests",
     skip: () => (!has_buffer()),
@@ -23,7 +16,6 @@ let alloc_tsuite = {
         return 'SUCCESS';
     },
 
-    prepare_args: p,
     opts: { encoding: 'utf-8' },
 
     tests: [
@@ -56,7 +48,6 @@ let byteLength_tsuite = {
         return 'SUCCESS';
     },
 
-    prepare_args: p,
     opts: { encoding: 'utf-8' },
 
     tests: [
@@ -95,7 +86,6 @@ let concat_tsuite = {
         return 'SUCCESS';
     },
 
-    prepare_args: p,
     opts: {},
     tests: [
         { buffers: [ Buffer.from('abc'),
@@ -122,7 +112,6 @@ let compare_tsuite = {
         return 'SUCCESS';
     },
 
-    prepare_args: p,
     opts: {},
 
     tests: [
@@ -161,7 +150,6 @@ let comparePrototype_tsuite = {
         return 'SUCCESS';
     },
 
-    prepare_args: p,
     opts: {},
 
     tests: [
@@ -212,7 +200,6 @@ let copy_tsuite = {
         return 'SUCCESS';
     },
 
-    prepare_args: p,
     opts: {},
 
     tests: [
@@ -249,7 +236,6 @@ let equals_tsuite = {
         return 'SUCCESS';
     },
 
-    prepare_args: p,
     opts: {},
     tests: [
 
@@ -285,7 +271,6 @@ let fill_tsuite = {
         return 'SUCCESS';
     },
 
-    prepare_args: p,
     opts: {},
     tests: [
         { buf: Buffer.from('abc'), value: 0x61, expected: 'aaa' },
@@ -336,7 +321,7 @@ let from_tsuite = {
 
         return 'SUCCESS';
     },
-    prepare_args: p,
+
     opts: { fmt: 'utf-8' },
 
     tests: [
@@ -445,7 +430,6 @@ let includes_tsuite = {
         return 'SUCCESS';
     },
 
-    prepare_args: p,
     opts: {},
 
     tests: [
@@ -471,7 +455,6 @@ let indexOf_tsuite = {
         return 'SUCCESS';
     },
 
-    prepare_args: p,
     opts: {},
 
     tests: [
@@ -519,7 +502,7 @@ let isBuffer_tsuite = {
 
         return 'SUCCESS';
     },
-    prepare_args: p,
+
     opts: {},
 
     tests: [
@@ -543,7 +526,6 @@ let isEncoding_tsuite = {
         return 'SUCCESS';
     },
 
-    prepare_args: p,
     opts: {},
 
     tests: [
@@ -594,7 +576,6 @@ let lastIndexOf_tsuite = {
         return 'SUCCESS';
     },
 
-    prepare_args: p,
     opts: {},
 
     tests: [
@@ -659,7 +640,6 @@ let readXIntXX_tsuite = {
         return 'SUCCESS';
     },
 
-    prepare_args: p,
     opts: {},
 
     tests: [
@@ -719,7 +699,6 @@ let readFloat_tsuite = {
         return 'SUCCESS';
     },
 
-    prepare_args: p,
     opts: {},
 
     tests: [
@@ -748,7 +727,6 @@ let readGeneric_tsuite = {
         return 'SUCCESS';
     },
 
-    prepare_args: p,
     opts: {},
 
     tests: [
@@ -789,7 +767,6 @@ let slice_tsuite = {
         return 'SUCCESS';
     },
 
-    prepare_args: p,
     opts: {},
 
     tests: [
@@ -818,7 +795,6 @@ let subarray_tsuite = {
         return 'SUCCESS';
     },
 
-    prepare_args: p,
     opts: {},
 
     tests: [
@@ -841,7 +817,6 @@ let swap_tsuite = {
         return 'SUCCESS';
     },
 
-    prepare_args: p,
     opts: { swap: 'swap16' },
 
     tests: [
@@ -867,8 +842,8 @@ let toJSON_tsuite = {
         return 'SUCCESS';
     },
 
-    prepare_args: p,
     opts: {},
+
     tests: [
         { value: '', expected: { type: 'Buffer', data: [] } },
         { value: 'αβγ', expected: { type: 'Buffer', data: [0xCE, 0xB1, 0xCE, 0xB2, 0xCE, 0xB3] } },
@@ -893,7 +868,7 @@ let toString_tsuite = {
 
         return 'SUCCESS';
     },
-    prepare_args: p,
+
     opts: { fmt: 'utf-8' },
 
     tests: [
@@ -937,7 +912,6 @@ let write_tsuite = {
         return 'SUCCESS';
     },
 
-    prepare_args: p,
     opts: {},
 
     tests: [
@@ -981,7 +955,6 @@ let writeXIntXX_tsuite = {
         return 'SUCCESS';
     },
 
-    prepare_args: p,
     opts: {},
 
     tests: [
@@ -1022,7 +995,6 @@ let writeGeneric_tsuite = {
         return 'SUCCESS';
     },
 
-    prepare_args: p,
     opts: {},
 
     tests: [

diff --git a/test/harness/runTsuite.js b/test/harness/runTsuite.js
index 1823e4a2054d405860a2f1b6afa4449bd8f118bb..068a19e19fccdcdfa59d48d02b8c744b6acf94e9 100644 (file)
--- a/test/harness/runTsuite.js
+++ b/test/harness/runTsuite.js
@@ -26,7 +26,10 @@ async function run(tlist) {
                     return Promise.resolve("SKIPPED");
                 }
 
-                return ts.T(ts.prepare_args(t, ts.opts));
+                let prepare_args = ts.prepare_args ? ts.prepare_args
+                                                   : default_prepare_args;
+
+                return ts.T(prepare_args(t, ts.opts));
 
             } catch (e) {
                 return Promise.reject(e);
@@ -57,6 +60,13 @@ async function run(tlist) {
     }
 }
 
+function default_prepare_args(args, default_opts) {
+    let params = merge({}, default_opts);
+    params = merge(params, args);
+
+    return params;
+}
+
 function merge(to, from) {
     let r = Object.assign(Array.isArray(to) ? [] : {}, to);
     Object.keys(from).forEach(v => {

diff --git a/test/querystring.t.mjs b/test/querystring.t.mjs
index b382d10d78eb75d65525d299acb5cfd1d48de93b..cb42305e2152f55b3f3b2e1ccb0b56fb54574d3f 100644 (file)
--- a/test/querystring.t.mjs
+++ b/test/querystring.t.mjs
@@ -16,12 +16,7 @@ let escape_tsuite = {
 
         return 'SUCCESS';
     },
-    prepare_args: (args, default_opts) => {
-        let params = merge({}, default_opts);
-        params = merge(params, args);
 
-        return params;
-    },
     opts: { },
 
     tests: [
@@ -66,12 +61,7 @@ let parse_tsuite = {
 
         return 'SUCCESS';
     },
-    prepare_args: (args, default_opts) => {
-        let params = merge({}, default_opts);
-        params = merge(params, args);
 
-        return params;
-    },
     opts: { },
 
     tests: [
@@ -174,12 +164,7 @@ let stringify_tsuite = {
 
         return 'SUCCESS';
     },
-    prepare_args: (args, default_opts) => {
-        let params = merge({}, default_opts);
-        params = merge(params, args);
 
-        return params;
-    },
     opts: { },
 
     tests: [
@@ -230,12 +215,7 @@ let unescape_tsuite = {
 
         return 'SUCCESS';
     },
-    prepare_args: (args, default_opts) => {
-        let params = merge({}, default_opts);
-        params = merge(params, args);
 
-        return params;
-    },
     opts: { },
 
     tests: [

diff --git a/test/text_decoder.t.js b/test/text_decoder.t.js
index 2eb879c006fda4dd69dce2097aa33f869690e5b9..a6fced2bbcb5e9719393011ebe819d4584307457 100644 (file)
--- a/test/text_decoder.t.js
+++ b/test/text_decoder.t.js
@@ -40,7 +40,6 @@ let stream_tsuite = {
         return 'SUCCESS';
     },
 
-    prepare_args: p,
     opts: {},
 
     tests: [
@@ -96,7 +95,6 @@ let fatal_tsuite = {
         return 'SUCCESS';
     },
 
-    prepare_args: p,
     opts: {},
 
     tests: [
@@ -126,7 +124,6 @@ let ignoreBOM_tsuite = {
         return 'SUCCESS';
     },
 
-    prepare_args: p,
     opts: {},
 
     tests: [

diff --git a/test/text_encoder.t.js b/test/text_encoder.t.js
index e790ae378a9aaa3a497f112e074da7d810e4ca9f..10324bcafc712f4ef0eedf906fd9aa6b8e62e36d 100644 (file)
--- a/test/text_encoder.t.js
+++ b/test/text_encoder.t.js
@@ -4,13 +4,6 @@ includes: [runTsuite.js, compareArray.js]
 flags: [async]
 ---*/
 
-function p(args, default_opts) {
-    let params = merge({}, default_opts);
-    params = merge(params, args);
-
-    return params;
-}
-
 let encode_tsuite = {
     name: "TextEncoder() encode tests",
     T: async (params) => {
@@ -33,7 +26,6 @@ let encode_tsuite = {
         return 'SUCCESS';
     },
 
-    prepare_args: p,
     opts: {},
 
     tests: [
@@ -66,7 +58,6 @@ let encodeinto_tsuite = {
         return 'SUCCESS';
     },
 
-    prepare_args: p,
     opts: {},
 
     tests: [

diff --git a/test/xml/saml_verify.t.mjs b/test/xml/saml_verify.t.mjs
index 875fbd40c4ce903673b420bcd50ed2ec70880b6d..d6f06a149632fb5a0f1d26020ddee2bccb471d6a 100644 (file)
--- a/test/xml/saml_verify.t.mjs
+++ b/test/xml/saml_verify.t.mjs
@@ -271,18 +271,10 @@ async function signatureSAML(signature, key_data, produce) {
                                       signedInfoC14n);
 }
 
-function p(args, default_opts) {
-    let params = merge({}, default_opts);
-    params = merge(params, args);
-
-    return params;
-}
-
 let saml_verify_tsuite = {
     name: "SAML verify",
     skip: () => (!has_njs() || !has_webcrypto() || !has_xml()),
     T: verify,
-    prepare_args: p,
     opts: {
         key: { fmt: "spki", file: "rsa.spki" },
     },

diff --git a/test/zlib.t.mjs b/test/zlib.t.mjs
index d972f6f839fb14fcb2355a879c20bddde20e66e5..faef1fb018a61e728f17af5514c81b2df4bd6553 100644 (file)
--- a/test/zlib.t.mjs
+++ b/test/zlib.t.mjs
@@ -5,13 +5,6 @@ flags: [async]
 
 import zlib from 'zlib';
 
-function p(args, default_opts) {
-    let params = merge({}, default_opts);
-    params = merge(params, args);
-
-    return params;
-}
-
 let deflateSync_tsuite = {
     name: "deflateSync()/deflateRawSync() tests",
     skip: () => !zlib.deflateRawSync,
@@ -29,7 +22,7 @@ let deflateSync_tsuite = {
 
         return 'SUCCESS';
     },
-    prepare_args: p,
+
     opts: { raw: true },
 
     tests: [
@@ -72,7 +65,7 @@ let inflateSync_tsuite = {
 
         return 'SUCCESS';
     },
-    prepare_args: p,
+
     opts: { raw: true },
 
     tests: [