Commit b87a4041 authored by balaskoa's avatar balaskoa
Browse files

tex2ttcn and recofOper tests have been added to Regression_Test_java


Signed-off-by: default avatarbalaskoa <Jeno.Balasko@ericsson.com>
parent d4989dbe
......@@ -7,7 +7,6 @@
<incrementalDependencyRefresh>true</incrementalDependencyRefresh>
<targetExecutable>bin/regressionTestSmall</targetExecutable>
<addSourceLineInfo>true</addSourceLineInfo>
<omitInValueList>true</omitInValueList>
</MakefileSettings>
<LocalBuildSettings>
<MakefileScript/>
......@@ -27,6 +26,18 @@
<ExcludeFromBuild>true</ExcludeFromBuild>
</FileProperties>
</FileResource>
<FileResource>
<FilePath>src/TrecofOper.ttcn</FilePath>
<FileProperties>
<ExcludeFromBuild>true</ExcludeFromBuild>
</FileProperties>
</FileResource>
<FileResource>
<FilePath>src/TtemplateRec.ttcn</FilePath>
<FileProperties>
<ExcludeFromBuild>true</ExcludeFromBuild>
</FileProperties>
</FileResource>
<FileResource>
<FilePath>src/TverdictOper.ttcn</FilePath>
<FileProperties>
......@@ -110,5 +121,145 @@
<ExcludeFromBuild>true</ExcludeFromBuild>
</FolderProperties>
</FolderResource>
<FolderResource>
<FolderPath>src/text2ttcn</FolderPath>
<FolderProperties>
<CentralStorage>false</CentralStorage>
<ExcludeFromBuild>true</ExcludeFromBuild>
</FolderProperties>
</FolderResource>
</FolderProperties>
<Configurations>
<Configuration name="legacy">
<ProjectProperties>
<MakefileSettings>
<GNUMake>true</GNUMake>
<incrementalDependencyRefresh>true</incrementalDependencyRefresh>
<targetExecutable>bin/regressionTestSmall</targetExecutable>
<addSourceLineInfo>true</addSourceLineInfo>
<omitInValueList>true</omitInValueList>
</MakefileSettings>
<LocalBuildSettings>
<MakefileScript/>
<workingDirectory>java_src</workingDirectory>
</LocalBuildSettings>
</ProjectProperties>
<FolderProperties>
<FolderResource>
<FolderPath>src/ASN1/Test330</FolderPath>
<FolderProperties>
<CentralStorage>false</CentralStorage>
<ExcludeFromBuild>true</ExcludeFromBuild>
</FolderProperties>
</FolderResource>
<FolderResource>
<FolderPath>src/ASN1/Test332</FolderPath>
<FolderProperties>
<CentralStorage>false</CentralStorage>
<ExcludeFromBuild>true</ExcludeFromBuild>
</FolderProperties>
</FolderResource>
<FolderResource>
<FolderPath>src/ASN1/errorMessages</FolderPath>
<FolderProperties>
<CentralStorage>false</CentralStorage>
<ExcludeFromBuild>true</ExcludeFromBuild>
</FolderProperties>
</FolderResource>
<FolderResource>
<FolderPath>src/ASN1/errorMessages2</FolderPath>
<FolderProperties>
<CentralStorage>false</CentralStorage>
<ExcludeFromBuild>true</ExcludeFromBuild>
</FolderProperties>
</FolderResource>
<FolderResource>
<FolderPath>src/ASN1/parse</FolderPath>
<FolderProperties>
<CentralStorage>false</CentralStorage>
<ExcludeFromBuild>true</ExcludeFromBuild>
</FolderProperties>
</FolderResource>
<FolderResource>
<FolderPath>src/cfgFile/testport_parameters</FolderPath>
<FolderProperties>
<CentralStorage>false</CentralStorage>
<ExcludeFromBuild>true</ExcludeFromBuild>
</FolderProperties>
</FolderResource>
<FolderResource>
<FolderPath>src/cfg_list_concat</FolderPath>
<FolderProperties>
<CentralStorage>false</CentralStorage>
<ExcludeFromBuild>true</ExcludeFromBuild>
</FolderProperties>
</FolderResource>
<FolderResource>
<FolderPath>src/done</FolderPath>
<FolderProperties>
<CentralStorage>false</CentralStorage>
<ExcludeFromBuild>true</ExcludeFromBuild>
</FolderProperties>
</FolderResource>
<FolderResource>
<FolderPath>src/json</FolderPath>
<FolderProperties>
<CentralStorage>false</CentralStorage>
<ExcludeFromBuild>true</ExcludeFromBuild>
</FolderProperties>
</FolderResource>
<FolderResource>
<FolderPath>src/text2ttcn_nolegacy</FolderPath>
<FolderProperties>
<CentralStorage>false</CentralStorage>
<ExcludeFromBuild>true</ExcludeFromBuild>
</FolderProperties>
</FolderResource>
</FolderProperties>
<FileProperties>
<FileResource>
<FilePath>src/ASN1/enum1/enum1</FilePath>
<FileProperties>
<ExcludeFromBuild>true</ExcludeFromBuild>
</FileProperties>
</FileResource>
<FileResource>
<FilePath>src/ASN1/enum2/enum2</FilePath>
<FileProperties>
<ExcludeFromBuild>true</ExcludeFromBuild>
</FileProperties>
</FileResource>
<FileResource>
<FilePath>src/TrecofOper.ttcn</FilePath>
<FileProperties>
<ExcludeFromBuild>true</ExcludeFromBuild>
</FileProperties>
</FileResource>
<FileResource>
<FilePath>src/TtemplateRec.ttcn</FilePath>
<FileProperties>
<ExcludeFromBuild>true</ExcludeFromBuild>
</FileProperties>
</FileResource>
<FileResource>
<FilePath>src/TverdictOper.ttcn</FilePath>
<FileProperties>
<ExcludeFromBuild>true</ExcludeFromBuild>
</FileProperties>
</FileResource>
<FileResource>
<FilePath>src/commProcedure/AdvancedRedirects.ttcn</FilePath>
<FileProperties>
<ExcludeFromBuild>true</ExcludeFromBuild>
</FileProperties>
</FileResource>
<FileResource>
<FilePath>src/functionSubref/TvalueofSubref.ttcn</FilePath>
<FileProperties>
<ExcludeFromBuild>true</ExcludeFromBuild>
</FileProperties>
</FileResource>
</FileProperties>
</Configuration>
</Configurations>
</TITAN_Designer_Properties>
\ No newline at end of file
......@@ -11,7 +11,7 @@
[ORDERED_INCLUDE]
"src/ERC/config.cfg" #fails in single mode, cfg file parse problems, 4 pass in parallel mode
#"src/text2ttcn_nolegacy/text2ttcn_2.cfg" #not necessary, see in single mode
[EXECUTE]
#==acceptance_test:
#testerlanc # exec time: 40sec
......@@ -34,7 +34,8 @@ ConnectMapOperNegTest #parallel ok 3 pass
TdefaultOper #ok,
#ispresent:
IsPresent_Test.control #ok, 84 pass
#text2ttcn
component_test.control #the same in legacy mode and nolegacy mode
[MAIN_CONTROLLER]
# The options herein control the behavior of MC.
TCPPort := 7339
......
......@@ -24,7 +24,7 @@
#HACK: escaped double quote added, ass. not. nok Error message:
# Error while setting parameter field 'tsp_editor' to 'vim': Referenced module parameter cannot be found. Module `vim' does not exist, and no parameter with name `vim' exists in any module.
"src/ERC/config.cfg" #fails in single mode, cfg file parse problems, 4 pass in parallel mode TODO: cfg parser bug fix
"src/recofOper/config.cfg" #only for init! (58 pass)
[EXECUTE]
#all_from_with_functions #TODO: JSON enc-dec function handling,
#encdec_OK #TODO: JSON, BER encoder
......@@ -42,7 +42,9 @@
#json (There are testcases commented out in it!! In preinit of JsonTypes it stops with exception)
#AttributeTestcases.control
#JsonTestcases.control
TrecofOper.tc_empty_record_element #DTE, unrecoverable (config file is necessary!)
TrecofOper.tc_empty_record_element2 #DTE, unrecoverable
record_test.tc_REC_string2ttcn_empty #fail, setting: nolegacy!!!
[LOGGING]
# In this section you can specify the name of the log file and the classes of events
# you want to log into the file or display on console (standard error).
......
......@@ -18,6 +18,9 @@
"src/ucharstrOper/config.cfg"
"src/hexstrOper/config.cfg" #TODO: one testase is commented out (send())
"src/implicitOmit/config.cfg" #ok, 18 pass
"src/text2ttcn_nolegacy/text2ttcn_1.cfg"
#"src/text2ttcn/text2ttcn_1.cfg" #legacy mode
"src/recofOper/config.cfg" #62 pass + 2 tc moved to single_bugs.cfg
[EXECUTE]
#==acceptance_test==
#chinese
......@@ -128,6 +131,7 @@ EnumDefBitHexOct
#functionSubref:
TfunctionSubref #22 pass, 1 error (see in single_bugs.cfg)
#TpardTemplateSubref #1 pass, 6 error (see in single_bugs.cfg)
#fuzzy:
FuzzyTestcases.control
#hexstrOper:
......@@ -157,6 +161,22 @@ IsChosen_Test #4pass
#AttributeTestcases.control
#JsonTestcases.control
#lazyEval:
lazy_main.control #130 pass
#logFiles ?
# TODO: not checked
#logger
#logger_control #special test
#logcontrol
#lostTimer:
TlostTimer.control
#TnonMandatory # excluded
#macros
Macros # 2pass
# modifiedTemplate
TmodifiedTemplate # 5 pass
#predefFunctions
bit_to_OK.control
bit_to_SW.control
......@@ -197,6 +217,10 @@ predefFunctTest.control
#predefFunctTest.tc_predef_oct2char_good2 //fail, TODO: bugfix
#predefFunctTest.tc_predef_oct2char_octetstr_elem //fail, TODO: bugfix
#omitdef
#pattern_quadruples
### RAW ###
Annex_E_variants.control
Bug521125.control
......@@ -228,6 +252,13 @@ RAW_integer_test
ustr.control
RAWCodingAttributes.control
### recofOper ###
# see in [ORDERED_INCLUDE]
#TrecofParamRef.control #2 pass, 10 fail, 1 error = DO NOT HANDLE THIS, jump it over ! TODO: fix it
#TrecofParamRefEncDec.control
#text2ttcn_legacy: see [ORDERED_INCLUDE]
#text2ttcn: not ready, that is the legacy code
#cont here ....
#ucharstrOper #pass, see in [ORDERED_INCLUDE] "src/ucharstrOper/config.cfg"
......@@ -242,10 +273,9 @@ TbasicStatem.control
TtemplateChar.control
#tryCatch_Functions.control
TtemplateBool.control
TrecofOper.control
SelectUnion.control
TtemplateEnum.control
TtemplateRec.control
TtemplateRec.control # 1 fail!!
IsTemplateKind.control
ExclusiveRangeTemplate.control
TtemplateBitstr.control
......@@ -267,12 +297,10 @@ TtemplateUnion.control
TarrayOper.control
#everything.control
#types.control
TlostTimer.control
#TtemplateRecAsn.control
TtemplateSet.control
TtemplateRecof.control
#ASN_Definitions.control
TanytypeWrapOper.control
#ImportedTemplates.control
TsetofOper.control
......
--/////////////////////////////////////////////////////////////////////////////
-- Copyright (c) 2000-2019 Ericsson Telecom AB
-- All rights reserved. This program and the accompanying materials
-- are made available under the terms of the Eclipse Public License v2.0
-- which accompanies this distribution, and is available at
-- https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
--
-- Contributors:
-- Balasko, Jeno
-- Baranyi, Botond
--
--/////////////////////////////////////////////////////////////////////////////
BerType
DEFINITIONS
AUTOMATIC TAGS
::=
BEGIN
IMPORTS ;
RoI-ber ::= SEQUENCE OF INTEGER
END
/******************************************************************************
* Copyright (c) 2000-2019 Ericsson Telecom AB
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
*
* Contributors:
* Balasko, Jeno
* Baranyi, Botond
*
******************************************************************************/
module Circular1 {
// testing pre-generated record of/set of types with circular import (HT95344)
// modules Circular1 and Circular2 import each other
// type CharstringList is defined in Circular2 and used here
// (only compilation and the C++ build are tested)
import from Circular2 all;
function f_dummy(CharstringList p_param)
{
log(p_param);
}
}
/******************************************************************************
* Copyright (c) 2000-2019 Ericsson Telecom AB
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
*
* Contributors:
* Balasko, Jeno
* Baranyi, Botond
*
******************************************************************************/
module Circular2 {
// nothing is actually used from module Circular1, this is only here to test
// pre-generated record of/set of types in circularly imported modules
import from Circular1 all;
type record of charstring CharstringList;
}
/******************************************************************************
* Copyright (c) 2000-2019 Ericsson Telecom AB
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
*
* Contributors:
* Balasko, Jeno
* Baranyi, Botond
*
******************************************************************************/
// This module tests the compatibility between record-ofs and set-ofs of base
// element types
module TrecofCompat {
type component CT_Empty {}
// record of
type record of integer RoI1;
type record of integer RoI2;
type record of boolean RoB1;
type record of boolean RoB2;
type record of float RoF1;
type record of float RoF2;
type record of bitstring RoBS1;
type record of bitstring RoBS2;
type record of hexstring RoHS1;
type record of hexstring RoHS2;
type record of octetstring RoOS1;
type record of octetstring RoOS2;
type record of charstring RoCS1;
type record of charstring RoCS2;
type record of universal charstring RoUS1;
type record of universal charstring RoUS2;
type record of integer RoI1_opt with { extension "optimize:memalloc" };
type record of integer RoI2_opt with { extension "optimize:memalloc" };
testcase tc_record_of_compat() runs on CT_Empty
{
var RoI1 v_roi1 := { 1, 2 };
var RoI2 v_roi2 := v_roi1;
if (not match( { 1, 2 }, v_roi2) or v_roi1 != v_roi2) { setverdict(fail, "record of integer incompatibility"); }
var RoB1 v_rob1 := { true, false };
var RoB2 v_rob2 := v_rob1;
if (not match( { true, false }, v_rob2) or v_rob1 != v_rob2) { setverdict(fail, "record of boolean incompatibility"); }
var RoF1 v_rof1 := { 0.4, 9.6 };
var RoF2 v_rof2 := v_rof1;
if (not match( { 0.4, 9.6 }, v_rof2) or v_rof1 != v_rof2) { setverdict(fail, "record of float incompatibility"); }
var RoBS1 v_robs1 := { '1101'B, '10101'B };
var RoBS2 v_robs2 := v_robs1;
if (not match( { '1101'B, '10101'B }, v_robs2) or v_robs1 != v_robs2) { setverdict(fail, "record of bitstring incompatibility"); }
var RoHS1 v_rohs1 := { '1AF74'H, 'D000D'H };
var RoHS2 v_rohs2 := v_rohs1;
if (not match( { '1AF74'H, 'D000D'H }, v_rohs2) or v_rohs1 != v_rohs2) { setverdict(fail, "record of hexstring incompatibility"); }
var RoOS1 v_roos1 := { 'DEAD'O, '1BC5'O };
var RoOS2 v_roos2 := v_roos1;
if (not match( { 'DEAD'O, '1BC5'O }, v_roos2) or v_roos1 != v_roos2) { setverdict(fail, "record of octetstring incompatibility"); }
var RoCS1 v_rocs1 := { "red", "blue" };
var RoCS2 v_rocs2 := v_rocs1;
if (not match( { "red", "blue" }, v_rocs2) or v_rocs1 != v_rocs2) { setverdict(fail, "record of charstring incompatibility"); }
var RoUS1 v_rous1 := { "yellow", "green" };
var RoUS2 v_rous2 := v_rous1;
if (not match( { "yellow", "green" }, v_rous2) or v_rous1 != v_rous2) { setverdict(fail, "record of universal charstring incompatibility"); }
var RoI1_opt v_roi1_opt := { 1, 2 };
var RoI2_opt v_roi2_opt := v_roi1_opt;
if (not match( { 1, 2 }, v_roi2_opt) or v_roi1_opt != v_roi2_opt) { setverdict(fail, "record of integer (optimized) incompatibility"); }
setverdict(pass);
}
// record of template
testcase tc_record_of_template_compat() runs on CT_Empty
{
var template RoI1 vt_roi1 := { 1, 2 };
var template RoI2 vt_roi2 := vt_roi1;
if (not match( { 1, 2 }, vt_roi2) or not match(valueof(vt_roi1), vt_roi2))
{ setverdict(fail, "record of integer template incompatibility"); }
var template RoB1 vt_rob1 := { true, false };
var template RoB2 vt_rob2 := vt_rob1;
if (not match( { true, false }, vt_rob2) or not match(valueof(vt_rob1), vt_rob2))
{ setverdict(fail, "record of boolean template incompatibility"); }
var template RoF1 vt_rof1 := { 0.4, 9.6 };
var template RoF2 vt_rof2 := vt_rof1;
if (not match( { 0.4, 9.6 }, vt_rof2) or not match(valueof(vt_rof1), vt_rof2))
{ setverdict(fail, "record of float template incompatibility"); }
var template RoBS1 vt_robs1 := { '1101'B, '10101'B };
var template RoBS2 vt_robs2 := vt_robs1;
if (not match( { '1101'B, '10101'B }, vt_robs2) or not match(valueof(vt_robs1), vt_robs2))
{ setverdict(fail, "record of bitstring template incompatibility"); }
var template RoHS1 vt_rohs1 := { '1AF74'H, 'D000D'H };
var template RoHS2 vt_rohs2 := vt_rohs1;
if (not match( { '1AF74'H, 'D000D'H }, vt_rohs2) or not match(valueof(vt_rohs1), vt_rohs2))
{ setverdict(fail, "record of hexstring template incompatibility"); }
var template RoOS1 vt_roos1 := { 'DEAD'O, '1BC5'O };
var template RoOS2 vt_roos2 := vt_roos1;
if (not match( { 'DEAD'O, '1BC5'O }, vt_roos2) or not match(valueof(vt_roos1), vt_roos2))
{ setverdict(fail, "record of octetstring template incompatibility"); }
var template RoCS1 vt_rocs1 := { "red", "blue" };
var template RoCS2 vt_rocs2 := vt_rocs1;
if (not match( { "red", "blue" }, vt_rocs2) or not match(valueof(vt_rocs1), vt_rocs2))
{ setverdict(fail, "record of charstring template incompatibility"); }
var template RoUS1 vt_rous1 := { "yellow", "green" };
var template RoUS2 vt_rous2 := vt_rous1;
if (not match( { "yellow", "green" }, vt_rous2) or not match(valueof(vt_rous1), vt_rous2))
{ setverdict(fail, "record of universal charstring template incompatibility"); }
var template RoI1_opt vt_roi1_opt := { 1, 2 };
var template RoI2_opt vt_roi2_opt := vt_roi1_opt;
if (not match( { 1, 2 }, vt_roi2_opt) or not match(valueof(vt_roi1_opt), vt_roi2_opt))
{ setverdict(fail, "record of integer template (optimized) incompatibility"); }
setverdict(pass);
}
// set of
type set of integer SoI1;
type set of integer SoI2;
type set of boolean SoB1;
type set of boolean SoB2;
type set of float SoF1;
type set of float SoF2;
type set of bitstring SoBS1;
type set of bitstring SoBS2;
type set of hexstring SoHS1;
type set of hexstring SoHS2;
type set of octetstring SoOS1;
type set of octetstring SoOS2;
type set of charstring SoCS1;
type set of charstring SoCS2;
type set of universal charstring SoUS1;
type set of universal charstring SoUS2;
type set of integer SoI1_opt with { extension "optimize:memalloc" };
type set of integer SoI2_opt with { extension "optimize:memalloc" };
testcase tc_set_of_compat() runs on CT_Empty
{
var SoI1 v_soi1 := { 1, 2 };
var SoI2 v_soi2 := v_soi1;
if (not match( { 1, 2 }, v_soi2) or v_soi1 != v_soi2) { setverdict(fail, "set of integer incompatibility"); }
var SoB1 v_sob1 := { true, false };
var SoB2 v_sob2 := v_sob1;
if (not match( { true, false }, v_sob2) or v_sob1 != v_sob2) { setverdict(fail, "set of boolean incompatibility"); }
var SoF1 v_sof1 := { 0.4, 9.6 };
var SoF2 v_sof2 := v_sof1;
if (not match( { 0.4, 9.6 }, v_sof2) or v_sof1 != v_sof2) { setverdict(fail, "set of float incompatibility"); }
var SoBS1 v_sobs1 := { '1101'B, '10101'B };
var SoBS2 v_sobs2 := v_sobs1;
if (not match( { '1101'B, '10101'B }, v_sobs2) or v_sobs1 != v_sobs2) { setverdict(fail, "set of bitstring incompatibility"); }
var SoHS1 v_sohs1 := { '1AF74'H, 'D000D'H };
var SoHS2 v_sohs2 := v_sohs1;
if (not match( { '1AF74'H, 'D000D'H }, v_sohs2) or v_sohs1 != v_sohs2) { setverdict(fail, "set of hexstring incompatibility"); }
var SoOS1 v_soos1 := { 'DEAD'O, '1BC5'O };
var SoOS2 v_soos2 := v_soos1;
if (not match( { 'DEAD'O, '1BC5'O }, v_soos2) or v_soos1 != v_soos2) { setverdict(fail, "set of octetstring incompatibility"); }
var SoCS1 v_socs1 := { "red", "blue" };
var SoCS2 v_socs2 := v_socs1;
if (not match( { "red", "blue" }, v_socs2) or v_socs1 != v_socs2) { setverdict(fail, "set of charstring incompatibility"); }
var SoUS1 v_sous1 := { "yellow", "green" };
var SoUS2 v_sous2 := v_sous1;
if (not match( { "yellow", "green" }, v_sous2) or v_sous1 != v_sous2) { setverdict(fail, "set of universal charstring incompatibility"); }
var SoI1_opt v_soi1_opt := { 1, 2 };
var SoI2_opt v_soi2_opt := v_soi1_opt;
if (not match( { 1, 2 }, v_soi2_opt) or v_soi1_opt != v_soi2_opt) { setverdict(fail, "set of integer (optimized) incompatibility"); }
setverdict(pass);
}
// set of template
testcase tc_set_of_template_compat() runs on CT_Empty
{
var template SoI1 vt_soi1 := { 1, 2 };
var template SoI2 vt_soi2 := vt_soi1;
if (not match( { 1, 2 }, vt_soi2) or not match(valueof(vt_soi1), vt_soi2))
{ setverdict(fail, "set of integer template incompatibility"); }
var template SoB1 vt_sob1 := { true, false };
var template SoB2 vt_sob2 := vt_sob1;
if (not match( { true, false }, vt_sob2) or not match(valueof(vt_sob1), vt_sob2))
{ setverdict(fail, "set of boolean template incompatibility"); }
var template SoF1 vt_sof1 := { 0.4, 9.6 };
var template SoF2 vt_sof2 := vt_sof1;
if (not match( { 0.4, 9.6 }, vt_sof2) or not match(valueof(vt_sof1), vt_sof2))