Fix circular dependency introduced by tests for AXISC-1627
The tests for AXISC-1627 created a circular link dependency between
axiom and guththila. Since the tests provided with the fix relied on
axiom calls, it made sense to move the tests to the axiom subproject.
This has the benefit of testing other parsers for this issue, instead of only
guththila.
diff --git a/axiom/test/om/test_om.cc b/axiom/test/om/test_om.cc
index 5bcbde3..33c65b6 100644
--- a/axiom/test/om/test_om.cc
+++ b/axiom/test/om/test_om.cc
@@ -402,3 +402,31 @@
return;
}
+
+/* AXIS2C-1627 */
+TEST_F(TestOM, test_attr_special_chars)
+{
+ axiom_namespace_t * ns = axiom_namespace_create(m_environment, "namespace", "ns");
+
+ char * attribute;
+ axiom_node_t * node;
+ axiom_node_t * deserialized_node;
+ axiom_element_t * element = axiom_element_create(m_environment, NULL, "el", ns, &node);
+
+ axiom_element_set_text(element, m_environment, "T1 & T2", node);
+ axiom_element_add_attribute(element, m_environment, axiom_attribute_create(m_environment, "name", "A1 & A2", NULL), node);
+
+ axis2_char_t * xml = axiom_node_to_string(node, m_environment);
+
+ ASSERT_STREQ(xml, "<ns:el xmlns:ns=\"namespace\" name=\"A1 & A2\">T1 & T2</ns:el>");
+
+ deserialized_node = axiom_node_create_from_buffer(m_environment, xml);
+
+ axiom_element_t * deserialized_element = (axiom_element_t*)axiom_node_get_data_element(deserialized_node, m_environment);
+
+ attribute = axiom_element_get_attribute_value_by_name(deserialized_element, m_environment,"name");
+ char * text = axiom_element_get_text(deserialized_element, m_environment, deserialized_node);
+
+ ASSERT_STREQ(attribute, "A1 & A2");
+ ASSERT_STREQ(text, "T1 & T2");
+}
diff --git a/guththila/tests/Makefile.am b/guththila/tests/Makefile.am
index 857d5b8..366bc48 100644
--- a/guththila/tests/Makefile.am
+++ b/guththila/tests/Makefile.am
@@ -34,6 +34,5 @@
test_attribute_LDADD = \
$(top_builddir)/src/libguththila.la \
../../util/src/libaxutil.la \
- ../../axiom/src/om/libaxis2_axiom.la \
$(top_builddir)/$(GTEST)/libgtest.a \
$(top_builddir)/$(GTEST)/libgtest_main.a
diff --git a/guththila/tests/test_attribute.cc b/guththila/tests/test_attribute.cc
index 0610d47..7b6147c 100644
--- a/guththila/tests/test_attribute.cc
+++ b/guththila/tests/test_attribute.cc
@@ -137,32 +137,3 @@
m_parser = nullptr;
}
-
-/* AXIS2C-1627 */
-TEST_F(TestAttribute, test_special_chars)
-{
- axiom_namespace_t * ns = axiom_namespace_create(m_env, "namespace", "ns");
-
- char * attribute;
- axiom_node_t * node;
- axiom_node_t * deserialized_node;
- axiom_element_t * element = axiom_element_create(m_env, NULL, "el", ns, &node);
-
- axiom_element_set_text(element, m_env, "T1 & T2", node);
- axiom_element_add_attribute(element, m_env, axiom_attribute_create(m_env, "name", "A1 & A2", NULL), node);
-
- axis2_char_t * xml = axiom_node_to_string(node, m_env);
-
- ASSERT_STREQ(xml, "<ns:el xmlns:ns=\"namespace\" name=\"A1 & A2\">T1 & T2</ns:el>");
-
- deserialized_node = axiom_node_create_from_buffer(m_env, xml);
-
- axiom_element_t * deserialized_element = (axiom_element_t*)axiom_node_get_data_element(deserialized_node, m_env);
-
- attribute = axiom_element_get_attribute_value_by_name(deserialized_element, m_env,"name");
- char * text = axiom_element_get_text(deserialized_element, m_env, deserialized_node);
-
- ASSERT_STREQ(attribute, "A1 & A2");
- ASSERT_STREQ(text, "T1 & T2");
-
-}
