axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sam...@apache.org
Subject svn commit: r525471 - in /webservices/axis2/trunk/c: axiom/test/om/ axiom/test/soap/ test/core/clientapi/ test/core/deployment/ test/core/transport/http/ util/test/util/
Date Wed, 04 Apr 2007 09:20:25 GMT
Author: samisa
Date: Wed Apr  4 02:20:23 2007
New Revision: 525471

URL: http://svn.apache.org/viewvc?view=rev&rev=525471
Log:
Fixed test build breaks

Modified:
    webservices/axis2/trunk/c/axiom/test/om/test_om.c
    webservices/axis2/trunk/c/axiom/test/soap/test_soap.c
    webservices/axis2/trunk/c/test/core/clientapi/test_clientapi.c
    webservices/axis2/trunk/c/test/core/deployment/test_deployment.c
    webservices/axis2/trunk/c/test/core/transport/http/test_http_transport.c
    webservices/axis2/trunk/c/util/test/util/test_log.c
    webservices/axis2/trunk/c/util/test/util/test_util.c

Modified: webservices/axis2/trunk/c/axiom/test/om/test_om.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/test/om/test_om.c?view=diff&rev=525471&r1=525470&r2=525471
==============================================================================
--- webservices/axis2/trunk/c/axiom/test/om/test_om.c (original)
+++ webservices/axis2/trunk/c/axiom/test/om/test_om.c Wed Apr  4 02:20:23 2007
@@ -119,7 +119,7 @@
         /** print root node information */
 
 
-        ele1 = AXIOM_NODE_GET_DATA_ELEMENT(node1, environment);
+        ele1 = axiom_node_get_data_element(node1, environment);
         if (ele1)
 
             printf("root localname %s\n", axiom_element_get_localname(ele1, environment));
@@ -143,10 +143,10 @@
         if (!node2)
             break;
 
