taler/exchange
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

introducing 'expected_response_code'

Browse Source
This commit is contained in:
Christian Grothoff 2015-07-09 12:22:07 +02:00
parent fdbedcd457
commit 8b91516fc3
1 changed files with 89 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/mint-lib/test_mint_api.c
View File

@ -106,6 +106,11 @@ struct Command
*/ */
const char *label; const char *label;
/**
* Which response code do we expect for this command?
*/
unsigned int expected_response_code;
/** /**
* Details about the command. * Details about the command.
*/ */
@ -496,12 +501,15 @@ withdraw_status_cb (void *cls,
struct TALER_Amount amount; struct TALER_Amount amount;
cmd->details.withdraw_status.wsh = NULL; cmd->details.withdraw_status.wsh = NULL;
if (MHD_HTTP_OK != http_status) if (cmd->expected_response_code != http_status)
{ {
GNUNET_break (0); GNUNET_break (0);
fail (is); fail (is);
return; return;
} }
switch (http_status)
{
case MHD_HTTP_OK:
/* FIXME: note that history events may come in a different /* FIXME: note that history events may come in a different
order than the commands right now... */ order than the commands right now... */
j = 0; j = 0;
@ -567,6 +575,12 @@ withdraw_status_cb (void *cls,
return; return;
} }
} }
/* FIXME: support other status codes! */
default:
/* Unsupported status code (by test harness) */
GNUNET_break (0);
break;
}
is->ip++; is->ip++;
is->task = GNUNET_SCHEDULER_add_now (&interpreter_run, is->task = GNUNET_SCHEDULER_add_now (&interpreter_run,
is); is);
@ -592,6 +606,15 @@ withdraw_sign_cb (void *cls,
struct Command *cmd = &is->commands[is->ip]; struct Command *cmd = &is->commands[is->ip];
cmd->details.withdraw_sign.wsh = NULL; cmd->details.withdraw_sign.wsh = NULL;
if (cmd->expected_response_code != http_status)
{
GNUNET_break (0);
fail (is);
return;
}
switch (http_status)
{
case MHD_HTTP_OK:
if (NULL == sig) if (NULL == sig)
{ {
GNUNET_break (0); GNUNET_break (0);
@ -600,6 +623,13 @@ withdraw_sign_cb (void *cls,
} }
cmd->details.withdraw_sign.sig.rsa_signature cmd->details.withdraw_sign.sig.rsa_signature
= GNUNET_CRYPTO_rsa_signature_dup (sig->rsa_signature); = GNUNET_CRYPTO_rsa_signature_dup (sig->rsa_signature);
break;
/* FIXME: support other status codes here */
default:
/* Unsupported status code (by test harness) */
GNUNET_break (0);
break;
}
is->ip++; is->ip++;
is->task = GNUNET_SCHEDULER_add_now (&interpreter_run, is->task = GNUNET_SCHEDULER_add_now (&interpreter_run,
is); is);
@ -624,7 +654,7 @@ deposit_cb (void *cls,
struct Command *cmd = &is->commands[is->ip]; struct Command *cmd = &is->commands[is->ip];
cmd->details.deposit.dh = NULL; cmd->details.deposit.dh = NULL;
if (MHD_HTTP_OK != http_status) if (cmd->expected_response_code != http_status)
{ {
GNUNET_break (0); GNUNET_break (0);
fail (is); fail (is);
@ -1202,18 +1232,22 @@ run (void *cls,
/* Fill reserve with EUR:5.01, as withdraw fee is 1 ct per config */ /* Fill reserve with EUR:5.01, as withdraw fee is 1 ct per config */
{ .oc = OC_ADMIN_ADD_INCOMING, { .oc = OC_ADMIN_ADD_INCOMING,
.label = "create-reserve-1", .label = "create-reserve-1",
.expected_response_code = MHD_HTTP_OK,
.details.admin_add_incoming.wire = "{ \"type\":\"TEST\", \"bank\":\"source bank\", \"account\":42 }", .details.admin_add_incoming.wire = "{ \"type\":\"TEST\", \"bank\":\"source bank\", \"account\":42 }",
.details.admin_add_incoming.amount = "EUR:5.01" }, .details.admin_add_incoming.amount = "EUR:5.01" },
{ .oc = OC_WITHDRAW_SIGN, { .oc = OC_WITHDRAW_SIGN,
.label = "withdraw-coin-1", .label = "withdraw-coin-1",
.expected_response_code = MHD_HTTP_OK,
.details.withdraw_sign.reserve_reference = "create-reserve-1", .details.withdraw_sign.reserve_reference = "create-reserve-1",
.details.withdraw_sign.amount = "EUR:5" }, .details.withdraw_sign.amount = "EUR:5" },
{ .oc = OC_WITHDRAW_STATUS, { .oc = OC_WITHDRAW_STATUS,
.label = "withdraw-status-1", .label = "withdraw-status-1",
.expected_response_code = MHD_HTTP_OK,
.details.withdraw_status.reserve_reference = "create-reserve-1", .details.withdraw_status.reserve_reference = "create-reserve-1",
.details.withdraw_status.expected_balance = "EUR:0" }, .details.withdraw_status.expected_balance = "EUR:0" },
{ .oc = OC_DEPOSIT, { .oc = OC_DEPOSIT,
.label = "deposit-simple", .label = "deposit-simple",
.expected_response_code = MHD_HTTP_OK,
.details.deposit.amount = "EUR:5", .details.deposit.amount = "EUR:5",
.details.deposit.coin_ref = "withdraw-coin-1", .details.deposit.coin_ref = "withdraw-coin-1",
.details.deposit.wire_details = "{ \"type\":\"TEST\", \"bank\":\"dest bank\", \"account\":42 }", .details.deposit.wire_details = "{ \"type\":\"TEST\", \"bank\":\"dest bank\", \"account\":42 }",