Return-Path: Delivered-To: apmail-ws-axis-dev-archive@www.apache.org Received: (qmail 55022 invoked from network); 15 Feb 2006 03:38:15 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 15 Feb 2006 03:38:15 -0000 Received: (qmail 75388 invoked by uid 500); 15 Feb 2006 03:38:13 -0000 Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org Received: (qmail 75269 invoked by uid 500); 15 Feb 2006 03:38:12 -0000 Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list axis-cvs@ws.apache.org Received: (qmail 75229 invoked by uid 500); 15 Feb 2006 03:38:12 -0000 Delivered-To: apmail-ws-axis2-cvs@ws.apache.org Received: (qmail 75207 invoked by uid 99); 15 Feb 2006 03:38:12 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 14 Feb 2006 19:38:12 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Tue, 14 Feb 2006 19:38:11 -0800 Received: (qmail 54901 invoked by uid 65534); 15 Feb 2006 03:37:50 -0000 Message-ID: <20060215033750.54900.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r377924 - in /webservices/axis2/trunk/c: modules/core/clientapi/ modules/core/deployment/ modules/core/description/ modules/core/engine/ modules/core/phaseresolver/ test/unit/core/context/ test/unit/core/deployment/ test/unit/core/descripti... Date: Wed, 15 Feb 2006 03:37:48 -0000 To: axis2-cvs@ws.apache.org From: damitha@apache.org X-Mailer: svnmailer-1.0.6 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: damitha Date: Tue Feb 14 19:37:46 2006 New Revision: 377924 URL: http://svn.apache.org/viewcvs?rev=377924&view=rev Log: updated unit and system tests Modified: webservices/axis2/trunk/c/modules/core/clientapi/Makefile.am webservices/axis2/trunk/c/modules/core/deployment/Makefile.am webservices/axis2/trunk/c/modules/core/description/Makefile.am webservices/axis2/trunk/c/modules/core/engine/Makefile.am webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c webservices/axis2/trunk/c/test/unit/core/context/Makefile.am webservices/axis2/trunk/c/test/unit/core/deployment/test_dep_engine.c webservices/axis2/trunk/c/test/unit/core/description/Makefile.am webservices/axis2/trunk/c/test/unit/core/description/test_svc.c webservices/axis2/trunk/c/test/unit/core/phaseresolver/Makefile.am webservices/axis2/trunk/c/test/unit/core/phaseresolver/test_resolver.c webservices/axis2/trunk/c/test/unit/util/util_class_loader_test.c Modified: webservices/axis2/trunk/c/modules/core/clientapi/Makefile.am URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/clientapi/Makefile.am?rev=377924&r1=377923&r2=377924&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/core/clientapi/Makefile.am (original) +++ webservices/axis2/trunk/c/modules/core/clientapi/Makefile.am Tue Feb 14 19:37:46 2006 @@ -1,4 +1,6 @@ TESTS = noinst_HEADERS = callback_recv.h \ - listener_manager.h + listener_manager.h \ + axis2_msg_sender.h + Modified: webservices/axis2/trunk/c/modules/core/deployment/Makefile.am URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/deployment/Makefile.am?rev=377924&r1=377923&r2=377924&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/core/deployment/Makefile.am (original) +++ webservices/axis2/trunk/c/modules/core/deployment/Makefile.am Tue Feb 14 19:37:46 2006 @@ -1,3 +1,16 @@ TESTS = -noinst_HEADERS = axis2_deployment.h +noinst_HEADERS = axis2_deployment.h \ + axis2_arch_file_data.h \ + axis2_arch_reader.h \ + axis2_conf_builder.h \ + axis2_conf_init.h \ + axis2_dep_engine.h \ + axis2_desc_builder.h \ + axis2_module_builder.h \ + axis2_repos_listener.h \ + axis2_svc_builder.h \ + axis2_svc_grp_builder.h \ + axis2_ws_info.h \ + axis2_ws_info_list.h + Modified: webservices/axis2/trunk/c/modules/core/description/Makefile.am URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/Makefile.am?rev=377924&r1=377923&r2=377924&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/core/description/Makefile.am (original) +++ webservices/axis2/trunk/c/modules/core/description/Makefile.am Tue Feb 14 19:37:46 2006 @@ -1,3 +1,2 @@ TESTS = -noinst_HEADERS = axis2_description.h Modified: webservices/axis2/trunk/c/modules/core/engine/Makefile.am URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/engine/Makefile.am?rev=377924&r1=377923&r2=377924&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/core/engine/Makefile.am (original) +++ webservices/axis2/trunk/c/modules/core/engine/Makefile.am Tue Feb 14 19:37:46 2006 @@ -1,6 +1,7 @@ TESTS = lib_LTLIBRARIES = libaxis2_engine.la AM_CPPFLAGS = $(CPPFLAGS) +noinst_HEADERS = axis2_engine.h libaxis2_engine_la_SOURCES = handler.c \ conf.c \ Modified: webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c?rev=377924&r1=377923&r2=377924&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c (original) +++ webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c Tue Feb 14 19:37:46 2006 @@ -650,7 +650,7 @@ */ size = AXIS2_ARRAY_LIST_SIZE(all_handlers, env); - if(AXIS2_TRUE != AXIS2_ERROR_GET_STATUS_CODE((*env)->error)) + if(AXIS2_SUCCESS != AXIS2_ERROR_GET_STATUS_CODE((*env)->error)) { return AXIS2_FAILURE; } Modified: webservices/axis2/trunk/c/test/unit/core/context/Makefile.am URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/unit/core/context/Makefile.am?rev=377924&r1=377923&r2=377924&view=diff ============================================================================== --- webservices/axis2/trunk/c/test/unit/core/context/Makefile.am (original) +++ webservices/axis2/trunk/c/test/unit/core/context/Makefile.am Tue Feb 14 19:37:46 2006 @@ -11,7 +11,7 @@ -I$(top_builddir)/modules/util \ -I${CUTEST_HOME}/include -check_PROGRAMS = context_test +prgbin_PROGRAMS = context_test context_test_SOURCES = main.c context_test_LDADD = libtest_context.la \ -L$(CUTEST_HOME)/lib \ @@ -22,6 +22,7 @@ -laxis2_engine \ -laxis2_wsdl \ -laxis2_om \ + -laxis2_soap \ -laxis2_parser \ -L$(GUTHTHILA_LIB) $(GUTHTHILA_LIBNAME) \ -L$(LIBXML2_LIB) $(LIBXML2_LIBNAME) Modified: webservices/axis2/trunk/c/test/unit/core/deployment/test_dep_engine.c URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/unit/core/deployment/test_dep_engine.c?rev=377924&r1=377923&r2=377924&view=diff ============================================================================== --- webservices/axis2/trunk/c/test/unit/core/deployment/test_dep_engine.c (original) +++ webservices/axis2/trunk/c/test/unit/core/deployment/test_dep_engine.c Tue Feb 14 19:37:46 2006 @@ -96,15 +96,15 @@ axis2c_home = AXIS2_GETENV("AXIS2C_HOME"); - dep_engine = axis2_dep_engine_create_with_repos_name(&env,axis2c_home); + dep_engine = axis2_dep_engine_create_with_repos_name(&env, axis2c_home); if (dep_engine) - conf_actual = axis2_dep_engine_load(dep_engine,&env); + conf_actual = axis2_dep_engine_load(dep_engine, &env); - CuAssertPtrNotNull(tc,conf_actual); + CuAssertPtrNotNull(tc, conf_actual); if (conf_actual) - AXIS2_CONF_FREE(conf_actual,&env); - + AXIS2_DEP_ENGINE_FREE(dep_engine, &env); + axis2_env_free(env); } Modified: webservices/axis2/trunk/c/test/unit/core/description/Makefile.am URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/unit/core/description/Makefile.am?rev=377924&r1=377923&r2=377924&view=diff ============================================================================== --- webservices/axis2/trunk/c/test/unit/core/description/Makefile.am (original) +++ webservices/axis2/trunk/c/test/unit/core/description/Makefile.am Tue Feb 14 19:37:46 2006 @@ -1,4 +1,5 @@ TESTS = description_test +prgbindir=$(prefix)/bin/unit_test prglibdir=$(prefix)/lib/unit_test prglib_LTLIBRARIES = libtest_description.la AM_CPPFLAGS = $(CPPFLAGS) @@ -23,7 +24,7 @@ -I${CUTEST_HOME}/include \ -I$(top_builddir)/modules/platforms -check_PROGRAMS = description_test +prgbin_PROGRAMS = description_test description_test_SOURCES = main.c description_test_LDADD = libtest_description.la \ -L$(CUTEST_HOME)/lib \ @@ -34,6 +35,7 @@ -laxis2_engine \ -laxis2_wsdl \ -laxis2_om \ + -laxis2_soap \ -laxis2_parser \ -L$(GUTHTHILA_LIB) $(GUTHTHILA_LIBNAME) \ -L$(LIBXML2_LIB) $(LIBXML2_LIBNAME) Modified: webservices/axis2/trunk/c/test/unit/core/description/test_svc.c URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/unit/core/description/test_svc.c?rev=377924&r1=377923&r2=377924&view=diff ============================================================================== --- webservices/axis2/trunk/c/test/unit/core/description/test_svc.c (original) +++ webservices/axis2/trunk/c/test/unit/core/description/test_svc.c Tue Feb 14 19:37:46 2006 @@ -1,4 +1,6 @@ #include "test_svc.h" +#include +#include struct axis2_module_desc *create_module_desc(axis2_env_t **env); void add_handlers_to_flow(struct axis2_flow *flow, axis2_env_t **env); @@ -13,13 +15,22 @@ axis2_status_t actual = AXIS2_FAILURE; struct axis2_flow *inflow = NULL; axis2_qname_t *svc_qname = NULL; + axis2_allocator_t *allocator = NULL; + axis2_log_t *log = NULL; + axis2_env_t *env = NULL; + axis2_error_t *error = NULL; printf("**************************************\n"); printf("testing axis2_svc_add_module_ops method \n"); printf("**************************************\n"); - axis2_allocator_t *allocator = axis2_allocator_init (NULL); - axis2_env_t *env = axis2_env_create (allocator); + + allocator = axis2_allocator_init (NULL); + error = axis2_error_create(allocator); + log = axis2_log_create(allocator, NULL, "/dev/stderr"); + env = axis2_env_create_with_error_log(allocator, error, log); + env->log->level = AXIS2_LOG_LEVEL_TRACE; + axis2_error_init(); conf = axis2_conf_create(&env); module_desc = create_module_desc(&env); Modified: webservices/axis2/trunk/c/test/unit/core/phaseresolver/Makefile.am URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/unit/core/phaseresolver/Makefile.am?rev=377924&r1=377923&r2=377924&view=diff ============================================================================== --- webservices/axis2/trunk/c/test/unit/core/phaseresolver/Makefile.am (original) +++ webservices/axis2/trunk/c/test/unit/core/phaseresolver/Makefile.am Tue Feb 14 19:37:46 2006 @@ -1,4 +1,5 @@ TESTS = phaseresolver_test +prgbindir=$(prefix)/bin/unit_test prglibdir=$(prefix)/lib/unit_test prglib_LTLIBRARIES = libtest_phaseresolver.la AM_CPPFLAGS = $(CPPFLAGS) @@ -21,7 +22,7 @@ -I${CUTEST_HOME}/include \ -I$(top_builddir)/modules/platforms -check_PROGRAMS = phaseresolver_test +prgbin_PROGRAMS = phaseresolver_test phaseresolver_test_SOURCES = main.c phaseresolver_test_LDADD = libtest_phaseresolver.la \ -L$(CUTEST_HOME)/lib \ @@ -32,6 +33,7 @@ -laxis2_engine \ -laxis2_wsdl \ -laxis2_om \ + -laxis2_soap \ -laxis2_parser \ -L$(GUTHTHILA_LIB) $(GUTHTHILA_LIBNAME) \ -L$(LIBXML2_LIB) $(LIBXML2_LIBNAME) Modified: webservices/axis2/trunk/c/test/unit/core/phaseresolver/test_resolver.c URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/unit/core/phaseresolver/test_resolver.c?rev=377924&r1=377923&r2=377924&view=diff ============================================================================== --- webservices/axis2/trunk/c/test/unit/core/phaseresolver/test_resolver.c (original) +++ webservices/axis2/trunk/c/test/unit/core/phaseresolver/test_resolver.c Tue Feb 14 19:37:46 2006 @@ -16,13 +16,21 @@ axis2_status_t actual = AXIS2_FAILURE; axis2_status_t expected = AXIS2_TRUE; axis2_phase_resolver_t *resolver = NULL; + axis2_allocator_t *allocator = NULL; + axis2_log_t *log = NULL; + axis2_env_t *env = NULL; + axis2_error_t *error = NULL; printf("******************************************\n"); printf("testing axis2_phase_resolver_free method \n"); printf("******************************************\n"); - axis2_allocator_t *allocator = axis2_allocator_init (NULL); - axis2_env_t *env = axis2_env_create (allocator); + allocator = axis2_allocator_init (NULL); + error = axis2_error_create(allocator); + log = axis2_log_create(allocator, NULL, "/dev/stderr"); + env = axis2_env_create_with_error_log(allocator, error, log); + env->log->level = AXIS2_LOG_LEVEL_TRACE; + axis2_error_init(); resolver = axis2_phase_resolver_create(&env); actual = axis2_phase_resolver_free(resolver, &env); @@ -39,15 +47,23 @@ struct axis2_flow *flow = NULL; axis2_status_t expected = AXIS2_SUCCESS; axis2_status_t actual = AXIS2_FAILURE; + axis2_allocator_t *allocator = NULL; + axis2_log_t *log = NULL; + axis2_env_t *env = NULL; + axis2_error_t *error = NULL; printf("*********************************************************\n"); printf("testing axis2_phase_resolver_engage_module_to_op method \n"); printf("*********************************************************\n"); - axis2_allocator_t *allocator = axis2_allocator_init (NULL); - axis2_env_t *env = axis2_env_create (allocator); - axis2_op_t *optr = axis2_op_create(&env); + allocator = axis2_allocator_init (NULL); + error = axis2_error_create(allocator); + log = axis2_log_create(allocator, NULL, "/dev/stderr"); + env = axis2_env_create_with_error_log(allocator, error, log); + env->log->level = AXIS2_LOG_LEVEL_TRACE; + axis2_error_init(); + axis2_op_t *optr = axis2_op_create(&env); op_in_phases = get_op_in_phases(&env); AXIS2_OP_SET_REMAINING_PHASES_INFLOW(optr, &env, op_in_phases); flow = axis2_flow_create(&env); Modified: webservices/axis2/trunk/c/test/unit/util/util_class_loader_test.c URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/unit/util/util_class_loader_test.c?rev=377924&r1=377923&r2=377924&view=diff ============================================================================== --- webservices/axis2/trunk/c/test/unit/util/util_class_loader_test.c (original) +++ webservices/axis2/trunk/c/test/unit/util/util_class_loader_test.c Tue Feb 14 19:37:46 2006 @@ -1,6 +1,6 @@ #include "util_class_loader_test.h" #include -#include +#include #include #include @@ -8,16 +8,15 @@ { axis2_dll_desc_t *dll_desc = NULL; axis2_char_t *dll_name = NULL; - axis2_msg_recv_t *msg_recv = NULL; + axis2_svc_skeleton_t *svc = NULL; axis2_param_t *impl_info_param = NULL; - axis2_char_t *scope = NULL; - axis2_char_t *expected = NULL; + axis2_status_t status = AXIS2_FAILURE; + axis2_status_t expected = AXIS2_SUCCESS; axis2_char_t *axis2c_home = NULL; printf("******************************************\n"); printf("testing axis2_class_loader_create_dll\n"); printf("******************************************\n"); - expected = "application"; axis2_allocator_t *allocator = axis2_allocator_init (NULL); axis2_env_t *env = axis2_env_create (allocator); @@ -25,17 +24,16 @@ dll_desc = axis2_dll_desc_create(&env); axis2c_home = AXIS2_GETENV("AXIS2C_HOME"); - dll_name = AXIS2_STRACAT (axis2c_home, "/lib/libaxis2_receivers.so", &env); + dll_name = AXIS2_STRACAT (axis2c_home, "/services/echo/libecho.so", &env); AXIS2_DLL_DESC_SET_NAME(dll_desc, &env, dll_name); - AXIS2_DLL_DESC_SET_TYPE(dll_desc, &env, AXIS2_MSG_RECV_DLL); - axis2_class_loader_init(&env); + AXIS2_DLL_DESC_SET_TYPE(dll_desc, &env, AXIS2_SVC_DLL); impl_info_param = axis2_param_create(&env, NULL, NULL); AXIS2_PARAM_SET_VALUE(impl_info_param, &env, dll_desc); - msg_recv = (axis2_msg_recv_t *) axis2_class_loader_create_dll(&env, + axis2_class_loader_init(&env); + svc = (axis2_svc_skeleton_t *) axis2_class_loader_create_dll(&env, impl_info_param); - scope = AXIS2_MSG_RECV_GET_SCOPE(msg_recv, &env); - printf("scope:%s\n", scope); + status = AXIS2_SVC_SKELETON_INIT(svc, &env); AXIS2_FREE(env->allocator, dll_name); - CuAssertStrEquals(tc, expected, scope); + CuAssertIntEquals(tc, expected, status); }