Tests: make result.json files optional

ursalang · Jul 22, 2024 · d5cc9e3 · d5cc9e3
1 parent a940efe
commit d5cc9e3
Show file tree

Hide file tree

Showing 16 changed files with 14 additions and 25 deletions.
diff --git a/rosettacode/Accumulator factory.result.json b/rosettacode/Accumulator factory.result.json
diff --git a/rosettacode/Ackermann function.result.json b/rosettacode/Ackermann function.result.json
diff --git a/rosettacode/Anagrams.result.json b/rosettacode/Anagrams.result.json
diff --git a/rosettacode/FizzBuzz.result.json b/rosettacode/FizzBuzz.result.json
diff --git a/rosettacode/Generator-Exponential.result.json b/rosettacode/Generator-Exponential.result.json
diff --git a/rosettacode/Hailstone sequence.result.json b/rosettacode/Hailstone sequence.result.json
diff --git a/rosettacode/Hello world-Text.result.json b/rosettacode/Hello world-Text.result.json
diff --git a/rosettacode/Loops-Continue.result.json b/rosettacode/Loops-Continue.result.json
diff --git a/src/testutil.ts b/src/testutil.ts
@@ -89,14 +89,16 @@ async function doCliTest(
   t: ExecutionContext,
   syntax: string,
   inputBasename: string,
-  resultJsonFilename: string,
+  realSourceBasename?: string,
   extraArgs?: string[],
   expectedStdout?: string,
   expectedStderr?: string,
   useRepl?: boolean,
   target: string = 'ark',
 ) {
-  const inputFile = `${inputBasename}.${syntax}`
+  const resultJsonFilename = `${inputBasename}.result.json`
+  const actualSourceBasename = realSourceBasename ?? inputBasename
+  const inputFile = `${actualSourceBasename}.${syntax}`
   const args = [`--syntax=${syntax}`, `--target=${target}`]
   let tempFile: tmp.FileResult
   if (!useRepl) {
@@ -111,8 +113,12 @@ async function doCliTest(
     )
     if (!useRepl) {
       const result: unknown = JSON.parse(fs.readFileSync(tempFile!.name, {encoding: 'utf-8'}))
-      const expected: unknown = JSON.parse(fs.readFileSync(resultJsonFilename, {encoding: 'utf-8'}))
-      t.deepEqual(result, expected)
+      const expected: unknown = fs.existsSync(resultJsonFilename)
+        ? JSON.parse(fs.readFileSync(resultJsonFilename, {encoding: 'utf-8'}))
+        : undefined
+      if (expected !== undefined) {
+        t.deepEqual(result, expected)
+      }
     }
     if (syntax === 'json') {
       const source = fs.readFileSync(inputFile, {encoding: 'utf-8'})
@@ -194,13 +200,12 @@ const reformattingCliTest = test.macro(async (
   expectedReformattedStderr?: string,
   syntaxErrorExpected?: boolean,
 ) => {
-  const resultFile = `${inputBasename}.result.json`
   for (const target of arkTargets) {
     await doCliTest(
       t,
       'ursa',
       inputBasename,
-      resultFile,
+      undefined,
       extraArgs,
       expectedStdout,
       expectedStderr,
@@ -212,8 +217,8 @@ const reformattingCliTest = test.macro(async (
     await doCliTest(
       t,
       'ursa',
+      inputBasename,
       makeReformattedSource(t, `${inputBasename}.ursa`),
-      resultFile,
       extraArgs,
       expectedStdout,
       expectedReformattedStderr ?? expectedStderr,
@@ -233,7 +238,6 @@ const reformattingCliDirTest = test.macro(async (
   expectedReformattedStderr?: string,
   syntaxErrorExpected?: boolean,
 ) => {
-  const resultFile = `${inputBasename}.result.json`
   for (const target of arkTargets) {
     await doDirTest(
       t,
@@ -243,7 +247,7 @@ const reformattingCliDirTest = test.macro(async (
           t,
           'ursa',
           inputBasename,
-          resultFile,
+          undefined,
           [tmpDirPath, ...extraArgs ?? []],
           expectedStdout,
           expectedStderr,
@@ -261,8 +265,8 @@ const reformattingCliDirTest = test.macro(async (
         doCliTest(
           t,
           'ursa',
+          inputBasename,
           makeReformattedSource(t, `${inputBasename}.ursa`),
-          resultFile,
           [tmpDirPath, ...extraArgs ?? []],
           expectedStdout,
           expectedReformattedStderr ?? expectedStderr,

diff --git a/test/advent-of-code-2023-day-25.result.json b/test/advent-of-code-2023-day-25.result.json
diff --git a/test/else-if.result.json b/test/else-if.result.json
diff --git a/test/generator.result.json b/test/generator.result.json
diff --git a/test/print.result.json b/test/print.result.json
diff --git a/test/syms.result.json b/test/syms.result.json
diff --git a/test/two-sequential-loops.result.json b/test/two-sequential-loops.result.json
diff --git a/test/yield.result.json b/test/yield.result.json