Merge "BER* moved into EncodeDecode/BER"

regression_test/EncodeDecode/BER/.gitignore

+*.cc
+*.hh
+*.exe
\ No newline at end of file

regression_test/BER_x682/X.cfg → regression_test/EncodeDecode/BER/BER.cfg

@@ -15,11 +15,12 @@
 
 [LOGGING]
 
-LogFile := "X.log"
+LogFile := "BER.log"
 FileMask := LOG_ALL
 ConsoleMask := TTCN_TESTCASE | TTCN_STATISTICS
 #ConsoleMask := LOG_ALL
 
 [EXECUTE]
-
-X.control
+BERTest
+X682_Test.control
+X682_simplified_Test.control

regression_test/BER/Regr1.asn → regression_test/EncodeDecode/BER/BER1.asn

 --/////////////////////////////////////////////////////////////////////////////
--- Copyright (c) 2000-2019 Ericsson Telecom AB
+-- Copyright (c) 2000-2020 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
@@ -13,7 +13,7 @@
 --   Szabo, Janos Zoltan – initial implementation
 --
 --/////////////////////////////////////////////////////////////////////////////
-Regr1
+BER1
 DEFINITIONS
 
 AUTOMATIC TAGS
@@ -36,8 +36,7 @@ d1a OCTET STRING ::= '0101FF'H
 c1b T1 ::= FALSE
 d1b OCTET STRING ::= '010100'H
 
-T2 ::= [APPLICATION 1] EXPLICIT [PRIVATE v2] [APPLICATION 3] EXPLICIT
-  [PRIVATE 20021018] T1
+T2 ::= [APPLICATION 1] EXPLICIT [PRIVATE v2] [APPLICATION 3] EXPLICIT [PRIVATE 20021018] T1
 c2a T2 ::= c1a
 d2a OCTET STRING ::= '6109E307DF89C5FE1A01FF'H
 c2b T2 ::= c1b

regression_test/BER/Regr2.asn → regression_test/EncodeDecode/BER/BER2.asn

 --/////////////////////////////////////////////////////////////////////////////
--- Copyright (c) 2000-2019 Ericsson Telecom AB
+-- Copyright (c) 2000-2020 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
@@ -12,7 +12,7 @@
 --   Szabados, Kristof
 --
 --/////////////////////////////////////////////////////////////////////////////
-Regr2
+BER2
 DEFINITIONS
 
 AUTOMATIC TAGS
@@ -23,7 +23,7 @@ EXTENSIBILITY IMPLIED
 BEGIN
 
 EXPORTS ;
-IMPORTS c6a, T4, c4e FROM Regr1;
+IMPORTS c6a, T4, c4e FROM BER1;
 
 T10 ::= CHOICE {
   f1 BOOLEAN,

regression_test/BER/Makefile → regression_test/EncodeDecode/BER/Makefile

@@ -16,7 +16,7 @@
 #   Szabo, Janos Zoltan – initial implementation
 #
 ##############################################################################
-TOPDIR := ..
+TOPDIR := ../..
 include $(TOPDIR)/Makefile.regression
 
 .SUFFIXES: .ttcn .asn .hh
@@ -24,8 +24,8 @@ include $(TOPDIR)/Makefile.regression
 
 TTCN3_LIB = ttcn3$(RT2_SUFFIX)$(DYNAMIC_SUFFIX)
 
-TTCN3_MODULES = Regr.ttcn
-ASN1_MODULES = Regr1.asn Regr2.asn
+TTCN3_MODULES = BERTest.ttcn X682_Test.ttcn X682_simplified_Test.ttcn
+ASN1_MODULES = BER1.asn BER2.asn X682.asn X682_simplified.asn
 
 GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) $(ASN1_MODULES:.asn=.cc)
 GENERATED_HEADERS = $(TTCN3_MODULES:.ttcn=.hh) $(ASN1_MODULES:.asn=.hh)
@@ -39,12 +39,12 @@ GENERATED_SOURCES += $(GENERATED_SOURCES2)
 endif
 
 # Source & header files of Test Ports and your other modules:
-USER_SOURCES = MyPort1.cc MyPort2.cc
-USER_HEADERS = MyPort1.hh MyPort2.hh
+USER_SOURCES =
+USER_HEADERS =
 
 OBJECTS = $(GENERATED_SOURCES:.cc=.o) $(USER_SOURCES:.cc=.o)
 
