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

Provide internal command advancer to batch-CMD.

Browse Source
This commit is contained in:
Marcello Stanisci 2019-01-21 15:42:51 +01:00
parent 08eafb1add
commit 5f6236ec71
No known key found for this signature in database
GPG Key ID: 8D526861953F4C0F
1 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/lib/testing_api_cmd_batch.c
View File

@ -39,9 +39,9 @@ struct BatchState
struct TALER_TESTING_Command *batch; struct TALER_TESTING_Command *batch;
/** /**
* Internal comand pointer. * Internal command pointer.
*/ */
int batch_ip; unsigned int batch_ip;
}; };
@ -59,7 +59,6 @@ batch_run (void *cls,
{ {
struct BatchState *bs = cls; struct BatchState *bs = cls;
bs->batch_ip++;
if (NULL != bs->batch[bs->batch_ip].label) if (NULL != bs->batch[bs->batch_ip].label)
TALER_LOG_DEBUG ("Running batched command: %s\n", TALER_LOG_DEBUG ("Running batched command: %s\n",
bs->batch[bs->batch_ip].label); bs->batch[bs->batch_ip].label);
@ -157,7 +156,6 @@ TALER_TESTING_cmd_batch (const char *label,
unsigned int i; unsigned int i;
bs = GNUNET_new (struct BatchState); bs = GNUNET_new (struct BatchState);
bs->batch_ip = -1;
/* Get number of commands. */ /* Get number of commands. */
for (i=0;NULL != batch[i].label;i++) for (i=0;NULL != batch[i].label;i++)
@ -181,6 +179,27 @@ TALER_TESTING_cmd_batch (const char *label,
return cmd; return cmd;
} }
/**
* Advance internal pointer to next command.
*
* @param is interpreter state.
*/
void
TALER_TESTING_cmd_batch_next
(struct TALER_TESTING_Interpreter *is)
{
struct BatchState *bs = is->commands[is->ip].cls;
if (NULL == bs->batch[bs->batch_ip].label)
{
is->ip++;
return;
}
bs->batch_ip++;
}
/** /**
* Test if this command is a batch command. * Test if this command is a batch command.
@ -188,7 +207,8 @@ TALER_TESTING_cmd_batch (const char *label,
* @return false if not, true if it is a batch command * @return false if not, true if it is a batch command
*/ */
int int
TALER_TESTING_cmd_is_batch (const struct TALER_TESTING_Command *cmd) TALER_TESTING_cmd_is_batch
(const struct TALER_TESTING_Command *cmd)
{ {
return cmd->run == &batch_run; return cmd->run == &batch_run;
} }
@ -200,7 +220,8 @@ TALER_TESTING_cmd_is_batch (const struct TALER_TESTING_Command *cmd)
* @return cmd current batch command * @return cmd current batch command
*/ */
struct TALER_TESTING_Command * struct TALER_TESTING_Command *
TALER_TESTING_cmd_batch_get_current (const struct TALER_TESTING_Command *cmd) TALER_TESTING_cmd_batch_get_current
(const struct TALER_TESTING_Command *cmd)
{ {
struct BatchState *bs = cmd->cls; struct BatchState *bs = cmd->cls;