diff options
Diffstat (limited to 'src/testing/test_merchant_api.c')
| -rw-r--r-- | src/testing/test_merchant_api.c | 34 |
1 files changed, 32 insertions, 2 deletions
diff --git a/src/testing/test_merchant_api.c b/src/testing/test_merchant_api.c index 07e6b61b..790bee43 100644 --- a/src/testing/test_merchant_api.c +++ b/src/testing/test_merchant_api.c @@ -278,7 +278,7 @@ run (void *cls, TALER_TESTING_cmd_merchant_post_orders2 ("create-proposal-1", merchant_url, MHD_HTTP_OK, - "1", + "1", /* order ID */ GNUNET_TIME_UNIT_ZERO_ABS, GNUNET_TIME_UNIT_FOREVER_ABS, true, @@ -290,7 +290,7 @@ run (void *cls, TALER_TESTING_cmd_merchant_post_orders2 ("create-proposal-1-idem", merchant_url, MHD_HTTP_OK, - "1", + "1", /* order ID */ GNUNET_TIME_UNIT_ZERO_ABS, GNUNET_TIME_UNIT_FOREVER_ABS, true, @@ -299,6 +299,18 @@ run (void *cls, "", "", "create-proposal-1"), + TALER_TESTING_cmd_merchant_post_orders2 ("create-proposal-1x", + merchant_url, + MHD_HTTP_OK, + "1x", /* order ID */ + GNUNET_TIME_UNIT_ZERO_ABS, + GNUNET_TIME_UNIT_FOREVER_ABS, + true, + "EUR:5.0", + "x-taler-bank", + "", + "", + NULL), TALER_TESTING_cmd_merchant_claim_order ("reclaim-1", merchant_url, MHD_HTTP_OK, @@ -309,6 +321,11 @@ run (void *cls, MHD_HTTP_CONFLICT, NULL, "1"), + TALER_TESTING_cmd_merchant_claim_order ("reclaim-1x", + merchant_url, + MHD_HTTP_OK, + "create-proposal-1x", + NULL), TALER_TESTING_cmd_merchant_post_orders ("create-proposal-1-pre-exists", merchant_url, MHD_HTTP_BAD_REQUEST, @@ -322,6 +339,7 @@ run (void *cls, TALER_TESTING_cmd_merchant_get_orders ("get-orders-1", merchant_url, MHD_HTTP_OK, + "create-proposal-1x", "create-proposal-1", NULL), TALER_TESTING_cmd_wallet_get_order ("get-order-wallet-1", @@ -342,6 +360,12 @@ run (void *cls, "create-proposal-1", GNUNET_TIME_UNIT_MINUTES, NULL), + TALER_TESTING_cmd_wallet_poll_order_start2 ("poll-order-wallet-start-1x", + merchant_url, + "create-proposal-1x", + GNUNET_TIME_UNIT_MINUTES, + NULL, + "session-0"), TALER_TESTING_cmd_poll_order_start ("poll-order-merchant-1-start", merchant_url, "1", @@ -361,6 +385,11 @@ run (void *cls, MHD_HTTP_OK, NULL, "poll-order-wallet-start-1"), + TALER_TESTING_cmd_wallet_poll_order_conclude2 ("poll-order-1x-conclude", + MHD_HTTP_OK, + NULL, + "poll-order-wallet-start-1x", + "1"), TALER_TESTING_cmd_merchant_post_orders_paid ("verify-order-1-paid", merchant_url, "deposit-simple", @@ -382,6 +411,7 @@ run (void *cls, TALER_TESTING_cmd_merchant_get_orders ("get-orders-1-paid", merchant_url, MHD_HTTP_OK, + "create-proposal-1x", "create-proposal-1", NULL), TALER_TESTING_cmd_merchant_pay_order ("replay-simple", |