From 7d78866cc94aec59d16c9d15ac4565ddf33a7983 Mon Sep 17 00:00:00 2001
From: ebensza <bence.janos.szabo@ericsson.com>
Date: Tue, 9 Aug 2016 15:08:05 +0200
Subject: [PATCH] fixed Usage of xsd2ttcn in regression test overwrites modules
under version control (Bug 498564)
Change-Id: I68bcc742112f9f7369495b5485ca49fb656b3515
Signed-off-by: ebensza <bence.janos.szabo@ericsson.com>
---
.../XML/XmlWorkflow/src/xmlTest_Shell.ttcn | 4 +
.../XmlWorkflow/src/xmlTest_Testcases.ttcn | 345 +++++++++---------
.../src/xmlTest_protocolXsd_Testcases.ttcn | 26 +-
.../templateIstemplatekind/Makefile | 2 +-
4 files changed, 190 insertions(+), 187 deletions(-)
diff --git a/regression_test/XML/XmlWorkflow/src/xmlTest_Shell.ttcn b/regression_test/XML/XmlWorkflow/src/xmlTest_Shell.ttcn
index 7f5255a00..c6bf0d9b0 100644
--- a/regression_test/XML/XmlWorkflow/src/xmlTest_Shell.ttcn
+++ b/regression_test/XML/XmlWorkflow/src/xmlTest_Shell.ttcn
@@ -97,6 +97,10 @@ type component mtc_CT {}
// Constants
//=========================================================================
+// -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 ";
+
const integer c_shell_successWithoutWarningAndError:=0;
const integer c_shell_success := 0;
const integer c_shell_successWithWarning:=1; //temp until licence is solved
diff --git a/regression_test/XML/XmlWorkflow/src/xmlTest_Testcases.ttcn b/regression_test/XML/XmlWorkflow/src/xmlTest_Testcases.ttcn
index f666ec96f..681e38877 100644
--- a/regression_test/XML/XmlWorkflow/src/xmlTest_Testcases.ttcn
+++ b/regression_test/XML/XmlWorkflow/src/xmlTest_Testcases.ttcn
@@ -89,7 +89,6 @@ type component mtc_CT {}
// Constants
//=========================================================================
-
//=========================================================================
// Templates
//=========================================================================
@@ -160,13 +159,13 @@ testcase tc_versionTest() runs on xmlTest_CT
testcase tc_xsd2ttcn_versionTest() runs on xmlTest_CT
{
- f_shellCommandWithVerdict("xsd2ttcn -v","",0)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " -v","",0)
}
//simple records
testcase tc_firstTrial() runs on xmlTest_CT
{
- f_shellCommandWithVerdict("xsd2ttcn elements.xsd","",c_shell_successWithoutWarningAndError);
+ f_shellCommandWithVerdict(xsd2ttcn_command & " elements.xsd","",c_shell_successWithoutWarningAndError);
if(getverdict==pass) {
f_compareFiles(
@@ -178,7 +177,7 @@ testcase tc_firstTrial() runs on xmlTest_CT
// This tc is "passed" but it is generated into noTargetNaespace.ttcn
testcase tc_secondTrial() runs on xmlTest_CT
{
- f_shellCommandWithVerdict("xsd2ttcn po.xsd noTargetNamespace.xsd","",c_shell_successWithoutWarningAndError);
+ f_shellCommandWithVerdict(xsd2ttcn_command & " po.xsd noTargetNamespace.xsd","",c_shell_successWithoutWarningAndError);
if(getverdict==pass) {
f_compareFiles(
@@ -187,7 +186,7 @@ testcase tc_secondTrial() runs on xmlTest_CT
}
testcase tc_empty() runs on xmlTest_CT
{
- f_shellCommandWithVerdict("xsd2ttcn empty.xsd","",c_shell_successWithoutWarningAndError);
+ f_shellCommandWithVerdict(xsd2ttcn_command & " empty.xsd","",c_shell_successWithoutWarningAndError);
if(getverdict==pass) {
f_compareFiles(
@@ -197,7 +196,7 @@ testcase tc_empty() runs on xmlTest_CT
testcase tc_annotation() runs on xmlTest_CT
{
- f_shellCommandWithVerdict("xsd2ttcn XmlTest_annotation.xsd","",c_shell_successWithWarning);
+ 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);
@@ -206,19 +205,19 @@ testcase tc_annotation() runs on xmlTest_CT
testcase tc_annotation1() runs on xmlTest_CT
{
- f_shellCommandWithVerdict("xsd2ttcn XmlTest_annotation1.xsd","",c_shell_successWithoutWarningAndError);
+ f_shellCommandWithVerdict(xsd2ttcn_command & " XmlTest_annotation1.xsd","",c_shell_successWithoutWarningAndError);
//No f_compareFiles becaulse tc_xml_in_annotation() covering this testcase
}
testcase tc_annotation2() runs on xmlTest_CT
{
- f_shellCommandWithVerdict("xsd2ttcn XmlTest_annotation2.xsd","",c_shell_error);
+ f_shellCommandWithVerdict(xsd2ttcn_command & " XmlTest_annotation2.xsd","",c_shell_error);
//No f_compareFiles becaulse tc_xml_in_annotation() covering this testcase
}
testcase tc_xml_in_annotation() runs on xmlTest_CT
{
- f_shellCommandWithVerdict("xsd2ttcn xml_in_annotation.xsd","",c_shell_successWithoutWarningAndError);
+ 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);
@@ -228,7 +227,7 @@ testcase tc_xml_in_annotation() runs on xmlTest_CT
//Incorrect version: 1.1, libxml parser prints warning
testcase tc_version() runs on xmlTest_CT
{
- f_shellCommandWithVerdict("xsd2ttcn XmlTest_version.xsd","",c_shell_successWithWarning);
+ f_shellCommandWithVerdict(xsd2ttcn_command & " XmlTest_version.xsd","",c_shell_successWithWarning);
}
//************************************
@@ -252,7 +251,7 @@ testcase tc_version() runs on xmlTest_CT
//TODO:Not ready yet
testcase tc_options_c() runs on xmlTest_CT
{
- f_shellCommandWithVerdict("xsd2ttcn -c XmlTest_annotation.xsd","",c_shell_successWithWarning );
+ 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);
}
@@ -261,7 +260,7 @@ testcase tc_options_c() runs on xmlTest_CT
// -e: disable the generation of encoding instructions in TTCN-3 modules
testcase tc_options_e() runs on xmlTest_CT
{
- f_shellCommandWithVerdict("xsd2ttcn -e XmlTest_annotation.xsd","",c_shell_successWithWarning );
+ 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);
}
@@ -270,7 +269,7 @@ testcase tc_options_e() runs on xmlTest_CT
// -f file: the XSD files are taken from file instead of the command line
testcase tc_options_f() runs on xmlTest_CT
{
- f_shellCommandWithVerdict("xsd2ttcn -f XmlTest_files1.txt","",c_shell_successWithWarning );
+ 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);
}
@@ -278,13 +277,13 @@ testcase tc_options_f() runs on xmlTest_CT
testcase tc_options_g() runs on xmlTest_CT
{
- f_shellCommandWithVerdict("xsd2ttcn -g dont_generate_element_substitution.xsd","",c_shell_successWithoutWarningAndError );
+ 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);
}
- f_shellCommandWithVerdict("xsd2ttcn generate_element_substitution.xsd","",c_shell_successWithoutWarningAndError );
+ 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);
@@ -298,7 +297,7 @@ testcase tc_options_p() runs on xmlTest_CT
f_shellCommandWithVerdict("mv XSD.ttcn tmp_XSD.ttcn","",c_shell_successWithoutWarningAndError );
f_shellCommandWithVerdict("mv UsefulTtcn3Types.ttcn tmp_UsefulTtcn3Types.ttcn","",c_shell_successWithoutWarningAndError );
- f_shellCommandWithVerdict("xsd2ttcn -p XmlTest_annotation.xsd","",c_shell_successWithWarning );
+ f_shellCommandWithVerdict(xsd2ttcn_command & " -p XmlTest_annotation.xsd","",c_shell_successWithWarning );
if(getverdict==pass) {
f_shellCommandWithVerdict("ls www_XmlTest_org_annotation.ttcn", "",c_shell_successWithoutWarningAndError);
f_shellCommandWithVerdict("ls XSD.ttcn", "",c_shell_error_noSuchFileOrDirectory );
@@ -317,7 +316,7 @@ testcase tc_options_s() runs on xmlTest_CT
f_shellCommandWithVerdict("mv XSD.ttcn tmp_XSD.ttcn","",c_shell_successWithoutWarningAndError );
f_shellCommandWithVerdict("mv UsefulTtcn3Types.ttcn tmp_UsefulTtcn3Types.ttcn","",c_shell_successWithoutWarningAndError );
- f_shellCommandWithVerdict("xsd2ttcn -s XmlTest_annotation.xsd","",c_shell_successWithoutWarningAndError );
+ f_shellCommandWithVerdict(xsd2ttcn_command & " -s XmlTest_annotation.xsd","",c_shell_successWithoutWarningAndError );
//TODO:test if wrong xsd causes conversion error wit this switch
//test if www_XmlTest_org_annotation.ttcn.ttcn, XSD.ttcn and UsefulTtcn3Types.ttcn exist:
@@ -335,7 +334,7 @@ testcase tc_options_s() runs on xmlTest_CT
// -t: disable the generation of timing information in TTCN-3 modules
testcase tc_options_t() runs on xmlTest_CT
{
- f_shellCommandWithVerdict("xsd2ttcn -t XmlTest_annotation.xsd","",c_shell_successWithWarning );
+ 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);
}
@@ -345,49 +344,49 @@ testcase tc_options_t() runs on xmlTest_CT
//TODO:Not ready yet
testcase tc_options_v() runs on xmlTest_CT
{
- f_shellCommandWithVerdict("xsd2ttcn -v","",c_shell_successWithoutWarningAndError );
+ f_shellCommandWithVerdict(xsd2ttcn_command & " -v","",c_shell_successWithoutWarningAndError );
}
//TODO:Not ready yet
// -q: quiet - disable the issue of status messages
testcase tc_options_V() runs on xmlTest_CT
{
- f_shellCommandWithVerdict("xsd2ttcn -q XmlTest_annotation.xsd","",c_shell_successWithWarning);
+ f_shellCommandWithVerdict(xsd2ttcn_command & " -q XmlTest_annotation.xsd","",c_shell_successWithWarning);
}
// -w: suppress warnings
testcase tc_options_w() runs on xmlTest_CT
{
- f_shellCommandWithVerdict("xsd2ttcn -w XmlTest_annotation.xsd","",c_shell_successWithoutWarningAndError );
+ f_shellCommandWithVerdict(xsd2ttcn_command & " -w XmlTest_annotation.xsd","",c_shell_successWithoutWarningAndError );
}
//TODO:Not ready yet
// -x: disable schema validation but generate TTCN-3 modules
testcase tc_options_x() runs on xmlTest_CT
{
- f_shellCommandWithVerdict("xsd2ttcn -x XmlTest_annotation.xsd","",c_shell_successWithWarning);
+ f_shellCommandWithVerdict(xsd2ttcn_command & " -x XmlTest_annotation.xsd","",c_shell_successWithWarning);
}
testcase tc_options_wrong() runs on xmlTest_CT
{
- f_shellCommandWithVerdict("xsd2ttcn -H XmlTest_annotation.xsd","", c_shell_error);
+ f_shellCommandWithVerdict(xsd2ttcn_command & " -H XmlTest_annotation.xsd","", c_shell_error);
}
testcase tc_options_missing() runs on xmlTest_CT
{
- f_shellCommandWithVerdict("xsd2ttcn ","",c_shell_successWithoutWarningAndError );
+ f_shellCommandWithVerdict("xsd2ttcn","",c_shell_successWithoutWarningAndError );
//TODO: check the output
}
testcase tc_XmlTest_label() runs on xmlTest_CT
{
- f_shellCommandWithVerdict("xsd2ttcn -x XmlTest_label.xsd","",c_shell_successWithoutWarningAndError );
+ f_shellCommandWithVerdict(xsd2ttcn_command & " -x XmlTest_label.xsd","",c_shell_successWithoutWarningAndError );
}
testcase tc_XmlTest_definition() runs on xmlTest_CT
{
- f_shellCommandWithVerdict("xsd2ttcn -x XmlTest_definition.xsd","",c_shell_successWithoutWarningAndError );
+ f_shellCommandWithVerdict(xsd2ttcn_command & " -x XmlTest_definition.xsd","",c_shell_successWithoutWarningAndError );
}
//************************************
// Testcases_basedOnTtcnStandard9
@@ -397,7 +396,7 @@ group Testcases_basedOnTtcnStandard9 {
//Passed
testcase tc_XmlTest_all() runs on xmlTest_CT
{
- f_shellCommandWithVerdict("xsd2ttcn all.xsd","",c_shell_successWithoutWarningAndError);
+ 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);
@@ -406,13 +405,13 @@ group Testcases_basedOnTtcnStandard9 {
testcase tc_element_in_all_neg() runs on xmlTest_CT
{
- f_shellCommandWithVerdict("xsd2ttcn element_in_all_minmax.xsd","",c_shell_error);
+ f_shellCommandWithVerdict(xsd2ttcn_command & " element_in_all_minmax.xsd","",c_shell_error);
}
//Passed
testcase tc_XmlTest_any_anyAttribute() runs on xmlTest_CT
{
- f_shellCommandWithVerdict("xsd2ttcn any_anyAttribute.xsd","",c_shell_successWithWarning);
+ f_shellCommandWithVerdict(xsd2ttcn_command & " any_anyAttribute.xsd","",c_shell_successWithWarning);
if(getverdict==pass) {
f_compareFiles(
@@ -425,7 +424,7 @@ group Testcases_basedOnTtcnStandard9 {
//Passed
testcase tc_XmlTest_HQ73011() runs on xmlTest_CT
{
- f_shellCommandWithVerdict("xsd2ttcn HQ73011.xsd","",c_shell_successWithoutWarningAndError);
+ 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);
@@ -434,7 +433,7 @@ group Testcases_basedOnTtcnStandard9 {
testcase tc_anyattribute_optional() runs on xmlTest_CT
{
- f_shellCommandWithVerdict("xsd2ttcn anyattribute_optional.xsd","",c_shell_successWithoutWarningAndError);
+ 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);
@@ -443,7 +442,7 @@ group Testcases_basedOnTtcnStandard9 {
testcase tc_anyattribute_single() runs on xmlTest_CT
{
- f_shellCommandWithVerdict("xsd2ttcn anyattrib_single.xsd","",c_shell_successWithoutWarningAndError);
+ 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);
@@ -452,7 +451,7 @@ group Testcases_basedOnTtcnStandard9 {
testcase tc_anyattribute_in_complex() runs on xmlTest_CT
{
- f_shellCommandWithVerdict("xsd2ttcn anyattr_in_complex.xsd","",c_shell_successWithoutWarningAndError);
+ 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);
@@ -463,7 +462,7 @@ group Testcases_basedOnTtcnStandard9 {
//Passed
testcase tc_XmlTest_attributeGroup() runs on xmlTest_CT
{
- f_shellCommandWithVerdict("xsd2ttcn attributeGroup.xsd","",c_shell_successWithoutWarningAndError);
+ f_shellCommandWithVerdict(xsd2ttcn_command & " attributeGroup.xsd","",c_shell_successWithoutWarningAndError);
if(getverdict==pass) {
f_compareFiles(
@@ -474,12 +473,12 @@ group Testcases_basedOnTtcnStandard9 {
//double schema definition - Validator Returns with Error, Passed
testcase tc_XmlTest_attribute_use_noTNS() runs on xmlTest_CT
{
- f_shellCommandWithVerdict("xsd2ttcn attribute_use_noTNS.xsd","",c_shell_error);
+ f_shellCommandWithVerdict(xsd2ttcn_command & " attribute_use_noTNS.xsd","",c_shell_error);
}
testcase tc_id_attribute() runs on xmlTest_CT
{
- f_shellCommandWithVerdict("xsd2ttcn id_attrib.xsd","",c_shell_successWithWarning);
+ 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);
@@ -488,7 +487,7 @@ group Testcases_basedOnTtcnStandard9 {
testcase tc_attribute_order() runs on xmlTest_CT
{
- f_shellCommandWithVerdict("xsd2ttcn attrib_order_a.xsd attrib_order_b.xsd attrib_order_c.xsd","",c_shell_successWithoutWarningAndError);
+ 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);
@@ -502,7 +501,7 @@ group Testcases_basedOnTtcnStandard9 {
testcase tc_name_conv_non_alphanumeric() runs on xmlTest_CT
{
- f_shellCommandWithVerdict("xsd2ttcn name_conv_non_alphanumeric.xsd","",c_shell_successWithoutWarningAndError);
+ f_shellCommandWithVerdict(xsd2ttcn_command & " name_conv_non_alphanumeric.xsd","",c_shell_successWithoutWarningAndError);
if(getverdict==pass) {
f_compareFiles(
"http_www_example_org_name_conv2_e.ttcn",
@@ -511,7 +510,7 @@ group Testcases_basedOnTtcnStandard9 {
}
testcase tc_module_name_convert_with_diff_namespace() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn imported_module.xsd imported_module_.xsd","",c_shell_successWithoutWarningAndError);
+ f_shellCommandWithVerdict(xsd2ttcn_command & " imported_module.xsd imported_module_.xsd","",c_shell_successWithoutWarningAndError);
if(getverdict==pass) {
f_compareFiles(
@@ -525,7 +524,7 @@ group Testcases_basedOnTtcnStandard9 {
}//tc_
testcase tc_module_typename_conversion() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn module_typename_conversion.xsd module_typename_conversion_1.xsd","",c_shell_successWithoutWarningAndError);
+ f_shellCommandWithVerdict(xsd2ttcn_command & " module_typename_conversion.xsd module_typename_conversion_1.xsd","",c_shell_successWithoutWarningAndError);
if(getverdict==pass) {
f_compareFiles(
@@ -540,7 +539,7 @@ group Testcases_basedOnTtcnStandard9 {
testcase tc_name_conv_remove_seq_of_low_line() runs on xmlTest_CT
{
- f_shellCommandWithVerdict("xsd2ttcn name_conv_remove_seq_of_low_line.xsd","",
+ f_shellCommandWithVerdict(xsd2ttcn_command & " name_conv_remove_seq_of_low_line.xsd","",
c_shell_successWithoutWarningAndError);
if(getverdict==pass) {
f_compareFiles(
@@ -551,7 +550,7 @@ group Testcases_basedOnTtcnStandard9 {
testcase tc_name_conv_with_z() runs on xmlTest_CT
{
- f_shellCommandWithVerdict("xsd2ttcn -z name_conv_with_z.xsd","",c_shell_successWithoutWarningAndError);
+ f_shellCommandWithVerdict(xsd2ttcn_command & " -z name_conv_with_z.xsd","",c_shell_successWithoutWarningAndError);
if(getverdict==pass) {
f_compareFiles(
"www_example_org_name_conv_http_e.ttcn",
@@ -561,7 +560,7 @@ group Testcases_basedOnTtcnStandard9 {
testcase tc_comment_placement() runs on xmlTest_CT
{
- f_shellCommandWithVerdict("xsd2ttcn comment_placement.xsd","",c_shell_successWithoutWarningAndError);
+ f_shellCommandWithVerdict(xsd2ttcn_command & " comment_placement.xsd","",c_shell_successWithoutWarningAndError);
if(getverdict==pass) {
f_compareFiles(
"www_example_org_comment_placement_e.ttcn",
@@ -584,7 +583,7 @@ group StringTest {
//TR HL21086 - whitespace preserve. TODO: standalone testcase
testcase tc_string() runs on xmlTest_CT
{
- f_shellCommandWithVerdict("xsd2ttcn -z XmlTest_string.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " -z XmlTest_string.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
"www_XmlTest_org_string.ttcn",
@@ -603,7 +602,7 @@ group StringTest {
//Passed, TR: Hl21086 - Solved
testcase tc_string_withWhitespace() runs on xmlTest_CT
{
- f_shellCommandWithVerdict("xsd2ttcn -z XmlTest_string_withWhitespace.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " -z XmlTest_string_withWhitespace.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
"www_XmlTest_org_string_withWhitespace.ttcn",
@@ -617,7 +616,7 @@ group StringTest {
//Passed, TR: HL26227 -Solved BUT rethink if variant part is well ordered or not!!
testcase tc_string_withEnum() runs on xmlTest_CT
{
- f_shellCommandWithVerdict("xsd2ttcn -z XmlTest_string_withEnum.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " -z XmlTest_string_withEnum.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
"www_XmlTest_org_string_withEnum.ttcn",
@@ -637,7 +636,7 @@ group StringTest {
//TR: HL21257 --Solved
testcase tc_string_withPosLength() runs on xmlTest_CT
{
- f_shellCommandWithVerdict("xsd2ttcn XmlTest_string_withPosLength.xsd","",c_shell_successWithoutWarningAndError);
+ f_shellCommandWithVerdict(xsd2ttcn_command & " XmlTest_string_withPosLength.xsd","",c_shell_successWithoutWarningAndError);
if(getverdict==pass) {
f_compareFiles(
"www_XmlTest_org_string_withPosLength.ttcn",
@@ -648,23 +647,23 @@ group StringTest {
//Passed, returs with error
testcase tc_string_withEmptyLength() runs on xmlTest_CT
{
- f_shellCommandWithVerdict("xsd2ttcn XmlTest_string_withEmptyLength.xsd","",c_shell_error)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " XmlTest_string_withEmptyLength.xsd","",c_shell_error)
}
testcase tc_string_withNegativeLength() runs on xmlTest_CT
{
- f_shellCommandWithVerdict("xsd2ttcn XmlTest_string_withNegativeLength.xsd","",c_shell_error)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " XmlTest_string_withNegativeLength.xsd","",c_shell_error)
}
//Passed
testcase tc_string_withFixedLength() runs on xmlTest_CT
{
- f_shellCommandWithVerdict("xsd2ttcn XmlTest_string_withFixedLength.xsd","",c_shell_error);
+ f_shellCommandWithVerdict(xsd2ttcn_command & " XmlTest_string_withFixedLength.xsd","",c_shell_error);
}
testcase tc_fixed_value() runs on xmlTest_CT
{
- f_shellCommandWithVerdict("xsd2ttcn fixed_value.xsd","",c_shell_successWithWarning);
+ f_shellCommandWithVerdict(xsd2ttcn_command & " fixed_value.xsd","",c_shell_successWithWarning);
if(getverdict==pass) {
f_compareFiles(
"www_example_org_fixed_value.ttcn",
@@ -675,14 +674,14 @@ group StringTest {
//Passed
testcase tc_string_withFloatLength() runs on xmlTest_CT
{
- f_shellCommandWithVerdict("xsd2ttcn XmlTest_string_withFloatLength.xsd","", c_shell_error)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " XmlTest_string_withFloatLength.xsd","", c_shell_error)
}
//===minLength===
//Passed, TR: HL21690
testcase tc_string_withPosMinLength() runs on xmlTest_CT
{
- f_shellCommandWithVerdict("xsd2ttcn XmlTest_string_withMinLength.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " XmlTest_string_withMinLength.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
"www_XmlTest_org_string_withMinLength.ttcn",
@@ -693,20 +692,20 @@ group StringTest {
//Passed
testcase tc_string_withEmptyMin() runs on xmlTest_CT
{
- f_shellCommandWithVerdict("xsd2ttcn XmlTest_string_withEmptyMin.xsd","",c_shell_error)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " XmlTest_string_withEmptyMin.xsd","",c_shell_error)
}
//Passed
testcase tc_string_withNegativeMin() runs on xmlTest_CT
{
- f_shellCommandWithVerdict("xsd2ttcn XmlTest_string_withNegativeMin.xsd","",c_shell_error)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " XmlTest_string_withNegativeMin.xsd","",c_shell_error)
}
//===maxLength===
//Passed
testcase tc_string_withPosMax() runs on xmlTest_CT
{
- f_shellCommandWithVerdict("xsd2ttcn XmlTest_string_withPosMax.xsd","",c_shell_successWithoutWarningAndError);
+ 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);
@@ -716,34 +715,34 @@ group StringTest {
//Passed
testcase tc_string_withEmptyMax() runs on xmlTest_CT
{
- f_shellCommandWithVerdict("xsd2ttcn XmlTest_string_withEmptyMax.xsd","",c_shell_error)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " XmlTest_string_withEmptyMax.xsd","",c_shell_error)
}
//Passed
testcase tc_string_withNegativeMax() runs on xmlTest_CT
{
- f_shellCommandWithVerdict("xsd2ttcn XmlTest_string_withNegativeMax.xsd","",c_shell_error)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " XmlTest_string_withNegativeMax.xsd","",c_shell_error)
}
//=== minLength>maxLength
//Passed, TR:
testcase tc_string_withFaultyMinMaxLength() runs on xmlTest_CT
{
- f_shellCommandWithVerdict("xsd2ttcn XmlTest_string_withFaultyMinMax.xsd","",c_shell_error)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " XmlTest_string_withFaultyMinMax.xsd","",c_shell_error)
}
//Passed
testcase tc_string_withOverDefinition() runs on xmlTest_CT
{
- f_shellCommandWithVerdict("xsd2ttcn XmlTest_string_withOverDefinition.xsd","",c_shell_error)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " XmlTest_string_withOverDefinition.xsd","",c_shell_error)
}
testcase tc_string_withTypeAndBase() runs on xmlTest_CT
{
- f_shellCommandWithVerdict("xsd2ttcn XmlTest_string_withTypeAndBase.xsd","",c_shell_error)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " XmlTest_string_withTypeAndBase.xsd","",c_shell_error)
}
//testcase tc_string_pattern_square_brackets() runs on xmlTest_CT
//{
- // f_shellCommandWithVerdict("xsd2ttcn regex_square_brackets.xsd","",c_shell_successWithoutWarningAndError);
+ // 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);
@@ -758,7 +757,7 @@ group BooleanTest {
//TODO: check warning sending for not supported:features
testcase tc_boolean() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn XmlTest_boolean.xsd","",c_shell_successWithoutWarningAndError)
+ 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);
@@ -766,7 +765,7 @@ group BooleanTest {
}
testcase tc_boolean_variant_commented() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn boolean_variant_commented.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " boolean_variant_commented.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
"www_example_org_boolean_variant_commented_e.ttcn",
@@ -783,7 +782,7 @@ group DecimalTest {
//Passed
testcase tc_decimal() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn XmlTest_decimal.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " XmlTest_decimal.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
"www_XmlTest_org_decimal_e.ttcn",
@@ -793,7 +792,7 @@ group DecimalTest {
//!!!!!Length not supported!!!!
// testcase tc_decimal_withLength() runs on xmlTest_CT {
- // f_shellCommandWithVerdict("xsd2ttcn XmlTest_decimal_withLength.xsd","",c_shell_successWithoutWarningAndError)
+ // f_shellCommandWithVerdict(xsd2ttcn_command & " XmlTest_decimal_withLength.xsd","",c_shell_successWithoutWarningAndError)
// if(getverdict==pass) {
// f_compareFiles(
// "www_XmlTest_org_decimal_withLength_e.ttcn",
@@ -804,7 +803,7 @@ group DecimalTest {
//TR: Generates integer limits instead of decimal
//TR: HL2715 -Solved
testcase tc_decimal_withMinMaxInclusive() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn XmlTest_decimal_withMinMaxInclusive.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " XmlTest_decimal_withMinMaxInclusive.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
@@ -815,7 +814,7 @@ group DecimalTest {
//TR21266 -Solved
testcase tc_decimal_withMinMaxExclusive() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn XmlTest_decimal_withMinMaxExclusive.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " XmlTest_decimal_withMinMaxExclusive.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
@@ -826,7 +825,7 @@ group DecimalTest {
//TR HL21296
testcase tc_decimal_withEnum() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn XmlTest_decimal_withEnum.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " XmlTest_decimal_withEnum.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
@@ -836,7 +835,7 @@ group DecimalTest {
}
testcase tc_decimal_fractiondigits() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn decimal_fractiondigits.xsd","",c_shell_successWithWarning)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " decimal_fractiondigits.xsd","",c_shell_successWithWarning)
if(getverdict==pass) {
f_compareFiles(
@@ -853,7 +852,7 @@ group DecimalTest {
group IntegerTest {
testcase tc_integer() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn XmlTest_integer.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " XmlTest_integer.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
@@ -865,17 +864,17 @@ group IntegerTest {
//negative test
testcase tc_integer_empty1() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn XmlTest_integer_empty1.xsd","",c_shell_error)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " XmlTest_integer_empty1.xsd","",c_shell_error)
}//tc_
//negative test
testcase tc_integer_withLength() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn XmlTest_integer_withLength.xsd","",c_shell_error)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " XmlTest_integer_withLength.xsd","",c_shell_error)
}//tc_
//Ready, passed, TR:HL21694 -solved
testcase tc_integer_withEnum() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn XmlTest_integer_withEnum.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " XmlTest_integer_withEnum.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
@@ -885,7 +884,7 @@ group IntegerTest {
//Passed
testcase tc_integer_withMinIncl() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn XmlTest_integer_withMinIncl.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " XmlTest_integer_withMinIncl.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
@@ -896,7 +895,7 @@ group IntegerTest {
//Passed
testcase tc_integer_withMaxIncl() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn XmlTest_integer_withMaxIncl.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " XmlTest_integer_withMaxIncl.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
@@ -906,7 +905,7 @@ group IntegerTest {
//Passed
testcase tc_integer_withMinExcl() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn XmlTest_integer_withMinExcl.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " XmlTest_integer_withMinExcl.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
@@ -917,7 +916,7 @@ group IntegerTest {
//Passed
testcase tc_integer_withMaxExcl() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn XmlTest_integer_withMaxExcl.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " XmlTest_integer_withMaxExcl.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
@@ -930,7 +929,7 @@ group IntegerTest {
testcase tc_float_not_a_number() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn not_a_number_minex_inf_maxex_-inf.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " not_a_number_minex_inf_maxex_-inf.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
@@ -942,7 +941,7 @@ group IntegerTest {
//
testcase tc_simpleType_enum() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn XmlTest_simple_enum.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " XmlTest_simple_enum.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
@@ -953,7 +952,7 @@ group IntegerTest {
testcase tc_simpleType_restrict_comp() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn simpletype_restrict_comp.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " simpletype_restrict_comp.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
@@ -964,7 +963,7 @@ group IntegerTest {
testcase tc_simpleType_ref() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn simpletype_ref.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " simpletype_ref.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
@@ -975,7 +974,7 @@ group IntegerTest {
testcase tc_simpleType_base() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn simpletype_base.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " simpletype_base.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
@@ -987,7 +986,7 @@ group IntegerTest {
//
testcase tc_enum_field_names() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn enum_field_names.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " enum_field_names.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
@@ -998,7 +997,7 @@ group IntegerTest {
testcase tc_attribute_enumeration_variant() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn attribute_enumeration_variant.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " attribute_enumeration_variant.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
@@ -1015,7 +1014,7 @@ group TimeTest {
//Passed:
testcase tc_time() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn XmlTest_time.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " XmlTest_time.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
@@ -1025,7 +1024,7 @@ group TimeTest {
//Passed TR HL22058
testcase tc_time_withEnum() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn XmlTest_time_withEnum.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " XmlTest_time_withEnum.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
@@ -1038,7 +1037,7 @@ group ListTest {
//converter
testcase tc_list_conv() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn XmlTest_list.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " XmlTest_list.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
@@ -1054,7 +1053,7 @@ group ListTest {
testcase tc_integerList() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn XmlTest_list_integer.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " XmlTest_list_integer.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
@@ -1065,7 +1064,7 @@ group ListTest {
testcase tc_list_simpletype() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn list_simpletype.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " list_simpletype.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
@@ -1076,7 +1075,7 @@ group ListTest {
testcase tc_list_complextype() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn list_complextype.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " list_complextype.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
@@ -1090,7 +1089,7 @@ group UnionTest {
//TR:HL23577
testcase tc_union() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn XmlTest_union.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " XmlTest_union.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
@@ -1100,7 +1099,7 @@ group UnionTest {
testcase tc_union_optional() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn ETSI_CR5852_union.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " ETSI_CR5852_union.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
@@ -1110,7 +1109,7 @@ group UnionTest {
testcase tc_enumeration_union_restriction() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn enumeration_restriction.xsd","",c_shell_successWithWarning)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " enumeration_restriction.xsd","",c_shell_successWithWarning)
if(getverdict==pass) {
f_compareFiles(
@@ -1121,7 +1120,7 @@ group UnionTest {
testcase tc_enumeration_union_restriction2() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn enumeration_restriction2.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " enumeration_restriction2.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
@@ -1132,7 +1131,7 @@ group UnionTest {
testcase tc_enumeration_restriction3() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn enumeration_restriction3.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " enumeration_restriction3.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
@@ -1144,7 +1143,7 @@ group UnionTest {
testcase tc_enumeration_remove_dup() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn enumeration_remove_dup.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " enumeration_remove_dup.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
@@ -1161,7 +1160,7 @@ group ComplexType {
testcase tc_complex1() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn XmlTest_complex1.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " XmlTest_complex1.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
@@ -1173,7 +1172,7 @@ group ComplexType {
//TR: HL24977 -Solved
testcase tc_complex2() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn XmlTest_complex2.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " XmlTest_complex2.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
@@ -1186,7 +1185,7 @@ group ComplexType {
testcase tc_complex_simpleContent() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn XmlTest_complex_simpleContent.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " XmlTest_complex_simpleContent.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
@@ -1199,7 +1198,7 @@ group ComplexType {
testcase tc_complex_namespaceas() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn namespaceas.xsd imported2.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " namespaceas.xsd imported2.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
@@ -1211,7 +1210,7 @@ group ComplexType {
testcase tc_complex_mixed_conv() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn XmlTest_complex_mixed.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " XmlTest_complex_mixed.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
@@ -1221,7 +1220,7 @@ group ComplexType {
testcase tc_complex_group_reference() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn seq_group_reference.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " seq_group_reference.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
@@ -1236,7 +1235,7 @@ group ComplexType {
testcase tc_complex_seq_embeds_seq() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn sequence_embeds_sequence.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " sequence_embeds_sequence.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
@@ -1247,7 +1246,7 @@ group ComplexType {
testcase tc_complex_choice_converter() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn XmlTest_complex_choice.xsd","",c_shell_successWithWarning)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " XmlTest_complex_choice.xsd","",c_shell_successWithWarning)
if(getverdict==pass) {
f_compareFiles(
@@ -1271,7 +1270,7 @@ group ComplexType {
//Passed, TR: HL30830 -solved
testcase tc_complex_all_converter() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn XmlTest_complex_all.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " XmlTest_complex_all.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
@@ -1452,7 +1451,7 @@ group ComplexType {
////TR (ethgry): HL10386
testcase tc_complex_minOccursMaxOccurs() runs on xmlTest_CT
{
- f_shellCommandWithVerdict("xsd2ttcn XmlTest_complex_minOccursMaxOccurs.xsd","",c_shell_successWithoutWarningAndError);
+ 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);
@@ -1461,7 +1460,7 @@ group ComplexType {
testcase tc_complex_extension_converter() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn XmlTest_complex_extension.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " XmlTest_complex_extension.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
@@ -1470,7 +1469,7 @@ group ComplexType {
}//tc_
testcase tc_complex_extension_name_attrib_convert() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn name_conversion_extension_attrib.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " name_conversion_extension_attrib.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
@@ -1479,7 +1478,7 @@ group ComplexType {
}//tc_
testcase tc_complex_long_extension() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn long_extension.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " long_extension.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
@@ -1488,7 +1487,7 @@ group ComplexType {
}//tc_
testcase tc_complex_self_recursion() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn complex_self_recursion.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " complex_self_recursion.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
@@ -1497,7 +1496,7 @@ group ComplexType {
}//tc_
testcase tc_type_name_conversion_follow() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn type_conversion_follow.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " type_conversion_follow.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
@@ -1506,7 +1505,7 @@ group ComplexType {
}//tc_
testcase tc_complex_extension_with_attrib() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn attribute_in_extension.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " attribute_in_extension.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
@@ -1515,7 +1514,7 @@ group ComplexType {
}//tc_
testcase tc_extension_restriction_with_attrib() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn attrib_restriction_extension.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " attrib_restriction_extension.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
@@ -1524,7 +1523,7 @@ group ComplexType {
}//tc_
testcase tc_attrib_enum() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn attrib_enum.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " attrib_enum.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
@@ -1549,7 +1548,7 @@ group ComplexType {
}
testcase tc_complex_restriction_converter() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn XmlTest_complex_restriction.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " XmlTest_complex_restriction.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
@@ -1558,7 +1557,7 @@ group ComplexType {
}//tc_
testcase tc_complex_restriction_with_use() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn complex_restriction_with_use.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " complex_restriction_with_use.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
@@ -1568,7 +1567,7 @@ group ComplexType {
}//tc_
testcase tc_complex_nillable() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn complex_nillable.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " complex_nillable.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
@@ -1579,7 +1578,7 @@ group ComplexType {
//Fixed or defaultforempty attribute is not allowed on nillable elements according to TITAN
testcase tc_nillable_fixed() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn nillable_fixed.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " nillable_fixed.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
@@ -1589,7 +1588,7 @@ group ComplexType {
}//tc_
testcase tc_no_ns_connector() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn no_ns_connector.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " no_ns_connector.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
@@ -1599,7 +1598,7 @@ group ComplexType {
}//tc_
testcase tc_xmlschema() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn MyXMLSchema.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " MyXMLSchema.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
@@ -1620,17 +1619,17 @@ group ComplexType {
}
//TR: HL32948, Solved
testcase tc_complex_restriction_neg1_converter() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn XmlTest_complex_restriction_neg1.xsd","",c_shell_error);
+ f_shellCommandWithVerdict(xsd2ttcn_command & " XmlTest_complex_restriction_neg1.xsd","",c_shell_error);
}//tc_
//TR: HL32948, Solved
testcase tc_complex_restriction_neg2_converter() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn XmlTest_complex_restriction_neg2.xsd","",c_shell_error);
+ f_shellCommandWithVerdict(xsd2ttcn_command & " XmlTest_complex_restriction_neg2.xsd","",c_shell_error);
}//tc_
//not supported:
testcase tc_complex_unique_converter() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn XmlTest_complex_unique.xsd","",c_shell_successWithWarning);
+ f_shellCommandWithVerdict(xsd2ttcn_command & " XmlTest_complex_unique.xsd","",c_shell_successWithWarning);
if(getverdict==pass) {
f_compareFiles(
"www_XmlTest_org_complex_unique_e.ttcn",
@@ -1640,7 +1639,7 @@ group ComplexType {
//Positive test: The including and the included schema are in the same namespace
testcase tc_complex_include_converter() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn XmlTest_complex_include.xsd XmlTest_complex_include1.xsd","",c_shell_successWithoutWarningAndError);
+ f_shellCommandWithVerdict(xsd2ttcn_command & " XmlTest_complex_include.xsd XmlTest_complex_include1.xsd","",c_shell_successWithoutWarningAndError);
if(getverdict==pass) {
f_compareFiles(
@@ -1653,7 +1652,7 @@ group ComplexType {
//=========================================================================
//Positive test: The including schema includes a schema without a namespace
testcase tc_complex_include_without_namespace() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn including_module.xsd included_without_namespace.xsd","",c_shell_successWithoutWarningAndError);
+ f_shellCommandWithVerdict(xsd2ttcn_command & " including_module.xsd included_without_namespace.xsd","",c_shell_successWithoutWarningAndError);
if(getverdict==pass) {
f_compareFiles(
@@ -1666,7 +1665,7 @@ group ComplexType {
//=========================================================================
//Negative test: The including and the included schema are not in the same namespace
testcase tc_complex_include_neg1_converter() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn XmlTest_complex_include.xsd XmlTest_complex_include2.xsd","",c_shell_error);
+ f_shellCommandWithVerdict(xsd2ttcn_command & " XmlTest_complex_include.xsd XmlTest_complex_include2.xsd","",c_shell_error);
}//tc_
//=========================================================================
@@ -1674,7 +1673,7 @@ group ComplexType {
//=========================================================================
//Positive test: The including and the included schema are in different namespaces (import and include)
testcase tc_complex_import_pos1_converter() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn XmlTest_complex_import_pos.xsd XmlTest_complex_include1.xsd","",c_shell_successWithoutWarningAndError);
+ f_shellCommandWithVerdict(xsd2ttcn_command & " XmlTest_complex_import_pos.xsd XmlTest_complex_include1.xsd","",c_shell_successWithoutWarningAndError);
if(getverdict==pass) {
f_compareFiles(
@@ -1691,7 +1690,7 @@ group ComplexType {
//Pos test: Checks if the converter can choose the file having the correct namespace
//The types are the same in the 2nd and the 3rd file but only the 3rd have the namespace having prefix in the first file
testcase tc_complex_import_pos2_converter() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn XmlTest_complex_import_pos.xsd XmlTest_complex_include2.xsd XmlTest_complex_include1.xsd","",c_shell_successWithoutWarningAndError);
+ f_shellCommandWithVerdict(xsd2ttcn_command & " XmlTest_complex_import_pos.xsd XmlTest_complex_include2.xsd XmlTest_complex_include1.xsd","",c_shell_successWithoutWarningAndError);
if(getverdict==pass) {
f_compareFiles(
@@ -1708,7 +1707,7 @@ group ComplexType {
//Negative test: The importing and the imported schema are in different namespaces, but the first file contains unknown type
//If the type checking is switched off the testcase fails.
testcase tc_complex_import_neg1_converter() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn XmlTest_complex_import_neg1.xsd XmlTest_complex_include1.xsd","",c_shell_error);
+ f_shellCommandWithVerdict(xsd2ttcn_command & " XmlTest_complex_import_neg1.xsd XmlTest_complex_include1.xsd","",c_shell_error);
}//tc_
//=========================================================================
@@ -1716,7 +1715,7 @@ group ComplexType {
//=========================================================================
//Positive test: The importing schema contains the namespace and the schema location of the imported schema.
testcase tc_complex_import_withSL_converter() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn XmlTest_complex_import_withSchemaLocation.xsd XmlTest_complex_include1.xsd","",c_shell_successWithoutWarningAndError);
+ f_shellCommandWithVerdict(xsd2ttcn_command & " XmlTest_complex_import_withSchemaLocation.xsd XmlTest_complex_include1.xsd","",c_shell_successWithoutWarningAndError);
if(getverdict==pass) {
f_compareFiles(
@@ -1772,7 +1771,7 @@ group ComplexType {
//=========================================================================
//imports the same type from different namespaces
testcase tc_complex_import_nameCollision_converter() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn XmlTest_complex_import_AB.xsd XmlTest_complex_import_A.xsd XmlTest_complex_import_B.xsd","",c_shell_successWithoutWarningAndError);
+ f_shellCommandWithVerdict(xsd2ttcn_command & " XmlTest_complex_import_AB.xsd XmlTest_complex_import_A.xsd XmlTest_complex_import_B.xsd","",c_shell_successWithoutWarningAndError);
if(getverdict==pass) {
f_compareFiles(
@@ -1789,14 +1788,14 @@ group ComplexType {
//=========================================================================
//imports the same type from different namespaces
testcase tc_complex_import_nameCollision2_converter() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn XmlTest_complex_import_AB.xsd XmlTest_complex_import_B.xsd XmlTest_complex_import_A.xsd","",c_shell_successWithoutWarningAndError);
+ f_shellCommandWithVerdict(xsd2ttcn_command & " XmlTest_complex_import_AB.xsd XmlTest_complex_import_B.xsd XmlTest_complex_import_A.xsd","",c_shell_successWithoutWarningAndError);
}//tc_
//=========================================================================
// tc_complex_any_pos_converter
//=========================================================================
testcase tc_complex_any_pos_converter() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn XmlTest_complex_any.xsd","",c_shell_successWithWarning);
+ f_shellCommandWithVerdict(xsd2ttcn_command & " XmlTest_complex_any.xsd","",c_shell_successWithWarning);
if(getverdict==pass) {
f_compareFiles(
@@ -1805,7 +1804,7 @@ group ComplexType {
}//tc_
testcase tc_imported_type_prefix() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn import_prefix_name.xsd imported_prefix_name.xsd","",c_shell_successWithoutWarningAndError);
+ f_shellCommandWithVerdict(xsd2ttcn_command & " import_prefix_name.xsd imported_prefix_name.xsd","",c_shell_successWithoutWarningAndError);
if(getverdict==pass) {
f_compareFiles(
@@ -1875,7 +1874,7 @@ group Elements{
//Passed
testcase tc_element_anyType_converter() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn XmlTest_element_anyType.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " XmlTest_element_anyType.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
@@ -1885,7 +1884,7 @@ group Elements{
testcase tc_element_attrib_qualified() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn qualified_element_attrib.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " qualified_element_attrib.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
@@ -1895,7 +1894,7 @@ group Elements{
testcase tc_element_attrib_unqualified() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn unqualified_element_attrib.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " unqualified_element_attrib.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
@@ -2019,7 +2018,7 @@ group Elements{
//Passed: TR: HL27438, Old name:tc_element_recOfElements_defaultAttr_converter
testcase tc_element_recOfElements_converter() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn XmlTest_element_recordOfElements.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " XmlTest_element_recordOfElements.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
@@ -2043,7 +2042,7 @@ group Elements{
//Passed: TR:27484
testcase tc_element_recOfElements_defaultElement() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn XmlTest_element_recordOfElements.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " XmlTest_element_recordOfElements.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
@@ -2055,7 +2054,7 @@ group Elements{
//Passed
testcase tc_element_recOfElements_minMaxOccurs() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn XmlTest_element_recordOfElements4.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " XmlTest_element_recordOfElements4.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
@@ -2067,7 +2066,7 @@ group Elements{
//Passed, TR:HL28010
testcase tc_element_recOfElements_maxOccursInfinity_converter() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn XmlTest_element_recordOfElements3.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " XmlTest_element_recordOfElements3.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
@@ -2084,7 +2083,7 @@ group Elements{
testcase tc_element_recOfElements_anonymousType_conv() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn XmlTest_element_recordOfElements5.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " XmlTest_element_recordOfElements5.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
@@ -2100,7 +2099,7 @@ group Elements{
testcase tc_substitutiongroup() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn substitutiongroup.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " substitutiongroup.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
@@ -2111,7 +2110,7 @@ group Elements{
testcase tc_substitutiongroup_name_as() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn substitutiongroup_name_as.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " substitutiongroup_name_as.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
@@ -2122,7 +2121,7 @@ group Elements{
testcase tc_substitutiongroup_abstract_block_rest() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn substitutiongroup_abstract_block_1.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " substitutiongroup_abstract_block_1.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
@@ -2134,7 +2133,7 @@ group Elements{
testcase tc_substitutiongroup_abstract_block_ext() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn substitutiongroup_abstract_block_2.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " substitutiongroup_abstract_block_2.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
@@ -2146,7 +2145,7 @@ group Elements{
testcase tc_substitutiongroup_complex_without_element() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn substitutiongroup_complex_without_element.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " substitutiongroup_complex_without_element.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
@@ -2158,7 +2157,7 @@ group Elements{
testcase tc_substitutiongroup_long_extension() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn substitutiongroup_complex_without_element.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " substitutiongroup_complex_without_element.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
@@ -2170,7 +2169,7 @@ group Elements{
testcase tc_substitutiongroup_complextype_block() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn substitutiongroup_complextype_block.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " substitutiongroup_complextype_block.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
@@ -2183,20 +2182,20 @@ group Elements{
//Test if we find the substitutiongroup references in notargetnamespace
testcase tc_substitutiongroup_notargetnamespace() runs on xmlTest_CT {
- //f_shellCommandWithVerdict("xsd2ttcn substitutiongroup_notargetnamespace.xsd","",c_shell_successWithoutWarningAndError)
+ //f_shellCommandWithVerdict(xsd2ttcn_command & " substitutiongroup_notargetnamespace.xsd","",c_shell_successWithoutWarningAndError)
setverdict(pass);
}//tc_
testcase tc_substitutiongroup_neg() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn substitutiongroup_neg.xsd","",c_shell_error)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " substitutiongroup_neg.xsd","",c_shell_error)
}//tc_
testcase tc_substitutiongroup_diff_module() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn substitutiongroup_main.xsd substitutiongroup_ref.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " substitutiongroup_main.xsd substitutiongroup_ref.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
@@ -2214,7 +2213,7 @@ group Elements{
testcase tc_substitutiongroup_rename() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn substitutiongroup_rename.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " substitutiongroup_rename.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
@@ -2231,7 +2230,7 @@ group Elements{
testcase tc_type_substitution() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn -h type_substitution.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " -h type_substitution.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
@@ -2249,7 +2248,7 @@ group Elements{
testcase tc_type_substitution_chain() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn -h type_substitution_chain.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " -h type_substitution_chain.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
@@ -2261,7 +2260,7 @@ group Elements{
testcase tc_type_substitution_abstract_block() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn -h type_substitution_abstract_block.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " -h type_substitution_abstract_block.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
@@ -2273,7 +2272,7 @@ group Elements{
testcase tc_type_substitution_diff_module() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn -h type_substitution_mod1.xsd type_substitution_mod2.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " -h type_substitution_mod1.xsd type_substitution_mod2.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
@@ -2291,7 +2290,7 @@ group Elements{
testcase tc_type_substitution_simpletype() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn -h type_substitution_simpletype.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " -h type_substitution_simpletype.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
@@ -2303,7 +2302,7 @@ group Elements{
testcase tc_type_substitution_with_elem_substitution() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn -h type_subs_with_elem_subs.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " -h type_subs_with_elem_subs.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
@@ -2315,7 +2314,7 @@ group Elements{
testcase tc_type_substitution_element_in_ct() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn -h type_substitution_elem_in_ct_mod1.xsd type_substitution_elem_in_ct_mod2.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " -h type_substitution_elem_in_ct_mod1.xsd type_substitution_elem_in_ct_mod2.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
@@ -2333,7 +2332,7 @@ group Elements{
testcase tc_only_element_substitution() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn -h only_element_substitution.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " -h only_element_substitution.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
@@ -2345,7 +2344,7 @@ group Elements{
testcase tc_type_substitution_builtintype() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn -h type_substitution_builtintype.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " -h type_substitution_builtintype.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
@@ -2357,7 +2356,7 @@ group Elements{
testcase tc_type_substitution_rename() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn -h type_substitution_rename.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " -h type_substitution_rename.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
@@ -2369,7 +2368,7 @@ group Elements{
testcase tc_type_substitution_complex_cascade() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn -h type_substitution_complex_cascade.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " -h type_substitution_complex_cascade.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
@@ -2381,7 +2380,7 @@ group Elements{
testcase tc_type_substitution_simple_cascade() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn -h type_substitution_simple_cascade.xsd","",c_shell_successWithoutWarningAndError)
+ f_shellCommandWithVerdict(xsd2ttcn_command & " -h type_substitution_simple_cascade.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
@@ -2398,7 +2397,7 @@ group Elements{
// Checks if name of named (aliased) type is not inherited
//========================================================
testcase tc_element_nameInheritance_conv() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn XmlTest_element_nameInheritance.xsd","",c_shell_successWithoutWarningAndError);
+ f_shellCommandWithVerdict(xsd2ttcn_command & " XmlTest_element_nameInheritance.xsd","",c_shell_successWithoutWarningAndError);
}//tc_
//========================================
@@ -2420,11 +2419,11 @@ group Elements{
}//tc_
testcase tc_element_abstract_conv() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn XmlTest_element_abstract.xsd","",c_shell_successWithoutWarningAndError);
+ f_shellCommandWithVerdict(xsd2ttcn_command & " XmlTest_element_abstract.xsd","",c_shell_successWithoutWarningAndError);
}//tc_
testcase tc_element_nillable_converter() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn -z XmlTest_imsike.xsd","",c_shell_successWithoutWarningAndError );
+ f_shellCommandWithVerdict(xsd2ttcn_command & " -z XmlTest_imsike.xsd","",c_shell_successWithoutWarningAndError );
if(getverdict==pass) {
f_compareFiles(
@@ -2433,7 +2432,7 @@ group Elements{
}//tc_
testcase tc_element_nillable_with_annotations() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn nillable_annotations.xsd","",c_shell_successWithoutWarningAndError );
+ f_shellCommandWithVerdict(xsd2ttcn_command & " nillable_annotations.xsd","",c_shell_successWithoutWarningAndError );
if(getverdict==pass) {
f_compareFiles(
@@ -2442,7 +2441,7 @@ group Elements{
}//tc_
testcase tc_element_nillable_in_nillable_extension() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn nillable_in_nillable_extension.xsd","",c_shell_successWithoutWarningAndError );
+ f_shellCommandWithVerdict(xsd2ttcn_command & " nillable_in_nillable_extension.xsd","",c_shell_successWithoutWarningAndError );
if(getverdict==pass) {
f_compareFiles(
@@ -2452,7 +2451,7 @@ group Elements{
}//tc_
testcase tc_element_attributegroup_nillable() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn attributegroup_nillable.xsd","",c_shell_successWithoutWarningAndError );
+ f_shellCommandWithVerdict(xsd2ttcn_command & " attributegroup_nillable.xsd","",c_shell_successWithoutWarningAndError );
if(getverdict==pass) {
f_compareFiles(
@@ -2462,7 +2461,7 @@ group Elements{
}//tc_
testcase tc_element_attributegroup_ingroup() runs on xmlTest_CT {
- f_shellCommandWithVerdict("xsd2ttcn attribgroup_ingroup.xsd","",c_shell_successWithoutWarningAndError );
+ f_shellCommandWithVerdict(xsd2ttcn_command & " attribgroup_ingroup.xsd","",c_shell_successWithoutWarningAndError );
if(getverdict==pass) {
f_compareFiles(
diff --git a/regression_test/XML/XmlWorkflow/src/xmlTest_protocolXsd_Testcases.ttcn b/regression_test/XML/XmlWorkflow/src/xmlTest_protocolXsd_Testcases.ttcn
index bd6936964..c679f6716 100644
--- a/regression_test/XML/XmlWorkflow/src/xmlTest_protocolXsd_Testcases.ttcn
+++ b/regression_test/XML/XmlWorkflow/src/xmlTest_protocolXsd_Testcases.ttcn
@@ -396,7 +396,7 @@ function f_encDecTest_SIP_MessageType(in MessageType pl_pdu, in charstring pl_ex
testcase tc_XmlTest_CAI3G_converter() runs on xmlTest_CT
{
- f_shellCommandWithVerdict("xsd2ttcn Bulk.xsd GenericCai3gType.xsd Provisioning.xsd","",c_shell_successWithWarning);
+ f_shellCommandWithVerdict(xsd2ttcn_command & "Bulk.xsd GenericCai3gType.xsd Provisioning.xsd","",c_shell_successWithWarning);
if(getverdict==pass) {
f_compareFiles(
@@ -410,7 +410,7 @@ testcase tc_XmlTest_CAI3G_converter() runs on xmlTest_CT
testcase tc_XmlTest_CCAPI_converter() runs on xmlTest_CT
{
- f_shellCommandWithVerdict("xsd2ttcn CCAPI.xsd","",c_shell_successWithoutWarningAndError);
+ f_shellCommandWithVerdict(xsd2ttcn_command & "CCAPI.xsd","",c_shell_successWithoutWarningAndError);
if(getverdict==pass) {
f_compareFiles(
@@ -420,7 +420,7 @@ testcase tc_XmlTest_CCAPI_converter() runs on xmlTest_CT
testcase tc_XmlTest_HSS_converter() runs on xmlTest_CT
{
- f_shellCommandWithVerdict("xsd2ttcn avg.xsd cai3g1.2_provisioning.xsd eps.xsd hssla_types.xsd","",c_shell_successWithWarning);
+ f_shellCommandWithVerdict(xsd2ttcn_command & "avg.xsd cai3g1.2_provisioning.xsd eps.xsd hssla_types.xsd","",c_shell_successWithWarning);
if(getverdict==pass) {
f_compareFiles(
@@ -432,7 +432,7 @@ testcase tc_XmlTest_HSS_converter() runs on xmlTest_CT
testcase tc_XmlTest_JMdict_converter() runs on xmlTest_CT
{
- f_shellCommandWithVerdict("xsd2ttcn jmdict-good.xsd","",c_shell_successWithoutWarningAndError);
+ f_shellCommandWithVerdict(xsd2ttcn_command & "jmdict-good.xsd","",c_shell_successWithoutWarningAndError);
if(getverdict==pass) {
f_compareFiles(
@@ -442,7 +442,7 @@ testcase tc_XmlTest_JMdict_converter() runs on xmlTest_CT
testcase tc_XmlTest_MGW_converter() runs on xmlTest_CT
{
- f_shellCommandWithVerdict("xsd2ttcn confd.xsd IntegratedSite.xsd IsTypes.xsd MainSwitch.xsd Mgw_R9B27.xsd Misc.xsd xml.xsd XMLSchema.xsd", "",c_shell_successWithWarning);
+ f_shellCommandWithVerdict(xsd2ttcn_command & "confd.xsd IntegratedSite.xsd IsTypes.xsd MainSwitch.xsd Mgw_R9B27.xsd Misc.xsd xml.xsd XMLSchema.xsd", "",c_shell_successWithWarning);
if(getverdict==pass) {
f_compareFiles(
@@ -464,7 +464,7 @@ testcase tc_XmlTest_MGW_converter() runs on xmlTest_CT
testcase tc_XmlTest_MGW_HK84933_converter() runs on xmlTest_CT
{
- f_shellCommandWithVerdict("xsd2ttcn IntegratedSite_HK84933.xsd","",c_shell_successWithWarning);
+ f_shellCommandWithVerdict(xsd2ttcn_command & "IntegratedSite_HK84933.xsd","",c_shell_successWithWarning);
if(getverdict==pass) {
f_compareFiles(
@@ -481,7 +481,7 @@ testcase tc_XmlTest_MGW_encDec() runs on xmlTest_CT
testcase tc_XmlTest_PAP_converter() runs on xmlTest_CT
{
- f_shellCommandWithVerdict("xsd2ttcn PAP.xsd","",c_shell_successWithoutWarningAndError);
+ f_shellCommandWithVerdict(xsd2ttcn_command & "PAP.xsd","",c_shell_successWithoutWarningAndError);
if(getverdict==pass) {
f_compareFiles(
@@ -491,7 +491,7 @@ testcase tc_XmlTest_PAP_converter() runs on xmlTest_CT
testcase tc_XmlTest_ParlayX_converter() runs on xmlTest_CT
{
- f_shellCommandWithVerdict("xsd2ttcn parlayx_common_types_2_0.xsd parlayx_payment_amount_charging_interface_2_0.xsd parlayx_payment_reserve_amount_charging_interface_2_0.xsd parlayx_payment_reserve_volume_charging_interface_2_0.xsd parlayx_payment_types_2_0.xsd parlayx_payment_volume_charging_interface_2_0.xsd", "",c_shell_successWithoutWarningAndError);
+ f_shellCommandWithVerdict(xsd2ttcn_command & "parlayx_common_types_2_0.xsd parlayx_payment_amount_charging_interface_2_0.xsd parlayx_payment_reserve_amount_charging_interface_2_0.xsd parlayx_payment_reserve_volume_charging_interface_2_0.xsd parlayx_payment_types_2_0.xsd parlayx_payment_volume_charging_interface_2_0.xsd", "",c_shell_successWithoutWarningAndError);
if(getverdict==pass) {
f_compareFiles(
@@ -511,7 +511,7 @@ testcase tc_XmlTest_ParlayX_converter() runs on xmlTest_CT
testcase tc_XmlTest_PIDF_converter() runs on xmlTest_CT
{
- f_shellCommandWithVerdict("xsd2ttcn pidf.xsd rlmi.xsd testschema.xsd xml_PIDF.xsd","",c_shell_successWithWarning);
+ f_shellCommandWithVerdict(xsd2ttcn_command & "pidf.xsd rlmi.xsd testschema.xsd xml_PIDF.xsd","",c_shell_successWithWarning);
if(getverdict==pass) {
f_compareFiles(
@@ -527,7 +527,7 @@ testcase tc_XmlTest_PIDF_converter() runs on xmlTest_CT
testcase tc_XmlTest_RLP_converter() runs on xmlTest_CT
{
- f_shellCommandWithVerdict("xsd2ttcn RLP_SVC.xsd","",c_shell_successWithoutWarningAndError);
+ f_shellCommandWithVerdict(xsd2ttcn_command & "RLP_SVC.xsd","",c_shell_successWithoutWarningAndError);
if(getverdict==pass) {
f_compareFiles(
@@ -537,7 +537,7 @@ testcase tc_XmlTest_RLP_converter() runs on xmlTest_CT
testcase tc_XmlTest_RLXML_converter() runs on xmlTest_CT
{
- f_shellCommandWithVerdict("xsd2ttcn RLXML_small.xsd","",c_shell_successWithWarning);
+ f_shellCommandWithVerdict(xsd2ttcn_command & "RLXML_small.xsd","",c_shell_successWithWarning);
if(getverdict==pass) {
f_compareFiles(
@@ -547,7 +547,7 @@ testcase tc_XmlTest_RLXML_converter() runs on xmlTest_CT
testcase tc_XmlTest_ShData_converter() runs on xmlTest_CT
{
- f_shellCommandWithVerdict("xsd2ttcn ShDataType.xsd","",c_shell_successWithWarning);
+ f_shellCommandWithVerdict(xsd2ttcn_command & "ShDataType.xsd","",c_shell_successWithWarning);
if(getverdict==pass) {
f_compareFiles(
@@ -557,7 +557,7 @@ testcase tc_XmlTest_ShData_converter() runs on xmlTest_CT
testcase tc_XmlTest_SIPserver_converter() runs on xmlTest_CT
{
- f_shellCommandWithVerdict("xsd2ttcn SIP.xsd","",c_shell_successWithoutWarningAndError);
+ f_shellCommandWithVerdict(xsd2ttcn_command & "SIP.xsd","",c_shell_successWithoutWarningAndError);
if(getverdict==pass) {
f_compareFiles(
diff --git a/regression_test/templateIstemplatekind/Makefile b/regression_test/templateIstemplatekind/Makefile
index 30918d4b7..ffffb45b3 100644
--- a/regression_test/templateIstemplatekind/Makefile
+++ b/regression_test/templateIstemplatekind/Makefile
@@ -49,7 +49,7 @@ clean distclean:
dep: $(GENERATED_SOURCES)
makedepend $(CPPFLAGS) $(GENERATED_SOURCES)
-run: $(TARGET) config.cfg
+run: $(TARGET)
./$^
.NOTPARALLEL:
--
GitLab