[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-merchant] 111/277: fix link errors in test
|
From: |
gnunet |
|
Subject: |
[taler-merchant] 111/277: fix link errors in test |
|
Date: |
Sun, 05 Jul 2020 20:50:24 +0200 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository merchant.
commit 9381057c80dfd99dd92e7ddc2450aeab70ad51de
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Wed May 13 22:35:54 2020 +0200
fix link errors in test
---
src/testing/test_merchant_api.c | 241 ++++++++++++++++++++--------------------
1 file changed, 119 insertions(+), 122 deletions(-)
diff --git a/src/testing/test_merchant_api.c b/src/testing/test_merchant_api.c
index a739807..b8a471a 100644
--- a/src/testing/test_merchant_api.c
+++ b/src/testing/test_merchant_api.c
@@ -273,6 +273,7 @@ run (void *cls,
\"fulfillment_url\": \"https://example.com/\",\
\"products\": [ {\"description\":\"ice cream\",\
\"value\":\"{EUR:5}\"} ] }"),
+#if 0
TALER_TESTING_cmd_check_payment ("check-payment-1",
merchant_url,
MHD_HTTP_OK,
@@ -296,14 +297,15 @@ run (void *cls,
merchant_url,
"create-proposal-1",
GNUNET_TIME_UNIT_MINUTES),
- TALER_TESTING_cmd_pay ("deposit-simple",
- merchant_url,
- MHD_HTTP_OK,
- "create-proposal-1",
- "withdraw-coin-1",
- "EUR:5",
- "EUR:4.99",
- "EUR:0.01"),
+#endif
+ TALER_TESTING_cmd_merchant_pay_order ("deposit-simple",
+ merchant_url,
+ MHD_HTTP_OK,
+ "create-proposal-1",
+ "withdraw-coin-1",
+ "EUR:5",
+ "EUR:4.99"),
+#if 0
TALER_TESTING_cmd_poll_payment_conclude ("poll-payment-conclude-2",
MHD_HTTP_OK,
"poll-payment-2",
@@ -312,18 +314,18 @@ run (void *cls,
MHD_HTTP_OK,
"check-payment-2",
GNUNET_YES),
- TALER_TESTING_cmd_pay_abort ("pay-abort-2",
- merchant_url,
- "deposit-simple",
- MHD_HTTP_FORBIDDEN),
- TALER_TESTING_cmd_pay ("replay-simple",
- merchant_url,
- MHD_HTTP_OK,
- "create-proposal-1",
- "withdraw-coin-1",
- "EUR:5",
- "EUR:4.99",
- "EUR:0.01"),
+ TALER_TESTING_cmd_merchant_order_abort ("pay-abort-2",
+ merchant_url,
+ "deposit-simple",
+ MHD_HTTP_FORBIDDEN),
+#endif
+ TALER_TESTING_cmd_merchant_pay_order ("replay-simple",
+ merchant_url,
+ MHD_HTTP_OK,
+ "create-proposal-1",
+ "withdraw-coin-1",
+ "EUR:5",
+ "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",
@@ -353,14 +355,14 @@ run (void *cls,
MHD_HTTP_OK,
"create-proposal-2",
NULL),
- TALER_TESTING_cmd_pay ("deposit-double-2",
- merchant_url,
- MHD_HTTP_CONFLICT,
- "create-proposal-2",
- "withdraw-coin-1",
- "EUR:5",
- "EUR:4.99",
- "EUR:0.01"),
+ TALER_TESTING_cmd_merchant_pay_order ("deposit-double-2",
+ merchant_url,
+ MHD_HTTP_CONFLICT,
+ "create-proposal-2",
+ "withdraw-coin-1",
+ "EUR:5",
+ "EUR:4.99"),
+#if 0
TALER_TESTING_cmd_history ("history-0",
merchant_url,
MHD_HTTP_OK,
@@ -376,9 +378,11 @@ run (void *cls,
*/1, // nresult
10, // start
-10), // nrows
+#endif
TALER_TESTING_cmd_end ()
};
struct TALER_TESTING_Command track[] = {
+#if 0
TALER_TESTING_cmd_merchant_track_transaction ("track-transaction-1",
merchant_url,
MHD_HTTP_OK,
@@ -391,6 +395,7 @@ run (void *cls,
merchant_url,
MHD_HTTP_OK,
"check_bank_transfer-498c"),
+#endif
cmd_transfer_to_exchange ("create-reserve-2",
"EUR:1"),
TALER_TESTING_cmd_admin_add_incoming_with_ref ("create-reserve-2b",
@@ -413,14 +418,13 @@ run (void *cls,
"create-reserve-2",
"EUR:5",
MHD_HTTP_OK),
- TALER_TESTING_cmd_pay ("deposit-simple-2",
- merchant_url,
- MHD_HTTP_OK,
- "create-proposal-2",
- "withdraw-coin-2",
- "EUR:5",
- "EUR:4.99",
- "EUR:0.01"),
+ TALER_TESTING_cmd_merchant_pay_order ("deposit-simple-2",
+ merchant_url,
+ MHD_HTTP_OK,
+ "create-proposal-2",
+ "withdraw-coin-2",
+ "EUR:5",
+ "EUR:4.99"),
CMD_EXEC_AGGREGATOR ("run-aggregator-2"),
TALER_TESTING_cmd_check_bank_transfer ("check_bank_transfer-498c-2",
EXCHANGE_URL,
@@ -428,6 +432,7 @@ run (void *cls,
exchange_payto,
merchant_payto),
TALER_TESTING_cmd_check_bank_empty ("check_bank_empty"),
+#if 0
TALER_TESTING_cmd_merchant_track_transfer ("track-transfer-2",
merchant_url,
MHD_HTTP_OK,
@@ -451,6 +456,7 @@ run (void *cls,
*/2,
10,
-10),
+#endif
TALER_TESTING_cmd_end ()
};
@@ -493,26 +499,27 @@ run (void *cls,
\"fulfillment_url\": \"https://example.com/\",\
\"products\": [ {\"description\":\"ice cream\",\
\"value\":\"{EUR:5}\"} ] }"),
- TALER_TESTING_cmd_pay ("pay-for-refund-1r",
- merchant_url,
- MHD_HTTP_OK,
- "create-proposal-1r",
- "withdraw-coin-1r",
- "EUR:5",
- "EUR:4.99",
- "EUR:0.01"),
+ TALER_TESTING_cmd_merchant_pay_order ("pay-for-refund-1r",
+ merchant_url,
+ MHD_HTTP_OK,
+ "create-proposal-1r",
+ "withdraw-coin-1r",
+ "EUR:5",
+ "EUR:4.99"),
+#if 0
TALER_TESTING_cmd_poll_payment_start ("poll-payment-refund-1",
merchant_url,
"create-proposal-1r",
"EUR:0.0",
GNUNET_TIME_UNIT_MINUTES),
- TALER_TESTING_cmd_refund_increase ("refund-increase-1r",
- merchant_url,
- "refund test",
- "1r", /* order ID */
- "EUR:0.1",
- "EUR:0.01",
- MHD_HTTP_OK),
+#endif
+ TALER_TESTING_cmd_merchant_order_refund ("refund-increase-1r",
+ merchant_url,
+ "refund test",
+ "1r", /* order ID */
+ "EUR:0.1",
+ MHD_HTTP_OK),
+#if 0
TALER_TESTING_cmd_poll_payment_conclude ("poll-payment-refund-conclude-1",
MHD_HTTP_OK,
"poll-payment-refund-1",
@@ -531,6 +538,7 @@ run (void *cls,
"deposit-simple",
"non-existend-id",
MHD_HTTP_NOT_FOUND),
+#endif
/* Test /refund on a contract that was never paid. */
TALER_TESTING_cmd_merchant_post_orders ("create-proposal-not-to-be-paid",
@@ -546,21 +554,19 @@ run (void *cls,
\"products\": [ {\"description\":\"ice cream\",\
\"value\":\"{EUR:5}\"} ] }"),
/* Try to increase a non paid proposal. */
- TALER_TESTING_cmd_refund_increase ("refund-increase-unpaid-proposal",
- merchant_url,
- "refund test",
- "1-unpaid",
- "EUR:0.1",
- "EUR:0.01",
- MHD_HTTP_CONFLICT),
+ TALER_TESTING_cmd_merchant_order_refund ("refund-increase-unpaid-proposal",
+ merchant_url,
+ "refund test",
+ "1-unpaid",
+ "EUR:0.1",
+ MHD_HTTP_CONFLICT),
/* Try to increase a non existent proposal. */
- TALER_TESTING_cmd_refund_increase ("refund-increase-unpaid-proposal",
- merchant_url,
- "refund test",
- "non-existent-id",
- "EUR:0.1",
- "EUR:0.01",
- MHD_HTTP_NOT_FOUND),
+ TALER_TESTING_cmd_merchant_order_refund ("refund-increase-unpaid-proposal",
+ merchant_url,
+ "refund test",
+ "non-existent-id",
+ "EUR:0.1",
+ MHD_HTTP_NOT_FOUND),
/*
The following block will (1) create a new
reserve, then (2) a proposal, then (3) pay for
@@ -594,14 +600,13 @@ run (void *cls,
\"fulfillment_url\": \"https://example.com/\",\
\"products\": [ {\"description\":\"ice cream\",\
\"value\":\"{EUR:5}\"} ] }"),
- TALER_TESTING_cmd_pay ("pay-unincreased-proposal",
- merchant_url,
- MHD_HTTP_OK,
- "create-proposal-unincreased-refund",
- "withdraw-coin-unincreased-refund",
- "EUR:5",
- "EUR:4.99",
- "EUR:0.01"),
+ TALER_TESTING_cmd_merchant_pay_order ("pay-unincreased-proposal",
+ merchant_url,
+ MHD_HTTP_OK,
+ "create-proposal-unincreased-refund",
+ "withdraw-coin-unincreased-refund",
+ "EUR:5",
+ "EUR:4.99"),
CMD_EXEC_AGGREGATOR ("run-aggregator-unincreased-refund"),
TALER_TESTING_cmd_check_bank_transfer (
"check_bank_transfer-paid-unincreased-refund",
@@ -611,6 +616,7 @@ run (void *cls,
exchange_payto,
merchant_payto),
/* Actually try to pick up the refund from the "unincreased proposal". */
+#if 0
TALER_TESTING_cmd_refund_lookup_with_amount ("refund-lookup-unincreased",
merchant_url,
NULL,
@@ -625,6 +631,7 @@ run (void *cls,
* but the HTTP response code
* is 200 OK. *///
"EUR:0"),
+#endif
TALER_TESTING_cmd_end ()
};
@@ -758,14 +765,13 @@ run (void *cls,
\"fulfillment_url\": \"https://example.com/\",\
\"products\": [ {\"description\":\"ice cream\",\
\"value\":\"{EUR:5}\"} ] }"),
- TALER_TESTING_cmd_pay ("deposit-tip-simple",
- merchant_url_external ("tip"),
- MHD_HTTP_OK,
- "create-proposal-tip-1",
- "pickup-tip-1",
- "EUR:5", // amount + fee
- "EUR:4.99", // amount - fee
- "EUR:0.01"), // refund fee
+ TALER_TESTING_cmd_merchant_pay_order ("deposit-tip-simple",
+ merchant_url_external ("tip"),
+ MHD_HTTP_OK,
+ "create-proposal-tip-1",
+ "pickup-tip-1",
+ "EUR:5", // amount + fee
+ "EUR:4.99"), // amount - fee
CMD_EXEC_AGGREGATOR ("aggregator-tip-1"),
TALER_TESTING_cmd_check_bank_transfer ("check_bank_transfer-tip-498c",
EXCHANGE_URL,
@@ -809,20 +815,20 @@ run (void *cls,
\"fulfillment_url\": \"https://example.com/\",\
\"products\": [ {\"description\":\"ice cream\",\
\"value\":\"{EUR:10}\"} ] }"),
- TALER_TESTING_cmd_pay ("pay-fail-partial-double-10",
- merchant_url,
- MHD_HTTP_CONFLICT,
- "create-proposal-10",
- "withdraw-coin-10a;withdraw-coin-1",
- "EUR:5",
- "EUR:4.99",
- "EUR:0.01"),
- TALER_TESTING_cmd_pay_again ("pay-again-10",
- merchant_url,
- "pay-fail-partial-double-10",
- "withdraw-coin-10a;withdraw-coin-10b",
- "EUR:0.01",
- MHD_HTTP_OK),
+ TALER_TESTING_cmd_merchant_pay_order ("pay-fail-partial-double-10",
+ merchant_url,
+ MHD_HTTP_CONFLICT,
+ "create-proposal-10",
+ "withdraw-coin-10a;withdraw-coin-1",
+ "EUR:5",
+ "EUR:4.99"),
+ TALER_TESTING_cmd_merchant_pay_order ("pay-again-10",
+ merchant_url,
+ MHD_HTTP_OK,
+ "create-proposal-10",
+
"withdraw-coin-10a;withdraw-coin-10b",
+ "EUR:5",
+ "EUR:4.99"),
CMD_EXEC_AGGREGATOR ("run-aggregator-10"),
TALER_TESTING_cmd_check_bank_transfer ("check_bank_transfer-9.97-10",
EXCHANGE_URL,
@@ -866,33 +872,24 @@ run (void *cls,
\"fulfillment_url\": \"https://example.com/\",\
\"products\": [ {\"description\":\"ice cream\",\
\"value\":\"{EUR:10}\"} ] }"),
- TALER_TESTING_cmd_pay ("pay-fail-partial-double-11-good",
- merchant_url,
- MHD_HTTP_NOT_ACCEPTABLE,
- "create-proposal-11",
- "withdraw-coin-11a",
- "EUR:5",
- "EUR:4.99",
- "EUR:0.01"),
- TALER_TESTING_cmd_pay ("pay-fail-partial-double-11-bad",
- merchant_url,
- MHD_HTTP_CONFLICT,
- "create-proposal-11",
- "withdraw-coin-1",
- "EUR:5",
- "EUR:4.99",
- "EUR:0.01"),
- TALER_TESTING_cmd_pay_abort ("pay-abort-11",
- merchant_url,
- "pay-fail-partial-double-11-good",
- MHD_HTTP_OK),
- TALER_TESTING_cmd_pay_abort_refund ("pay-abort-refund-11",
- /* abort reference */
- "pay-abort-11",
- 0,
- "EUR:5",
- "EUR:0.01",
- MHD_HTTP_OK),
+ TALER_TESTING_cmd_merchant_pay_order ("pay-fail-partial-double-11-good",
+ merchant_url,
+ MHD_HTTP_NOT_ACCEPTABLE,
+ "create-proposal-11",
+ "withdraw-coin-11a",
+ "EUR:5",
+ "EUR:4.99"),
+ TALER_TESTING_cmd_merchant_pay_order ("pay-fail-partial-double-11-bad",
+ merchant_url,
+ MHD_HTTP_CONFLICT,
+ "create-proposal-11",
+ "withdraw-coin-1",
+ "EUR:5",
+ "EUR:4.99"),
+ TALER_TESTING_cmd_merchant_order_abort ("pay-abort-11",
+ merchant_url,
+ "pay-fail-partial-double-11-good",
+ MHD_HTTP_OK),
CMD_EXEC_AGGREGATOR ("run-aggregator-11"),
TALER_TESTING_cmd_check_bank_empty ("check_bank_empty-11"),
TALER_TESTING_cmd_end ()
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-merchant] 104/277: GET /transfers implementation, (continued)
- [taler-merchant] 104/277: GET /transfers implementation, gnunet, 2020/07/05
- [taler-merchant] 102/277: towards idempotency in POST /private/transfers, gnunet, 2020/07/05
- [taler-merchant] 103/277: towards GET /transfers, gnunet, 2020/07/05
- [taler-merchant] 114/277: fix sql, gnunet, 2020/07/05
- [taler-merchant] 119/277: better error handling, gnunet, 2020/07/05
- [taler-merchant] 117/277: get simple pay test to pass, gnunet, 2020/07/05
- [taler-merchant] 94/277: fix ftbfs, gnunet, 2020/07/05
- [taler-merchant] 98/277: implement POST /transfers, gnunet, 2020/07/05
- [taler-merchant] 107/277: implement GET /transfers, gnunet, 2020/07/05
- [taler-merchant] 106/277: implement merchant_api_post_transfers.c, gnunet, 2020/07/05
- [taler-merchant] 111/277: fix link errors in test,
gnunet <=
- [taler-merchant] 90/277: starting with get-orders-ID logic, gnunet, 2020/07/05
- [taler-merchant] 92/277: fix backenddb, gnunet, 2020/07/05
- [taler-merchant] 97/277: integrate POST /tranfers handler, gnunet, 2020/07/05
- [taler-merchant] 105/277: API design for /transfers, gnunet, 2020/07/05
- [taler-merchant] 113/277: use unregister, gnunet, 2020/07/05
- [taler-merchant] 112/277: rename _v to _mv for merchant, gnunet, 2020/07/05
- [taler-merchant] 118/277: implement POST /reserves, gnunet, 2020/07/05
- [taler-merchant] 122/277: fixed bool casts in plugin initialization, gnunet, 2020/07/05
- [taler-merchant] 129/277: fixed coding style in db tests and double callbacks in lookup_instances, gnunet, 2020/07/05
- [taler-merchant] 131/277: towards POST tips pickup impl, gnunet, 2020/07/05