test: fix reader tests

packages/reader/test/allure1.test.ts

@@ -10,31 +10,31 @@ describe("allure1 reader", () => {
   it("should parse empty xml file", async () => {
     const visitor = mockVisitor();
     const resultFile = await readResourceAsResultFile("allure1data/empty-file.xml", randomTestsuiteFileName());
-    const read = await allure1.read(visitor, resultFile);
+    const read = await allure1.readFile(visitor, resultFile);
 
     expect(read).toBeFalsy();
   });
 
   it("should parse empty xml correct xml heading", async () => {
     const visitor = mockVisitor();
     const resultFile = await readResourceAsResultFile("allure1data/empty-xml.xml", randomTestsuiteFileName());
-    const read = await allure1.read(visitor, resultFile);
+    const read = await allure1.readFile(visitor, resultFile);
 
     expect(read).toBeFalsy();
   });
 
   it("should parse empty root element", async () => {
     const visitor = mockVisitor();
     const resultFile = await readResourceAsResultFile("allure1data/empty-root.xml", randomTestsuiteFileName());
-    const read = await allure1.read(visitor, resultFile);
+    const read = await allure1.readFile(visitor, resultFile);
 
     expect(read).toBeFalsy();
   });
 
   it("should parse test-suites element with invalid type", async () => {
     const visitor = mockVisitor();
     const resultFile = await readResourceAsResultFile("allure1data/invalid-root.xml", randomTestsuiteFileName());
-    const read = await allure1.read(visitor, resultFile);
+    const read = await allure1.readFile(visitor, resultFile);
 
     expect(read).toBeFalsy();
   });

packages/reader/test/junitxml.test.ts

@@ -640,23 +640,23 @@ describe("junit xml reader", () => {
   it("should ignore invalid root element", async () => {
     const visitor = mockVisitor();
     const resultFile = await readResourceAsResultFile("junitxmldata/invalid.xml", randomTestsuiteFileName());
-    const read = await junitXml.read(visitor, resultFile);
+    const read = await junitXml.readFile(visitor, resultFile);
 
     expect(read).toBeFalsy();
   });
 
   it("should parse empty root element", async () => {
     const visitor = mockVisitor();
     const resultFile = await readResourceAsResultFile("junitxmldata/empty.xml", randomTestsuiteFileName());
-    const read = await junitXml.read(visitor, resultFile);
+    const read = await junitXml.readFile(visitor, resultFile);
 
     expect(read).toBeTruthy();
   });
 
   it("should parse test-suites element with invalid type", async () => {
     const visitor = mockVisitor();
     const resultFile = await readResourceAsResultFile("junitxmldata/wrong-type.xml", randomTestsuiteFileName());
-    const read = await junitXml.read(visitor, resultFile);
+    const read = await junitXml.readFile(visitor, resultFile);
 
     expect(read).toBeFalsy();
   });

packages/reader/test/utils.ts

@@ -1,10 +1,12 @@
-import { ResultFile } from "@allurereport/plugin-api";
-import { PathResultFile, ResultsReader, ResultsVisitor } from "@allurereport/reader-api";
+import type { ResultFile } from "@allurereport/plugin-api";
+import type { DirectoryResultsReader, FileResultsReader, ResultsVisitor } from "@allurereport/reader-api";
+import { PathResultFile } from "@allurereport/reader-api";
 import { attachment, step } from "allure-js-commons";
 import { existsSync } from "fs";
 import { readFile } from "node:fs/promises";
 import { basename, resolve } from "node:path";
-import { Mocked, expect, vi } from "vitest";
+import type { Mocked } from "vitest";
+import { expect, vi } from "vitest";
 
 export const buildResourcePath = (path: string) => resolve(__dirname, "./resources", path);
 
@@ -14,6 +16,7 @@ export const readResourceAsJson = async <T>(path: string) => {
 
   return JSON.parse(resourceContent) as T;
 };
+
 export const readResourceAsResultFile = async (path: string, filename?: string) => {
   const resourcePath = buildResourcePath(path);
 
@@ -24,6 +27,16 @@ export const readResourceAsResultFile = async (path: string, filename?: string)
   return new PathResultFile(resourcePath, filename || basename(path));
 };
 
+export const resolveResourceDirectory = async (path: string) => {
+  const resourcePath = buildResourcePath(path);
+
+  if (!existsSync(resourcePath)) {
+    throw new Error(`Resource ${resourcePath} not found`);
+  }
+
+  return path;
+};
+
 export const mockVisitor: () => Mocked<ResultsVisitor> = () => ({
   visitTestResult: vi.fn<ResultsVisitor["visitTestResult"]>(),
   visitAttachmentFile: vi.fn<ResultsVisitor["visitAttachmentFile"]>(),
@@ -32,7 +45,7 @@ export const mockVisitor: () => Mocked<ResultsVisitor> = () => ({
 });
 
 export const readResults = async (
-  reader: ResultsReader,
+  reader: FileResultsReader,
   files: Record<string, string> = {},
   result: boolean = true,
 ) => {
@@ -41,7 +54,20 @@ export const readResults = async (
     for (const filesKey in files) {
       const resultFile = await readResourceAsResultFile(filesKey, files[filesKey]);
       await attachResultFile(resultFile);
-      const read = await reader.read(visitor, resultFile);
+      const read = await reader.readFile(visitor, resultFile);
+      expect(read).toBe(result);
+    }
+    return visitor;
+  });
+};
+
+export const readDirectoryResults = async (reader: DirectoryResultsReader, paths: string, result: boolean = true) => {
+  return step("readResults", async () => {
+    const visitor = mockVisitor();
+    for (const path of paths) {
+      const resultDir = await resolveResourceDirectory(path);
+      await attachResultDir(resultDir);
+      const read = await reader.readDirectory(visitor, resultDir);
       expect(read).toBe(result);
     }
     return visitor;
@@ -54,3 +80,7 @@ export const attachResultFile = async (resultFile: ResultFile) => {
     await attachment(resultFile.getOriginalFileName(), content, resultFile.getContentType() ?? "text/plain");
   }
 };
+
+export const attachResultDir = async (path: string) => {
+  await attachment(basename(path), "", "application/zip");
+};