zation-assured 3.0.0-dev.1 → 3.0.0-dev.5

package/dist/lib/api/assert.d.ts

@@ -1,6 +1,6 @@
 import { StandaloneClientAsserter } from "../helper/asserter/client/standaloneClientAsserter";
 import { Channel, Databox, Client, Response } from "zation-client";
-import { ForintQuery } from "forint";
+import { Query } from "queric";
 import { StandaloneDataboxAsserter } from "../helper/asserter/databox/standaloneDataboxAsserter";
 import { StandaloneChannelAsserter } from "../helper/asserter/channel/standaloneChannelAsserter";
 import { StandaloneValueAsserter } from "../helper/asserter/value/standaloneValueAsserter";
@@ -46,19 +46,19 @@ export declare const assert: {
      */
     channel: <C extends Channel<any, any>>(channel: C | C[], description?: string) => StandaloneChannelAsserter<C>;
     /**
-     * Asserts that the promise rejects an error that matches with the forint query.
+     * Asserts that the promise rejects an error that matches with the queric query.
      * @param promise
      * @param query
      * @param message
      */
-    rejects: (promise: Promise<any>, query: ForintQuery, message?: string | Error) => Promise<void>;
+    rejects: (promise: Promise<any>, query: Query, message?: string | Error) => Promise<void>;
     /**
-     * Asserts that the promise resolves with a result that matches with the forint query.
+     * Asserts that the promise resolves with a result that matches with the queric query.
      * @param promise
      * @param query
      * @param message
      */
-    resolves: (promise: Promise<any>, query: ForintQuery, message?: string | Error) => Promise<void>;
+    resolves: (promise: Promise<any>, query: Query, message?: string | Error) => Promise<void>;
     /**
      * Lets the test failing.
      * @param message

package/dist/lib/api/assert.js

@@ -8,7 +8,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.assert = void 0;
 const assertFunc = require("assert");
 const standaloneClientAsserter_1 = require("../helper/asserter/client/standaloneClientAsserter");
-const forint_1 = require("forint");
+const queric_1 = require("queric");
 const standaloneDataboxAsserter_1 = require("../helper/asserter/databox/standaloneDataboxAsserter");
 const standaloneChannelAsserter_1 = require("../helper/asserter/channel/standaloneChannelAsserter");
 const standaloneValueAsserter_1 = require("../helper/asserter/value/standaloneValueAsserter");
@@ -37,7 +37,7 @@ exports.assert.rejects = (promise, query, message) => {
             assertFunc.fail(message);
             r();
         }, (err) => {
-            (0, exports.assert)((0, forint_1.default)(query)(err), message);
+            (0, exports.assert)((0, queric_1.default)(query)(err), message);
             r();
         });
     });
@@ -45,7 +45,7 @@ exports.assert.rejects = (promise, query, message) => {
 exports.assert.resolves = (promise, query, message) => {
     return new Promise(r => {
         promise.then((res) => {
-            (0, exports.assert)((0, forint_1.default)(query)(res), message);
+            (0, exports.assert)((0, queric_1.default)(query)(res), message);
             r();
         }, () => {
             assertFunc.fail(message);

package/dist/lib/api/when.d.ts

@@ -10,7 +10,7 @@ export declare class WhenBuilder<C extends Client<any, any>> {
     private readonly _client;
     private readonly _test;
     constructor(client: C, test: Test);
-    static when<C extends Client<any, any>>(client: C, itShould?: string): WhenBuilder<C>;
+    static when<C extends Client<any, any>>(client: C, it?: string): WhenBuilder<C>;
     /**
      * @description
      * Creates a request test action.

package/dist/lib/api/when.js

@@ -15,8 +15,8 @@ class WhenBuilder {
         this._client = client;
         this._test = test;
     }
-    static when(client, itShould) {
-        return new WhenBuilder(client, new test_1.Test(itShould));
+    static when(client, it) {
+        return new WhenBuilder(client, new test_1.Test(it));
     }
     // noinspection JSUnusedGlobalSymbols
     /**

package/dist/lib/helper/asserter/channel/standaloneChannelAsserter.d.ts

@@ -9,7 +9,7 @@ export declare class StandaloneChannelAsserter<C extends Channel<any, any>> exte
     subscribe(member?: any): StandaloneChannelAsserter<C>;
     /**
      * @description
-     * Run the test.
+     * Runs the test.
      */
     test(): Promise<void>;
     protected self(): StandaloneChannelAsserter<C>;

package/dist/lib/helper/asserter/channel/standaloneChannelAsserter.js

@@ -43,7 +43,7 @@ class StandaloneChannelAsserter extends abstractChannelAsserter_1.AbstractChanne
     // noinspection JSUnusedGlobalSymbols
     /**
      * @description
-     * Run the test.
+     * Runs the test.
      */
     test() {
         return __awaiter(this, void 0, void 0, function* () {

package/dist/lib/helper/asserter/client/standaloneClientAsserter.d.ts

@@ -9,7 +9,7 @@ export declare class StandaloneClientAsserter<C extends Client<any, any>> extend
     connect(): StandaloneClientAsserter<C>;
     /**
      * @description
-     * Run the test.
+     * Runs the test.
      */
     test(): Promise<void>;
     protected self(): StandaloneClientAsserter<C>;

package/dist/lib/helper/asserter/client/standaloneClientAsserter.js

@@ -43,7 +43,7 @@ class StandaloneClientAsserter extends abstractClientAsserter_1.AbstractClientAs
     // noinspection JSUnusedGlobalSymbols
     /**
      * @description
-     * Run the test.
+     * Runs the test.
      */
     test() {
         return __awaiter(this, void 0, void 0, function* () {

package/dist/lib/helper/asserter/controller/integratedResponseAsserter.d.ts

@@ -39,7 +39,7 @@ export declare class IntegratedResponseAsserter<R extends Response<any>, C exten
      * @description
      * Asserts that the response has specific errors with a raw filter.
      * @param filter
-     * Forint filter to filter for specific errors.
+     * Queric filter to filter for specific errors.
      */
     hasError(filter: BackErrorFilter): IntegratedResponseAsserter<R, C>;
     /**

package/dist/lib/helper/asserter/controller/integratedResponseAsserter.js

@@ -15,6 +15,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IntegratedResponseAsserter = void 0;
+const zation_client_1 = require("zation-client");
 const valueAsserter_1 = require("../value/valueAsserter");
 const backErrorsFilterBuilder_1 = require("../../backError/backErrorsFilterBuilder");
 const abstractActionAsserter_1 = require("../abstractActionAsserter");
@@ -27,7 +28,16 @@ class IntegratedResponseAsserter extends abstractActionAsserter_1.AbstractAction
     }
     _executeAction() {
         return __awaiter(this, void 0, void 0, function* () {
-            const resp = yield this.sendRequest();
+            let resp;
+            try {
+                resp = yield this.sendRequest();
+            }
+            catch (err) {
+                if (err instanceof zation_client_1.Response)
+                    resp = err;
+                else
+                    throw err;
+            }
             for (let i = 0; i < this.responseAsserters.length; i++)
                 yield this.responseAsserters[i](resp);
         });

package/dist/lib/helper/asserter/controller/standaloneResponseAsserter.d.ts

@@ -3,7 +3,7 @@ import { ValueAsserter } from "../value/valueAsserter";
 import { BackErrorsFilterBuilder } from "../../backError/backErrorsFilterBuilder";
 import { ResponseData } from "../../utils/types";
 export default class StandaloneResponseAsserter<R extends Response<any>> {
-    private readonly test;
+    private readonly _test;
     private readonly responses;
     constructor(response: R | R[], description?: string);
     protected _forEachResponse(func: (response: R, i: number) => Promise<void> | void): Promise<void>;
@@ -37,7 +37,7 @@ export default class StandaloneResponseAsserter<R extends Response<any>> {
      * @description
      * Asserts that the response has specific errors with a raw filter.
      * @param filter
-     * Forint filter to filter for specific errors.
+     * Queric filter to filter for specific errors.
      */
     hasError(filter: BackErrorFilter): StandaloneResponseAsserter<R>;
     /**
@@ -46,4 +46,9 @@ export default class StandaloneResponseAsserter<R extends Response<any>> {
      * @param assert
      */
     assert(assert: (resp: R) => void | Promise<void>): StandaloneResponseAsserter<R>;
+    /**
+     * @description
+     * Runs the test.
+     */
+    test(): Promise<void>;
 }

package/dist/lib/helper/asserter/controller/standaloneResponseAsserter.js

@@ -20,7 +20,7 @@ const backErrorsFilterBuilder_1 = require("../../backError/backErrorsFilterBuild
 const assert = require('assert');
 class StandaloneResponseAsserter {
     constructor(response, description) {
-        this.test = new test_1.Test(description);
+        this._test = new test_1.Test(description);
         this.responses = Array.isArray(response) ? response : [response];
     }
     _forEachResponse(func) {
@@ -39,7 +39,7 @@ class StandaloneResponseAsserter {
      * Asserts that the response is successful.
      */
     isSuccessful() {
-        this.test.test(() => this._forEachResponse((resp, i) => __awaiter(this, void 0, void 0, function* () {
+        this._test.test(() => this._forEachResponse((resp, i) => __awaiter(this, void 0, void 0, function* () {
             assert(resp.successful, `Response: ${i} should be successful.` + this._respInfo(resp));
         })));
         return this;
@@ -50,7 +50,7 @@ class StandaloneResponseAsserter {
      * Asserts that the response is not successful.
      */
     isNotSuccessful() {
-        this.test.test(() => this._forEachResponse((resp, i) => __awaiter(this, void 0, void 0, function* () {
+        this._test.test(() => this._forEachResponse((resp, i) => __awaiter(this, void 0, void 0, function* () {
             assert(!resp.successful, `Response: ${i} should be not successful.` + this._respInfo(resp));
         })));
         return this;
@@ -61,7 +61,7 @@ class StandaloneResponseAsserter {
      * Asserts that the response has a result.
      */
     hasResult() {
-        this.test.test(() => this._forEachResponse((resp, i) => __awaiter(this, void 0, void 0, function* () {
+        this._test.test(() => this._forEachResponse((resp, i) => __awaiter(this, void 0, void 0, function* () {
             assert(resp.result != null, `Response: ${i} should have a result.`
                 + this._respInfo(resp));
         })));
@@ -74,14 +74,14 @@ class StandaloneResponseAsserter {
      */
     result() {
         return new valueAsserter_1.ValueAsserter(this, (test) => {
-            this.test.test(() => this._forEachResponse((resp, i) => __awaiter(this, void 0, void 0, function* () {
+            this._test.test(() => this._forEachResponse((resp, i) => __awaiter(this, void 0, void 0, function* () {
                 test(resp.result, `response: ${i} result`);
             })));
         });
     }
     hasError(filter) {
         if (filter !== undefined) {
-            this.test.test(() => this._forEachResponse((resp, i) => __awaiter(this, void 0, void 0, function* () {
+            this._test.test(() => this._forEachResponse((resp, i) => __awaiter(this, void 0, void 0, function* () {
                 assert(resp.filter(filter).length > 0, `Response: ${i} should have at least one back error that matches the filter: ${JSON.stringify(filter)}.`
                     + this._respInfo(resp));
             })));
@@ -99,10 +99,20 @@ class StandaloneResponseAsserter {
      * @param assert
      */
     assert(assert) {
-        this.test.test(() => this._forEachResponse((resp) => __awaiter(this, void 0, void 0, function* () {
+        this._test.test(() => this._forEachResponse((resp) => __awaiter(this, void 0, void 0, function* () {
             yield assert(resp);
         })));
         return this;
     }
+    // noinspection JSUnusedGlobalSymbols
+    /**
+     * @description
+     * Runs the test.
+     */
+    test() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this._test.execute();
+        });
+    }
 }
 exports.default = StandaloneResponseAsserter;

package/dist/lib/helper/asserter/databox/abstractDataboxAsserter.d.ts

@@ -3,7 +3,7 @@ import { Databox, DataEventReason, DbStorage } from 'zation-client';
 import { DataEventAsserter } from "../event/dataEventAsserter";
 import { ValueAsserter } from "../value/valueAsserter";
 import { CodeMetadataEventAsserter } from "../event/codeMetadataEventAsserter";
-import { ForintQuery } from "forint";
+import { Query } from "queric";
 import { DataboxData, DataboxFetchData, DataboxMember } from "../../utils/types";
 import { DeepReadonly } from "../../utils/types";
 export declare abstract class AbstractDataboxAsserter<T, D extends Databox<any, any, any, any>> {
@@ -50,15 +50,15 @@ export declare abstract class AbstractDataboxAsserter<T, D extends Databox<any,
     /**
      * @description
      * Asserts that the databox should trigger an data change event.
-     * It is also possible to filter for specific data event reasons with a forint query.
+     * It is also possible to filter for specific data event reasons with a queric query.
      */
-    dataChangeTriggers(reasonFilter?: ForintQuery<DataEventReason>): DataEventAsserter<T, [DeepReadonly<DataboxData<D>>, DataEventReason, DbStorage<DataboxData<D>>], 0>;
+    dataChangeTriggers(reasonFilter?: Query<DataEventReason>): DataEventAsserter<T, [DeepReadonly<DataboxData<D>>, DataEventReason, DbStorage<DataboxData<D>>], 0>;
     /**
      * @description
      * Asserts that the databox should trigger an data touch event.
-     * It is also possible to filter for specific data event reasons with a forint query.
+     * It is also possible to filter for specific data event reasons with a queric query.
      */
-    dataTouchTriggers(reasonFilter?: ForintQuery<DataEventReason>): DataEventAsserter<T, [DeepReadonly<DataboxData<D>>, DataEventReason, DbStorage<DataboxData<D>>], 0>;
+    dataTouchTriggers(reasonFilter?: Query<DataEventReason>): DataEventAsserter<T, [DeepReadonly<DataboxData<D>>, DataEventReason, DbStorage<DataboxData<D>>], 0>;
     /**
      * @description
      * Asserts that the databox should trigger an close event.

package/dist/lib/helper/asserter/databox/abstractDataboxAsserter.js

@@ -21,7 +21,7 @@ const dataEventAsserter_1 = require("../event/dataEventAsserter");
 const valueAsserter_1 = require("../value/valueAsserter");
 const codeMetadataEventAsserter_1 = require("../event/codeMetadataEventAsserter");
 const chai_1 = require("chai");
-const forint_1 = require("forint");
+const queric_1 = require("queric");
 class AbstractDataboxAsserter {
     constructor(databoxes, test) {
         this._test = test;
@@ -134,10 +134,10 @@ class AbstractDataboxAsserter {
     /**
      * @description
      * Asserts that the databox should trigger an data change event.
-     * It is also possible to filter for specific data event reasons with a forint query.
+     * It is also possible to filter for specific data event reasons with a queric query.
      */
     dataChangeTriggers(reasonFilter) {
-        const filter = reasonFilter ? (0, forint_1.default)(reasonFilter) : () => true;
+        const filter = reasonFilter ? (0, queric_1.default)(reasonFilter) : () => true;
         return new dataEventAsserter_1.DataEventAsserter(this.databoxes.map(d => {
             return (listener) => {
                 let handler;
@@ -154,10 +154,10 @@ class AbstractDataboxAsserter {
     /**
      * @description
      * Asserts that the databox should trigger an data touch event.
-     * It is also possible to filter for specific data event reasons with a forint query.
+     * It is also possible to filter for specific data event reasons with a queric query.
      */
     dataTouchTriggers(reasonFilter) {
-        const filter = reasonFilter ? (0, forint_1.default)(reasonFilter) : () => true;
+        const filter = reasonFilter ? (0, queric_1.default)(reasonFilter) : () => true;
         return new dataEventAsserter_1.DataEventAsserter(this.databoxes.map(d => {
             return (listener) => {
                 let handler;

package/dist/lib/helper/asserter/databox/standaloneDataboxAsserter.d.ts

@@ -10,7 +10,7 @@ export declare class StandaloneDataboxAsserter<D extends Databox<any, any, any,
     connect(member?: DataboxMember<D>): StandaloneDataboxAsserter<D>;
     /**
      * @description
-     * Run the test.
+     * Runs the test.
      */
     test(): Promise<void>;
     protected self(): StandaloneDataboxAsserter<D>;

package/dist/lib/helper/asserter/databox/standaloneDataboxAsserter.js

@@ -43,7 +43,7 @@ class StandaloneDataboxAsserter extends abstractDataboxAsserter_1.AbstractDatabo
     // noinspection JSUnusedGlobalSymbols
     /**
      * @description
-     * Run the test.
+     * Runs the test.
      */
     test() {
         return __awaiter(this, void 0, void 0, function* () {

package/dist/lib/helper/asserter/value/abstractValueAsserter.d.ts

@@ -1,4 +1,4 @@
-import { ForintQuery } from "forint";
+import { Query } from "queric";
 declare type AddTest = (test: (value: any, target: string) => void) => void;
 export declare abstract class AbstractValueAsserter<V, T> {
     protected abstract self(): T;
@@ -63,13 +63,13 @@ export declare abstract class AbstractValueAsserter<V, T> {
      */
     notDeepEqual(expectedValue: any): T;
     /**
-     * Asserts that the value matches with a forint query.
+     * Asserts that the value matches with a queric query.
      */
-    matches(query: ForintQuery<V> | ForintQuery<Record<any, any>>): T;
+    matches(query: Query<V> | Query<Record<any, any>>): T;
     /**
-     * Asserts that the value not matches with a forint query.
+     * Asserts that the value not matches with a queric query.
      */
-    notMatches(query: ForintQuery<V> | ForintQuery<Record<any, any>>): T;
+    notMatches(query: Query<V> | Query<Record<any, any>>): T;
     /**
      * @description
      * Asserts that the value has all specific keys.

package/dist/lib/helper/asserter/value/abstractValueAsserter.js

@@ -15,7 +15,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AbstractValueAsserter = void 0;
-const forint_1 = require("forint");
+const queric_1 = require("queric");
 const chai_1 = require("chai");
 class AbstractValueAsserter {
     constructor(addTest) {
@@ -141,21 +141,21 @@ class AbstractValueAsserter {
     }
     // noinspection JSUnusedGlobalSymbols
     /**
-     * Asserts that the value matches with a forint query.
+     * Asserts that the value matches with a queric query.
      */
     matches(query) {
         this.addTest((inAny, target) => __awaiter(this, void 0, void 0, function* () {
-            yield (0, chai_1.assert)((0, forint_1.default)(query)(inAny), `${target} should match with the forint query.`);
+            yield (0, chai_1.assert)((0, queric_1.default)(query)(inAny), `${target} should match with the queric query.`);
         }));
         return this.self();
     }
     // noinspection JSUnusedGlobalSymbols
     /**
-     * Asserts that the value not matches with a forint query.
+     * Asserts that the value not matches with a queric query.
      */
     notMatches(query) {
         this.addTest((inAny, target) => __awaiter(this, void 0, void 0, function* () {
-            yield (0, chai_1.assert)(!(0, forint_1.default)(query)(inAny), `${target} should not match with the forint query.`);
+            yield (0, chai_1.assert)(!(0, queric_1.default)(query)(inAny), `${target} should not match with the queric query.`);
         }));
         return this.self();
     }

package/dist/lib/helper/test/test.d.ts

@@ -2,8 +2,8 @@ declare type Action = () => Promise<void> | void;
 export declare class Test {
     private readonly _subTests;
     private currentSubTest;
-    private readonly _description?;
-    constructor(description?: string);
+    private readonly _it?;
+    constructor(it?: string);
     newSubTest(): void;
     beforeTest(action: Action): void;
     test(action: Action): void;

package/dist/lib/helper/test/test.js

@@ -17,9 +17,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Test = void 0;
 const waitSymbol = Symbol();
 class Test {
-    constructor(description) {
+    constructor(it) {
         this._subTests = [];
-        this._description = description;
+        this._it = it;
         this.newSubTest();
     }
     newSubTest() {
@@ -49,11 +49,11 @@ class Test {
     }
     execute() {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this._description != null) {
+            if (this._it != null) {
                 if (global['it'] == null)
                     throw new Error("Please install a test runner like mocha or jest.");
                 return new Promise((resolve, reject) => {
-                    global['it'](this._description, () => __awaiter(this, void 0, void 0, function* () {
+                    global['it'](this._it, () => __awaiter(this, void 0, void 0, function* () {
                         try {
                             yield this._run();
                             resolve();

package/package.json

@@ -1,14 +1,13 @@
 {
   "name": "zation-assured",
-  "version": "3.0.0-dev.1",
+  "version": "3.0.0-dev.5",
   "license": "MIT",
   "description": "Library For Testing Zation Servers",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {
     "prepublishOnly": "npm run build",
-    "build": "gulp compile",
-    "test": "nyc --reporter=html mocha -- ./test/**/*.test.js"
+    "build": "gulp compile"
   },
   "repository": {
     "type": "git",
@@ -42,8 +41,8 @@
     "@types/node": "^12.7.2",
     "chai": "^4.3.3",
     "path": "0.12.7",
-    "zation-client": "^3.0.0-dev.3",
-    "forint": "^0.2.1"
+    "zation-client": "^3.0.0-dev.9",
+    "queric": "^2.0.0"
   },
   "devDependencies": {
     "gulp": "4.0.0",