Changeset 114

Show
Ignore:
Timestamp:
03/04/06 15:50:46 (3 years ago)
Author:
abauer
Message:

Fixed a bug regarding handling of devinf and cdata

updated the xml assembler test cases

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/development-branch/configure.ac

    r101 r114  
    2828  AS_HELP_STRING([--enable-http], [enable http transports]), 
    2929  WANT_HTTP=$enableval) 
    30 PKG_CHECK_MODULES(LIBSOUP, libsoup-2.2 >= 2.2.90, HAVE_LIBSOUP=yes, HAVE_LIBSOUP=no) 
     30PKG_CHECK_MODULES(LIBSOUP, libsoup-2.2 >= 2.2.91, HAVE_LIBSOUP=yes, HAVE_LIBSOUP=no) 
    3131if test "x${HAVE_LIBSOUP}" = "xyes"; then 
    3232        if test "x${WANT_HTTP}" = "xno"; then 

  • branches/development-branch/libsyncml/parser/sml_xml_assm.c

    r112 r114  
    7979} 
    8080 
    81 SmlBool _smlXmlAssemblerAddData(SmlXmlAssembler *assm, const char *name, const char *value, SmlError **error) 
     81SmlBool _smlXmlAssemblerAddData(SmlXmlAssembler *assm, const char *name, const char *value, SmlBool raw, SmlError **error) 
    8282{ 
    8383        int rc = 0; 
    …… 
    8585                return FALSE; 
    8686         
    87         //rc = xmlTextWriterWriteRaw(assm->writer, (xmlChar *)value); 
    88         rc = xmlTextWriterWriteCDATA(assm->writer, (xmlChar *)value); 
     87        if (raw) 
     88                rc = xmlTextWriterWriteRaw(assm->writer, (xmlChar *)value); 
     89        else 
     90                rc = xmlTextWriterWriteCDATA(assm->writer, (xmlChar *)value); 
    8991        if (rc < 0) { 
    9092                smlErrorSet(error, SML_ERROR_GENERIC, "Unable to add data"); 
    …… 
    180182} 
    181183 
    182 SmlBool smlItemAssemble(SmlItem *item, SmlXmlAssembler *assm, SmlError **error) 
    183 { 
    184         smlTrace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, item, assm, error); 
     184SmlBool smlItemAssemble(SmlItem *item, SmlXmlAssembler *assm, SmlBool raw, SmlError **error) 
     185{ 
     186        smlTrace(TRACE_ENTRY, "%s(%p, %p, %i, %p)", __func__, item, assm, raw, error); 
    185187        smlAssert(assm); 
    186188        smlAssert(item); 
    …… 
    200202         
    201203        if (item->data) { 
    202                 if (!_smlXmlAssemblerAddData(assm, SML_ELEMENT_DATA, item->data, error)) 
     204                if (!_smlXmlAssemblerAddData(assm, SML_ELEMENT_DATA, item->data, raw, error)) 
    203205                        goto error; 
    204206        } 
    …… 
    253255                goto error; 
    254256         
    255         if (!_smlXmlAssemblerAddData(assm, SML_ELEMENT_DATA, cred->data, error)) 
     257        if (!_smlXmlAssemblerAddData(assm, SML_ELEMENT_DATA, cred->data, TRUE, error)) 
    256258                goto error; 
    257259         
    …… 
    298300                goto error; 
    299301         
    300         if (!smlItemAssemble(change->private.access.item, assm, error)) 
     302        if (!smlItemAssemble(change->private.access.item, assm, FALSE, error)) 
    301303                goto error; 
    302304         
    …… 
    346348        } 
    347349         
    348         if (!smlItemAssemble(change->private.change.item, assm, error)) 
     350        if (!smlItemAssemble(change->private.change.item, assm, FALSE, error)) 
    349351                goto error; 
    350352         
    …… 
    10751077                                goto error; 
    10761078                         
    1077                         if (!smlItemAssemble(status->item, assm, error)) 
     1079                        if (!smlItemAssemble(status->item, assm, TRUE, error)) 
    10781080                                goto error; 
    10791081                        break; 

  • branches/development-branch/libsyncml/sml_devinf.c

    r112 r114  
    4949{ 
    5050        smlAssert(devid); 
    51         smlTrace(TRACE_ENTRY, "%s(%i, %s, %i, %p)", __func__, devid, devtyp, error); 
     51        smlTrace(TRACE_ENTRY, "%s(%s, %i, %p)", __func__, devid, devtyp, error); 
    5252         
    5353        SmlDevInf *devinf = smlTryMalloc0(sizeof(SmlDevInf), error); 

  • branches/development-branch/tests/check_http.c

    r112 r114  
    945945{ 
    946946        Suite *s = suite_create("Http Transports"); 
    947         Suite *s2 = suite_create("Http Transports"); 
     947        //Suite *s2 = suite_create("Http Transports"); 
    948948         
    949949        create_case(s, "http_client_new", http_client_new); 
    …… 
    965965        create_case(s, "http_multi_connect", http_multi_connect); 
    966966        create_case(s, "http_multi_partial_error", http_multi_partial_error); 
    967         create_case(s2, "http_multi_stress", http_multi_stress); 
    968          
    969         return s2; 
     967        create_case(s, "http_multi_stress", http_multi_stress); 
     968         
     969        return s; 
    970970} 
    971971 

  • branches/development-branch/tests/check_xml_assembler.c

    r112 r114  
    122122        fail_unless(error == NULL, NULL); 
    123123         
    124         fail_unless(smlAssemblerReserveStatus(assm, 1, 0, 1, &error), NULL); 
     124        fail_unless(smlAssemblerReserveStatus(assm, 1, 1, 1, &error), NULL); 
    125125        fail_unless(error == NULL, NULL); 
    126126         
    …… 
    590590        fail_unless(assm != NULL, NULL); 
    591591         
    592         fail_unless(smlAssemblerReserveStatus(assm, 1, 0, 1, &error), NULL); 
     592        fail_unless(smlAssemblerReserveStatus(assm, 1, 1, 1, &error), NULL); 
    593593        fail_unless(error == NULL, NULL); 
    594594         
    …… 
    630630        fail_unless(error == NULL, NULL); 
    631631         
    632         fail_unless(smlAssemblerReserveStatus(assm, 1, 0, 1, &error), NULL); 
     632        fail_unless(smlAssemblerReserveStatus(assm, 1, 1, 1, &error), NULL); 
    633633        fail_unless(error == NULL, NULL); 
    634634         
    …… 
    666666        fail_unless(error == NULL, NULL); 
    667667         
    668         fail_unless(smlAssemblerReserveStatus(assm, 1, 0, 1, &error), NULL); 
     668        fail_unless(smlAssemblerReserveStatus(assm, 1, 1, 1, &error), NULL); 
    669669        fail_unless(error == NULL, NULL); 
    670670         
    …… 
    723723        fail_unless(assm != NULL, NULL); 
    724724         
    725         fail_unless(smlAssemblerReserveStatus(assm, 0, 0, 1, &error), NULL); 
     725        fail_unless(smlAssemblerReserveStatus(assm, 0, 1, 1, &error), NULL); 
    726726        fail_unless(error == NULL, NULL); 
    727727         
    …… 
    782782        fail_unless(error == NULL, NULL); 
    783783         
    784         fail_unless(smlAssemblerReserveStatus(assm, 0, 0, 1, &error), NULL); 
    785         fail_unless(error == NULL, NULL); 
    786         fail_unless(smlAssemblerReserveStatus(assm, 1, 0, 2, &error), NULL); 
    787         fail_unless(error == NULL, NULL); 
    788         fail_unless(smlAssemblerReserveStatus(assm, 2, 0, 3, &error), NULL); 
     784        fail_unless(smlAssemblerReserveStatus(assm, 0, 1, 1, &error), NULL); 
     785        fail_unless(error == NULL, NULL); 
     786        fail_unless(smlAssemblerReserveStatus(assm, 1, 1, 2, &error), NULL); 
     787        fail_unless(error == NULL, NULL); 
     788        fail_unless(smlAssemblerReserveStatus(assm, 2, 1, 3, &error), NULL); 
    789789        fail_unless(error == NULL, NULL); 
    790790         
    …… 
    892892        fail_unless(smlAssemblerIsStatusMissing(assm) == FALSE); 
    893893         
    894         fail_unless(smlAssemblerReserveStatus(assm, 0, 0, 1, &error), NULL); 
    895         fail_unless(error == NULL, NULL); 
    896         fail_unless(smlAssemblerReserveStatus(assm, 1, 0, 2, &error), NULL); 
    897         fail_unless(error == NULL, NULL); 
    898         fail_unless(smlAssemblerReserveStatus(assm, 2, 0, 3, &error), NULL); 
     894        fail_unless(smlAssemblerReserveStatus(assm, 0, 1, 1, &error), NULL); 
     895        fail_unless(error == NULL, NULL); 
     896        fail_unless(smlAssemblerReserveStatus(assm, 1, 1, 2, &error), NULL); 
     897        fail_unless(error == NULL, NULL); 
     898        fail_unless(smlAssemblerReserveStatus(assm, 2, 1, 3, &error), NULL); 
    899899        fail_unless(error == NULL, NULL); 
    900900         
    …… 
    10361036{ 
    10371037        Suite *s = suite_create("Assembler"); 
    1038         //Suite *s2 = suite_create("Assembler"); 
     1038        Suite *s2 = suite_create("Assembler"); 
    10391039         
    10401040        create_case(s, "check_assembler_message_empty", check_assembler_message_empty); 
    …… 
    10441044        create_case(s, "check_assembler_message_subcmd", check_assembler_message_subcmd); 
    10451045        create_case(s, "check_assembler_message_several_subcmd", check_assembler_message_several_subcmd); 
    1046         create_case(s, "check_assembler_message_flush_open", check_assembler_message_flush_open); 
     1046        create_case(s2, "check_assembler_message_flush_open", check_assembler_message_flush_open); 
    10471047        create_case(s, "check_assembler_out_of_order", check_assembler_out_of_order); 
    10481048        create_case(s, "check_assembler_limit1", check_assembler_limit1); 
    …… 
    10551055        create_case(s, "check_assembler_reuse", check_assembler_reuse); 
    10561056         
    1057         return s; 
     1057        return s2; 
    10581058} 
    10591059