testit-js-commons 3.3.0 → 3.4.0

package/lib/client/client.d.ts

@@ -1,10 +1,11 @@
 import { AdapterConfig } from "../common";
-import { type IAttachmentsService, type IAutotestService, type ITestRunsService } from "../services";
+import { type IAttachmentsService, type IAutotestService, type ITestResultsService, type ITestRunsService } from "../services";
 import { IClient } from "./client.type";
 export declare class Client implements IClient {
     private readonly config;
     attachments: IAttachmentsService;
     autoTests: IAutotestService;
+    testResults: ITestResultsService;
     testRuns: ITestRunsService;
     constructor(config: AdapterConfig);
     getConfig(): Readonly<AdapterConfig>;

package/lib/client/client.js

@@ -7,6 +7,7 @@ class Client {
         this.config = config;
         this.attachments = new services_1.AttachmentsService(config);
         this.autoTests = new services_1.AutotestsService(config);
+        this.testResults = new services_1.TestResultsService(config);
         this.testRuns = new services_1.TestRunsService(config);
     }
     getConfig() {

package/lib/client/client.type.d.ts

@@ -1,8 +1,9 @@
-import type { IAttachmentsService, IAutotestService, ITestRunsService } from "../services";
+import type { IAttachmentsService, IAutotestService, ITestResultsService, ITestRunsService } from "../services";
 import type { AdapterConfig } from "../common";
 export interface IClient {
     attachments: IAttachmentsService;
     autoTests: IAutotestService;
+    testResults: ITestResultsService;
     testRuns: ITestRunsService;
     getConfig(): AdapterConfig;
 }

package/lib/services/index.d.ts

@@ -1,3 +1,4 @@
 export * from "./attachments";
 export * from "./autotests";
+export * from "./testresults";
 export * from "./testruns";

package/lib/services/index.js

@@ -16,4 +16,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./attachments"), exports);
 __exportStar(require("./autotests"), exports);
+__exportStar(require("./testresults"), exports);
 __exportStar(require("./testruns"), exports);

package/lib/services/testresults/index.d.ts

@@ -0,0 +1,2 @@
+export * from "./testresults.service";
+export * from "./testresults.type";

package/lib/services/testresults/index.js

@@ -0,0 +1,18 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./testresults.service"), exports);
+__exportStar(require("./testresults.type"), exports);

package/lib/services/testresults/testresults.converter.d.ts

@@ -0,0 +1,9 @@
+import { TestResultsFilterApiModel } from "testit-api-client";
+import { AdapterConfig, BaseConverter } from "../../common";
+export interface ITestResultsConverter {
+    getTestResultsFilterApiModel(): TestResultsFilterApiModel;
+}
+export declare class TestResultsConverter extends BaseConverter implements ITestResultsConverter {
+    constructor(config: AdapterConfig);
+    getTestResultsFilterApiModel(): TestResultsFilterApiModel;
+}

package/lib/services/testresults/testresults.converter.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TestResultsConverter = void 0;
+const common_1 = require("../../common");
+class TestResultsConverter extends common_1.BaseConverter {
+    constructor(config) {
+        super(config);
+    }
+    getTestResultsFilterApiModel() {
+        const model = {
+            testRunIds: [this.config.testRunId],
+            configurationIds: [this.config.configurationId],
+            statusCodes: ["InProgress"],
+        };
+        return model;
+    }
+}
+exports.TestResultsConverter = TestResultsConverter;

package/lib/services/testresults/testresults.handler.d.ts

@@ -0,0 +1 @@
+export declare function handleHttpError(err: unknown, message?: string): void;

package/lib/services/testresults/testresults.handler.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.handleHttpError = handleHttpError;
+const testit_api_client_1 = require("testit-api-client");
+function handleHttpError(err, message = "") {
+    if (err instanceof testit_api_client_1.HttpError) {
+        console.error(`HttpError ${err.statusCode}: ${message}. Error body: \n`, err.body);
+    }
+    else {
+        console.log(message, err);
+    }
+}

package/lib/services/testresults/testresults.service.d.ts

@@ -0,0 +1,13 @@
+import { TestResultsApi } from "testit-api-client";
+import { AdapterConfig, BaseService } from "../../common";
+import { ITestResultsConverter } from "./testresults.converter";
+import { ITestResultsService } from "./testresults.type";
+export declare class TestResultsService extends BaseService implements ITestResultsService {
+    protected readonly config: AdapterConfig;
+    protected _client: TestResultsApi;
+    protected _converter: ITestResultsConverter;
+    protected _testsLimit: number;
+    constructor(config: AdapterConfig);
+    getExternalIdsForRun(): Promise<string[]>;
+    private getTestResults;
+}

package/lib/services/testresults/testresults.service.js

@@ -0,0 +1,58 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TestResultsService = void 0;
+const testit_api_client_1 = require("testit-api-client");
+const common_1 = require("../../common");
+const testresults_handler_1 = require("./testresults.handler");
+const testresults_converter_1 = require("./testresults.converter");
+const testResultsApiKey = testit_api_client_1.TestResultsApiApiKeys["Bearer or PrivateToken"];
+class TestResultsService extends common_1.BaseService {
+    constructor(config) {
+        super(config);
+        this.config = config;
+        this._testsLimit = 100;
+        this._client = new testit_api_client_1.TestResultsApi(config.url);
+        this._converter = new testresults_converter_1.TestResultsConverter(config);
+        this._client.setApiKey(testResultsApiKey, `PrivateToken ${config.privateToken}`);
+        if (config.certValidation !== undefined) {
+            this._client.setRejectUnauthorized(config.certValidation);
+        }
+    }
+    getExternalIdsForRun() {
+        return __awaiter(this, void 0, void 0, function* () {
+            var skip = 0;
+            var externalIds = [];
+            const model = this._converter.getTestResultsFilterApiModel();
+            while (true) {
+                const testResults = yield this.getTestResults(skip, model);
+                if (testResults.length != 0) {
+                    externalIds = externalIds.concat(testResults.map((result) => result.autotestExternalId).filter((id) => id !== undefined));
+                    skip += this._testsLimit;
+                    continue;
+                }
+                return externalIds;
+            }
+        });
+    }
+    getTestResults(skip, model) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield this._client
+                .apiV2TestResultsSearchPost(skip, this._testsLimit, undefined, undefined, undefined, model)
+                .then(({ body }) => body)
+                .catch((err) => {
+                (0, testresults_handler_1.handleHttpError)(err);
+                return [];
+            });
+        });
+    }
+}
+exports.TestResultsService = TestResultsService;

