From 2d0648a7dd5a73f10b45718da6b12aaad371fe28 Mon Sep 17 00:00:00 2001
From: David Dorchies <david.dorchies@irstea.fr>
Date: Mon, 29 May 2017 16:34:37 +0200
Subject: [PATCH] #2 Utilisation de ToBeCloseTo dans les tests de la conduite
distributrice
---
spec/cond_distri.spec.ts | 32 ++++++++++----------------------
1 file changed, 10 insertions(+), 22 deletions(-)
diff --git a/spec/cond_distri.spec.ts b/spec/cond_distri.spec.ts
index 2dbed059..9bcebdc4 100644
--- a/spec/cond_distri.spec.ts
+++ b/spec/cond_distri.spec.ts
@@ -19,10 +19,7 @@ describe('Class ConduiteDistrib: ', () => {
nub.v.lg = 100;
nub.v.nu = 1e-6;
- let res = new Result;
- res.vCalc = 9.393428919333346;
-
- expect(nub.Calc("q").vCalc).toEqual(res.vCalc);
+ expect(nub.Calc("q").vCalc).toBeCloseTo(9.393, 3);
});
});
@@ -34,45 +31,36 @@ describe('Class ConduiteDistrib: ', () => {
nub.v.lg = 10;
nub.v.nu = 1e-6;
- let res = new Result;
- res.vCalc = 152.99207150346;
-
- expect(nub.Calc("q").vCalc).toEqual(res.vCalc);
+ expect(nub.Calc("q").vCalc).toBeCloseTo(152.992, 3);
});
});
describe('Calc(): ', () => {
- it('D should be 2.128465006', () => {
+ it('D should be 2.12847', () => {
let nub = new ConduiteDistrib();
nub.v.q = 3;
nub.v.j = 0.7;
nub.v.lg = 10;
nub.v.nu = 1e-6;
- let res = new Result;
- res.vCalc = 2.1284650063949666;
-
- expect(nub.Calc("d").vCalc).toEqual(res.vCalc);
+ expect(nub.Calc("d").vCalc).toBeCloseTo(2.12847, 5);
});
});
describe('Calc(): ', () => {
- it('J should be 0.00814087671', () => {
+ it('J should be 0.00814', () => {
let nub = new ConduiteDistrib();
nub.v.q = 3;
nub.v.d = 1.2;
nub.v.lg = 10;
nub.v.nu = 1e-6;
- let res = new Result;
- res.vCalc = 0.008140876712328136;
-
- expect(nub.Calc("j").vCalc).toEqual(res.vCalc);
+ expect(nub.Calc("j").vCalc).toBeCloseTo(0.00814, 5);
});
});
describe('Calc(): ', () => {
- it('Lg should be 0.008140876712328136', () => {
+ it('Lg should be 737.021', () => {
let nub = new ConduiteDistrib();
nub.v.q = 3;
nub.v.d = 1.2;
@@ -82,12 +70,12 @@ describe('Class ConduiteDistrib: ', () => {
let res = new Result;
res.vCalc = 737.0213567924325;
- expect(nub.Calc("lg").vCalc).toEqual(res.vCalc);
+ expect(nub.Calc("lg").vCalc).toBeCloseTo(737.021, 3);
});
});
describe('Calc(): ', () => {
- it('Nu should be 0.00295066762', () => {
+ it('Nu should be 0.00295', () => {
let nub = new ConduiteDistrib();
nub.v.q = 3;
nub.v.d = 1.2;
@@ -97,7 +85,7 @@ describe('Class ConduiteDistrib: ', () => {
let res = new Result;
res.vCalc = 0.0029506676187219757;
- expect(nub.Calc("nu").vCalc).toEqual(res.vCalc);
+ expect(nub.Calc("nu").vCalc).toBeCloseTo(0.00295, 5);
});
});
});
--
GitLab