zation-assured 0.6.2 → 3.0.0-beta.1

package/LICENSE

@@ -1,6 +1,8 @@
 MIT License
 
-Copyright (c) 2019 Zation
+Copyright (c) 2018 Ing. Luca Gian Scaringella
+
+This MIT license applies only to zation-assured.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -18,4 +20,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.

package/README.md

@@ -1,2 +1,56 @@
-# zation-assured
-Library For Testing Zation Servers
+# zation-assured ✔
+*Library for testing zation servers.*
+
+<h1 align="center">
+  <!-- Logo -->
+  <br/>
+  <a href="https://github.com/ZationServer">
+      <img src="https://raw.githubusercontent.com/ZationServer/zation/master/assets/logo/zationWideLogoDark.svg" alt="Logo Zation" height="200"/>
+  </a>
+  <br/>
+</h1>
+
+<h1 align="center">  
+  <!-- Stability -->
+  <a href="https://nodejs.org/api/documentation.html#documentation_stability_index">
+    <img src="https://img.shields.io/badge/stability-stable-brightgreen.svg" alt="API Stability"/>
+  </a>
+  <!-- TypeScript -->
+  <a href="http://typescriptlang.org">
+    <img src="https://img.shields.io/badge/%3C%2F%3E-typescript-blue.svg" alt="TypeScript"/>
+  </a>    
+  <!-- Downloads -->
+  <a href="https://npmjs.org/package/zation-assured">
+    <img src="https://img.shields.io/npm/dm/zation-assured.svg" alt="Downloads"/>
+  </a> 
+  <!-- Size -->
+  <a href="https://npmjs.org/package/zation-assured">
+      <img src="https://img.shields.io/bundlephobia/min/zation-assured.svg" alt="Size"/>
+  </a>  
+</h1>
+
+## License
+
+MIT License
+
+Copyright (c) 2018 Ing. Luca Gian Scaringella
+
+This MIT license applies only to zation-assured.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/dist/index.d.ts

@@ -1,6 +1,5 @@
-import { ClientOptions, Client, create } from "zation-client";
 import { when } from "./lib/api/when";
-import { beforeTest as before, afterTest as after, afterEachTest as afterEach, beforeEachTest as beforeEach, describeTest as describe, itTest as it, failTest as fail } from "./lib/api/testHelper";
+import { failTest as fail } from "./lib/api/testHelper";
 import { assert } from "./lib/api/assert";
 export * from 'zation-client';
-export { create as createClient, ClientOptions, when, assert, describe, before, after, beforeEach, afterEach, it, fail, Client };
+export { when, assert, fail };

package/dist/index.js

@@ -1,12 +1,16 @@
 "use strict";
 /*
-Author: Luca Scaringella
+Author: Ing. Luca Gian Scaringella
 GitHub: LucaCode
-©Copyright by Luca Scaringella
+Copyright(c) Ing. Luca Gian Scaringella
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];
@@ -15,20 +19,10 @@ 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 });
-exports.Client = exports.fail = exports.it = exports.afterEach = exports.beforeEach = exports.after = exports.before = exports.describe = exports.assert = exports.when = exports.createClient = void 0;
-//Api Classes
-const zation_client_1 = require("zation-client");
-Object.defineProperty(exports, "Client", { enumerable: true, get: function () { return zation_client_1.Client; } });
-Object.defineProperty(exports, "createClient", { enumerable: true, get: function () { return zation_client_1.create; } });
+exports.fail = exports.assert = exports.when = void 0;
 const when_1 = require("./lib/api/when");
 Object.defineProperty(exports, "when", { enumerable: true, get: function () { return when_1.when; } });
 const testHelper_1 = require("./lib/api/testHelper");
-Object.defineProperty(exports, "before", { enumerable: true, get: function () { return testHelper_1.beforeTest; } });
-Object.defineProperty(exports, "after", { enumerable: true, get: function () { return testHelper_1.afterTest; } });
-Object.defineProperty(exports, "afterEach", { enumerable: true, get: function () { return testHelper_1.afterEachTest; } });
-Object.defineProperty(exports, "beforeEach", { enumerable: true, get: function () { return testHelper_1.beforeEachTest; } });
-Object.defineProperty(exports, "describe", { enumerable: true, get: function () { return testHelper_1.describeTest; } });
-Object.defineProperty(exports, "it", { enumerable: true, get: function () { return testHelper_1.itTest; } });
 Object.defineProperty(exports, "fail", { enumerable: true, get: function () { return testHelper_1.failTest; } });
 const assert_1 = require("./lib/api/assert");
 Object.defineProperty(exports, "assert", { enumerable: true, get: function () { return assert_1.assert; } });

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

@@ -1,9 +1,10 @@
 import { StandaloneClientAsserter } from "../helper/asserter/client/standaloneClientAsserter";
-import { Channel, Databox, Client } from "zation-client";
-import { ForintQuery } from "forint";
+import { Channel, Databox, Client, Response } from "zation-client";
+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";
+import StandaloneResponseAsserter from "../helper/asserter/controller/standaloneResponseAsserter";
 export declare const assert: {
     /**
      * Asserts that the value is true.
@@ -14,44 +15,50 @@ export declare const assert: {
     /**
      * Start value assertions.
      * @param client
-     * @param itTestDescription
+     * @param description
      */
-    value: (value: any, itTestDescription?: string) => StandaloneValueAsserter;
+    value: <V>(value: V, description?: string) => StandaloneValueAsserter<V>;
+    /**
+     * Start response assertions.
+     * @param response
+     * @param description
+     */
+    response: <R extends Response<any>>(response: R | R[], description?: string) => StandaloneResponseAsserter<R>;
     /**
      * Start client assertions.
      * Notice that this method will not automatically connect the clients.
      * @param client
-     * @param itTestDescription
+     * @param description
      */
-    client: (client: Client | Client[], itTestDescription?: string) => StandaloneClientAsserter;
+    client: <C extends Client<any, any>>(client: C | C[], description?: string) => StandaloneClientAsserter<C>;
     /**
      * Start databox assertions.
      * Notice that this method will not automatically connect the databoxes.
      * @param databox
-     * @param itTestDescription
+     * @param description
      */
-    databox: (databox: Databox | Databox[], itTestDescription?: string) => StandaloneDataboxAsserter;
+    databox: <D extends Databox<any, any, any, any>>(databox: D | D[], description?: string) => StandaloneDataboxAsserter<D>;
     /**
      * Start channel assertions.
      * Notice that this method will not automatically subscribe to the channels.
      * @param channel
-     * @param itTestDescription
+     * @param description
      */
-    channel: (channel: Channel | Channel[], itTestDescription?: string) => StandaloneChannelAsserter;
+    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

@@ -1,31 +1,35 @@
 "use strict";
 /*
-Author: Luca Scaringella
+Author: Ing. Luca Gian Scaringella
 GitHub: LucaCode
-©Copyright by Luca Scaringella
+Copyright(c) Ing. Luca Gian Scaringella
  */
 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");
+const standaloneResponseAsserter_1 = require("../helper/asserter/controller/standaloneResponseAsserter");
 exports.assert = ((value, message) => {
     assertFunc(value, message);
 });