package/lib/services/testresults/testresults.type.d.ts

@@ -0,0 +1,3 @@
+export interface ITestResultsService {
+    getExternalIdsForRun(): Promise<string[]>;
+}

package/lib/services/testresults/testresults.type.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/services/testruns/testruns.converter.d.ts

@@ -1,12 +1,11 @@
-import { AutoTestResultsForTestRunModel, TestResultV2GetModel, TestRunState, TestRunV2ApiResult } from "testit-api-client";
+import { AutoTestResultsForTestRunModel, TestRunState, TestRunV2ApiResult } from "testit-api-client";
 import { BaseConverter, AdapterConfig } from "../../common";
-import { AutotestResult, AutotestResultGet, RunState, TestRunGet } from "./testruns.type";
+import { AutotestResult, RunState, TestRunGet } from "./testruns.type";
 export interface ITestRunConverter {
     toOriginState(state: RunState): TestRunState;
     toLocalState(state: TestRunState): RunState;
     toLocalTestRun(testRun: TestRunV2ApiResult): TestRunGet;
     toOriginAutotestResult(autotest: AutotestResult): AutoTestResultsForTestRunModel;
-    toLocalAutotestResult(autotest: TestResultV2GetModel): AutotestResultGet;
 }
 export declare class TestRunConverter extends BaseConverter implements ITestRunConverter {
     private autotestConverter;
@@ -14,6 +13,5 @@ export declare class TestRunConverter extends BaseConverter implements ITestRunC
     toLocalState(state: TestRunState): RunState;
     toOriginState(state: RunState): TestRunState;
     toOriginAutotestResult(autotest: AutotestResult): AutoTestResultsForTestRunModel;
-    toLocalAutotestResult(test: TestResultV2GetModel): AutotestResultGet;
     toLocalTestRun(testRun: TestRunV2ApiResult): TestRunGet;
 }

