commit e357b735bf09bcdb201841885e79e9f946582912 parent 7aaeee0914057eeb64bf6af80b54d7d9e58d1b39 Author: Christian Grothoff <christian@grothoff.org> Date: Wed, 22 Apr 2020 19:59:34 +0200 move libtalermerchanttesting and test cases to src/testing/ Diffstat:
51 files changed, 125 insertions(+), 115 deletions(-)
diff --git a/.gitignore b/.gitignore @@ -30,14 +30,14 @@ tags *.swp src/backend/taler-merchant-httpd src/merchant-tools/taler-merchant-dbinit -src/lib/test_merchant_api -src/lib/test_merchant_api_new -src/lib/test_merchant_api_home/.local/share/taler/exchange/live-keys/ -src/lib/test_merchant_api_home/.local/share/taler/wirefees/ -src/lib/auditor.in -src/lib/test_merchant_api_home/.local/share/taler/auditor/ -src/lib/test_merchant_api_home/.local/share/taler/auditors/ -src/lib/test_merchant_api_twisted +src/testing/test_merchant_api +src/testing/test_merchant_api_new +src/testing/test_merchant_api_home/.local/share/taler/exchange/live-keys/ +src/testing/test_merchant_api_home/.local/share/taler/wirefees/ +src/testing/auditor.in +src/testing/test_merchant_api_home/.local/share/taler/auditor/ +src/testing/test_merchant_api_home/.local/share/taler/auditors/ +src/testing/test_merchant_api_twisted taler_merchant_config.h taler_merchant_config.h.in doc/* @@ -50,15 +50,15 @@ doc/version-*.texi !doc/*.js !doc/*.dot !doc/examples/ -src/lib/test_merchant_api_home/.local/share/taler/exchange/wirefees/ +src/testing/test_merchant_api_home/.local/share/taler/exchange/wirefees/ src/merchant-tools/taler-merchant-generate-payments src/merchant-tools/mitm/taler-merchant-mitm src/merchant-tools/mitm/merchant-mitm.wsgi doxygen-doc/ contrib/taler-merchant.tag src/merchant-tools/taler-merchant-tip-enable -src/lib/reserve_dkey.priv -src/lib/reserve_key.priv +src/testing/reserve_dkey.priv +src/testing/reserve_key.priv doc/version.texi src/merchant-tools/taler-merchant-generate-payments-alt src/merchant-tools/taler-merchant-generate-payments diff --git a/configure.ac b/configure.ac @@ -341,5 +341,6 @@ src/include/Makefile src/backenddb/Makefile src/backend/Makefile src/lib/Makefile +src/testing/Makefile ]) AC_OUTPUT diff --git a/src/Makefile.am b/src/Makefile.am @@ -1,3 +1,3 @@ # This Makefile is in the public domain AM_CPPFLAGS = -I$(top_srcdir)/src/include -SUBDIRS = include backenddb backend lib merchant-tools +SUBDIRS = include backenddb backend lib testing merchant-tools diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am @@ -7,17 +7,12 @@ if USE_COVERAGE endif lib_LTLIBRARIES = \ - libtalermerchant.la \ - libtalermerchanttesting.la + libtalermerchant.la libtalermerchant_la_LDFLAGS = \ -version-info 2:0:0 \ -no-undefined -libtalermerchanttesting_la_LDFLAGS = \ - -version-info 2:0:0 \ - -no-undefined - libtalermerchant_la_SOURCES = \ merchant_api_common.c \ merchant_api_delete_instance.c \ @@ -57,43 +52,6 @@ libtalermerchant_la_LIBADD = \ -ljansson \ $(XLIB) -libtalermerchanttesting_la_SOURCES = \ - testing_api_cmd_check_payment.c \ - testing_api_cmd_config.c \ - testing_api_cmd_history.c \ - testing_api_cmd_pay.c \ - testing_api_cmd_pay_abort.c \ - testing_api_cmd_pay_abort_refund.c \ - testing_api_cmd_poll_payment.c \ - testing_api_cmd_proposal.c \ - testing_api_cmd_proposal_lookup.c \ - testing_api_cmd_refund_increase.c \ - testing_api_cmd_refund_lookup.c \ - 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_track_transfer.c \ - testing_api_helpers.c \ - testing_api_trait_merchant_sig.c \ - testing_api_trait_string.c \ - testing_api_trait_hash.c \ - testing_api_trait_planchet.c \ - testing_api_trait_refund_entry.c - -libtalermerchanttesting_la_LIBADD = \ - libtalermerchant.la \ - -ltalerexchange \ - -ltalerjson \ - -ltalerutil \ - -lgnunetcurl \ - -lgnunetjson \ - -lgnunetutil \ - -ljansson \ - -ltalertesting \ - $(XLIB) - if HAVE_LIBCURL libtalermerchant_la_LIBADD += -lcurl else @@ -101,63 +59,3 @@ if HAVE_LIBGNURL libtalermerchant_la_LIBADD += -lgnurl endif endif - -if HAVE_TALERFAKEBANK -check_PROGRAMS = \ - test_merchant_api - -if HAVE_TWISTER -check_PROGRAMS += test_merchant_api_twisted -endif - -endif - -TESTS = \ - $(check_PROGRAMS) - -test_merchant_api_twisted_SOURCES = \ - test_merchant_api_twisted.c -test_merchant_api_twisted_LDADD = \ - $(top_srcdir)/src/backenddb/libtalermerchantdb.la \ - libtalermerchant.la \ - $(LIBGCRYPT_LIBS) \ - -ltalertesting \ - -ltalermerchanttesting \ - -ltalertwistertesting \ - -ltalerfakebank \ - -ltalerbank \ - -ltalerexchange \ - -ltalerjson \ - -ltalerutil \ - -lgnunetjson \ - -lgnunetcurl \ - -lgnunetutil \ - -ljansson \ - -ltalertwister - -test_merchant_api_SOURCES = \ - test_merchant_api.c -test_merchant_api_LDADD = \ - $(top_srcdir)/src/backenddb/libtalermerchantdb.la \ - libtalermerchant.la \ - $(LIBGCRYPT_LIBS) \ - -ltalertesting \ - -ltalermerchanttesting \ - -ltalerfakebank \ - -ltalerbank \ - -ltalerexchange \ - -ltalerjson \ - -ltalerutil \ - -lgnunetjson \ - -lgnunetcurl \ - -lgnunetutil \ - -ljansson - -EXTRA_DIST = \ - test_merchant_api.conf \ - test_merchant_api_twisted.conf \ - test_merchant_api_proxy_merchant.conf \ - test_merchant_api_proxy_exchange.conf \ - test_merchant_api_home/.local/share/taler/exchange/offline-keys/master.priv \ - test_merchant_api_home/.config/taler/exchange/account-2.json \ - test_merchant.priv diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am @@ -0,0 +1,111 @@ +# This Makefile.am is in the public domain +AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/backend + +if USE_COVERAGE + AM_CFLAGS = --coverage -O0 + XLIB = -lgcov +endif + +lib_LTLIBRARIES = \ + libtalermerchanttesting.la + +libtalermerchanttesting_la_LDFLAGS = \ + -version-info 2:0:0 \ + -no-undefined + +libtalermerchanttesting_la_SOURCES = \ + testing_api_cmd_check_payment.c \ + testing_api_cmd_config.c \ + testing_api_cmd_history.c \ + testing_api_cmd_pay.c \ + testing_api_cmd_pay_abort.c \ + testing_api_cmd_pay_abort_refund.c \ + testing_api_cmd_poll_payment.c \ + testing_api_cmd_proposal.c \ + testing_api_cmd_proposal_lookup.c \ + testing_api_cmd_refund_increase.c \ + testing_api_cmd_refund_lookup.c \ + 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_track_transfer.c \ + testing_api_helpers.c \ + testing_api_trait_merchant_sig.c \ + testing_api_trait_string.c \ + testing_api_trait_hash.c \ + testing_api_trait_planchet.c \ + testing_api_trait_refund_entry.c + +libtalermerchanttesting_la_LIBADD = \ + libtalermerchant.la \ + -ltalerexchange \ + -ltalerjson \ + -ltalerutil \ + -lgnunetcurl \ + -lgnunetjson \ + -lgnunetutil \ + -ljansson \ + -ltalertesting \ + $(XLIB) + + +if HAVE_TALERFAKEBANK +check_PROGRAMS = \ + test_merchant_api + +if HAVE_TWISTER +check_PROGRAMS += test_merchant_api_twisted +endif +endif + +TESTS = \ + $(check_PROGRAMS) + +test_merchant_api_twisted_SOURCES = \ + test_merchant_api_twisted.c +test_merchant_api_twisted_LDADD = \ + $(top_srcdir)/src/backenddb/libtalermerchantdb.la \ + libtalermerchant.la \ + $(LIBGCRYPT_LIBS) \ + -ltalertesting \ + -ltalermerchanttesting \ + -ltalertwistertesting \ + -ltalerfakebank \ + -ltalerbank \ + -ltalerexchange \ + -ltalerjson \ + -ltalerutil \ + -lgnunetjson \ + -lgnunetcurl \ + -lgnunetutil \ + -ljansson \ + -ltalertwister + +test_merchant_api_SOURCES = \ + test_merchant_api.c +test_merchant_api_LDADD = \ + $(top_srcdir)/src/backenddb/libtalermerchantdb.la \ + libtalermerchant.la \ + $(LIBGCRYPT_LIBS) \ + -ltalertesting \ + -ltalermerchanttesting \ + -ltalerfakebank \ + -ltalerbank \ + -ltalerexchange \ + -ltalerjson \ + -ltalerutil \ + -lgnunetjson \ + -lgnunetcurl \ + -lgnunetutil \ + -ljansson + +EXTRA_DIST = \ + test_merchant_api.conf \ + test_merchant_api_twisted.conf \ + test_merchant_api_proxy_merchant.conf \ + test_merchant_api_proxy_exchange.conf \ + test_merchant_api_home/.local/share/taler/exchange/offline-keys/master.priv \ + test_merchant_api_home/.config/taler/exchange/account-2.json \ + test_merchant.priv diff --git a/src/lib/reserve_dtip.priv b/src/testing/reserve_dtip.priv diff --git a/src/lib/reserve_tip.priv b/src/testing/reserve_tip.priv Binary files differ. diff --git a/src/lib/test_merchant.priv b/src/testing/test_merchant.priv diff --git a/src/lib/test_merchant_api.c b/src/testing/test_merchant_api.c diff --git a/src/lib/test_merchant_api.conf b/src/testing/test_merchant_api.conf diff --git a/src/lib/test_merchant_api_home/.config/taler/exchange/account-2.json b/src/testing/test_merchant_api_home/.config/taler/exchange/account-2.json diff --git a/src/lib/test_merchant_api_home/.config/taler/merchant/account-3.json b/src/testing/test_merchant_api_home/.config/taler/merchant/account-3.json diff --git a/src/lib/test_merchant_api_home/.config/taler/merchant/default.priv b/src/testing/test_merchant_api_home/.config/taler/merchant/default.priv diff --git a/src/lib/test_merchant_api_home/.config/taler/merchant/dtip.priv b/src/testing/test_merchant_api_home/.config/taler/merchant/dtip.priv diff --git a/src/lib/test_merchant_api_home/.config/taler/merchant/nulltip.priv b/src/testing/test_merchant_api_home/.config/taler/merchant/nulltip.priv diff --git a/src/lib/test_merchant_api_home/.config/taler/merchant/reserve/dtip.priv b/src/testing/test_merchant_api_home/.config/taler/merchant/reserve/dtip.priv Binary files differ. diff --git a/src/lib/test_merchant_api_home/.config/taler/merchant/reserve/nulltip.priv b/src/testing/test_merchant_api_home/.config/taler/merchant/reserve/nulltip.priv diff --git a/src/lib/test_merchant_api_home/.config/taler/merchant/reserve/tip.priv b/src/testing/test_merchant_api_home/.config/taler/merchant/reserve/tip.priv diff --git a/src/lib/test_merchant_api_home/.config/taler/merchant/tip.priv b/src/testing/test_merchant_api_home/.config/taler/merchant/tip.priv diff --git a/src/lib/test_merchant_api_home/.config/taler/merchant/tor.priv b/src/testing/test_merchant_api_home/.config/taler/merchant/tor.priv diff --git a/src/lib/test_merchant_api_home/.config/taler/test.json b/src/testing/test_merchant_api_home/.config/taler/test.json diff --git a/src/lib/test_merchant_api_home/.local/share/taler/exchange/offline-keys/master.priv b/src/testing/test_merchant_api_home/.local/share/taler/exchange/offline-keys/master.priv diff --git a/src/lib/test_merchant_api_home/.local/share/taler/merchant/merchant.priv b/src/testing/test_merchant_api_home/.local/share/taler/merchant/merchant.priv diff --git a/src/lib/test_merchant_api_proxy_exchange.conf b/src/testing/test_merchant_api_proxy_exchange.conf diff --git a/src/lib/test_merchant_api_proxy_merchant.conf b/src/testing/test_merchant_api_proxy_merchant.conf diff --git a/src/lib/test_merchant_api_twisted.c b/src/testing/test_merchant_api_twisted.c diff --git a/src/lib/test_merchant_api_twisted.conf b/src/testing/test_merchant_api_twisted.conf diff --git a/src/lib/testing_api_cmd_check_payment.c b/src/testing/testing_api_cmd_check_payment.c diff --git a/src/lib/testing_api_cmd_config.c b/src/testing/testing_api_cmd_config.c diff --git a/src/lib/testing_api_cmd_history.c b/src/testing/testing_api_cmd_history.c diff --git a/src/lib/testing_api_cmd_pay.c b/src/testing/testing_api_cmd_pay.c diff --git a/src/lib/testing_api_cmd_pay_abort.c b/src/testing/testing_api_cmd_pay_abort.c diff --git a/src/lib/testing_api_cmd_pay_abort_refund.c b/src/testing/testing_api_cmd_pay_abort_refund.c diff --git a/src/lib/testing_api_cmd_poll_payment.c b/src/testing/testing_api_cmd_poll_payment.c diff --git a/src/lib/testing_api_cmd_proposal.c b/src/testing/testing_api_cmd_proposal.c diff --git a/src/lib/testing_api_cmd_proposal_lookup.c b/src/testing/testing_api_cmd_proposal_lookup.c diff --git a/src/lib/testing_api_cmd_refund_increase.c b/src/testing/testing_api_cmd_refund_increase.c diff --git a/src/lib/testing_api_cmd_refund_lookup.c b/src/testing/testing_api_cmd_refund_lookup.c diff --git a/src/lib/testing_api_cmd_rewind.c b/src/testing/testing_api_cmd_rewind.c diff --git a/src/lib/testing_api_cmd_tip_authorize.c b/src/testing/testing_api_cmd_tip_authorize.c diff --git a/src/lib/testing_api_cmd_tip_pickup.c b/src/testing/testing_api_cmd_tip_pickup.c diff --git a/src/lib/testing_api_cmd_tip_query.c b/src/testing/testing_api_cmd_tip_query.c diff --git a/src/lib/testing_api_cmd_track_transaction.c b/src/testing/testing_api_cmd_track_transaction.c diff --git a/src/lib/testing_api_cmd_track_transfer.c b/src/testing/testing_api_cmd_track_transfer.c diff --git a/src/lib/testing_api_helpers.c b/src/testing/testing_api_helpers.c diff --git a/src/lib/testing_api_trait_hash.c b/src/testing/testing_api_trait_hash.c diff --git a/src/lib/testing_api_trait_merchant_sig.c b/src/testing/testing_api_trait_merchant_sig.c diff --git a/src/lib/testing_api_trait_planchet.c b/src/testing/testing_api_trait_planchet.c diff --git a/src/lib/testing_api_trait_refund_entry.c b/src/testing/testing_api_trait_refund_entry.c diff --git a/src/lib/testing_api_trait_string.c b/src/testing/testing_api_trait_string.c diff --git a/src/lib/tor_merchant.priv b/src/testing/tor_merchant.priv