summaryrefslogtreecommitdiff
path: root/packages/taler-integrationtests
diff options
context:
space:
mode:
Diffstat (limited to 'packages/taler-integrationtests')
-rw-r--r--packages/taler-integrationtests/src/harness.ts44
-rw-r--r--packages/taler-integrationtests/src/test-refund-incremental.ts4
2 files changed, 11 insertions, 37 deletions
diff --git a/packages/taler-integrationtests/src/harness.ts b/packages/taler-integrationtests/src/harness.ts
index 0b41923a4..0beed3976 100644
--- a/packages/taler-integrationtests/src/harness.ts
+++ b/packages/taler-integrationtests/src/harness.ts
@@ -361,53 +361,27 @@ export class GlobalTestState {
}
assertAmountEquals(
- amtExpected: string | AmountJson,
amtActual: string | AmountJson,
+ amtExpected: string | AmountJson,
): void {
- let ja1: AmountJson;
- let ja2: AmountJson;
- if (typeof amtExpected === "string") {
- ja1 = Amounts.parseOrThrow(amtExpected);
- } else {
- ja1 = amtExpected;
- }
- if (typeof amtActual === "string") {
- ja2 = Amounts.parseOrThrow(amtActual);
- } else {
- ja2 = amtActual;
- }
-
- if (Amounts.cmp(ja1, ja2) != 0) {
+ if (Amounts.cmp(amtActual, amtExpected) != 0) {
throw Error(
`test assertion failed: expected ${Amounts.stringify(
- ja1,
- )} but got ${Amounts.stringify(ja2)}`,
+ amtExpected,
+ )} but got ${Amounts.stringify(amtActual)}`,
);
}
}
assertAmountLeq(
- amtExpected: string | AmountJson,
- amtActual: string | AmountJson,
+ a: string | AmountJson,
+ b: string | AmountJson,
): void {
- let ja1: AmountJson;
- let ja2: AmountJson;
- if (typeof amtExpected === "string") {
- ja1 = Amounts.parseOrThrow(amtExpected);
- } else {
- ja1 = amtExpected;
- }
- if (typeof amtActual === "string") {
- ja2 = Amounts.parseOrThrow(amtActual);
- } else {
- ja2 = amtActual;
- }
-
- if (Amounts.cmp(ja1, ja2) > 0) {
+ if (Amounts.cmp(a, b) > 0) {
throw Error(
`test assertion failed: expected ${Amounts.stringify(
- ja1,
- )} to be less or equal (leq) than ${Amounts.stringify(ja2)}`,
+ a,
+ )} to be less or equal (leq) than ${Amounts.stringify(b)}`,
);
}
}
diff --git a/packages/taler-integrationtests/src/test-refund-incremental.ts b/packages/taler-integrationtests/src/test-refund-incremental.ts
index 2e0f03f29..661378dc8 100644
--- a/packages/taler-integrationtests/src/test-refund-incremental.ts
+++ b/packages/taler-integrationtests/src/test-refund-incremental.ts
@@ -175,7 +175,7 @@ runTest(async (t: GlobalTestState) => {
.map((x) => x.amountRaw),
).amount;
- t.assertAmountEquals(raw, "TESTKUDOS:10");
+ t.assertAmountEquals("TESTKUDOS:10", raw);
const effective = Amounts.sum(
txs.transactions
@@ -183,7 +183,7 @@ runTest(async (t: GlobalTestState) => {
.map((x) => x.amountEffective),
).amount;
- t.assertAmountEquals(effective, "TESTKUDOS:8.17");
+ t.assertAmountEquals("TESTKUDOS:8.33", effective);
}
await t.shutdown();