From ba269f9fe395397fd446a993dc9bc1d1b1034b73 Mon Sep 17 00:00:00 2001
From: David Dorchies <david.dorchies@irstea.fr>
Date: Mon, 13 Aug 2018 16:42:50 +0200
Subject: [PATCH] Corrige bug introduit dans 0ce46e46 (suppression de
Result:get name)
---
spec/iterator/named_iterable_value.spec.ts | 15 ++++++++++-----
src/util/result.ts | 4 ++++
2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/spec/iterator/named_iterable_value.spec.ts b/spec/iterator/named_iterable_value.spec.ts
index a3e68602..577312f0 100644
--- a/spec/iterator/named_iterable_value.spec.ts
+++ b/spec/iterator/named_iterable_value.spec.ts
@@ -14,8 +14,9 @@ function testBaseParamValues(vals: number[]): BaseParam {
p.paramValues.setValues(vals);
let n = 0;
- for (const v of p.valuesIterator)
+ for (const v of p.valuesIterator) {
expect(v).toEqual(vals[n++]);
+ }
expect(n).toEqual(vals.length);
@@ -25,12 +26,14 @@ function testBaseParamValues(vals: number[]): BaseParam {
function testResultValues(vals: number[]): Result {
const r: Result = new Result();
- for (const v of vals)
+ for (const v of vals) {
r.addResultElement(new ResultElement(v));
+ }
let n = 0;
- for (const v of r.valuesIterator)
+ for (const v of r.valuesIterator) {
expect(v).toEqual(vals[n++]);
+ }
expect(n).toEqual(vals.length);
@@ -40,12 +43,14 @@ function testResultValues(vals: number[]): Result {
function testExtraResultsValues(vals: number[]): ExtraResults {
const ers: ExtraResults = new ExtraResults("aa");
- for (const v of vals)
+ for (const v of vals) {
ers.addValue(v);
+ }
let n = 0;
- for (const v of ers.valuesIterator)
+ for (const v of ers.valuesIterator) {
expect(v).toEqual(vals[n++]);
+ }
expect(n).toEqual(vals.length);
diff --git a/src/util/result.ts b/src/util/result.ts
index 3094c711..b16c054f 100644
--- a/src/util/result.ts
+++ b/src/util/result.ts
@@ -43,6 +43,10 @@ export class Result extends JalhydObject implements NamedIterableValues {
}
}
+ public get name(): string {
+ return this._name;
+ }
+
public set name(n: string) {
this._name = n;
}
--
GitLab