diff options
| author | Christian Grothoff <christian@grothoff.org> | 2020-10-15 14:27:39 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2020-10-15 14:27:39 +0200 |
| commit | f353a1efeab21e46ccdb203e15a848345775f451 (patch) | |
| tree | 851971c58f563f27d3ecc963d34484d6a28cb12e /src/testing/test_merchant_api.c | |
| parent | deb427412b5b4229590b91548d66f64e3f69f15b (diff) | |
| download | merchant-f353a1efeab21e46ccdb203e15a848345775f451.tar.gz merchant-f353a1efeab21e46ccdb203e15a848345775f451.tar.bz2 merchant-f353a1efeab21e46ccdb203e15a848345775f451.zip | |
expand test suite, remove obsolete functions from header
Diffstat (limited to 'src/testing/test_merchant_api.c')
| -rw-r--r-- | src/testing/test_merchant_api.c | 49 |
1 files changed, 20 insertions, 29 deletions
diff --git a/src/testing/test_merchant_api.c b/src/testing/test_merchant_api.c index e738ca0d..17984079 100644 --- a/src/testing/test_merchant_api.c +++ b/src/testing/test_merchant_api.c @@ -337,6 +337,11 @@ run (void *cls, TALER_MERCHANT_OSC_CLAIMED, false, MHD_HTTP_OK), + TALER_TESTING_cmd_wallet_poll_order_start ("poll-order-wallet-start-1", + merchant_url, + "create-proposal-1", + GNUNET_TIME_UNIT_MINUTES, + NULL), TALER_TESTING_cmd_poll_order_start ("poll-order-merchant-1-start", merchant_url, "1", @@ -352,6 +357,10 @@ run (void *cls, TALER_TESTING_cmd_poll_order_conclude ("poll-order-merchant-1-conclude", MHD_HTTP_OK, "poll-order-merchant-1-start"), + TALER_TESTING_cmd_wallet_poll_order_conclude ("poll-order-1-conclude", + MHD_HTTP_OK, + NULL, + "poll-order-wallet-start-1"), TALER_TESTING_cmd_merchant_post_orders_paid ("verify-order-1-paid", merchant_url, "deposit-simple", @@ -606,12 +615,14 @@ run (void *cls, * all records to be returned; setting date as 0 lets the * interpreter set it as 'now' + one hour delta, just to * make sure it surpasses the proposal's timestamp. - */GNUNET_TIME_UNIT_ZERO_ABS, + */// + GNUNET_TIME_UNIT_ZERO_ABS, /** * We only expect ONE result (create-proposal-1) to be * included in /history response, because create-proposal-3 * did NOT go through because of double spending. - */1, // nresult + */// + 1, // nresult 10, // start -10), // nrows #endif @@ -665,13 +676,10 @@ run (void *cls, "EUR:5", "EUR:4.99", NULL), -#if 0 - TALER_TESTING_cmd_poll_payment_start ("poll-payment-refund-1", - merchant_url, - "create-proposal-1r", - "EUR:0.0", - GNUNET_TIME_UNIT_MINUTES), -#endif + TALER_TESTING_cmd_poll_order_start ("poll-payment-refund-1", + merchant_url, + "1r", /* proposal name, not cmd ref! */ + GNUNET_TIME_UNIT_MINUTES), TALER_TESTING_cmd_merchant_order_refund ("refund-increase-1r", merchant_url, "refund test", @@ -731,26 +739,9 @@ run (void *cls, order_1r_refunds, NULL, MHD_HTTP_OK), -#if 0 - TALER_TESTING_cmd_poll_payment_conclude ("poll-payment-refund-conclude-1", - MHD_HTTP_OK, - "poll-payment-refund-1", - GNUNET_YES), - /* Ordinary refund. */ - TALER_TESTING_cmd_refund_lookup ("refund-lookup-1r", - merchant_url, - "refund-increase-1r", - "pay-for-refund-1r", - "1r", - MHD_HTTP_OK), - /* Trying to pick up refund from non existent proposal. */ - TALER_TESTING_cmd_refund_lookup ("refund-lookup-non-existent", - merchant_url, - "refund-increase-1r", - "deposit-simple", - "non-existend-id", - MHD_HTTP_NOT_FOUND), -#endif + TALER_TESTING_cmd_poll_order_conclude ("poll-payment-refund-conclude-1", + MHD_HTTP_OK, + "poll-payment-refund-1"), /* Test /refund on a contract that was never paid. */ TALER_TESTING_cmd_merchant_post_orders ("create-proposal-not-to-be-paid", |