package/lib/services/testruns/testruns.converter.js

@@ -21,7 +21,7 @@ class TestRunConverter extends common_1.BaseConverter {
             configurationId: this.config.configurationId,
             autoTestExternalId: autotest.autoTestExternalId,
             links: (_a = autotest.links) === null || _a === void 0 ? void 0 : _a.map((link) => this.toOriginLink(link)),
-            outcome: this.toOriginOutcome(autotest.outcome),
+            statusCode: autotest.outcome,
             stepResults: (_b = autotest.stepResults) === null || _b === void 0 ? void 0 : _b.map((step) => this.toOriginStep(step)),
             setupResults: (_c = autotest.setupResults) === null || _c === void 0 ? void 0 : _c.map((step) => this.toOriginStep(step)),
             teardownResults: (_d = autotest.teardownResults) === null || _d === void 0 ? void 0 : _d.map((step) => this.toOriginStep(step)),
@@ -42,28 +42,8 @@ class TestRunConverter extends common_1.BaseConverter {
         }
         return model;
     }
-    toLocalAutotestResult(test) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
-        return {
-            id: test.id,
-            testRunId: test.testRunId,
-            configurationId: test.configurationId,
-            autoTestId: (_a = test.autoTestId) !== null && _a !== void 0 ? _a : undefined,
-            comment: (_b = test.comment) !== null && _b !== void 0 ? _b : undefined,
-            outcome: (_c = test.outcome) !== null && _c !== void 0 ? _c : undefined,
-            links: (_d = test.links) === null || _d === void 0 ? void 0 : _d.map((link) => this.toLocalLink(link)),
-            attachments: (_e = test.attachments) !== null && _e !== void 0 ? _e : undefined,
-            parameters: (_f = test.parameters) !== null && _f !== void 0 ? _f : undefined,
-            properties: (_g = test.properties) !== null && _g !== void 0 ? _g : undefined,
-            completedOn: (_h = test.completedOn) !== null && _h !== void 0 ? _h : undefined,
-            message: (_j = test.message) !== null && _j !== void 0 ? _j : undefined,
-            traces: (_k = test.traces) !== null && _k !== void 0 ? _k : undefined,
-            startedOn: (_l = test.startedOn) !== null && _l !== void 0 ? _l : undefined,
-            autoTest: test.autoTest ? this.autotestConverter.toLocalAutotestByModel(test.autoTest) : undefined,
-        };
-    }
     toLocalTestRun(testRun) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d;
         return {
             id: testRun.id,
             name: testRun.name,
@@ -72,7 +52,6 @@ class TestRunConverter extends common_1.BaseConverter {
             description: (_c = testRun.description) !== null && _c !== void 0 ? _c : undefined,
             launchSource: (_d = testRun.launchSource) !== null && _d !== void 0 ? _d : undefined,
             stateName: this.toLocalState(testRun.stateName),
-            testResults: (_e = testRun.testResults) === null || _e === void 0 ? void 0 : _e.map((test) => this.toLocalAutotestResult(test)),
         };
     }
 }

package/lib/services/testruns/testruns.service.d.ts

@@ -1,6 +1,6 @@
 import { TestRunsApi } from "testit-api-client";
 import { AdapterConfig, BaseService } from "../../common";
-import { type ITestRunsService, TestRunId, AutotestResult, TestRunGet, AutotestResultGet } from "./testruns.type";
+import { type ITestRunsService, TestRunId, AutotestResult, TestRunGet } from "./testruns.type";
 import { type ITestRunConverter } from "./testruns.converter";
 export declare class TestRunsService extends BaseService implements ITestRunsService {
     protected readonly config: AdapterConfig;
@@ -11,6 +11,5 @@ export declare class TestRunsService extends BaseService implements ITestRunsSer
     startTestRun(testRunId: TestRunId): Promise<void>;
     completeTestRun(testRunId: TestRunId): Promise<void>;
     loadAutotests(testRunId: string, autotests: Array<AutotestResult>): Promise<void>;
-    getAutotests(testRunId: string): Promise<AutotestResultGet[] | undefined>;
     getTestRun(testRunId: TestRunId): Promise<TestRunGet>;
 }

