Menu
▾
▴
[Opensync-commits] r1179 - trunk/tests
|
From: <svn...@op...> - 2009-07-13 12:12:40
|
Author: bellmich Date: Mon Jul 13 14:12:22 2009 New Revision: 1179 URL: http://libsyncml.opensync.org/changeset/1179 Log: migrated check_wbxml_parser from SmlError to GError Modified: trunk/tests/check_wbxml_parser.c Modified: trunk/tests/check_wbxml_parser.c ============================================================================== --- trunk/tests/check_wbxml_parser.c Mon Jul 13 14:09:45 2009 (r1178) +++ trunk/tests/check_wbxml_parser.c Mon Jul 13 14:12:22 2009 (r1179) @@ -27,12 +27,13 @@ #include <libsyncml/sml_command_internals.h> #include <libsyncml/sml_elements_internals.h> +#include <libsyncml/sml_error_internals.h> static SmlParser *start_wbxml_parser(const char *data) { setup_testbed(NULL); - SmlError *error = NULL; + GError *error = NULL; SmlParser *parser = smlParserNew(SML_MIMETYPE_WBXML, 0, &error); sml_fail_unless(parser != NULL, NULL); sml_fail_unless(error == NULL, NULL); @@ -45,7 +46,7 @@ if (!smlParserStart(parser, buffer, size, &error)) { sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); /* the error is not used */ + SML_ERROR_FREE(error); /* the error is not used */ smlParserFree(parser); smlSafeCFree(&buffer); @@ -72,7 +73,7 @@ SmlParser *parser = start_wbxml_parser(data); sml_fail_unless(parser != NULL, NULL); - SmlError *error = NULL; + GError *error = NULL; SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -80,11 +81,11 @@ sml_fail_unless(header == NULL, NULL); sml_fail_unless(cred == NULL, NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); sml_fail_unless(!smlParserEnd(parser, NULL, NULL, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); smlParserFree(parser); } @@ -104,7 +105,7 @@ SmlParser *parser = start_wbxml_parser(data); sml_fail_unless(parser != NULL, NULL); - SmlError *error = NULL; + GError *error = NULL; SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -112,7 +113,7 @@ sml_fail_unless(header == NULL, NULL); sml_fail_unless(cred == NULL, NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); /* The empty SyncHdr is followed by an empty SyncHdr. * So the parser is at the correct position to finish successfully. @@ -130,7 +131,7 @@ SmlParser *parser = start_wbxml_parser(data); sml_fail_unless(parser != NULL, NULL); - SmlError *error = NULL; + GError *error = NULL; SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -138,11 +139,11 @@ sml_fail_unless(header == NULL, NULL); sml_fail_unless(cred == NULL, NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); sml_fail_unless(!smlParserEnd(parser, NULL, NULL, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); smlParserFree(parser); } @@ -154,7 +155,7 @@ SmlParser *parser = start_wbxml_parser(data); sml_fail_unless(parser != NULL, NULL); - SmlError *error = NULL; + GError *error = NULL; SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -162,11 +163,11 @@ sml_fail_unless(header == NULL, NULL); sml_fail_unless(cred == NULL, NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); sml_fail_unless(!smlParserEnd(parser, NULL, NULL, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); smlParserFree(parser); } @@ -178,7 +179,7 @@ SmlParser *parser = start_wbxml_parser(data); sml_fail_unless(parser != NULL, NULL); - SmlError *error = NULL; + GError *error = NULL; SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -186,11 +187,11 @@ sml_fail_unless(header == NULL, NULL); sml_fail_unless(cred == NULL, NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); sml_fail_unless(!smlParserEnd(parser, NULL, NULL, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); smlParserFree(parser); } @@ -202,7 +203,7 @@ SmlParser *parser = start_wbxml_parser(data); sml_fail_unless(parser != NULL, NULL); - SmlError *error = NULL; + GError *error = NULL; SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -210,11 +211,11 @@ sml_fail_unless(header == NULL, NULL); sml_fail_unless(cred == NULL, NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); sml_fail_unless(!smlParserEnd(parser, NULL, NULL, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); smlParserFree(parser); } @@ -226,7 +227,7 @@ SmlParser *parser = start_wbxml_parser(data); sml_fail_unless(parser != NULL, NULL); - SmlError *error = NULL; + GError *error = NULL; SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -234,11 +235,11 @@ sml_fail_unless(header == NULL, NULL); sml_fail_unless(cred == NULL, NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); sml_fail_unless(!smlParserEnd(parser, NULL, NULL, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); smlParserFree(parser); } @@ -250,7 +251,7 @@ SmlParser *parser = start_wbxml_parser(data); sml_fail_unless(parser != NULL, NULL); - SmlError *error = NULL; + GError *error = NULL; SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -264,7 +265,7 @@ sml_fail_unless(header->source != NULL, NULL); sml_fail_unless(header->protocol == SML_PROTOCOL_SYNCML, NULL); sml_fail_unless(header->version == SML_VERSION_11, NULL); - sml_fail_unless(!strcmp(header->sessionID, "1"), NULL); + sml_fail_unless(header->sessionID == 1, NULL); smlHeaderFree(header); SmlStatus *status = NULL; @@ -286,11 +287,11 @@ START_TEST (wbxml_parser_synchdr_source2) { - const char *data = "<SyncML><SyncHdr><VerProto>SyncML/1.1</VerProto><VerDTD>1.1</VerDTD><MsgID>1</MsgID><SessionID>asd</SessionID><Target><LocURI>test</LocURI></Target><Source><LocURI>test</LocURI></Source></SyncHdr><SyncBody></SyncBody></SyncML>"; + const char *data = "<SyncML><SyncHdr><VerProto>SyncML/1.1</VerProto><VerDTD>1.1</VerDTD><MsgID>1</MsgID><SessionID>123</SessionID><Target><LocURI>test</LocURI></Target><Source><LocURI>test</LocURI></Source></SyncHdr><SyncBody></SyncBody></SyncML>"; SmlParser *parser = start_wbxml_parser(data); sml_fail_unless(parser != NULL, NULL); - SmlError *error = NULL; + GError *error = NULL; SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -304,7 +305,7 @@ sml_fail_unless(header->source != NULL, NULL); sml_fail_unless(header->protocol == SML_PROTOCOL_SYNCML, NULL); sml_fail_unless(header->version == SML_VERSION_11, NULL); - sml_fail_unless(!strcmp(header->sessionID, "asd"), NULL); + sml_fail_unless(header->sessionID == 123, NULL); smlHeaderFree(header); SmlStatus *status = NULL; @@ -330,7 +331,7 @@ SmlParser *parser = start_wbxml_parser(data); sml_fail_unless(parser != NULL, NULL); - SmlError *error = NULL; + GError *error = NULL; SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -338,11 +339,11 @@ sml_fail_unless(header == NULL, NULL); sml_fail_unless(cred == NULL, NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); sml_fail_unless(!smlParserEnd(parser, NULL, NULL, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); smlParserFree(parser); } @@ -354,7 +355,7 @@ SmlParser *parser = start_wbxml_parser(data); sml_fail_unless(parser != NULL, NULL); - SmlError *error = NULL; + GError *error = NULL; SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -370,7 +371,7 @@ sml_fail_unless(!smlParserGetStatus(parser, &status, &error), NULL); sml_fail_unless(status == NULL, NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); SmlCommand *cmd = NULL; sml_fail_unless(smlParserGetCommand(parser, &cmd, &error), NULL); @@ -390,7 +391,7 @@ SmlParser *parser = start_wbxml_parser(data); sml_fail_unless(parser != NULL, NULL); - SmlError *error = NULL; + GError *error = NULL; SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -406,7 +407,7 @@ sml_fail_unless(!smlParserGetStatus(parser, &status, &error), NULL); sml_fail_unless(status == NULL, NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); smlParserFree(parser); } @@ -418,7 +419,7 @@ SmlParser *parser = start_wbxml_parser(data); sml_fail_unless(parser != NULL, NULL); - SmlError *error = NULL; + GError *error = NULL; SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -434,7 +435,7 @@ sml_fail_unless(!smlParserGetStatus(parser, &status, &error), NULL); sml_fail_unless(status == NULL, NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); smlParserFree(parser); } @@ -446,7 +447,7 @@ SmlParser *parser = start_wbxml_parser(data); sml_fail_unless(parser != NULL, NULL); - SmlError *error = NULL; + GError *error = NULL; SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -462,7 +463,7 @@ sml_fail_unless(!smlParserGetStatus(parser, &status, &error), NULL); sml_fail_unless(status == NULL, NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); smlParserFree(parser); } @@ -474,7 +475,7 @@ SmlParser *parser = start_wbxml_parser(data); sml_fail_unless(parser != NULL, NULL); - SmlError *error = NULL; + GError *error = NULL; SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -514,7 +515,7 @@ SmlParser *parser = start_wbxml_parser(data); sml_fail_unless(parser != NULL, NULL); - SmlError *error = NULL; + GError *error = NULL; SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -546,8 +547,8 @@ sml_fail_unless(cmd == NULL, NULL); sml_fail_unless(error == NULL, NULL); - SmlBool final = TRUE; - SmlBool end = TRUE; + gboolean final = TRUE; + gboolean end = TRUE; sml_fail_unless(smlParserEnd(parser, &final, &end, &error), NULL); sml_fail_unless(error == NULL, NULL); sml_fail_unless(final == FALSE, NULL); @@ -563,7 +564,7 @@ SmlParser *parser = start_wbxml_parser(data); sml_fail_unless(parser != NULL, NULL); - SmlError *error = NULL; + GError *error = NULL; SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -595,8 +596,8 @@ sml_fail_unless(cmd == NULL, NULL); sml_fail_unless(error == NULL, NULL); - SmlBool final = FALSE; - SmlBool end = FALSE; + gboolean final = FALSE; + gboolean end = FALSE; sml_fail_unless(smlParserEnd(parser, &final, &end, &error), NULL); sml_fail_unless(error == NULL, NULL); sml_fail_unless(final == TRUE, NULL); @@ -612,7 +613,7 @@ SmlParser *parser = start_wbxml_parser(data); sml_fail_unless(parser != NULL, NULL); - SmlError *error = NULL; + GError *error = NULL; SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -644,8 +645,8 @@ sml_fail_unless(cmd == NULL, NULL); sml_fail_unless(error == NULL, NULL); - SmlBool final = FALSE; - SmlBool end = FALSE; + gboolean final = FALSE; + gboolean end = FALSE; sml_fail_unless(smlParserEnd(parser, &final, &end, &error), NULL); sml_fail_unless(error == NULL, NULL); sml_fail_unless(final == TRUE, NULL); @@ -661,7 +662,7 @@ SmlParser *parser = start_wbxml_parser(data); sml_fail_unless(parser != NULL, NULL); - SmlError *error = NULL; + GError *error = NULL; SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -693,8 +694,8 @@ sml_fail_unless(cmd == NULL, NULL); sml_fail_unless(error == NULL, NULL); - SmlBool final = TRUE; - SmlBool end = TRUE; + gboolean final = TRUE; + gboolean end = TRUE; sml_fail_unless(smlParserEnd(parser, &final, &end, &error), NULL); sml_fail_unless(error == NULL, NULL); sml_fail_unless(final == FALSE, NULL); @@ -710,7 +711,7 @@ SmlParser *parser = start_wbxml_parser(data); sml_fail_unless(parser != NULL, NULL); - SmlError *error = NULL; + GError *error = NULL; SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -742,8 +743,8 @@ sml_fail_unless(cmd == NULL, NULL); sml_fail_unless(error == NULL, NULL); - SmlBool final = FALSE; - SmlBool end = TRUE; + gboolean final = FALSE; + gboolean end = TRUE; sml_fail_unless(smlParserEnd(parser, &final, &end, &error), NULL); sml_fail_unless(error == NULL, NULL); sml_fail_unless(final == TRUE, NULL); |
