From 6d5871314e143fb886aa2fcc934dd768e96c54ca Mon Sep 17 00:00:00 2001
From: BenceJanosSzabo <bence.janos.szabo@ericsson.com>
Date: Wed, 14 Dec 2016 10:37:04 +0100
Subject: [PATCH] Xmlworkfloat testcase unification finieshed (artf677608)
Change-Id: I25d3fbf7483661e50150b1f5c5177817ba24e9d3
Signed-off-by: BenceJanosSzabo <bence.janos.szabo@ericsson.com>
---
.../ETSI_CR5852_union_e.ttcn | 4 +-
.../XmlTest_expectedTtcns/MyTypes_e.ttcn | 4 +-
.../NoTargetNamespace2_e.ttcn | 2 +-
.../NoTargetNamespace_CCAPI_e.ttcn | 4 +-
.../NoTargetNamespace_JMdict_e.ttcn | 4 +-
.../NoTargetNamespace_PAP_e.ttcn | 4 +-
.../NoTargetNamespace_RLP_e.ttcn | 4 +-
.../NoTargetNamespace_XML_RPC_e.ttcn | 4 +-
.../NoTargetNamespace_e.ttcn | 4 +-
.../XmlTest_imsike_e.ttcn | 4 +-
.../attribute_in_extension_e.ttcn | 4 +-
.../http_example_org_ttcn_wildcards_e.ttcn | 6 +-
.../http_www_XmlTest_org_po_e.ttcn | 4 +-
...http_www_example_org_2001_XMLSchema_e.ttcn | 4 +-
...le_org_complex_restriction_with_use_e.ttcn | 4 +-
...p_www_example_org_list_minmaxoccurs_e.ttcn | 16 +-
.../http_www_example_org_name_conv2_e.ttcn | 4 +-
.../http_www_example_org_name_conv3_e.ttcn | 4 +-
..._org_nillable_in_nillable_extension_e.ttcn | 4 +-
...http_www_example_org_seq_embeds_seq_e.ttcn | 6 +-
...http_www_example_org_ttcn_wildcards_e.ttcn | 4 +-
.../http_www_example_org_wildcards_e.ttcn | 4 +-
.../ietf_params_xml_ns_pidf_e.ttcn | 4 +-
.../ietf_params_xml_ns_pidf_status_e.ttcn | 4 +-
.../ietf_params_xml_ns_resource_lists_e.ttcn | 4 +-
.../ietf_params_xml_ns_rlmi_e.ttcn | 4 +-
.../imported_module_1_e.ttcn | 4 +-
.../imported_module_e.ttcn | 4 +-
.../module_typename_conversion_e.ttcn | 4 +-
.../name_conversion_extension_attrib_e.ttcn | 4 +-
.../nillable_annotations_e.ttcn | 4 +-
.../schemas_ericsson_com_cai3g1_1_e.ttcn | 4 +-
.../schemas_ericsson_com_cai3g1_2_e.ttcn | 4 +-
.../schemas_ericsson_com_ma_HSS_e.ttcn | 4 +-
...icsson_com_upg_bulkprovisioning_1_0_e.ttcn | 4 +-
...emas_ericsson_com_upg_dm_hss_sh_4_1_e.ttcn | 4 +-
...s_ericsson_com_upg_provisioning_1_0_e.ttcn | 4 +-
.../tail_f_com_ns_confd_1_0_e.ttcn | 4 +-
...tsi_org_ngn_params_xml_simservs_sci_e.ttcn | 4 +-
..._ietf_params_xml_ns_conference_info_e.ttcn | 4 +-
.../www_XmlTest_org_annotation2_e.ttcn | 82 ++++
.../www_XmlTest_org_annotation_c_e.ttcn | 4 +-
.../www_XmlTest_org_annotation_e.ttcn | 2 +-
.../www_XmlTest_org_annotation_e_e.ttcn | 4 +-
.../www_XmlTest_org_annotation_t_e.ttcn | 7 +-
.../www_XmlTest_org_boolean_e.ttcn | 4 +-
.../www_XmlTest_org_complex1_e.ttcn | 6 +-
.../www_XmlTest_org_complex2_e.ttcn | 6 +-
.../www_XmlTest_org_complex_all_e.ttcn | 4 +-
.../www_XmlTest_org_complex_any_e.ttcn | 4 +-
.../www_XmlTest_org_complex_choice_e.ttcn | 4 +-
.../www_XmlTest_org_complex_e.ttcn | 4 +-
.../www_XmlTest_org_complex_extension_e.ttcn | 4 +-
.../www_XmlTest_org_complex_import_AB_e.ttcn | 12 +-
.../www_XmlTest_org_complex_import_A_e.ttcn | 4 +-
.../www_XmlTest_org_complex_import_B_e.ttcn | 4 +-
.../www_XmlTest_org_complex_import_e.ttcn | 6 +-
.../www_XmlTest_org_complex_include1_e.ttcn | 3 +-
.../www_XmlTest_org_complex_include2_e.ttcn | 6 +-
.../www_XmlTest_org_complex_include_e.ttcn | 4 +-
...Test_org_complex_minOccursMaxOccurs_e.ttcn | 4 +-
.../www_XmlTest_org_complex_mixed_e.ttcn | 4 +-
...www_XmlTest_org_complex_restriction_e.ttcn | 4 +-
...w_XmlTest_org_complex_simpleContent_e.ttcn | 6 +-
.../www_XmlTest_org_complex_unique_e.ttcn | 6 +-
.../www_XmlTest_org_decimal_e.ttcn | 4 +-
.../www_XmlTest_org_decimal_withEnum_e.ttcn | 4 +-
.../www_XmlTest_org_decimal_withLength_e.ttcn | 4 +-
...est_org_decimal_withMinMaxExclusive_e.ttcn | 4 +-
...est_org_decimal_withMinMaxInclusive_e.ttcn | 4 +-
.../www_XmlTest_org_element_anyType_e.ttcn | 4 +-
...XmlTest_org_element_nameInheritance_e.ttcn | 4 +-
...lTest_org_element_recordOfElements3_e.ttcn | 6 +-
...lTest_org_element_recordOfElements4_e.ttcn | 4 +-
...lTest_org_element_recordOfElements5_e.ttcn | 6 +-
...mlTest_org_element_recordOfElements_e.ttcn | 6 +-
.../www_XmlTest_org_empty_e.ttcn | 4 +-
.../www_XmlTest_org_integer_MaxExcl_e.ttcn | 4 +-
.../www_XmlTest_org_integer_MaxIncl_e.ttcn | 4 +-
.../www_XmlTest_org_integer_MinExcl_e.ttcn | 4 +-
.../www_XmlTest_org_integer_MinIncl_e.ttcn | 4 +-
.../www_XmlTest_org_integer_e.ttcn | 4 +-
.../www_XmlTest_org_integer_withEnum_e.ttcn | 4 +-
...www_XmlTest_org_integer_withMaxExcl_e.ttcn | 4 +-
...www_XmlTest_org_integer_withMaxIncl_e.ttcn | 4 +-
...www_XmlTest_org_integer_withMinExcl_e.ttcn | 4 +-
...www_XmlTest_org_integer_withMinIncl_e.ttcn | 4 +-
.../www_XmlTest_org_list_e.ttcn | 4 +-
.../www_XmlTest_org_list_integer_e.ttcn | 4 +-
.../www_XmlTest_org_simple_enum_e.ttcn | 4 +-
.../www_XmlTest_org_string_e.ttcn | 6 +-
..._XmlTest_org_string_withEmptyLength_e.ttcn | 2 +-
...www_XmlTest_org_string_withEmptyMax_e.ttcn | 2 +-
...www_XmlTest_org_string_withEmptyMin_e.ttcn | 2 +-
.../www_XmlTest_org_string_withEnum_e.ttcn | 4 +-
...XmlTest_org_string_withFaultyMinMax_e.ttcn | 2 +-
..._XmlTest_org_string_withFixedLength_e.ttcn | 2 +-
..._XmlTest_org_string_withFloatLength_e.ttcn | 2 +-
...ww_XmlTest_org_string_withMinLength_e.ttcn | 4 +-
...lTest_org_string_withNegativeLength_e.ttcn | 2 +-
..._XmlTest_org_string_withNegativeMin_e.ttcn | 2 +-
...lTest_org_string_withOverDefinition_e.ttcn | 2 +-
...ww_XmlTest_org_string_withPosLength_e.ttcn | 4 +-
.../www_XmlTest_org_string_withPosMax_e.ttcn | 4 +-
..._XmlTest_org_string_withTypeAndBase_e.ttcn | 2 +-
...w_XmlTest_org_string_withWhitespace_e.ttcn | 4 +-
.../www_XmlTest_org_time_e.ttcn | 4 +-
.../www_XmlTest_org_time_withEnum_e.ttcn | 4 +-
.../www_XmlTest_org_union_e.ttcn | 4 +-
...sapi_org_schema_parlayx_common_v2_0_e.ttcn | 4 +-
..._payment_amount_charging_v2_0_local_e.ttcn | 4 +-
..._reserve_amount_charging_v2_0_local_e.ttcn | 4 +-
..._reserve_volume_charging_v2_0_local_e.ttcn | 4 +-
...api_org_schema_parlayx_payment_v2_0_e.ttcn | 4 +-
..._payment_volume_charging_v2_0_local_e.ttcn | 4 +-
...egratedSite_R4L06_R4AB_1_02_HK84933_e.ttcn | 4 +-
...isco_IntegratedSite_R4L06_R4AB_1_02_e.ttcn | 4 +-
...com_is_isco_IsTypes_R4L06_R4AB_1_02_e.ttcn | 4 +-
...on_com_is_isco_IsTypes_R4L06_R4AF11_e.ttcn | 4 +-
..._is_isco_MainSwitch_R4L06_R4AB_1_02_e.ttcn | 4 +-
.../www_ericsson_com_is_isco_Mgw_R9B27_e.ttcn | 4 +-
...on_com_is_isco_Misc_R4L06_R4AB_1_02_e.ttcn | 4 +-
...ricsson_com_is_isco_Tgc_R6A48_R6H01_e.ttcn | 4 +-
.../www_example_org_all_e.ttcn | 4 +-
.../www_example_org_anyattr_in_complex_e.ttcn | 6 +-
.../www_example_org_anyattrib_single_e.ttcn | 4 +-
.../www_example_org_attr_ext_rest_e.ttcn | 4 +-
.../www_example_org_attrib_enum_e.ttcn | 6 +-
.../www_example_org_attrib_order_a_e.ttcn | 4 +-
.../www_example_org_attrib_order_b_e.ttcn | 4 +-
...www_example_org_attribgroup_ingroup_e.ttcn | 6 +-
...e_org_attribute_enumeration_variant_e.ttcn | 4 +-
.../www_example_org_attributegroup_e.ttcn | 6 +-
...ample_org_boolean_variant_commented_e.ttcn | 4 +-
.../www_example_org_comment_placement_e.ttcn | 4 +-
.../www_example_org_complex_nillable_e.ttcn | 4 +-
..._example_org_decimal_fractiondigits_e.ttcn | 4 +-
..._dont_generate_element_substitution_e.ttcn | 6 +-
.../www_example_org_e.ttcn | 4 +-
.../www_example_org_elements_e.ttcn | 4 +-
.../www_example_org_enum_field_names_e.ttcn | 4 +-
..._example_org_enumeration_remove_dup_e.ttcn | 4 +-
...xample_org_enumeration_restriction3_e.ttcn | 12 +-
...example_org_enumeration_restriction_e.ttcn | 4 +-
.../www_example_org_fixed_value_e.ttcn | 4 +-
...e_org_generate_element_substitution_e.ttcn | 6 +-
.../www_example_org_id_attrib_e.ttcn | 4 +-
.../www_example_org_import_prefix_e.ttcn | 4 +-
.../www_example_org_imported2_e.ttcn | 4 +-
.../www_example_org_including_module_e.ttcn | 6 +-
.../www_example_org_list_complextype_e.ttcn | 14 +-
.../www_example_org_list_simpletype_e.ttcn | 4 +-
.../www_example_org_long_extension_e.ttcn | 4 +-
.../www_example_org_name_conv_http_e.ttcn | 4 +-
.../www_example_org_namespaceas_e.ttcn | 4 +-
.../www_example_org_nillable_fixed_e.ttcn | 4 +-
.../www_example_org_no_ns_connector_e.ttcn | 6 +-
...rg_not_a_number_minex_inf_maxex_inf_e.ttcn | 4 +-
...ample_org_only_element_substitution_e.ttcn | 6 +-
.../www_example_org_pref1_e.ttcn | 19 +-
.../www_example_org_pref2_e.ttcn | 17 +-
.../www_example_org_pref3_e.ttcn | 17 +-
...xample_org_qualified_element_attrib_e.ttcn | 4 +-
.../www_example_org_self_recursion_e.ttcn | 4 +-
...ple_org_seq_enumeration_restriction_e.ttcn | 4 +-
...www_example_org_seq_group_reference_e.ttcn | 4 +-
.../www_example_org_simpletype_base_e.ttcn | 4 +-
.../www_example_org_simpletype_ref_e.ttcn | 4 +-
...xample_org_simpletype_restrict_comp_e.ttcn | 4 +-
..._substitutiongroup_abstract_block_1_e.ttcn | 6 +-
..._substitutiongroup_abstract_block_2_e.ttcn | 6 +-
...tutiongroup_complex_without_element_e.ttcn | 6 +-
...substitutiongroup_complextype_block_e.ttcn | 6 +-
.../www_example_org_substitutiongroup_e.ttcn | 6 +-
...rg_substitutiongroup_long_extension_e.ttcn | 6 +-
..._example_org_substitutiongroup_main_e.ttcn | 6 +-
...ample_org_substitutiongroup_name_as_e.ttcn | 6 +-
...w_example_org_substitutiongroup_ref_e.ttcn | 6 +-
...xample_org_substitutiongroup_rename_e.ttcn | 6 +-
...le_org_type_attributegroup_nillable_e.ttcn | 4 +-
..._example_org_type_conversion_follow_e.ttcn | 4 +-
...xample_org_type_subs_with_elem_subs_e.ttcn | 6 +-
...rg_type_substitution_abstract_block_e.ttcn | 6 +-
...e_org_type_substitution_builtintype_e.ttcn | 6 +-
...example_org_type_substitution_chain_e.ttcn | 6 +-
...g_type_substitution_complex_cascade_e.ttcn | 6 +-
.../www_example_org_type_substitution_e.ttcn | 6 +-
...g_type_substitution_elem_in_ct_mod1_e.ttcn | 6 +-
...g_type_substitution_elem_in_ct_mod2_e.ttcn | 6 +-
..._example_org_type_substitution_mod1_e.ttcn | 6 +-
..._example_org_type_substitution_mod2_e.ttcn | 6 +-
...xample_org_type_substitution_rename_e.ttcn | 6 +-
...rg_type_substitution_simple_cascade_e.ttcn | 6 +-
...le_org_type_substitution_simpletype_e.ttcn | 6 +-
...mple_org_unqualified_element_attrib_e.ttcn | 4 +-
.../www_example_org_xml_in_annotation_e.ttcn | 6 +-
.../www_w3_org_XML_1998_namespace_PIDF_e.ttcn | 4 +-
.../www_w3_org_XML_1998_namespace_e.ttcn | 4 +-
.../XML/XmlWorkflow/src/external.cc | 34 ++
.../XML/XmlWorkflow/src/xmlTest.prj | 2 +
.../src/xmlTest_Functions_complex.ttcn | 18 +-
.../src/xmlTest_Functions_complex1.ttcn | 2 +-
.../src/xmlTest_Functions_complex2.ttcn | 2 +-
.../src/xmlTest_Functions_element.ttcn | 14 +-
.../src/xmlTest_Functions_list.ttcn | 2 +-
.../src/xmlTest_Functions_string.ttcn | 6 +-
.../XML/XmlWorkflow/src/xmlTest_Shell.ttcn | 85 ++---
.../XmlWorkflow/src/xmlTest_Testcases.ttcn | 359 ++++++++----------
xsdconvert/ComplexType.cc | 8 +-
209 files changed, 818 insertions(+), 731 deletions(-)
create mode 100644 regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_annotation2_e.ttcn
create mode 100644 regression_test/XML/XmlWorkflow/src/external.cc
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/ETSI_CR5852_union_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/ETSI_CR5852_union_e.ttcn
index ce1febb30..e2cb4ce09 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/ETSI_CR5852_union_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/ETSI_CR5852_union_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: ETSI_CR5852_union_e.ttcn
+// File: ETSI_CR5852_union.ttcn
// Description:
// References:
// Rev:
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module ETSI_CR5852_union_e {
+module ETSI_CR5852_union {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/MyTypes_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/MyTypes_e.ttcn
index d08adc419..650aaf3a4 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/MyTypes_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/MyTypes_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: MyTypes_e.ttcn
+// File: MyTypes.ttcn
// Description:
// References:
// Rev:
@@ -26,7 +26,7 @@
// Generated from file(s):
// - module_typename_conversion_1.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "MyTypes_e" */
+// /* targetnamespace = "MyTypes" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/NoTargetNamespace2_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/NoTargetNamespace2_e.ttcn
index 88af9fd94..28927052e 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/NoTargetNamespace2_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/NoTargetNamespace2_e.ttcn
@@ -38,7 +38,7 @@
////////////////////////////////////////////////////////////////////////////////
-module NoTargetNamespace2_e {
+module NoTargetNamespace2 {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/NoTargetNamespace_CCAPI_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/NoTargetNamespace_CCAPI_e.ttcn
index d3aeb27e8..1b7c4b5ac 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/NoTargetNamespace_CCAPI_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/NoTargetNamespace_CCAPI_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: NoTargetNamespace_CCAPI_e.ttcn
+// File: NoTargetNamespace_CCAPI.ttcn
// Description:
// References:
// Rev:
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module NoTargetNamespace_CCAPI_e {
+module NoTargetNamespace_CCAPI {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/NoTargetNamespace_JMdict_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/NoTargetNamespace_JMdict_e.ttcn
index 835585363..eda846c74 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/NoTargetNamespace_JMdict_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/NoTargetNamespace_JMdict_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: NoTargetNamespace_JMdict_e.ttcn
+// File: NoTargetNamespace_JMdict.ttcn
// Description:
// References:
// Rev:
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module NoTargetNamespace_JMdict_e {
+module NoTargetNamespace_JMdict {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/NoTargetNamespace_PAP_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/NoTargetNamespace_PAP_e.ttcn
index 95de72794..f4af98904 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/NoTargetNamespace_PAP_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/NoTargetNamespace_PAP_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: NoTargetNamespace_PAP_e.ttcn
+// File: NoTargetNamespace_PAP.ttcn
// Description:
// References:
// Rev:
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module NoTargetNamespace_PAP_e {
+module NoTargetNamespace_PAP {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/NoTargetNamespace_RLP_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/NoTargetNamespace_RLP_e.ttcn
index 4d79075f3..fc7a8aa95 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/NoTargetNamespace_RLP_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/NoTargetNamespace_RLP_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: NoTargetNamespace_RLP_e.ttcn
+// File: NoTargetNamespace_RLP.ttcn
// Description:
// References:
// Rev:
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module NoTargetNamespace_RLP_e {
+module NoTargetNamespace_RLP {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/NoTargetNamespace_XML_RPC_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/NoTargetNamespace_XML_RPC_e.ttcn
index ebd4faf3e..618e8e926 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/NoTargetNamespace_XML_RPC_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/NoTargetNamespace_XML_RPC_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: NoTargetNamespace_XML_RPC_e.ttcn
+// File: NoTargetNamespace_XML_RPC.ttcn
// Description:
// References:
// Rev:
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module NoTargetNamespace_XML_RPC_e {
+module NoTargetNamespace_XML_RPC {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/NoTargetNamespace_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/NoTargetNamespace_e.ttcn
index 9bd243677..52009326a 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/NoTargetNamespace_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/NoTargetNamespace_e.ttcn
@@ -15,7 +15,7 @@
*
******************************************************************************/
//
-// File: NoTargetNamespace_e.ttcn
+// File: NoTargetNamespace.ttcn
// Description:
// References:
// Rev:
@@ -39,7 +39,7 @@
////////////////////////////////////////////////////////////////////////////////
-module NoTargetNamespace_e {
+module NoTargetNamespace {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/XmlTest_imsike_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/XmlTest_imsike_e.ttcn
index 5cece66c5..2ebba315b 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/XmlTest_imsike_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/XmlTest_imsike_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: XmlTest_imsike_e.ttcn
+// File: XmlTest_imsike.ttcn
// Description:
// References:
// Rev:
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module XmlTest_imsike_e {
+module XmlTest_imsike {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/attribute_in_extension_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/attribute_in_extension_e.ttcn
index dd03df644..214366a4f 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/attribute_in_extension_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/attribute_in_extension_e.ttcn
@@ -15,7 +15,7 @@
*
******************************************************************************/
//
-// File: attribute_in_extension_e.ttcn
+// File: attribute_in_extension.ttcn
// Description:
// References:
// Rev:
@@ -27,7 +27,7 @@
// Generated from file(s):
// - attribute_in_extension.xsd
// /* xml version = "1.0" */
-// /* targetnamespace = "attribute_in_extension_e" */
+// /* targetnamespace = "attribute_in_extension" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_example_org_ttcn_wildcards_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_example_org_ttcn_wildcards_e.ttcn
index 41138b1ce..ed032faee 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_example_org_ttcn_wildcards_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_example_org_ttcn_wildcards_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: http_www_example_org_ttcn_wildcards_e.ttcn
+// File: http_www_example_org_ttcn_wildcards.ttcn
// Description:
// References:
// Rev:
@@ -24,9 +24,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - any_anyAttribute_e.xsd
+// - any_anyAttribute.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "http://www.example.org/ttcn/wildcards/e" */
+// /* targetnamespace = "http://www.example.org/ttcn/wildcards" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_www_XmlTest_org_po_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_www_XmlTest_org_po_e.ttcn
index 94b6f90ef..fa15d212b 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_www_XmlTest_org_po_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_www_XmlTest_org_po_e.ttcn
@@ -15,7 +15,7 @@
*
******************************************************************************/
//
-// File: http_www_XmlTest_org_po_e.ttcn
+// File: http_www_XmlTest_org_po.ttcn
// Description:
// References:
// Rev:
@@ -27,7 +27,7 @@
// Generated from file(s):
// - po.xsd
// /* xml version = "1.0" */
-// /* targetnamespace = "http://www.XmlTest.org/po/e" */
+// /* targetnamespace = "http://www.XmlTest.org/po" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_www_example_org_2001_XMLSchema_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_www_example_org_2001_XMLSchema_e.ttcn
index b0bef7f6a..d64230432 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_www_example_org_2001_XMLSchema_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_www_example_org_2001_XMLSchema_e.ttcn
@@ -9,7 +9,7 @@
* http://www.eclipse.org/legal/epl-v10.html
*******************************************************************************/
//
-// File: http_www_example_org_2001_XMLSchema_e.ttcn
+// File: http_www_example_org_2001_XMLSchema.ttcn
// Description:
// References:
// Rev:
@@ -21,7 +21,7 @@
// Generated from file(s):
// - MyXMLSchema.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "http://www.example.org/2001/XMLSchema/e" */
+// /* targetnamespace = "http://www.example.org/2001/XMLSchema" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_www_example_org_complex_restriction_with_use_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_www_example_org_complex_restriction_with_use_e.ttcn
index b4f4def9c..e81a64e40 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_www_example_org_complex_restriction_with_use_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_www_example_org_complex_restriction_with_use_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: http_www_example_org_complex_restriction_with_use_e.ttcn
+// File: http_www_example_org_complex_restriction_with_use.ttcn
// Description:
// References:
// Rev:
@@ -26,7 +26,7 @@
// Generated from file(s):
// - complex_restriction_with_use.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "http://www.example.org/complex-restriction-with-use/e" */
+// /* targetnamespace = "http://www.example.org/complex-restriction-with-use" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_www_example_org_list_minmaxoccurs_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_www_example_org_list_minmaxoccurs_e.ttcn
index 60fe6571a..93b6aa867 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_www_example_org_list_minmaxoccurs_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_www_example_org_list_minmaxoccurs_e.ttcn
@@ -1,7 +1,7 @@
-/*******************************************************************************
+/******************************************************************************
* Copyright (c) 2000-2016 Ericsson Telecom AB
*
-* XSD to TTCN-3 Translator version: CRL 113 200/6 R0A
+* XSD to TTCN-3 Translator
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -11,9 +11,9 @@
* Contributors:
* Szabo, Bence Janos
*
-*******************************************************************************/
+******************************************************************************/
//
-// File: http_www_example_org_list_minmaxoccurs_e.ttcn
+// File: http_www_example_org_list_minmaxoccurs.ttcn
// Description:
// References:
// Rev:
@@ -23,9 +23,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - listMinMaxOccurs_e.xsd
+// - listMinMaxOccurs.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "http://www.example.org/list/minmaxoccurs/e" */
+// /* targetnamespace = "http://www.example.org/list/minmaxoccurs" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
@@ -37,7 +37,7 @@
////////////////////////////////////////////////////////////////////////////////
-module http_www_example_org_list_minmaxoccurs_e {
+module http_www_example_org_list_minmaxoccurs {
import from XSD all;
@@ -298,6 +298,6 @@ with {
}
with {
encode "XML";
- variant "namespace as 'http://www.example.org/list/minmaxoccurs/e' prefix 'this'";
+ variant "namespace as 'http://www.example.org/list/minmaxoccurs' prefix 'this'";
variant "controlNamespace 'http://www.w3.org/2001/XMLSchema-instance' prefix 'xsi'";
}
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_www_example_org_name_conv2_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_www_example_org_name_conv2_e.ttcn
index 623b1cda6..25d11199b 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_www_example_org_name_conv2_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_www_example_org_name_conv2_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: http_www_example_org_name_conv2_e.ttcn
+// File: http_www_example_org_name_conv2.ttcn
// Description:
// References:
// Rev:
@@ -26,7 +26,7 @@
// Generated from file(s):
// - name_conv_non_alphanumeric.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "http://www.example.org/name_conv2;;;;;;/e" */
+// /* targetnamespace = "http://www.example.org/name_conv2;;;;;;" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_www_example_org_name_conv3_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_www_example_org_name_conv3_e.ttcn
index 4e0209dd3..f74fb2f8e 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_www_example_org_name_conv3_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_www_example_org_name_conv3_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: http_www_example_org_name_conv3_e.ttcn
+// File: http_www_example_org_name_conv3.ttcn
// Description:
// References:
// Rev:
@@ -26,7 +26,7 @@
// Generated from file(s):
// - name_conv_remove_seq_of_low_line.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "http://////////www.example.org/name_conv3////e" */
+// /* targetnamespace = "http://////////www.example.org/name_conv3///" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_www_example_org_nillable_in_nillable_extension_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_www_example_org_nillable_in_nillable_extension_e.ttcn
index 206fa813f..89f3f9195 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_www_example_org_nillable_in_nillable_extension_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_www_example_org_nillable_in_nillable_extension_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: http_www_example_org_nillable_in_nillable_extension_e.ttcn
+// File: http_www_example_org_nillable_in_nillable_extension.ttcn
// Description:
// References:
// Rev:
@@ -26,7 +26,7 @@
// Generated from file(s):
// - nillable_in_nillable_extension.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "http://www.example.org/nillable/in/nillable/extension/e" */
+// /* targetnamespace = "http://www.example.org/nillable/in/nillable/extension" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_www_example_org_seq_embeds_seq_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_www_example_org_seq_embeds_seq_e.ttcn
index c7b0ec640..1fc419ad2 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_www_example_org_seq_embeds_seq_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_www_example_org_seq_embeds_seq_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: http_www_example_org_seq_embeds_seq_e.ttcn
+// File: http_www_example_org_seq_embeds_seq.ttcn
// Description:
// References:
// Rev:
@@ -24,9 +24,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - sequence_embeds_sequence_e.xsd
+// - sequence_embeds_sequence.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "http://www.example.org/seq-embeds-seq/e" */
+// /* targetnamespace = "http://www.example.org/seq-embeds-seq" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_www_example_org_ttcn_wildcards_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_www_example_org_ttcn_wildcards_e.ttcn
index c366d5c59..1e7aa6c03 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_www_example_org_ttcn_wildcards_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_www_example_org_ttcn_wildcards_e.ttcn
@@ -15,7 +15,7 @@
*
******************************************************************************/
//
-// File: http_www_example_org_ttcn_wildcards_e.ttcn
+// File: http_www_example_org_ttcn_wildcards.ttcn
// Description:
// References:
// Rev:
@@ -27,7 +27,7 @@
// Generated from file(s):
// - any_anyAttribute.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "http://www.example.org/ttcn/wildcards/e" */
+// /* targetnamespace = "http://www.example.org/ttcn/wildcards" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_www_example_org_wildcards_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_www_example_org_wildcards_e.ttcn
index a95fa1ef3..d22d43fb6 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_www_example_org_wildcards_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_www_example_org_wildcards_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: http_www_example_org_wildcards_e.ttcn
+// File: http_www_example_org_wildcards.ttcn
// Description:
// References:
// Rev:
@@ -26,7 +26,7 @@
// Generated from file(s):
// - anyattribute_optional.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "http://www.example.org/wildcards/e" */
+// /* targetnamespace = "http://www.example.org/wildcards" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/ietf_params_xml_ns_pidf_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/ietf_params_xml_ns_pidf_e.ttcn
index 33fbf5073..26d29c5a1 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/ietf_params_xml_ns_pidf_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/ietf_params_xml_ns_pidf_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: ietf_params_xml_ns_pidf_e.ttcn
+// File: ietf_params_xml_ns_pidf.ttcn
// Description:
// References:
// Rev:
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module ietf_params_xml_ns_pidf_e {
+module ietf_params_xml_ns_pidf {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/ietf_params_xml_ns_pidf_status_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/ietf_params_xml_ns_pidf_status_e.ttcn
index 154d73615..066bc616d 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/ietf_params_xml_ns_pidf_status_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/ietf_params_xml_ns_pidf_status_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: ietf_params_xml_ns_pidf_status_e.ttcn
+// File: ietf_params_xml_ns_pidf_status.ttcn
// Description:
// References:
// Rev:
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module ietf_params_xml_ns_pidf_status_e {
+module ietf_params_xml_ns_pidf_status {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/ietf_params_xml_ns_resource_lists_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/ietf_params_xml_ns_resource_lists_e.ttcn
index 3a9dc0c7f..421fcf3b6 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/ietf_params_xml_ns_resource_lists_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/ietf_params_xml_ns_resource_lists_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: ietf_params_xml_ns_resource_lists_e.ttcn
+// File: ietf_params_xml_ns_resource_lists.ttcn
// Description:
// References:
// Rev:
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module ietf_params_xml_ns_resource_lists_e {
+module ietf_params_xml_ns_resource_lists {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/ietf_params_xml_ns_rlmi_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/ietf_params_xml_ns_rlmi_e.ttcn
index a101185f1..13d36923b 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/ietf_params_xml_ns_rlmi_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/ietf_params_xml_ns_rlmi_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: ietf_params_xml_ns_rlmi_e.ttcn
+// File: ietf_params_xml_ns_rlmi.ttcn
// Description:
// References:
// Rev:
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module ietf_params_xml_ns_rlmi_e {
+module ietf_params_xml_ns_rlmi {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/imported_module_1_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/imported_module_1_e.ttcn
index a3d77df9b..73f48148b 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/imported_module_1_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/imported_module_1_e.ttcn
@@ -24,9 +24,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - imported_module__e.xsd
+// - imported_module_.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "imported_module_1_e" */
+// /* targetnamespace = "imported_module_" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/imported_module_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/imported_module_e.ttcn
index ab35df093..ee1d25aa0 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/imported_module_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/imported_module_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: imported_module_e.ttcn
+// File: imported_module.ttcn
// Description:
// References:
// Rev:
@@ -26,7 +26,7 @@
// Generated from file(s):
// - imported_module.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "imported_module_e" */
+// /* targetnamespace = "imported_module" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/module_typename_conversion_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/module_typename_conversion_e.ttcn
index 4b0184650..bac9b5aa3 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/module_typename_conversion_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/module_typename_conversion_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: module_typename_conversion_e.ttcn
+// File: module_typename_conversion.ttcn
// Description:
// References:
// Rev:
@@ -26,7 +26,7 @@
// Generated from file(s):
// - module_typename_conversion.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "module_typename_conversion_e" */
+// /* targetnamespace = "module_typename_conversion" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/name_conversion_extension_attrib_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/name_conversion_extension_attrib_e.ttcn
index 3e5eb239b..cbfafde7c 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/name_conversion_extension_attrib_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/name_conversion_extension_attrib_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: name_conversion_extension_attrib_e.ttcn
+// File: name_conversion_extension_attrib.ttcn
// Description:
// References:
// Rev:
@@ -26,7 +26,7 @@
// Generated from file(s):
// - name_conversion_extension_attrib.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "name_conversion_extension_attrib/e" */
+// /* targetnamespace = "name_conversion_extension_attrib" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/nillable_annotations_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/nillable_annotations_e.ttcn
index 6bf359d5a..5340c0610 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/nillable_annotations_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/nillable_annotations_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: nillable_annotations_e.ttcn
+// File: nillable_annotations.ttcn
// Description:
// References:
// Rev:
@@ -26,7 +26,7 @@
// Generated from file(s):
// - nillable_annotations.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "nillable_annotations/e" */
+// /* targetnamespace = "nillable_annotations" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/schemas_ericsson_com_cai3g1_1_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/schemas_ericsson_com_cai3g1_1_e.ttcn
index fd5ac28a9..078b06b12 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/schemas_ericsson_com_cai3g1_1_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/schemas_ericsson_com_cai3g1_1_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: schemas_ericsson_com_cai3g1_1_e.ttcn
+// File: schemas_ericsson_com_cai3g1_1.ttcn
// Description:
// References:
// Rev:
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module schemas_ericsson_com_cai3g1_1_e {
+module schemas_ericsson_com_cai3g1_1 {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/schemas_ericsson_com_cai3g1_2_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/schemas_ericsson_com_cai3g1_2_e.ttcn
index 3e528ba07..2cd575be8 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/schemas_ericsson_com_cai3g1_2_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/schemas_ericsson_com_cai3g1_2_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: schemas_ericsson_com_cai3g1_2_e.ttcn
+// File: schemas_ericsson_com_cai3g1_2.ttcn
// Description:
// References:
// Rev:
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module schemas_ericsson_com_cai3g1_2_e {
+module schemas_ericsson_com_cai3g1_2 {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/schemas_ericsson_com_ma_HSS_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/schemas_ericsson_com_ma_HSS_e.ttcn
index 266647a9b..d56e5a867 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/schemas_ericsson_com_ma_HSS_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/schemas_ericsson_com_ma_HSS_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: schemas_ericsson_com_ma_HSS_e.ttcn
+// File: schemas_ericsson_com_ma_HSS.ttcn
// Description:
// References:
// Rev:
@@ -43,7 +43,7 @@
////////////////////////////////////////////////////////////////////////////////
-module schemas_ericsson_com_ma_HSS_e {
+module schemas_ericsson_com_ma_HSS {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/schemas_ericsson_com_upg_bulkprovisioning_1_0_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/schemas_ericsson_com_upg_bulkprovisioning_1_0_e.ttcn
index 10042b1ad..4215c6a1e 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/schemas_ericsson_com_upg_bulkprovisioning_1_0_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/schemas_ericsson_com_upg_bulkprovisioning_1_0_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: schemas_ericsson_com_upg_bulkprovisioning_1_0_e.ttcn
+// File: schemas_ericsson_com_upg_bulkprovisioning_1_0.ttcn
// Description:
// References:
// Rev:
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module schemas_ericsson_com_upg_bulkprovisioning_1_0_e {
+module schemas_ericsson_com_upg_bulkprovisioning_1_0 {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/schemas_ericsson_com_upg_dm_hss_sh_4_1_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/schemas_ericsson_com_upg_dm_hss_sh_4_1_e.ttcn
index 785dfa938..1707bbaa4 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/schemas_ericsson_com_upg_dm_hss_sh_4_1_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/schemas_ericsson_com_upg_dm_hss_sh_4_1_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: schemas_ericsson_com_upg_dm_hss_sh_4_1_e.ttcn
+// File: schemas_ericsson_com_upg_dm_hss_sh_4_1.ttcn
// Description:
// References:
// Rev:
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module schemas_ericsson_com_upg_dm_hss_sh_4_1_e {
+module schemas_ericsson_com_upg_dm_hss_sh_4_1 {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/schemas_ericsson_com_upg_provisioning_1_0_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/schemas_ericsson_com_upg_provisioning_1_0_e.ttcn
index e5536af43..c4c8d7782 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/schemas_ericsson_com_upg_provisioning_1_0_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/schemas_ericsson_com_upg_provisioning_1_0_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: schemas_ericsson_com_upg_provisioning_1_0_e.ttcn
+// File: schemas_ericsson_com_upg_provisioning_1_0.ttcn
// Description:
// References:
// Rev:
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module schemas_ericsson_com_upg_provisioning_1_0_e {
+module schemas_ericsson_com_upg_provisioning_1_0 {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/tail_f_com_ns_confd_1_0_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/tail_f_com_ns_confd_1_0_e.ttcn
index 9ffbc13dd..55d207b45 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/tail_f_com_ns_confd_1_0_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/tail_f_com_ns_confd_1_0_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: tail_f_com_ns_confd_1_0_e.ttcn
+// File: tail_f_com_ns_confd_1_0.ttcn
// Description:
// References:
// Rev:
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module tail_f_com_ns_confd_1_0_e {
+module tail_f_com_ns_confd_1_0 {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/uri_etsi_org_ngn_params_xml_simservs_sci_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/uri_etsi_org_ngn_params_xml_simservs_sci_e.ttcn
index b387cbf1a..7a925afa3 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/uri_etsi_org_ngn_params_xml_simservs_sci_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/uri_etsi_org_ngn_params_xml_simservs_sci_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: uri_etsi_org_ngn_params_xml_simservs_sci_e.ttcn
+// File: uri_etsi_org_ngn_params_xml_simservs_sci.ttcn
// Description:
// References:
// Rev:
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module uri_etsi_org_ngn_params_xml_simservs_sci_e {
+module uri_etsi_org_ngn_params_xml_simservs_sci {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/urn_ietf_params_xml_ns_conference_info_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/urn_ietf_params_xml_ns_conference_info_e.ttcn
index 0d3c0952d..10ed39d60 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/urn_ietf_params_xml_ns_conference_info_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/urn_ietf_params_xml_ns_conference_info_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: urn_ietf_params_xml_ns_conference_info_e.ttcn
+// File: urn_ietf_params_xml_ns_conference_info.ttcn
// Description:
// References:
// Rev:
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module urn_ietf_params_xml_ns_conference_info_e {
+module urn_ietf_params_xml_ns_conference_info {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_annotation2_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_annotation2_e.ttcn
new file mode 100644
index 000000000..ee3a6206f
--- /dev/null
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_annotation2_e.ttcn
@@ -0,0 +1,82 @@
+/******************************************************************************
+* Copyright (c) 2000-2016 Ericsson Telecom AB
+*
+* XSD to TTCN-3 Translator
+*
+* All rights reserved. This program and the accompanying materials
+* are made available under the terms of the Eclipse Public License v1.0
+* which accompanies this distribution, and is available at
+* http://www.eclipse.org/legal/epl-v10.html
+*
+* Contributors:
+* Balasko, Jeno
+* Lovassy, Arpad
+* Szabo, Bence Janos
+*
+******************************************************************************/
+//
+// File: www_XmlTest_org_annotation.ttcn
+// Description:
+// References:
+// Rev:
+// Prodnr:
+// Updated: Thu Sep 5 17:34:58 2015
+// Contact: http://ttcn.ericsson.se
+//
+////////////////////////////////////////////////////////////////////////////////
+// Generated from file(s):
+// - XmlTest_annotation.xsd
+// /* xml version = "1.0" encoding = "UTF-8" */
+// /* targetnamespace = "www.XmlTest.org/annotation" */
+// - XmlTest_annotation1.xsd
+// /* xml version = "1.0" encoding = "UTF-8" */
+// /* targetnamespace = "www.XmlTest.org/annotation" */
+////////////////////////////////////////////////////////////////////////////////
+// Modification header(s):
+//-----------------------------------------------------------------------------
+// Modified by:
+// Modification date:
+// Description:
+// Modification contact:
+//------------------------------------------------------------------------------
+////////////////////////////////////////////////////////////////////////////////
+
+
+module www_XmlTest_org_annotation2 {
+
+
+import from XSD all;
+
+
+/* This Schema defines a W3Schools note! */
+
+
+/* This comment is the documentation for MyInteger1! */
+type XSD.PositiveInteger MyInteger1
+with {
+ variant "element";
+};
+
+
+/* This comment is the documentation for MyInteger2!
+ More lines allowed? */
+/* This comment is the second documentation for MyInteger2!
+ More lines allowed? */
+/* This comment is the third documentation for MyInteger2!
+ More lines allowed! */
+type XSD.PositiveInteger MyInteger2
+with {
+ variant "element";
+};
+
+
+/* This Schema defines a W3Schools note! */
+
+
+}
+with {
+ encode "XML";
+ variant "namespace as 'www.XmlTest.org/annotation'";
+ variant "controlNamespace 'http://www.w3.org/2001/XMLSchema-instance' prefix 'xsi'";
+ variant "attributeFormQualified";
+}
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_annotation_c_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_annotation_c_e.ttcn
index ff2059854..41f3cda6e 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_annotation_c_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_annotation_c_e.ttcn
@@ -15,7 +15,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_annotation_c_e.ttcn
+// File: www_XmlTest_org_annotation.ttcn
// Description:
// References:
// Rev:
@@ -45,6 +45,8 @@ module www_XmlTest_org_annotation_c {
import from XSD all;
+
+
type XSD.PositiveInteger MyInteger1
with {
variant "element";
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_annotation_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_annotation_e.ttcn
index f1363c02c..1623092fb 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_annotation_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_annotation_e.ttcn
@@ -15,7 +15,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_annotation_e.ttcn
+// File: www_XmlTest_org_annotation.ttcn
// Description:
// References:
// Rev:
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_annotation_e_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_annotation_e_e.ttcn
index 85ac765fb..267807cf5 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_annotation_e_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_annotation_e_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_annotation_e_e.ttcn
+// File: www_XmlTest_org_annotation.ttcn
// Description:
// References:
// Rev:
@@ -37,7 +37,7 @@
//------------------------------------------------------------------------------
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_annotation_e_e {
+module www_XmlTest_org_annotation_e {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_annotation_t_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_annotation_t_e.ttcn
index 950a9ca89..9f2b4f80c 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_annotation_t_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_annotation_t_e.ttcn
@@ -15,7 +15,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_annotation_t_e.ttcn
+// File: www_XmlTest_org_annotation_t.ttcn
// Description:
// References:
// Rev:
@@ -27,7 +27,7 @@
// Generated from file(s):
// - XmlTest_annotation.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.XmlTest.org/annotation/e" */
+// /* targetnamespace = "www.XmlTest.org/annotation" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
@@ -38,7 +38,8 @@
//------------------------------------------------------------------------------
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_annotation_t_e {
+
+module www_XmlTest_org_annotation_t {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_boolean_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_boolean_e.ttcn
index d17d0d17c..f22b51333 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_boolean_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_boolean_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_boolean_e.ttcn
+// File: www_XmlTest_org_boolean.ttcn
// Description:
// References:
// Rev:
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_boolean_e {
+module www_XmlTest_org_boolean {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex1_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex1_e.ttcn
index cd5113eb1..178056bb4 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex1_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex1_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_complex1_e.ttcn
+// File: www_XmlTest_org_complex1.ttcn
// Description:
// References:
// Rev:
@@ -28,7 +28,7 @@
// Generated from file(s):
// - XmlTest_complex1.xsd
// /* xml version = "1.0" */
-// /* targetnamespace = "www.XmlTest.org/complex1/e" */
+// /* targetnamespace = "www.XmlTest.org/complex1" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_complex1_e {
+module www_XmlTest_org_complex1 {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex2_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex2_e.ttcn
index 66fe704a2..a29e03b8f 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex2_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex2_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_complex2_e.ttcn
+// File: www_XmlTest_org_complex2.ttcn
// Description:
// References:
// Rev:
@@ -28,7 +28,7 @@
// Generated from file(s):
// - XmlTest_complex2.xsd
// /* xml version = "1.0" */
-// /* targetnamespace = "www.XmlTest.org/complex2/e" */
+// /* targetnamespace = "www.XmlTest.org/complex2" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_complex2_e {
+module www_XmlTest_org_complex2 {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_all_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_all_e.ttcn
index 4aedf4561..cb78f5b7c 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_all_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_all_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_complex_all_e.ttcn
+// File: www_XmlTest_org_complex_all.ttcn
// Description:
// References:
// Rev:
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_complex_all_e {
+module www_XmlTest_org_complex_all {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_any_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_any_e.ttcn
index af39147ef..fd8187305 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_any_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_any_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_complex_any_e.ttcn
+// File: www_XmlTest_org_complex_any.ttcn
// Description:
// References:
// Rev:
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_complex_any_e {
+module www_XmlTest_org_complex_any {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_choice_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_choice_e.ttcn
index e2f150cc5..1f429bed6 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_choice_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_choice_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_complex_choice_e.ttcn
+// File: www_XmlTest_org_complex_choice.ttcn
// Description:
// References:
// Rev:
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_complex_choice_e {
+module www_XmlTest_org_complex_choice {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_e.ttcn
index bc9f2b032..8ecd50887 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_complex1_e.ttcn
+// File: www_XmlTest_org_complex1.ttcn
// Description:
// References:
// Rev:
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_complex1_e {
+module www_XmlTest_org_complex1 {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_extension_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_extension_e.ttcn
index 5a45127a9..f28c275cb 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_extension_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_extension_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_complex_extension_e.ttcn
+// File: www_XmlTest_org_complex_extension.ttcn
// Description:
// References:
// Rev:
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_complex_extension_e {
+module www_XmlTest_org_complex_extension {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_import_AB_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_import_AB_e.ttcn
index cdf0eab97..da8c7d787 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_import_AB_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_import_AB_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_complex_import_AB_e.ttcn
+// File: www_XmlTest_org_complex_import_AB.ttcn
// Description:
// References:
// Rev:
@@ -40,16 +40,16 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_complex_import_AB_e {
+module www_XmlTest_org_complex_import_AB {
import from XSD all;
-import from www_XmlTest_org_complex_import_A_e all;
+import from www_XmlTest_org_complex_import_A all;
-import from www_XmlTest_org_complex_import_B_e all;
+import from www_XmlTest_org_complex_import_B all;
/* This documentum tests based on
@@ -63,8 +63,8 @@ import from www_XmlTest_org_complex_import_B_e all;
type record PurchaseReportImport
{
- www_XmlTest_org_complex_import_A_e.MyType myTypeA,
- www_XmlTest_org_complex_import_B_e.MyType myTypeB
+ www_XmlTest_org_complex_import_A.MyType myTypeA,
+ www_XmlTest_org_complex_import_B.MyType myTypeB
}
with {
variant "name as uncapitalized";
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_import_A_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_import_A_e.ttcn
index 0838cdc92..5c30a942c 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_import_A_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_import_A_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_complex_import_A_e.ttcn
+// File: www_XmlTest_org_complex_import_A.ttcn
// Description:
// References:
// Rev:
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_complex_import_A_e {
+module www_XmlTest_org_complex_import_A {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_import_B_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_import_B_e.ttcn
index 08c83c0c4..aa6af195a 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_import_B_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_import_B_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_complex_import_B_e.ttcn
+// File: www_XmlTest_org_complex_import_B.ttcn
// Description:
// References:
// Rev:
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_complex_import_B_e {
+module www_XmlTest_org_complex_import_B {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_import_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_import_e.ttcn
index a9afeb978..a0653df22 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_import_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_import_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_complex_import_e.ttcn
+// File: www_XmlTest_org_complex_import.ttcn
// Description:
// References:
// Rev:
@@ -40,13 +40,13 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_complex_import_e {
+module www_XmlTest_org_complex_import {
import from XSD all;
-import from www_XmlTest_org_complex_include_e all;
+import from www_XmlTest_org_complex_include all;
/* This documentum tests based on
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_include1_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_include1_e.ttcn
index 1e200e483..7e091ffe4 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_include1_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_include1_e.ttcn
@@ -43,7 +43,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_complex_include1_e {
+module www_XmlTest_org_complex_include1 {
import from XSD all;
@@ -80,6 +80,7 @@ with {
5.4 Importing Types
XML Schema Part 1: Structures Second Edition
...
+ ETSI ES 201 873-9 V4.1.2
This is the included schema with proper namespace */
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_include2_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_include2_e.ttcn
index dc7a9bb7b..8c3e9b0fb 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_include2_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_include2_e.ttcn
@@ -17,7 +17,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_complex_include_e.ttcn
+// File: www_XmlTest_org_complex_include.ttcn
// Description:
// References:
// Rev:
@@ -41,7 +41,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_complex_include2_e {
+module www_XmlTest_org_complex_include2 {
import from XSD all;
@@ -96,7 +96,7 @@ with {
}
with {
encode "XML";
- variant "namespace as 'www.XmlTest.org/complex_include2' prefix 'r2'";
+ variant "namespace as 'www.XmlTest.org/complex_include' prefix 'r'";
variant "controlNamespace 'http://www.w3.org/2001/XMLSchema-instance' prefix 'xsi'";
variant "elementFormQualified";
}
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_include_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_include_e.ttcn
index 6327013c1..e8ce5464d 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_include_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_include_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_complex_include_e.ttcn
+// File: www_XmlTest_org_complex_include.ttcn
// Description:
// References:
// Rev:
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_complex_include_e {
+module www_XmlTest_org_complex_include {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_minOccursMaxOccurs_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_minOccursMaxOccurs_e.ttcn
index 1adc92d3d..8bd1dd2f6 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_minOccursMaxOccurs_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_minOccursMaxOccurs_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_complex_minOccursMaxOccurs_e.ttcn
+// File: www_XmlTest_org_complex_minOccursMaxOccurs.ttcn
// Description:
// References:
// Rev:
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_complex_minOccursMaxOccurs_e {
+module www_XmlTest_org_complex_minOccursMaxOccurs {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_mixed_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_mixed_e.ttcn
index 5f057c87b..3cd142511 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_mixed_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_mixed_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_complex_mixed_e.ttcn
+// File: www_XmlTest_org_complex_mixed.ttcn
// Description:
// References:
// Rev:
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_complex_mixed_e {
+module www_XmlTest_org_complex_mixed {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_restriction_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_restriction_e.ttcn
index 98a2698e7..c10e59975 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_restriction_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_restriction_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_complex_restriction_e.ttcn
+// File: www_XmlTest_org_complex_restriction.ttcn
// Description:
// References:
// Rev:
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_complex_restriction_e {
+module www_XmlTest_org_complex_restriction {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_simpleContent_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_simpleContent_e.ttcn
index 0ff0e0ce5..73d854753 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_simpleContent_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_simpleContent_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_complex_simpleContent_e.ttcn
+// File: www_XmlTest_org_complex_simpleContent.ttcn
// Description:
// References:
// Rev:
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_complex_simpleContent_e {
+module www_XmlTest_org_complex_simpleContent {
import from XSD all;
@@ -83,6 +83,6 @@ with {
}
with {
encode "XML";
- variant "namespace as 'www.XmlTest.org/complex_simpleContent_e' prefix 'ns35'";
+ variant "namespace as 'www.XmlTest.org/complex_simpleContent' prefix 'ns35'";
variant "controlNamespace 'http://www.w3.org/2001/XMLSchema-instance' prefix 'xsi'";
}
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_unique_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_unique_e.ttcn
index 2aa6e2771..4b3eb8c07 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_unique_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_unique_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_complex_unique_e.ttcn
+// File: www_XmlTest_org_complex_unique.ttcn
// Description:
// References:
// Rev:
@@ -24,9 +24,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - XmlTest_complex_unique_e.xsd
+// - XmlTest_complex_unique.xsd
// /* xml version = "1.0" */
-// /* targetnamespace = "www.XmlTest.org/complex_unique/e" */
+// /* targetnamespace = "www.XmlTest.org/complex_unique" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_decimal_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_decimal_e.ttcn
index 1ad43dade..9c7dd81ff 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_decimal_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_decimal_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_decimal_e.ttcn
+// File: www_XmlTest_org_decimal.ttcn
// Description:
// References:
// Rev:
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_decimal_e {
+module www_XmlTest_org_decimal {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_decimal_withEnum_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_decimal_withEnum_e.ttcn
index 21b68f961..7c849682f 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_decimal_withEnum_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_decimal_withEnum_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_decimal_withEnum_e.ttcn
+// File: www_XmlTest_org_decimal_withEnum.ttcn
// Description:
// References:
// Rev:
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_decimal_withEnum_e {
+module www_XmlTest_org_decimal_withEnum {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_decimal_withLength_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_decimal_withLength_e.ttcn
index 5ca323ec8..d04553664 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_decimal_withLength_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_decimal_withLength_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_decimal_withLength_e.ttcn
+// File: www_XmlTest_org_decimal_withLength.ttcn
// Description:
// References:
// Rev:
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_decimal_withLength_e {
+module www_XmlTest_org_decimal_withLength {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_decimal_withMinMaxExclusive_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_decimal_withMinMaxExclusive_e.ttcn
index 7a3bbc3cb..dc48329b5 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_decimal_withMinMaxExclusive_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_decimal_withMinMaxExclusive_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_decimal_withMinMaxExclusive_e.ttcn
+// File: www_XmlTest_org_decimal_withMinMaxExclusive.ttcn
// Description:
// References:
// Rev:
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_decimal_withMinMaxExclusive_e {
+module www_XmlTest_org_decimal_withMinMaxExclusive {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_decimal_withMinMaxInclusive_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_decimal_withMinMaxInclusive_e.ttcn
index 5cd648296..afe6ce0b7 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_decimal_withMinMaxInclusive_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_decimal_withMinMaxInclusive_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_decimal_withMinMaxInclusive_e.ttcn
+// File: www_XmlTest_org_decimal_withMinMaxInclusive.ttcn
// Description:
// References:
// Rev:
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_decimal_withMinMaxInclusive_e {
+module www_XmlTest_org_decimal_withMinMaxInclusive {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_element_anyType_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_element_anyType_e.ttcn
index 49ba9cfff..cde9c26d9 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_element_anyType_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_element_anyType_e.ttcn
@@ -17,7 +17,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_element_anyType_e.ttcn
+// File: www_XmlTest_org_element_anyType.ttcn
// Description:
// References:
// Rev:
@@ -41,7 +41,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_element_anyType_e {
+module www_XmlTest_org_element_anyType {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_element_nameInheritance_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_element_nameInheritance_e.ttcn
index ab427c36f..5acf43ec8 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_element_nameInheritance_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_element_nameInheritance_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_element_nameInheritance_e.ttcn
+// File: www_XmlTest_org_element_nameInheritance.ttcn
// Description:
// References:
// Rev:
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_element_nameInheritance_e {
+module www_XmlTest_org_element_nameInheritance {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_element_recordOfElements3_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_element_recordOfElements3_e.ttcn
index 2ac103af7..5b187708c 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_element_recordOfElements3_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_element_recordOfElements3_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_element_recordOfElements3_e.ttcn
+// File: www_XmlTest_org_element_recordOfElements3.ttcn
// Description:
// References:
// Rev:
@@ -26,7 +26,7 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - XmlTest_element_recordOfElements3_e.xsd
+// - XmlTest_element_recordOfElements3.xsd
// /* xml version = "1.0" */
// /* targetnamespace = "www.XmlTest.org/element_recordOfElements3" */
////////////////////////////////////////////////////////////////////////////////
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_element_recordOfElements3_e {
+module www_XmlTest_org_element_recordOfElements3 {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_element_recordOfElements4_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_element_recordOfElements4_e.ttcn
index da3091c0c..7098e0e03 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_element_recordOfElements4_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_element_recordOfElements4_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_element_recordOfElements4_e.ttcn
+// File: www_XmlTest_org_element_recordOfElements4.ttcn
// Description:
// References:
// Rev:
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_element_recordOfElements4_e {
+module www_XmlTest_org_element_recordOfElements4 {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_element_recordOfElements5_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_element_recordOfElements5_e.ttcn
index 33faaedee..0fbcc955b 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_element_recordOfElements5_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_element_recordOfElements5_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_element_recordOfElements5_e.ttcn
+// File: www_XmlTest_org_element_recordOfElements5.ttcn
// Description:
// References:
// Rev:
@@ -26,7 +26,7 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - XmlTest_element_recordOfElements5_e.xsd
+// - XmlTest_element_recordOfElements5.xsd
// /* xml version = "1.0" */
// /* targetnamespace = "www.XmlTest.org/element_recordOfElements5" */
////////////////////////////////////////////////////////////////////////////////
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_element_recordOfElements5_e {
+module www_XmlTest_org_element_recordOfElements5 {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_element_recordOfElements_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_element_recordOfElements_e.ttcn
index 928191cb5..8a08b002b 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_element_recordOfElements_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_element_recordOfElements_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_element_recordOfElements_e.ttcn
+// File: www_XmlTest_org_element_recordOfElements.ttcn
// Description:
// References:
// Rev:
@@ -26,7 +26,7 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - XmlTest_element_recordOfElements_e.xsd
+// - XmlTest_element_recordOfElements.xsd
// /* xml version = "1.0" */
// /* targetnamespace = "www.XmlTest.org/element_recordOfElements" */
////////////////////////////////////////////////////////////////////////////////
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_element_recordOfElements_e {
+module www_XmlTest_org_element_recordOfElements {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_empty_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_empty_e.ttcn
index 1d813aa25..6856270ac 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_empty_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_empty_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_empty_e.ttcn
+// File: www_XmlTest_org_empty.ttcn
// Description:
// References:
// Rev:
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_empty_e {
+module www_XmlTest_org_empty {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_integer_MaxExcl_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_integer_MaxExcl_e.ttcn
index 846d296b9..5ea386441 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_integer_MaxExcl_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_integer_MaxExcl_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_integer_withMaxExcl_e.ttcn
+// File: www_XmlTest_org_integer_withMaxExcl.ttcn
// Description:
// References:
// Rev:
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_integer_withMaxExcl_e {
+module www_XmlTest_org_integer_withMaxExcl {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_integer_MaxIncl_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_integer_MaxIncl_e.ttcn
index f583d5e93..f1a330d1c 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_integer_MaxIncl_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_integer_MaxIncl_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_integer_withMaxIncl_e.ttcn
+// File: www_XmlTest_org_integer_withMaxIncl.ttcn
// Description:
// References:
// Rev:
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_integer_withMaxIncl_e {
+module www_XmlTest_org_integer_withMaxIncl {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_integer_MinExcl_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_integer_MinExcl_e.ttcn
index aca1ddb53..d5b056f99 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_integer_MinExcl_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_integer_MinExcl_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_integer_withMinExcl_e.ttcn
+// File: www_XmlTest_org_integer_withMinExcl.ttcn
// Description:
// References:
// Rev:
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_integer_withMinExcl_e {
+module www_XmlTest_org_integer_withMinExcl {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_integer_MinIncl_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_integer_MinIncl_e.ttcn
index ecc1d345f..34c3c8571 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_integer_MinIncl_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_integer_MinIncl_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_integer_withMinIncl_e.ttcn
+// File: www_XmlTest_org_integer_withMinIncl.ttcn
// Description:
// References:
// Rev:
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_integer_withMinIncl_e {
+module www_XmlTest_org_integer_withMinIncl {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_integer_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_integer_e.ttcn
index c45481248..dee4b8f3f 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_integer_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_integer_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_integer_e.ttcn
+// File: www_XmlTest_org_integer.ttcn
// Description:
// References:
// Rev:
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_integer_e {
+module www_XmlTest_org_integer {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_integer_withEnum_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_integer_withEnum_e.ttcn
index ac0d663b5..62107ed16 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_integer_withEnum_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_integer_withEnum_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_integer_withEnum_e.ttcn
+// File: www_XmlTest_org_integer_withEnum.ttcn
// Description:
// References:
// Rev:
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_integer_withEnum_e {
+module www_XmlTest_org_integer_withEnum {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_integer_withMaxExcl_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_integer_withMaxExcl_e.ttcn
index 481955996..e96d73ce3 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_integer_withMaxExcl_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_integer_withMaxExcl_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_integer_withMaxExcl_e.ttcn
+// File: www_XmlTest_org_integer_withMaxExcl.ttcn
// Description:
// References:
// Rev:
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_integer_withMaxExcl_e {
+module www_XmlTest_org_integer_withMaxExcl {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_integer_withMaxIncl_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_integer_withMaxIncl_e.ttcn
index 829586614..cfb5b07b6 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_integer_withMaxIncl_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_integer_withMaxIncl_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_integer_withMaxIncl_e.ttcn
+// File: www_XmlTest_org_integer_withMaxIncl.ttcn
// Description:
// References:
// Rev:
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_integer_withMaxIncl_e {
+module www_XmlTest_org_integer_withMaxIncl {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_integer_withMinExcl_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_integer_withMinExcl_e.ttcn
index 5c2d23e79..438d77508 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_integer_withMinExcl_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_integer_withMinExcl_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_integer_withMinExcl_e.ttcn
+// File: www_XmlTest_org_integer_withMinExcl.ttcn
// Description:
// References:
// Rev:
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_integer_withMinExcl_e {
+module www_XmlTest_org_integer_withMinExcl {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_integer_withMinIncl_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_integer_withMinIncl_e.ttcn
index 487734cb8..badd966ed 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_integer_withMinIncl_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_integer_withMinIncl_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_integer_withMinIncl_e.ttcn
+// File: www_XmlTest_org_integer_withMinIncl.ttcn
// Description:
// References:
// Rev:
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_integer_withMinIncl_e {
+module www_XmlTest_org_integer_withMinIncl {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_list_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_list_e.ttcn
index c32e99a1d..68d2980e6 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_list_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_list_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_list_e.ttcn
+// File: www_XmlTest_org_list.ttcn
// Description:
// References:
// Rev:
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_list_e {
+module www_XmlTest_org_list {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_list_integer_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_list_integer_e.ttcn
index 9441829d4..165d920b9 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_list_integer_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_list_integer_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_list_integer_e.ttcn
+// File: www_XmlTest_org_list_integer.ttcn
// Description:
// References:
// Rev:
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_list_integer_e {
+module www_XmlTest_org_list_integer {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_simple_enum_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_simple_enum_e.ttcn
index e004d4215..5002d53f3 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_simple_enum_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_simple_enum_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_simple_enum_e.ttcn
+// File: www_XmlTest_org_simple_enum.ttcn
// Description:
// References:
// Rev:
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_simple_enum_e {
+module www_XmlTest_org_simple_enum {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_e.ttcn
index b37764403..b90279acc 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_string_e.ttcn
+// File: www_XmlTest_org_string.ttcn
// Description:
// References:
// Rev:
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_string_e {
+module www_XmlTest_org_string {
import from XSD all;
@@ -119,7 +119,7 @@ type XSD.String StringMax length(0 .. 7);
type XSD.String StringMinMax length(5 .. 7);
-type XSD.String Better_us_zipcode (pattern "[0-9]#5(-[0-9]#4)#(0,1)")
+type XSD.String Better_us_zipcode (pattern "[0-9]#(5)(-[0-9]#(4))#(0,1)")
with {
variant "name as 'better-us-zipcode'";
};
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withEmptyLength_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withEmptyLength_e.ttcn
index 5190038e5..18587441b 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withEmptyLength_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withEmptyLength_e.ttcn
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_string_withEmptyLength_e {
+module www_XmlTest_org_string_withEmptyLength {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withEmptyMax_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withEmptyMax_e.ttcn
index 41a2d1cc1..081886ccd 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withEmptyMax_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withEmptyMax_e.ttcn
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_string_withEmptyMax_e {
+module www_XmlTest_org_string_withEmptyMax {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withEmptyMin_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withEmptyMin_e.ttcn
index 3b580051c..5ce2431d0 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withEmptyMin_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withEmptyMin_e.ttcn
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_string_withEmptyMin_e {
+module www_XmlTest_org_string_withEmptyMin {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withEnum_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withEnum_e.ttcn
index aa5a8129e..4e3dca6f6 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withEnum_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withEnum_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_string_withEnum_e.ttcn
+// File: www_XmlTest_org_string_withEnum.ttcn
// Description:
// References:
// Rev:
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_string_withEnum_e {
+module www_XmlTest_org_string_withEnum {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withFaultyMinMax_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withFaultyMinMax_e.ttcn
index b1da99601..7e5dd43ef 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withFaultyMinMax_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withFaultyMinMax_e.ttcn
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_string_withFaultyMinMax_e {
+module www_XmlTest_org_string_withFaultyMinMax {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withFixedLength_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withFixedLength_e.ttcn
index ac7117ca5..77602934e 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withFixedLength_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withFixedLength_e.ttcn
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_string_withFixedLength_e {
+module www_XmlTest_org_string_withFixedLength {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withFloatLength_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withFloatLength_e.ttcn
index a641f4000..9816f9cf9 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withFloatLength_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withFloatLength_e.ttcn
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_string_withFloatLength_e {
+module www_XmlTest_org_string_withFloatLength {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withMinLength_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withMinLength_e.ttcn
index af8971b2c..25a36aa4d 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withMinLength_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withMinLength_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_string_withMinLength_e.ttcn
+// File: www_XmlTest_org_string_withMinLength.ttcn
// Description:
// References:
// Rev:
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_string_withMinLength_e {
+module www_XmlTest_org_string_withMinLength {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withNegativeLength_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withNegativeLength_e.ttcn
index c0d093658..fc20a9d24 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withNegativeLength_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withNegativeLength_e.ttcn
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_string_withNegativeLength_e {
+module www_XmlTest_org_string_withNegativeLength {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withNegativeMin_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withNegativeMin_e.ttcn
index d85728542..4ab805a7f 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withNegativeMin_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withNegativeMin_e.ttcn
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_string_withNegativeMin_e {
+module www_XmlTest_org_string_withNegativeMin {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withOverDefinition_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withOverDefinition_e.ttcn
index 091078450..a6e43666a 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withOverDefinition_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withOverDefinition_e.ttcn
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_string_withOverDefinition_e {
+module www_XmlTest_org_string_withOverDefinition {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withPosLength_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withPosLength_e.ttcn
index ddb2fa460..f11970786 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withPosLength_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withPosLength_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_string_withPosLength_e.ttcn
+// File: www_XmlTest_org_string_withPosLength.ttcn
// Description:
// References:
// Rev:
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_string_withPosLength_e {
+module www_XmlTest_org_string_withPosLength {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withPosMax_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withPosMax_e.ttcn
index fd87d601b..accd6cb23 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withPosMax_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withPosMax_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_string_withPosMax_e.ttcn
+// File: www_XmlTest_org_string_withPosMax.ttcn
// Description:
// References:
// Rev:
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_string_withPosMax_e {
+module www_XmlTest_org_string_withPosMax {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withTypeAndBase_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withTypeAndBase_e.ttcn
index 59821391d..24ba39652 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withTypeAndBase_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withTypeAndBase_e.ttcn
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_string_withTypeAndBase_e {
+module www_XmlTest_org_string_withTypeAndBase {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withWhitespace_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withWhitespace_e.ttcn
index d36fe18c2..9e49a92a7 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withWhitespace_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withWhitespace_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_string_withWhitespace_e.ttcn
+// File: www_XmlTest_org_string_withWhitespace.ttcn
// Description:
// References:
// Rev:
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_string_withWhitespace_e {
+module www_XmlTest_org_string_withWhitespace {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_time_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_time_e.ttcn
index 9180c487c..b4ef8cf76 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_time_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_time_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_time_e.ttcn
+// File: www_XmlTest_org_time.ttcn
// Description:
// References:
// Rev:
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_time_e {
+module www_XmlTest_org_time {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_time_withEnum_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_time_withEnum_e.ttcn
index 5baeedb0a..a9a83adec 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_time_withEnum_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_time_withEnum_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_time_withEnum_e.ttcn
+// File: www_XmlTest_org_time_withEnum.ttcn
// Description:
// References:
// Rev:
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_time_withEnum_e {
+module www_XmlTest_org_time_withEnum {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_union_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_union_e.ttcn
index 4faacee6a..4d3f6058b 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_union_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_union_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_union_e.ttcn
+// File: www_XmlTest_org_union.ttcn
// Description:
// References:
// Rev:
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_union_e {
+module www_XmlTest_org_union {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_csapi_org_schema_parlayx_common_v2_0_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_csapi_org_schema_parlayx_common_v2_0_e.ttcn
index 25fc900d2..5c9583291 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_csapi_org_schema_parlayx_common_v2_0_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_csapi_org_schema_parlayx_common_v2_0_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_csapi_org_schema_parlayx_common_v2_0_e.ttcn
+// File: www_csapi_org_schema_parlayx_common_v2_0.ttcn
// Description:
// References:
// Rev:
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_csapi_org_schema_parlayx_common_v2_0_e {
+module www_csapi_org_schema_parlayx_common_v2_0 {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_csapi_org_schema_parlayx_payment_amount_charging_v2_0_local_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_csapi_org_schema_parlayx_payment_amount_charging_v2_0_local_e.ttcn
index 81b437c0f..1bc5a87a4 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_csapi_org_schema_parlayx_payment_amount_charging_v2_0_local_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_csapi_org_schema_parlayx_payment_amount_charging_v2_0_local_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_csapi_org_schema_parlayx_payment_amount_charging_v2_0_local_e.ttcn
+// File: www_csapi_org_schema_parlayx_payment_amount_charging_v2_0_local.ttcn
// Description:
// References:
// Rev:
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_csapi_org_schema_parlayx_payment_amount_charging_v2_0_local_e {
+module www_csapi_org_schema_parlayx_payment_amount_charging_v2_0_local {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_csapi_org_schema_parlayx_payment_reserve_amount_charging_v2_0_local_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_csapi_org_schema_parlayx_payment_reserve_amount_charging_v2_0_local_e.ttcn
index b4453a2b2..e9318e7ba 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_csapi_org_schema_parlayx_payment_reserve_amount_charging_v2_0_local_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_csapi_org_schema_parlayx_payment_reserve_amount_charging_v2_0_local_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_csapi_org_schema_parlayx_payment_reserve_amount_charging_v2_0_local_e.ttcn
+// File: www_csapi_org_schema_parlayx_payment_reserve_amount_charging_v2_0_local.ttcn
// Description:
// References:
// Rev:
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_csapi_org_schema_parlayx_payment_reserve_amount_charging_v2_0_local_e {
+module www_csapi_org_schema_parlayx_payment_reserve_amount_charging_v2_0_local {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_csapi_org_schema_parlayx_payment_reserve_volume_charging_v2_0_local_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_csapi_org_schema_parlayx_payment_reserve_volume_charging_v2_0_local_e.ttcn
index 215db3064..aa0906d04 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_csapi_org_schema_parlayx_payment_reserve_volume_charging_v2_0_local_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_csapi_org_schema_parlayx_payment_reserve_volume_charging_v2_0_local_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_csapi_org_schema_parlayx_payment_reserve_volume_charging_v2_0_local_e.ttcn
+// File: www_csapi_org_schema_parlayx_payment_reserve_volume_charging_v2_0_local.ttcn
// Description:
// References:
// Rev:
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_csapi_org_schema_parlayx_payment_reserve_volume_charging_v2_0_local_e {
+module www_csapi_org_schema_parlayx_payment_reserve_volume_charging_v2_0_local {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_csapi_org_schema_parlayx_payment_v2_0_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_csapi_org_schema_parlayx_payment_v2_0_e.ttcn
index 765e09e71..38eeb2b4f 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_csapi_org_schema_parlayx_payment_v2_0_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_csapi_org_schema_parlayx_payment_v2_0_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_csapi_org_schema_parlayx_payment_v2_0_e.ttcn
+// File: www_csapi_org_schema_parlayx_payment_v2_0.ttcn
// Description:
// References:
// Rev:
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_csapi_org_schema_parlayx_payment_v2_0_e {
+module www_csapi_org_schema_parlayx_payment_v2_0 {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_csapi_org_schema_parlayx_payment_volume_charging_v2_0_local_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_csapi_org_schema_parlayx_payment_volume_charging_v2_0_local_e.ttcn
index 6f7672c07..9df3db32a 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_csapi_org_schema_parlayx_payment_volume_charging_v2_0_local_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_csapi_org_schema_parlayx_payment_volume_charging_v2_0_local_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_csapi_org_schema_parlayx_payment_volume_charging_v2_0_local_e.ttcn
+// File: www_csapi_org_schema_parlayx_payment_volume_charging_v2_0_local.ttcn
// Description:
// References:
// Rev:
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_csapi_org_schema_parlayx_payment_volume_charging_v2_0_local_e {
+module www_csapi_org_schema_parlayx_payment_volume_charging_v2_0_local {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_ericsson_com_is_isco_IntegratedSite_R4L06_R4AB_1_02_HK84933_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_ericsson_com_is_isco_IntegratedSite_R4L06_R4AB_1_02_HK84933_e.ttcn
index ff1f94bcd..ab92d5d69 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_ericsson_com_is_isco_IntegratedSite_R4L06_R4AB_1_02_HK84933_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_ericsson_com_is_isco_IntegratedSite_R4L06_R4AB_1_02_HK84933_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_ericsson_com_is_isco_IntegratedSite_R4L06_R4AB_1_02_HK84933_e.ttcn
+// File: www_ericsson_com_is_isco_IntegratedSite_R4L06_R4AB_1_02_HK84933.ttcn
// Description:
// References:
// Rev:
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_ericsson_com_is_isco_IntegratedSite_R4L06_R4AB_1_02_HK84933_e {
+module www_ericsson_com_is_isco_IntegratedSite_R4L06_R4AB_1_02_HK84933 {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_ericsson_com_is_isco_IntegratedSite_R4L06_R4AB_1_02_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_ericsson_com_is_isco_IntegratedSite_R4L06_R4AB_1_02_e.ttcn
index 5f88085ab..35442a40a 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_ericsson_com_is_isco_IntegratedSite_R4L06_R4AB_1_02_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_ericsson_com_is_isco_IntegratedSite_R4L06_R4AB_1_02_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_ericsson_com_is_isco_IntegratedSite_R4L06_R4AB_1_02_e.ttcn
+// File: www_ericsson_com_is_isco_IntegratedSite_R4L06_R4AB_1_02.ttcn
// Description:
// References:
// Rev:
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_ericsson_com_is_isco_IntegratedSite_R4L06_R4AB_1_02_e {
+module www_ericsson_com_is_isco_IntegratedSite_R4L06_R4AB_1_02 {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_ericsson_com_is_isco_IsTypes_R4L06_R4AB_1_02_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_ericsson_com_is_isco_IsTypes_R4L06_R4AB_1_02_e.ttcn
index b22662cf1..336b21229 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_ericsson_com_is_isco_IsTypes_R4L06_R4AB_1_02_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_ericsson_com_is_isco_IsTypes_R4L06_R4AB_1_02_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_ericsson_com_is_isco_IsTypes_R4L06_R4AB_1_02_e.ttcn
+// File: www_ericsson_com_is_isco_IsTypes_R4L06_R4AB_1_02.ttcn
// Description:
// References:
// Rev:
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_ericsson_com_is_isco_IsTypes_R4L06_R4AB_1_02_e {
+module www_ericsson_com_is_isco_IsTypes_R4L06_R4AB_1_02 {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_ericsson_com_is_isco_IsTypes_R4L06_R4AF11_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_ericsson_com_is_isco_IsTypes_R4L06_R4AF11_e.ttcn
index c762b6753..2132fa5d2 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_ericsson_com_is_isco_IsTypes_R4L06_R4AF11_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_ericsson_com_is_isco_IsTypes_R4L06_R4AF11_e.ttcn
@@ -15,7 +15,7 @@
*
******************************************************************************/
//
-// File: www_ericsson_com_is_isco_IsTypes_R4L06_R4AF11_e.ttcn
+// File: www_ericsson_com_is_isco_IsTypes_R4L06_R4AF11.ttcn
// Description:
// References:
// Rev:
@@ -34,7 +34,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_ericsson_com_is_isco_IsTypes_R4L06_R4AF11_e {
+module www_ericsson_com_is_isco_IsTypes_R4L06_R4AF11 {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_ericsson_com_is_isco_MainSwitch_R4L06_R4AB_1_02_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_ericsson_com_is_isco_MainSwitch_R4L06_R4AB_1_02_e.ttcn
index 279c15f73..45614aa33 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_ericsson_com_is_isco_MainSwitch_R4L06_R4AB_1_02_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_ericsson_com_is_isco_MainSwitch_R4L06_R4AB_1_02_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_ericsson_com_is_isco_MainSwitch_R4L06_R4AB_1_02_e.ttcn
+// File: www_ericsson_com_is_isco_MainSwitch_R4L06_R4AB_1_02.ttcn
// Description:
// References:
// Rev:
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_ericsson_com_is_isco_MainSwitch_R4L06_R4AB_1_02_e {
+module www_ericsson_com_is_isco_MainSwitch_R4L06_R4AB_1_02 {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_ericsson_com_is_isco_Mgw_R9B27_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_ericsson_com_is_isco_Mgw_R9B27_e.ttcn
index 299328491..c526281ba 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_ericsson_com_is_isco_Mgw_R9B27_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_ericsson_com_is_isco_Mgw_R9B27_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_ericsson_com_is_isco_Mgw_R9B27_e.ttcn
+// File: www_ericsson_com_is_isco_Mgw_R9B27.ttcn
// Description:
// References:
// Rev:
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_ericsson_com_is_isco_Mgw_R9B27_e {
+module www_ericsson_com_is_isco_Mgw_R9B27 {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_ericsson_com_is_isco_Misc_R4L06_R4AB_1_02_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_ericsson_com_is_isco_Misc_R4L06_R4AB_1_02_e.ttcn
index b98976b08..42a56d5a7 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_ericsson_com_is_isco_Misc_R4L06_R4AB_1_02_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_ericsson_com_is_isco_Misc_R4L06_R4AB_1_02_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_ericsson_com_is_isco_Misc_R4L06_R4AB_1_02_e.ttcn
+// File: www_ericsson_com_is_isco_Misc_R4L06_R4AB_1_02.ttcn
// Description:
// References:
// Rev:
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_ericsson_com_is_isco_Misc_R4L06_R4AB_1_02_e {
+module www_ericsson_com_is_isco_Misc_R4L06_R4AB_1_02 {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_ericsson_com_is_isco_Tgc_R6A48_R6H01_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_ericsson_com_is_isco_Tgc_R6A48_R6H01_e.ttcn
index 5ab964453..ff26dbda1 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_ericsson_com_is_isco_Tgc_R6A48_R6H01_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_ericsson_com_is_isco_Tgc_R6A48_R6H01_e.ttcn
@@ -15,7 +15,7 @@
*
******************************************************************************/
//
-// File: www_ericsson_com_is_isco_Tgc_R6A48_R6H01_e.ttcn
+// File: www_ericsson_com_is_isco_Tgc_R6A48_R6H01.ttcn
// Description:
// References:
// Rev:
@@ -34,7 +34,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_ericsson_com_is_isco_Tgc_R6A48_R6H01_e {
+module www_ericsson_com_is_isco_Tgc_R6A48_R6H01 {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_all_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_all_e.ttcn
index 820622ee6..867ccb0ed 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_all_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_all_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_all_e.ttcn
+// File: www_example_org_all.ttcn
// Description:
// References:
// Rev:
@@ -26,7 +26,7 @@
// Generated from file(s):
// - all.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/all/e" */
+// /* targetnamespace = "www.example.org/all" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_anyattr_in_complex_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_anyattr_in_complex_e.ttcn
index c3f45f6c9..ba323b651 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_anyattr_in_complex_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_anyattr_in_complex_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_anyattr_in_complex_e.ttcn
+// File: www_example_org_anyattr_in_complex.ttcn
// Description:
// References:
// Rev:
@@ -24,9 +24,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - anyattr_in_compex_e.xsd
+// - anyattr_in_complex.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/anyattr/in/complex/e" */
+// /* targetnamespace = "www.example.org/anyattr/in/complex" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_anyattrib_single_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_anyattrib_single_e.ttcn
index 59b3ee2cf..2878eb53c 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_anyattrib_single_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_anyattrib_single_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_anyattrib_single_e.ttcn
+// File: www_example_org_anyattrib_single.ttcn
// Description:
// References:
// Rev:
@@ -38,7 +38,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_example_org_anyattrib_single_e {
+module www_example_org_anyattrib_single {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_attr_ext_rest_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_attr_ext_rest_e.ttcn
index c1fd9995f..be375833f 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_attr_ext_rest_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_attr_ext_rest_e.ttcn
@@ -24,7 +24,7 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - attrib_restriction_extension_e.xsd
+// - attrib_restriction_extension.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
// /* targetnamespace = "www.example.org/attr/ext/rest" */
////////////////////////////////////////////////////////////////////////////////
@@ -38,7 +38,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_example_org_attr_ext_rest_e {
+module www_example_org_attr_ext_rest {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_attrib_enum_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_attrib_enum_e.ttcn
index 05da3b78a..a2d6a4a6d 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_attrib_enum_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_attrib_enum_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_attrib_enum_e.ttcn
+// File: www_example_org_attrib_enum.ttcn
// Description:
// References:
// Rev:
@@ -24,9 +24,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - attrib_enum_e.xsd
+// - attrib_enum.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/attrib/enum/e" */
+// /* targetnamespace = "www.example.org/attrib/enum" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_attrib_order_a_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_attrib_order_a_e.ttcn
index bd8706c91..16afe87f5 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_attrib_order_a_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_attrib_order_a_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_attrib_order_a_e.ttcn
+// File: www_example_org_attrib_order_a.ttcn
// Description:
// References:
// Rev:
@@ -47,7 +47,7 @@ import from XSD all;
import from www_example_org_attrib_order_b all;
-import from NoTargetNamespace2_e all;
+import from NoTargetNamespace2 all;
type XSD.String Local1 ("fixed")
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_attrib_order_b_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_attrib_order_b_e.ttcn
index f01b95c55..7201c6f02 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_attrib_order_b_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_attrib_order_b_e.ttcn
@@ -24,9 +24,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - attrib_order_b_e.xsd
+// - attrib_order_b.xsd
// /* xml version = "1.0" */
-// /* targetnamespace = "www.example.org/attrib/order/b/e" */
+// /* targetnamespace = "www.example.org/attrib/order/b" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_attribgroup_ingroup_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_attribgroup_ingroup_e.ttcn
index 1b897242b..b69ffd395 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_attribgroup_ingroup_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_attribgroup_ingroup_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_attribgroup_ingroup_e.ttcn
+// File: www_example_org_attribgroup_ingroup.ttcn
// Description:
// References:
// Rev:
@@ -24,9 +24,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - attribgroup_ingroup_e.xsd
+// - attribgroup_ingroup.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/attribgroup/ingroup/e" */
+// /* targetnamespace = "www.example.org/attribgroup/ingroup" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_attribute_enumeration_variant_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_attribute_enumeration_variant_e.ttcn
index 98926086e..5eabeb98e 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_attribute_enumeration_variant_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_attribute_enumeration_variant_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_attribute_enumeration_variant_e.ttcn
+// File: www_example_org_attribute_enumeration_variant.ttcn
// Description:
// References:
// Rev:
@@ -26,7 +26,7 @@
// Generated from file(s):
// - attribute_enumeration_variant.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/attribute/enumeration/variant/e" */
+// /* targetnamespace = "www.example.org/attribute/enumeration/variant" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_attributegroup_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_attributegroup_e.ttcn
index fd112816b..78714c6d5 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_attributegroup_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_attributegroup_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_attributegroup_e.ttcn
+// File: www_example_org_attributegroup.ttcn
// Description:
// References:
// Rev:
@@ -24,9 +24,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - attributeGroup_e.xsd
+// - attributeGroup.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/attributegroup/e" */
+// /* targetnamespace = "www.example.org/attributegroup" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_boolean_variant_commented_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_boolean_variant_commented_e.ttcn
index c311a6a7a..4f4066c8f 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_boolean_variant_commented_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_boolean_variant_commented_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_boolean_variant_commented_e.ttcn
+// File: www_example_org_boolean_variant_commented.ttcn
// Description:
// References:
// Rev:
@@ -26,7 +26,7 @@
// Generated from file(s):
// - boolean_variant_commented.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/boolean/variant/commented/e" */
+// /* targetnamespace = "www.example.org/boolean/variant/commented" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_comment_placement_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_comment_placement_e.ttcn
index e73ff2481..921e46174 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_comment_placement_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_comment_placement_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_comment_placement_e.ttcn
+// File: www_example_org_comment_placement.ttcn
// Description:
// References:
// Rev:
@@ -26,7 +26,7 @@
// Generated from file(s):
// - comment_placement.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/comment/placement/e" */
+// /* targetnamespace = "www.example.org/comment/placement" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_complex_nillable_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_complex_nillable_e.ttcn
index 14bb7310f..058996722 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_complex_nillable_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_complex_nillable_e.ttcn
@@ -26,7 +26,7 @@
// Generated from file(s):
// - complex_nillable.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/complex/nillable/e" */
+// /* targetnamespace = "www.example.org/complex/nillable" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
@@ -38,7 +38,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_example_org_complex_nillable_e {
+module www_example_org_complex_nillable {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_decimal_fractiondigits_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_decimal_fractiondigits_e.ttcn
index d6b7347fd..b52b3cb00 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_decimal_fractiondigits_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_decimal_fractiondigits_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_decimal_fractiondigits_e.ttcn
+// File: www_example_org_decimal_fractiondigits.ttcn
// Description:
// References:
// Rev:
@@ -26,7 +26,7 @@
// Generated from file(s):
// - decimal_fractiondigits.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/decimal/fractiondigits/e" */
+// /* targetnamespace = "www.example.org/decimal/fractiondigits" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_dont_generate_element_substitution_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_dont_generate_element_substitution_e.ttcn
index f1de3fa9a..318c67fdb 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_dont_generate_element_substitution_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_dont_generate_element_substitution_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_dont_generate_element_substitution_e.ttcn
+// File: www_example_org_dont_generate_element_substitution.ttcn
// Description:
// References:
// Rev:
@@ -24,9 +24,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - dont_generate_element_substitution_e.xsd
+// - dont_generate_element_substitution.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/dont/generate/element/substitution/e" */
+// /* targetnamespace = "www.example.org/dont/generate/element/substitution" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_e.ttcn
index 2de064d7b..6ea1a0302 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_e.ttcn
@@ -15,7 +15,7 @@
*
******************************************************************************/
//
-// File: www_example_org_e.ttcn
+// File: www_example_org.ttcn
// Description:
// References:
// Rev:
@@ -39,7 +39,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_example_org_e {
+module www_example_org {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_elements_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_elements_e.ttcn
index 4b3607fe3..1196cd578 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_elements_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_elements_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_elements_e.ttcn
+// File: www_example_org_elements.ttcn
// Description:
// References:
// Rev:
@@ -24,7 +24,7 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - elements_e.xsd
+// - elements.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
// /* targetnamespace = "www.example.org/elements" */
////////////////////////////////////////////////////////////////////////////////
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_enum_field_names_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_enum_field_names_e.ttcn
index b6d6e2739..bb5023b65 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_enum_field_names_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_enum_field_names_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_enum_field_names_e.ttcn
+// File: www_example_org_enum_field_names.ttcn
// Description:
// References:
// Rev:
@@ -26,7 +26,7 @@
// Generated from file(s):
// - enum_field_names.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/enum/field/names/e" */
+// /* targetnamespace = "www.example.org/enum/field/names" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_enumeration_remove_dup_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_enumeration_remove_dup_e.ttcn
index 510a6c13f..9bf2cfa0d 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_enumeration_remove_dup_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_enumeration_remove_dup_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_enumeration_remove_dup_e.ttcn
+// File: www_example_org_enumeration_remove_dup.ttcn
// Description:
// References:
// Rev:
@@ -38,7 +38,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_example_org_enumeration_remove_dup_e {
+module www_example_org_enumeration_remove_dup {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_enumeration_restriction3_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_enumeration_restriction3_e.ttcn
index c36a1d358..5e4229bf1 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_enumeration_restriction3_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_enumeration_restriction3_e.ttcn
@@ -1,7 +1,7 @@
-/*******************************************************************************
+/******************************************************************************
* Copyright (c) 2000-2016 Ericsson Telecom AB
*
-* XSD to TTCN-3 Translator version: CRL 113 200/5 R5A
+* XSD to TTCN-3 Translator
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -12,9 +12,9 @@
* Balasko, Jeno
* Szabo, Bence Janos
*
-*******************************************************************************/
+******************************************************************************/
//
-// File: www_example_org_enumeration_restriction3_e.ttcn
+// File: www_example_org_enumeration_restriction3.ttcn
// Description:
// References:
// Rev:
@@ -24,9 +24,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - enumeration_restriction3_e.xsd
+// - enumeration_restriction3.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/enumeration_restriction3/e" */
+// /* targetnamespace = "www.example.org/enumeration_restriction3" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_enumeration_restriction_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_enumeration_restriction_e.ttcn
index 06ca2ab07..7b4d41578 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_enumeration_restriction_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_enumeration_restriction_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_enumeration_restriction_e.ttcn
+// File: www_example_org_enumeration_restriction.ttcn
// Description:
// References:
// Rev:
@@ -26,7 +26,7 @@
// Generated from file(s):
// - enumeration_restriction.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/enumeration/restriction/e" */
+// /* targetnamespace = "www.example.org/enumeration/restriction" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_fixed_value_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_fixed_value_e.ttcn
index 92064c766..40f1fca2f 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_fixed_value_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_fixed_value_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_fixed_value_e.ttcn
+// File: www_example_org_fixed_value.ttcn
// Description:
// References:
// Rev:
@@ -24,7 +24,7 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - a.xsd
+// - fixed_value.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
// /* targetnamespace = "www.example.org/fixed/value" */
////////////////////////////////////////////////////////////////////////////////
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_generate_element_substitution_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_generate_element_substitution_e.ttcn
index 5f8870480..e5f4a619e 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_generate_element_substitution_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_generate_element_substitution_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_generate_element_substitution_e.ttcn
+// File: www_example_org_generate_element_substitution.ttcn
// Description:
// References:
// Rev:
@@ -24,9 +24,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - generate_element_substitution_e.xsd
+// - generate_element_substitution.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/generate/element/substitution/e" */
+// /* targetnamespace = "www.example.org/generate/element/substitution" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_id_attrib_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_id_attrib_e.ttcn
index dbffd83b6..ffa9bd4ca 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_id_attrib_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_id_attrib_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_id_attrib_e.ttcn
+// File: www_example_org_id_attrib.ttcn
// Description:
// References:
// Rev:
@@ -26,7 +26,7 @@
// Generated from file(s):
// - id_attrib.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/id_attrib/e" */
+// /* targetnamespace = "www.example.org/id_attrib" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_import_prefix_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_import_prefix_e.ttcn
index b06e2b9ce..7c2789566 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_import_prefix_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_import_prefix_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_import_prefix_e.ttcn
+// File: www_example_org_import_prefix.ttcn
// Description:
// References:
// Rev:
@@ -26,7 +26,7 @@
// Generated from file(s):
// - import_prefix_name.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/import/prefix/e" */
+// /* targetnamespace = "www.example.org/import/prefix" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_imported2_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_imported2_e.ttcn
index 66033dee5..797bc052a 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_imported2_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_imported2_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_imported2_e.ttcn
+// File: www_example_org_imported2.ttcn
// Description:
// References:
// Rev:
@@ -26,7 +26,7 @@
// Generated from file(s):
// - imported2.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/imported2_e" */
+// /* targetnamespace = "www.example.org/imported2" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_including_module_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_including_module_e.ttcn
index a84927226..71379d002 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_including_module_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_including_module_e.ttcn
@@ -9,7 +9,7 @@
* http://www.eclipse.org/legal/epl-v10.html
*******************************************************************************/
//
-// File: www_example_org_including_module_e.ttcn
+// File: www_example_org_including_module.ttcn
// Description:
// References:
// Rev:
@@ -19,9 +19,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - including_module_e.xsd
+// - including_module.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/including/module/e" */
+// /* targetnamespace = "www.example.org/including/module" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_list_complextype_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_list_complextype_e.ttcn
index c5beda92b..b350e37ef 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_list_complextype_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_list_complextype_e.ttcn
@@ -1,7 +1,7 @@
-/*******************************************************************************
+/******************************************************************************
* Copyright (c) 2000-2016 Ericsson Telecom AB
*
-* XSD to TTCN-3 Translator version: CRL 113 200/5 R4C
+* XSD to TTCN-3 Translator
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -9,11 +9,11 @@
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
-* Szabo Bence Janos
+* Szabo, Bence Janos
*
-*******************************************************************************/
+******************************************************************************/
//
-// File: www_example_org_list_complextype_e.ttcn
+// File: www_example_org_list_complextype.ttcn
// Description:
// References:
// Rev:
@@ -23,9 +23,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - list_complextype_e.xsd
+// - list_complextype.xsd
// /* xml version = "1.0" */
-// /* targetnamespace = "www.example.org/list/complextype/e" */
+// /* targetnamespace = "www.example.org/list/complextype" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_list_simpletype_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_list_simpletype_e.ttcn
index 33b2d499f..b33c42ea0 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_list_simpletype_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_list_simpletype_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_list_simpletype_e.ttcn
+// File: www_example_org_list_simpletype.ttcn
// Description:
// References:
// Rev:
@@ -26,7 +26,7 @@
// Generated from file(s):
// - list_simpletype.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/list/simpletype/e" */
+// /* targetnamespace = "www.example.org/list/simpletype" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_long_extension_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_long_extension_e.ttcn
index 97ddad9f3..2f3493497 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_long_extension_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_long_extension_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_long_extension_e.ttcn
+// File: www_example_org_long_extension.ttcn
// Description:
// References:
// Rev:
@@ -26,7 +26,7 @@
// Generated from file(s):
// - long_extension.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/long/extension_e" */
+// /* targetnamespace = "www.example.org/long/extension" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_name_conv_http_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_name_conv_http_e.ttcn
index e38ad222b..9ed4576b3 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_name_conv_http_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_name_conv_http_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_name_conv_http_e.ttcn
+// File: www_example_org_name_conv_http.ttcn
// Description:
// References:
// Rev:
@@ -26,7 +26,7 @@
// Generated from file(s):
// - name_conv_with_z.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/name_conv/http:///e" */
+// /* targetnamespace = "www.example.org/name_conv/http://" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_namespaceas_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_namespaceas_e.ttcn
index db2d49de6..dd79d52ec 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_namespaceas_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_namespaceas_e.ttcn
@@ -26,7 +26,7 @@
// Generated from file(s):
// - namespaceas.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/namespaceas_e" */
+// /* targetnamespace = "www.example.org/namespaceas" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
@@ -38,7 +38,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_example_org_namespaceas_e {
+module www_example_org_namespaceas {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_nillable_fixed_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_nillable_fixed_e.ttcn
index 843082fd9..9acbcdcb9 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_nillable_fixed_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_nillable_fixed_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_nillable_fixed_e.ttcn
+// File: www_example_org_nillable_fixed.ttcn
// Description:
// References:
// Rev:
@@ -38,7 +38,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_example_org_nillable_fixed_e {
+module www_example_org_nillable_fixed {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_no_ns_connector_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_no_ns_connector_e.ttcn
index 0205dd159..bec47e1e0 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_no_ns_connector_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_no_ns_connector_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_no_ns_connector_e.ttcn
+// File: www_example_org_no_ns_connector.ttcn
// Description:
// References:
// Rev:
@@ -24,9 +24,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - no_ns_connector_e.xsd
+// - no_ns_connector.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/no/ns/connector/e" */
+// /* targetnamespace = "www.example.org/no/ns/connector" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_not_a_number_minex_inf_maxex_inf_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_not_a_number_minex_inf_maxex_inf_e.ttcn
index 30af36745..d2c66c046 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_not_a_number_minex_inf_maxex_inf_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_not_a_number_minex_inf_maxex_inf_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_not_a_number_minex_inf_maxex_inf_e.ttcn
+// File: www_example_org_not_a_number_minex_inf_maxex_inf.ttcn
// Description:
// References:
// Rev:
@@ -26,7 +26,7 @@
// Generated from file(s):
// - not_a_number_minex_inf_maxex_-inf.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/not_a_number/minex_inf/maxex_-inf/e" */
+// /* targetnamespace = "www.example.org/not_a_number/minex_inf/maxex_-inf" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_only_element_substitution_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_only_element_substitution_e.ttcn
index 7e1509a64..5115d5af6 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_only_element_substitution_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_only_element_substitution_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_only_element_substitution_e.ttcn
+// File: www_example_org_only_element_substitution.ttcn
// Description:
// References:
// Rev:
@@ -24,9 +24,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - only_element_substitution_e.xsd
+// - only_element_substitution.xsd
// /* xml version = "1.0" */
-// /* targetnamespace = "www.example.org/only/element/substitution/e" */
+// /* targetnamespace = "www.example.org/only/element/substitution" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_pref1_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_pref1_e.ttcn
index 808ba6a54..ec3b02c37 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_pref1_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_pref1_e.ttcn
@@ -1,18 +1,19 @@
-/*******************************************************************************
+/******************************************************************************
* Copyright (c) 2000-2016 Ericsson Telecom AB
*
-* XSD to TTCN-3 Translator version: CRL 113 200/5 R5B01
+* XSD to TTCN-3 Translator
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
-
+*
* Contributors:
* Szabo, Bence Janos
-*******************************************************************************/
+*
+******************************************************************************/
//
-// File: www_example_org_pref1_e.ttcn
+// File: www_example_org_pref1.ttcn
// Description:
// References:
// Rev:
@@ -22,9 +23,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - www_example_org_perf1_e.xsd
+// - www_example_org_pref1.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/pref1/e" */
+// /* targetnamespace = "www.example.org/pref1" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
@@ -36,7 +37,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_example_org_pref1_e {
+module www_example_org_pref1 {
import from XSD all;
@@ -89,7 +90,7 @@ with {
}
with {
encode "XML";
- variant "namespace as 'www.example.org/pref1/e' prefix 'ns'";
+ variant "namespace as 'www.example.org/pref1' prefix 'ns'";
variant "controlNamespace 'http://www.w3.org/2001/XMLSchema-instance' prefix 'xsi'";
variant "elementFormQualified";
}
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_pref2_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_pref2_e.ttcn
index 8681260da..263797751 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_pref2_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_pref2_e.ttcn
@@ -1,18 +1,19 @@
-/*******************************************************************************
+/******************************************************************************
* Copyright (c) 2000-2016 Ericsson Telecom AB
*
-* XSD to TTCN-3 Translator version: CRL 113 200/5 R5B01
+* XSD to TTCN-3 Translator
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
-
+*
* Contributors:
* Szabo, Bence Janos
-*******************************************************************************/
+*
+******************************************************************************/
//
-// File: www_example_org_pref2_e.ttcn
+// File: www_example_org_pref2.ttcn
// Description:
// References:
// Rev:
@@ -22,9 +23,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - www_example_org_pref2_e.xsd
+// - www_example_org_pref2.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/pref2/e" */
+// /* targetnamespace = "www.example.org/pref2" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
@@ -63,6 +64,6 @@ type record MyType
}
with {
encode "XML";
- variant "namespace as 'www.example.org/pref2/e' prefix 'ns'";
+ variant "namespace as 'www.example.org/pref2' prefix 'ns'";
variant "controlNamespace 'http://www.w3.org/2001/XMLSchema-instance' prefix 'xsi'";
}
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_pref3_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_pref3_e.ttcn
index 8deff0c69..1caefcf65 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_pref3_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_pref3_e.ttcn
@@ -1,18 +1,19 @@
-/*******************************************************************************
+/******************************************************************************
* Copyright (c) 2000-2016 Ericsson Telecom AB
*
-* XSD to TTCN-3 Translator version: CRL 113 200/5 R5B01
+* XSD to TTCN-3 Translator
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
-
+*
* Contributors:
* Szabo, Bence Janos
-*******************************************************************************/
+*
+******************************************************************************/
//
-// File: www_example_org_pref3_e.ttcn
+// File: www_example_org_pref3.ttcn
// Description:
// References:
// Rev:
@@ -22,9 +23,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - www_example_org_pref3_e.xsd
+// - www_example_org_pref3.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/pref3/e" */
+// /* targetnamespace = "www.example.org/pref3" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
@@ -57,6 +58,6 @@ type record MyType
}
with {
encode "XML";
- variant "namespace as 'www.example.org/pref3/e' prefix 'ns'";
+ variant "namespace as 'www.example.org/pref3' prefix 'ns'";
variant "controlNamespace 'http://www.w3.org/2001/XMLSchema-instance' prefix 'xsi'";
}
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_qualified_element_attrib_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_qualified_element_attrib_e.ttcn
index 1df582b46..d5bd2bbef 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_qualified_element_attrib_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_qualified_element_attrib_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_qualified_element_attrib_e.ttcn
+// File: www_example_org_qualified_element_attrib.ttcn
// Description:
// References:
// Rev:
@@ -26,7 +26,7 @@
// Generated from file(s):
// - qualified_element_attrib.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/qualified/element/attrib/e" */
+// /* targetnamespace = "www.example.org/qualified/element/attrib" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_self_recursion_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_self_recursion_e.ttcn
index 08a992f7f..fc3067b22 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_self_recursion_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_self_recursion_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_self_recursion_e.ttcn
+// File: www_example_org_self_recursion.ttcn
// Description:
// References:
// Rev:
@@ -38,7 +38,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_example_org_self_recursion_e {
+module www_example_org_self_recursion {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_seq_enumeration_restriction_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_seq_enumeration_restriction_e.ttcn
index b165a7013..8bf407a2f 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_seq_enumeration_restriction_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_seq_enumeration_restriction_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_seq_enumeration_restriction_e.ttcn
+// File: www_example_org_seq_enumeration_restriction.ttcn
// Description:
// References:
// Rev:
@@ -26,7 +26,7 @@
// Generated from file(s):
// - enumeration_restriction2.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/seq/enumeration/restriction/e" */
+// /* targetnamespace = "www.example.org/seq/enumeration/restriction" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_seq_group_reference_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_seq_group_reference_e.ttcn
index d77275785..bab507e41 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_seq_group_reference_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_seq_group_reference_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_seq_group_reference_e.ttcn
+// File: www_example_org_seq_group_reference.ttcn
// Description:
// References:
// Rev:
@@ -26,7 +26,7 @@
// Generated from file(s):
// - seq_group_reference.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/seq/group/reference/e" */
+// /* targetnamespace = "www.example.org/seq/group/reference" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_simpletype_base_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_simpletype_base_e.ttcn
index ab3aa1469..3ec80dd16 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_simpletype_base_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_simpletype_base_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_simpletype_base_e.ttcn
+// File: www_example_org_simpletype_base.ttcn
// Description:
// References:
// Rev:
@@ -24,7 +24,7 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - simpletype_base_e.xsd
+// - simpletype_base.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
// /* targetnamespace = "www.example.org/simpletype/base" */
////////////////////////////////////////////////////////////////////////////////
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_simpletype_ref_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_simpletype_ref_e.ttcn
index f6e15b062..9db686aae 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_simpletype_ref_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_simpletype_ref_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_simpletype_ref_e.ttcn
+// File: www_example_org_simpletype_ref.ttcn
// Description:
// References:
// Rev:
@@ -38,7 +38,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_example_org_simpletype_ref_e {
+module www_example_org_simpletype_ref {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_simpletype_restrict_comp_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_simpletype_restrict_comp_e.ttcn
index b88e58b94..fb1aed48f 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_simpletype_restrict_comp_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_simpletype_restrict_comp_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_simpletype_restrict_comp_e.ttcn
+// File: www_example_org_simpletype_restrict_comp.ttcn
// Description:
// References:
// Rev:
@@ -26,7 +26,7 @@
// Generated from file(s):
// - simpletype_restrict_comp.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/simpletype/restrict/comp/e" */
+// /* targetnamespace = "www.example.org/simpletype/restrict/comp" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_substitutiongroup_abstract_block_1_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_substitutiongroup_abstract_block_1_e.ttcn
index f8c7194bf..b3667d997 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_substitutiongroup_abstract_block_1_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_substitutiongroup_abstract_block_1_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_substitutiongroup_abstract_block_1_e.ttcn
+// File: www_example_org_substitutiongroup_abstract_block_1.ttcn
// Description:
// References:
// Rev:
@@ -24,9 +24,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - substitutiongroup_abstract_block_1_e.xsd
+// - substitutiongroup_abstract_block_1.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/substitutiongroup/abstract/block/1/e" */
+// /* targetnamespace = "www.example.org/substitutiongroup/abstract/block/1" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_substitutiongroup_abstract_block_2_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_substitutiongroup_abstract_block_2_e.ttcn
index 4161aac16..1c28c28af 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_substitutiongroup_abstract_block_2_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_substitutiongroup_abstract_block_2_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_substitutiongroup_abstract_block_2_e.ttcn
+// File: www_example_org_substitutiongroup_abstract_block_2.ttcn
// Description:
// References:
// Rev:
@@ -24,9 +24,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - substitutiongroup_abstract_block_2_e.xsd
+// - substitutiongroup_abstract_block_2.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/substitutiongroup/abstract/block/2/e" */
+// /* targetnamespace = "www.example.org/substitutiongroup/abstract/block/2" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_substitutiongroup_complex_without_element_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_substitutiongroup_complex_without_element_e.ttcn
index f7ff9fda8..0622c2c32 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_substitutiongroup_complex_without_element_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_substitutiongroup_complex_without_element_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_substitutiongroup_complex_without_element_e.ttcn
+// File: www_example_org_substitutiongroup_complex_without_element.ttcn
// Description:
// References:
// Rev:
@@ -24,9 +24,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - substitutiongroup_complex_without_element_e.xsd
+// - substitutiongroup_complex_without_element.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/substitutiongroup/complex/without/element/e" */
+// /* targetnamespace = "www.example.org/substitutiongroup/complex/without/element" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_substitutiongroup_complextype_block_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_substitutiongroup_complextype_block_e.ttcn
index efba7b387..aa73e6b3f 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_substitutiongroup_complextype_block_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_substitutiongroup_complextype_block_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_substitutiongroup_complextype_block_e.ttcn
+// File: www_example_org_substitutiongroup_complextype_block.ttcn
// Description:
// References:
// Rev:
@@ -24,9 +24,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - substitutiongroup_complextype_block_e.xsd
+// - substitutiongroup_complextype_block.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/substitutiongroup/complextype/block/e" */
+// /* targetnamespace = "www.example.org/substitutiongroup/complextype/block" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_substitutiongroup_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_substitutiongroup_e.ttcn
index 4842dcb9a..07818727a 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_substitutiongroup_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_substitutiongroup_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_substitutiongroup_e.ttcn
+// File: www_example_org_substitutiongroup.ttcn
// Description:
// References:
// Rev:
@@ -24,9 +24,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - substitutiongroup_e.xsd
+// - substitutiongroup.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/substitutiongroup/e" */
+// /* targetnamespace = "www.example.org/substitutiongroup" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_substitutiongroup_long_extension_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_substitutiongroup_long_extension_e.ttcn
index 342e5174a..47fc37fbd 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_substitutiongroup_long_extension_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_substitutiongroup_long_extension_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_substitutiongroup_long_extension_e.ttcn
+// File: www_example_org_substitutiongroup_long_extension.ttcn
// Description:
// References:
// Rev:
@@ -24,9 +24,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - substitutiongroup_long_extension_e.xsd
+// - substitutiongroup_long_extension.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/substitutiongroup/long/extension/e" */
+// /* targetnamespace = "www.example.org/substitutiongroup/long/extension" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_substitutiongroup_main_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_substitutiongroup_main_e.ttcn
index 3f72390e9..fe226afca 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_substitutiongroup_main_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_substitutiongroup_main_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_substitutiongroup_main_e.ttcn
+// File: www_example_org_substitutiongroup_main.ttcn
// Description:
// References:
// Rev:
@@ -24,9 +24,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - substitutiongroup_main_e.xsd
+// - substitutiongroup_main.xsd
// /* xml version = "1.0" */
-// /* targetnamespace = "www.example.org/substitutiongroup/main/e" */
+// /* targetnamespace = "www.example.org/substitutiongroup/main" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_substitutiongroup_name_as_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_substitutiongroup_name_as_e.ttcn
index 4465bf844..884372b77 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_substitutiongroup_name_as_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_substitutiongroup_name_as_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_substitutiongroup_name_as_e.ttcn
+// File: www_example_org_substitutiongroup_name_as.ttcn
// Description:
// References:
// Rev:
@@ -24,9 +24,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - substitutiongroup_name_as_e.xsd
+// - substitutiongroup_name_as.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/substitutiongroup/name/as/e" */
+// /* targetnamespace = "www.example.org/substitutiongroup/name/as" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_substitutiongroup_ref_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_substitutiongroup_ref_e.ttcn
index e474c00c9..f2a55c4b8 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_substitutiongroup_ref_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_substitutiongroup_ref_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_substitutiongroup_ref_e.ttcn
+// File: www_example_org_substitutiongroup_ref.ttcn
// Description:
// References:
// Rev:
@@ -24,9 +24,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - substitutiongroup_ref_e.xsd
+// - substitutiongroup_ref.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/substitutiongroup/ref/e" */
+// /* targetnamespace = "www.example.org/substitutiongroup/ref" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_substitutiongroup_rename_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_substitutiongroup_rename_e.ttcn
index 4926c4dc3..d01fe4d72 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_substitutiongroup_rename_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_substitutiongroup_rename_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_substitutiongroup_rename_e.ttcn
+// File: www_example_org_substitutiongroup_rename.ttcn
// Description:
// References:
// Rev:
@@ -24,9 +24,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - substitutiongroup_rename_e.xsd
+// - substitutiongroup_rename.xsd
// /* xml version = "1.0" */
-// /* targetnamespace = "www.example.org/substitutiongroup/rename/e" */
+// /* targetnamespace = "www.example.org/substitutiongroup/rename" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_attributegroup_nillable_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_attributegroup_nillable_e.ttcn
index 65762829f..fc000c7e7 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_attributegroup_nillable_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_attributegroup_nillable_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_type_attributegroup_nillable_e.ttcn
+// File: www_example_org_type_attributegroup_nillable.ttcn
// Description:
// References:
// Rev:
@@ -26,7 +26,7 @@
// Generated from file(s):
// - attributegroup_nillable.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/type/attributegroup/nillable/e" */
+// /* targetnamespace = "www.example.org/type/attributegroup/nillable" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_conversion_follow_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_conversion_follow_e.ttcn
index a3cd770fa..c860d9af0 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_conversion_follow_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_conversion_follow_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_type_conversion_follow_e.ttcn
+// File: www_example_org_type_conversion_follow.ttcn
// Description:
// References:
// Rev:
@@ -38,7 +38,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_example_org_type_conversion_follow_e {
+module www_example_org_type_conversion_follow {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_subs_with_elem_subs_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_subs_with_elem_subs_e.ttcn
index 899edf068..0554309a5 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_subs_with_elem_subs_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_subs_with_elem_subs_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_type_subs_with_elem_subs_e.ttcn
+// File: www_example_org_type_subs_with_elem_subs.ttcn
// Description:
// References:
// Rev:
@@ -24,9 +24,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - type_subs_with_elem_subs_e.xsd
+// - type_subs_with_elem_subs.xsd
// /* xml version = "1.0" */
-// /* targetnamespace = "www.example.org/type/subs/with/elem/subs/e" */
+// /* targetnamespace = "www.example.org/type/subs/with/elem/subs" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_abstract_block_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_abstract_block_e.ttcn
index 4605d0285..96424d20f 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_abstract_block_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_abstract_block_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_type_substitution_abstract_block_e.ttcn
+// File: www_example_org_type_substitution_abstract_block.ttcn
// Description:
// References:
// Rev:
@@ -24,9 +24,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - type_substitution_abstract_block_e.xsd
+// - type_substitution_abstract_block.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/type/substitution/abstract/block/e" */
+// /* targetnamespace = "www.example.org/type/substitution/abstract/block" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_builtintype_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_builtintype_e.ttcn
index 234a13bf8..e1540a041 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_builtintype_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_builtintype_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_type_substitution_builtintype_e.ttcn
+// File: www_example_org_type_substitution_builtintype.ttcn
// Description:
// References:
// Rev:
@@ -24,9 +24,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - type_substitution_builtintype_e.xsd
+// - type_substitution_builtintype.xsd
// /* xml version = "1.0" */
-// /* targetnamespace = "www.example.org/type/substitution/builtintype/e" */
+// /* targetnamespace = "www.example.org/type/substitution/builtintype" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_chain_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_chain_e.ttcn
index a0ef5c968..056be10e4 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_chain_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_chain_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_type_substitution_chain_e.ttcn
+// File: www_example_org_type_substitution_chain.ttcn
// Description:
// References:
// Rev:
@@ -24,9 +24,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - type_substitution_chain_e.xsd
+// - type_substitution_chain.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/type/substitution/chain/e" */
+// /* targetnamespace = "www.example.org/type/substitution/chain" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_complex_cascade_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_complex_cascade_e.ttcn
index ce23541a3..106cbdff9 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_complex_cascade_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_complex_cascade_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_type_substitution_complex_cascade_e.ttcn
+// File: www_example_org_type_substitution_complex_cascade.ttcn
// Description:
// References:
// Rev:
@@ -24,9 +24,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - type_substitution_complex_cascade_e.xsd
+// - type_substitution_complex_cascade.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/type/substitution/complex/cascade/e" */
+// /* targetnamespace = "www.example.org/type/substitution/complex/cascade" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_e.ttcn
index f4f44d9d9..1a22e3157 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_type_substitution_e.ttcn
+// File: www_example_org_type_substitution.ttcn
// Description:
// References:
// Rev:
@@ -24,9 +24,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - type_substitution_e.xsd
+// - type_substitution.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/type/substitution/e" */
+// /* targetnamespace = "www.example.org/type/substitution" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_elem_in_ct_mod1_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_elem_in_ct_mod1_e.ttcn
index 8741e4136..e6742e1c7 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_elem_in_ct_mod1_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_elem_in_ct_mod1_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_type_substitution_elem_in_ct_mod1_e.ttcn
+// File: www_example_org_type_substitution_elem_in_ct_mod1.ttcn
// Description:
// References:
// Rev:
@@ -24,9 +24,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - type_substitution_elem_in_ct_mod1_e.xsd
+// - type_substitution_elem_in_ct_mod1.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/type/substitution/elem/in/ct/mod1/e" */
+// /* targetnamespace = "www.example.org/type/substitution/elem/in/ct/mod1" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_elem_in_ct_mod2_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_elem_in_ct_mod2_e.ttcn
index 4a0cbe72f..29413b061 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_elem_in_ct_mod2_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_elem_in_ct_mod2_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_type_substitution_elem_in_ct_mod2_e.ttcn
+// File: www_example_org_type_substitution_elem_in_ct_mod2.ttcn
// Description:
// References:
// Rev:
@@ -24,9 +24,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - type_substitution_elem_in_ct_mod2_e.xsd
+// - type_substitution_elem_in_ct_mod2.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/type/substitution/elem/in/ct/mod2/e" */
+// /* targetnamespace = "www.example.org/type/substitution/elem/in/ct/mod2" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_mod1_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_mod1_e.ttcn
index b27d6b022..24e28e90f 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_mod1_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_mod1_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_type_substitution_mod1_e.ttcn
+// File: www_example_org_type_substitution_mod1.ttcn
// Description:
// References:
// Rev:
@@ -24,9 +24,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - type_substitution_mod1_e.xsd
+// - type_substitution_mod1.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/type/substitution/mod1/e" */
+// /* targetnamespace = "www.example.org/type/substitution/mod1" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_mod2_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_mod2_e.ttcn
index a7b6c2f66..9208f1eda 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_mod2_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_mod2_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_type_substitution_mod2_e.ttcn
+// File: www_example_org_type_substitution_mod2.ttcn
// Description:
// References:
// Rev:
@@ -24,9 +24,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - type_substitution_mod2_e.xsd
+// - type_substitution_mod2.xsd
// /* xml version = "1.0" */
-// /* targetnamespace = "www.example.org/type/substitution/mod2/e" */
+// /* targetnamespace = "www.example.org/type/substitution/mod2" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_rename_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_rename_e.ttcn
index bc670dbce..e014c568c 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_rename_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_rename_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_type_substitution_rename_e.ttcn
+// File: www_example_org_type_substitution_rename.ttcn
// Description:
// References:
// Rev:
@@ -24,9 +24,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - type_substitution_rename_e.xsd
+// - type_substitution_rename.xsd
// /* xml version = "1.0" */
-// /* targetnamespace = "www.example.org/type/substitution/rename/e" */
+// /* targetnamespace = "www.example.org/type/substitution/rename" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_simple_cascade_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_simple_cascade_e.ttcn
index 6c333e77f..f5539a606 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_simple_cascade_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_simple_cascade_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_type_substitution_simple_cascade_e.ttcn
+// File: www_example_org_type_substitution_simple_cascade.ttcn
// Description:
// References:
// Rev:
@@ -24,9 +24,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - type_substitution_simple_cascade_e.xsd
+// - type_substitution_simple_cascade.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/type/substitution/simple/cascade/e" */
+// /* targetnamespace = "www.example.org/type/substitution/simple/cascade" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_simpletype_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_simpletype_e.ttcn
index 0663617fb..1c82380a6 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_simpletype_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_simpletype_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_type_substitution_simpletype_e.ttcn
+// File: www_example_org_type_substitution_simpletype.ttcn
// Description:
// References:
// Rev:
@@ -24,9 +24,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - type_substitution_simpletype_e.xsd
+// - type_substitution_simpletype.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/type/substitution/simpletype/e" */
+// /* targetnamespace = "www.example.org/type/substitution/simpletype" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_unqualified_element_attrib_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_unqualified_element_attrib_e.ttcn
index 8eca69bfe..cfc25d55b 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_unqualified_element_attrib_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_unqualified_element_attrib_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_unqualified_element_attrib_e.ttcn
+// File: www_example_org_unqualified_element_attrib.ttcn
// Description:
// References:
// Rev:
@@ -26,7 +26,7 @@
// Generated from file(s):
// - unqualified_element_attrib.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/unqualified/element/attrib/e" */
+// /* targetnamespace = "www.example.org/unqualified/element/attrib" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_xml_in_annotation_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_xml_in_annotation_e.ttcn
index 39a8eec5a..29c808659 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_xml_in_annotation_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_xml_in_annotation_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_xml_in_annotation_e.ttcn
+// File: www_example_org_xml_in_annotation.ttcn
// Description:
// References:
// Rev:
@@ -26,7 +26,7 @@
// Generated from file(s):
// - xml_in_annotation.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/xml/in/annotation/e" */
+// /* targetnamespace = "www.example.org/xml/in/annotation" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
@@ -38,7 +38,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_example_org_xml_in_annotation_e {
+module www_example_org_xml_in_annotation {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_w3_org_XML_1998_namespace_PIDF_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_w3_org_XML_1998_namespace_PIDF_e.ttcn
index bed279597..76e3cb37e 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_w3_org_XML_1998_namespace_PIDF_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_w3_org_XML_1998_namespace_PIDF_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_w3_org_XML_1998_namespace_PIDF_e.ttcn
+// File: www_w3_org_XML_1998_namespace_PIDF.ttcn
// Description:
// References:
// Rev:
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_w3_org_XML_1998_namespace_PIDF_e {
+module www_w3_org_XML_1998_namespace_PIDF {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_w3_org_XML_1998_namespace_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_w3_org_XML_1998_namespace_e.ttcn
index 1f77c69ed..77e906e31 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_w3_org_XML_1998_namespace_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_w3_org_XML_1998_namespace_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_w3_org_XML_1998_namespace_e.ttcn
+// File: www_w3_org_XML_1998_namespace.ttcn
// Description:
// References:
// Rev:
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_w3_org_XML_1998_namespace_e {
+module www_w3_org_XML_1998_namespace {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/src/external.cc b/regression_test/XML/XmlWorkflow/src/external.cc
new file mode 100644
index 000000000..29dcb395f
--- /dev/null
+++ b/regression_test/XML/XmlWorkflow/src/external.cc
@@ -0,0 +1,34 @@
+/******************************************************************************
+ * Copyright (c) 2000-2016 Ericsson Telecom AB
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Szabo, Bence Janos
+ *
+ ******************************************************************************/
+#include <TTCN3.hh>
+#include <ctype.h>
+
+namespace xmlTest__Shell {
+
+// Count the lines which starts with a number
+INTEGER f__countDiffs(const CHARSTRING& diffoutput) {
+ INTEGER result = 0;
+ const char* c_diffoutput = (const char*)diffoutput;
+ if (isdigit(*c_diffoutput)) {
+ result = result + 1;
+ }
+ const char* pos = strchr(c_diffoutput, '\n');
+ while (pos != NULL) {
+ if ((pos + 1) != NULL && isdigit(*(pos + 1))) {
+ result = result + 1;
+ }
+ pos = strchr(pos + 1, '\n');
+ }
+ return result;
+}
+
+}
diff --git a/regression_test/XML/XmlWorkflow/src/xmlTest.prj b/regression_test/XML/XmlWorkflow/src/xmlTest.prj
index 56e1f649d..43684fcef 100644
--- a/regression_test/XML/XmlWorkflow/src/xmlTest.prj
+++ b/regression_test/XML/XmlWorkflow/src/xmlTest.prj
@@ -311,6 +311,7 @@
<File path="../XmlTest_expectedTtcns/XmlTest_imsike_e.ttcn" />
<File path="../XmlTest_expectedTtcns/www_XmlTest_org_element_nameInheritance_e.ttcn" />
<File path="../XmlTest_expectedTtcns/www_XmlTest_org_annotation_e.ttcn" />
+ <File path="../XmlTest_expectedTtcns/www_XmlTest_org_annotation2_e.ttcn" />
<File path="../XmlTest_expectedTtcns/www_XmlTest_org_annotation_c_e.ttcn" />
<File path="../XmlTest_expectedTtcns/www_XmlTest_org_annotation_e_e.ttcn" />
<File path="../XmlTest_expectedTtcns/www_XmlTest_org_annotation_t_e.ttcn" />
@@ -420,6 +421,7 @@
<File path="xmlTest_Functions_element.ttcn" />
<File path="xmlTest_Functions_complex.ttcn" />
<File path="xmlTest_Functions_list.ttcn" />
+ <File path="external.cc" />
</File_Group>
<File_Group name="XmlTest_asn1s" />
<File_Group name="Tgc_temporary" >
diff --git a/regression_test/XML/XmlWorkflow/src/xmlTest_Functions_complex.ttcn b/regression_test/XML/XmlWorkflow/src/xmlTest_Functions_complex.ttcn
index ea6371a6d..d59757791 100644
--- a/regression_test/XML/XmlWorkflow/src/xmlTest_Functions_complex.ttcn
+++ b/regression_test/XML/XmlWorkflow/src/xmlTest_Functions_complex.ttcn
@@ -15,15 +15,15 @@
module xmlTest_Functions_complex
{
-import from www_XmlTest_org_complex_simpleContent_e all;
-import from www_XmlTest_org_complex_mixed_e all;
-import from www_XmlTest_org_complex_choice_e all;
-import from www_XmlTest_org_complex_all_e all;
-import from www_XmlTest_org_complex_extension_e all;
-import from www_XmlTest_org_complex_restriction_e all;
-import from www_XmlTest_org_complex_include_e all;
-import from www_XmlTest_org_complex_import_e all;
-import from www_XmlTest_org_complex_any_e all;
+import from www_XmlTest_org_complex_simpleContent all;
+import from www_XmlTest_org_complex_mixed all;
+import from www_XmlTest_org_complex_choice all;
+import from www_XmlTest_org_complex_all all;
+import from www_XmlTest_org_complex_extension all;
+import from www_XmlTest_org_complex_restriction all;
+import from www_XmlTest_org_complex_include all;
+import from www_XmlTest_org_complex_import all;
+import from www_XmlTest_org_complex_any all;
//==============================================================================
// External functions
//==============================================================================
diff --git a/regression_test/XML/XmlWorkflow/src/xmlTest_Functions_complex1.ttcn b/regression_test/XML/XmlWorkflow/src/xmlTest_Functions_complex1.ttcn
index 40f9df521..34e2805f4 100644
--- a/regression_test/XML/XmlWorkflow/src/xmlTest_Functions_complex1.ttcn
+++ b/regression_test/XML/XmlWorkflow/src/xmlTest_Functions_complex1.ttcn
@@ -14,7 +14,7 @@
module xmlTest_Functions_complex1
{
-import from www_XmlTest_org_complex1_e all;
+import from www_XmlTest_org_complex1 all;
external function f_enc_InternationalPrice(in InternationalPrice pdu, out octetstring stream)
with { extension "prototype(fast) encode(XER:XER_EXTENDED)" }
diff --git a/regression_test/XML/XmlWorkflow/src/xmlTest_Functions_complex2.ttcn b/regression_test/XML/XmlWorkflow/src/xmlTest_Functions_complex2.ttcn
index 413514e8c..d8a6730f5 100644
--- a/regression_test/XML/XmlWorkflow/src/xmlTest_Functions_complex2.ttcn
+++ b/regression_test/XML/XmlWorkflow/src/xmlTest_Functions_complex2.ttcn
@@ -14,7 +14,7 @@
module xmlTest_Functions_complex2
{
-import from www_XmlTest_org_complex2_e all;
+import from www_XmlTest_org_complex2 all;
external function f_enc_InternationalPrice2(in InternationalPrice2 pdu, out octetstring stream)
with { extension "prototype(fast) encode(XER:XER_EXTENDED)" }
diff --git a/regression_test/XML/XmlWorkflow/src/xmlTest_Functions_element.ttcn b/regression_test/XML/XmlWorkflow/src/xmlTest_Functions_element.ttcn
index 04a84fa9e..698320ce6 100644
--- a/regression_test/XML/XmlWorkflow/src/xmlTest_Functions_element.ttcn
+++ b/regression_test/XML/XmlWorkflow/src/xmlTest_Functions_element.ttcn
@@ -14,16 +14,16 @@
******************************************************************************/
module xmlTest_Functions_element
{
-import from www_XmlTest_org_element_anyType_e all;
-import from www_XmlTest_org_element_recordOfElements_e all;
-import from www_XmlTest_org_element_recordOfElements3_e all;
-import from www_XmlTest_org_element_recordOfElements4_e all;
-import from www_XmlTest_org_element_recordOfElements5_e all;
-import from www_XmlTest_org_element_nameInheritance_e all;
+import from www_XmlTest_org_element_anyType all;
+import from www_XmlTest_org_element_recordOfElements all;
+import from www_XmlTest_org_element_recordOfElements3 all;
+import from www_XmlTest_org_element_recordOfElements4 all;
+import from www_XmlTest_org_element_recordOfElements5 all;
+import from www_XmlTest_org_element_nameInheritance all;
import from www_ericsson_com_is_isco_Tgc_R6A48_R6H01 all;
import from www_example_org_substitutiongroup all;
import from www_example_org_type_substitution all;
-import from XmlTest_imsike_e all;
+import from XmlTest_imsike all;
import from xmlTest_Shell all;
//==============================================================================
// External functions
diff --git a/regression_test/XML/XmlWorkflow/src/xmlTest_Functions_list.ttcn b/regression_test/XML/XmlWorkflow/src/xmlTest_Functions_list.ttcn
index daa7ee6f7..4d12034d6 100644
--- a/regression_test/XML/XmlWorkflow/src/xmlTest_Functions_list.ttcn
+++ b/regression_test/XML/XmlWorkflow/src/xmlTest_Functions_list.ttcn
@@ -14,7 +14,7 @@
module xmlTest_Functions_list
{
-import from www_XmlTest_org_list_e all;
+import from www_XmlTest_org_list all;
//==============================================================================
// External functions
//==============================================================================
diff --git a/regression_test/XML/XmlWorkflow/src/xmlTest_Functions_string.ttcn b/regression_test/XML/XmlWorkflow/src/xmlTest_Functions_string.ttcn
index 92a352678..545783be2 100644
--- a/regression_test/XML/XmlWorkflow/src/xmlTest_Functions_string.ttcn
+++ b/regression_test/XML/XmlWorkflow/src/xmlTest_Functions_string.ttcn
@@ -14,9 +14,9 @@
module xmlTest_Functions_string
{
-import from www_XmlTest_org_string_e all;
-import from www_XmlTest_org_string_withEnum_e all;
-import from www_XmlTest_org_string_withWhitespace_e all;
+import from www_XmlTest_org_string all;
+import from www_XmlTest_org_string_withEnum all;
+import from www_XmlTest_org_string_withWhitespace all;
import from xmlTest_Shell all;
//==============================================================================
// External functions
diff --git a/regression_test/XML/XmlWorkflow/src/xmlTest_Shell.ttcn b/regression_test/XML/XmlWorkflow/src/xmlTest_Shell.ttcn
index c6bf0d9b0..cc91aeb47 100644
--- a/regression_test/XML/XmlWorkflow/src/xmlTest_Shell.ttcn
+++ b/regression_test/XML/XmlWorkflow/src/xmlTest_Shell.ttcn
@@ -99,7 +99,8 @@ type component mtc_CT {}
// -p switch needed because it would overwrite the predefined XSD.ttcn and
// UsefulTtcn3types.ttcn file with each xsd2ttcn execution
-const charstring xsd2ttcn_command := "xsd2ttcn -p ";
+// -t switch needed to not generate timing information
+const charstring xsd2ttcn_command := "xsd2ttcn -p -t ";
const integer c_shell_successWithoutWarningAndError:=0;
const integer c_shell_success := 0;
@@ -108,57 +109,36 @@ const integer c_shell_error:=256;
const integer c_shell_error_noSuchFileOrDirectory:=512;
//Expected and accepted diffs:
-// Line "Copyright Ericsson AB 2013" - 4 diffs
-// Line "XSD to TTCN-3 Translator version:" - 4 diffs
-// Line "File" - 4 diffs
-// Line "Updated: " - 4 diffs
-// Line "module www_" - 4 diffs
-// Line "ETSI ES 201 873-9 V4.1.2" - 2 diffs ???? << Fix it !
-// Line "variant \"namespace as" - 4 diffs
-// Script counts the strings "\n" thus N different lines mean N-1 numOfDiff
-//Possible values:12+ 8+ 19,21,23,25 but 21 and 25 should be eliminated!
-
-const integer c_numOfDiff_header := 21+12;
-const integer c_numOfDiff_headerAndModuleName := 27+12;
-const integer c_numOfDiff_headerModNameAndNamespace := 31+12;
-const integer c_numOfDiff_headerModNameAndImport := 31+12;
+// Line "Copyright (c) 2000-2016" - 1 diff
+// Lines "Contributors: ... " - 1 diff
+// Line "Updated: " - 1 diff
+// Optional diff: Module name - 1 diff
-//=========================================================================
-// Templates
-//=========================================================================
+// In most cases this 3 diff will be present, but in some rare cases there
+// will be 4.
-// Insert templates here if applicable!
-// You can use the template skeleton!
+const integer c_numOfDiff := 3;
+const integer c_numOfDiff_ModName := 4;
-//=========================================================================
-// Altsteps
-//=========================================================================
+// When creating new testcases: Change the copyright header of the expected
+// ttcn just like in the other expected ttcns and write your name into a
+// contributors section just like in the other expected ttcns. In normal
+// case theese changes are required.
-// Insert altsteps here if applicable!
-// You can use the altstep skeleton!
-
-//=========================================================================
-// Functions
-//=========================================================================
//=========================================================================
-// f_countDelimiters
+// f_countDiffs
//=========================================================================
-function f_countDelimiters(in charstring pl_string, in charstring pl_delimiter, inout integer pl_counter) {
- pl_counter:=0;
- var integer pos:=0;
- var integer vl_size:=lengthof(pl_string);
- var integer vl_delimsize:=lengthof(pl_delimiter);
- while(pos<vl_size) {
- if( substr(pl_string,pos,vl_delimsize)==pl_delimiter) { pl_counter:=pl_counter+1}
- pos:=pos+1;
- }
-}//f_
+// Each difference starts with a newline and a number. This function
+// counts these.
+external function f_countDiffs(charstring diffoutput) return integer;
//=========================================================================
// f_compareFiles
//=========================================================================
-//pl_diffLimit: upper limit of acceptable diff lines. 4 means one acceptable difference
+// File comparison works with the following logic:
+// Command to execute: diff -w file1 file2
+// The result is passed to the f_countDiffs which counts the differences
function f_compareFiles(in charstring pl_file1, in charstring pl_file2, in integer pl_diffLimit) runs on xmlTest_CT {
var integer vl_expectedResult:=0
if(pl_diffLimit>0) { vl_expectedResult:=256; }
@@ -171,9 +151,9 @@ function f_compareFiles(in charstring pl_file1, in charstring pl_file2, in integ
}
else if(v_ASP_PResult.code==256) {
var integer vl_counter:=0;
- f_countDelimiters(v_ASP_PResult.stdout,"\n",vl_counter);
- log("Counted lines: ",vl_counter, " diffLimit: ", pl_diffLimit)
- if(vl_counter>pl_diffLimit) {
+ vl_counter := f_countDiffs(v_ASP_PResult.stdout);
+ log("Counted differences: ",vl_counter, " Expected differences: ", pl_diffLimit)
+ if(vl_counter!=pl_diffLimit) {
setverdict(fail);
}
} else { //e.g 512: No such file or directory
@@ -182,6 +162,23 @@ function f_compareFiles(in charstring pl_file1, in charstring pl_file2, in integ
}
}//f_
+//=========================================================================
+// Templates
+//=========================================================================
+
+// Insert templates here if applicable!
+// You can use the template skeleton!
+
+//=========================================================================
+// Altsteps
+//=========================================================================
+
+// Insert altsteps here if applicable!
+// You can use the altstep skeleton!
+
+//=========================================================================
+// Functions
+//=========================================================================
//********* SHELL Functions ***********************
diff --git a/regression_test/XML/XmlWorkflow/src/xmlTest_Testcases.ttcn b/regression_test/XML/XmlWorkflow/src/xmlTest_Testcases.ttcn
index eb5ac4931..5e58d3672 100644
--- a/regression_test/XML/XmlWorkflow/src/xmlTest_Testcases.ttcn
+++ b/regression_test/XML/XmlWorkflow/src/xmlTest_Testcases.ttcn
@@ -35,12 +35,12 @@ import from PIPEasp_PortType all;
import from PIPEasp_Templates all;
import from xmlTest_Shell all;
-import from www_XmlTest_org_element_anyType_e all;
-import from www_XmlTest_org_complex_all_e all;
-import from www_XmlTest_org_complex_extension_e all;
-import from www_XmlTest_org_complex_restriction_e all;
-import from www_XmlTest_org_complex_import_e all;
-import from www_XmlTest_org_complex_any_e all;
+import from www_XmlTest_org_element_anyType all;
+import from www_XmlTest_org_complex_all all;
+import from www_XmlTest_org_complex_extension all;
+import from www_XmlTest_org_complex_restriction all;
+import from www_XmlTest_org_complex_import all;
+import from www_XmlTest_org_complex_any all;
import from xmlTest_Functions_string all;
import from xmlTest_Functions_complex1 all;
@@ -82,8 +82,6 @@ import from xmlTest_Functions_list all;
//Component Types
//=========================================================================
-type component xmlTest_CT extends Shell_CT {}
-
type component mtc_CT {}
//=========================================================================
// Constants
@@ -107,48 +105,6 @@ type component mtc_CT {}
// Functions
//=========================================================================
-//=========================================================================
-// f_countDelimiters
-//=========================================================================
-function f_countDelimiters(in charstring pl_string, in charstring pl_delimiter, inout integer pl_counter) {
- pl_counter:=0;
- var integer pos:=0;
- var integer vl_size:=lengthof(pl_string);
- var integer vl_delimsize:=lengthof(pl_delimiter);
- while(pos<vl_size) {
- if( substr(pl_string,pos,vl_delimsize)==pl_delimiter) { pl_counter:=pl_counter+1}
- pos:=pos+1;
- }
-}//f_
-
-//=========================================================================
-// f_compareFiles
-//=========================================================================
-//pl_diffLimit: upper limit of acceptable diff lines. 4 means one acceptable difference
-function f_compareFiles(in charstring pl_file1, in charstring pl_file2, in integer pl_diffLimit) runs on xmlTest_CT {
- var integer vl_expectedResult:=0
- if(pl_diffLimit>0) { vl_expectedResult:=256; }
- var boolean vl_success:=false;
- f_shell_command("diff -w " & pl_file1 & " " & pl_file2,"",vl_expectedResult,vl_success);
-
- if(v_ASP_PResult.code==0)
- {
- setverdict(pass);
- }
- else if(v_ASP_PResult.code==256) {
- var integer vl_counter:=0;
- f_countDelimiters(v_ASP_PResult.stdout,"\n",vl_counter);
- log("Counted lines: ",vl_counter, " diffLimit: ", pl_diffLimit)
- if(vl_counter>pl_diffLimit) {
- setverdict(fail);
- }
- } else { //e.g 512: No such file or directory
- log("Wrong result code: ",v_ASP_PResult.code, " Expected result code: ", vl_expectedResult)
- setverdict(fail);
- }
-}//f_
-
-
//=========================================================================
// Testcases
//=========================================================================
@@ -169,7 +125,7 @@ testcase tc_firstTrial() runs on xmlTest_CT
if(getverdict==pass) {
f_compareFiles(
- "www_example_org_elements_e.ttcn","www_example_org_elements.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_example_org_elements_e.ttcn","www_example_org_elements.ttcn", c_numOfDiff);
}
}
@@ -181,7 +137,7 @@ testcase tc_secondTrial() runs on xmlTest_CT
if(getverdict==pass) {
f_compareFiles(
- "http_www_XmlTest_org_po_e.ttcn","http_www_XmlTest_org_po.ttcn", c_numOfDiff_headerAndModuleName);
+ "http_www_XmlTest_org_po_e.ttcn","http_www_XmlTest_org_po.ttcn", c_numOfDiff);
}
}
testcase tc_empty() runs on xmlTest_CT
@@ -190,7 +146,7 @@ testcase tc_empty() runs on xmlTest_CT
if(getverdict==pass) {
f_compareFiles(
- "www_XmlTest_org_empty_e.ttcn","www_XmlTest_org_empty.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_XmlTest_org_empty_e.ttcn","www_XmlTest_org_empty.ttcn", c_numOfDiff);
}
}
@@ -199,7 +155,7 @@ testcase tc_annotation() runs on xmlTest_CT
f_shellCommandWithVerdict(xsd2ttcn_command & " XmlTest_annotation.xsd","",c_shell_successWithWarning);
if(getverdict==pass) {
f_compareFiles(
- "www_XmlTest_org_annotation_e.ttcn","www_XmlTest_org_annotation.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_XmlTest_org_annotation_e.ttcn","www_XmlTest_org_annotation.ttcn", c_numOfDiff);
}
}
@@ -220,7 +176,7 @@ testcase tc_xml_in_annotation() runs on xmlTest_CT
f_shellCommandWithVerdict(xsd2ttcn_command & " xml_in_annotation.xsd","",c_shell_successWithoutWarningAndError);
if(getverdict==pass) {
f_compareFiles(
- "www_example_org_xml_in_annotation_e.ttcn","www_example_org_xml_in_annotation.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_example_org_xml_in_annotation_e.ttcn","www_example_org_xml_in_annotation.ttcn", c_numOfDiff);
}
}
@@ -253,7 +209,7 @@ testcase tc_options_c() runs on xmlTest_CT
{
f_shellCommandWithVerdict(xsd2ttcn_command & " -c XmlTest_annotation.xsd","",c_shell_successWithWarning );
if(getverdict==pass) {
- f_compareFiles("www_XmlTest_org_annotation_c_e.ttcn","www_XmlTest_org_annotation.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ f_compareFiles("www_XmlTest_org_annotation_c_e.ttcn","www_XmlTest_org_annotation.ttcn", c_numOfDiff_ModName);
}
}
@@ -262,7 +218,7 @@ testcase tc_options_e() runs on xmlTest_CT
{
f_shellCommandWithVerdict(xsd2ttcn_command & " -e XmlTest_annotation.xsd","",c_shell_successWithWarning );
if(getverdict==pass) {
- f_compareFiles("www_XmlTest_org_annotation_e_e.ttcn","www_XmlTest_org_annotation.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ f_compareFiles("www_XmlTest_org_annotation_e_e.ttcn","www_XmlTest_org_annotation.ttcn", c_numOfDiff_ModName);
}
}
@@ -271,7 +227,7 @@ testcase tc_options_f() runs on xmlTest_CT
{
f_shellCommandWithVerdict(xsd2ttcn_command & " -f XmlTest_files1.txt","",c_shell_successWithWarning );
if(getverdict==pass) {
- f_compareFiles("www_XmlTest_org_annotation_e.ttcn","www_XmlTest_org_annotation.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ f_compareFiles("www_XmlTest_org_annotation2_e.ttcn","www_XmlTest_org_annotation.ttcn", c_numOfDiff_ModName);
}
}
@@ -280,13 +236,13 @@ testcase tc_options_g() runs on xmlTest_CT
f_shellCommandWithVerdict(xsd2ttcn_command & " -g dont_generate_element_substitution.xsd","",c_shell_successWithoutWarningAndError );
if(getverdict==pass) {
f_compareFiles("www_example_org_dont_generate_element_substitution_e.ttcn",
- "www_example_org_dont_generate_element_substitution.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_example_org_dont_generate_element_substitution.ttcn", c_numOfDiff);
}
f_shellCommandWithVerdict(xsd2ttcn_command & " generate_element_substitution.xsd","",c_shell_successWithoutWarningAndError );
if(getverdict==pass) {
f_compareFiles("www_example_org_generate_element_substitution_e.ttcn",
- "www_example_org_generate_element_substitution.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_example_org_generate_element_substitution.ttcn", c_numOfDiff);
}
}
@@ -336,7 +292,7 @@ testcase tc_options_t() runs on xmlTest_CT
{
f_shellCommandWithVerdict(xsd2ttcn_command & " -t XmlTest_annotation.xsd","",c_shell_successWithWarning );
if(getverdict==pass) {
- f_compareFiles("www_XmlTest_org_annotation_t_e.ttcn","www_XmlTest_org_annotation.ttcn", c_numOfDiff_headerAndModuleName);
+ f_compareFiles("www_XmlTest_org_annotation_t_e.ttcn","www_XmlTest_org_annotation.ttcn", c_numOfDiff_ModName);
}
}
@@ -399,7 +355,7 @@ group Testcases_basedOnTtcnStandard9 {
f_shellCommandWithVerdict(xsd2ttcn_command & " all.xsd","",c_shell_successWithoutWarningAndError);
if(getverdict==pass) {
f_compareFiles(
- "www_example_org_all_e.ttcn","www_example_org_all.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_example_org_all_e.ttcn","www_example_org_all.ttcn", c_numOfDiff);
}
}
@@ -415,7 +371,7 @@ group Testcases_basedOnTtcnStandard9 {
if(getverdict==pass) {
f_compareFiles(
- "http_www_example_org_ttcn_wildcards_e.ttcn","http_www_example_org_ttcn_wildcards.ttcn", c_numOfDiff_headerAndModuleName);
+ "http_www_example_org_ttcn_wildcards_e.ttcn","http_www_example_org_ttcn_wildcards.ttcn", c_numOfDiff);
}
}
@@ -427,7 +383,7 @@ group Testcases_basedOnTtcnStandard9 {
f_shellCommandWithVerdict(xsd2ttcn_command & " HQ73011.xsd","",c_shell_successWithoutWarningAndError);
if(getverdict==pass) {
f_compareFiles(
- "urn_ietf_params_xml_ns_conference_info_e.ttcn","urn_ietf_params_xml_ns_conference_info.ttcn", c_numOfDiff_headerAndModuleName);
+ "urn_ietf_params_xml_ns_conference_info_e.ttcn","urn_ietf_params_xml_ns_conference_info.ttcn", c_numOfDiff);
}
}
@@ -436,7 +392,7 @@ group Testcases_basedOnTtcnStandard9 {
f_shellCommandWithVerdict(xsd2ttcn_command & " anyattribute_optional.xsd","",c_shell_successWithoutWarningAndError);
if(getverdict==pass) {
f_compareFiles(
- "http_www_example_org_wildcards_e.ttcn","http_www_example_org_wildcards.ttcn", c_numOfDiff_headerAndModuleName);
+ "http_www_example_org_wildcards_e.ttcn","http_www_example_org_wildcards.ttcn", c_numOfDiff);
}
}
@@ -445,7 +401,7 @@ group Testcases_basedOnTtcnStandard9 {
f_shellCommandWithVerdict(xsd2ttcn_command & " anyattrib_single.xsd","",c_shell_successWithoutWarningAndError);
if(getverdict==pass) {
f_compareFiles(
- "www_example_org_anyattrib_single_e.ttcn","www_example_org_anyattrib_single.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_example_org_anyattrib_single_e.ttcn","www_example_org_anyattrib_single.ttcn", c_numOfDiff);
}
}
@@ -454,7 +410,7 @@ group Testcases_basedOnTtcnStandard9 {
f_shellCommandWithVerdict(xsd2ttcn_command & " anyattr_in_complex.xsd","",c_shell_successWithoutWarningAndError);
if(getverdict==pass) {
f_compareFiles(
- "www_example_org_anyattr_in_complex_e.ttcn","www_example_org_anyattr_in_complex.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_example_org_anyattr_in_complex_e.ttcn","www_example_org_anyattr_in_complex.ttcn", c_numOfDiff);
}
}
@@ -466,7 +422,7 @@ group Testcases_basedOnTtcnStandard9 {
if(getverdict==pass) {
f_compareFiles(
- "www_example_org_attributegroup_e.ttcn","www_example_org_attributegroup.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_example_org_attributegroup_e.ttcn","www_example_org_attributegroup.ttcn", c_numOfDiff);
}
}
@@ -481,7 +437,7 @@ group Testcases_basedOnTtcnStandard9 {
f_shellCommandWithVerdict(xsd2ttcn_command & " id_attrib.xsd","",c_shell_successWithWarning);
if(getverdict==pass) {
f_compareFiles(
- "www_example_org_id_attrib_e.ttcn", "www_example_org_id_attrib.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_example_org_id_attrib_e.ttcn", "www_example_org_id_attrib.ttcn", c_numOfDiff);
}
}
@@ -490,12 +446,12 @@ group Testcases_basedOnTtcnStandard9 {
f_shellCommandWithVerdict(xsd2ttcn_command & " attrib_order_a.xsd attrib_order_b.xsd attrib_order_c.xsd","",c_shell_successWithoutWarningAndError);
if(getverdict==pass) {
f_compareFiles(
- "www_example_org_attrib_order_a_e.ttcn", "www_example_org_attrib_order_a.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_example_org_attrib_order_a_e.ttcn", "www_example_org_attrib_order_a.ttcn", c_numOfDiff+1); // +1: imported module
}
if(getverdict==pass) {
f_compareFiles(
- "www_example_org_attrib_order_b_e.ttcn", "www_example_org_attrib_order_b.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_example_org_attrib_order_b_e.ttcn", "www_example_org_attrib_order_b.ttcn", c_numOfDiff);
}
}
@@ -505,7 +461,7 @@ group Testcases_basedOnTtcnStandard9 {
if(getverdict==pass) {
f_compareFiles(
"http_www_example_org_name_conv2_e.ttcn",
- "http_www_example_org_name_conv2.ttcn", c_numOfDiff_headerAndModuleName);
+ "http_www_example_org_name_conv2.ttcn", c_numOfDiff);
}
}
@@ -514,12 +470,12 @@ group Testcases_basedOnTtcnStandard9 {
if(getverdict==pass) {
f_compareFiles(
- "imported_module_e.ttcn","imported_module.ttcn", c_numOfDiff_headerAndModuleName);
+ "imported_module_e.ttcn","imported_module.ttcn", c_numOfDiff);
}
if(getverdict==pass) {
f_compareFiles(
- "imported_module_1_e.ttcn","imported_module_1.ttcn", c_numOfDiff_headerAndModuleName);
+ "imported_module_1_e.ttcn","imported_module_1.ttcn", c_numOfDiff);
}
}//tc_
@@ -528,12 +484,12 @@ group Testcases_basedOnTtcnStandard9 {
if(getverdict==pass) {
f_compareFiles(
- "module_typename_conversion_e.ttcn","module_typename_conversion.ttcn", c_numOfDiff_headerAndModuleName);
+ "module_typename_conversion_e.ttcn","module_typename_conversion.ttcn", c_numOfDiff);
}
if(getverdict==pass) {
f_compareFiles(
- "MyTypes_e.ttcn","MyTypes.ttcn", c_numOfDiff_headerAndModuleName);
+ "MyTypes_e.ttcn","MyTypes.ttcn", c_numOfDiff);
}
}//tc_
@@ -544,7 +500,7 @@ group Testcases_basedOnTtcnStandard9 {
if(getverdict==pass) {
f_compareFiles(
"http_www_example_org_name_conv3_e.ttcn",
- "http_www_example_org_name_conv3.ttcn", c_numOfDiff_headerAndModuleName);
+ "http_www_example_org_name_conv3.ttcn", c_numOfDiff);
}
}
@@ -554,7 +510,7 @@ group Testcases_basedOnTtcnStandard9 {
if(getverdict==pass) {
f_compareFiles(
"www_example_org_name_conv_http_e.ttcn",
- "www_example_org_name_conv_http.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_example_org_name_conv_http.ttcn", c_numOfDiff);
}
}
@@ -564,7 +520,7 @@ group Testcases_basedOnTtcnStandard9 {
if(getverdict==pass) {
f_compareFiles(
"www_example_org_comment_placement_e.ttcn",
- "www_example_org_comment_placement.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_example_org_comment_placement.ttcn", c_numOfDiff);
}
}
@@ -587,7 +543,7 @@ group StringTest {
if(getverdict==pass) {
f_compareFiles(
"www_XmlTest_org_string.ttcn",
- "www_XmlTest_org_string_e.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_XmlTest_org_string_e.ttcn", c_numOfDiff);
}
////////////////////////////////////////////
//
@@ -606,7 +562,7 @@ group StringTest {
if(getverdict==pass) {
f_compareFiles(
"www_XmlTest_org_string_withWhitespace.ttcn",
- "www_XmlTest_org_string_withWhitespace_e.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_XmlTest_org_string_withWhitespace_e.ttcn", c_numOfDiff);
}
f_encDecTest_StringWhiteSpaceP();
f_encDecTest_StringWhiteSpaceR();
@@ -620,7 +576,7 @@ group StringTest {
if(getverdict==pass) {
f_compareFiles(
"www_XmlTest_org_string_withEnum.ttcn",
- "www_XmlTest_org_string_withEnum_e.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_XmlTest_org_string_withEnum_e.ttcn", c_numOfDiff);
}
f_encDecTest_StringEnum();
}
@@ -640,7 +596,7 @@ group StringTest {
if(getverdict==pass) {
f_compareFiles(
"www_XmlTest_org_string_withPosLength.ttcn",
- "www_XmlTest_org_string_withPosLength_e.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_XmlTest_org_string_withPosLength_e.ttcn", c_numOfDiff);
}
}
@@ -667,7 +623,7 @@ group StringTest {
if(getverdict==pass) {
f_compareFiles(
"www_example_org_fixed_value.ttcn",
- "www_example_org_fixed_value_e.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_example_org_fixed_value_e.ttcn", c_numOfDiff);
}
}
@@ -685,7 +641,7 @@ group StringTest {
if(getverdict==pass) {
f_compareFiles(
"www_XmlTest_org_string_withMinLength.ttcn",
- "www_XmlTest_org_string_withMinLength_e.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_XmlTest_org_string_withMinLength_e.ttcn", c_numOfDiff);
}
}
@@ -708,7 +664,7 @@ group StringTest {
f_shellCommandWithVerdict(xsd2ttcn_command & " XmlTest_string_withPosMax.xsd","",c_shell_successWithoutWarningAndError);
if(getverdict==pass) {
f_compareFiles(
- "www_XmlTest_org_string_withPosMax_e.ttcn","www_XmlTest_org_string_withPosMax.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_XmlTest_org_string_withPosMax_e.ttcn","www_XmlTest_org_string_withPosMax.ttcn", c_numOfDiff);
}
}
@@ -745,7 +701,7 @@ group StringTest {
// f_shellCommandWithVerdict(xsd2ttcn_command & " regex_square_brackets.xsd","",c_shell_successWithoutWarningAndError);
// if(getverdict==pass) {
// f_compareFiles(
- // "www_example_org_regex_square_brackets_e.ttcn","www_example_org_regex_square_brackets.ttcn", c_numOfDiff_headerAndModuleName);
+ // "www_example_org_regex_square_brackets_e.ttcn","www_example_org_regex_square_brackets.ttcn", c_numOfDiff);
// }
//}
}//StringTest
@@ -760,7 +716,7 @@ group BooleanTest {
f_shellCommandWithVerdict(xsd2ttcn_command & " XmlTest_boolean.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
- "www_XmlTest_org_boolean_e.ttcn","www_XmlTest_org_boolean.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_XmlTest_org_boolean_e.ttcn","www_XmlTest_org_boolean.ttcn", c_numOfDiff);
}
}
@@ -769,7 +725,7 @@ group BooleanTest {
if(getverdict==pass) {
f_compareFiles(
"www_example_org_boolean_variant_commented_e.ttcn",
- "www_example_org_boolean_variant_commented.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_example_org_boolean_variant_commented.ttcn", c_numOfDiff);
}
}
}//BooleanTest
@@ -786,7 +742,7 @@ group DecimalTest {
if(getverdict==pass) {
f_compareFiles(
"www_XmlTest_org_decimal_e.ttcn",
- "www_XmlTest_org_decimal.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_XmlTest_org_decimal.ttcn", c_numOfDiff);
}
}
@@ -796,7 +752,7 @@ group DecimalTest {
// if(getverdict==pass) {
// f_compareFiles(
// "www_XmlTest_org_decimal_withLength_e.ttcn",
- // "www_XmlTest_org_decimal_withLength.ttcn", c_numOfDiff_headerAndModuleName);
+ // "www_XmlTest_org_decimal_withLength.ttcn", c_numOfDiff);
// }
// }
@@ -808,7 +764,7 @@ group DecimalTest {
if(getverdict==pass) {
f_compareFiles(
"www_XmlTest_org_decimal_withMinMaxInclusive_e.ttcn",
- "www_XmlTest_org_decimal_withMinMaxInclusive.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_XmlTest_org_decimal_withMinMaxInclusive.ttcn", c_numOfDiff);
}
}//tc_
@@ -819,7 +775,7 @@ group DecimalTest {
if(getverdict==pass) {
f_compareFiles(
"www_XmlTest_org_decimal_withMinMaxExclusive_e.ttcn",
- "www_XmlTest_org_decimal_withMinMaxExclusive.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_XmlTest_org_decimal_withMinMaxExclusive.ttcn", c_numOfDiff);
}
}//tc_
@@ -830,7 +786,7 @@ group DecimalTest {
if(getverdict==pass) {
f_compareFiles(
"www_XmlTest_org_decimal_withEnum_e.ttcn",
- "www_XmlTest_org_decimal_withEnum.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_XmlTest_org_decimal_withEnum.ttcn", c_numOfDiff);
}
}
@@ -840,7 +796,7 @@ group DecimalTest {
if(getverdict==pass) {
f_compareFiles(
"www_example_org_decimal_fractiondigits_e.ttcn",
- "www_example_org_decimal_fractiondigits.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_example_org_decimal_fractiondigits.ttcn", c_numOfDiff);
}
}
}//DecimalTest
@@ -857,7 +813,7 @@ group IntegerTest {
if(getverdict==pass) {
f_compareFiles(
"www_XmlTest_org_integer_e.ttcn",
- "www_XmlTest_org_integer.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_XmlTest_org_integer.ttcn", c_numOfDiff);
}
}//tc_
@@ -878,7 +834,7 @@ group IntegerTest {
if(getverdict==pass) {
f_compareFiles(
- "www_XmlTest_org_integer_withEnum_e.ttcn","www_XmlTest_org_integer_withEnum.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_XmlTest_org_integer_withEnum_e.ttcn","www_XmlTest_org_integer_withEnum.ttcn", c_numOfDiff);
}
}//tc_
@@ -889,7 +845,7 @@ group IntegerTest {
if(getverdict==pass) {
f_compareFiles(
"www_XmlTest_org_integer_withMinIncl_e.ttcn",
- "www_XmlTest_org_integer_withMinIncl.ttcn",c_numOfDiff_headerAndModuleName);
+ "www_XmlTest_org_integer_withMinIncl.ttcn",c_numOfDiff);
}
}//tc_
@@ -899,7 +855,7 @@ group IntegerTest {
if(getverdict==pass) {
f_compareFiles(
- "www_XmlTest_org_integer_withMaxIncl_e.ttcn","www_XmlTest_org_integer_withMaxIncl.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_XmlTest_org_integer_withMaxIncl_e.ttcn","www_XmlTest_org_integer_withMaxIncl.ttcn", c_numOfDiff);
}
}//tc_
@@ -910,7 +866,7 @@ group IntegerTest {
if(getverdict==pass) {
f_compareFiles(
"www_XmlTest_org_integer_withMinExcl_e.ttcn",
- "www_XmlTest_org_integer_withMinExcl.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_XmlTest_org_integer_withMinExcl.ttcn", c_numOfDiff);
}
}//tc_
@@ -920,7 +876,7 @@ group IntegerTest {
if(getverdict==pass) {
f_compareFiles(
- "www_XmlTest_org_integer_withMaxExcl_e.ttcn","www_XmlTest_org_integer_withMaxExcl.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_XmlTest_org_integer_withMaxExcl_e.ttcn","www_XmlTest_org_integer_withMaxExcl.ttcn", c_numOfDiff);
}
}//tc_
@@ -934,7 +890,7 @@ group IntegerTest {
if(getverdict==pass) {
f_compareFiles(
"www_example_org_not_a_number_minex_inf_maxex_inf_e.ttcn",
- "www_example_org_not_a_number_minex_inf_maxex_inf.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_example_org_not_a_number_minex_inf_maxex_inf.ttcn", c_numOfDiff);
}
}//tc_
@@ -945,7 +901,7 @@ group IntegerTest {
if(getverdict==pass) {
f_compareFiles(
- "www_XmlTest_org_simple_enum_e.ttcn","www_XmlTest_org_simple_enum.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_XmlTest_org_simple_enum_e.ttcn","www_XmlTest_org_simple_enum.ttcn", c_numOfDiff);
}
}//tc_
@@ -956,7 +912,7 @@ group IntegerTest {
if(getverdict==pass) {
f_compareFiles(
- "www_example_org_simpletype_restrict_comp_e.ttcn","www_example_org_simpletype_restrict_comp.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_example_org_simpletype_restrict_comp_e.ttcn","www_example_org_simpletype_restrict_comp.ttcn", c_numOfDiff);
}
}//tc_
@@ -967,7 +923,7 @@ group IntegerTest {
if(getverdict==pass) {
f_compareFiles(
- "www_example_org_simpletype_ref_e.ttcn","www_example_org_simpletype_ref.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_example_org_simpletype_ref_e.ttcn","www_example_org_simpletype_ref.ttcn", c_numOfDiff);
}
}//tc_
@@ -978,7 +934,7 @@ group IntegerTest {
if(getverdict==pass) {
f_compareFiles(
- "www_example_org_simpletype_base_e.ttcn","www_example_org_simpletype_base.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_example_org_simpletype_base_e.ttcn","www_example_org_simpletype_base.ttcn", c_numOfDiff);
}
}//tc_
@@ -990,7 +946,7 @@ group IntegerTest {
if(getverdict==pass) {
f_compareFiles(
- "www_example_org_enum_field_names_e.ttcn","www_example_org_enum_field_names.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_example_org_enum_field_names_e.ttcn","www_example_org_enum_field_names.ttcn", c_numOfDiff);
}
}//tc_
@@ -1001,7 +957,7 @@ group IntegerTest {
if(getverdict==pass) {
f_compareFiles(
- "www_example_org_attribute_enumeration_variant_e.ttcn","www_example_org_attribute_enumeration_variant.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_example_org_attribute_enumeration_variant_e.ttcn","www_example_org_attribute_enumeration_variant.ttcn", c_numOfDiff);
}
}//tc_
@@ -1018,7 +974,7 @@ group TimeTest {
if(getverdict==pass) {
f_compareFiles(
- "www_XmlTest_org_time_e.ttcn","www_XmlTest_org_time.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_XmlTest_org_time_e.ttcn","www_XmlTest_org_time.ttcn", c_numOfDiff);
}
}//tc_
@@ -1028,7 +984,7 @@ group TimeTest {
if(getverdict==pass) {
f_compareFiles(
- "www_XmlTest_org_time_withEnum_e.ttcn","www_XmlTest_org_time_withEnum.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_XmlTest_org_time_withEnum_e.ttcn","www_XmlTest_org_time_withEnum.ttcn", c_numOfDiff);
}
}//tc_
}//TimeTest
@@ -1041,7 +997,7 @@ group ListTest {
if(getverdict==pass) {
f_compareFiles(
- "www_XmlTest_org_list_e.ttcn","www_XmlTest_org_list.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_XmlTest_org_list_e.ttcn","www_XmlTest_org_list.ttcn", c_numOfDiff);
}
// restrictions:length, minLength, maxLength, pattern, and enumeration.
@@ -1057,7 +1013,7 @@ group ListTest {
if(getverdict==pass) {
f_compareFiles(
- "www_XmlTest_org_list_integer_e.ttcn","www_XmlTest_org_list_integer.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_XmlTest_org_list_integer_e.ttcn","www_XmlTest_org_list_integer.ttcn", c_numOfDiff);
}
}//tc_
@@ -1068,7 +1024,7 @@ group ListTest {
if(getverdict==pass) {
f_compareFiles(
- "www_example_org_list_simpletype_e.ttcn","www_example_org_list_simpletype.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_example_org_list_simpletype_e.ttcn","www_example_org_list_simpletype.ttcn", c_numOfDiff);
}
}//tc_
@@ -1079,7 +1035,7 @@ group ListTest {
if(getverdict==pass) {
f_compareFiles(
- "www_example_org_list_complextype_e.ttcn","www_example_org_list_complextype.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_example_org_list_complextype_e.ttcn","www_example_org_list_complextype.ttcn", c_numOfDiff);
}
}//tc_
@@ -1090,7 +1046,7 @@ group ListTest {
if(getverdict==pass) {
f_compareFiles(
- "http_www_example_org_list_minmaxoccurs_e.ttcn","http_www_example_org_list_minmaxoccurs.ttcn", c_numOfDiff_headerAndModuleName);
+ "http_www_example_org_list_minmaxoccurs_e.ttcn","http_www_example_org_list_minmaxoccurs.ttcn", c_numOfDiff);
}
}//tc_
@@ -1104,7 +1060,7 @@ group UnionTest {
if(getverdict==pass) {
f_compareFiles(
- "www_XmlTest_org_union_e.ttcn","www_XmlTest_org_union.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_XmlTest_org_union_e.ttcn","www_XmlTest_org_union.ttcn", c_numOfDiff);
}
}//tc_
@@ -1114,7 +1070,7 @@ group UnionTest {
if(getverdict==pass) {
f_compareFiles(
- "ETSI_CR5852_union_e.ttcn","ETSI_CR5852_union.ttcn", c_numOfDiff_headerAndModuleName);
+ "ETSI_CR5852_union_e.ttcn","ETSI_CR5852_union.ttcn", c_numOfDiff);
}
}
@@ -1125,7 +1081,7 @@ group UnionTest {
if(getverdict==pass) {
f_compareFiles(
"www_example_org_enumeration_restriction_e.ttcn",
- "www_example_org_enumeration_restriction.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_example_org_enumeration_restriction.ttcn", c_numOfDiff);
}
}
@@ -1136,7 +1092,7 @@ group UnionTest {
if(getverdict==pass) {
f_compareFiles(
"www_example_org_seq_enumeration_restriction_e.ttcn",
- "www_example_org_seq_enumeration_restriction.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_example_org_seq_enumeration_restriction.ttcn", c_numOfDiff);
}
}
@@ -1147,7 +1103,7 @@ group UnionTest {
if(getverdict==pass) {
f_compareFiles(
"www_example_org_enumeration_restriction3_e.ttcn",
- "www_example_org_enumeration_restriction3.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_example_org_enumeration_restriction3.ttcn", c_numOfDiff);
}
}
@@ -1159,7 +1115,7 @@ group UnionTest {
if(getverdict==pass) {
f_compareFiles(
"www_example_org_enumeration_remove_dup_e.ttcn",
- "www_example_org_enumeration_remove_dup.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_example_org_enumeration_remove_dup.ttcn", c_numOfDiff);
}
}
@@ -1175,7 +1131,7 @@ group ComplexType {
if(getverdict==pass) {
f_compareFiles(
- "www_XmlTest_org_complex1_e.ttcn","www_XmlTest_org_complex1.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_XmlTest_org_complex1_e.ttcn","www_XmlTest_org_complex1.ttcn", c_numOfDiff);
f_encDecTest_InternationalPrice();
}
}//tc_
@@ -1187,7 +1143,7 @@ group ComplexType {
if(getverdict==pass) {
f_compareFiles(
- "www_XmlTest_org_complex2_e.ttcn","www_XmlTest_org_complex2.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_XmlTest_org_complex2_e.ttcn","www_XmlTest_org_complex2.ttcn", c_numOfDiff);
}
f_encDecTest_InternationalPrice2(); //TR: HL24977 -solved -Primer, 2.5.3 Empty Content
f_encDecTest_InternationalPrice3();
@@ -1200,7 +1156,7 @@ group ComplexType {
if(getverdict==pass) {
f_compareFiles(
- "www_XmlTest_org_complex_simpleContent_e.ttcn","www_XmlTest_org_complex_simpleContent.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_XmlTest_org_complex_simpleContent_e.ttcn","www_XmlTest_org_complex_simpleContent.ttcn", c_numOfDiff);
f_encDecTest_ComplexTypeWithSimpleContent1();
f_encDecTest_ComplexTypeWithSimpleContent2();
f_encDecTest_ComplexTypeWithSimpleContent2_neg();
@@ -1213,9 +1169,9 @@ group ComplexType {
if(getverdict==pass) {
f_compareFiles(
- "www_example_org_namespaceas_e.ttcn","www_example_org_namespaceas.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_example_org_namespaceas_e.ttcn","www_example_org_namespaceas.ttcn", c_numOfDiff);
f_compareFiles(
- "www_example_org_imported2_e.ttcn","www_example_org_imported2.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_example_org_imported2_e.ttcn","www_example_org_imported2.ttcn", c_numOfDiff);
}
}//tc_
@@ -1225,7 +1181,7 @@ group ComplexType {
if(getverdict==pass) {
f_compareFiles(
- "www_XmlTest_org_complex_mixed_e.ttcn","www_XmlTest_org_complex_mixed.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_XmlTest_org_complex_mixed_e.ttcn","www_XmlTest_org_complex_mixed.ttcn", c_numOfDiff);
}
}//tc_
@@ -1235,7 +1191,7 @@ group ComplexType {
if(getverdict==pass) {
f_compareFiles(
- "www_example_org_seq_group_reference_e.ttcn","www_example_org_seq_group_reference.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_example_org_seq_group_reference_e.ttcn","www_example_org_seq_group_reference.ttcn", c_numOfDiff);
}
}//tc_
@@ -1250,7 +1206,7 @@ group ComplexType {
if(getverdict==pass) {
f_compareFiles(
- "http_www_example_org_seq_embeds_seq_e.ttcn","http_www_example_org_seq_embeds_seq.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "http_www_example_org_seq_embeds_seq_e.ttcn","http_www_example_org_seq_embeds_seq.ttcn", c_numOfDiff);
f_encDecTest_InternationalPrice();
}
}//tc_
@@ -1261,7 +1217,7 @@ group ComplexType {
if(getverdict==pass) {
f_compareFiles(
- "www_XmlTest_org_complex_choice_e.ttcn","www_XmlTest_org_complex_choice.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_XmlTest_org_complex_choice_e.ttcn","www_XmlTest_org_complex_choice.ttcn", c_numOfDiff);
}
}//tc_
@@ -1285,7 +1241,7 @@ group ComplexType {
if(getverdict==pass) {
f_compareFiles(
- "www_XmlTest_org_complex_all_e.ttcn","www_XmlTest_org_complex_all.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_XmlTest_org_complex_all_e.ttcn","www_XmlTest_org_complex_all.ttcn", c_numOfDiff);
}
}//tc_
@@ -1465,7 +1421,7 @@ group ComplexType {
f_shellCommandWithVerdict(xsd2ttcn_command & " XmlTest_complex_minOccursMaxOccurs.xsd","",c_shell_successWithoutWarningAndError);
if(getverdict==pass) {
f_compareFiles(
- "www_XmlTest_org_complex_minOccursMaxOccurs_e.ttcn","www_XmlTest_org_complex_minOccursMaxOccurs.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_XmlTest_org_complex_minOccursMaxOccurs_e.ttcn","www_XmlTest_org_complex_minOccursMaxOccurs.ttcn", c_numOfDiff);
}
}
@@ -1475,7 +1431,7 @@ group ComplexType {
if(getverdict==pass) {
f_compareFiles(
- "www_XmlTest_org_complex_extension_e.ttcn","www_XmlTest_org_complex_extension.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_XmlTest_org_complex_extension_e.ttcn","www_XmlTest_org_complex_extension.ttcn", c_numOfDiff);
}
}//tc_
@@ -1484,7 +1440,7 @@ group ComplexType {
if(getverdict==pass) {
f_compareFiles(
- "name_conversion_extension_attrib_e.ttcn","name_conversion_extension_attrib.ttcn", c_numOfDiff_headerAndModuleName);
+ "name_conversion_extension_attrib_e.ttcn","name_conversion_extension_attrib.ttcn", c_numOfDiff);
}
}//tc_
@@ -1493,7 +1449,7 @@ group ComplexType {
if(getverdict==pass) {
f_compareFiles(
- "www_example_org_long_extension_e.ttcn","www_example_org_long_extension.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_example_org_long_extension_e.ttcn","www_example_org_long_extension.ttcn", c_numOfDiff);
}
}//tc_
@@ -1502,7 +1458,7 @@ group ComplexType {
if(getverdict==pass) {
f_compareFiles(
- "www_example_org_self_recursion_e.ttcn","www_example_org_self_recursion.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_example_org_self_recursion_e.ttcn","www_example_org_self_recursion.ttcn", c_numOfDiff);
}
}//tc_
@@ -1511,7 +1467,7 @@ group ComplexType {
if(getverdict==pass) {
f_compareFiles(
- "www_example_org_type_conversion_follow_e.ttcn","www_example_org_type_conversion_follow.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_example_org_type_conversion_follow_e.ttcn","www_example_org_type_conversion_follow.ttcn", c_numOfDiff);
}
}//tc_
@@ -1520,7 +1476,7 @@ group ComplexType {
if(getverdict==pass) {
f_compareFiles(
- "attribute_in_extension_e.ttcn","attribute_in_extension.ttcn", c_numOfDiff_headerAndModuleName);
+ "attribute_in_extension_e.ttcn","attribute_in_extension.ttcn", c_numOfDiff);
}
}//tc_
@@ -1529,7 +1485,7 @@ group ComplexType {
if(getverdict==pass) {
f_compareFiles(
- "www_example_org_attr_ext_rest_e.ttcn","www_example_org_attr_ext_rest.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_example_org_attr_ext_rest_e.ttcn","www_example_org_attr_ext_rest.ttcn", c_numOfDiff);
}
}//tc_
@@ -1538,7 +1494,7 @@ group ComplexType {
if(getverdict==pass) {
f_compareFiles(
- "www_example_org_attrib_enum_e.ttcn","www_example_org_attrib_enum.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_example_org_attrib_enum_e.ttcn","www_example_org_attrib_enum.ttcn", c_numOfDiff);
}
}//tc_
@@ -1563,7 +1519,7 @@ group ComplexType {
if(getverdict==pass) {
f_compareFiles(
- "www_XmlTest_org_complex_restriction_e.ttcn","www_XmlTest_org_complex_restriction.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_XmlTest_org_complex_restriction_e.ttcn","www_XmlTest_org_complex_restriction.ttcn", c_numOfDiff);
}
}//tc_
@@ -1573,7 +1529,7 @@ group ComplexType {
if(getverdict==pass) {
f_compareFiles(
"http_www_example_org_complex_restriction_with_use_e.ttcn",
- "http_www_example_org_complex_restriction_with_use.ttcn", c_numOfDiff_headerAndModuleName);
+ "http_www_example_org_complex_restriction_with_use.ttcn", c_numOfDiff);
}
}//tc_
@@ -1583,7 +1539,7 @@ group ComplexType {
if(getverdict==pass) {
f_compareFiles(
"www_example_org_complex_nillable_e.ttcn",
- "www_example_org_complex_nillable.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_example_org_complex_nillable.ttcn", c_numOfDiff);
}
}//tc_
@@ -1594,7 +1550,7 @@ group ComplexType {
if(getverdict==pass) {
f_compareFiles(
"www_example_org_nillable_fixed_e.ttcn",
- "www_example_org_nillable_fixed.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_example_org_nillable_fixed.ttcn", c_numOfDiff);
}
}//tc_
@@ -1604,7 +1560,7 @@ group ComplexType {
if(getverdict==pass) {
f_compareFiles(
"www_example_org_no_ns_connector_e.ttcn",
- "www_example_org_no_ns_connector.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_example_org_no_ns_connector.ttcn", c_numOfDiff);
}
}//tc_
@@ -1614,7 +1570,7 @@ group ComplexType {
if(getverdict==pass) {
f_compareFiles(
"http_www_example_org_2001_XMLSchema_e.ttcn",
- "http_www_example_org_2001_XMLSchema.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "http_www_example_org_2001_XMLSchema.ttcn", c_numOfDiff);
}
}//tc_
@@ -1644,7 +1600,7 @@ group ComplexType {
if(getverdict==pass) {
f_compareFiles(
"www_XmlTest_org_complex_unique_e.ttcn",
- "www_XmlTest_org_complex_unique.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_XmlTest_org_complex_unique.ttcn", c_numOfDiff);
}
}//tc_
@@ -1654,7 +1610,7 @@ group ComplexType {
if(getverdict==pass) {
f_compareFiles(
- "www_XmlTest_org_complex_include1_e.ttcn","www_XmlTest_org_complex_include.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_XmlTest_org_complex_include1_e.ttcn","www_XmlTest_org_complex_include.ttcn", c_numOfDiff_ModName);
}
}//tc_
@@ -1667,7 +1623,7 @@ group ComplexType {
if(getverdict==pass) {
f_compareFiles(
- "www_example_org_including_module_e.ttcn","www_example_org_including_module.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_example_org_including_module_e.ttcn","www_example_org_including_module.ttcn", c_numOfDiff);
}
}//tc_
@@ -1688,10 +1644,10 @@ group ComplexType {
if(getverdict==pass) {
f_compareFiles(
- "www_XmlTest_org_complex_import_e.ttcn","www_XmlTest_org_complex_import.ttcn", c_numOfDiff_headerModNameAndImport);
+ "www_XmlTest_org_complex_import_e.ttcn","www_XmlTest_org_complex_import.ttcn", c_numOfDiff);
f_compareFiles(
- "www_XmlTest_org_complex_include2_e.ttcn","www_XmlTest_org_complex_include.ttcn", c_numOfDiff_headerModNameAndImport);
+ "www_XmlTest_org_complex_include2_e.ttcn","www_XmlTest_org_complex_include.ttcn", c_numOfDiff_ModName);
}
}//tc_
@@ -1705,10 +1661,10 @@ group ComplexType {
if(getverdict==pass) {
f_compareFiles(
- "www_XmlTest_org_complex_import_e.ttcn","www_XmlTest_org_complex_import.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_XmlTest_org_complex_import_e.ttcn","www_XmlTest_org_complex_import.ttcn", c_numOfDiff);
f_compareFiles(
- "www_XmlTest_org_complex_include2_e.ttcn","www_XmlTest_org_complex_include.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_XmlTest_org_complex_include2_e.ttcn","www_XmlTest_org_complex_include.ttcn", c_numOfDiff_ModName);
}
}//tc_
@@ -1730,7 +1686,7 @@ group ComplexType {
if(getverdict==pass) {
f_compareFiles(
- "www_XmlTest_org_complex_import_e.ttcn","www_XmlTest_org_complex_import.ttcn", c_numOfDiff_headerModNameAndNamespace+4);
+ "www_XmlTest_org_complex_import_e.ttcn","www_XmlTest_org_complex_import.ttcn", c_numOfDiff+1); // +1 because of tc_complex_import_pos2_converter
}
}//tc_
@@ -1786,11 +1742,11 @@ group ComplexType {
if(getverdict==pass) {
f_compareFiles(
- "www_XmlTest_org_complex_import_A_e.ttcn","www_XmlTest_org_complex_import_A.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_XmlTest_org_complex_import_A_e.ttcn","www_XmlTest_org_complex_import_A.ttcn", c_numOfDiff);
f_compareFiles(
- "www_XmlTest_org_complex_import_B_e.ttcn","www_XmlTest_org_complex_import_B.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_XmlTest_org_complex_import_B_e.ttcn","www_XmlTest_org_complex_import_B.ttcn", c_numOfDiff);
f_compareFiles(
- "www_XmlTest_org_complex_import_AB_e.ttcn","www_XmlTest_org_complex_import_AB.ttcn", 10+c_numOfDiff_headerModNameAndImport);
+ "www_XmlTest_org_complex_import_AB_e.ttcn","www_XmlTest_org_complex_import_AB.ttcn", c_numOfDiff);
}
}//tc_
@@ -1810,7 +1766,7 @@ group ComplexType {
if(getverdict==pass) {
f_compareFiles(
- "www_XmlTest_org_complex_any_e.ttcn","www_XmlTest_org_complex_any.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_XmlTest_org_complex_any_e.ttcn","www_XmlTest_org_complex_any.ttcn", c_numOfDiff);
}
}//tc_
@@ -1819,7 +1775,7 @@ group ComplexType {
if(getverdict==pass) {
f_compareFiles(
- "www_example_org_import_prefix_e.ttcn","www_example_org_import_prefix.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_example_org_import_prefix_e.ttcn","www_example_org_import_prefix.ttcn", c_numOfDiff);
}
}//tc_
@@ -1828,15 +1784,15 @@ group ComplexType {
if(getverdict==pass) {
f_compareFiles(
- "www_example_org_pref1_e.ttcn","www_example_org_pref1.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_example_org_pref1_e.ttcn","www_example_org_pref1.ttcn", c_numOfDiff);
}
if(getverdict==pass) {
f_compareFiles(
- "www_example_org_pref2_e.ttcn","www_example_org_pref2.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_example_org_pref2_e.ttcn","www_example_org_pref2.ttcn", c_numOfDiff);
}
if(getverdict==pass) {
f_compareFiles(
- "www_example_org_pref3_e.ttcn","www_example_org_pref3.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_example_org_pref3_e.ttcn","www_example_org_pref3.ttcn", c_numOfDiff);
}
}//tc_
@@ -1906,7 +1862,7 @@ group Elements{
if(getverdict==pass) {
f_compareFiles(
- "www_XmlTest_org_element_anyType_e.ttcn","www_XmlTest_org_element_anyType.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_XmlTest_org_element_anyType_e.ttcn","www_XmlTest_org_element_anyType.ttcn", c_numOfDiff);
}
}//tc_
@@ -1916,7 +1872,7 @@ group Elements{
if(getverdict==pass) {
f_compareFiles(
- "www_example_org_qualified_element_attrib_e.ttcn","www_example_org_qualified_element_attrib.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_example_org_qualified_element_attrib_e.ttcn","www_example_org_qualified_element_attrib.ttcn", c_numOfDiff);
}
}//tc_
@@ -1926,7 +1882,7 @@ group Elements{
if(getverdict==pass) {
f_compareFiles(
- "www_example_org_unqualified_element_attrib_e.ttcn","www_example_org_unqualified_element_attrib.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_example_org_unqualified_element_attrib_e.ttcn","www_example_org_unqualified_element_attrib.ttcn", c_numOfDiff);
}
}//tc_
@@ -2050,7 +2006,7 @@ group Elements{
if(getverdict==pass) {
f_compareFiles(
- "www_XmlTest_org_element_recordOfElements_e.ttcn","www_XmlTest_org_element_recordOfElements.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_XmlTest_org_element_recordOfElements_e.ttcn","www_XmlTest_org_element_recordOfElements.ttcn", c_numOfDiff);
}
}//tc_
@@ -2074,7 +2030,7 @@ group Elements{
if(getverdict==pass) {
f_compareFiles(
- "www_XmlTest_org_element_recordOfElements_e.ttcn","www_XmlTest_org_element_recordOfElements.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_XmlTest_org_element_recordOfElements_e.ttcn","www_XmlTest_org_element_recordOfElements.ttcn", c_numOfDiff);
f_encDecTest_PersonInfo1_defaultElement();
}
}//tc_
@@ -2086,7 +2042,7 @@ group Elements{
if(getverdict==pass) {
f_compareFiles(
- "www_XmlTest_org_element_recordOfElements4_e.ttcn","www_XmlTest_org_element_recordOfElements4.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_XmlTest_org_element_recordOfElements4_e.ttcn","www_XmlTest_org_element_recordOfElements4.ttcn", c_numOfDiff);
f_encDecTest_PersonInfo4();
}
}//tc_
@@ -2098,7 +2054,7 @@ group Elements{
if(getverdict==pass) {
f_compareFiles(
- "www_XmlTest_org_element_recordOfElements3_e.ttcn","www_XmlTest_org_element_recordOfElements3.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_XmlTest_org_element_recordOfElements3_e.ttcn","www_XmlTest_org_element_recordOfElements3.ttcn", c_numOfDiff);
}
}//tc_
@@ -2115,7 +2071,7 @@ group Elements{
if(getverdict==pass) {
f_compareFiles(
- "www_XmlTest_org_element_recordOfElements5_e.ttcn","www_XmlTest_org_element_recordOfElements5.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_XmlTest_org_element_recordOfElements5_e.ttcn","www_XmlTest_org_element_recordOfElements5.ttcn", c_numOfDiff);
}
}//tc_
@@ -2131,7 +2087,7 @@ group Elements{
if(getverdict==pass) {
f_compareFiles(
- "www_example_org_substitutiongroup_e.ttcn","www_example_org_substitutiongroup.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_example_org_substitutiongroup_e.ttcn","www_example_org_substitutiongroup.ttcn", c_numOfDiff);
}
}//tc_
@@ -2142,7 +2098,7 @@ group Elements{
if(getverdict==pass) {
f_compareFiles(
- "www_example_org_substitutiongroup_name_as_e.ttcn","www_example_org_substitutiongroup_name_as.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_example_org_substitutiongroup_name_as_e.ttcn","www_example_org_substitutiongroup_name_as.ttcn", c_numOfDiff);
}
}//tc_
@@ -2154,7 +2110,7 @@ group Elements{
if(getverdict==pass) {
f_compareFiles(
"www_example_org_substitutiongroup_abstract_block_1_e.ttcn",
- "www_example_org_substitutiongroup_abstract_block_1.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_example_org_substitutiongroup_abstract_block_1.ttcn", c_numOfDiff);
}
}//tc_
@@ -2166,7 +2122,7 @@ group Elements{
if(getverdict==pass) {
f_compareFiles(
"www_example_org_substitutiongroup_abstract_block_2_e.ttcn",
- "www_example_org_substitutiongroup_abstract_block_2.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_example_org_substitutiongroup_abstract_block_2.ttcn", c_numOfDiff);
}
}//tc_
@@ -2178,7 +2134,7 @@ group Elements{
if(getverdict==pass) {
f_compareFiles(
"www_example_org_substitutiongroup_complex_without_element_e.ttcn",
- "www_example_org_substitutiongroup_complex_without_element.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_example_org_substitutiongroup_complex_without_element.ttcn", c_numOfDiff);
}
}//tc_
@@ -2190,7 +2146,7 @@ group Elements{
if(getverdict==pass) {
f_compareFiles(
"www_example_org_substitutiongroup_complex_without_element_e.ttcn",
- "www_example_org_substitutiongroup_complex_without_element.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_example_org_substitutiongroup_complex_without_element.ttcn", c_numOfDiff);
}
}//tc_
@@ -2202,7 +2158,7 @@ group Elements{
if(getverdict==pass) {
f_compareFiles(
"www_example_org_substitutiongroup_complextype_block_e.ttcn",
- "www_example_org_substitutiongroup_complextype_block.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_example_org_substitutiongroup_complextype_block.ttcn", c_numOfDiff);
}
}//tc_
@@ -2228,13 +2184,13 @@ group Elements{
if(getverdict==pass) {
f_compareFiles(
"www_example_org_substitutiongroup_ref_e.ttcn",
- "www_example_org_substitutiongroup_ref.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_example_org_substitutiongroup_ref.ttcn", c_numOfDiff);
}
if(getverdict==pass) {
f_compareFiles(
"www_example_org_substitutiongroup_main_e.ttcn",
- "www_example_org_substitutiongroup_main.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_example_org_substitutiongroup_main.ttcn", c_numOfDiff);
}
}//tc_
@@ -2246,7 +2202,7 @@ group Elements{
if(getverdict==pass) {
f_compareFiles(
"www_example_org_substitutiongroup_rename_e.ttcn",
- "www_example_org_substitutiongroup_rename.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_example_org_substitutiongroup_rename.ttcn", c_numOfDiff);
}
}//tc_
@@ -2263,7 +2219,7 @@ group Elements{
if(getverdict==pass) {
f_compareFiles(
"www_example_org_type_substitution_e.ttcn",
- "www_example_org_type_substitution.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_example_org_type_substitution.ttcn", c_numOfDiff);
}
}//tc_
@@ -2281,7 +2237,7 @@ group Elements{
if(getverdict==pass) {
f_compareFiles(
"www_example_org_type_substitution_chain_e.ttcn",
- "www_example_org_type_substitution_chain.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_example_org_type_substitution_chain.ttcn", c_numOfDiff);
}
}//tc_
@@ -2293,7 +2249,7 @@ group Elements{
if(getverdict==pass) {
f_compareFiles(
"www_example_org_type_substitution_abstract_block_e.ttcn",
- "www_example_org_type_substitution_abstract_block.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_example_org_type_substitution_abstract_block.ttcn", c_numOfDiff);
}
}//tc_
@@ -2305,13 +2261,13 @@ group Elements{
if(getverdict==pass) {
f_compareFiles(
"www_example_org_type_substitution_mod1_e.ttcn",
- "www_example_org_type_substitution_mod1.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_example_org_type_substitution_mod1.ttcn", c_numOfDiff);
}
if(getverdict==pass) {
f_compareFiles(
"www_example_org_type_substitution_mod2_e.ttcn",
- "www_example_org_type_substitution_mod2.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_example_org_type_substitution_mod2.ttcn", c_numOfDiff);
}
}//tc_
@@ -2323,7 +2279,7 @@ group Elements{
if(getverdict==pass) {
f_compareFiles(
"www_example_org_type_substitution_simpletype_e.ttcn",
- "www_example_org_type_substitution_simpletype.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_example_org_type_substitution_simpletype.ttcn", c_numOfDiff);
}
}//tc_
@@ -2335,7 +2291,7 @@ group Elements{
if(getverdict==pass) {
f_compareFiles(
"www_example_org_type_subs_with_elem_subs_e.ttcn",
- "www_example_org_type_subs_with_elem_subs.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_example_org_type_subs_with_elem_subs.ttcn", c_numOfDiff);
}
}//tc_
@@ -2347,13 +2303,13 @@ group Elements{
if(getverdict==pass) {
f_compareFiles(
"www_example_org_type_substitution_elem_in_ct_mod1_e.ttcn",
- "www_example_org_type_substitution_elem_in_ct_mod1.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_example_org_type_substitution_elem_in_ct_mod1.ttcn", c_numOfDiff);
}
if(getverdict==pass) {
f_compareFiles(
"www_example_org_type_substitution_elem_in_ct_mod2_e.ttcn",
- "www_example_org_type_substitution_elem_in_ct_mod2.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_example_org_type_substitution_elem_in_ct_mod2.ttcn", c_numOfDiff);
}
}//tc_
@@ -2365,7 +2321,7 @@ group Elements{
if(getverdict==pass) {
f_compareFiles(
"www_example_org_only_element_substitution_e.ttcn",
- "www_example_org_only_element_substitution.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_example_org_only_element_substitution.ttcn", c_numOfDiff);
}
}//tc_
@@ -2377,7 +2333,7 @@ group Elements{
if(getverdict==pass) {
f_compareFiles(
"www_example_org_type_substitution_builtintype_e.ttcn",
- "www_example_org_type_substitution_builtintype.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_example_org_type_substitution_builtintype.ttcn", c_numOfDiff);
}
}//tc_
@@ -2389,7 +2345,7 @@ group Elements{
if(getverdict==pass) {
f_compareFiles(
"www_example_org_type_substitution_rename_e.ttcn",
- "www_example_org_type_substitution_rename.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_example_org_type_substitution_rename.ttcn", c_numOfDiff);
}
}//tc_
@@ -2401,7 +2357,7 @@ group Elements{
if(getverdict==pass) {
f_compareFiles(
"www_example_org_type_substitution_complex_cascade_e.ttcn",
- "www_example_org_type_substitution_complex_cascade.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_example_org_type_substitution_complex_cascade.ttcn", c_numOfDiff);
}
}//tc_
@@ -2413,7 +2369,7 @@ group Elements{
if(getverdict==pass) {
f_compareFiles(
"www_example_org_type_substitution_simple_cascade_e.ttcn",
- "www_example_org_type_substitution_simple_cascade.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_example_org_type_substitution_simple_cascade.ttcn", c_numOfDiff);
}
}//tc_
@@ -2455,7 +2411,7 @@ group Elements{
if(getverdict==pass) {
f_compareFiles(
- "XmlTest_imsike_e.ttcn","XmlTest_imsike.ttcn", c_numOfDiff_headerAndModuleName);
+ "XmlTest_imsike_e.ttcn","XmlTest_imsike.ttcn", c_numOfDiff);
}
}//tc_
@@ -2464,7 +2420,7 @@ group Elements{
if(getverdict==pass) {
f_compareFiles(
- "nillable_annotations_e.ttcn","nillable_annotations.ttcn", c_numOfDiff_headerAndModuleName);
+ "nillable_annotations_e.ttcn","nillable_annotations.ttcn", c_numOfDiff);
}
}//tc_
@@ -2474,7 +2430,7 @@ group Elements{
if(getverdict==pass) {
f_compareFiles(
"http_www_example_org_nillable_in_nillable_extension_e.ttcn",
- "http_www_example_org_nillable_in_nillable_extension.ttcn", c_numOfDiff_headerAndModuleName);
+ "http_www_example_org_nillable_in_nillable_extension.ttcn", c_numOfDiff);
}
}//tc_
@@ -2484,7 +2440,7 @@ group Elements{
if(getverdict==pass) {
f_compareFiles(
"www_example_org_type_attributegroup_nillable_e.ttcn",
- "www_example_org_type_attributegroup_nillable.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_example_org_type_attributegroup_nillable.ttcn", c_numOfDiff);
}
}//tc_
@@ -2494,7 +2450,7 @@ group Elements{
if(getverdict==pass) {
f_compareFiles(
"www_example_org_attribgroup_ingroup_e.ttcn",
- "www_example_org_attribgroup_ingroup.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_example_org_attribgroup_ingroup.ttcn", c_numOfDiff);
}
}//tc_
@@ -2533,7 +2489,10 @@ group Elements{
//=========================================================================
// Control
//=========================================================================
-
+// When creating new testcases: Change the copyright header of the expected
+// ttcn just like in the other expected ttcns and write your name into a
+// contributors section just like in the other expected ttcns. In normal
+// case theese changes are required.
control {
execute(tc_versionTest());//Passed
execute(tc_xsd2ttcn_versionTest());//Passed
diff --git a/xsdconvert/ComplexType.cc b/xsdconvert/ComplexType.cc
index 7ebe8bc44..221f65b90 100644
--- a/xsdconvert/ComplexType.cc
+++ b/xsdconvert/ComplexType.cc
@@ -2012,6 +2012,12 @@ void ComplexType::resolveComplexTypeExtension() {
void ComplexType::resolveComplexTypeRestriction() {
if (mode == restrictionMode && cmode == CT_complextype_mode && !outside_reference.empty()) {
ComplexType * ct = (ComplexType*) TTCN3ModuleInventory::getInstance().lookup(this, want_CT);
+ if (ct == NULL) {
+ printError(module->getSchemaname(), name.convertedValue,
+ "Reference for a non-defined type: " + getReference().repr());
+ TTCN3ModuleInventory::getInstance().incrNumErrors();
+ return;
+ }
if(ct->getXsdtype() != n_NOTSET){
if (ct->resolved == No) {
ct->referenceResolving();
@@ -2026,7 +2032,7 @@ void ComplexType::resolveComplexTypeRestriction() {
List<ComplexType*>::iterator field2 = ct->complexfields.begin();
for (; field2; field2 = field2->Next) {
if (field->Data->getName().convertedValue == field2->Data->getName().convertedValue &&
- field->Data->getType().convertedValue == field2->Data->getType().convertedValue &&
+ field->Data->getType().convertedValue.getValueWithoutPrefix(':') == field2->Data->getType().convertedValue.getValueWithoutPrefix(':') &&
field->Data->complexfields.size() <= field2->Data->complexfields.size() &&
hasMatchingFields(field->Data->complexfields, field2->Data->complexfields)) {
// TODO: better algorithm to find matching fields
--
GitLab