Xmlworkfloat testcase unification finieshed (artf677608)

Change-Id: I25d3fbf7483661e50150b1f5c5177817ba24e9d3
Signed-off-by: BenceJanosSzabo <bence.janos.szabo@ericsson.com>

regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_annotation2_e.ttcn

+/******************************************************************************
+* 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";
+}

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";

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:

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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";

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;

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;

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

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 */
 
 

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";
 }

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;