-        switch (AXIOM_NODE_GET_NODE_TYPE(node2, environment))
+        switch (axiom_node_get_node_type(node2, environment))
         {
             case AXIOM_ELEMENT:
-                ele2 = (axiom_element_t*) AXIOM_NODE_GET_DATA_ELEMENT(node2, environment);
+                ele2 = (axiom_element_t*) axiom_node_get_data_element(node2, environment);
                 if (ele2 && axiom_element_get_localname(ele2, environment))
                 {
                     printf("\n localname %s\n" , axiom_element_get_localname(ele2, environment));
@@ -157,7 +157,7 @@
                 break;
             case AXIOM_TEXT:
 
-                text = (axiom_text_t *)AXIOM_NODE_GET_DATA_ELEMENT(node2, environment);
+                text = (axiom_text_t *)axiom_node_get_data_element(node2, environment);
                 if (text && axiom_text_get_value(text , environment))
                     printf("\n text value  %s \n", axiom_text_get_value(text, environment));
                 break;
@@ -179,7 +179,7 @@
 
     axiom_node_serialize_sub_tree(node3, environment , om_output);
 
-    buffer = (axis2_char_t*)AXIOM_XML_WRITER_GET_XML(writer, environment);
+    buffer = (axis2_char_t*)axiom_xml_writer_get_xml(writer, environment);
 
     if (buffer)
         printf("%s", buffer);
@@ -263,7 +263,7 @@
     stream = axiom_data_source_get_stream(data_source, environment);
     if (stream)
     {
-        AXIS2_STREAM_WRITE(stream, environment, "<this xmlns:axiom=\"http://ws.apache.org/axis2/c/om\">is
a test</this>", 
+        axutil_stream_write(stream, environment, "<this xmlns:axiom=\"http://ws.apache.org/axis2/c/om\">is
a test</this>", 
             axutil_strlen("<this xmlns:axiom=\"http://ws.apache.org/axis2/c/om\">is
a test</this>"));
     }
 
@@ -273,7 +273,7 @@
     om_output = axiom_output_create(environment, writer);
 
     printf("Serialize built document\n");
-    status = AXIOM_NODE_SERIALIZE(node1, environment , om_output);
+    status = axiom_node_serialize(node1, environment , om_output);
     if (status != AXIS2_SUCCESS)
     {
         printf("\naxiom_node_serialize failed\n");
@@ -283,8 +283,8 @@
         printf("\naxiom_node_serialize success\n");
     /* end serializing stuff */
 
-    AXIOM_NODE_FREE_TREE(node1, environment);
-    output_buffer = (axis2_char_t*)AXIOM_XML_WRITER_GET_XML(writer, environment);
+    axiom_node_free_tree(node1, environment);
+    output_buffer = (axis2_char_t*)axiom_xml_writer_get_xml(writer, environment);
 
     axiom_output_free(om_output, environment);
 	/*    if (output_buffer) */

Modified: webservices/axis2/trunk/c/axiom/test/soap/test_soap.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/test/soap/test_soap.c?view=diff&rev=525471&r1=525470&r2=525471
==============================================================================
--- webservices/axis2/trunk/c/axiom/test/soap/test_soap.c (original)
+++ webservices/axis2/trunk/c/axiom/test/soap/test_soap.c Wed Apr  4 02:20:23 2007
@@ -32,7 +32,6 @@
 #include <axiom_soap_envelope.h>
 #include <axiom_soap_body.h>
 #include <axiom_soap_header.h>
-#include <axiom_soap_message.h>
 #include <axiom_soap_header_block.h>
 #include <axiom_soap_fault.h>
 #include <axiom_soap_fault_code.h>
@@ -80,9 +79,9 @@
     if (!om_node)
         return AXIS2_FAILURE;
 
-    if (AXIOM_NODE_GET_NODE_TYPE(om_node, env) == AXIOM_ELEMENT)
+    if (axiom_node_get_node_type(om_node, env) == AXIOM_ELEMENT)
     {
-        om_ele = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(om_node, env);
+        om_ele = (axiom_element_t *)axiom_node_get_data_element(om_node, env);
         if (!om_ele)
             return AXIS2_FAILURE;
 
@@ -141,7 +140,7 @@
     om_builder = axiom_stax_builder_create(env, xml_reader);
     if (!om_builder)
     {
-        AXIOM_XML_READER_FREE(xml_reader, env);
+        axiom_xml_reader_free(xml_reader, env);
         printf("%s \n", axutil_error_get_message(env->error));
         return AXIS2_FAILURE;
     }
@@ -176,12 +175,12 @@
         children_iter = axiom_soap_header_examine_all_header_blocks(soap_header, env);
         if (children_iter)
         {
-            while (axiom_children_iterator_has_next(children_iter, env))
+            /*while (axiom_children_iterator_has_next(children_iter, env))
             {
                 om_node = axiom_children_iterator_next(children_iter, env);
                 if (om_node)
                     printnode(om_node, env);
-            }
+            }*/
         }
     }
 
@@ -210,7 +209,7 @@
     om_node = axiom_soap_body_get_base_node(soap_body, env);
     if (om_node)
     {
-        while (!(AXIOM_NODE_IS_COMPLETE(om_node, env)))
+        while (!(axiom_node_is_complete(om_node, env)))
         {
             status = axiom_soap_builder_next(soap_builder, env);
             if (status == AXIS2_FAILURE)
@@ -233,14 +232,14 @@
     if (!om_output)
     {
         axiom_soap_builder_free(soap_builder, env);
-        AXIOM_XML_WRITER_FREE(xml_writer, env);
+        axiom_xml_writer_free(xml_writer, env);
         return AXIS2_FAILURE;
     }
 
 
     axiom_soap_envelope_serialize(soap_envelope, env, om_output, AXIS2_FALSE);
 
-    buffer = (axis2_char_t*)AXIOM_XML_WRITER_GET_XML(xml_writer, env);
+    buffer = (axis2_char_t*)axiom_xml_writer_get_xml(xml_writer, env);
 
     printf("\n\nThe serialized xml is >>>>>>>>>>>>>\n\n\n%s
\n\n\n", buffer);
 
@@ -302,7 +301,7 @@
 
     hb_node = axiom_soap_header_block_get_base_node(hb1, env);
 
-    hb_ele = AXIOM_NODE_GET_DATA_ELEMENT(hb_node, env);
+    hb_ele = axiom_node_get_data_element(hb_node, env);
 
     axiom_element_set_namespace(hb_ele, env, test_ns, hb_node);
 
@@ -320,7 +319,7 @@
 
     axiom_soap_envelope_serialize(soap_envelope, env, om_output, AXIS2_FALSE);
 
-    buffer = (axis2_char_t*)AXIOM_XML_WRITER_GET_XML(xml_writer, env);
+    buffer = (axis2_char_t*)axiom_xml_writer_get_xml(xml_writer, env);
 
     printf("%s \n",  buffer);
 
@@ -359,7 +358,7 @@
             AXIS2_XML_PARSER_TYPE_BUFFER);
     om_output = axiom_output_create(env, xml_writer);
     axiom_soap_envelope_serialize(soap_envelope, env, om_output, AXIS2_FALSE);
-    buffer = (axis2_char_t*)AXIOM_XML_WRITER_GET_XML(xml_writer, env);
+    buffer = (axis2_char_t*)axiom_xml_writer_get_xml(xml_writer, env);
     printf("%s \n",  buffer);
     AXIS2_FREE(env->allocator, buffer);
     axiom_soap_envelope_free(soap_envelope, env);

Modified: webservices/axis2/trunk/c/test/core/clientapi/test_clientapi.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/core/clientapi/test_clientapi.c?view=diff&rev=525471&r1=525470&r2=525471
==============================================================================
--- webservices/axis2/trunk/c/test/core/clientapi/test_clientapi.c (original)
+++ webservices/axis2/trunk/c/test/core/clientapi/test_clientapi.c Wed Apr  4 02:20:23 2007
@@ -60,10 +60,10 @@
     ret_node = axis2_svc_client_send_receive(svc_client, env, payload);
     if (ret_node)
     {
-        if (AXIOM_NODE_GET_NODE_TYPE(ret_node, env) == AXIOM_ELEMENT)
+        if (axiom_node_get_node_type(ret_node, env) == AXIOM_ELEMENT)
         {
-            ret_node = AXIOM_NODE_GET_FIRST_CHILD(ret_node, env);
-            result_ele = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(ret_node, env);
+            ret_node = axiom_node_get_first_child(ret_node, env);
+            result_ele = (axiom_element_t*)axiom_node_get_data_element(ret_node, env);
             result = axiom_element_get_text(result_ele, env, ret_node);
             if (!strcmp(result, echo_text))
                 printf("axis2_test SVC_CLIENT_SEND_RECEIVE SUCCESS\n");

Modified: webservices/axis2/trunk/c/test/core/deployment/test_deployment.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/core/deployment/test_deployment.c?view=diff&rev=525471&r1=525470&r2=525471
==============================================================================
--- webservices/axis2/trunk/c/test/core/deployment/test_deployment.c (original)
+++ webservices/axis2/trunk/c/test/core/deployment/test_deployment.c Wed Apr  4 02:20:23 2007
@@ -155,7 +155,7 @@
     axutil_class_loader_init(env);
     transport_recv = (axis2_transport_receiver_t *) axutil_class_loader_create_dll(env,
             impl_info_param);
-    is_running = AXIS2_TRANSPORT_RECEIVER_IS_RUNNING(transport_recv, env);
+    is_running = axis2_transport_receiver_is_running(transport_recv, env);
     printf("is_running:%d\n", is_running);
     AXIS2_FREE(env->allocator, dll_name);
     printf("transport receiver load test successful\n");
@@ -168,7 +168,6 @@
     axis2_char_t *dll_name = NULL;
     axis2_transport_sender_t *transport_sender = NULL;
     axutil_param_t *impl_info_param = NULL;
-    axis2_status_t status = AXIS2_FAILURE;
     axis2_char_t *axis2c_home = NULL;
     axis2_msg_ctx_t *msg_ctx = NULL;
 
@@ -190,8 +189,6 @@
     transport_sender = (axis2_transport_sender_t *) axutil_class_loader_create_dll(env,
             impl_info_param);
 
-    status = AXIS2_TRANSPORT_SENDER_CLEANUP(transport_sender, env, msg_ctx);
-    printf("clean status:%d\n", status);
     AXIS2_FREE(env->allocator, dll_name);
     printf("transport sender load test successful\n");
     return 0;

Modified: webservices/axis2/trunk/c/test/core/transport/http/test_http_transport.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/core/transport/http/test_http_transport.c?view=diff&rev=525471&r1=525470&r2=525471
==============================================================================
--- webservices/axis2/trunk/c/test/core/transport/http/test_http_transport.c (original)
+++ webservices/axis2/trunk/c/test/core/transport/http/test_http_transport.c Wed Apr  4 02:20:23
2007
@@ -44,10 +44,10 @@
 
     printf("Starting http_request_line tests\n");
     request_line = axis2_http_request_line_parse_line(env, request_line_str);
-    printf("Method: %s|URI: %s|HTTP Version: %s|\n", AXIS2_HTTP_REQUEST_LINE_GET_METHOD
-            (request_line, env), AXIS2_HTTP_REQUEST_LINE_GET_URI(request_line, env),
-            AXIS2_HTTP_REQUEST_LINE_GET_HTTP_VERSION(request_line, env));
-    AXIS2_HTTP_REQUEST_LINE_FREE(request_line, env);
+    printf("Method: %s|URI: %s|HTTP Version: %s|\n", axis2_http_request_line_get_method
+            (request_line, env), axis2_http_request_line_get_uri(request_line, env),
+            axis2_http_request_line_get_http_version(request_line, env));
+    axis2_http_request_line_free(request_line, env);
     printf("Finished http_request_line tests ..........\n\n");
 }
 
@@ -60,13 +60,13 @@
     printf("Starting http_status_line tests\n");
     status_line = axis2_http_status_line_create(env, status_line_str);
     printf("Staus Line starts with HTTP ? :%d\n",
-            AXIS2_HTTP_STATUS_LINE_STARTS_WITH_HTTP(status_line, env));
+            axis2_http_status_line_starts_with_http(status_line, env));
     printf("HTTP Version :%s|Status Code:%d|Reason Phrase:%s|\n",
-            AXIS2_HTTP_STATUS_LINE_GET_HTTP_VERSION(status_line, env),
-            AXIS2_HTTP_STATUS_LINE_GET_STATUS_CODE(status_line, env),
-            AXIS2_HTTP_STATUS_LINE_GET_REASON_PHRASE(status_line, env));
-    printf("to_string :%s\n", AXIS2_HTTP_STATUS_LINE_TO_STRING(status_line, env));
-    AXIS2_HTTP_STATUS_LINE_FREE(status_line, env);
+            axis2_http_status_line_get_http_version(status_line, env),
+            axis2_http_status_line_get_status_code(status_line, env),
+            axis2_http_status_line_get_reason_phrase(status_line, env));
+    printf("to_string :%s\n", axis2_http_status_line_to_string(status_line, env));
+    axis2_http_status_line_free(status_line, env);
     printf("Finished http_status_line tests ..........\n\n");
 }
 
@@ -80,13 +80,13 @@
 
     printf("Starting http_header tests\n");
     http_header = axis2_http_header_create(env, header_name, header_value);
-    external_form = AXIS2_HTTP_HEADER_TO_EXTERNAL_FORM(http_header, env);
+    external_form = axis2_http_header_to_external_form(http_header, env);
     printf("Heder Name :%s|Header Value:%s|External Form:%s\n",
-            AXIS2_HTTP_HEADER_GET_NAME(http_header, env),
-            AXIS2_HTTP_HEADER_GET_VALUE(http_header, env),
+            axis2_http_header_get_name(http_header, env),
+            axis2_http_header_get_value(http_header, env),
             external_form);
     AXIS2_FREE(env->allocator, external_form);
-    AXIS2_HTTP_HEADER_FREE(http_header, env);
+    axis2_http_header_free(http_header, env);
 
     http_header = axis2_http_header_create_by_str(env, str_header);
     printf("Finished http_header tests ..........\n\n");
@@ -131,38 +131,38 @@
     url = axutil_url_create(env, "http", "localhost", 80,
             NULL);
     header = axis2_http_header_create(env, "Host", axutil_url_get_server(url, env));
-    AXIS2_HTTP_SIMPLE_REQUEST_ADD_HEADER(request, env, header);
+    axis2_http_simple_request_add_header(request, env, header);
     client = axis2_http_client_create(env, url);
 
-    status = AXIS2_HTTP_CLIENT_SEND(client, env, request, NULL);
+    status = axis2_http_client_send(client, env, request, NULL);
     if (status < 0)
     {
         printf("Test FAILED .........Can't send the request. Status :%d\n", status);
         return;
     }
-    status = AXIS2_HTTP_CLIENT_RECIEVE_HEADER(client, env);
+    status = axis2_http_client_recieve_header(client, env);
     if (status < 0)
     {
         printf("Test FAILED ......... Can't recieve. Status: %d\n", status);
         return;
     }
-    response = AXIS2_HTTP_CLIENT_GET_RESPONSE(client, env);
+    response = axis2_http_client_get_response(client, env);
     if (! response)
     {
         printf("Test Failed : NULL response");
         return;
     }
-    printf("Content Type :%s\n", AXIS2_HTTP_SIMPLE_RESPONSE_GET_CONTENT_TYPE(
+    printf("Content Type :%s\n", axis2_http_simple_response_get_content_type(
                 response, env));
-    printf("Content Length :%d\n", AXIS2_HTTP_SIMPLE_RESPONSE_GET_CONTENT_LENGTH(
+    printf("Content Length :%d\n", axis2_http_simple_response_get_content_length(
                 response, env));
     printf("Status code :%d\n", status);
-    body_bytes_len = AXIS2_HTTP_SIMPLE_RESPONSE_GET_BODY_BYTES(response, env, &body_bytes);
+    body_bytes_len = axis2_http_simple_response_get_body_bytes(response, env, &body_bytes);
     printf("body :%s\n", body_bytes);
 
-    AXIS2_HTTP_CLIENT_FREE(client, env);
-    AXIS2_HTTP_SIMPLE_REQUEST_FREE(request, env);
-    AXIS2_STREAM_FREE(request_body, env);
+    axis2_http_client_free(client, env);
+    axis2_http_simple_request_free(request, env);
+    axutil_stream_free(request_body, env);
     AXIS2_FREE(env->allocator, body_bytes);
     printf("Finished http_client tests ..........\n\n");
 }

Modified: webservices/axis2/trunk/c/util/test/util/test_log.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/test/util/test_log.c?view=diff&rev=525471&r1=525470&r2=525471
==============================================================================
--- webservices/axis2/trunk/c/util/test/util/test_log.c (original)
+++ webservices/axis2/trunk/c/util/test/util/test_log.c Wed Apr  4 02:20:23 2007
@@ -62,7 +62,6 @@
     char msg[10];
     printf("\n####start of test_axutil_log_write\n\n");
     strcpy(msg, "abcd test123");
-    AXIS2_LOG_WRITE(env->log, msg, AXIS2_LOG_LEVEL_ERROR);
     printf("\n####end of test_axutil_log_write\n\n");
 }
 

Modified: webservices/axis2/trunk/c/util/test/util/test_util.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/test/util/test_util.c?view=diff&rev=525471&r1=525470&r2=525471
==============================================================================
--- webservices/axis2/trunk/c/util/test/util/test_util.c (original)
+++ webservices/axis2/trunk/c/util/test/util/test_util.c Wed Apr  4 02:20:23 2007
@@ -244,7 +244,6 @@
         return;
     }
     strcpy(msg, "abcd test123");
-    AXIS2_LOG_WRITE(env->log, msg, AXIS2_LOG_LEVEL_ERROR);
 
     AXIS2_LOG_CRITICAL(env->log, AXIS2_LOG_SI, "log1 %s", "test1");
     AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "log2 %d", 2);



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org


Mime
View raw message