-TARGET = Regr$(EXESUFFIX)
+TARGET = BER$(EXESUFFIX)
 
 all: $(TARGET)
 
@@ -61,18 +61,9 @@ clean distclean:
 dep: $(GENERATED_SOURCES)
 	makedepend $(CPPFLAGS) $(USER_SOURCES) $(GENERATED_SOURCES)
 
-run: $(TARGET) Regr.cfg
+run: $(TARGET) BER.cfg
 	./$^
 
-MyPort1.o: MyPort1.hh Regr.hh Regr2.hh Regr1.hh
-MyPort1.o: MyPort2.hh
-MyPort2.o: MyPort2.hh Regr.hh Regr2.hh Regr1.hh
-MyPort2.o: MyPort1.hh
-Regr.o: Regr.hh Regr2.hh Regr1.hh
-Regr.o: MyPort1.hh MyPort2.hh
-Regr1.o: Regr1.hh
-Regr2.o: Regr2.hh Regr1.hh
-
 ifdef SRCDIR
 $(foreach src, $(USER_SOURCES), $(eval vpath $(src) $(ABS_SRC)))
 endif

regression_test/EncodeDecode/BER/X682_Test.ttcn

+/******************************************************************************
+* Copyright (c) 2000-2020 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
+*   Koppany, Csaba
+*   Szabo, Janos Zoltan – initial implementation
+*
+******************************************************************************/
+module X682_Test
+{
+import from X682 language "ASN.1:1997" all
+
+//=== functions ====
+function f_compare_octetstring(in octetstring pl_val, in octetstring pl_expected) {
+  if ( pl_val == pl_expected ){
+    setverdict(pass);
+  } else {
+    setverdict( fail, "expected:", pl_expected, " got: ", pl_val)
+  }
+} with { extension "transparent"}
+//==== types
+type component CT { }
+
+
+external function enc_ber_ErrorReturn(in ErrorReturn r) return octetstring
+with { extension "encode(BER:BER_ENCODE_DER) prototype(convert) errorbehavior(ALL:WARNING)" }
+
+external function dec_ber_ErrorReturn(in octetstring r) return ErrorReturn
+with { extension "decode(BER:BER_ENCODE_DER) prototype(convert) errorbehavior(ALL:WARNING)" }
+
+testcase TC0a() runs on CT {
+  var octetstring d := enc_ber_ErrorReturn(errorReturn1);
+  f_compare_octetstring(d,ber_errorReturn1);
+  
+  
+}
+
+testcase TC0b() runs on CT {
+  var ErrorReturn d := dec_ber_ErrorReturn(ber_errorReturn1);
+  if ( d==errorReturn1) {
+    setverdict(pass)
+  } else {
+    setverdict(fail, "expected: ", errorReturn1, " got: ", d);
+  }
+}
+control
+{
+  execute(TC0a());
+  execute(TC0b());
+}
+
+}

regression_test/BER_x682_wa/x682.asn → regression_test/EncodeDecode/BER/X682_simplified.asn

@@ -11,7 +11,7 @@
 --   Szabados, Kristof
 --
 --/////////////////////////////////////////////////////////////////////////////
-X682
+X682-simplified
 DEFINITIONS
 
 AUTOMATIC TAGS
