summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorMarcello Stanisci <stanisci.m@gmail.com>2018-06-26 12:13:07 +0200
committerMarcello Stanisci <stanisci.m@gmail.com>2018-06-26 12:13:07 +0200
commitc4c978b42296832dc0ca1e1529359b060c49194f (patch)
tree32cc72c41ebd70c9e2fa5eab682e1cfe4d3ab080 /src/lib
parent8eb86b430e3276ba5246460d5c8832645134281d (diff)
downloadmerchant-c4c978b42296832dc0ca1e1529359b060c49194f.tar.gz
merchant-c4c978b42296832dc0ca1e1529359b060c49194f.tar.bz2
merchant-c4c978b42296832dc0ca1e1529359b060c49194f.zip
Splitting tests, _actually_ up to tip
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/test_merchant_api_new.c78
1 files changed, 40 insertions, 38 deletions
diff --git a/src/lib/test_merchant_api_new.c b/src/lib/test_merchant_api_new.c
index 6787ebc5..9f328028 100644
--- a/src/lib/test_merchant_api_new.c
+++ b/src/lib/test_merchant_api_new.c
@@ -707,44 +707,6 @@ run (void *cls,
"authorize-tip-1",
pickup_amounts_1,
is->exchange),
- TALER_TESTING_cmd_end ()
- };
-
- struct TALER_TESTING_Command commands[] = {
-
- TALER_TESTING_cmd_batch ("pay",
- pay),
-
- TALER_TESTING_cmd_batch ("double-spending",
- double_spending),
-
- TALER_TESTING_cmd_batch ("track",
- track),
-
- /**
- * Just a weird /history request, not really tied to
- * any CMDs chunk.
- */
- TALER_TESTING_cmd_history
- ("history-2",
- merchant_url,
- is->ctx,
- MHD_HTTP_OK,
- GNUNET_TIME_absolute_add (GNUNET_TIME_UNIT_ZERO_ABS,
- GNUNET_TIME_UNIT_MICROSECONDS),
- /* zero results expected, time too ancient. */
- 0,
- 10,
- 10),
-
- TALER_TESTING_cmd_batch ("refund",
- refund),
-
- TALER_TESTING_cmd_batch ("tip",
- tip),
-
-
-
TALER_TESTING_cmd_tip_query_with_amounts ("query-tip-3",
merchant_url,
@@ -892,6 +854,46 @@ run (void *cls,
TALER_TESTING_cmd_check_bank_empty
("check_bank_empty-at-tips"),
+ TALER_TESTING_cmd_end ()
+ };
+
+ struct TALER_TESTING_Command commands[] = {
+
+ TALER_TESTING_cmd_batch ("pay",
+ pay),
+
+ TALER_TESTING_cmd_batch ("double-spending",
+ double_spending),
+
+ TALER_TESTING_cmd_batch ("track",
+ track),
+
+ /**
+ * Just a weird /history request, not really tied to
+ * any CMDs chunk.
+ */
+ TALER_TESTING_cmd_history
+ ("history-2",
+ merchant_url,
+ is->ctx,
+ MHD_HTTP_OK,
+ GNUNET_TIME_absolute_add (GNUNET_TIME_UNIT_ZERO_ABS,
+ GNUNET_TIME_UNIT_MICROSECONDS),
+ /* zero results expected, time too ancient. */
+ 0,
+ 10,
+ 10),
+
+ TALER_TESTING_cmd_batch ("refund",
+ refund),
+
+ TALER_TESTING_cmd_batch ("tip",
+ tip),
+
+// TALER_TESTING_cmd_batch ("pay-again",
+ // pay_again),
+
+
/* pay again logic. */
TALER_TESTING_cmd_fakebank_transfer
("create-reserve-10",