@locustjs/test 2.0.1 → 2.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@locustjs/test",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "description": "This library provides a simple test runner for unit-testing.",
   "main": "dist/index.js",
   "module": "src/index.js",
@@ -27,7 +27,7 @@
   },
   "homepage": "https://github.com/ironcodev/locustjs-test#readme",
   "dependencies": {
-    "@locustjs/base": "^4.4.0",
+    "@locustjs/base": "^4.5.2",
     "@locustjs/exception": "^2.1.1"
   },
   "devDependencies": {

package/src/Expect.js

@@ -22,13 +22,13 @@ import TestException from "./TestException";
 class Expect {
   constructor(value) {
     this.value = value;
-    this._expected = false;
+    this._satisfied = false;
   }
-  get expected() {
-    return this._expected;
+  get satisfied() {
+    return this._satisfied;
   }
   toBe(value) {
-    this._expected = true;
+    this._satisfied = true;
 
     if (this.value === value) {
     } else {
@@ -42,7 +42,7 @@ class Expect {
     return this;
   }
   notToBe(value) {
-    this._expected = true;
+    this._satisfied = true;
 
     if (this.value === value) {
       throw new TestException({
@@ -55,7 +55,7 @@ class Expect {
     return this;
   }
   toBeGt(value) {
-    this._expected = true;
+    this._satisfied = true;
 
     if (this.value <= value) {
       throw new TestException({
@@ -71,7 +71,7 @@ class Expect {
     return this.toBeGt(value);
   }
   toBeGte(value) {
-    this._expected = true;
+    this._satisfied = true;
 
     if (this.value < value) {
       throw new TestException({
@@ -87,7 +87,7 @@ class Expect {
     return this.toBeGte(value);
   }
   toBeLt(value) {
-    this._expected = true;
+    this._satisfied = true;
 
     if (this.value >= value) {
       throw new TestException({
@@ -103,7 +103,7 @@ class Expect {
     return this.toBeLt(value);
   }
   toBeLte(value) {
-    this._expected = true;
+    this._satisfied = true;
 
     if (this.value > value) {
       throw new TestException({
@@ -119,7 +119,7 @@ class Expect {
     return this.toBeLte(value);
   }
   toBeBetween(n, m) {
-    this._expected = true;
+    this._satisfied = true;
 
     if (!(this.value >= n && this.value < m)) {
       throw new TestException({
@@ -132,7 +132,7 @@ class Expect {
     return this;
   }
   notToBeBetween(n, m) {
-    this._expected = true;
+    this._satisfied = true;
 
     if (this.value >= n && this.value < m) {
       throw new TestException({
@@ -145,7 +145,7 @@ class Expect {
     return this;
   }
   toBeOfType(type) {
-    this._expected = true;
+    this._satisfied = true;
 
     if (typeof this.value !== type) {
       throw new TestException({
@@ -158,7 +158,7 @@ class Expect {
     return this;
   }
   notToBeOfType(type) {
-    this._expected = true;
+    this._satisfied = true;
 
     if (typeof this.value === type) {
       throw new TestException({
@@ -171,7 +171,7 @@ class Expect {
     return this;
   }
   toBeString() {
-    this._expected = true;
+    this._satisfied = true;
 
     if (!isString(this.value)) {
       throw new TestException({
@@ -184,7 +184,7 @@ class Expect {
     return this;
   }
   notToBeString() {
-    this._expected = true;
+    this._satisfied = true;
 
     if (isString(this.value)) {
       throw new TestException({
@@ -197,7 +197,7 @@ class Expect {
     return this;
   }
   toBeSomeString() {
-    this._expected = true;
+    this._satisfied = true;
     if (!isSomeString(this.value)) {
       throw new TestException({
         message: `${this.value} is not some string`,
@@ -209,7 +209,7 @@ class Expect {
     return this;
   }
   notToBeSomeString() {
-    this._expected = true;
+    this._satisfied = true;
 
     if (isSomeString(this.value)) {
       throw new TestException({
@@ -222,7 +222,7 @@ class Expect {
     return this;
   }
   toBeNumber() {
-    this._expected = true;
+    this._satisfied = true;
 
     if (!isNumber(this.value)) {
       throw new TestException({
@@ -235,7 +235,7 @@ class Expect {
     return this;
   }
   notToBeNumber() {
-    this._expected = true;
+    this._satisfied = true;
 
     if (isNumber(this.value)) {
       throw new TestException({
@@ -248,7 +248,7 @@ class Expect {
     return this;
   }
   toBeDate() {
-    this._expected = true;
+    this._satisfied = true;
 
     if (!isDate(this.value)) {
       throw new TestException({
@@ -261,7 +261,7 @@ class Expect {
     return this;
   }
   notToBeDate() {
-    this._expected = true;
+    this._satisfied = true;
 
     if (isDate(this.value)) {
       throw new TestException({
@@ -274,7 +274,7 @@ class Expect {
     return this;
   }
   toBeBool() {
-    this._expected = true;
+    this._satisfied = true;
 
     if (!isBool(this.value)) {
       throw new TestException({
@@ -287,7 +287,7 @@ class Expect {
     return this;
   }
   notToBeBool() {
-    this._expected = true;
+    this._satisfied = true;
 
     if (isBool(this.value)) {
       throw new TestException({
@@ -300,7 +300,7 @@ class Expect {
     return this;
   }
   toBeBasicType() {
-    this._expected = true;
+    this._satisfied = true;
 
     if (!isBasic(this.value)) {
       throw new TestException({
@@ -313,7 +313,7 @@ class Expect {
     return this;
   }
   notToBeBasicType() {
-    this._expected = true;
+    this._satisfied = true;
 
     if (isBasic(this.value)) {
       throw new TestException({
@@ -326,7 +326,7 @@ class Expect {
     return this;
   }
   toBePrimitive() {
-    this._expected = true;
+    this._satisfied = true;
 
     if (!isPrimitive(this.value)) {
       throw new TestException({
@@ -339,7 +339,7 @@ class Expect {
     return this;
   }
   notToBePrimitive() {
-    this._expected = true;
+    this._satisfied = true;
 
     if (isPrimitive(this.value)) {
       throw new TestException({
@@ -352,7 +352,7 @@ class Expect {
     return this;
   }
   toBeEmpty() {
-    this._expected = true;
+    this._satisfied = true;
 
     if (!isEmpty(this.value)) {
       throw new TestException({
@@ -365,7 +365,7 @@ class Expect {
     return this;
   }
   notToBeEmpty() {
-    this._expected = true;
+    this._satisfied = true;
 
     if (isEmpty(this.value)) {
       throw new TestException({
@@ -378,7 +378,7 @@ class Expect {
     return this;
   }
   toBeObject() {
-    this._expected = true;
+    this._satisfied = true;
 
     if (!isObject(this.value)) {
       throw new TestException({
@@ -391,7 +391,7 @@ class Expect {
     return this;
   }
   notToBeObject() {
-    this._expected = true;
+    this._satisfied = true;
 
     if (isObject(this.value)) {
       throw new TestException({
@@ -404,7 +404,7 @@ class Expect {
     return this;
   }
   toBeSomeObject() {
-    this._expected = true;
+    this._satisfied = true;
 
     if (!isSomeObject(this.value)) {
       throw new TestException({
@@ -417,7 +417,7 @@ class Expect {
     return this;
   }
   notToBeSomeObject() {
-    this._expected = true;
+    this._satisfied = true;
 
     if (isSomeObject(this.value)) {
       throw new TestException({
@@ -430,7 +430,7 @@ class Expect {
     return this;
   }
   toBeFunction() {
-    this._expected = true;
+    this._satisfied = true;
 
     if (!isFunction(this.value)) {
       throw new TestException({
@@ -443,7 +443,7 @@ class Expect {
     return this;
   }
   notToBeFunction() {
-    this._expected = true;
+    this._satisfied = true;
 
     if (isFunction(this.value)) {
       throw new TestException({
@@ -456,7 +456,7 @@ class Expect {
     return this;
   }
   toBeNumeric() {
-    this._expected = true;
+    this._satisfied = true;
 
     if (!isNumeric(this.value)) {
       throw new TestException({
@@ -469,7 +469,7 @@ class Expect {
     return this;
   }
   notToBeNumeric() {
-    this._expected = true;
+    this._satisfied = true;
 
     if (isNumeric(this.value)) {
       throw new TestException({
@@ -482,7 +482,7 @@ class Expect {
     return this;
   }
   toBeArray() {
-    this._expected = true;
+    this._satisfied = true;
 
     if (!isArray(this.value)) {
       throw new TestException({
@@ -495,7 +495,7 @@ class Expect {
     return this;
   }
   notToBeArray() {
-    this._expected = true;
+    this._satisfied = true;
 
     if (isArray(this.value)) {
       throw new TestException({
@@ -508,7 +508,7 @@ class Expect {
     return this;
   }
   toBeSomeArray() {
-    this._expected = true;
+    this._satisfied = true;
 
     if (!isSomeArray(this.value)) {
       throw new TestException({
@@ -521,7 +521,7 @@ class Expect {
     return this;
   }
   notToBeSomeArray() {
-    this._expected = true;
+    this._satisfied = true;
 
     if (!isArray(this.value)) {
       throw new TestException({
@@ -541,7 +541,7 @@ class Expect {
     return this;
   }
   toBeIterable() {
-    this._expected = true;
+    this._satisfied = true;
 
     if (!isIterable(this.value)) {
       throw new TestException({
@@ -554,7 +554,7 @@ class Expect {
     return this;
   }
   notToBeIterable() {
-    this._expected = true;
+    this._satisfied = true;
 
     if (isIterable(this.value)) {
       throw new TestException({
@@ -567,7 +567,7 @@ class Expect {
     return this;
   }
   toBeSubClassOf(type) {
-    this._expected = true;
+    this._satisfied = true;
 
     if (!isSubClassOf(this.value, type)) {
       throw new TestException({
@@ -580,7 +580,7 @@ class Expect {
     return this;
   }
   notToBeSubClassOf(type) {
-    this._expected = true;
+    this._satisfied = true;
 
     if (isSubClassOf(this.value, type)) {
       throw new TestException({
@@ -593,7 +593,7 @@ class Expect {
     return this;
   }
   toBeInstanceOf(type) {
-    this._expected = true;
+    this._satisfied = true;
 
     if (!(this.value instanceof type)) {
       throw new TestException({
@@ -606,7 +606,7 @@ class Expect {
     return this;
   }
   notToBeInstanceOf(type) {
-    this._expected = true;
+    this._satisfied = true;
 
     if (this.value instanceof type) {
       throw new TestException({
@@ -619,7 +619,7 @@ class Expect {
     return this;
   }
   toMatch(pattern, flags) {
-    this._expected = true;
+    this._satisfied = true;
 
     const r = new RegExp(pattern, flags);
 
@@ -634,7 +634,7 @@ class Expect {
     return this;
   }
   notToMatch(pattern, flags) {
-    this._expected = true;
+    this._satisfied = true;
 
     const r = new RegExp(pattern, flags);
 
@@ -649,7 +649,7 @@ class Expect {
     return this;
   }
   doesNotMatch(pattern, flags) {
-    this._expected = true;
+    this._satisfied = true;
 
     const r = new RegExp(pattern, flags);
 
@@ -664,7 +664,7 @@ class Expect {
     return this;
   }
   toBeDefined() {
-    this._expected = true;
+    this._satisfied = true;
 
     if (this.value === undefined) {
       throw new TestException({
@@ -677,7 +677,7 @@ class Expect {
     return this;
   }
   notToBeDefined() {
-    this._expected = true;
+    this._satisfied = true;
 
     if (this.value !== undefined) {
       throw new TestException({
@@ -690,7 +690,7 @@ class Expect {
     return this;
   }
   toBeUndefined() {
-    this._expected = true;
+    this._satisfied = true;
 
     if (this.value !== undefined) {
       throw new TestException({
@@ -703,7 +703,7 @@ class Expect {
     return this;
   }
   notToBeUndefined() {
-    this._expected = true;
+    this._satisfied = true;
 
     if (this.value === undefined) {
       throw new TestException({
@@ -716,7 +716,7 @@ class Expect {
     return this;
   }
   toBeNull() {
-    this._expected = true;
+    this._satisfied = true;
 
     if (this.value !== null) {
       throw new TestException({
@@ -729,7 +729,7 @@ class Expect {
     return this;
   }
   notToBeNull() {
-    this._expected = true;
+    this._satisfied = true;
 
     if (this.value === null) {
       throw new TestException({
@@ -742,7 +742,7 @@ class Expect {
     return this;
   }
   toBeNullOrUndefined() {
-    this._expected = true;
+    this._satisfied = true;
 
     if (this.value == null) {
     } else {
@@ -756,7 +756,7 @@ class Expect {
     return this;
   }
   notToBeNullOrUndefined() {
-    this._expected = true;
+    this._satisfied = true;
 
     if (this.value == null) {
       throw new TestException({
@@ -769,7 +769,7 @@ class Expect {
     return this;
   }
   toBeEmptyArray() {
-    this._expected = true;
+    this._satisfied = true;
 
     if (isSomeArray(this.value)) {
       throw new TestException({
@@ -782,7 +782,7 @@ class Expect {
     return this;
   }
   toBeValid(fnValidation) {
-    this._expected = true;
+    this._satisfied = true;
 
     if (!isFunction(fnValidation)) {
       throw new TestException({
@@ -802,7 +802,7 @@ class Expect {
     return this;
   }
   notToBeValid(fnValidation) {
-    this._expected = true;
+    this._satisfied = true;
 
     if (!isFunction(fnValidation)) {
       throw new TestException({
@@ -822,7 +822,7 @@ class Expect {
     return this;
   }
   toThrow(ex, shape = false, strict = false) {
-    this._expected = true;
+    this._satisfied = true;
 
     if (!isFunction(this.value)) {
       throw new TestException({
@@ -899,7 +899,7 @@ class Expect {
     return this;
   }
   notToThrow(ex, shape = false, strict = false) {
-    this._expected = true;
+    this._satisfied = true;
 
     if (!isFunction(this.value)) {
       throw new TestException({
@@ -980,7 +980,7 @@ class Expect {
     return this;
   }
   async toThrowAsync(ex, shape = false, strict = false) {
-    this._expected = true;
+    this._satisfied = true;
 
     if (!isFunction(this.value)) {
       throw new TestException({
@@ -1057,7 +1057,7 @@ class Expect {
     return this;
   }
   async notToThrowAsync(ex, shape = false, strict = false) {
-    this._expected = true;
+    this._satisfied = true;
 
     if (!isFunction(this.value)) {
       throw new TestException({
@@ -1138,7 +1138,7 @@ class Expect {
     return this;
   }
   toBeTruthy() {
-    this._expected = true;
+    this._satisfied = true;
 
     if (this.value) {
     } else {
@@ -1155,7 +1155,7 @@ class Expect {
     return this.toBeTruthy();
   }
   toBeFalsy() {
-    this._expected = true;
+    this._satisfied = true;
 
     if (!this.value) {
     } else {
@@ -1172,7 +1172,7 @@ class Expect {
     return this.toBeFalsy();
   }
   toBeNaN() {
-    this._expected = true;
+    this._satisfied = true;
 
     if (isNaN(this.value)) {
     } else {
@@ -1186,7 +1186,7 @@ class Expect {
     return this;
   }
   notToBeNaN() {
-    this._expected = true;
+    this._satisfied = true;
 
     if (!isNaN(this.value)) {
     } else {

package/src/Test.js

@@ -14,12 +14,28 @@ class Test {
       if (isFunction(this.fn)) {
         const _expect = new Expect();
 
-        try {
-          const _result = this.fn((x) => {
+        function expectProvider(fn) {
+          const expect = function (x) {
             _expect.value = x;
 
             return _expect;
-          });
+          };
+          const fnStr = fn.toString();
+          const wrapper = new Function(
+            "expect",
+            `
+      return function() {
+        return (${fnStr})();
+      };
+    `,
+          );
+
+          return wrapper(expect);
+        }
+
+        try {
+          const wrappedFn = expectProvider(this.fn);
+          const _result = wrappedFn();
 
           if (_result && isFunction(_result.then)) {
             _result
@@ -29,7 +45,7 @@ class Test {
                   test: this.name,
                   result,
                   time: new Date() - start,
-                  expected: _expect.expected,
+                  satisfied: _expect.satisfied,
                 });
               })
               .catch((ex) => {
@@ -37,7 +53,7 @@ class Test {
                   success: false,
                   test: this.name,
                   time: new Date() - start,
-                  expected: _expect.expected,
+                  satisfied: _expect.satisfied,
                   err: new TestException({
                     message: `test '${this.name}' failed.`,
                     code: 501,
@@ -52,7 +68,7 @@ class Test {
               test: this.name,
               time: new Date() - start,
               result: _result,
-              expected: _expect.expected,
+              satisfied: _expect.satisfied,
             });
           }
         } catch (ex) {
@@ -60,7 +76,7 @@ class Test {
             success: false,
             test: this.name,
             time: new Date() - start,
-            expected: _expect.expected,
+            satisfied: _expect.satisfied,
             err: new TestException({
               message: `test '${this.name}' failed.`,
               code: 501,