diff options
Diffstat (limited to 'src/testing')
| -rw-r--r-- | src/testing/test_merchant_api.c | 8 | ||||
| -rw-r--r-- | src/testing/testing_api_cmd_abort_order.c | 12 | ||||
| -rw-r--r-- | src/testing/testing_api_cmd_pay_order.c | 2 |
3 files changed, 16 insertions, 6 deletions
diff --git a/src/testing/test_merchant_api.c b/src/testing/test_merchant_api.c index 2f30ca7a..b02d8c8b 100644 --- a/src/testing/test_merchant_api.c +++ b/src/testing/test_merchant_api.c @@ -1180,15 +1180,15 @@ run (void *cls, 10, 10), #endif + TALER_TESTING_cmd_batch ("pay-again", + pay_again), + TALER_TESTING_cmd_batch ("pay-abort", + pay_abort), TALER_TESTING_cmd_batch ("refund", refund), TALER_TESTING_cmd_batch ("tip", tip), #if 0 - TALER_TESTING_cmd_batch ("pay-again", - pay_again), - TALER_TESTING_cmd_batch ("pay-abort", - pay_abort), TALER_TESTING_cmd_history_default_start ("history-default-start", merchant_url, MHD_HTTP_OK, diff --git a/src/testing/testing_api_cmd_abort_order.c b/src/testing/testing_api_cmd_abort_order.c index d2f4e2aa..c44684e4 100644 --- a/src/testing/testing_api_cmd_abort_order.c +++ b/src/testing/testing_api_cmd_abort_order.c @@ -152,7 +152,15 @@ build_coins (struct TALER_MERCHANT_AbortCoin **ac, TALER_TESTING_get_trait_url (coin_cmd, TALER_TESTING_UT_EXCHANGE_BASE_URL, &icoin->exchange_url)); - // FIXME: initialize icon->amount_with_fee! + { + const struct TALER_Amount *denom_value; + GNUNET_assert (GNUNET_OK + == TALER_TESTING_get_trait_amount_obj (coin_cmd, + 0, + &denom_value)); + icoin->amount_with_fee = *denom_value; + } + } } return GNUNET_OK; @@ -359,7 +367,7 @@ abort_cleanup (void *cls, { struct AbortState *as = cls; - if (NULL != as->acs) + if (NULL != as->oah) { GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Command `%s' did not complete.\n", diff --git a/src/testing/testing_api_cmd_pay_order.c b/src/testing/testing_api_cmd_pay_order.c index ee47ae5e..c576c316 100644 --- a/src/testing/testing_api_cmd_pay_order.c +++ b/src/testing/testing_api_cmd_pay_order.c @@ -508,6 +508,8 @@ pay_traits (void *cls, order_id), TALER_TESTING_make_trait_merchant_pub (0, merchant_pub), + TALER_TESTING_make_trait_string (0, + ps->amount_with_fee), TALER_TESTING_trait_end () }; |