Commit 7ec2382d authored by Grand Francois's avatar Grand Francois
Browse files

mocks Jasmine : argument optionnel pour toBeTruthy() et toBeFalsy(),...

mocks Jasmine : argument optionnel pour toBeTruthy() et toBeFalsy(), correction bug dans toBeUndefined() et toThrow()
Showing with 25 additions and 12 deletions
+25 -12
...@@ -92,9 +92,13 @@ class Expect { ...@@ -92,9 +92,13 @@ class Expect {
* Mock de la fonction toBeTruthy de Jasmine : the actual value should be true * Mock de la fonction toBeTruthy de Jasmine : the actual value should be true
* @param message message d'erreur * @param message message d'erreur
*/ */
public toBeTruthy(message: string) { public toBeTruthy(message?: string) {
if (!this.actual) { if (!this.actual) {
console.error(message); if (message !== undefined) {
console.error(message);
} else {
console.error(`${this.actual} should be true`);
}
} }
} }
...@@ -102,23 +106,27 @@ class Expect { ...@@ -102,23 +106,27 @@ class Expect {
* Mock de la fonction toBeFalsy de Jasmine : the actual value should be false * Mock de la fonction toBeFalsy de Jasmine : the actual value should be false
* @param message message d'erreur * @param message message d'erreur
*/ */
public toBeFalsy(message: string) { public toBeFalsy(message?: string) {
if (this.actual) { if (this.actual) {
console.error(message); if (message !== undefined) {
console.error(message);
} else {
console.error(`${this.actual} should be false`);
}
} }
} }
public toBeUndefined(message?: string) { public toBeUndefined(message?: string) {
if (this.actual !== undefined) { if (this.actual !== undefined) {
if (message === undefined) { if (message !== undefined) {
console.error(message); console.error(message);
} else { } else {
console.error(this.actual + " should be undefined"); console.error(`${this.actual} should be undefined`);
} }
} }
} }
public toThrow(expected: any) { public toThrow(expected?: any) {
let exception: Error; let exception: Error;
if (typeof this.actual !== "function") { if (typeof this.actual !== "function") {
throw new Error("Actual is not a function"); throw new Error("Actual is not a function");
...@@ -128,11 +136,16 @@ class Expect { ...@@ -128,11 +136,16 @@ class Expect {
} catch (e) { } catch (e) {
exception = e; exception = e;
} }
if (exception) { if (exception === undefined) {
if (exception === undefined) { console.error("Expected tested function to throw an error");
console.error("Expected tested function to thow an error"); } else {
} else if (exception.message !== expected.message) { if (expected) {
console.error("Function throws " + exception.message + " and " + expected.message + " was expected"); if (exception.message !== expected.message) {
console.error(`Function throws '${exception.message}' but '${expected.message}' was expected`);
}
}
else if (exception.message) {
console.error(`Function throws '${exception.message}' but no message was expected`);
} }
} }
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment