Merge pull request #93 from eadrkir/master

Added xml test

conformance_test/xml_tests/negative_test/UsefulTtcn3Types.txt

@@ -33,9 +33,9 @@ module UsefulTtcn3Types {
 
     type integer unsignedlong (0 .. 4294967295) with { variant "/*unsigned 32 bit*/" };
 
-    type integer longlong /* (  -9223372036854775808 .. 9223372036854775807 ) */ with { variant "/*64 bit*/" };
+    type integer longlong (  -9223372036854775808 .. 9223372036854775807 )  with { variant "/*64 bit*/" };
 
-    type integer unsignedlonglong /* ( 0 .. 18446744073709551615 ) */ with { variant "/*unsigned 64 bit*/" };
+    type integer unsignedlonglong ( 0 .. 18446744073709551615 ) with { variant "/*unsigned 64 bit*/" };
 
     type float IEEE754float with { variant "/*IEEE754 float*/" };
 

conformance_test/xml_tests/positive_tests/ATS/07_mapping_xsd_components/0706_complextype_components/070608_mixed_content/Pos_070608_mixed_content_002/Pos_070608_mixed_content_002.ttcn

@@ -60,7 +60,7 @@ module Pos_070608_mixed_content_002 {
     testcase TC_Pos_070608_mixed_content_002() runs on C system C {
         var Raw v_rcv;
 
-        var Raw  v_Raw:= "<ns205:MyType xmlns:ns205='schema:Pos_070608_mixed_content_002'>The ordered <a>car</a> has arrived <b>false</b> the ordered <a>bycicle</a> has arrived! <b>true</b>Wait for further information.</ns205:MyType>\n";
+        var Raw  v_Raw:= "<ns205:MyType xmlns:ns205='schema:Pos_070608_mixed_content_002'>The ordered <a>car</a> has arrived <b>false</b>, the ordered <a>bicycle</a> has arrived! <b>true</b>Wait for further information.</ns205:MyType>\n";
 
         connect(self:p, self:p1);
 

conformance_test/xml_tests/positive_tests/XML_tests.cfg

@@ -203,6 +203,7 @@ Pos_070607_attribute_definitions_attribute_and_attributegroup_references_001.con
 Pos_070607_attribute_definitions_attribute_and_attributegroup_references_002.control
 Pos_070607_attribute_definitions_attribute_and_attributegroup_references_003.control
 Pos_070608_mixed_content_001.control
+Pos_070608_mixed_content_002.control
 Pos_070608_mixed_content_003.control
 Pos_070608_mixed_content_005.control
 Pos_070701_the_any_element_001.control

conformance_test/xml_tests/positive_tests/XML_tests.tpd

@@ -411,7 +411,7 @@
     <FolderResource projectRelativePath="ATS/07_mapping_xsd_components/0706_complextype_components/070606_sequence_content/07060605_sequence_with_nested_any_content/Pos_07060605_sequence_with_nested_any_content_001" relativeURI="ATS/07_mapping_xsd_components/0706_complextype_components/070606_sequence_content/07060605_sequence_with_nested_any_content/Pos_07060605_sequence_with_nested_any_content_001"/>
     <FolderResource projectRelativePath="ATS/07_mapping_xsd_components/0706_complextype_components/070606_sequence_content/07060606_effect_of_minoccurs_and_maxoccurs" relativeURI="ATS/07_mapping_xsd_components/0706_complextype_components/070606_sequence_content/07060606_effect_of_minoccurs_and_maxoccurs"/>
     <FolderResource projectRelativePath="ATS/07_mapping_xsd_components/0706_complextype_components/070606_sequence_content/07060606_effect_of_minoccurs_and_maxoccurs/Pos_07060606_effect_of_minoccurs_and_maxoccurs_001" relativeURI="ATS/07_mapping_xsd_components/0706_complextype_components/070606_sequence_content/07060606_effect_of_minoccurs_and_maxoccurs/Pos_07060606_effect_of_minoccurs_and_maxoccurs_001"/>
-<!--    <FolderResource projectRelativePath="ATS/07_mapping_xsd_components/0706_complextype_components/070606_sequence_content/07060606_effect_of_minoccurs_and_maxoccurs/Pos_07060606_effect_of_minoccurs_and_maxoccurs_002" relativeURI="ATS/07_mapping_xsd_components/0706_complextype_components/070606_sequence_content/07060606_effect_of_minoccurs_and_maxoccurs/Pos_07060606_effect_of_minoccurs_and_maxoccurs_002"/>-->
+    <FolderResource projectRelativePath="ATS/07_mapping_xsd_components/0706_complextype_components/070606_sequence_content/07060606_effect_of_minoccurs_and_maxoccurs/Pos_07060606_effect_of_minoccurs_and_maxoccurs_002" relativeURI="ATS/07_mapping_xsd_components/0706_complextype_components/070606_sequence_content/07060606_effect_of_minoccurs_and_maxoccurs/Pos_07060606_effect_of_minoccurs_and_maxoccurs_002"/>
     <FolderResource projectRelativePath="ATS/07_mapping_xsd_components/0706_complextype_components/070606_sequence_content/07060606_effect_of_minoccurs_and_maxoccurs/Pos_07060606_effect_of_minoccurs_and_maxoccurs_003" relativeURI="ATS/07_mapping_xsd_components/0706_complextype_components/070606_sequence_content/07060606_effect_of_minoccurs_and_maxoccurs/Pos_07060606_effect_of_minoccurs_and_maxoccurs_003"/>
     <FolderResource projectRelativePath="ATS/07_mapping_xsd_components/0706_complextype_components/070606_sequence_content/07060606_effect_of_minoccurs_and_maxoccurs/Pos_07060606_effect_of_minoccurs_and_maxoccurs_004" relativeURI="ATS/07_mapping_xsd_components/0706_complextype_components/070606_sequence_content/07060606_effect_of_minoccurs_and_maxoccurs/Pos_07060606_effect_of_minoccurs_and_maxoccurs_004"/>
     <FolderResource projectRelativePath="ATS/07_mapping_xsd_components/0706_complextype_components/070606_sequence_content/07060606_minmaxoccurs" relativeURI="ATS/07_mapping_xsd_components/0706_complextype_components/070606_sequence_content/07060606_minmaxoccurs"/>
@@ -1058,8 +1058,8 @@
 	<FileResource projectRelativePath="ATS/xsd_converted/schema_Pos_070607_attribute_definitions_attribute_and_attributegroup_references_003.ttcn" relativeURI="ATS/xsd_converted/schema_Pos_070607_attribute_definitions_attribute_and_attributegroup_references_003.ttcn"/>
 	<FileResource projectRelativePath="ATS/07_mapping_xsd_components/0706_complextype_components/070608_mixed_content/Pos_070608_mixed_content_001/Pos_070608_mixed_content_001.ttcn" relativeURI="ATS/07_mapping_xsd_components/0706_complextype_components/070608_mixed_content/Pos_070608_mixed_content_001/Pos_070608_mixed_content_001.ttcn"/>
 	<FileResource projectRelativePath="ATS/xsd_converted/schema_Pos_070608_mixed_content_001.ttcn" relativeURI="ATS/xsd_converted/schema_Pos_070608_mixed_content_001.ttcn"/>
-<!--	<FileResource projectRelativePath="ATS/07_mapping_xsd_components/0706_complextype_components/070608_mixed_content/Pos_070608_mixed_content_002/Pos_070608_mixed_content_002.ttcn" relativeURI="ATS/07_mapping_xsd_components/0706_complextype_components/070608_mixed_content/Pos_070608_mixed_content_002/Pos_070608_mixed_content_002.ttcn"/>
-	<FileResource projectRelativePath="ATS/xsd_converted/schema_Pos_070608_mixed_content_002.ttcn" relativeURI="ATS/xsd_converted/schema_Pos_070608_mixed_content_002.ttcn"/>-->
+	<FileResource projectRelativePath="ATS/07_mapping_xsd_components/0706_complextype_components/070608_mixed_content/Pos_070608_mixed_content_002/Pos_070608_mixed_content_002.ttcn" relativeURI="ATS/07_mapping_xsd_components/0706_complextype_components/070608_mixed_content/Pos_070608_mixed_content_002/Pos_070608_mixed_content_002.ttcn"/>
+	<FileResource projectRelativePath="ATS/xsd_converted/schema_Pos_070608_mixed_content_002.ttcn" relativeURI="ATS/xsd_converted/schema_Pos_070608_mixed_content_002.ttcn"/>
 	<FileResource projectRelativePath="ATS/07_mapping_xsd_components/0706_complextype_components/070608_mixed_content/Pos_070608_mixed_content_003/Pos_070608_mixed_content_003.ttcn" relativeURI="ATS/07_mapping_xsd_components/0706_complextype_components/070608_mixed_content/Pos_070608_mixed_content_003/Pos_070608_mixed_content_003.ttcn"/>
 	<FileResource projectRelativePath="ATS/xsd_converted/schema_Pos_070608_mixed_content_003.ttcn" relativeURI="ATS/xsd_converted/schema_Pos_070608_mixed_content_003.ttcn"/>
 	<FileResource projectRelativePath="ATS/07_mapping_xsd_components/0706_complextype_components/070608_mixed_content/Pos_070608_mixed_content_004/Pos_070608_mixed_content_004.ttcn" relativeURI="ATS/07_mapping_xsd_components/0706_complextype_components/070608_mixed_content/Pos_070608_mixed_content_004/Pos_070608_mixed_content_004.ttcn"/>