You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by na...@apache.org on 2006/06/01 10:51:52 UTC
svn commit: r410799 - in /webservices/axis2/trunk/c:
util/include/platforms/windows/ util/src/ util/src/platforms/windows/
xml_schema/include/xml_schema/ xml_schema/src/ xml_schema/test/
Author: nandika
Date: Thu Jun 1 01:51:51 2006
New Revision: 410799
URL: http://svn.apache.org/viewvc?rev=410799&view=rev
Log:
compilation problems fixed on windows
Modified:
webservices/axis2/trunk/c/util/include/platforms/windows/axis2_dir_windows.h
webservices/axis2/trunk/c/util/include/platforms/windows/axis2_getopt_windows.h
webservices/axis2/trunk/c/util/include/platforms/windows/axis2_uuid_gen_windows.h
webservices/axis2/trunk/c/util/include/platforms/windows/axis2_windows.h
webservices/axis2/trunk/c/util/src/platforms/windows/axis2_windows.c
webservices/axis2/trunk/c/util/src/platforms/windows/getopt_windows.c
webservices/axis2/trunk/c/util/src/platforms/windows/thread_mutex_windows.c
webservices/axis2/trunk/c/util/src/platforms/windows/uuid_gen_windows.c
webservices/axis2/trunk/c/util/src/url.c
webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_element.h
webservices/axis2/trunk/c/xml_schema/src/om_util.c
webservices/axis2/trunk/c/xml_schema/src/xml_schema_builder.c
webservices/axis2/trunk/c/xml_schema/test/xml_schema_test.c
Modified: webservices/axis2/trunk/c/util/include/platforms/windows/axis2_dir_windows.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/platforms/windows/axis2_dir_windows.h?rev=410799&r1=410798&r2=410799&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/platforms/windows/axis2_dir_windows.h (original)
+++ webservices/axis2/trunk/c/util/include/platforms/windows/axis2_dir_windows.h Thu Jun 1 01:51:51 2006
@@ -53,39 +53,43 @@
* open a directory on a given name
* returns a DIR if successful, or NULL if the path cannot be opened
*/
-AXIS2_DECLARE (DIR *) opendir(const char *);
+AXIS2_EXTERN DIR* AXIS2_CALL opendir(const char *);
/**
* Close the directory stream DIRP.
* Return 0 if successful, -1 otherwise.
*/
-AXIS2_EXTERN int) closedir(DIR *);
+AXIS2_EXTERN int AXIS2_CALL closedir(DIR *);
/**
* Read a directory entry from DIRP. Return a pointer to a `struct
* dirent' describing the entry, or NULL for EOF or error.
*/
-AXIS2_EXTERN truct dirent *) readdir(DIR *);
+AXIS2_EXTERN struct dirent* AXIS2_CALL
+readdir(DIR *);
/**
* Reentrant version of `readdir'
*/
-AXIS2_EXTERN int) readdir_r(DIR *, struct dirent *, struct dirent **);
+AXIS2_EXTERN int AXIS2_CALL
+readdir_r(DIR *, struct dirent *, struct dirent **);
/**
* Rewind DIRP to the beginning of the directory.
*/
-AXIS2_EXTERN int) rewinddir(DIR *);
+AXIS2_EXTERN int AXIS2_CALL rewinddir(DIR *);
/**
* Scan the directory DIR
* Returns the number of entries selected, or -1 on error
*/
-AXIS2_EXTERN int) scandir(const char *_dirname, struct dirent **__namelist[], int (*selector) (const struct dirent *entry), int (*compare) (const struct dirent **a, const struct dirent **b));
+AXIS2_EXTERN int AXIS2_CALL
+scandir(const char *_dirname, struct dirent **__namelist[], int (*selector) (const struct dirent *entry), int (*compare) (const struct dirent **a, const struct dirent **b));
/**
* Compare two `struct dirent's alphabetically
*/
-AXIS2_DECLARE_DATA int alphasort(const struct dirent **__d1, const struct dirent **__d2);
+extern int
+alphasort(const struct dirent **__d1, const struct dirent **__d2);
#endif /* READDIR_H */
Modified: webservices/axis2/trunk/c/util/include/platforms/windows/axis2_getopt_windows.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/platforms/windows/axis2_getopt_windows.h?rev=410799&r1=410798&r2=410799&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/platforms/windows/axis2_getopt_windows.h (original)
+++ webservices/axis2/trunk/c/util/include/platforms/windows/axis2_getopt_windows.h Thu Jun 1 01:51:51 2006
@@ -36,7 +36,8 @@
* @param __shortopts options
* @return option char if successful, -1 if over, ':' or '?' if error
*/
-AXIS2_EXTERN int) axis2_getopt(int __argc, char * const *__argv, const char *__shortopts);
+AXIS2_EXTERN int AXIS2_CALL
+axis2_getopt(int __argc, char * const *__argv, const char *__shortopts);
/** @} */
Modified: webservices/axis2/trunk/c/util/include/platforms/windows/axis2_uuid_gen_windows.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/platforms/windows/axis2_uuid_gen_windows.h?rev=410799&r1=410798&r2=410799&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/platforms/windows/axis2_uuid_gen_windows.h (original)
+++ webservices/axis2/trunk/c/util/include/platforms/windows/axis2_uuid_gen_windows.h Thu Jun 1 01:51:51 2006
@@ -30,7 +30,7 @@
* Generate universally unique id
* @return a char pointer to uuid
*/
-AXIS2_EXTERN axis2_char_t *) axis2_platform_uuid_gen(char *s);
+AXIS2_EXTERN axis2_char_t* AXIS2_CALL axis2_platform_uuid_gen(char *s);
/** @} */
#ifdef __cplusplus
Modified: webservices/axis2/trunk/c/util/include/platforms/windows/axis2_windows.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/platforms/windows/axis2_windows.h?rev=410799&r1=410798&r2=410799&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/platforms/windows/axis2_windows.h (original)
+++ webservices/axis2/trunk/c/util/include/platforms/windows/axis2_windows.h Thu Jun 1 01:51:51 2006
@@ -144,7 +144,8 @@
#define AXIS2_PRINTF_LONGLONG_FORMAT_SPECIFIER "%I64d"
#define AXIS2_PRINTF_LONGLONG_FORMAT_SPECIFIER_CHARS "I64d"
-AXIS2_EXTERN HMODULE) callLoadLib(LPCTSTR lib);
+AXIS2_EXTERN HMODULE AXIS2_CALL
+callLoadLib(LPCTSTR lib);
/**
* Platform specific path separator char
Modified: webservices/axis2/trunk/c/util/src/platforms/windows/axis2_windows.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/platforms/windows/axis2_windows.c?rev=410799&r1=410798&r2=410799&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/platforms/windows/axis2_windows.c (original)
+++ webservices/axis2/trunk/c/util/src/platforms/windows/axis2_windows.c Thu Jun 1 01:51:51 2006
@@ -40,7 +40,8 @@
return returningString;
}
*/
-AXIS2_EXTERN HMODULE) callLoadLib(LPCTSTR lib AXIS2_CALL
+AXIS2_EXTERN HMODULE AXIS2_CALL
+callLoadLib(LPCTSTR lib)
{
SetErrorMode(SEM_FAILCRITICALERRORS); //Disable display of the critical-error-handler message box
Modified: webservices/axis2/trunk/c/util/src/platforms/windows/getopt_windows.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/platforms/windows/getopt_windows.c?rev=410799&r1=410798&r2=410799&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/platforms/windows/getopt_windows.c (original)
+++ webservices/axis2/trunk/c/util/src/platforms/windows/getopt_windows.c Thu Jun 1 01:51:51 2006
@@ -36,7 +36,8 @@
return (int)'?';
}
-AXIS2_EXTERN int) axis2_getopt(int __argc, char * const *__argv, const char *__shortopts AXIS2_CALL
+AXIS2_EXTERN int AXIS2_CALL
+axis2_getopt(int __argc, char * const *__argv, const char *__shortopts)
{
static char *pos = "";
char *olstindex;
Modified: webservices/axis2/trunk/c/util/src/platforms/windows/thread_mutex_windows.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/platforms/windows/thread_mutex_windows.c?rev=410799&r1=410798&r2=410799&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/platforms/windows/thread_mutex_windows.c (original)
+++ webservices/axis2/trunk/c/util/src/platforms/windows/thread_mutex_windows.c Thu Jun 1 01:51:51 2006
@@ -67,7 +67,8 @@
return mutex;
}
-AXIS2_EXTERN axis2_status_t AXIS2_CALL axis2_thread_mutex_lock(axis2_thread_mutex_t *mutex AXIS2_CALL
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+axis2_thread_mutex_lock(axis2_thread_mutex_t *mutex)
{
if (mutex->type == thread_mutex_critical_section)
{
@@ -85,7 +86,8 @@
return AXIS2_SUCCESS;
}
-AXIS2_EXTERN axis2_status_t AXIS2_CALL axis2_thread_mutex_trylock(axis2_thread_mutex_t *mutex AXIS2_CALL
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+axis2_thread_mutex_trylock(axis2_thread_mutex_t *mutex)
{
if (mutex->type == thread_mutex_critical_section)
Modified: webservices/axis2/trunk/c/util/src/platforms/windows/uuid_gen_windows.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/platforms/windows/uuid_gen_windows.c?rev=410799&r1=410798&r2=410799&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/platforms/windows/uuid_gen_windows.c (original)
+++ webservices/axis2/trunk/c/util/src/platforms/windows/uuid_gen_windows.c Thu Jun 1 01:51:51 2006
@@ -22,7 +22,8 @@
#include <axis2_utils_defines.h>
-AXIS2_EXTERN axis2_char_t *) axis2_platform_uuid_gen(char *s AXIS2_CALL
+AXIS2_EXTERN axis2_char_t* AXIS2_CALL
+axis2_platform_uuid_gen(char *s)
{
RPC_STATUS retval;
UUID uuid;
Modified: webservices/axis2/trunk/c/util/src/url.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/url.c?rev=410799&r1=410798&r2=410799&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/url.c (original)
+++ webservices/axis2/trunk/c/util/src/url.c Thu Jun 1 01:51:51 2006
@@ -424,7 +424,7 @@
axis2_url_t* AXIS2_CALL
axis2_url_clone(
axis2_url_t *url,
- axis2_env_t **env)
+ axis2_env_t *env)
{
axis2_url_impl_t *url_impl = NULL;
Modified: webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_element.h?rev=410799&r1=410798&r2=410799&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_element.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_element.h Thu Jun 1 01:51:51 2006
@@ -287,7 +287,11 @@
#define AXIS2_XML_SCHEMA_ELEMENT_GET_BLOCK_RESOLVED(element, env) \
(((axis2_xml_schema_element_t *) element)->ops->get_block_resolved(\
- element, env))
+ element, env))
+
+#define AXIS2_XML_SCHEMA_ELEMENT_GET_BLOCK(element, env) \
+ (((axis2_xml_schema_element_t *) element)->ops->get_block(\
+ element, env))
#define AXIS2_XML_SCHEMA_ELEMENT_GET_FIXED_VALUE(element, env) \
(((axis2_xml_schema_element_t *) element)->ops->get_fixed_value(\
Modified: webservices/axis2/trunk/c/xml_schema/src/om_util.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/om_util.c?rev=410799&r1=410798&r2=410799&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/om_util.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/om_util.c Thu Jun 1 01:51:51 2006
@@ -276,7 +276,7 @@
AXIS2_EXTERN axis2_om_element_t * AXIS2_CALL
axis2_om_util_get_next_siblng_element_with_localname(axis2_om_element_t *ele,
- axis2_env_t **env,
+ axis2_env_t *env,
axis2_om_node_t *ele_node,
axis2_char_t *localname,
axis2_om_node_t **next_node)
@@ -314,7 +314,7 @@
AXIS2_EXTERN axis2_om_element_t * AXIS2_CALL
axis2_om_util_get_first_child_element_with_uri_localname(axis2_om_element_t *ele,
- axis2_env_t **env,
+ axis2_env_t *env,
axis2_om_node_t *ele_node,
axis2_char_t *localname,
axis2_char_t *uri,
@@ -397,7 +397,7 @@
}
AXIS2_EXTERN axis2_om_element_t * AXIS2_CALL
axis2_om_util_get_last_child_element_with_uri_localname(axis2_om_element_t *ele,
- axis2_env_t **env,
+ axis2_env_t *env,
axis2_om_node_t *ele_node,
axis2_char_t *localname,
axis2_char_t *uri,
@@ -448,7 +448,7 @@
AXIS2_EXTERN axis2_om_element_t * AXIS2_CALL
axis2_om_util_get_next_sibling_element_with_uri_localname(axis2_om_element_t *ele,
- axis2_env_t **env,
+ axis2_env_t *env,
axis2_om_node_t *ele_node,
axis2_char_t *localname,
axis2_char_t *uri,
@@ -495,7 +495,7 @@
AXIS2_EXTERN axis2_om_element_t * AXIS2_CALL
axis2_om_util_get_first_child_element_with_localnames(axis2_om_element_t *ele,
- axis2_env_t **env,
+ axis2_env_t *env,
axis2_om_node_t *ele_node,
axis2_array_list_t *names,
axis2_om_node_t **child_node)
@@ -579,7 +579,7 @@
AXIS2_EXTERN axis2_om_element_t * AXIS2_CALL
axis2_om_util_get_last_child_element_with_localnames(axis2_om_element_t *ele,
- axis2_env_t **env,
+ axis2_env_t *env,
axis2_om_node_t *ele_node,
axis2_array_list_t *names,
axis2_om_node_t **child_node)
@@ -629,7 +629,7 @@
AXIS2_EXTERN axis2_om_element_t * AXIS2_CALL
axis2_om_util_get_next_siblng_element_with_localnames(axis2_om_element_t *ele,
- axis2_env_t **env,
+ axis2_env_t *env,
axis2_om_node_t *ele_node,
axis2_array_list_t *names,
axis2_om_node_t **next_node)
@@ -679,7 +679,7 @@
AXIS2_EXTERN axis2_om_element_t * AXIS2_CALL
axis2_om_util_get_first_child_element_with_localname_attr(axis2_om_element_t *ele,
- axis2_env_t **env,
+ axis2_env_t *env,
axis2_om_node_t *ele_node,
axis2_char_t *localname,
axis2_char_t *attr_name,
@@ -811,7 +811,7 @@
AXIS2_EXTERN axis2_om_element_t * AXIS2_CALL
axis2_om_util_get_last_child_element_with_localname_attr(axis2_om_element_t *ele,
- axis2_env_t **env,
+ axis2_env_t *env,
axis2_om_node_t *ele_node,
axis2_char_t *localname,
axis2_char_t *attr_name,
@@ -890,7 +890,7 @@
AXIS2_EXTERN axis2_om_element_t * AXIS2_CALL
axis2_om_util_get_next_siblng_element_with_localname_attr(axis2_om_element_t *ele,
- axis2_env_t **env,
+ axis2_env_t *env,
axis2_om_node_t *ele_node,
axis2_char_t *localname,
axis2_char_t *attr_name,
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_builder.c?rev=410799&r1=410798&r2=410799&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_builder.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_builder.c Thu Jun 1 01:51:51 2006
@@ -601,6 +601,7 @@
if(NULL != sch_ele)
{
axis2_qname_t *qualified_qname = NULL;
+ axis2_char_t *qname_uri = NULL; /* for debuging */
axis2_qname_t *ref_qname = NULL;
axis2_xml_schema_obj_table_t *elements = NULL;
@@ -611,6 +612,7 @@
if(NULL != qualified_qname && NULL != elements)
{
+ qname_uri = AXIS2_QNAME_GET_URI(qualified_qname, env);
AXIS2_XML_SCHEMA_OBJ_TABLE_ADD(elements, env,
qualified_qname, sch_ele);
}
@@ -1449,7 +1451,7 @@
else if(AXIS2_STRCMP(localname, "anyAttribute") == 0)
{
void *any_attr = NULL;
- any_attr = handle_any_attribute(builder, env, any_attr, schema_node);
+ any_attr = handle_any_attribute(builder, env, node1, schema_node);
AXIS2_XML_SCHEMA_COMPLEX_TYPE_SET_ANY_ATTRIBUTE(cmp_type, env, any_attr);
}
ele1 = axis2_om_util_get_next_sibling_element_with_uri(node1, env,
@@ -2245,7 +2247,7 @@
AXIS2_XML_SCHEMA_ANNOTATED_SET_ANNOTATION(sequence, env, annotation);
}
- ele1 = axis2_om_util_get_first_child_element_with_uri(node1, env,
+ ele1 = axis2_om_util_get_next_sibling_element_with_uri(node1, env,
AXIS2_XML_SCHEMA_NS, &node1);
}
return sequence;
@@ -2593,6 +2595,8 @@
axis2_xml_schema_builder_impl_t *builder_impl = NULL;
builder_impl = AXIS2_INTF_TO_IMPL(builder);
+
+ any_attr = axis2_xml_schema_any_attribute_create(env);
any_attr_ele = (axis2_om_element_t*)
AXIS2_OM_NODE_GET_DATA_ELEMENT(any_attr_node, env);
Modified: webservices/axis2/trunk/c/xml_schema/test/xml_schema_test.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/test/xml_schema_test.c?rev=410799&r1=410798&r2=410799&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/test/xml_schema_test.c (original)
+++ webservices/axis2/trunk/c/xml_schema/test/xml_schema_test.c Thu Jun 1 01:51:51 2006
@@ -45,20 +45,20 @@
CuSuite* xml_schema_GetSuite()
{
CuSuite* suite = CuSuiteNew();
- SUITE_ADD_TEST(suite, test_simple_type_schema_generation);
+ /* SUITE_ADD_TEST(suite, test_simple_type_schema_generation);
SUITE_ADD_TEST(suite, test_any_attribute);
SUITE_ADD_TEST(suite, test_block_content);
SUITE_ADD_TEST(suite, test_circular_schema);
SUITE_ADD_TEST(suite, test_schema_import1);
- SUITE_ADD_TEST(suite, test_schema_import2);
+ SUITE_ADD_TEST(suite, test_schema_import2);*/
SUITE_ADD_TEST(suite, test_mixed_content);
- SUITE_ADD_TEST(suite, test_local_elements);
+/* SUITE_ADD_TEST(suite, test_local_elements);
SUITE_ADD_TEST(suite, test_element_refs);
SUITE_ADD_TEST(suite, test_forward_refs);
SUITE_ADD_TEST(suite, test_local_unnamed_simple_type);
SUITE_ADD_TEST(suite, test_simple_restriction);
SUITE_ADD_TEST(suite, test_unqualified_schemas);
- SUITE_ADD_TEST(suite, test_two_schmes);
+ SUITE_ADD_TEST(suite, test_two_schmes);*/
return suite;
}
@@ -107,21 +107,181 @@
ele = NULL;
sch_type = NULL;
}
+ AXIS2_OM_DOCUMENT_FREE(om_doc, env);
+
}
-void test_any_attribute(CuTest *tc){}
-void test_block_content(CuTest *tc){}
+void test_any_attribute(CuTest *tc)
+{
+ axis2_env_t *env = NULL;
+ axis2_om_document_t *om_doc = NULL;
+ axis2_xml_schema_collection_t *sch_collection = NULL;
+ axis2_xml_schema_t *schema = NULL;
+ axis2_qname_t *qn = NULL;
+ void *ele = NULL;
+ void *sch_type = NULL;
+ void *particle = NULL;
+ void *any_attr = NULL;
+
+ axis2_char_t *filename = "./..//test-resources/anyAttTest.xsd";
+
+ env = axis2_env_create_all("test.log", 1);
+
+ om_doc = get_root_element_from_filename(env, filename);
+
+ sch_collection = axis2_xml_schema_collection_create(env);
+
+ schema = AXIS2_XML_SCHEMA_COLLECTION_READ_DOCUMENT(
+ sch_collection, env, om_doc);
+
+ qn = axis2_qname_create(env, "AnyAttContainer",
+ "http://unqualified-elements.example.com", NULL);
+
+ ele = AXIS2_XML_SCHEMA_GET_ELEMENT_BY_QNAME(schema, env, qn);
+
+ CuAssertPtrNotNull(tc, ele);
+
+ sch_type = AXIS2_XML_SCHEMA_ELEMENT_GET_SCHEMA_TYPE(ele, env);
+
+ CuAssertPtrNotNull(tc, sch_type);
+
+ particle = AXIS2_XML_SCHEMA_COMPLEX_TYPE_GET_PARTICLE(sch_type, env);
+
+ CuAssertPtrNotNull(tc, particle);
+
+ any_attr = AXIS2_XML_SCHEMA_COMPLEX_TYPE_GET_ANY_ATTRIBUTE(sch_type, env);
+
+ CuAssertPtrNotNull(tc, any_attr);
+}
+
+void test_block_content(CuTest *tc)
+{
+ axis2_env_t *env = NULL;
+ axis2_om_document_t *om_doc = NULL;
+ axis2_xml_schema_collection_t *sch_collection = NULL;
+ axis2_xml_schema_t *schema = NULL;
+ axis2_qname_t *qn = NULL;
+ void *ele = NULL;
+ void *block = NULL;
+ void *value = NULL;
+
+ axis2_char_t *filename = "./..//test-resources/block.xsd";
+
+ env = axis2_env_create_all("test.log", 1);
+
+ om_doc = get_root_element_from_filename(env, filename);
+
+ sch_collection = axis2_xml_schema_collection_create(env);
+
+ schema = AXIS2_XML_SCHEMA_COLLECTION_READ_DOCUMENT(
+ sch_collection, env, om_doc);
+
+ qn = axis2_qname_create(env, "complexElt",
+ "http://soapinterop.org/xsd", NULL);
+
+ ele = AXIS2_XML_SCHEMA_GET_ELEMENT_BY_QNAME(schema, env, qn);
+
+ CuAssertPtrNotNull(tc, ele);
+
+ block = AXIS2_XML_SCHEMA_ELEMENT_GET_BLOCK(ele, env);
+
+ CuAssertPtrNotNull(tc, block);
+
+ value = AXIS2_XML_SCHEMA_ENUM_GET_VALUE(block, env);
+
+ CuAssertPtrNotNull(tc, value);
+}
+
+
void test_circular_schema(CuTest *tc){}
void test_schema_import1(CuTest *tc){}
void test_schema_import2(CuTest *tc){}
-void test_mixed_content(CuTest *tc){}
+void test_mixed_content(CuTest *tc)
+{
+ axis2_env_t *env = NULL;
+ axis2_om_document_t *om_doc = NULL;
+ axis2_xml_schema_collection_t *sch_collection = NULL;
+ axis2_xml_schema_t *schema = NULL;
+ axis2_qname_t *qn = NULL;
+ void *ele = NULL;
+ void *cmp_type = NULL;
+ void *seq = NULL;
+ axis2_xml_schema_obj_collection_t *items = NULL;
+ void *sub_element = NULL;
+ axis2_qname_t *qn1 = NULL;
+ axis2_char_t *uri = NULL;
+
+
+ axis2_char_t *filename = "./..//test-resources/elementForm.xsd";
+
+ env = axis2_env_create_all("test.log", 1);
+
+ om_doc = get_root_element_from_filename(env, filename);
+
+ sch_collection = axis2_xml_schema_collection_create(env);
+
+ schema = AXIS2_XML_SCHEMA_COLLECTION_READ_DOCUMENT(
+ sch_collection, env, om_doc);
+
+ qn = axis2_qname_create(env, "unQualifiedLocals",
+ "http://unqualified-elements.example.com", NULL);
+
+ ele = AXIS2_XML_SCHEMA_GET_ELEMENT_BY_QNAME(schema, env, qn);
+
+ CuAssertPtrNotNull(tc, ele);
+
+ cmp_type = AXIS2_XML_SCHEMA_ELEMENT_GET_SCHEMA_TYPE(ele, env);
+
+ CuAssertPtrNotNull(tc, cmp_type);
+
+ seq = AXIS2_XML_SCHEMA_COMPLEX_TYPE_GET_PARTICLE(cmp_type, env);
+
+ CuAssertPtrNotNull(tc, seq);
+
+ items = AXIS2_XML_SCHEMA_GROUP_BASE_GET_ITEMS(seq, env);
+
+ CuAssertPtrNotNull(tc, items);
+
+ sub_element = AXIS2_XML_SCHEMA_OBJ_COLLECTION_GET_ITEM(items, env, 0);
+
+ CuAssertPtrNotNull(tc, sub_element);
+
+ qn1 = AXIS2_XML_SCHEMA_ELEMENT_GET_QNAME(sub_element, env);
+
+ CuAssertPtrNotNull(tc, qn1);
+
+ uri = AXIS2_QNAME_GET_URI(qn1, env);
+
+ CuAssertPtrNotNull(tc, uri);
+
+ sub_element = NULL;
+ qn1 = NULL;
+ uri = NULL;
+
+ sub_element = AXIS2_XML_SCHEMA_OBJ_COLLECTION_GET_ITEM(items, env, 0);
+
+ CuAssertPtrNotNull(tc, sub_element);
+
+ qn1 = AXIS2_XML_SCHEMA_ELEMENT_GET_QNAME(sub_element, env);
+
+ CuAssertPtrNotNull(tc, qn1);
+
+ uri = AXIS2_QNAME_GET_URI(qn1, env);
+
+ CuAssertPtrNotNull(tc, uri);
+
+}
void test_local_elements(CuTest *tc){}
void test_element_refs(CuTest *tc){}
void test_forward_refs(CuTest *tc){}
void test_local_unnamed_simple_type(CuTest *tc){}
void test_simple_restriction(CuTest *tc){}
void test_unqualified_schemas(CuTest *tc){}
-void test_two_schmes(CuTest *tc){}
+
+void test_two_schmes(CuTest *tc)
+{
+
+}
static axis2_om_document_t*
get_root_element_from_filename(const axis2_env_t *env,
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org