diff options
Diffstat (limited to 'src/testing/test_merchant_api.c')
| -rw-r--r-- | src/testing/test_merchant_api.c | 57 |
1 files changed, 40 insertions, 17 deletions
diff --git a/src/testing/test_merchant_api.c b/src/testing/test_merchant_api.c index 0d4bc471..b0ac2301 100644 --- a/src/testing/test_merchant_api.c +++ b/src/testing/test_merchant_api.c @@ -253,13 +253,18 @@ run (void *cls, MHD_HTTP_NOT_FOUND, NULL, "1"), - TALER_TESTING_cmd_merchant_post_orders ("create-proposal-1", - merchant_url, - MHD_HTTP_OK, - "1", - GNUNET_TIME_UNIT_ZERO_ABS, - GNUNET_TIME_UNIT_FOREVER_ABS, - "EUR:5.0"), + TALER_TESTING_cmd_merchant_post_orders2 ("create-proposal-1", + merchant_url, + MHD_HTTP_OK, + "1", + GNUNET_TIME_UNIT_ZERO_ABS, + GNUNET_TIME_UNIT_FOREVER_ABS, + "EUR:5.0", + "x-taler-bank", + "", + "", + "max_fee", + NULL), TALER_TESTING_cmd_merchant_claim_order ("reclaim-1", merchant_url, MHD_HTTP_OK, @@ -308,6 +313,20 @@ run (void *cls, "withdraw-coin-1", "EUR:5", "EUR:4.99"), + TALER_TESTING_cmd_merchant_forget_order ("forget-p3", + merchant_url, + MHD_HTTP_OK, + "create-proposal-1", + NULL, + "$.max_fee", + NULL), + TALER_TESTING_cmd_merchant_forget_order ("forget-unforgettable", + merchant_url, + MHD_HTTP_CONFLICT, + "create-proposal-1", + NULL, + "$.amount", + NULL), TALER_TESTING_cmd_poll_order_conclude ("poll-order-merchant-1-conclude", MHD_HTTP_OK, "poll-order-merchant-1-start"), @@ -317,19 +336,19 @@ run (void *cls, true, false, MHD_HTTP_OK), - TALER_TESTING_cmd_merchant_get_order ("get-order-merchant-1-2", + /*TALER_TESTING_cmd_merchant_get_order ("get-order-merchant-1-2", merchant_url, "create-proposal-1", true, false, - MHD_HTTP_OK), - TALER_TESTING_cmd_merchant_pay_order ("replay-simple", + MHD_HTTP_OK),*/ + /*TALER_TESTING_cmd_merchant_pay_order ("replay-simple", merchant_url, MHD_HTTP_OK, "create-proposal-1", "withdraw-coin-1", "EUR:5", - "EUR:4.99"), + "EUR:4.99"),*/ TALER_TESTING_cmd_check_bank_empty ("check_bank_empty-1"), CMD_EXEC_AGGREGATOR ("run-aggregator"), TALER_TESTING_cmd_check_bank_transfer ("check_bank_transfer-498c", @@ -351,7 +370,7 @@ run (void *cls, MHD_HTTP_OK, "post-transfer-1", NULL), - TALER_TESTING_cmd_merchant_get_order2 ("get-order-merchant-1-2", + /*TALER_TESTING_cmd_merchant_get_order2 ("get-order-merchant-1-2", merchant_url, "create-proposal-1", true, @@ -359,7 +378,7 @@ run (void *cls, order_1_transfers, false, NULL, - MHD_HTTP_OK), + MHD_HTTP_OK),*/ TALER_TESTING_cmd_merchant_post_products ("post-products-p3", merchant_url, "product-3", @@ -396,7 +415,8 @@ run (void *cls, "EUR:5.0", "unsupported-wire-method", "product-3/2", - ""), + "", + NULL), TALER_TESTING_cmd_merchant_post_orders2 ("create-proposal-p3-pd-nx", merchant_url, MHD_HTTP_NOT_FOUND, @@ -406,7 +426,8 @@ run (void *cls, "EUR:5.0", "x-taler-bank", "unknown-product/2", - ""), + "", + NULL), TALER_TESTING_cmd_merchant_post_orders2 ( "create-proposal-p3-not-enough-stock", merchant_url, @@ -417,7 +438,8 @@ run (void *cls, "EUR:5.0", "x-taler-bank", "product-3/24", - ""), + "", + NULL), TALER_TESTING_cmd_merchant_post_orders2 ("create-proposal-p3", merchant_url, MHD_HTTP_OK, @@ -427,7 +449,8 @@ run (void *cls, "EUR:5.0", "x-taler-bank", "product-3/3", - "lock-product-p3"), + "lock-product-p3", + NULL), TALER_TESTING_cmd_merchant_delete_order ("delete-order-1", merchant_url, "1", |