From 6624576c0cdd81072256d8abbfe6dd1343f956c6 Mon Sep 17 00:00:00 2001 From: Jonathan Buchanan Date: Wed, 17 Jun 2020 21:35:09 -0400 Subject: implementations, tests, and renames for GET /tips/ & GET /private/tips/ --- src/testing/Makefile.am | 3 +- src/testing/test_merchant_api.c | 8 + src/testing/testing_api_cmd_merchant_get_tip.c | 207 ++++++++++++++++++ src/testing/testing_api_cmd_tip_authorize.c | 2 +- src/testing/testing_api_cmd_tip_query.c | 292 ------------------------- src/testing/testing_api_cmd_wallet_get_tip.c | 200 +++++++++++++++++ 6 files changed, 418 insertions(+), 294 deletions(-) create mode 100644 src/testing/testing_api_cmd_merchant_get_tip.c delete mode 100644 src/testing/testing_api_cmd_tip_query.c create mode 100644 src/testing/testing_api_cmd_wallet_get_tip.c (limited to 'src/testing') diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am index 6a3aedaa..d8025bf0 100644 --- a/src/testing/Makefile.am +++ b/src/testing/Makefile.am @@ -29,6 +29,7 @@ libtalermerchanttesting_la_SOURCES = \ testing_api_cmd_delete_product.c \ testing_api_cmd_delete_reserve.c \ testing_api_cmd_lock_product.c \ + testing_api_cmd_merchant_get_tip.c \ testing_api_cmd_pay_order.c \ testing_api_cmd_post_instances.c \ testing_api_cmd_post_orders.c \ @@ -42,8 +43,8 @@ libtalermerchanttesting_la_SOURCES = \ testing_api_cmd_rewind.c \ testing_api_cmd_tip_authorize.c \ testing_api_cmd_tip_pickup.c \ - testing_api_cmd_tip_query.c \ testing_api_cmd_track_transaction.c \ + testing_api_cmd_wallet_get_tip.c \ testing_api_helpers.c \ testing_api_trait_merchant_sig.c \ testing_api_trait_string.c \ diff --git a/src/testing/test_merchant_api.c b/src/testing/test_merchant_api.c index fb230f04..ff705a36 100644 --- a/src/testing/test_merchant_api.c +++ b/src/testing/test_merchant_api.c @@ -660,6 +660,14 @@ run (void *cls, MHD_HTTP_OK, "tip 2", "EUR:5.01"), + TALER_TESTING_cmd_wallet_get_tip ("get-tip-1", + merchant_url, + "authorize-tip-1", + MHD_HTTP_OK), + TALER_TESTING_cmd_merchant_get_tip ("merchant-get-tip-1", + merchant_url, + "authorize-tip-1", + MHD_HTTP_OK), TALER_TESTING_cmd_get_tips ("get-tips-1", merchant_url, MHD_HTTP_OK), diff --git a/src/testing/testing_api_cmd_merchant_get_tip.c b/src/testing/testing_api_cmd_merchant_get_tip.c new file mode 100644 index 00000000..f70356c7 --- /dev/null +++ b/src/testing/testing_api_cmd_merchant_get_tip.c @@ -0,0 +1,207 @@ +/* + This file is part of TALER + Copyright (C) 2020 Taler Systems SA + + TALER is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as + published by the Free Software Foundation; either version 3, or + (at your option) any later version. + + TALER is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public + License along with TALER; see the file COPYING. If not, see + +*/ +/** + * @file lib/testing_api_cmd_merchant_get_tip.c + * @brief command to test GET /private/tips/$TIP_ID. + * @author Jonathan Buchanan + */ +#include "platform.h" +#include +#include +#include "taler_merchant_service.h" +#include "taler_merchant_testing_lib.h" + +/** + * State for a GET /private/tips/$TIP_ID CMD. + */ +struct MerchantTipGetState +{ + + /** + * The merchant base URL. + */ + const char *merchant_url; + + /** + * Expected HTTP response code for this CMD. + */ + unsigned int http_status; + + /** + * The handle to the current GET /tips/$TIP_ID request. + */ + struct TALER_MERCHANT_TipMerchantGetHandle *tgh; + + /** + * The interpreter state. + */ + struct TALER_TESTING_Interpreter *is; + + /** + * Reference to a command that created a tip. + */ + const char *tip_reference; +}; + + +/** + * Callback for a GET /private/tips/$TIP_ID operation. + * + * @param cls closure for this function + * @param hr http response + * @param total_authorized the total amount authorized for the tip + * @param total_picked_up the total amount of the tip that has been picked up + * @param reason why the tip was authorized + * @param expiration when the tip will expire + * @param reserve_pub public key of the reserve the tip is drawing from + * @param pickups_length number of pickups associated with the tip + * @param pickups the array of pickups associated with the tip + */ +static void +merchant_get_tip_cb (void *cls, + const struct TALER_MERCHANT_HttpResponse *hr, + const struct TALER_Amount *total_authorized, + const struct TALER_Amount *total_picked_up, + const char *reason, + struct GNUNET_TIME_Absolute expiration, + const struct TALER_ReservePublicKeyP *reserve_pub, + unsigned int pickups_length, + const struct TALER_MERCHANT_PickupDetail pickups[]) +{ + /* FIXME, deeper checks should be implemented here. */ + struct MerchantTipGetState *gts = cls; + + gts->tgh = NULL; + if (gts->http_status != hr->http_status) + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "Unexpected response code %u (%d) to command %s\n", + hr->http_status, + (int) hr->ec, + TALER_TESTING_interpreter_get_current_label (gts->is)); + TALER_TESTING_interpreter_fail (gts->is); + return; + } + switch (hr->http_status) + { + case MHD_HTTP_OK: + // FIXME: use gts->tip_reference here to + // check if the data returned matches that from the POST / PATCH + break; + default: + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + "Unhandled HTTP status.\n"); + } + TALER_TESTING_interpreter_next (gts->is); +} + + +/** + * Run the "GET tip" CMD. + * + * @param cls closure. + * @param cmd command being run now. + * @param is interpreter state. + */ +static void +merchant_get_tip_run (void *cls, + const struct TALER_TESTING_Command *cmd, + struct TALER_TESTING_Interpreter *is) +{ + struct MerchantTipGetState *tgs = cls; + const struct TALER_TESTING_Command *tip_cmd; + const struct GNUNET_HashCode *tip_id; + + tip_cmd = TALER_TESTING_interpreter_lookup_command (is, + tgs->tip_reference); + + if (GNUNET_OK != + TALER_TESTING_get_trait_tip_id (tip_cmd, + 0, + &tip_id)) + TALER_TESTING_FAIL (is); + + tgs->is = is; + tgs->tgh = TALER_MERCHANT_merchant_tip_get (is->ctx, + tgs->merchant_url, + tip_id, + false, + &merchant_get_tip_cb, + tgs); + GNUNET_assert (NULL != tgs->tgh); +} + + +/** +* Free the state of a "GET tip" CMD, and possibly +* cancel a pending operation thereof. +* +* @param cls closure. +* @param cmd command being run. +*/ +static void +merchant_get_tip_cleanup (void *cls, + const struct TALER_TESTING_Command *cmd) +{ + struct MerchantTipGetState *tgs = cls; + + if (NULL != tgs->tgh) + { + TALER_LOG_WARNING ("Get tip operation did not complete\n"); + TALER_MERCHANT_merchant_tip_get_cancel (tgs->tgh); + } + GNUNET_free (tgs); +} + + +/** + * Define a GET /private/tips/$TIP_IDE CMD. + * + * @param label the command label + * @param merchant_url base URL of the merchant which will + * serve the request. + * @param tip_reference reference to a command that created a tip. + * @param http_status expected HTTP response code for the request. + */ +struct TALER_TESTING_Command +TALER_TESTING_cmd_merchant_get_tip (const char *label, + const char *merchant_url, + const char *tip_reference, + unsigned int http_status) +{ + struct MerchantTipGetState *tgs; + + tgs = GNUNET_new (struct MerchantTipGetState); + tgs->merchant_url = merchant_url; + tgs->tip_reference = tip_reference; + tgs->http_status = http_status; + { + struct TALER_TESTING_Command cmd = { + .cls = tgs, + .label = label, + .run = &merchant_get_tip_run, + .cleanup = &merchant_get_tip_cleanup + }; + + return cmd; + } +} + + +/* end of testing_api_cmd_merchant_get_tip.c */ diff --git a/src/testing/testing_api_cmd_tip_authorize.c b/src/testing/testing_api_cmd_tip_authorize.c index ff7f9c0a..e51b70f4 100644 --- a/src/testing/testing_api_cmd_tip_authorize.c +++ b/src/testing/testing_api_cmd_tip_authorize.c @@ -1,6 +1,6 @@ /* This file is part of TALER - Copyright (C) 2014-2018 Taler Systems SA + Copyright (C) 2014-2020 Taler Systems SA TALER is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/testing/testing_api_cmd_tip_query.c b/src/testing/testing_api_cmd_tip_query.c deleted file mode 100644 index 27a82a99..00000000 --- a/src/testing/testing_api_cmd_tip_query.c +++ /dev/null @@ -1,292 +0,0 @@ -/* - This file is part of TALER - Copyright (C) 2014-2018 Taler Systems SA - - TALER is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation; either version 3, or - (at your option) any later version. - - TALER is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with TALER; see the file COPYING. If not, see - -*/ - -/** - * @file lib/testing_api_cmd_tip_query.c - * @brief command to test the tipping. - * @author Marcello Stanisci - */ - -#include "platform.h" -#include -#include -#include "taler_merchant_service.h" -#include "taler_merchant_testing_lib.h" - - -/** - * State for a /tip-query CMD. - */ -struct TipQueryState -{ - - /** - * The merchant base URL. - */ - const char *merchant_url; - - /** - * Expected HTTP response code for this CMD. - */ - unsigned int http_status; - - /** - * The handle to the current /tip-query request. - */ - struct TALER_MERCHANT_TipGetHandle *tqo; - - /** - * The interpreter state. - */ - struct TALER_TESTING_Interpreter *is; - - /** - * Expected amount to be picked up. - */ - const char *expected_amount_picked_up; - - /** - * Expected amount to be tip-authorized. - */ - const char *expected_amount_authorized; - - /** - * Amount that is expected to be still available - * from the tip reserve. - */ - const char *expected_amount_available; -}; - - -/** - * Callback to process a GET /tip-query request, it mainly - * checks that what the backend returned matches the command's - * expectations. - * - * @param cls closure - * @param hr HTTP response - * @param reserve_expiration when the tip reserve will expire - * @param exchange_url from where to pick up the tip - * @param amount_remaining how much is remaining - */ -static void -tip_query_cb (void *cls, - const struct TALER_MERCHANT_HttpResponse *hr, - struct GNUNET_TIME_Absolute reserve_expiration, - const char *exchange_url, - struct TALER_Amount *amount_remaining) -{ - struct TipQueryState *tqs = cls; - - tqs->tqo = NULL; - GNUNET_log (GNUNET_ERROR_TYPE_INFO, - "Tip query callback at command `%s'\n", - TALER_TESTING_interpreter_get_current_label (tqs->is)); -#if FIXME_LATER - if (tqs->expected_amount_available) - { - struct TALER_Amount a; - - GNUNET_assert (GNUNET_OK == - TALER_string_to_amount (tqs->expected_amount_available, - &a)); - { - char *str; - - str = TALER_amount_to_string (amount_available); - TALER_LOG_INFO ("expected available %s, actual %s\n", - TALER_amount2s (&a), - str); - GNUNET_free (str); - } - if (0 != - TALER_amount_cmp (amount_available, - &a)) - TALER_TESTING_FAIL (tqs->is); - } - - if (tqs->expected_amount_authorized) - { - struct TALER_Amount a; - char *str; - - GNUNET_assert (GNUNET_OK == - TALER_string_to_amount (tqs->expected_amount_authorized, - &a)); - str = TALER_amount_to_string (amount_authorized); - TALER_LOG_INFO ("expected authorized %s, actual %s\n", - TALER_amount2s (&a), - str); - GNUNET_free (str); - if (0 != - TALER_amount_cmp (amount_authorized, - &a)) - TALER_TESTING_FAIL (tqs->is); - } - - if (tqs->expected_amount_picked_up) - { - struct TALER_Amount a; - char *str; - - GNUNET_assert (GNUNET_OK == - TALER_string_to_amount (tqs->expected_amount_picked_up, - &a)); - str = TALER_amount_to_string (amount_picked_up); - TALER_LOG_INFO ("expected picked_up %s, actual %s\n", - TALER_amount2s (&a), - str); - GNUNET_free (str); - if (0 != - TALER_amount_cmp (amount_picked_up, - &a)) - TALER_TESTING_FAIL (tqs->is); - } -#endif - if (tqs->http_status != hr->http_status) - TALER_TESTING_FAIL (tqs->is); - TALER_TESTING_interpreter_next (tqs->is); -} - - -/** - * Free the state from a /tip-query CMD, and possibly cancel - * a pending /tip-query request. - * - * @param cls closure. - * @param cmd the /tip-query CMD to free. - */ -static void -tip_query_cleanup (void *cls, - const struct TALER_TESTING_Command *cmd) -{ - struct TipQueryState *tqs = cls; - - if (NULL != tqs->tqo) - { - TALER_LOG_WARNING ("Tip-query operation did not complete\n"); - TALER_MERCHANT_tip_get_cancel (tqs->tqo); - } - GNUNET_free (tqs); -} - - -/** - * Run a /tip-query CMD. - * - * @param cls closure. - * @param cmd the current /tip-query CMD. - * @param is the interpreter state. - */ -static void -tip_query_run (void *cls, - const struct TALER_TESTING_Command *cmd, - struct TALER_TESTING_Interpreter *is) -{ - struct TipQueryState *tqs = cls; - struct GNUNET_HashCode tip_id; // FIXME: big bad bug, need to pass this in. Done like this just to quickly fix FTBFS! - - tqs->is = is; - tqs->tqo = TALER_MERCHANT_tip_get (is->ctx, - tqs->merchant_url, - &tip_id, - &tip_query_cb, - tqs); - GNUNET_assert (NULL != tqs->tqo); -} - - -/** - * Define a /tip-query CMD equipped with a expected amount. - * - * @param label the command label - * @param merchant_url base URL of the merchant which will - * server the /tip-query request. - * @param http_status expected HTTP response code for the - * /tip-query request. - * @param expected_amount_picked_up expected amount already - * picked up. - * @param expected_amount_authorized expected amount that was - * authorized in the first place. - * @param expected_amount_available expected amount which is - * still available from the tip reserve - * @return the command - */ -struct TALER_TESTING_Command -TALER_TESTING_cmd_tip_query_with_amounts (const char *label, - const char *merchant_url, - unsigned int http_status, - const char *expected_amount_picked_up, - const char *expected_amount_authorized, - const char *expected_amount_available) -{ - struct TipQueryState *tqs; - - tqs = GNUNET_new (struct TipQueryState); - tqs->merchant_url = merchant_url; - tqs->http_status = http_status; - tqs->expected_amount_picked_up = expected_amount_picked_up; - tqs->expected_amount_authorized = expected_amount_authorized; - tqs->expected_amount_available = expected_amount_available; - { - struct TALER_TESTING_Command cmd = { - .cls = tqs, - .label = label, - .run = &tip_query_run, - .cleanup = &tip_query_cleanup - }; - - return cmd; - } -} - - -/** - * Define a /tip-query CMD. - * - * @param label the command label - * @param merchant_url base URL of the merchant which will - * server the /tip-query request. - * @param http_status expected HTTP response code for the - * /tip-query request. - */ -struct TALER_TESTING_Command -TALER_TESTING_cmd_tip_query (const char *label, - const char *merchant_url, - unsigned int http_status) -{ - struct TipQueryState *tqs; - - tqs = GNUNET_new (struct TipQueryState); - tqs->merchant_url = merchant_url; - tqs->http_status = http_status; - { - struct TALER_TESTING_Command cmd = { - .cls = tqs, - .label = label, - .run = &tip_query_run, - .cleanup = &tip_query_cleanup - }; - - return cmd; - } -} - - -/* end of testing_api_cmd_tip_query.c */ diff --git a/src/testing/testing_api_cmd_wallet_get_tip.c b/src/testing/testing_api_cmd_wallet_get_tip.c new file mode 100644 index 00000000..f76c3b69 --- /dev/null +++ b/src/testing/testing_api_cmd_wallet_get_tip.c @@ -0,0 +1,200 @@ +/* + This file is part of TALER + Copyright (C) 2014-2020 Taler Systems SA + + TALER is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as + published by the Free Software Foundation; either version 3, or + (at your option) any later version. + + TALER is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public + License along with TALER; see the file COPYING. If not, see + +*/ +/** + * @file lib/testing_api_cmd_wallet_get_tip.c + * @brief command to test the tipping. + * @author Marcello Stanisci + */ +#include "platform.h" +#include +#include +#include "taler_merchant_service.h" +#include "taler_merchant_testing_lib.h" + + +/** + * State for a GET /tips/$TIP_ID CMD. + */ +struct WalletTipGetState +{ + + /** + * The merchant base URL. + */ + const char *merchant_url; + + /** + * Expected HTTP response code for this CMD. + */ + unsigned int http_status; + + /** + * The handle to the current GET /tips/$TIP_ID request. + */ + struct TALER_MERCHANT_TipWalletGetHandle *tgh; + + /** + * The interpreter state. + */ + struct TALER_TESTING_Interpreter *is; + + /** + * Reference to a command that created a tip. + */ + const char *tip_reference; +}; + + +/** + * Callback to process a GET /tips/$TIP_ID request, it mainly + * checks that what the backend returned matches the command's + * expectations. + * + * @param cls closure + * @param hr HTTP response + * @param reserve_expiration when the tip reserve will expire + * @param exchange_url from where to pick up the tip + * @param amount_remaining how much is remaining + */ +static void +wallet_tip_get_cb (void *cls, + const struct TALER_MERCHANT_HttpResponse *hr, + struct GNUNET_TIME_Absolute reserve_expiration, + const char *exchange_url, + const struct TALER_Amount *amount_remaining) +{ + /* FIXME, deeper checks should be implemented here. */ + struct WalletTipGetState *gts = cls; + + gts->tgh = NULL; + if (gts->http_status != hr->http_status) + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "Unexpected response code %u (%d) to command %s\n", + hr->http_status, + (int) hr->ec, + TALER_TESTING_interpreter_get_current_label (gts->is)); + TALER_TESTING_interpreter_fail (gts->is); + return; + } + switch (hr->http_status) + { + case MHD_HTTP_OK: + // FIXME: use gts->tip_reference here to + // check if the data returned matches that from the POST / PATCH + break; + default: + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + "Unhandled HTTP status.\n"); + } + TALER_TESTING_interpreter_next (gts->is); +} + + +/** + * Run the "GET tip" CMD. + * + * @param cls closure. + * @param cmd command being run now. + * @param is interpreter state. + */ +static void +wallet_get_tip_run (void *cls, + const struct TALER_TESTING_Command *cmd, + struct TALER_TESTING_Interpreter *is) +{ + struct WalletTipGetState *tgs = cls; + const struct TALER_TESTING_Command *tip_cmd; + const struct GNUNET_HashCode *tip_id; + + tip_cmd = TALER_TESTING_interpreter_lookup_command (is, + tgs->tip_reference); + + if (GNUNET_OK != + TALER_TESTING_get_trait_tip_id (tip_cmd, + 0, + &tip_id)) + TALER_TESTING_FAIL (is); + + tgs->is = is; + tgs->tgh = TALER_MERCHANT_wallet_tip_get (is->ctx, + tgs->merchant_url, + tip_id, + &wallet_tip_get_cb, + tgs); +} + + +/** + * Free the state of a "GET tip" CMD, and possibly + * cancel a pending operation thereof. + * + * @param cls closure. + * @param cmd command being run. + */ +static void +wallet_get_tip_cleanup (void *cls, + const struct TALER_TESTING_Command *cmd) +{ + struct WalletTipGetState *tgs = cls; + + if (NULL != tgs->tgh) + { + TALER_LOG_WARNING ("Get tip operation did not complete\n"); + TALER_MERCHANT_wallet_tip_get_cancel (tgs->tgh); + } + GNUNET_free (tgs); +} + + +/** + * Define a GET /tips/$TIP_ID CMD. + * + * @param label the command label + * @param merchant_url base URL of the merchant which will + * serve the request. + * @param tip_reference reference to a command that created a tip. + * @param http_status expected HTTP response code for the request. + */ +struct TALER_TESTING_Command +TALER_TESTING_cmd_wallet_get_tip (const char *label, + const char *merchant_url, + const char *tip_reference, + unsigned int http_status) +{ + struct WalletTipGetState *tgs; + + tgs = GNUNET_new (struct WalletTipGetState); + tgs->merchant_url = merchant_url; + tgs->tip_reference = tip_reference; + tgs->http_status = http_status; + { + struct TALER_TESTING_Command cmd = { + .cls = tgs, + .label = label, + .run = &wallet_get_tip_run, + .cleanup = &wallet_get_tip_cleanup + }; + + return cmd; + } +} + + +/* end of testing_api_cmd_get_tip.c */ -- cgit v1.2.3