package/lib/services/testruns/testruns.service.js

@@ -73,13 +73,6 @@ class TestRunsService extends common_1.BaseService {
             }
         });
     }
-    getAutotests(testRunId) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const testRun = yield this.getTestRun(testRunId);
-            return (_a = testRun.testResults) === null || _a === void 0 ? void 0 : _a.filter((autotest) => autotest.configurationId === this.config.configurationId);
-        });
-    }
     getTestRun(testRunId) {
         return __awaiter(this, void 0, void 0, function* () {
             return yield this._client

package/lib/services/testruns/testruns.type.d.ts

@@ -10,7 +10,6 @@ export interface TestRunGet {
     startedOn?: Date;
     completedOn?: Date;
     stateName: RunState;
-    testResults?: Array<AutotestResultGet>;
 }
 interface AutotestResultBase {
     links?: Array<Link>;
@@ -38,6 +37,7 @@ export interface AutotestResultGet extends AutotestResultBase {
     id?: string;
     configurationId?: string;
     autoTest?: AutotestGet;
+    autoTestExternalId?: string;
     autoTestId?: string;
     testRunId?: string;
     comment?: string;
@@ -48,7 +48,6 @@ export interface ITestRunsService {
     getTestRun(testRunId: TestRunId): Promise<TestRunGet>;
     startTestRun(testRunId: TestRunId): Promise<void>;
     completeTestRun(testRunId: TestRunId): Promise<void>;
-    getAutotests(testRunId: TestRunId): Promise<AutotestResultGet[] | undefined>;
     loadAutotests(testRunId: string, autotests: Array<AutotestResult>): Promise<void>;
 }
 export {};

package/lib/strategy/strategy.type.d.ts

@@ -1,7 +1,7 @@
-import { AutotestPost, AutotestResult, AutotestResultGet, TestRunId } from "../services";
+import { AutotestPost, AutotestResult, TestRunId } from "../services";
 export interface IStrategy {
     readonly testRunId: Promise<TestRunId>;
-    readonly testsInRun?: Promise<AutotestResultGet[] | undefined>;
+    readonly testsInRun?: Promise<string[] | undefined>;
     setup(): Promise<void>;
     teardown(): Promise<void>;
     loadAutotest(autotest: AutotestPost, status: string): Promise<void>;

package/lib/strategy/zero.strategy.d.ts

@@ -1,8 +1,7 @@
 import { AdapterConfig } from "../common";
-import { AutotestResultGet } from "../services";
 import { IStrategy } from "./strategy.type";
 import { BaseStrategy } from "./base.strategy";
 export declare class ZeroStrategy extends BaseStrategy implements IStrategy {
-    readonly testsInRun: Promise<AutotestResultGet[] | undefined>;
+    readonly testsInRun: Promise<string[]>;
     constructor(config: AdapterConfig);
 }

package/lib/strategy/zero.strategy.js

@@ -7,7 +7,7 @@ class ZeroStrategy extends base_strategy_1.BaseStrategy {
         super(config);
         if (!config.testRunId)
             throw new Error("testRunId is required when mode is 0");
-        this.testsInRun = this.client.testRuns.getAutotests(config.testRunId);
+        this.testsInRun = this.client.testResults.getExternalIdsForRun();
     }
 }
 exports.ZeroStrategy = ZeroStrategy;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "testit-js-commons",
-  "version": "3.3.0",
+  "version": "3.4.0",
   "description": "JavaScript commons for Test IT",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -32,7 +32,7 @@
   },
   "dependencies": {
     "dotenv": "^16.0.3",
-    "testit-api-client": "6.3.0"
+    "testit-api-client": "6.3.1"
   },
   "files": [
     "lib"