minor changes to test scripts

microsoft · Mar 9, 2023 · 3a93014 · 3a93014
1 parent 3aed503
commit 3a93014
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 12 deletions.
diff --git a/src/test/scripts/createBenchmark.ts b/src/test/scripts/createBenchmark.ts
@@ -8,7 +8,7 @@ import * as path from "path";
 
 import { ArrayUtils, DefaultSettings, Settings, Task, TaskUtils } from "../../powerquery-parser";
 import { BenchmarkTraceManager, NoOpTraceManagerInstance } from "../../powerquery-parser/common/trace";
-import { TestConstants, TestFileUtils, TestResourceUtils } from "../testUtils";
+import { TestConstants, TestFileUtils, TestResourceUtils, TestUtils } from "../testUtils";
 import { TestResource } from "../testUtils/resourceUtils";
 
 const BenchmarkDirectory: string = path.join(__dirname, "benchmark");
@@ -49,10 +49,6 @@ function jsonStringify(value: unknown): string {
     return JSON.stringify(value, undefined, 4);
 }
 
-function zFill(currentValue: number, upperBound: number): string {
-    return currentValue.toString().padStart(Math.ceil(Math.log10(upperBound + 1)), "0");
-}
-
 function createParserSummaryDurations(
     resourceSummaries: ReadonlyArray<ResourceSummary>,
     filterOutOutliers: boolean,
@@ -99,15 +95,17 @@ async function main(): Promise<void> {
     for (let resourceIndex: number = 0; resourceIndex < numResources; resourceIndex += 1) {
         const { fileContents, filePath, resourceName }: TestResource = ArrayUtils.assertGet(resources, resourceIndex);
 
-        console.log(`Starting resource ${zFill(resourceIndex + 1, numResources)} out of ${numResources}: ${filePath}`);
+        console.log(
+            `Starting resource ${TestUtils.zFill(resourceIndex + 1, numResources)} out of ${numResources}: ${filePath}`,
+        );
 
         for (const [parserName, parser] of TestConstants.ParserByParserName.entries()) {
             let failedToParse: boolean = false;
             const durations: number[] = [];
 
             for (let iteration: number = 0; iteration < IterationsPerFile; iteration += 1) {
                 console.log(
-                    `\tIteration ${zFill(
+                    `\tIteration ${TestUtils.zFill(
                         iteration + 1,
                         IterationsPerFile,
                     )} out of ${IterationsPerFile} using ${parserName}`,
@@ -144,7 +142,7 @@ async function main(): Promise<void> {
                             "traces",
                             parserName,
                             resourceName,
-                            `iteration_${zFill(iteration, IterationsPerFile)}.log`,
+                            `iteration_${TestUtils.zFill(iteration, IterationsPerFile)}.log`,
                         ),
                         contents,
                     );

diff --git a/src/test/scripts/createNodeDump.ts b/src/test/scripts/createNodeDump.ts
@@ -3,7 +3,7 @@
 
 import * as path from "path";
 
-import { Assert, DefaultSettings, Settings, Task, TaskUtils } from "../../powerquery-parser";
+import { ArrayUtils, Assert, DefaultSettings, Settings, Task, TaskUtils } from "../../powerquery-parser";
 import { Ast, AstUtils } from "../../powerquery-parser/language";
 import {
     NodeIdMap,
@@ -13,7 +13,7 @@ import {
     XorNodeKind,
     XorNodeUtils,
 } from "../../powerquery-parser/parser";
-import { TestConstants, TestFileUtils, TestResourceUtils } from "../testUtils";
+import { TestConstants, TestFileUtils, TestResourceUtils, TestUtils } from "../testUtils";
 import { TestResource } from "../testUtils/resourceUtils";
 
 const OutputDirectory: string = path.join(__dirname, "nodeDump");
@@ -45,8 +45,17 @@ async function main(): Promise<void> {
             parser,
         };
 
-        for (const resource of resources) {
-            console.log(`Starting ${resource.filePath} using ${parserName}`);
+        const numResources: number = resources.length;
+
+        for (let index: number = 0; index < numResources; index += 1) {
+            const resource: TestResource = ArrayUtils.assertGet(resources, index);
+
+            console.log(
+                `Starting ${resource.filePath} using ${parserName} (${TestUtils.zFill(
+                    index + 1,
+                    numResources,
+                )} out of ${numResources})`,
+            );
 
             // eslint-disable-next-line no-await-in-loop
             const nodeDump: TNodeDump = await lexParseDump(settings, resource);

diff --git a/src/test/testUtils/index.ts b/src/test/testUtils/index.ts
@@ -5,3 +5,4 @@ export * as TestAssertUtils from "./assertUtils";
 export * as TestConstants from "./testConstants";
 export * as TestFileUtils from "./fileUtils";
 export * as TestResourceUtils from "./resourceUtils";
+export * as TestUtils from "./testHelperUtils";
diff --git a/src/test/testUtils/testHelperUtils.ts b/src/test/testUtils/testHelperUtils.ts
@@ -0,0 +1,6 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+export function zFill(currentValue: number, upperBound: number): string {
+    return currentValue.toString().padStart(Math.ceil(Math.log10(upperBound + 1)), "0");
+}