From b1f77f4662e8198d0e02e74d43fd6d1f82ce2fb0 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Mon, 5 Sep 2022 12:29:32 +0200 Subject: add integration test for p2p age restrictions --- .../test-age-restrictions-merchant.ts | 112 +++++++++++++++++++++ .../integrationtests/test-age-restrictions-peer.ts | 80 +++++++++++++++ .../src/integrationtests/test-age-restrictions.ts | 112 --------------------- .../src/integrationtests/testrunner.ts | 6 +- 4 files changed, 196 insertions(+), 114 deletions(-) create mode 100644 packages/taler-wallet-cli/src/integrationtests/test-age-restrictions-merchant.ts create mode 100644 packages/taler-wallet-cli/src/integrationtests/test-age-restrictions-peer.ts delete mode 100644 packages/taler-wallet-cli/src/integrationtests/test-age-restrictions.ts (limited to 'packages/taler-wallet-cli/src') diff --git a/packages/taler-wallet-cli/src/integrationtests/test-age-restrictions-merchant.ts b/packages/taler-wallet-cli/src/integrationtests/test-age-restrictions-merchant.ts new file mode 100644 index 000000000..27c36ae40 --- /dev/null +++ b/packages/taler-wallet-cli/src/integrationtests/test-age-restrictions-merchant.ts @@ -0,0 +1,112 @@ +/* + This file is part of GNU Taler + (C) 2022 Taler Systems S.A. + + GNU Taler is free software; you can redistribute it and/or modify it under the + terms of the GNU General Public License as published by the Free Software + Foundation; either version 3, or (at your option) any later version. + + GNU Taler is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR + A PARTICULAR PURPOSE. See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along with + GNU Taler; see the file COPYING. If not, see + */ + +/** + * Imports. + */ +import { defaultCoinConfig } from "../harness/denomStructures.js"; +import { GlobalTestState, WalletCli } from "../harness/harness.js"; +import { + createSimpleTestkudosEnvironment, + withdrawViaBank, + makeTestPayment, +} from "../harness/helpers.js"; + +/** + * Run test for basic, bank-integrated withdrawal and payment. + */ +export async function runAgeRestrictionsMerchantTest(t: GlobalTestState) { + // Set up test environment + + const { wallet: walletOne, bank, exchange, merchant } = + await createSimpleTestkudosEnvironment( + t, + defaultCoinConfig.map((x) => x("TESTKUDOS")), + { + ageMaskSpec: "8:10:12:14:16:18:21", + }, + ); + + const walletTwo = new WalletCli(t, "walletTwo"); + const walletThree = new WalletCli(t, "walletThree"); + + { + const wallet = walletOne; + + await withdrawViaBank(t, { + wallet, + bank, + exchange, + amount: "TESTKUDOS:20", + restrictAge: 13, + }); + + const order = { + summary: "Buy me!", + amount: "TESTKUDOS:5", + fulfillment_url: "taler://fulfillment-success/thx", + minimum_age: 9, + }; + + await makeTestPayment(t, { wallet, merchant, order }); + await wallet.runUntilDone(); + } + + { + const wallet = walletTwo; + + await withdrawViaBank(t, { + wallet, + bank, + exchange, + amount: "TESTKUDOS:20", + restrictAge: 13, + }); + + const order = { + summary: "Buy me!", + amount: "TESTKUDOS:5", + fulfillment_url: "taler://fulfillment-success/thx", + }; + + await makeTestPayment(t, { wallet, merchant, order }); + await wallet.runUntilDone(); + } + + { + const wallet = walletThree; + + await withdrawViaBank(t, { + wallet, + bank, + exchange, + amount: "TESTKUDOS:20", + }); + + const order = { + summary: "Buy me!", + amount: "TESTKUDOS:5", + fulfillment_url: "taler://fulfillment-success/thx", + minimum_age: 9, + }; + + await makeTestPayment(t, { wallet, merchant, order }); + await wallet.runUntilDone(); + } + +} + +runAgeRestrictionsMerchantTest.suites = ["wallet"]; diff --git a/packages/taler-wallet-cli/src/integrationtests/test-age-restrictions-peer.ts b/packages/taler-wallet-cli/src/integrationtests/test-age-restrictions-peer.ts new file mode 100644 index 000000000..12e993c3d --- /dev/null +++ b/packages/taler-wallet-cli/src/integrationtests/test-age-restrictions-peer.ts @@ -0,0 +1,80 @@ +/* + This file is part of GNU Taler + (C) 2022 Taler Systems S.A. + + GNU Taler is free software; you can redistribute it and/or modify it under the + terms of the GNU General Public License as published by the Free Software + Foundation; either version 3, or (at your option) any later version. + + GNU Taler is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR + A PARTICULAR PURPOSE. See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along with + GNU Taler; see the file COPYING. If not, see + */ + +/** + * Imports. + */ +import { WalletApiOperation } from "@gnu-taler/taler-wallet-core"; +import { defaultCoinConfig } from "../harness/denomStructures.js"; +import { GlobalTestState, WalletCli } from "../harness/harness.js"; +import { + createSimpleTestkudosEnvironment, + withdrawViaBank, + makeTestPayment, +} from "../harness/helpers.js"; + +/** + * Run test for basic, bank-integrated withdrawal and payment. + */ +export async function runAgeRestrictionsPeerTest(t: GlobalTestState) { + // Set up test environment + + const { + wallet: walletOne, + bank, + exchange, + merchant, + } = await createSimpleTestkudosEnvironment( + t, + defaultCoinConfig.map((x) => x("TESTKUDOS")), + { + ageMaskSpec: "8:10:12:14:16:18:21", + }, + ); + + const walletTwo = new WalletCli(t, "walletTwo"); + const walletThree = new WalletCli(t, "walletThree"); + + { + const wallet = walletOne; + + await withdrawViaBank(t, { + wallet, + bank, + exchange, + amount: "TESTKUDOS:20", + restrictAge: 13, + }); + + const order = { + summary: "Buy me!", + amount: "TESTKUDOS:5", + fulfillment_url: "taler://fulfillment-success/thx", + minimum_age: 9, + }; + + await wallet.client.call(WalletApiOperation.InitiatePeerPushPayment, { + amount: "TESTKUDOS:1", + partialContractTerms: { + summary: "Hello, World", + }, + }); + + await wallet.runUntilDone(); + } +} + +runAgeRestrictionsPeerTest.suites = ["wallet"]; diff --git a/packages/taler-wallet-cli/src/integrationtests/test-age-restrictions.ts b/packages/taler-wallet-cli/src/integrationtests/test-age-restrictions.ts deleted file mode 100644 index c290fe919..000000000 --- a/packages/taler-wallet-cli/src/integrationtests/test-age-restrictions.ts +++ /dev/null @@ -1,112 +0,0 @@ -/* - This file is part of GNU Taler - (C) 2022 Taler Systems S.A. - - GNU Taler is free software; you can redistribute it and/or modify it under the - terms of the GNU General Public License as published by the Free Software - Foundation; either version 3, or (at your option) any later version. - - GNU Taler is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along with - GNU Taler; see the file COPYING. If not, see - */ - -/** - * Imports. - */ -import { defaultCoinConfig } from "../harness/denomStructures.js"; -import { GlobalTestState, WalletCli } from "../harness/harness.js"; -import { - createSimpleTestkudosEnvironment, - withdrawViaBank, - makeTestPayment, -} from "../harness/helpers.js"; - -/** - * Run test for basic, bank-integrated withdrawal and payment. - */ -export async function runAgeRestrictionsTest(t: GlobalTestState) { - // Set up test environment - - const { wallet: walletOne, bank, exchange, merchant } = - await createSimpleTestkudosEnvironment( - t, - defaultCoinConfig.map((x) => x("TESTKUDOS")), - { - ageMaskSpec: "8:10:12:14:16:18:21", - }, - ); - - const walletTwo = new WalletCli(t, "walletTwo"); - const walletThree = new WalletCli(t, "walletThree"); - - { - const wallet = walletOne; - - await withdrawViaBank(t, { - wallet, - bank, - exchange, - amount: "TESTKUDOS:20", - restrictAge: 13, - }); - - const order = { - summary: "Buy me!", - amount: "TESTKUDOS:5", - fulfillment_url: "taler://fulfillment-success/thx", - minimum_age: 9, - }; - - await makeTestPayment(t, { wallet, merchant, order }); - await wallet.runUntilDone(); - } - - { - const wallet = walletTwo; - - await withdrawViaBank(t, { - wallet, - bank, - exchange, - amount: "TESTKUDOS:20", - restrictAge: 13, - }); - - const order = { - summary: "Buy me!", - amount: "TESTKUDOS:5", - fulfillment_url: "taler://fulfillment-success/thx", - }; - - await makeTestPayment(t, { wallet, merchant, order }); - await wallet.runUntilDone(); - } - - { - const wallet = walletThree; - - await withdrawViaBank(t, { - wallet, - bank, - exchange, - amount: "TESTKUDOS:20", - }); - - const order = { - summary: "Buy me!", - amount: "TESTKUDOS:5", - fulfillment_url: "taler://fulfillment-success/thx", - minimum_age: 9, - }; - - await makeTestPayment(t, { wallet, merchant, order }); - await wallet.runUntilDone(); - } - -} - -runAgeRestrictionsTest.suites = ["wallet"]; diff --git a/packages/taler-wallet-cli/src/integrationtests/testrunner.ts b/packages/taler-wallet-cli/src/integrationtests/testrunner.ts index 699057304..de6e246d3 100644 --- a/packages/taler-wallet-cli/src/integrationtests/testrunner.ts +++ b/packages/taler-wallet-cli/src/integrationtests/testrunner.ts @@ -25,7 +25,7 @@ import { shouldLingerInTest, TestRunResult, } from "../harness/harness.js"; -import { runAgeRestrictionsTest } from "./test-age-restrictions.js"; +import { runAgeRestrictionsMerchantTest } from "./test-age-restrictions-merchant.js"; import { runBankApiTest } from "./test-bank-api.js"; import { runClaimLoopTest } from "./test-claim-loop.js"; import { runClauseSchnorrTest } from "./test-clause-schnorr.js"; @@ -90,6 +90,7 @@ import { runWithdrawalAbortBankTest } from "./test-withdrawal-abort-bank.js"; import { runWithdrawalBankIntegratedTest } from "./test-withdrawal-bank-integrated.js"; import { runWithdrawalFakebankTest } from "./test-withdrawal-fakebank.js"; import { runTestWithdrawalManualTest } from "./test-withdrawal-manual.js"; +import { runAgeRestrictionsPeerTest } from "./test-age-restrictions-peer.js"; /** * Test runner. @@ -106,7 +107,8 @@ interface TestMainFunction { } const allTests: TestMainFunction[] = [ - runAgeRestrictionsTest, + runAgeRestrictionsMerchantTest, + runAgeRestrictionsPeerTest, runBankApiTest, runClaimLoopTest, runClauseSchnorrTest, -- cgit v1.2.3