Commit 179fa080 authored by BenceJanosSzabo's avatar BenceJanosSzabo
Browse files

Added and upgraded the XmlWorkflow protocol module tests. (Bug 509203)



Change-Id: Ic18ed731fe11ffab904421fc57c3891e20c04ffa
Signed-off-by: default avatarBenceJanosSzabo <bence.janos.szabo@ericsson.com>
parent 1b335458
......@@ -8,30 +8,19 @@
# Contributors:
# Balasko, Jeno
# Raduly, Csaba
# Szabo, Bence Janos
#
##############################################################################
TOPDIR := ../..
include ../../Makefile.regression
all: all1
all: all1 all2
run: run1
run: run1 run2
clean: clean1
distclean: distclean1
ifeq ($(XMLWORKFLOW),2)
# Add more prerequisites to the targets
all: all2
run: run2
clean: clean2
distclean: distclean2
endif
clean: clean1 clean2
distclean: distclean1 distclean2
# for general XML tests
all1: bin/Makefile
......
......@@ -16,7 +16,7 @@
*
******************************************************************************/
//
// File: NoTargetNamespace_CCAPI.ttcn
// File: NoTargetNamespace.ttcn
// Description:
// References:
// Rev:
......@@ -25,17 +25,23 @@
// Contact: http://ttcn.ericsson.se
//
////////////////////////////////////////////////////////////////////////////////
//
// Generated from file(s):
//
// - CCAPI.xsd
// /* xml version = "1.0" */
// /* targetnamespace = "NoTargetNamespace" */
//
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
// Modified by:
// Modification date:
// Description:
// Modification contact:
//------------------------------------------------------------------------------
////////////////////////////////////////////////////////////////////////////////
module NoTargetNamespace_CCAPI {
module NoTargetNamespace_CCAPI_e {
import from XSD all;
......@@ -95,6 +101,7 @@ type record DedicatedAccounts
with {
variant "element";
variant (dedicatedAccount_list) "untagged";
variant (dedicatedAccount_list[-]) "name as 'DedicatedAccount'";
};
......@@ -126,6 +133,7 @@ type record UsageAccumulators
with {
variant "element";
variant (usageAccumulator_list) "untagged";
variant (usageAccumulator_list[-]) "name as 'UsageAccumulator'";
};
......
......@@ -16,7 +16,7 @@
*
******************************************************************************/
//
// File: NoTargetNamespace_JMdict.ttcn
// File: NoTargetNamespace.ttcn
// Description:
// References:
// Rev:
......@@ -25,17 +25,22 @@
// Contact: http://ttcn.ericsson.se
//
////////////////////////////////////////////////////////////////////////////////
//
// Generated from file(s):
//
// - jmdict-good.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
// /* targetnamespace = "NoTargetNamespace" */
//
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
// Modified by:
// Modification date:
// Description:
// Modification contact:
//------------------------------------------------------------------------------
////////////////////////////////////////////////////////////////////////////////
module NoTargetNamespace_JMdict {
module NoTargetNamespace_JMdict_e {
import from XSD all;
......@@ -48,6 +53,7 @@ type record JMdict
with {
variant "element";
variant (entry_list) "untagged";
variant (entry_list[-]) "name as 'entry'";
};
......@@ -63,8 +69,11 @@ with {
variant "name as uncapitalized";
variant "element";
variant (k_ele_list) "untagged";
variant (k_ele_list[-]) "name as 'k_ele'";
variant (r_ele_list) "untagged";
variant (r_ele_list[-]) "name as 'r_ele'";
variant (sense_list) "untagged";
variant (sense_list[-]) "name as 'sense'";
};
......@@ -85,7 +94,9 @@ with {
variant "name as uncapitalized";
variant "element";
variant (ke_inf_list) "untagged";
variant (ke_inf_list[-]) "name as 'ke_inf'";
variant (ke_pri_list) "untagged";
variant (ke_pri_list[-]) "name as 'ke_pri'";
};
......@@ -125,8 +136,11 @@ with {
variant "element";
variant (choice) "untagged";
variant (choice.re_restr_list) "untagged";
variant (choice.re_restr_list[-]) "name as 're_restr'";
variant (re_inf_list) "untagged";
variant (re_inf_list[-]) "name as 're_inf'";
variant (re_pri_list) "untagged";
variant (re_pri_list[-]) "name as 're_pri'";
};
......@@ -215,7 +229,7 @@ type record Sense
S_inf s_inf optional,
union {
record of Dial dial_list,
record of Lsource lsource_list
record length(1 .. infinity) of Lsource lsource_list
} choice,
record of Gloss gloss_list
}
......@@ -223,16 +237,26 @@ with {
variant "name as uncapitalized";
variant "element";
variant (stagk_list) "untagged";
variant (stagk_list[-]) "name as 'stagk'";
variant (stagr_list) "untagged";
variant (stagr_list[-]) "name as 'stagr'";
variant (pos_list) "untagged";
variant (pos_list[-]) "name as 'pos'";
variant (xref_list) "untagged";
variant (xref_list[-]) "name as 'xref'";
variant (ant_list) "untagged";
variant (ant_list[-]) "name as 'ant'";
variant (field_list) "untagged";
variant (field_list[-]) "name as 'field'";
variant (misc_list) "untagged";
variant (misc_list[-]) "name as 'misc'";
variant (choice) "untagged";
variant (choice.dial_list) "untagged";
variant (choice.dial_list[-]) "name as 'dial'";
variant (choice.lsource_list) "untagged";
variant (choice.lsource_list[-]) "name as 'lsource'";
variant (gloss_list) "untagged";
variant (gloss_list[-]) "name as 'gloss'";
};
......
/******************************************************************************
/*******************************************************************************
* Copyright (c) 2000-2017 Ericsson Telecom AB
*
* XSD to TTCN-3 Translator
......@@ -16,7 +16,7 @@
*
******************************************************************************/
//
// File: NoTargetNamespace_PAP.ttcn
// File: NoTargetNamespace.ttcn
// Description:
// References:
// Rev:
......@@ -25,22 +25,45 @@
// Contact: http://ttcn.ericsson.se
//
////////////////////////////////////////////////////////////////////////////////
//
// Generated from file(s):
//
// - PAP.xsd
// /* xml version = "1.0" */
// /* targetnamespace = "NoTargetNamespace" */
//
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
// Modified by:
// Modification date:
// Description:
// Modification contact:
//------------------------------------------------------------------------------
////////////////////////////////////////////////////////////////////////////////
module NoTargetNamespace_PAP {
module NoTargetNamespace_PAP_e {
import from XSD all;
const Push_message.replace_method c_defaultForEmpty_1 := all_;
const Push_message.progress_notes_requested c_defaultForEmpty_2 := false_;
const Quality_of_service.priority c_defaultForEmpty_3 := medium;
const Quality_of_service.delivery_method c_defaultForEmpty_4 := notspecified;
const Quality_of_service.network_required c_defaultForEmpty_5 := false_;
const Quality_of_service.bearer_required c_defaultForEmpty_6 := false_;
type record Address
{
XSD.AnySimpleType address_value
......@@ -80,6 +103,7 @@ with {
variant (push_id) "name as 'push-id'";
variant (push_id) "attribute";
variant (address_list) "untagged";
variant (address_list[-]) "name as 'address'";
};
......@@ -94,6 +118,7 @@ with {
variant (push_id) "name as 'push-id'";
variant (push_id) "attribute";
variant (cancel_result_list) "untagged";
variant (cancel_result_list[-]) "name as 'cancel-result'";
};
......@@ -109,6 +134,7 @@ with {
variant (code) "attribute";
variant (desc) "attribute";
variant (address_list) "untagged";
variant (address_list[-]) "name as 'address'";
};
......@@ -205,13 +231,13 @@ type record Push_message
XSD.AnySimpleType deliver_before_timestamp optional,
XSD.AnySimpleType ppg_notify_requested_to optional,
enumerated {
true_,
false_
false_,
true_
} progress_notes_requested optional,
XSD.AnySimpleType push_id,
enumerated {
pending_only,
all_
all_,
pending_only
} replace_method optional,
XSD.AnySimpleType replace_push_id optional,
XSD.AnySimpleType source_reference optional,
......@@ -229,21 +255,22 @@ with {
variant (ppg_notify_requested_to) "attribute";
variant (progress_notes_requested) "text 'false_' as 'false'";
variant (progress_notes_requested) "text 'true_' as 'true'";
variant (progress_notes_requested) "defaultForEmpty as c_defaultForEmpty_2";
variant (progress_notes_requested) "name as 'progress-notes-requested'";
variant (progress_notes_requested) "defaultForEmpty as 'false'";
variant (progress_notes_requested) "attribute";
variant (push_id) "name as 'push-id'";
variant (push_id) "attribute";
variant (replace_method) "text 'all_' as 'all'";
variant (replace_method) "text 'pending_only' as 'pending-only'";
variant (replace_method) "defaultForEmpty as c_defaultForEmpty_1";
variant (replace_method) "name as 'replace-method'";
variant (replace_method) "defaultForEmpty as 'all'";
variant (replace_method) "attribute";
variant (replace_push_id) "name as 'replace-push-id'";
variant (replace_push_id) "attribute";
variant (source_reference) "name as 'source-reference'";
variant (source_reference) "attribute";
variant (address_list) "untagged";
variant (address_list[-]) "name as 'address'";
variant (quality_of_service) "name as 'quality-of-service'";
};
......@@ -269,6 +296,7 @@ with {
variant (sender_name) "name as 'sender-name'";
variant (sender_name) "attribute";
variant (progress_note_list) "untagged";
variant (progress_note_list[-]) "name as 'progress-note'";
variant (response_result) "name as 'response-result'";
};
......@@ -277,24 +305,24 @@ type record Quality_of_service
{
XSD.AnySimpleType bearer optional,
enumerated {
true_,
false_
false_,
true_
} bearer_required optional,
enumerated {
confirmed,
notspecified,
preferconfirmed,
unconfirmed,
notspecified
unconfirmed
} delivery_method optional,
XSD.AnySimpleType network optional,
enumerated {
true_,
false_
false_,
true_
} network_required optional,
enumerated {
high,
medium,
low
low,
medium
} priority optional
}
with {
......@@ -303,19 +331,19 @@ with {
variant (bearer) "attribute";
variant (bearer_required) "text 'false_' as 'false'";
variant (bearer_required) "text 'true_' as 'true'";
variant (bearer_required) "defaultForEmpty as c_defaultForEmpty_6";
variant (bearer_required) "name as 'bearer-required'";
variant (bearer_required) "defaultForEmpty as 'false'";
variant (bearer_required) "attribute";
variant (delivery_method) "defaultForEmpty as c_defaultForEmpty_4";
variant (delivery_method) "name as 'delivery-method'";
variant (delivery_method) "defaultForEmpty as 'notspecified'";
variant (delivery_method) "attribute";
variant (network) "attribute";
variant (network_required) "text 'false_' as 'false'";
variant (network_required) "text 'true_' as 'true'";
variant (network_required) "defaultForEmpty as c_defaultForEmpty_5";
variant (network_required) "name as 'network-required'";
variant (network_required) "defaultForEmpty as 'false'";
variant (network_required) "attribute";
variant (priority) "defaultForEmpty as 'medium'";
variant (priority) "defaultForEmpty as c_defaultForEmpty_3";
variant (priority) "attribute";
};
......@@ -339,14 +367,14 @@ type record Resultnotification_message
XSD.AnySimpleType desc optional,
XSD.AnySimpleType event_time optional,
enumerated {
rejected,
pending,
aborted,
cancelled,
delivered,
undeliverable,
expired,
aborted,
pending,
rejected,
timeout_,
cancelled,
undeliverable,
unknown
} message_state,
XSD.AnySimpleType push_id,
......@@ -408,6 +436,7 @@ with {
variant (push_id) "name as 'push-id'";
variant (push_id) "attribute";
variant (address_list) "untagged";
variant (address_list[-]) "name as 'address'";
};
......@@ -422,6 +451,7 @@ with {
variant (push_id) "name as 'push-id'";
variant (push_id) "attribute";
variant (statusquery_result_list) "untagged";
variant (statusquery_result_list[-]) "name as 'statusquery-result'";
};
......@@ -431,14 +461,14 @@ type record Statusquery_result
XSD.AnySimpleType desc optional,
XSD.AnySimpleType event_time optional,
enumerated {
rejected,
pending,
aborted,
cancelled,
delivered,
undeliverable,
expired,
aborted,
pending,
rejected,
timeout_,
cancelled,
undeliverable,
unknown
} message_state,
record of Address address_list,
......@@ -455,6 +485,7 @@ with {
variant (message_state) "name as 'message-state'";
variant (message_state) "attribute";
variant (address_list) "untagged";
variant (address_list[-]) "name as 'address'";
variant (quality_of_service) "name as 'quality-of-service'";
};
......
/******************************************************************************
/*******************************************************************************
* Copyright (c) 2000-2017 Ericsson Telecom AB
*
* XSD to TTCN-3 Translator
......@@ -16,7 +16,7 @@
*
******************************************************************************/
//
// File: NoTargetNamespace_RLP.ttcn
// File: NoTargetNamespace.ttcn
// Description:
// References:
// Rev:
......@@ -25,22 +25,111 @@
// Contact: http://ttcn.ericsson.se
//
////////////////////////////////////////////////////////////////////////////////
//
// Generated from file(s):
//
// - RLP_SVC.xsd
// /* xml version = "1.0" */
// /* targetnamespace = "NoTargetNamespace" */
//
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
// Modified by:
// Modification date:
// Description:
// Modification contact:
//------------------------------------------------------------------------------
////////////////////////////////////////////////////////////////////////////////
module NoTargetNamespace_RLP {
module NoTargetNamespace_RLP_e {
import from XSD all;
const Client.type_ c_defaultForEmpty_1 := x1;
const Esrd.type_ c_defaultForEmpty_2 := nA;
const Esrk.type_ c_defaultForEmpty_3 := nA;
const Loc_type.type_ c_defaultForEmpty_4 := cURRENT;
const Msid.type_ c_defaultForEmpty_5 := mSISDN;
const Msid.enc c_defaultForEmpty_6 := aSC;
const Poi.flag c_defaultForEmpty_7 := oFF;
const Prio.type_ c_defaultForEmpty_8 := nORMAL;
const Requestmode.type_ c_defaultForEmpty_9 := pASSIVE;
const Requestor.type_ c_defaultForEmpty_10 := mSISDN;
const Resp_req.type_ c_defaultForEmpty_11 := dELAY_TOL;
const XSD.AnySimpleType c_defaultForEmpty_12 := "1.0.0";
const Serving_node_action.active_type c_defaultForEmpty_13 := pOSITION_NOT_ALLOWED;
const Srlir.res_type c_defaultForEmpty_14 := sYNC;
const XSD.AnySimpleType c_defaultForEmpty_15 := "0000";
const Supported_shapes.point c_defaultForEmpty_16 := nO;
const Supported_shapes.lineString c_defaultForEmpty_17 := nO;
const Supported_shapes.polygon c_defaultForEmpty_18 := nO;
const Supported_shapes.box c_defaultForEmpty_19 := nO;
const Supported_shapes.circularArea c_defaultForEmpty_20 := nO;
const Supported_shapes.circularArcArea c_defaultForEmpty_21 := nO;
const Supported_shapes.ellipticalArea c_defaultForEmpty_22 := nO;
const Supported_shapes.multiLineString c_defaultForEmpty_23 := nO;
const Supported_shapes.multiPoint c_defaultForEmpty_24 := nO;
const Supported_shapes.multiPolygon c_defaultForEmpty_25 := nO;
const Supported_shapes.linearRing c_defaultForEmpty_26 := nO;
const Supported_shapes.altitude c_defaultForEmpty_27 := nO;
const Uc_id.status c_defaultForEmpty_28 := cURRENT;
type record Box
{
XSD.ID gid optional,
......@@ -141,6 +230,7 @@ with {
variant (gid) "attribute";
variant (srsName) "attribute";
variant (coord_list) "untagged";
variant (coord_list[-]) "name as 'coord'";
};
......@@ -160,6 +250,7 @@ with {
variant (coord_1) "name as 'coord'";
variant (coord_2) "name as 'coord'";
variant (coord_list) "untagged";
variant (coord_list[-]) "name as 'coord'";