@@ -161,16 +161,8 @@ void test_object_assert()
161161 CTEST_ON_ERROR_CB (test_pointer_assert_RELEASE , (void * )& test_pointer_assert_rel )
162162 ))
163163
164- #define BHA_RUN_XML "examples/xmls/BhaRun.xml"
165- err = readText (& test_pointer_assert_rel .text , & test_pointer_assert_rel .textLen , BHA_RUN_XML );
164+ OPEN_XML (BhaRun )
166165
167- C_ASSERT_EQUAL_INT (0 , err , CTEST_SETTER (
168- CTEST_TITLE ("Opening file " BHA_RUN_XML "..." ),
169- CTEST_INFO ("Return value SHOULD be 0" ),
170- CTEST_ON_SUCCESS ("readText SUCCESS" ),
171- CTEST_ON_ERROR_CB (test_pointer_assert_RELEASE , (void * )& test_pointer_assert_rel )
172- ))
173- #undef BHA_RUN_XML
174166 CHECK_CFG_P (soap_internal , soap_internal , EQ )
175167 CHECK_CFG_P (internal_soap_error , 0 , EQ )
176168 CHECK_CFG_P (internalInitFlag , 0 , GT )
@@ -358,6 +350,231 @@ void test_object_assert()
358350 CHECK_CFG_P (c_json_str .json , NULL , NEQ )
359351 CHECK_CFG_P (c_json_str .json_len , 0 , NEQ )
360352
353+ cws_internal_soap_recycle (soap_internal );
354+ cws_recycle_config (config );
355+
356+ C_ASSERT_EQUAL_INT (SOAP_OK , err , CTEST_SETTER (
357+ CTEST_TITLE ("Checking cws_soap_serve is SOAP_OK after recycle" ),
358+ CTEST_INFO ("Return value SHOULD be SOAP_OK after recycle" ),
359+ CTEST_ON_SUCCESS ("cws_soap_serve SUCCESS after recycle" ),
360+ CTEST_ON_ERROR_CB (test_pointer_assert_RELEASE , (void * )& test_pointer_assert_rel )
361+ ))
362+
363+ CHECK_CFG_P (internal_soap_error , 0 , EQ )
364+ CHECK_CFG_P (internalInitFlag , 0 , GT )
365+ CHECK_CFG_P (xmlIn , NULL , NEQ )
366+ CHECK_CFG_P (xmlLen , 0 , EQ )
367+ CHECK_CFG_P (xmlSoap , NULL , NEQ )
368+ CHECK_CFG_P (xmlSoapLen , 0 , EQ )
369+ CHECK_CFG_P (xmlSoapSize , 0 , NEQ )
370+ CHECK_CFG_P (internal_os , NULL , NEQ )
371+
372+ COMP_VAL (config -> xmlLen , 0 , EQ )
373+ COMP_VAL (config -> xmlSoapLen , 0 , EQ )
374+
375+ CHECK_CFG_P (WitsmlObject , NULL , EQ )
376+ CHECK_CFG_P (witsml_version , VERSION_UNKNOWN , EQ ) //TODO will be deprecated. ALWAYS VERSION_UNKNOWN
377+ CHECK_CFG_P (object , NULL , EQ )
378+ CHECK_CFG_P (c_bson_serialized .bson , NULL , EQ )
379+ CHECK_CFG_P (c_bson_serialized .bson_size , 0 , EQ )
380+ CHECK_CFG_P (c_json_str .json , NULL , EQ )
381+ CHECK_CFG_P (c_json_str .json_len , 0 , EQ )
382+ CHECK_CFG_P (object_type , TYPE_None , EQ )
383+ CHECK_CFG_P (object_name , NULL , EQ )
384+
385+ CHECK_CFG_P (cws_soap_fault .faultstring , NULL , EQ )
386+ CHECK_CFG_P (cws_soap_fault .faultstring_len , 0 , EQ )
387+ CHECK_CFG_P (cws_soap_fault .XMLfaultdetail , NULL , EQ )
388+ CHECK_CFG_P (cws_soap_fault .XMLfaultdetail_len , 0 , EQ )
389+ CHECK_CFG_P (statistics .costs , 0 , EQ )
390+ CHECK_CFG_P (statistics .strings , 0 , EQ )
391+ CHECK_CFG_P (statistics .shorts , 0 , EQ )
392+ CHECK_CFG_P (statistics .ints , 0 , EQ )
393+ CHECK_CFG_P (statistics .long64s , 0 , EQ )
394+ CHECK_CFG_P (statistics .enums , 0 , EQ )
395+ CHECK_CFG_P (statistics .arrays , 0 , EQ )
396+ CHECK_CFG_P (statistics .booleans , 0 , EQ )
397+ CHECK_CFG_P (statistics .doubles , 0 , EQ )
398+ CHECK_CFG_P (statistics .date_times , 0 , EQ )
399+ CHECK_CFG_P (statistics .measures , 0 , EQ )
400+ CHECK_CFG_P (statistics .event_types , 0 , EQ )
401+ CHECK_CFG_P (statistics .total , 0 , EQ )
402+ CHECK_CFG_P (statistics .used_memory , 0 , EQ )
403+ CHECK_CFG_P (initial_resource_size , 0 , NEQ )
404+
405+ C_ASSERT_NULL ((void * )bsonSerialize (soap_internal ), CTEST_SETTER (
406+ CTEST_TITLE ("Checking bsonSerialize(soap_internal) is NULL after recycle" ),
407+ CTEST_INFO ("Return value SHOULD be NULL after recycle" ),
408+ CTEST_ON_SUCCESS ("bsonSerialize(soap_internal) SUCCESS after recycle" ),
409+ CTEST_ON_ERROR_CB (test_pointer_assert_RELEASE , (void * )& test_pointer_assert_rel )
410+ ))
411+
412+ CHECK_CFG_P (c_bson_serialized .bson , NULL , EQ )
413+ CHECK_CFG_P (c_bson_serialized .bson_size , 0 , EQ )
414+
415+ C_ASSERT_NULL ((void * )getJson (soap_internal ), CTEST_SETTER (
416+ CTEST_TITLE ("Checking getJson(soap_internal) is NULL after recycle" ),
417+ CTEST_INFO ("Return value SHOULD be NULL after recycle" ),
418+ CTEST_ON_SUCCESS ("getJson(soap_internal) SUCCESS after recycle" ),
419+ CTEST_ON_ERROR_CB (test_pointer_assert_RELEASE , (void * )& test_pointer_assert_rel )
420+ ))
421+
422+ CHECK_CFG_P (c_json_str .json , NULL , EQ )
423+ CHECK_CFG_P (c_json_str .json_len , 0 , EQ )
424+
425+ CLOSE_XML
426+
427+ OPEN_XML (Log )
428+
429+ thisXml = cws_parse_XML_soap_envelope (test_pointer_assert_rel .soap_internal , (char * )test_pointer_assert_rel .text , test_pointer_assert_rel .textLen );
430+
431+ C_ASSERT_NOT_NULL ((void * )thisXml , CTEST_SETTER (
432+ CTEST_TITLE ("Checking cws_parse_XML_soap_envelope is NOT NULL" ),
433+ CTEST_INFO ("Return value SHOULD be NOT NULL" ),
434+ CTEST_ON_SUCCESS ("cws_parse_XML_soap_envelope SUCCESS" ),
435+ CTEST_ON_ERROR_CB (test_pointer_assert_RELEASE , (void * )& test_pointer_assert_rel )
436+ ))
437+
438+ CHECK_CFG_P (internal_soap_error , 0 , EQ )
439+ CHECK_CFG_P (internalInitFlag , 0 , GT )
440+ CHECK_CFG_P (xmlIn , NULL , NEQ )
441+ CHECK_CFG_P (xmlLen , 0 , NEQ )
442+ CHECK_CFG_P (xmlSoap , NULL , NEQ )
443+ CHECK_CFG_P (xmlSoapLen , 0 , NEQ )
444+ CHECK_CFG_P (xmlSoapSize , 0 , NEQ )
445+ CHECK_CFG_P (internal_os , NULL , NEQ )
446+
447+ COMP_VAL (config -> xmlLen , test_pointer_assert_rel .textLen , EQ )
448+ COMP_VAL (config -> xmlSoapLen , config -> xmlLen , GT )
449+ COMP_VAL (config -> xmlSoapLen , config -> xmlSoapSize , LT )
450+
451+ CHECK_CFG_P (WitsmlObject , NULL , EQ )
452+ CHECK_CFG_P (witsml_version , VERSION_UNKNOWN , EQ )
453+ CHECK_CFG_P (object , NULL , EQ )
454+ CHECK_CFG_P (c_bson_serialized .bson , NULL , EQ )
455+ CHECK_CFG_P (c_bson_serialized .bson_size , 0 , EQ )
456+ CHECK_CFG_P (c_json_str .json , NULL , EQ )
457+ CHECK_CFG_P (c_json_str .json_len , 0 , EQ )
458+ CHECK_CFG_P (object_type , TYPE_None , EQ )
459+ CHECK_CFG_P (object_name , NULL , EQ )
460+ CHECK_CFG_P (cws_soap_fault .faultstring , NULL , EQ )
461+ CHECK_CFG_P (cws_soap_fault .faultstring_len , 0 , EQ )
462+ CHECK_CFG_P (cws_soap_fault .XMLfaultdetail , NULL , EQ )
463+ CHECK_CFG_P (cws_soap_fault .XMLfaultdetail_len , 0 , EQ )
464+ CHECK_CFG_P (statistics .costs , 0 , EQ )
465+ CHECK_CFG_P (statistics .strings , 0 , EQ )
466+ CHECK_CFG_P (statistics .shorts , 0 , EQ )
467+ CHECK_CFG_P (statistics .ints , 0 , EQ )
468+ CHECK_CFG_P (statistics .long64s , 0 , EQ )
469+ CHECK_CFG_P (statistics .enums , 0 , EQ )
470+ CHECK_CFG_P (statistics .arrays , 0 , EQ )
471+ CHECK_CFG_P (statistics .booleans , 0 , EQ )
472+ CHECK_CFG_P (statistics .doubles , 0 , EQ )
473+ CHECK_CFG_P (statistics .date_times , 0 , EQ )
474+ CHECK_CFG_P (statistics .measures , 0 , EQ )
475+ CHECK_CFG_P (statistics .event_types , 0 , EQ )
476+ CHECK_CFG_P (statistics .total , 0 , EQ )
477+ CHECK_CFG_P (statistics .used_memory , 0 , EQ )
478+ CHECK_CFG_P (initial_resource_size , 0 , NEQ )
479+
480+ err = cws_soap_serve (soap_internal );
481+
482+ C_ASSERT_EQUAL_INT (SOAP_OK , err , CTEST_SETTER (
483+ CTEST_TITLE ("Checking cws_soap_serve is SOAP_OK" ),
484+ CTEST_INFO ("Return value SHOULD be SOAP_OK" ),
485+ CTEST_ON_SUCCESS ("cws_soap_serve SUCCESS" ),
486+ CTEST_ON_ERROR_CB (test_pointer_assert_RELEASE , (void * )& test_pointer_assert_rel )
487+ ))
488+
489+ CHECK_CFG_P (internal_soap_error , 0 , EQ )
490+ CHECK_CFG_P (internalInitFlag , 0 , GT )
491+ CHECK_CFG_P (xmlIn , NULL , NEQ )
492+ CHECK_CFG_P (xmlLen , 0 , NEQ )
493+ CHECK_CFG_P (xmlSoap , NULL , NEQ )
494+ CHECK_CFG_P (xmlSoapLen , 0 , NEQ )
495+ CHECK_CFG_P (xmlSoapSize , 0 , NEQ )
496+ CHECK_CFG_P (internal_os , NULL , NEQ )
497+
498+ COMP_VAL (config -> xmlLen , test_pointer_assert_rel .textLen , EQ )
499+ COMP_VAL (config -> xmlSoapLen , config -> xmlLen , GT )
500+ COMP_VAL (config -> xmlSoapLen , config -> xmlSoapSize , LT )
501+
502+ CHECK_CFG_P (WitsmlObject , NULL , NEQ )
503+ CHECK_CFG_P (witsml_version , VERSION_UNKNOWN , EQ ) //TODO will be deprecated. ALWAYS VERSION_UNKNOWN
504+ CHECK_CFG_P (object , NULL , NEQ )
505+ CHECK_CFG_P (c_bson_serialized .bson , NULL , EQ )
506+ CHECK_CFG_P (c_bson_serialized .bson_size , 0 , EQ )
507+ CHECK_CFG_P (c_json_str .json , NULL , EQ )
508+ CHECK_CFG_P (c_json_str .json_len , 0 , EQ )
509+ CHECK_CFG_P (object_type , TYPE_Log , EQ )
510+ CHECK_CFG_P (object_name , NULL , NEQ )
511+ C_ASSERT_EQUAL_STRING ("Log" , config -> object_name , CTEST_SETTER (
512+ CTEST_TITLE ("Checking config->object_name is Log" ),
513+ CTEST_ON_ERROR_CB (test_pointer_assert_RELEASE , (void * )& test_pointer_assert_rel )
514+ ))
515+ CHECK_CFG_P (cws_soap_fault .faultstring , NULL , EQ )
516+ CHECK_CFG_P (cws_soap_fault .faultstring_len , 0 , EQ )
517+ CHECK_CFG_P (cws_soap_fault .XMLfaultdetail , NULL , EQ )
518+ CHECK_CFG_P (cws_soap_fault .XMLfaultdetail_len , 0 , EQ )
519+ CHECK_CFG_P (statistics .costs , 0 , EQ )
520+ CHECK_CFG_P (statistics .strings , 365 , EQ )
521+ CHECK_CFG_P (statistics .shorts , 0 , EQ )
522+ CHECK_CFG_P (statistics .ints , 0 , EQ )
523+ CHECK_CFG_P (statistics .long64s , 30 , EQ )
524+ CHECK_CFG_P (statistics .enums , 47 , EQ )
525+ CHECK_CFG_P (statistics .arrays , 45 , EQ )
526+ CHECK_CFG_P (statistics .booleans , 4 , EQ )
527+ CHECK_CFG_P (statistics .doubles , 4 , EQ )
528+ CHECK_CFG_P (statistics .date_times , 46 , EQ )
529+ CHECK_CFG_P (statistics .measures , 36 , EQ )
530+ CHECK_CFG_P (statistics .event_types , 0 , EQ )
531+ CHECK_CFG_P (statistics .total , 0 , EQ )
532+ CHECK_CFG_P (statistics .used_memory , 0 , EQ )
533+ CHECK_CFG_P (initial_resource_size , 0 , NEQ )
534+
535+ C_ASSERT_NOT_NULL ((void * )getStatistics (soap_internal ), CTEST_SETTER (
536+ CTEST_TITLE ("Checking getStatistics(soap_internal) is NOT NULL" ),
537+ CTEST_INFO ("Return value SHOULD be NOT NULL" ),
538+ CTEST_ON_SUCCESS ("getStatistics(soap_internal) SUCCESS" ),
539+ CTEST_ON_ERROR_CB (test_pointer_assert_RELEASE , (void * )& test_pointer_assert_rel )
540+ ))
541+
542+ CHECK_CFG_P (statistics .costs , 0 , EQ )
543+ CHECK_CFG_P (statistics .strings , 365 , EQ )
544+ CHECK_CFG_P (statistics .shorts , 0 , EQ )
545+ CHECK_CFG_P (statistics .ints , 0 , EQ )
546+ CHECK_CFG_P (statistics .long64s , 30 , EQ )
547+ CHECK_CFG_P (statistics .enums , 47 , EQ )
548+ CHECK_CFG_P (statistics .arrays , 45 , EQ )
549+ CHECK_CFG_P (statistics .booleans , 4 , EQ )
550+ CHECK_CFG_P (statistics .doubles , 4 , EQ )
551+ CHECK_CFG_P (statistics .date_times , 46 , EQ )
552+ CHECK_CFG_P (statistics .measures , 36 , EQ )
553+ CHECK_CFG_P (statistics .event_types , 0 , EQ )
554+ CHECK_CFG_P (statistics .total , 577 , EQ )
555+ CHECK_CFG_P (statistics .used_memory , 0 , NEQ )
556+ CHECK_CFG_P (initial_resource_size , 0 , NEQ )
557+
558+ C_ASSERT_NOT_NULL ((void * )bsonSerialize (soap_internal ), CTEST_SETTER (
559+ CTEST_TITLE ("Checking bsonSerialize(soap_internal) is NOT NULL" ),
560+ CTEST_INFO ("Return value SHOULD be NOT NULL" ),
561+ CTEST_ON_SUCCESS ("bsonSerialize(soap_internal) SUCCESS" ),
562+ CTEST_ON_ERROR_CB (test_pointer_assert_RELEASE , (void * )& test_pointer_assert_rel )
563+ ))
564+
565+ CHECK_CFG_P (c_bson_serialized .bson , NULL , NEQ )
566+ CHECK_CFG_P (c_bson_serialized .bson_size , 0 , NEQ )
567+
568+ C_ASSERT_NOT_NULL ((void * )getJson (soap_internal ), CTEST_SETTER (
569+ CTEST_TITLE ("Checking getJson(soap_internal) is NOT NULL" ),
570+ CTEST_INFO ("Return value SHOULD be NOT NULL" ),
571+ CTEST_ON_SUCCESS ("getJson(soap_internal) SUCCESS" ),
572+ CTEST_ON_ERROR_CB (test_pointer_assert_RELEASE , (void * )& test_pointer_assert_rel )
573+ ))
574+
575+ CHECK_CFG_P (c_json_str .json , NULL , NEQ )
576+ CHECK_CFG_P (c_json_str .json_len , 0 , NEQ )
577+
361578 test_pointer_assert_RELEASE ((void * )& test_pointer_assert_rel );
362579
363580 C_ASSERT_NULL ((void * )test_pointer_assert_rel .soap_internal , CTEST_SETTER (
0 commit comments