@@ -58,9 +58,9 @@ ErrorReturn ::= SEQUENCE
     errorInfo	[99] CHOICE
     {
       iNTEGER [1] INTEGER,
-      visibleString [1] VisibleString,
-      printableString [1] PrintableString,
-      bOOLEAN [1] BOOLEAN
+      visibleString [2] VisibleString,
+      printableString [3] PrintableString,
+      bOOLEAN [4] BOOLEAN
     }
     /*#asn1_compiler#
       OPENTYPE
@@ -89,6 +89,6 @@ errorReturn1 ErrorReturn ::=
   }
 }
 
-  ber-errorReturn1 OCTET STRING ::= '304D800141A148300C020101BF6306810401317DEC3038020102BF63328130496620552063616E206465636F646520746869732C20552063616E2062652068617070792E20536D696C6521203A2D29'H
+  ber-errorReturn1 OCTET STRING ::= '304D800141A148300C020101BF6306810401317DEC3038020102BF63328230496620552063616E206465636F646520746869732C20552063616E2062652068617070792E20536D696C6521203A2D29'H
 
 END

regression_test/EncodeDecode/BER/X682_simplified_Test.ttcn

+/******************************************************************************
+ * Copyright (c) 2000-2020 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
+ *   Forstner, Matyas
+ *
+ ******************************************************************************/
+module X682_simplified_Test {
+
+import from X682_simplified language "ASN.1:1997" all
+
+//=== functions ====
+function f_compare_octetstring(in octetstring pl_val, in octetstring pl_expected) {
+  if ( pl_val == pl_expected ){
+    setverdict(pass);
+  } else {
+    setverdict( fail, "expected:", pl_expected, " got: ", pl_val)
+  }
+} with { extension "transparent"}
+//==== types ===
+type component CT { }
+
+//=== external functions ====
+external function enc_ber_ErrorReturn(in ErrorReturn r) return octetstring
+with { extension "encode(BER:BER_ENCODE_DER) prototype(convert) errorbehavior(ALL:WARNING)" }
+
+external function dec_ber_ErrorReturn(in octetstring r) return ErrorReturn
+with { extension "decode(BER:BER_ENCODE_DER) prototype(convert) errorbehavior(ALL:WARNING)" }
+
+//=== Testcases ===
+testcase TC0a() runs on CT {
+  var octetstring d := enc_ber_ErrorReturn(errorReturn1);
+  f_compare_octetstring(d,ber_errorReturn1);
+  
+  
+}
+
+testcase TC0b() runs on CT {
+  var ErrorReturn d := dec_ber_ErrorReturn(ber_errorReturn1);
+  if ( d==errorReturn1) {
+    setverdict(pass)
+  } else {
+    setverdict(fail, "expected: ", errorReturn1, " got: ", d);
+  }
+}
+control
+{
+  execute(TC0a());
+  execute(TC0b());
+}
+
+}

regression_test/BER/Regr.cfg → regression_test/EncodeDecode/Makefile

-###############################################################################
-# Copyright (c) 2000-2019 Ericsson Telecom AB
+##############################################################################
+# Copyright (c) 2000-2020 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
@@ -7,20 +7,27 @@
 #
 # Contributors:
 #   Balasko, Jeno
-#   Beres, Szabolcs
-#   Forstner, Matyas
-#   Szabo, Janos Zoltan – initial implementation
 #
-###############################################################################
-[MODULE_PARAMETERS]
+##############################################################################
+TOPDIR := ..
+include $(TOPDIR)/Makefile.regression
 
-[LOGGING]
+unexport ABS_SRC
+unexport SRCDIR
 
-LogFile := "Regr.log"
-FileMask := LOG_ALL
-ConsoleMask := TTCN_TESTCASE | TTCN_STATISTICS
-SourceInfoFormat := Single
+DIRS := BER
+
+# List of fake targets:
+.PHONY: all dep clean run $(DIRS) $(addsuffix /, $(DIRS)) profile
+
+all run dep clean distclean:
+	for dir in $(DIRS); do $(MAKE) -C $$dir $@ || exit; done
+
+# To run just one test, type "make dir" or "make "dir/"
+$(DIRS) $(addsuffix /, $(DIRS)):
+	$(MAKE) -C $@ run
+
+# To run all tests, possibly in parallel
+runall: $(DIRS)
 
-[EXECUTE]
 
-Regr.control

regression_test/Makefile

@@ -40,7 +40,7 @@ enumOper arrayOper anytypeOper templateInt templateBool templateFloat templateBi
 templateHexstr templateOctetstr templateChar templateCharstr templateUnicharstr \
 templateRec templateRec_nolegacy templateRecof templateSet templateSetof templateUnion templateEnum modifiedTemplate \
 basicStatem configOper commMessage commProcedure lostTimer controlTimer \
-BER BER_x682 ASN1 predefFunction ERC preCompilerFlags functionReference \
+EncodeDecode ASN1 predefFunction ERC preCompilerFlags functionReference \
 nonMandatoryPar logFiles logger_control namedActualParameters \
 assignmentNotation omitdef anytype RAW implicitMsgEncoding pattern_quadruples \
 macros visibility hexstrOper ucharstrOper objidOper CRTR00015758 slider \