From 8ca8f6a5d3316686337b4f4323a18aa034c4dd33 Mon Sep 17 00:00:00 2001
From: David Dorchies <david.dorchies@irstea.fr>
Date: Wed, 17 May 2017 13:51:58 +0200
Subject: [PATCH] #1 Mutualisation de test (pas fonctionnel)
---
spec/base.spec.ts | 14 ++------------
spec/nubtest.ts | 11 +++++++++++
spec/tsconfig.spec.json | 2 +-
3 files changed, 14 insertions(+), 13 deletions(-)
create mode 100644 spec/nubtest.ts
diff --git a/spec/base.spec.ts b/spec/base.spec.ts
index 67958058..e03682a5 100644
--- a/spec/base.spec.ts
+++ b/spec/base.spec.ts
@@ -1,16 +1,6 @@
/// <reference path="../node_modules/@types/jasmine/index.d.ts" />
-import { Nub, Result } from "../src/base";
-
-class NubTest extends Nub {
- Equation(): Result {
- let res: Result = new Result();
- res.vCalc = this.v["A"] + this.v["B"];
- return res;
- }
-}
-let nub = new NubTest({ "A": 1, "B": 2, "C": null });
-let res = new Result;
+import { nub, res } from "nubtest";
describe('Class Nub: ', () => {
beforeEach(() => {
@@ -18,7 +8,7 @@ describe('Class Nub: ', () => {
res.vCalc = 3;
});
describe('Calc(): ', () => {
- it('should return a result', () => {
+ it('should return a result equal to 3', () => {
expect(nub.Calc("C")).toEqual(res);
});
});
diff --git a/spec/nubtest.ts b/spec/nubtest.ts
new file mode 100644
index 00000000..a85d5bad
--- /dev/null
+++ b/spec/nubtest.ts
@@ -0,0 +1,11 @@
+import { Nub, Result } from "../src/base";
+
+export class NubTest extends Nub {
+ Equation(): Result {
+ let res: Result = new Result();
+ res.vCalc = this.v["A"] + this.v["B"];
+ return res;
+ }
+}
+export let nub = new NubTest({ "A": 1, "B": 2, "C": null });
+export let res = new Result;
diff --git a/spec/tsconfig.spec.json b/spec/tsconfig.spec.json
index d860a663..a6acd911 100644
--- a/spec/tsconfig.spec.json
+++ b/spec/tsconfig.spec.json
@@ -13,7 +13,7 @@
// ],
"include": [
"../src/**/*.ts",
- "../spec/**/*.spec.ts",
+ "../spec/**/*.ts",
"../typings/**/*.d.ts"
]
}
--
GitLab