diff options
| -rw-r--r-- | src/include/taler_merchant_testing_lib.h | 54 | ||||
| -rw-r--r-- | src/lib/merchant_api_merchant_get_order.c | 15 | ||||
| -rw-r--r-- | src/testing/Makefile.am | 2 | ||||
| -rw-r--r-- | src/testing/test_merchant_api.c | 548 | ||||
| -rw-r--r-- | src/testing/testing_api_cmd_post_orders.c | 7 |
5 files changed, 346 insertions, 280 deletions
diff --git a/src/include/taler_merchant_testing_lib.h b/src/include/taler_merchant_testing_lib.h index 3bab73e6..011f96a8 100644 --- a/src/include/taler_merchant_testing_lib.h +++ b/src/include/taler_merchant_testing_lib.h @@ -594,6 +594,7 @@ TALER_TESTING_cmd_merchant_post_orders3 ( const struct GNUNET_CONFIGURATION_Handle *cfg, const char *merchant_url, unsigned int http_status, + const char *order_id, struct GNUNET_TIME_Timestamp refund_deadline, struct GNUNET_TIME_Timestamp pay_deadline, const char *fulfillment_url, @@ -910,11 +911,12 @@ TALER_TESTING_cmd_merchant_pay_order ( * @return the command */ struct TALER_TESTING_Command -TALER_TESTING_cmd_merchant_post_orders_paid (const char *label, - const char *merchant_url, - const char *pay_reference, - const char *session_id, - unsigned int http_status); +TALER_TESTING_cmd_merchant_post_orders_paid ( + const char *label, + const char *merchant_url, + const char *pay_reference, + const char *session_id, + unsigned int http_status); /** @@ -927,10 +929,11 @@ TALER_TESTING_cmd_merchant_post_orders_paid (const char *label, * @return the command */ struct TALER_TESTING_Command -TALER_TESTING_cmd_merchant_order_abort (const char *label, - const char *merchant_url, - const char *pay_reference, - unsigned int http_status); +TALER_TESTING_cmd_merchant_order_abort ( + const char *label, + const char *merchant_url, + const char *pay_reference, + unsigned int http_status); /** @@ -969,12 +972,13 @@ TALER_TESTING_cmd_merchant_forget_order ( * @return the command. */ struct TALER_TESTING_Command -TALER_TESTING_cmd_merchant_order_refund (const char *label, - const char *merchant_url, - const char *reason, - const char *order_id, - const char *refund_amount, - unsigned int http_code); +TALER_TESTING_cmd_merchant_order_refund ( + const char *label, + const char *merchant_url, + const char *reason, + const char *order_id, + const char *refund_amount, + unsigned int http_code); /** @@ -992,11 +996,12 @@ TALER_TESTING_cmd_merchant_order_refund (const char *label, * @return the command. */ struct TALER_TESTING_Command -TALER_TESTING_cmd_wallet_order_refund (const char *label, - const char *merchant_url, - const char *order_ref, - unsigned int http_code, - ...); +TALER_TESTING_cmd_wallet_order_refund ( + const char *label, + const char *merchant_url, + const char *order_ref, + unsigned int http_code, + ...); /** @@ -1010,10 +1015,11 @@ TALER_TESTING_cmd_wallet_order_refund (const char *label, * @return the command. */ struct TALER_TESTING_Command -TALER_TESTING_cmd_merchant_delete_order (const char *label, - const char *merchant_url, - const char *order_id, - unsigned int http_status); +TALER_TESTING_cmd_merchant_delete_order ( + const char *label, + const char *merchant_url, + const char *order_id, + unsigned int http_status); /* ******************* /transfers *************** */ diff --git a/src/lib/merchant_api_merchant_get_order.c b/src/lib/merchant_api_merchant_get_order.c index f410ee50..afef8853 100644 --- a/src/lib/merchant_api_merchant_get_order.c +++ b/src/lib/merchant_api_merchant_get_order.c @@ -400,13 +400,14 @@ handle_merchant_order_get_finished (void *cls, struct TALER_MERCHANT_OrderMerchantGetHandle * -TALER_MERCHANT_merchant_order_get (struct GNUNET_CURL_Context *ctx, - const char *backend_url, - const char *order_id, - const char *session_id, - struct GNUNET_TIME_Relative timeout, - TALER_MERCHANT_OrderMerchantGetCallback cb, - void *cb_cls) +TALER_MERCHANT_merchant_order_get ( + struct GNUNET_CURL_Context *ctx, + const char *backend_url, + const char *order_id, + const char *session_id, + struct GNUNET_TIME_Relative timeout, + TALER_MERCHANT_OrderMerchantGetCallback cb, + void *cb_cls) { struct TALER_MERCHANT_OrderMerchantGetHandle *omgh; unsigned int tms; diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am index 1bf2a4fc..49eb8cc8 100644 --- a/src/testing/Makefile.am +++ b/src/testing/Makefile.am @@ -24,7 +24,7 @@ lib_LTLIBRARIES = \ libtalermerchanttesting.la libtalermerchanttesting_la_LDFLAGS = \ - -version-info 3:0:0 \ + -version-info 4:0:1 \ -no-undefined libtalermerchanttesting_la_SOURCES = \ diff --git a/src/testing/test_merchant_api.c b/src/testing/test_merchant_api.c index cff12442..48e8cec4 100644 --- a/src/testing/test_merchant_api.c +++ b/src/testing/test_merchant_api.c @@ -1500,6 +1500,7 @@ run (void *cls, cred.cfg, merchant_url, MHD_HTTP_OK, + "repurchase-original", GNUNET_TIME_relative_to_timestamp (GNUNET_TIME_UNIT_MINUTES), GNUNET_TIME_UNIT_FOREVER_TS, "https://fulfillment.example.com/", @@ -1534,6 +1535,7 @@ run (void *cls, cred.cfg, merchant_url, MHD_HTTP_OK, + "repurchase-secondary", GNUNET_TIME_relative_to_timestamp (GNUNET_TIME_UNIT_MINUTES), GNUNET_TIME_UNIT_FOREVER_TS, "https://fulfillment.example.com/", @@ -1554,150 +1556,189 @@ run (void *cls, "repurchase-session", "post-order-repurchase-original", MHD_HTTP_OK), + TALER_TESTING_cmd_merchant_order_refund ( + "refund-repurchased", + merchant_url, + "refund repurchase", + "repurchase-original", + "EUR:1.0", + MHD_HTTP_OK), + TALER_TESTING_cmd_merchant_get_order3 ( + "repurchase-check-secondary-payment", + merchant_url, + "post-order-repurchase-secondary", + TALER_MERCHANT_OSC_CLAIMED, + "repurchase-session", + NULL, + MHD_HTTP_OK), TALER_TESTING_cmd_end () }; struct TALER_TESTING_Command commands[] = { /* general setup */ - TALER_TESTING_cmd_run_fakebank ("run-fakebank", - cred.cfg, - "exchange-account-exchange"), - TALER_TESTING_cmd_system_start ("start-taler", - config_file, - "-ema", - "-u", "exchange-account-exchange", - NULL), - TALER_TESTING_cmd_get_exchange ("get-exchange", - cred.cfg, - NULL, - true, - true), - TALER_TESTING_cmd_batch ("orders-id", - get_private_order_id), - TALER_TESTING_cmd_config ("config", - merchant_url, - MHD_HTTP_OK), - TALER_TESTING_cmd_merchant_get_instances ("instances-empty", - merchant_url, - MHD_HTTP_OK, - NULL), - TALER_TESTING_cmd_merchant_post_instances ("instance-create-default-setup", - merchant_url, - "default", - MHD_HTTP_NO_CONTENT), + TALER_TESTING_cmd_run_fakebank ( + "run-fakebank", + cred.cfg, + "exchange-account-exchange"), + TALER_TESTING_cmd_system_start ( + "start-taler", + config_file, + "-ema", + "-u", "exchange-account-exchange", + NULL), + TALER_TESTING_cmd_get_exchange ( + "get-exchange", + cred.cfg, + NULL, + true, + true), + TALER_TESTING_cmd_batch ( + "orders-id", + get_private_order_id), + TALER_TESTING_cmd_config ( + "config", + merchant_url, + MHD_HTTP_OK), + TALER_TESTING_cmd_merchant_get_instances ( + "instances-empty", + merchant_url, + MHD_HTTP_OK, + NULL), + TALER_TESTING_cmd_merchant_post_instances ( + "instance-create-default-setup", + merchant_url, + "default", + MHD_HTTP_NO_CONTENT), TALER_TESTING_cmd_merchant_post_account ( "instance-create-default-account", merchant_url, PAYTO_I1, NULL, NULL, MHD_HTTP_OK), - TALER_TESTING_cmd_merchant_post_instances ("instance-create-i1", - merchant_url, - "i1", - MHD_HTTP_NO_CONTENT), - TALER_TESTING_cmd_merchant_get_instances ("instances-get-i1", - merchant_url, - MHD_HTTP_OK, - "instance-create-i1", - "instance-create-default-setup", - NULL), - TALER_TESTING_cmd_merchant_get_instance ("instances-get-i1", - merchant_url, - "i1", - MHD_HTTP_OK, - "instance-create-i1"), - TALER_TESTING_cmd_merchant_patch_instance ("instance-patch-i1", - merchant_url, - "i1", - "bob-the-merchant", - json_pack ("{s:s}", - "street", - "bobstreet"), - json_pack ("{s:s}", - "street", - "bobjuryst"), - true, - GNUNET_TIME_UNIT_MINUTES, - GNUNET_TIME_UNIT_MINUTES, - MHD_HTTP_NO_CONTENT), - TALER_TESTING_cmd_merchant_get_instance ("instances-get-i1-2", - merchant_url, - "i1", - MHD_HTTP_OK, - "instance-patch-i1"), - TALER_TESTING_cmd_merchant_get_instance ("instances-get-i2-nx", - merchant_url, - "i2", - MHD_HTTP_NOT_FOUND, - NULL), - TALER_TESTING_cmd_merchant_post_instances2 ("instance-create-ACL", - merchant_url, - "i-acl", - "controlled instance", - json_pack ("{s:s}", "city", - "shopcity"), - json_pack ("{s:s}", "city", - "lawyercity"), - true, - GNUNET_TIME_UNIT_MINUTES, - GNUNET_TIME_UNIT_MINUTES, - // FIXME: change this back once - // we have a update auth test CMD - // RFC_8959_PREFIX "EXAMPLE", - NULL, - MHD_HTTP_NO_CONTENT), - TALER_TESTING_cmd_merchant_patch_instance ("instance-patch-ACL", - merchant_url, - "i-acl", - "controlled instance", - json_pack ("{s:s}", - "street", - "bobstreet"), - json_pack ("{s:s}", - "street", - "bobjuryst"), - true, - GNUNET_TIME_UNIT_MINUTES, - GNUNET_TIME_UNIT_MINUTES, - MHD_HTTP_NO_CONTENT), - TALER_TESTING_cmd_merchant_post_instances ("instance-create-i2", - merchant_url, - "i2", - MHD_HTTP_NO_CONTENT), - TALER_TESTING_cmd_merchant_post_instances ("instance-create-i2-idem", - merchant_url, - "i2", - MHD_HTTP_NO_CONTENT), - TALER_TESTING_cmd_merchant_delete_instance ("instance-delete-i2", - merchant_url, - "i2", - MHD_HTTP_NO_CONTENT), - TALER_TESTING_cmd_merchant_get_instance ("instances-get-i2-post-deletion", - merchant_url, - "i2", - MHD_HTTP_NOT_FOUND, - NULL), - TALER_TESTING_cmd_merchant_purge_instance ("instance-delete-then-purge-i2", - merchant_url, - "i2", - MHD_HTTP_NO_CONTENT), - TALER_TESTING_cmd_merchant_purge_instance ("instance-purge-i1", - merchant_url, - "i1", - MHD_HTTP_NO_CONTENT), - TALER_TESTING_cmd_merchant_delete_instance ("instance-purge-then-delete-i1", - merchant_url, - "i1", - MHD_HTTP_NOT_FOUND), - TALER_TESTING_cmd_merchant_purge_instance ("instance-purge-i-acl-middle", - merchant_url, - "i-acl", - MHD_HTTP_NO_CONTENT), - TALER_TESTING_cmd_merchant_purge_instance ("instance-purge-default-middle", - merchant_url, - "default", - MHD_HTTP_NO_CONTENT), + TALER_TESTING_cmd_merchant_post_instances ( + "instance-create-i1", + merchant_url, + "i1", + MHD_HTTP_NO_CONTENT), + TALER_TESTING_cmd_merchant_get_instances ( + "instances-get-i1", + merchant_url, + MHD_HTTP_OK, + "instance-create-i1", + "instance-create-default-setup", + NULL), + TALER_TESTING_cmd_merchant_get_instance ( + "instances-get-i1", + merchant_url, + "i1", + MHD_HTTP_OK, + "instance-create-i1"), + TALER_TESTING_cmd_merchant_patch_instance ( + "instance-patch-i1", + merchant_url, + "i1", + "bob-the-merchant", + json_pack ("{s:s}", + "street", + "bobstreet"), + json_pack ("{s:s}", + "street", + "bobjuryst"), + true, + GNUNET_TIME_UNIT_MINUTES, + GNUNET_TIME_UNIT_MINUTES, + MHD_HTTP_NO_CONTENT), + TALER_TESTING_cmd_merchant_get_instance ( + "instances-get-i1-2", + merchant_url, + "i1", + MHD_HTTP_OK, + "instance-patch-i1"), + TALER_TESTING_cmd_merchant_get_instance ( + "instances-get-i2-nx", + merchant_url, + "i2", + MHD_HTTP_NOT_FOUND, + NULL), + TALER_TESTING_cmd_merchant_post_instances2 ( + "instance-create-ACL", + merchant_url, + "i-acl", + "controlled instance", + json_pack ("{s:s}", "city", + "shopcity"), + json_pack ("{s:s}", "city", + "lawyercity"), + true, + GNUNET_TIME_UNIT_MINUTES, + GNUNET_TIME_UNIT_MINUTES, + // FIXME: change this back once + // we have a update auth test CMD + // RFC_8959_PREFIX "EXAMPLE", + NULL, + MHD_HTTP_NO_CONTENT), + TALER_TESTING_cmd_merchant_patch_instance ( + "instance-patch-ACL", + merchant_url, + "i-acl", + "controlled instance", + json_pack ("{s:s}", + "street", + "bobstreet"), + json_pack ("{s:s}", + "street", + "bobjuryst"), + true, + GNUNET_TIME_UNIT_MINUTES, + GNUNET_TIME_UNIT_MINUTES, + MHD_HTTP_NO_CONTENT), + TALER_TESTING_cmd_merchant_post_instances ( + "instance-create-i2", + merchant_url, + "i2", + MHD_HTTP_NO_CONTENT), + TALER_TESTING_cmd_merchant_post_instances ( + "instance-create-i2-idem", + merchant_url, + "i2", + MHD_HTTP_NO_CONTENT), + TALER_TESTING_cmd_merchant_delete_instance ( + "instance-delete-i2", + merchant_url, + "i2", + MHD_HTTP_NO_CONTENT), + TALER_TESTING_cmd_merchant_get_instance ( + "instances-get-i2-post-deletion", + merchant_url, + "i2", + MHD_HTTP_NOT_FOUND, + NULL), + TALER_TESTING_cmd_merchant_purge_instance ( + "instance-delete-then-purge-i2", + merchant_url, + "i2", + MHD_HTTP_NO_CONTENT), + TALER_TESTING_cmd_merchant_purge_instance ( + "instance-purge-i1", + merchant_url, + "i1", + MHD_HTTP_NO_CONTENT), + TALER_TESTING_cmd_merchant_delete_instance ( + "instance-purge-then-delete-i1", + merchant_url, + "i1", + MHD_HTTP_NOT_FOUND), + TALER_TESTING_cmd_merchant_purge_instance ( + "instance-purge-i-acl-middle", + merchant_url, + "i-acl", + MHD_HTTP_NO_CONTENT), + TALER_TESTING_cmd_merchant_purge_instance ( + "instance-purge-default-middle", + merchant_url, + "default", + MHD_HTTP_NO_CONTENT), TALER_TESTING_cmd_merchant_post_instances ( "instance-create-default-after-purge", merchant_url, @@ -1709,119 +1750,136 @@ run (void *cls, PAYTO_I1, NULL, NULL, MHD_HTTP_OK), - TALER_TESTING_cmd_merchant_get_products ("get-products-empty", - merchant_url, - MHD_HTTP_OK, - NULL), - TALER_TESTING_cmd_merchant_post_products ("post-products-p1", - merchant_url, - "product-1", - "a product", - "EUR:1", - MHD_HTTP_NO_CONTENT), - TALER_TESTING_cmd_merchant_post_products ("post-products-p1-idem", - merchant_url, - "product-1", - "a product", - "EUR:1", - MHD_HTTP_NO_CONTENT), - TALER_TESTING_cmd_merchant_post_products ("post-products-p1-non-idem", - merchant_url, - "product-1", - "a different product", - "EUR:1", - MHD_HTTP_CONFLICT), - TALER_TESTING_cmd_merchant_get_products ("get-products-p1", - merchant_url, - MHD_HTTP_OK, - "post-products-p1", - NULL), - TALER_TESTING_cmd_merchant_get_product ("get-product-p1", - merchant_url, - "product-1", - MHD_HTTP_OK, - "post-products-p1"), - TALER_TESTING_cmd_merchant_post_products ("post-products-p2", - merchant_url, - "product-2", - "a product", - "EUR:1", - MHD_HTTP_NO_CONTENT), - TALER_TESTING_cmd_merchant_patch_product ("patch-products-p2", - merchant_url, - "product-2", - "another product", - json_pack ("{s:s}", "en", "text"), - "kg", - "EUR:1", - "data:image/jpeg;base64,RAWDATA", - json_array (), - 40, - 0, - json_pack ("{s:s}", - "street", - "pstreet"), - GNUNET_TIME_relative_to_timestamp ( - GNUNET_TIME_UNIT_MINUTES), - MHD_HTTP_NO_CONTENT), - TALER_TESTING_cmd_merchant_get_product ("get-product-p2", - merchant_url, - "product-2", - MHD_HTTP_OK, - "patch-products-p2"), - TALER_TESTING_cmd_merchant_get_product ("get-product-nx", - merchant_url, - "product-nx", - MHD_HTTP_NOT_FOUND, - NULL), - TALER_TESTING_cmd_merchant_patch_product ("patch-products-p3-nx", - merchant_url, - "product-3", - "nx updated product", - json_pack ("{s:s}", "en", "text"), - "kg", - "EUR:1", - "data:image/jpeg;base64,RAWDATA", - json_array (), - 40, - 0, - json_pack ("{s:s}", - "street", - "pstreet"), - GNUNET_TIME_relative_to_timestamp ( - GNUNET_TIME_UNIT_MINUTES), - MHD_HTTP_NOT_FOUND), - TALER_TESTING_cmd_merchant_delete_product ("get-products-empty", - merchant_url, - "p1", - MHD_HTTP_NOT_FOUND), - TALER_TESTING_cmd_merchant_delete_product ("get-products-empty", - merchant_url, - "product-1", - MHD_HTTP_NO_CONTENT), - TALER_TESTING_cmd_merchant_lock_product ("lock-product-p2", - merchant_url, - "product-2", - GNUNET_TIME_UNIT_MINUTES, - 2, - MHD_HTTP_NO_CONTENT), - TALER_TESTING_cmd_merchant_lock_product ("lock-product-nx", - merchant_url, - "product-nx", - GNUNET_TIME_UNIT_MINUTES, - 2, - MHD_HTTP_NOT_FOUND), - TALER_TESTING_cmd_merchant_lock_product ("lock-product-too-much", - merchant_url, - "product-2", - GNUNET_TIME_UNIT_MINUTES, - 39, - MHD_HTTP_GONE), - TALER_TESTING_cmd_merchant_delete_product ("delete-product-locked", - merchant_url, - "product-2", - MHD_HTTP_CONFLICT), -#if 1 + TALER_TESTING_cmd_merchant_get_products ( + "get-products-empty", + merchant_url, + MHD_HTTP_OK, + NULL), + TALER_TESTING_cmd_merchant_post_products ( + "post-products-p1", + merchant_url, + "product-1", + "a product", + "EUR:1", + MHD_HTTP_NO_CONTENT), + TALER_TESTING_cmd_merchant_post_products ( + "post-products-p1-idem", + merchant_url, + "product-1", + "a product", + "EUR:1", + MHD_HTTP_NO_CONTENT), + TALER_TESTING_cmd_merchant_post_products ( + "post-products-p1-non-idem", + merchant_url, + "product-1", + "a different product", + "EUR:1", + MHD_HTTP_CONFLICT), + TALER_TESTING_cmd_merchant_get_products ( + "get-products-p1", + merchant_url, + MHD_HTTP_OK, + "post-products-p1", + NULL), + TALER_TESTING_cmd_merchant_get_product ( + "get-product-p1", + merchant_url, + "product-1", + MHD_HTTP_OK, + "post-products-p1"), + TALER_TESTING_cmd_merchant_post_products ( + "post-products-p2", + merchant_url, + "product-2", + "a product", + "EUR:1", + MHD_HTTP_NO_CONTENT), + TALER_TESTING_cmd_merchant_patch_product ( + "patch-products-p2", + merchant_url, + "product-2", + "another product", + json_pack ("{s:s}", "en", "text"), + "kg", + "EUR:1", + "data:image/jpeg;base64,RAWDATA", + json_array (), + 40, + 0, + json_pack ("{s:s}", + "street", + "pstreet"), + GNUNET_TIME_relative_to_timestamp ( + GNUNET_TIME_UNIT_MINUTES), + MHD_HTTP_NO_CONTENT), + TALER_TESTING_cmd_merchant_get_product ( + "get-product-p2", + merchant_url, + "product-2", + MHD_HTTP_OK, + "patch-products-p2"), + TALER_TESTING_cmd_merchant_get_product ( + "get-product-nx", + merchant_url, + "product-nx", + MHD_HTTP_NOT_FOUND, + NULL), + TALER_TESTING_cmd_merchant_patch_product ( + "patch-products-p3-nx", + merchant_url, + "product-3", + "nx updated product", + json_pack ("{s:s}", "en", "text"), + "kg", + "EUR:1", + "data:image/jpeg;base64,RAWDATA", + json_array (), + 40, + 0, + json_pack ("{s:s}", + "street", + "pstreet"), + GNUNET_TIME_relative_to_timestamp ( + GNUNET_TIME_UNIT_MINUTES), + MHD_HTTP_NOT_FOUND), + TALER_TESTING_cmd_merchant_delete_product ( + "get-products-empty", + merchant_url, + "p1", + MHD_HTTP_NOT_FOUND), + TALER_TESTING_cmd_merchant_delete_product ( + "get-products-empty", + merchant_url, + "product-1", + MHD_HTTP_NO_CONTENT), + TALER_TESTING_cmd_merchant_lock_product ( + "lock-product-p2", + merchant_url, + "product-2", + GNUNET_TIME_UNIT_MINUTES, + 2, + MHD_HTTP_NO_CONTENT), + TALER_TESTING_cmd_merchant_lock_product ( + "lock-product-nx", + merchant_url, + "product-nx", + GNUNET_TIME_UNIT_MINUTES, + 2, + MHD_HTTP_NOT_FOUND), + TALER_TESTING_cmd_merchant_lock_product ( + "lock-product-too-much", + merchant_url, + "product-2", + GNUNET_TIME_UNIT_MINUTES, + 39, + MHD_HTTP_GONE), + TALER_TESTING_cmd_merchant_delete_product ( + "delete-product-locked", + merchant_url, + "product-2", + MHD_HTTP_CONFLICT), +#if 0 TALER_TESTING_cmd_batch ("pay", pay), TALER_TESTING_cmd_batch ("double-spending", diff --git a/src/testing/testing_api_cmd_post_orders.c b/src/testing/testing_api_cmd_post_orders.c index 9fdf5a6a..5688d174 100644 --- a/src/testing/testing_api_cmd_post_orders.c +++ b/src/testing/testing_api_cmd_post_orders.c @@ -792,7 +792,8 @@ TALER_TESTING_cmd_merchant_post_orders3 ( const char *label, const struct GNUNET_CONFIGURATION_Handle *cfg, const char *merchant_url, - unsigned int http_status, + unsigned int expected_http_status, + const char *order_id, struct GNUNET_TIME_Timestamp refund_deadline, struct GNUNET_TIME_Timestamp pay_deadline, const char *fulfillment_url, @@ -802,7 +803,7 @@ TALER_TESTING_cmd_merchant_post_orders3 ( ps = GNUNET_new (struct OrdersState); ps->cfg = cfg; - make_order_json (NULL, + make_order_json (order_id, refund_deadline, pay_deadline, amount, @@ -811,7 +812,7 @@ TALER_TESTING_cmd_merchant_post_orders3 ( json_object_set_new (ps->order_terms, "fulfillment_url", json_string (fulfillment_url))); - ps->http_status = http_status; + ps->http_status = expected_http_status; ps->merchant_url = merchant_url; ps->with_claim = true; { |