From e68a4b8ac410f402d12308ce7d63083b78d7ee89 Mon Sep 17 00:00:00 2001 From: Rupinder Singh Khokhar Date: Sat, 14 Jun 2014 07:35:44 +0530 Subject: Adding PLAINTEXT State & fixing the tester at places --- test/tokeniser2.c | 11 +++++++---- test/tokeniser3.c | 11 +++++++---- 2 files changed, 14 insertions(+), 8 deletions(-) (limited to 'test') diff --git a/test/tokeniser2.c b/test/tokeniser2.c index 07f355a..a0264c9 100644 --- a/test/tokeniser2.c +++ b/test/tokeniser2.c @@ -86,7 +86,7 @@ int main(int argc, char **argv) } else if (strcmp(key, "lastStartTag") == 0) { ctx.last_start_tag = (const char *) json_object_get_string(val); - } else if (strcmp(key, "contentModelFlags") == 0) { + } else if (strcmp(key, "initialStates") == 0) { ctx.content_model = json_object_get_array(val); } else if (strcmp(key, "processCDATA") == 0) { @@ -169,15 +169,18 @@ void run_test(context *ctx) (struct json_object *) array_list_get_idx(ctx->content_model, i)); - if (strcmp(cm, "PCDATA") == 0) { + if (strcmp(cm, "PCDATA state") == 0) { params.content_model.model = HUBBUB_CONTENT_MODEL_PCDATA; - } else if (strcmp(cm, "RCDATA") == 0) { + } else if (strcmp(cm, "RCDATA state") == 0) { params.content_model.model = HUBBUB_CONTENT_MODEL_RCDATA; - } else if (strcmp(cm, "CDATA") == 0) { + } else if (strcmp(cm, "CDATA state") == 0) { params.content_model.model = HUBBUB_CONTENT_MODEL_CDATA; + } else if (strcmp(cm, "RAWTEXT state") == 0) { + params.content_model.model = + HUBBUB_CONTENT_MODEL_RAWTEXT; } else { params.content_model.model = HUBBUB_CONTENT_MODEL_PLAINTEXT; diff --git a/test/tokeniser3.c b/test/tokeniser3.c index e68a230..86f079b 100644 --- a/test/tokeniser3.c +++ b/test/tokeniser3.c @@ -85,7 +85,7 @@ int main(int argc, char **argv) } else if (strcmp(key, "lastStartTag") == 0) { ctx.last_start_tag = (const char *) json_object_get_string(val); - } else if (strcmp(key, "contentModelFlags") == 0) { + } else if (strcmp(key, "initialStates") == 0) { ctx.content_model = json_object_get_array(val); } else if (strcmp(key, "processCDATA") == 0) { @@ -167,15 +167,18 @@ void run_test(context *ctx) (struct json_object *) array_list_get_idx(ctx->content_model, i)); - if (strcmp(cm, "PCDATA") == 0) { + if (strcmp(cm, "PCDATA state") == 0) { params.content_model.model = HUBBUB_CONTENT_MODEL_PCDATA; - } else if (strcmp(cm, "RCDATA") == 0) { + } else if (strcmp(cm, "RCDATA state") == 0) { params.content_model.model = HUBBUB_CONTENT_MODEL_RCDATA; - } else if (strcmp(cm, "CDATA") == 0) { + } else if (strcmp(cm, "CDATA state") == 0) { params.content_model.model = HUBBUB_CONTENT_MODEL_CDATA; + } else if (strcmp(cm, "RAWTEXT state") == 0) { + params.content_model.model = + HUBBUB_CONTENT_MODEL_RAWTEXT; } else { params.content_model.model = HUBBUB_CONTENT_MODEL_PLAINTEXT; -- cgit v1.2.3