Naming synchronized with titan.EclipsePlug-ins

Signed-off-by: balaskoa <Jeno.Balasko@ericsson.com>
Change-Id: I2286cd558019cab80c2484196785dfefc6478046

regression_test/map_param/PT.cc

@@ -9,7 +9,7 @@
 
 #include "PT.hh"
 
-namespace common {
+namespace map_param_common {
 
 PT::PT(const char *par_port_name)
 	: PT_BASE(par_port_name)

regression_test/map_param/PT.hh

@@ -10,9 +10,9 @@
 #ifndef PT_HH
 #define PT_HH
 
-#include "common.hh"
+#include "map_param_common.hh"
 
-namespace common {
+namespace map_param_common {
 
 class PT : public PT_BASE {
 public:

regression_test/map_param/common.ttcn → regression_test/map_param/map_param_common.ttcn

@@ -9,7 +9,7 @@
  *   Baranyi, Botond
  *
  ******************************************************************************/
-module common {
+module map_param_common {
 
 type record of integer IntList;
 

regression_test/map_param/parallel_mode/.gitignore

+map_param_parallel
+map_param_parallel.exe
+map_param_common.cc
+map_param_common.hh
+map_param_parallel_test.cc
+map_param_parallel_test.hh
+*.o
+*.d
+PT.cc
+PT.hh
+map_param_common.ttcn
+map_param_parallel*.log

regression_test/map_param/parallel_mode/Makefile

+##############################################################################
+# 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:
+#   Baranyi, Botond
+#
+##############################################################################
+TOPDIR := ../..
+include $(TOPDIR)/Makefile.regression
+
+.PHONY: all clean dep run
+
+TTCN3_LIB = ttcn3$(RT2_SUFFIX)-parallel$(DYNAMIC_SUFFIX)
+
+COMMON_TTCN3_MODULES = map_param_common.ttcn
+TTCN3_MODULES = $(COMMON_TTCN3_MODULES) map_param_parallel_test.ttcn
+
+GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc)
+GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh)
+ifdef CODE_SPLIT
+GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc  _seqof.cc _setof.cc _union.cc))
+else ifdef SPLIT_TO_SLICES
+POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_))
+POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc))
+GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES)))
+GENERATED_SOURCES += $(GENERATED_SOURCES2)
+endif
+
+PORT_SOURCES = PT.cc
+PORT_HEADERS = $(PORT_SOURCES:.cc=.hh)
+
+
+OBJECTS = $(GENERATED_SOURCES:.cc=.o) $(PORT_SOURCES:.cc=.o) 
+
+TARGET = map_param_parallel$(EXESUFFIX)
+
+all: $(TARGET)
+
+$(COMMON_TTCN3_MODULES) $(PORT_SOURCES) $(PORT_HEADERS):
+	ln -s ../$@
+
+$(TARGET): $(OBJECTS)
+	$(CXX) $(LDFLAGS) -o $@ $(OBJECTS) -L$(TTCN3_DIR)/lib -l$(TTCN3_LIB) -L$(OPENSSL_DIR)/lib -lcrypto $($(PLATFORM)_LIBS)
+
+.cc.o:
+	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $<
+
+$(GENERATED_SOURCES) $(GENERATED_HEADERS): $(TTCN3_MODULES) $(PORT_HEADERS)
+	$(TTCN3_COMPILER) $(TTCN3_MODULES)
+
+clean distclean:
+	-rm -f $(TARGET) $(OBJECTS) $(GENERATED_HEADERS) \
+	$(GENERATED_SOURCES) *.log Makefile.bak
+
+dep: $(GENERATED_SOURCES)
+	makedepend $(CPPFLAGS) $(GENERATED_SOURCES)
+
+run: $(TARGET)
+	$(TTCN3_DIR)/bin/ttcn3_start $(TARGET) parallel.cfg
+
+

regression_test/map_param/parallel_mode/parallel_test.ttcn → regression_test/map_param/parallel_mode/map_param_parallel_test.ttcn

@@ -11,9 +11,9 @@
  ******************************************************************************/
 
 // this module contains tests for 'map'/'unmap' parameters in parallel mode
-module parallel_test {
+module map_param_parallel_test {
 
-import from common all;
+import from map_param_common all;
 
 testcase tc_parallel_mtc() runs on CT {
   f_test_params(mtc);

regression_test/map_param/parallel_mode/parallel.cfg

@@ -13,9 +13,9 @@
 [LOGGING]
 Logfile := "map_param_parallel_%r.log"
 FileMask := LOG_ALL
-ConsoleMask := TTCN_WARNING | TTCN_ERROR | TTCN_TESTCASE | TTCN_STATISTICS
+ConsoleMask := WARNING | ERROR | TESTCASE | STATISTICS
 
 [EXECUTE]
-parallel_test.tc_parallel_mtc
-parallel_test.tc_parallel_ptc
+map_param_parallel_test.tc_parallel_mtc
+map_param_parallel_test.tc_parallel_ptc
 

regression_test/map_param/single_mode/.gitignore

 map_param_single
 map_param_single.exe
-common*.cc
-common*.hh
-single_test*.cc
-single_test*.hh
+map_param_common*.cc
+map_param_common*.hh
+map_param_single_test.cc
+map_param_single_test.hh
 *.o
 *.d
 PT.cc
 PT.hh
-common.ttcn
+map_param_common.ttcn
 map_param_single.log

regression_test/map_param/single_mode/Makefile

@@ -16,8 +16,8 @@ include $(TOPDIR)/Makefile.regression
 
 TTCN3_LIB = ttcn3$(RT2_SUFFIX)$(DYNAMIC_SUFFIX)
 
-COMMON_TTCN3_MODULES = common.ttcn
-TTCN3_MODULES = $(COMMON_TTCN3_MODULES) single_test.ttcn
+COMMON_TTCN3_MODULES = map_param_common.ttcn
+TTCN3_MODULES = $(COMMON_TTCN3_MODULES) map_param_single_test.ttcn
 
 GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc)
 GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh)

regression_test/map_param/single_mode/single_test.ttcn → regression_test/map_param/single_mode/map_param_single_test.ttcn

@@ -11,9 +11,9 @@
  ******************************************************************************/
 
 // this module contains tests for 'map'/'unmap' parameters in single mode
-module single_test {
+module map_param_single_test {
 
-import from common all;
+import from map_param_common all;
 
 testcase tc_single() runs on CT {
   f_test_params(mtc);

regression_test/map_param/single_mode/single.cfg

@@ -13,9 +13,9 @@
 [LOGGING]
 Logfile := "map_param_single.log"
 FileMask := LOG_ALL
-ConsoleMask := TTCN_WARNING | TTCN_ERROR | TTCN_TESTCASE | TTCN_STATISTICS
+ConsoleMask := WARNING | ERROR | TESTCASE | STATISTICS
 
 [EXECUTE]
-single_test.tc_single
-single_test.tc_single_retval
-single_test.tc_single_mtc
+map_param_single_test.tc_single
+map_param_single_test.tc_single_retval
+map_param_single_test.tc_single_mtc