From 6aa8adede08385c7a602892ecda77825eabfe23a Mon Sep 17 00:00:00 2001 From: Marcello Stanisci Date: Mon, 9 Sep 2019 23:46:19 +0200 Subject: fix makefile --- src/bank-lib/Makefile.am | 11 +- src/bank-lib/test_bank_api_NEW.c | 281 ++++++++++++++++++++++++++++++++++++++ src/bank-lib/test_bank_api_new2.c | 281 -------------------------------------- 3 files changed, 287 insertions(+), 286 deletions(-) create mode 100644 src/bank-lib/test_bank_api_NEW.c delete mode 100644 src/bank-lib/test_bank_api_new2.c diff --git a/src/bank-lib/Makefile.am b/src/bank-lib/Makefile.am index 3b7690662..8cdd7824e 100644 --- a/src/bank-lib/Makefile.am +++ b/src/bank-lib/Makefile.am @@ -98,7 +98,8 @@ check_PROGRAMS = \ test_bank_api \ test_bank_api_new \ test_bank_api_with_fakebank \ - test_bank_api_with_fakebank_new + test_bank_api_with_fakebank_new \ + test_bank_api_with_pybank_new if HAVE_TWISTER check_PROGRAMS += \ @@ -172,10 +173,10 @@ test_bank_api_with_fakebank_LDADD = \ -lgnunetutil \ -ljansson -test_bank_api_new2_SOURCES = \ - test_bank_api_new2.c +test_bank_api_with_pybank_new_SOURCES = \ + test_bank_api_NEW.c -test_bank_api_new2_LDADD = \ +test_bank_api_with_pybank_new_LDADD = \ $(top_builddir)/src/lib/libtalertesting.la \ libtalerbanktesting.la \ -ltalerexchange \ @@ -183,7 +184,7 @@ test_bank_api_new2_LDADD = \ libtalerbank.la test_bank_api_with_fakebank_new_SOURCES = \ - test_bank_api_new2.c + test_bank_api_NEW.c test_bank_api_with_fakebank_new_LDADD = \ $(top_builddir)/src/lib/libtalertesting.la \ diff --git a/src/bank-lib/test_bank_api_NEW.c b/src/bank-lib/test_bank_api_NEW.c new file mode 100644 index 000000000..a2f776239 --- /dev/null +++ b/src/bank-lib/test_bank_api_NEW.c @@ -0,0 +1,281 @@ +/* + This file is part of TALER + Copyright (C) 2016, 2017 GNUnet e.V. + + 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 bank/test_bank_api_with_fakebank.c + * @brief testcase to test bank's HTTP API + * interface against the fakebank + * @author Marcello Stanisci + * @author Christian Grothoff + */ + +#include "platform.h" +#include "taler_util.h" +#include "taler_signatures.h" +#include "taler_bank_service.h" +#include "taler_exchange_service.h" +#include +#include +#include +#include "test_bank_interpreter.h" +#include "taler_testing_lib.h" +#include "taler_testing_bank_lib.h" + + +#define CONFIG_FILE "bank.conf" + +/** + * Fakebank URL. + */ +static char *bank_url; + +/** + * Handle to the Py-bank daemon. + */ +static struct GNUNET_OS_Process *bankd; + +/** + * Flag indicating whether the test is running against the + * Fakebank. Set up at runtime. + */ +static int WITH_FAKEBANK; + +/** + * Main function that will tell the interpreter what commands to + * run. + * + * @param cls closure + */ +static void +run (void *cls, + struct TALER_TESTING_Interpreter *is) +{ + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + "Bank serves at `%s'\n", + bank_url); + extern struct TALER_BANK_AuthenticationData AUTHS[]; + + struct TALER_TESTING_Command commands[] = { + + TALER_TESTING_cmd_bank_history ("history-0", + bank_url, + BANK_ACCOUNT_NUMBER, + TALER_BANK_DIRECTION_BOTH, + GNUNET_YES, + NULL, + 1), + + + /* WARNING: old API has expected http response code among + * the parameters, although it was always set as '200 OK' */ + TALER_TESTING_cmd_fakebank_transfer_with_subject + ("debit-1", + "KUDOS:5.01", + bank_url, + EXCHANGE_ACCOUNT_NUMBER, + BANK_ACCOUNT_NUMBER, + AUTHS[EXCHANGE_ACCOUNT_NUMBER - 1].details.basic.username, + AUTHS[EXCHANGE_ACCOUNT_NUMBER - 1].details.basic.password, + "subject 1", + "http://exchange.com/"), + + TALER_TESTING_cmd_bank_history ("history-1c", + bank_url, + BANK_ACCOUNT_NUMBER, + TALER_BANK_DIRECTION_CREDIT, + GNUNET_YES, + NULL, + 5), + + TALER_TESTING_cmd_bank_history ("history-1d", + bank_url, + BANK_ACCOUNT_NUMBER, + TALER_BANK_DIRECTION_DEBIT, + GNUNET_YES, + NULL, + 5), + + TALER_TESTING_cmd_fakebank_transfer_with_subject + ("debit-2", + "KUDOS:3.21", + bank_url, + EXCHANGE_ACCOUNT_NUMBER, // debit account. + USER_ACCOUNT_NUMBER, + AUTHS[EXCHANGE_ACCOUNT_NUMBER - 1].details.basic.username, + AUTHS[EXCHANGE_ACCOUNT_NUMBER - 1].details.basic.password, + "subject 2", + "http://exchange.org/"), + + TALER_TESTING_cmd_fakebank_transfer_with_subject + ("credit-2", + "KUDOS:3.22", + bank_url, + USER_ACCOUNT_NUMBER, // debit account. + EXCHANGE_ACCOUNT_NUMBER, + AUTHS[USER_ACCOUNT_NUMBER - 1].details.basic.username, + AUTHS[USER_ACCOUNT_NUMBER - 1].details.basic.password, + "credit 2", + "http://exchange.org/"), + + TALER_TESTING_cmd_bank_history ("history-2b", + bank_url, + EXCHANGE_ACCOUNT_NUMBER, + TALER_BANK_DIRECTION_BOTH, + GNUNET_YES, + NULL, + 5), + + TALER_TESTING_cmd_bank_history ("history-2bi", + bank_url, + EXCHANGE_ACCOUNT_NUMBER, + TALER_BANK_DIRECTION_BOTH, + GNUNET_YES, + "debit-1", + 5), + + TALER_TESTING_cmd_check_bank_transfer_with_ref ("expect-2d", + "credit-2"), + + TALER_TESTING_cmd_check_bank_transfer_with_ref ("expect-2c", + "debit-2"), + + TALER_TESTING_cmd_check_bank_transfer_with_ref ("expect-1", + "debit-1"), + + TALER_TESTING_cmd_check_bank_empty ("expect-empty"), + + TALER_TESTING_cmd_fakebank_transfer_with_subject + ("credit-for-reject-1", + "KUDOS:5.01", + bank_url, + BANK_ACCOUNT_NUMBER, + EXCHANGE_ACCOUNT_NUMBER, + AUTHS[BANK_ACCOUNT_NUMBER - 1].details.basic.username, + AUTHS[BANK_ACCOUNT_NUMBER - 1].details.basic.password, + "subject 3", + "http://exchange.net/"), + + TALER_TESTING_cmd_bank_reject ("reject-1", + bank_url, + "credit-for-reject-1"), + + TALER_TESTING_cmd_bank_history ("history-r1", + bank_url, + BANK_ACCOUNT_NUMBER, + TALER_BANK_DIRECTION_BOTH, + GNUNET_YES, + NULL, + 5), + + TALER_TESTING_cmd_bank_history ("history-r1c", + bank_url, + BANK_ACCOUNT_NUMBER, + TALER_BANK_DIRECTION_BOTH + | TALER_BANK_DIRECTION_CANCEL, + GNUNET_YES, + NULL, + 5), + + TALER_TESTING_cmd_check_bank_transfer_with_ref + ("expect-credit-reject-1", + "credit-for-reject-1"), + + TALER_TESTING_cmd_check_bank_empty ("expect-empty-2"), + + /** + * End the suite. Fixme: better to have a label for this + * too, as it shows a "(null)" token on logs. + */ + TALER_TESTING_cmd_end () + }; + + if (GNUNET_YES == WITH_FAKEBANK) + TALER_TESTING_run_with_fakebank (is, + commands, + bank_url); + else + TALER_TESTING_run (is, + commands); +} + +int +main (int argc, + char *const *argv) +{ + int rv; + + /* These environment variables get in the way... */ + unsetenv ("XDG_DATA_HOME"); + unsetenv ("XDG_CONFIG_HOME"); + GNUNET_log_setup ("test-bank-api-with-fakebank-new", + "DEBUG", + NULL); + + WITH_FAKEBANK = TALER_TESTING_has_in_name (argv[0], + "_with_fakebank"); + + if (GNUNET_YES == WITH_FAKEBANK) + { + TALER_LOG_DEBUG ("Running against the Fakebank.\n"); + if (NULL == (bank_url = TALER_TESTING_prepare_fakebank + (CONFIG_FILE, + "account-1"))) + { + GNUNET_break (0); + return 77; + } + } + else + { + if (NULL == (bank_url = TALER_TESTING_prepare_bank + (CONFIG_FILE))) + { + GNUNET_break (0); + return 77; + } + + if (NULL == (bankd = TALER_TESTING_run_bank + (CONFIG_FILE, + bank_url))) + { + GNUNET_break (0); + return 77; + } + } + + rv = (GNUNET_OK == TALER_TESTING_setup (&run, + NULL, + CONFIG_FILE, + NULL, + GNUNET_NO)) ? 0 : 1; + if (GNUNET_NO == WITH_FAKEBANK) + { + + GNUNET_OS_process_kill (bankd, + SIGKILL); + GNUNET_OS_process_wait (bankd); + GNUNET_OS_process_destroy (bankd); + GNUNET_free (bank_url); + } + + return rv; +} + + +/* end of test_bank_api_with_fakebank_new.c */ diff --git a/src/bank-lib/test_bank_api_new2.c b/src/bank-lib/test_bank_api_new2.c deleted file mode 100644 index a2f776239..000000000 --- a/src/bank-lib/test_bank_api_new2.c +++ /dev/null @@ -1,281 +0,0 @@ -/* - This file is part of TALER - Copyright (C) 2016, 2017 GNUnet e.V. - - 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 bank/test_bank_api_with_fakebank.c - * @brief testcase to test bank's HTTP API - * interface against the fakebank - * @author Marcello Stanisci - * @author Christian Grothoff - */ - -#include "platform.h" -#include "taler_util.h" -#include "taler_signatures.h" -#include "taler_bank_service.h" -#include "taler_exchange_service.h" -#include -#include -#include -#include "test_bank_interpreter.h" -#include "taler_testing_lib.h" -#include "taler_testing_bank_lib.h" - - -#define CONFIG_FILE "bank.conf" - -/** - * Fakebank URL. - */ -static char *bank_url; - -/** - * Handle to the Py-bank daemon. - */ -static struct GNUNET_OS_Process *bankd; - -/** - * Flag indicating whether the test is running against the - * Fakebank. Set up at runtime. - */ -static int WITH_FAKEBANK; - -/** - * Main function that will tell the interpreter what commands to - * run. - * - * @param cls closure - */ -static void -run (void *cls, - struct TALER_TESTING_Interpreter *is) -{ - GNUNET_log (GNUNET_ERROR_TYPE_INFO, - "Bank serves at `%s'\n", - bank_url); - extern struct TALER_BANK_AuthenticationData AUTHS[]; - - struct TALER_TESTING_Command commands[] = { - - TALER_TESTING_cmd_bank_history ("history-0", - bank_url, - BANK_ACCOUNT_NUMBER, - TALER_BANK_DIRECTION_BOTH, - GNUNET_YES, - NULL, - 1), - - - /* WARNING: old API has expected http response code among - * the parameters, although it was always set as '200 OK' */ - TALER_TESTING_cmd_fakebank_transfer_with_subject - ("debit-1", - "KUDOS:5.01", - bank_url, - EXCHANGE_ACCOUNT_NUMBER, - BANK_ACCOUNT_NUMBER, - AUTHS[EXCHANGE_ACCOUNT_NUMBER - 1].details.basic.username, - AUTHS[EXCHANGE_ACCOUNT_NUMBER - 1].details.basic.password, - "subject 1", - "http://exchange.com/"), - - TALER_TESTING_cmd_bank_history ("history-1c", - bank_url, - BANK_ACCOUNT_NUMBER, - TALER_BANK_DIRECTION_CREDIT, - GNUNET_YES, - NULL, - 5), - - TALER_TESTING_cmd_bank_history ("history-1d", - bank_url, - BANK_ACCOUNT_NUMBER, - TALER_BANK_DIRECTION_DEBIT, - GNUNET_YES, - NULL, - 5), - - TALER_TESTING_cmd_fakebank_transfer_with_subject - ("debit-2", - "KUDOS:3.21", - bank_url, - EXCHANGE_ACCOUNT_NUMBER, // debit account. - USER_ACCOUNT_NUMBER, - AUTHS[EXCHANGE_ACCOUNT_NUMBER - 1].details.basic.username, - AUTHS[EXCHANGE_ACCOUNT_NUMBER - 1].details.basic.password, - "subject 2", - "http://exchange.org/"), - - TALER_TESTING_cmd_fakebank_transfer_with_subject - ("credit-2", - "KUDOS:3.22", - bank_url, - USER_ACCOUNT_NUMBER, // debit account. - EXCHANGE_ACCOUNT_NUMBER, - AUTHS[USER_ACCOUNT_NUMBER - 1].details.basic.username, - AUTHS[USER_ACCOUNT_NUMBER - 1].details.basic.password, - "credit 2", - "http://exchange.org/"), - - TALER_TESTING_cmd_bank_history ("history-2b", - bank_url, - EXCHANGE_ACCOUNT_NUMBER, - TALER_BANK_DIRECTION_BOTH, - GNUNET_YES, - NULL, - 5), - - TALER_TESTING_cmd_bank_history ("history-2bi", - bank_url, - EXCHANGE_ACCOUNT_NUMBER, - TALER_BANK_DIRECTION_BOTH, - GNUNET_YES, - "debit-1", - 5), - - TALER_TESTING_cmd_check_bank_transfer_with_ref ("expect-2d", - "credit-2"), - - TALER_TESTING_cmd_check_bank_transfer_with_ref ("expect-2c", - "debit-2"), - - TALER_TESTING_cmd_check_bank_transfer_with_ref ("expect-1", - "debit-1"), - - TALER_TESTING_cmd_check_bank_empty ("expect-empty"), - - TALER_TESTING_cmd_fakebank_transfer_with_subject - ("credit-for-reject-1", - "KUDOS:5.01", - bank_url, - BANK_ACCOUNT_NUMBER, - EXCHANGE_ACCOUNT_NUMBER, - AUTHS[BANK_ACCOUNT_NUMBER - 1].details.basic.username, - AUTHS[BANK_ACCOUNT_NUMBER - 1].details.basic.password, - "subject 3", - "http://exchange.net/"), - - TALER_TESTING_cmd_bank_reject ("reject-1", - bank_url, - "credit-for-reject-1"), - - TALER_TESTING_cmd_bank_history ("history-r1", - bank_url, - BANK_ACCOUNT_NUMBER, - TALER_BANK_DIRECTION_BOTH, - GNUNET_YES, - NULL, - 5), - - TALER_TESTING_cmd_bank_history ("history-r1c", - bank_url, - BANK_ACCOUNT_NUMBER, - TALER_BANK_DIRECTION_BOTH - | TALER_BANK_DIRECTION_CANCEL, - GNUNET_YES, - NULL, - 5), - - TALER_TESTING_cmd_check_bank_transfer_with_ref - ("expect-credit-reject-1", - "credit-for-reject-1"), - - TALER_TESTING_cmd_check_bank_empty ("expect-empty-2"), - - /** - * End the suite. Fixme: better to have a label for this - * too, as it shows a "(null)" token on logs. - */ - TALER_TESTING_cmd_end () - }; - - if (GNUNET_YES == WITH_FAKEBANK) - TALER_TESTING_run_with_fakebank (is, - commands, - bank_url); - else - TALER_TESTING_run (is, - commands); -} - -int -main (int argc, - char *const *argv) -{ - int rv; - - /* These environment variables get in the way... */ - unsetenv ("XDG_DATA_HOME"); - unsetenv ("XDG_CONFIG_HOME"); - GNUNET_log_setup ("test-bank-api-with-fakebank-new", - "DEBUG", - NULL); - - WITH_FAKEBANK = TALER_TESTING_has_in_name (argv[0], - "_with_fakebank"); - - if (GNUNET_YES == WITH_FAKEBANK) - { - TALER_LOG_DEBUG ("Running against the Fakebank.\n"); - if (NULL == (bank_url = TALER_TESTING_prepare_fakebank - (CONFIG_FILE, - "account-1"))) - { - GNUNET_break (0); - return 77; - } - } - else - { - if (NULL == (bank_url = TALER_TESTING_prepare_bank - (CONFIG_FILE))) - { - GNUNET_break (0); - return 77; - } - - if (NULL == (bankd = TALER_TESTING_run_bank - (CONFIG_FILE, - bank_url))) - { - GNUNET_break (0); - return 77; - } - } - - rv = (GNUNET_OK == TALER_TESTING_setup (&run, - NULL, - CONFIG_FILE, - NULL, - GNUNET_NO)) ? 0 : 1; - if (GNUNET_NO == WITH_FAKEBANK) - { - - GNUNET_OS_process_kill (bankd, - SIGKILL); - GNUNET_OS_process_wait (bankd); - GNUNET_OS_process_destroy (bankd); - GNUNET_free (bank_url); - } - - return rv; -} - - -/* end of test_bank_api_with_fakebank_new.c */ -- cgit v1.2.3