-exports.assert.value = (value, itTestDescription) => {
-    return new standaloneValueAsserter_1.StandaloneValueAsserter(value, itTestDescription);
+exports.assert.value = (value, description) => {
+    return new standaloneValueAsserter_1.StandaloneValueAsserter(value, description);
 };
-exports.assert.client = (client, itTestDescription) => {
-    return new standaloneClientAsserter_1.StandaloneClientAsserter(client, itTestDescription);
+exports.assert.response = (response, description) => {
+    return new standaloneResponseAsserter_1.default(response, description);
 };
-exports.assert.databox = (databox, itTestDescription) => {
-    return new standaloneDataboxAsserter_1.StandaloneDataboxAsserter(databox, itTestDescription);
+exports.assert.client = (client, description) => {
+    return new standaloneClientAsserter_1.StandaloneClientAsserter(client, description);
 };
-exports.assert.channel = (channel, itTestDescription) => {
-    return new standaloneChannelAsserter_1.StandaloneChannelAsserter(channel, itTestDescription);
+exports.assert.databox = (databox, description) => {
+    return new standaloneDataboxAsserter_1.StandaloneDataboxAsserter(databox, description);
+};
+exports.assert.channel = (channel, description) => {
+    return new standaloneChannelAsserter_1.StandaloneChannelAsserter(channel, description);
 };
 exports.assert.rejects = (promise, query, message) => {
     return new Promise(r => {
@@ -33,7 +37,7 @@ exports.assert.rejects = (promise, query, message) => {
             assertFunc.fail(message);
             r();
         }, (err) => {
-            exports.assert(forint_1.default(query)(err), message);
+            (0, exports.assert)((0, queric_1.default)(query)(err), message);
             r();
         });
     });
@@ -41,7 +45,7 @@ exports.assert.rejects = (promise, query, message) => {
 exports.assert.resolves = (promise, query, message) => {
     return new Promise(r => {
         promise.then((res) => {
-            exports.assert(forint_1.default(query)(res), message);
+            (0, exports.assert)((0, queric_1.default)(query)(res), message);
             r();
         }, () => {
             assertFunc.fail(message);

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

@@ -1,9 +1 @@
-declare type Func = () => Promise<void> | void;
-export declare const beforeTest: (beforeTest: Func, timeout?: number) => void;
-export declare const afterTest: (afterTest: Func, timeout?: number) => void;
-export declare const beforeEachTest: (beforeEachTest: Func, timeout?: number) => void;
-export declare const afterEachTest: (afterEachTest: Func, timeout?: number) => void;
-export declare const describeTest: (title: string, area: Func, timeout?: number) => void;
-export declare const itTest: (title: string, area: Func, timeout?: number) => void;
 export declare const failTest: (msg: string, actual?: any, expected?: any) => void;
-export {};

package/dist/lib/api/testHelper.js

@@ -1,93 +1,16 @@
 "use strict";
 /*
-Author: Luca Scaringella
+Author: Ing. Luca Gian Scaringella
 GitHub: LucaCode
-©Copyright by Luca Scaringella
+Copyright(c) Ing. Luca Gian Scaringella
  */
-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.failTest = exports.itTest = exports.describeTest = exports.afterEachTest = exports.beforeEachTest = exports.afterTest = exports.beforeTest = void 0;
-const logger_1 = require("../helper/console/logger");
+exports.failTest = void 0;
 const assert = require('assert');
-const beforeTest = (beforeTest, timeout = 10000) => {
-    firstInit();
-    before(function () {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.timeout(timeout);
-            yield beforeTest();
-        });
-    });
-};
-exports.beforeTest = beforeTest;
-const afterTest = (afterTest, timeout = 10000) => {
-    after(function () {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.timeout(timeout);
-            yield afterTest();
-        });
-    });
-};
-exports.afterTest = afterTest;
-const beforeEachTest = (beforeEachTest, timeout = 10000) => {
-    firstInit();
-    beforeEach(function () {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.timeout(timeout);
-            yield beforeEachTest;
-        });
-    });
-};
-exports.beforeEachTest = beforeEachTest;
-const afterEachTest = (afterEachTest, timeout = 10000) => {
-    afterEach(function () {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.timeout(timeout);
-            yield afterEachTest;
-        });
-    });
-};
-exports.afterEachTest = afterEachTest;
-const describeTest = (title, area, timeout = 10000) => {
-    firstInit();
-    describe(title, function () {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.timeout(timeout);
-            yield area();
-        });
-    });
-};
-exports.describeTest = describeTest;
-const itTest = (title, area, timeout = 10000) => {
-    firstInit();
-    it(title, function () {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.timeout(timeout);
-            yield area();
-        });
-    });
-};
-exports.itTest = itTest;
-const failTest = (msg, actual, expected) => {
-    if (actual !== undefined || expected !== undefined) {
+const failTest = function (msg, actual, expected) {
+    if (arguments.length > 1)
         assert.fail(actual, expected, msg);
-    }
-    else {
+    else
         assert.fail(msg);
-    }
 };
 exports.failTest = failTest;
-let firstCall = true;
-const firstInit = () => {
-    if (firstCall) {
-        firstCall = false;
-        logger_1.Logger.logBusy('Run Tests');
-    }
-};

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

@@ -1,67 +1,64 @@
-import { SpecialController, ValidationCheckPair, Client } from 'zation-client';
+import { ValidationCheckPair, Client, AUTH_CONTROLLER, ChecksContent, Response, FilterAPIDefinition, AnyControllerDef, ReceiverDef } from 'zation-client';
 import { Test } from "../helper/test/test";
-import { AuthRequestBuilder } from "../helper/builder/controller/authRequestBuilder";
-import { ValidationCheckRequestBuilder } from "../helper/builder/controller/validationCheckRequestBuilder";
-import { StandardRequestBuilder } from "../helper/builder/controller/standardRequestBuilder";
-import { PackageBuilder } from "../helper/builder/receiver/packageBuilder";
-export declare const when: (client: Client, itTestDescription?: string | undefined) => WhenBuilder;
-export declare class WhenBuilder {
+import { ExtractControllerDefInput, ExtractControllerDefOutput, ExtractAuthControllerDef } from "zation-client";
+import TransmitOptions, { RequestOptions, ValidationRequestOptions } from "../helper/definitions/optionTypes";
+import AssertStarter from "../helper/asserter/assertStarter";
+import { IntegratedResponseAsserter } from "../helper/asserter/controller/integratedResponseAsserter";
+import { IntegratedTransmitAsserter } from "../helper/asserter/receiver/integratedTransmitAsserter";
+import { ClientAPI } from "../helper/utils/types";
+import { SystemController } from "zation-client/dist/lib/main/definitions/systemController";
+export declare class WhenBuilder<C extends Client<any, any>> {
     private readonly _client;
     private readonly _test;
-    constructor(client: Client, test: Test);
-    static when(client: Client, itTestDescription?: string): WhenBuilder;
+    constructor(client: C, test: Test);
+    static when<C extends Client<any, any>>(client: C, it?: string): WhenBuilder<C>;
     /**
      * @description
-     * Returns an StandardRequestBuilder.
-     * The StandardRequestBuilder can be used to easily build
-     * a standard request.
-     * The default values are:
-     * Data: undefined
+     * Creates a request test action.
      * @example
-     * when(client1).request('sendMessage')
-     * .data({msg: 'hallo'})
-     * ...
+     * when(client1)
+     *  .request('sendMessage',message)
+     *  .assertThat....
      * @param controller
      * @param data
+     * @param options
      */
-    request(controller: string | SpecialController, data?: any): StandardRequestBuilder;
+    request<CN extends keyof FilterAPIDefinition<ClientAPI<C>, AnyControllerDef> | typeof AUTH_CONTROLLER | SystemController>(controller: CN, data?: CN extends typeof AUTH_CONTROLLER ? ExtractControllerDefInput<ExtractAuthControllerDef<ClientAPI<C>>> : ExtractControllerDefInput<FilterAPIDefinition<ClientAPI<C>, CN>>, options?: RequestOptions): AssertStarter<IntegratedResponseAsserter<Response<ExtractControllerDefOutput<FilterAPIDefinition<ClientAPI<C>, CN>>>, C>>;
     /**
      * @description
-     * Returns an AuthRequestBuilder.
-     * The AuthRequestBuilder can be used to easily build
-     * an auth request.
-     * The default values are:
-     * AuthData: undefined
+     * Creates a request validation test action.
+     * This action sends a validation request to a specific controller.
+     * Validation requests only validate the given checks with the controller input models.
+     * The controller handle method will not be invoked.
+     * It is helpful to check form inputs directly even if the user
+     * has not filled out the complete data.
      * @example
-     * when(client1).authRequest()
-     * .authData({userName : 'luca',password : '123'})
-     * ...
-     * @param authData
-     */
-    authRequest(authData?: any): AuthRequestBuilder;
-    /**
-     * @description
-     * Returns an ValidationCheckRequestBuilder.
-     * The ValidationCheckRequestBuilder can be used to easily build
-     * a validation check request.
-     * The default values are:
-     * Checks: []
-     * @example
-     * when(client1).validationRequest('sendMessage')
-     * .check('msg','hallo')
-     * ....
+     * //Check builder usage (typesafe):
+     * when(client1)
+     *  .requestValidation('sendMessage',s => {
+     *     s.msg.check("Hello!");
+     *  })
+     *  .assertThat....
+     * //Raw usage (not typesafe):
+     * when(client1)
+     *  .requestValidation('sendMessage',[[['msg'],'Hello!']]);
+     *  .assertThat....
      * @param controller
      * @param checks
+     * @param options
      */
-    validationRequest(controller: string | SpecialController, ...checks: ValidationCheckPair[]): ValidationCheckRequestBuilder;
+    requestValidation<CN extends keyof FilterAPIDefinition<ClientAPI<C>, AnyControllerDef> | typeof AUTH_CONTROLLER>(controller: CN, checks: ValidationCheckPair[] | ((structure: ChecksContent<CN extends typeof AUTH_CONTROLLER ? ExtractControllerDefInput<ExtractAuthControllerDef<ClientAPI<C>>> : ExtractControllerDefInput<FilterAPIDefinition<ClientAPI<C>, CN>>>) => void), options?: ValidationRequestOptions): AssertStarter<IntegratedResponseAsserter<Response<void>, C>>;
     /**
      * @description
-     * Returns a PackageBuilder.
-     * The PackageBuilder can be used to easily build a package send it to a receiver.
+     * Creates a transmit test action.
      * @example
-     * when(client1).transmit('movement').data('up')
+     * when(client1)
+     *  .transmit('updatePosition',[1,2,2])
+     *  .assertThat....
      * @param receiver
      * @param data
+     * @param options
      */
-    transmit(receiver: string, data?: any): PackageBuilder;
+    transmit<RN extends keyof FilterAPIDefinition<ClientAPI<C>, ReceiverDef>>(receiver: RN, data?: ClientAPI<C>['receivers'][RN], options?: TransmitOptions): AssertStarter<IntegratedTransmitAsserter<C>>;
 }
+export declare const when: typeof WhenBuilder.when;

package/dist/lib/api/when.js

@@ -1,93 +1,80 @@
 "use strict";
 /*
-Author: Luca Scaringella
+Author: Ing. Luca Gian Scaringella
 GitHub: LucaCode
-©Copyright by Luca Scaringella
+Copyright(c) Ing. Luca Gian Scaringella
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WhenBuilder = exports.when = void 0;
+exports.when = exports.WhenBuilder = void 0;
 const test_1 = require("../helper/test/test");
-const authRequestBuilder_1 = require("../helper/builder/controller/authRequestBuilder");
-const validationCheckRequestBuilder_1 = require("../helper/builder/controller/validationCheckRequestBuilder");
-const standardRequestBuilder_1 = require("../helper/builder/controller/standardRequestBuilder");
-const packageBuilder_1 = require("../helper/builder/receiver/packageBuilder");
-const when = (client, itTestDescription) => {
-    return WhenBuilder.when(client, itTestDescription);
-};
-exports.when = when;
+const assertStarter_1 = require("../helper/asserter/assertStarter");
+const integratedResponseAsserter_1 = require("../helper/asserter/controller/integratedResponseAsserter");
+const integratedTransmitAsserter_1 = require("../helper/asserter/receiver/integratedTransmitAsserter");
 class WhenBuilder {
     constructor(client, test) {
         this._client = client;
         this._test = test;
     }
-    static when(client, itTestDescription) {
-        return new WhenBuilder(client, new test_1.Test(itTestDescription));
+    static when(client, it) {
+        return new WhenBuilder(client, new test_1.Test(it));
     }
     // noinspection JSUnusedGlobalSymbols
     /**
      * @description
-     * Returns an StandardRequestBuilder.
-     * The StandardRequestBuilder can be used to easily build
-     * a standard request.
-     * The default values are:
-     * Data: undefined
+     * Creates a request test action.
      * @example
-     * when(client1).request('sendMessage')
-     * .data({msg: 'hallo'})
-     * ...
+     * when(client1)
+     *  .request('sendMessage',message)
+     *  .assertThat....
      * @param controller
      * @param data
+     * @param options
      */
-    request(controller, data) {
-        return new standardRequestBuilder_1.StandardRequestBuilder(this._client.request(controller, data), this._test, this._client);
+    request(controller, data, options = {}) {
+        return new assertStarter_1.default(new integratedResponseAsserter_1.IntegratedResponseAsserter(() => this._client.request(controller, data, Object.assign(Object.assign({}, options), { unwrapResult: false })), this._test, this._client));
     }
     // noinspection JSUnusedGlobalSymbols
     /**
      * @description
-     * Returns an AuthRequestBuilder.
-     * The AuthRequestBuilder can be used to easily build
-     * an auth request.
-     * The default values are:
-     * AuthData: undefined
+     * Creates a request validation test action.
+     * This action sends a validation request to a specific controller.
+     * Validation requests only validate the given checks with the controller input models.
+     * The controller handle method will not be invoked.
+     * It is helpful to check form inputs directly even if the user
+     * has not filled out the complete data.
      * @example
-     * when(client1).authRequest()
-     * .authData({userName : 'luca',password : '123'})
-     * ...
-     * @param authData
-     */
-    authRequest(authData) {
-        return new authRequestBuilder_1.AuthRequestBuilder(this._client.authRequest(authData), this._test, this._client);
-    }
-    // noinspection JSUnusedGlobalSymbols
-    /**
-     * @description
-     * Returns an ValidationCheckRequestBuilder.
-     * The ValidationCheckRequestBuilder can be used to easily build
-     * a validation check request.
-     * The default values are:
-     * Checks: []
-     * @example
-     * when(client1).validationRequest('sendMessage')
-     * .check('msg','hallo')
-     * ....
+     * //Check builder usage (typesafe):
+     * when(client1)
+     *  .requestValidation('sendMessage',s => {
+     *     s.msg.check("Hello!");
+     *  })
+     *  .assertThat....
+     * //Raw usage (not typesafe):
+     * when(client1)
+     *  .requestValidation('sendMessage',[[['msg'],'Hello!']]);
+     *  .assertThat....
      * @param controller
      * @param checks
+     * @param options
      */
-    validationRequest(controller, ...checks) {
-        return new validationCheckRequestBuilder_1.ValidationCheckRequestBuilder(this._client.validationRequest(controller, ...checks), this._test, this._client);
+    requestValidation(controller, checks, options = {}) {
+        return new assertStarter_1.default(new integratedResponseAsserter_1.IntegratedResponseAsserter(() => this._client.requestValidation(controller, checks, options), this._test, this._client));
     }
     // noinspection JSUnusedGlobalSymbols
     /**
      * @description
-     * Returns a PackageBuilder.
-     * The PackageBuilder can be used to easily build a package send it to a receiver.
+     * Creates a transmit test action.
      * @example
-     * when(client1).transmit('movement').data('up')
+     * when(client1)
+     *  .transmit('updatePosition',[1,2,2])
+     *  .assertThat....
      * @param receiver
      * @param data
+     * @param options
      */
-    transmit(receiver, data) {
-        return new packageBuilder_1.PackageBuilder(this._client.transmit(receiver, data), this._test, this._client);
+    transmit(receiver, data, options = {}) {
+        return new assertStarter_1.default(new integratedTransmitAsserter_1.IntegratedTransmitAsserter(() => this._client.transmit(receiver, data, options), this._test, this._client));
     }
 }
 exports.WhenBuilder = WhenBuilder;
+exports.when = WhenBuilder.when;