test_runner: refactor to use min/max of validateInteger

deokjinkim · targos · commit 07c601e32fcf · 2024-06-03T08:48:33.000+02:00
Instead of additional `if` statement, use min/max of `validateInteger` for `shard.index`. PR-URL: #53148 Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Chemi Atlow <chemi@atlow.co.il> Reviewed-By: Moshe Atlow <moshe@atlow.co.il> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
diff --git a/lib/internal/test_runner/runner.js b/lib/internal/test_runner/runner.js
@@ -41,7 +41,6 @@ const {
   codes: {
     ERR_INVALID_ARG_TYPE,
     ERR_INVALID_ARG_VALUE,
-    ERR_OUT_OF_RANGE,
     ERR_TEST_FAILURE,
   },
 } = require('internal/errors');
@@ -495,11 +494,7 @@ function run(options = kEmptyObject) {
     shard = { __proto__: null, index: shard.index, total: shard.total };
 
     validateInteger(shard.total, 'options.shard.total', 1);
-    validateInteger(shard.index, 'options.shard.index');
-
-    if (shard.index <= 0 || shard.total < shard.index) {
-      throw new ERR_OUT_OF_RANGE('options.shard.index', `>= 1 && <= ${shard.total} ("options.shard.total")`, shard.index);
-    }
+    validateInteger(shard.index, 'options.shard.index', 1, shard.total);
 
     if (watch) {
       throw new ERR_INVALID_ARG_VALUE('options.shard', watch, 'shards not supported with watch mode');
diff --git a/test/parallel/test-runner-cli.js b/test/parallel/test-runner-cli.js
@@ -238,7 +238,7 @@ const testFixtures = fixtures.path('test-runner');
 
   assert.strictEqual(child.status, 1);
   assert.strictEqual(child.signal, null);
-  assert.match(child.stderr.toString(), /The value of "options\.shard\.index" is out of range\. It must be >= 1 && <= 3 \("options\.shard\.total"\)\. Received 0/);
+  assert.match(child.stderr.toString(), /The value of "options\.shard\.index" is out of range\. It must be >= 1 && <= 3\. Received 0/);
   const stdout = child.stdout.toString();
   assert.strictEqual(stdout, '');
 }
diff --git a/test/parallel/test-runner-run.mjs b/test/parallel/test-runner-run.mjs
@@ -345,8 +345,7 @@ describe('require(\'node:test\').run', { concurrency: true }, () => {
         }), {
           name: 'RangeError',
           code: 'ERR_OUT_OF_RANGE',
-          // eslint-disable-next-line @stylistic/js/max-len
-          message: 'The value of "options.shard.index" is out of range. It must be >= 1 && <= 6 ("options.shard.total"). Received 0'
+          message: 'The value of "options.shard.index" is out of range. It must be >= 1 && <= 6. Received 0'
         });
       });
 
@@ -360,8 +359,7 @@ describe('require(\'node:test\').run', { concurrency: true }, () => {
         }), {
           name: 'RangeError',
           code: 'ERR_OUT_OF_RANGE',
-          // eslint-disable-next-line @stylistic/js/max-len
-          message: 'The value of "options.shard.index" is out of range. It must be >= 1 && <= 6 ("options.shard.total"). Received 7'
+          message: 'The value of "options.shard.index" is out of range. It must be >= 1 && <= 6. Received 7'
         });
       });
 

Original file line number	Diff line number	Diff line change
`@@ -238,7 +238,7 @@ const testFixtures = fixtures.path('test-runner');`
`238`	`238`
`239`	`239`	`assert.strictEqual(child.status, 1);`
`240`	`240`	`assert.strictEqual(child.signal, null);`
`241`		`- assert.match(child.stderr.toString(), /The value of "options\.shard\.index" is out of range\. It must be >= 1 && <= 3 \("options\.shard\.total"\)\. Received 0/);`
	`241`	`+ assert.match(child.stderr.toString(), /The value of "options\.shard\.index" is out of range\. It must be >= 1 && <= 3\. Received 0/);`
`242`	`242`	`const stdout = child.stdout.toString();`
`243`	`243`	`assert.strictEqual(stdout, '');`
`244`	`244`	`}`