From eaa24a2937502983659f9cfea716ae4037f51d46 Mon Sep 17 00:00:00 2001
From: Botond Baranyi <botond.baranyi@ericsson.com>
Date: Mon, 5 Dec 2016 13:42:53 +0100
Subject: [PATCH] Unified DTE message
Change-Id: I5fbcebde43e00f18e4acb5f744746ca264407681
Signed-off-by: Botond Baranyi <botond.baranyi@ericsson.com>
---
compiler2/record.c | 2 +-
compiler2/union.c | 2 +-
core/ASN_CharacterString.cc | 8 ++++----
core/ASN_EmbeddedPDV.cc | 8 ++++----
core/ASN_External.cc | 8 ++++----
core/Charstring.cc | 2 +-
core/Universal_charstring.cc | 2 +-
function_test/XER_EncDec/XER_EncDec_TD.script | 2 +-
regression_test/tryCatch/tryCatch_Testcases.ttcn | 6 +++---
9 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/compiler2/record.c b/compiler2/record.c
index 689582b4d..5bae3e48c 100644
--- a/compiler2/record.c
+++ b/compiler2/record.c
@@ -5304,7 +5304,7 @@ void defRecordTemplate1(const struct_def *sdef, output_struct *output)
src = mputprintf(src, "%s %s_template::valueof() const\n"
"{\n"
"if (template_selection != SPECIFIC_VALUE || is_ifpresent)\n"
- "TTCN_error(\"Performing valueof or send operation on a non-specific "
+ "TTCN_error(\"Performing a valueof or send operation on a non-specific "
"template of type %s.\");\n"
"%s ret_val;\n", name, name, dispname, name);
for (i = 0; i < sdef->nElements; i++) {
diff --git a/compiler2/union.c b/compiler2/union.c
index f3342ae54..a2e84dbb6 100644
--- a/compiler2/union.c
+++ b/compiler2/union.c
@@ -2591,7 +2591,7 @@ void defUnionTemplate(const struct_def *sdef, output_struct *output)
src = mputprintf(src, "%s %s_template::valueof() const\n"
"{\n"
"if (template_selection != SPECIFIC_VALUE || is_ifpresent)\n"
- "TTCN_error(\"Performing valueof or send operation on a non-specific "
+ "TTCN_error(\"Performing a valueof or send operation on a non-specific "
"template of union type %s.\");\n"
"%s ret_val;\n"
"switch (single_value.union_selection) {\n", name, name, dispname, name);
diff --git a/core/ASN_CharacterString.cc b/core/ASN_CharacterString.cc
index 86b989b77..43c7cded4 100644
--- a/core/ASN_CharacterString.cc
+++ b/core/ASN_CharacterString.cc
@@ -1122,7 +1122,7 @@ boolean CHARACTER_STRING_identification_template::match(const CHARACTER_STRING_i
CHARACTER_STRING_identification CHARACTER_STRING_identification_template::valueof() const
{
if (template_selection != SPECIFIC_VALUE || is_ifpresent)
- TTCN_error("Performing valueof or send operation on a non-specific template of union type CHARACTER STRING.identification.");
+ TTCN_error("Performing a valueof or send operation on a non-specific template of union type CHARACTER STRING.identification.");
CHARACTER_STRING_identification ret_val;
switch (single_value.union_selection) {
case CHARACTER_STRING_identification::ALT_syntaxes:
@@ -2112,7 +2112,7 @@ boolean CHARACTER_STRING_identification_syntaxes_template::match(const CHARACTER
CHARACTER_STRING_identification_syntaxes CHARACTER_STRING_identification_syntaxes_template::valueof() const
{
if (template_selection != SPECIFIC_VALUE || is_ifpresent)
- TTCN_error("Performing valueof or send operation on a non-specific template of type CHARACTER STRING.identification.syntaxes.");
+ TTCN_error("Performing a valueof or send operation on a non-specific template of type CHARACTER STRING.identification.syntaxes.");
CHARACTER_STRING_identification_syntaxes ret_val;
ret_val.abstract() = single_value->field_abstract.valueof();
ret_val.transfer() = single_value->field_transfer.valueof();
@@ -2845,7 +2845,7 @@ boolean CHARACTER_STRING_identification_context__negotiation_template::match(con
CHARACTER_STRING_identification_context__negotiation CHARACTER_STRING_identification_context__negotiation_template::valueof() const
{
if (template_selection != SPECIFIC_VALUE || is_ifpresent)
- TTCN_error("Performing valueof or send operation on a non-specific template of type CHARACTER STRING.identification.context-negotiation.");
+ TTCN_error("Performing a valueof or send operation on a non-specific template of type CHARACTER STRING.identification.context-negotiation.");
CHARACTER_STRING_identification_context__negotiation ret_val;
ret_val.presentation__context__id() = single_value->field_presentation__context__id.valueof();
ret_val.transfer__syntax() = single_value->field_transfer__syntax.valueof();
@@ -3730,7 +3730,7 @@ boolean CHARACTER_STRING_template::match(const CHARACTER_STRING& other_value,
CHARACTER_STRING CHARACTER_STRING_template::valueof() const
{
if (template_selection != SPECIFIC_VALUE || is_ifpresent)
- TTCN_error("Performing valueof or send operation on a non-specific template of type CHARACTER STRING.");
+ TTCN_error("Performing a valueof or send operation on a non-specific template of type CHARACTER STRING.");
CHARACTER_STRING ret_val;
ret_val.identification() = single_value->field_identification.valueof();
if (single_value->field_data__value__descriptor.is_omit()) ret_val.data__value__descriptor() = OMIT_VALUE;
diff --git a/core/ASN_EmbeddedPDV.cc b/core/ASN_EmbeddedPDV.cc
index 33695173a..a8eeed28b 100644
--- a/core/ASN_EmbeddedPDV.cc
+++ b/core/ASN_EmbeddedPDV.cc
@@ -1118,7 +1118,7 @@ boolean EMBEDDED_PDV_identification_template::match(const EMBEDDED_PDV_identific
EMBEDDED_PDV_identification EMBEDDED_PDV_identification_template::valueof() const
{
if (template_selection != SPECIFIC_VALUE || is_ifpresent)
- TTCN_error("Performing valueof or send operation on a non-specific template of union type EMBEDDED PDV.identification.");
+ TTCN_error("Performing a valueof or send operation on a non-specific template of union type EMBEDDED PDV.identification.");
EMBEDDED_PDV_identification ret_val;
switch (single_value.union_selection) {
case EMBEDDED_PDV_identification::ALT_syntaxes:
@@ -2116,7 +2116,7 @@ boolean EMBEDDED_PDV_identification_syntaxes_template::match(const EMBEDDED_PDV_
EMBEDDED_PDV_identification_syntaxes EMBEDDED_PDV_identification_syntaxes_template::valueof() const
{
if (template_selection != SPECIFIC_VALUE || is_ifpresent)
- TTCN_error("Performing valueof or send operation on a non-specific template of type EMBEDDED PDV.identification.syntaxes.");
+ TTCN_error("Performing a valueof or send operation on a non-specific template of type EMBEDDED PDV.identification.syntaxes.");
EMBEDDED_PDV_identification_syntaxes ret_val;
ret_val.abstract() = single_value->field_abstract.valueof();
ret_val.transfer() = single_value->field_transfer.valueof();
@@ -2857,7 +2857,7 @@ boolean EMBEDDED_PDV_identification_context__negotiation_template::match(const E
EMBEDDED_PDV_identification_context__negotiation EMBEDDED_PDV_identification_context__negotiation_template::valueof() const
{
if (template_selection != SPECIFIC_VALUE || is_ifpresent)
- TTCN_error("Performing valueof or send operation on a non-specific template of type EMBEDDED PDV.identification.context-negotiation.");
+ TTCN_error("Performing a valueof or send operation on a non-specific template of type EMBEDDED PDV.identification.context-negotiation.");
EMBEDDED_PDV_identification_context__negotiation ret_val;
ret_val.presentation__context__id() = single_value->field_presentation__context__id.valueof();
ret_val.transfer__syntax() = single_value->field_transfer__syntax.valueof();
@@ -3747,7 +3747,7 @@ boolean EMBEDDED_PDV_template::match(const EMBEDDED_PDV& other_value,
EMBEDDED_PDV EMBEDDED_PDV_template::valueof() const
{
if (template_selection != SPECIFIC_VALUE || is_ifpresent)
- TTCN_error("Performing valueof or send operation on a non-specific template of type EMBEDDED PDV.");
+ TTCN_error("Performing a valueof or send operation on a non-specific template of type EMBEDDED PDV.");
EMBEDDED_PDV ret_val;
ret_val.identification() = single_value->field_identification.valueof();
if (single_value->field_data__value__descriptor.is_omit()) ret_val.data__value__descriptor() = OMIT_VALUE;
diff --git a/core/ASN_External.cc b/core/ASN_External.cc
index 9eacbc8e4..c984ea866 100644
--- a/core/ASN_External.cc
+++ b/core/ASN_External.cc
@@ -1513,7 +1513,7 @@ boolean EXTERNAL_identification_template::match(const EXTERNAL_identification& o
EXTERNAL_identification EXTERNAL_identification_template::valueof() const
{
if (template_selection != SPECIFIC_VALUE || is_ifpresent)
- TTCN_error("Performing valueof or send operation on a non-specific template of union type EXTERNAL.identification.");
+ TTCN_error("Performing a valueof or send operation on a non-specific template of union type EXTERNAL.identification.");
EXTERNAL_identification ret_val;
switch (single_value.union_selection) {
case EXTERNAL_identification::ALT_syntaxes:
@@ -2418,7 +2418,7 @@ boolean EXTERNAL_identification_syntaxes_template::match(const EXTERNAL_identifi
EXTERNAL_identification_syntaxes EXTERNAL_identification_syntaxes_template::valueof() const
{
if (template_selection != SPECIFIC_VALUE || is_ifpresent)
- TTCN_error("Performing valueof or send operation on a non-specific template of type EXTERNAL.identification.syntaxes.");
+ TTCN_error("Performing a valueof or send operation on a non-specific template of type EXTERNAL.identification.syntaxes.");
EXTERNAL_identification_syntaxes ret_val;
ret_val.abstract() = single_value->field_abstract.valueof();
ret_val.transfer() = single_value->field_transfer.valueof();
@@ -3064,7 +3064,7 @@ boolean EXTERNAL_identification_context__negotiation_template::match(const EXTER
EXTERNAL_identification_context__negotiation EXTERNAL_identification_context__negotiation_template::valueof() const
{
if (template_selection != SPECIFIC_VALUE || is_ifpresent)
- TTCN_error("Performing valueof or send operation on a non-specific template of type EXTERNAL.identification.context-negotiation.");
+ TTCN_error("Performing a valueof or send operation on a non-specific template of type EXTERNAL.identification.context-negotiation.");
EXTERNAL_identification_context__negotiation ret_val;
ret_val.presentation__context__id() = single_value->field_presentation__context__id.valueof();
ret_val.transfer__syntax() = single_value->field_transfer__syntax.valueof();
@@ -3836,7 +3836,7 @@ boolean EXTERNAL_template::match(const EXTERNAL& other_value,
EXTERNAL EXTERNAL_template::valueof() const
{
if (template_selection != SPECIFIC_VALUE || is_ifpresent)
- TTCN_error("Performing valueof or send operation on a non-specific template of type EXTERNAL.");
+ TTCN_error("Performing a valueof or send operation on a non-specific template of type EXTERNAL.");
EXTERNAL ret_val;
ret_val.identification() = single_value->field_identification.valueof();
if (single_value->field_data__value__descriptor.is_omit()) ret_val.data__value__descriptor() = OMIT_VALUE;
diff --git a/core/Charstring.cc b/core/Charstring.cc
index f72ce5d72..486622542 100644
--- a/core/Charstring.cc
+++ b/core/Charstring.cc
@@ -2333,7 +2333,7 @@ boolean CHARSTRING_template::match(const CHARSTRING& other_value,
const CHARSTRING& CHARSTRING_template::valueof() const
{
if (template_selection != SPECIFIC_VALUE || is_ifpresent)
- TTCN_error("Performing valueof or send operation on a non-specific "
+ TTCN_error("Performing a valueof or send operation on a non-specific "
"charstring template.");
return single_value;
}
diff --git a/core/Universal_charstring.cc b/core/Universal_charstring.cc
index dd5b5f2c4..6a5514b02 100644
--- a/core/Universal_charstring.cc
+++ b/core/Universal_charstring.cc
@@ -4155,7 +4155,7 @@ boolean UNIVERSAL_CHARSTRING_template::match
const UNIVERSAL_CHARSTRING& UNIVERSAL_CHARSTRING_template::valueof() const
{
if (template_selection != SPECIFIC_VALUE || is_ifpresent)
- TTCN_error("Performing valueof or send operation on a non-specific "
+ TTCN_error("Performing a valueof or send operation on a non-specific "
"universal charstring template.");
return single_value;
}
diff --git a/function_test/XER_EncDec/XER_EncDec_TD.script b/function_test/XER_EncDec/XER_EncDec_TD.script
index 4e5a7e3c6..e15a681d7 100644
--- a/function_test/XER_EncDec/XER_EncDec_TD.script
+++ b/function_test/XER_EncDec/XER_EncDec_TD.script
@@ -1455,7 +1455,7 @@ control {
<RESULT>
-Dynamic test case error: Performing valueof or send operation on a non-specific template of type @Temp.MyType
+Dynamic test case error: Performing a valueof or send operation on a non-specific template of type @Temp.MyType
<END_TC>
diff --git a/regression_test/tryCatch/tryCatch_Testcases.ttcn b/regression_test/tryCatch/tryCatch_Testcases.ttcn
index c7ffd26c0..5acb9fb12 100644
--- a/regression_test/tryCatch/tryCatch_Testcases.ttcn
+++ b/regression_test/tryCatch/tryCatch_Testcases.ttcn
@@ -162,7 +162,7 @@ function f_behavior_sending(in template charstring pl_msg) runs on MyComp {
} else {
log("Catched error msg:", e);
if( isvalue(pl_msg) ) { setverdict(fail, "exception for sending real value");}
- f_setverdict_str(e, pattern "*Performing valueof or send operation on a non-specific charstring template.");
+ f_setverdict_str(e, pattern "*Performing a valueof or send operation on a non-specific charstring template.");
@try {
PCO.send("Default msg");
}
@@ -177,7 +177,7 @@ function f_behavior_sending(in template charstring pl_msg) runs on MyComp {
}
@catch(e) {
log("Catched DTE:",e);
- f_setverdict_str(e, pattern "*Performing valueof or send operation on a non-specific charstring template.");
+ f_setverdict_str(e, pattern "*Performing a valueof or send operation on a non-specific charstring template.");
if(isvalue(pl_msg) ) {
setverdict(fail, "exception for valueof(real value template)");
@@ -269,7 +269,7 @@ function f_valueof(in template charstring pl_msg) runs on MyComp {
}
@catch(e) {
log("Catched DTE:", e);
- f_setverdict_str(e, pattern "*Performing valueof or send operation on a non-specific charstring template.");
+ f_setverdict_str(e, pattern "*Performing a valueof or send operation on a non-specific charstring template.");
if(isvalue(pl_msg) ) {
setverdict(fail, "exception for valueof of real value template");
--
GitLab