Commit 6348fc18 authored by Yann Garcia's avatar Yann Garcia
Browse files

Resolve merge conflict in ItsSpatem_TpFunctions

parents c08f1aaa d27f7fe9

ttcn/AtsMapemSpatem/ItsSpatem_TestCases.ttcn

+7 −7
Changes for ttcn/AtsMapemSpatem/ItsSpatem_TestCases.ttcn: 7 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -395,7 +395,7 @@ module ItsSpatem_TestCases { 
             * @see       ETSI TS 103 191-2 v1.2.5 TP_IS_TLM_GEN_MSGF_BV_08

             * @reference CEN ISO/TS 19091 [4], clause 6.7.11

             */

            testcase TC_IS_TLM_GEN_MSGF_BV_08 () runs on ItsMapemSpatem system ItsMapemSpatemSystem {

            testcase TC_IS_TLM_GEN_MSGF_BV_08 () runs on ItsMtc {

                

                f_IS_TLM_GEN_MSGF_BV_08();
@@ -459,7 +459,7 @@ module ItsSpatem_TestCases { 
             * @see       ETSI TS 103 191-2 v1.2.5 TP_IS_TLM_GEN_MSGF_BV_09

             * @reference CEN ISO/TS 19091 [4], clauses 6.7.13, 6.7.14

             */

            testcase TC_IS_TLM_GEN_MSGF_BV_09 () runs on ItsMapemSpatem system ItsMapemSpatemSystem {

            testcase TC_IS_TLM_GEN_MSGF_BV_09 () runs on ItsMtc {

                

                f_IS_TLM_GEN_MSGF_BV_09();
@@ -506,7 +506,7 @@ module ItsSpatem_TestCases { 
             * @see       ETSI TS 103 191-2 v1.2.5 TP_IS_TLM_GEN_MSGF_BV_10

             * @reference CEN ISO/TS 19091 [4], clauses G.5.1.4 and G.8.2.5.2

             */

            testcase TC_IS_TLM_GEN_MSGF_BV_10 () runs on ItsMapemSpatem system ItsMapemSpatemSystem {

            testcase TC_IS_TLM_GEN_MSGF_BV_10 () runs on ItsMtc {

                

                f_IS_TLM_GEN_MSGF_BV_10();
@@ -561,7 +561,7 @@ module ItsSpatem_TestCases { 
             * @see       ETSI TS 103 191-2 v1.2.5 TP_IS_TLM_GEN_MSGF_BV_12

             * @reference CEN ISO/TS 19091 [4], clauses 6.7.16

             */

            testcase TC_IS_TLM_GEN_MSGF_BV_11 () runs on ItsMapemSpatem system ItsMapemSpatemSystem {

            testcase TC_IS_TLM_GEN_MSGF_BV_11 () runs on ItsMtc {

                

                f_IS_TLM_GEN_MSGF_BV_11();
@@ -621,7 +621,7 @@ module ItsSpatem_TestCases { 
             * @see       ETSI TS 103 191-2 v1.2.5 TP_IS_TLM_GEN_MSGF_BV_12

             * @reference CEN ISO/TS 19091 [4], clauses 6.7.18

             */

            testcase TC_IS_TLM_GEN_MSGF_BV_12 () runs on ItsMapemSpatem system ItsMapemSpatemSystem {

            testcase TC_IS_TLM_GEN_MSGF_BV_12 () runs on ItsMtc {

                

                f_IS_TLM_GEN_MSGF_BV_12();
@@ -682,7 +682,7 @@ module ItsSpatem_TestCases { 
             * @see       ETSI TS 103 191-2 v1.2.5 TP_IS_TLM_GEN_MSGF_BV_13

             * @reference CEN ISO/TS 19091 [4], clauses 6.7.19

             */

            testcase TC_IS_TLM_GEN_MSGF_BV_13 () runs on ItsMapemSpatem system ItsMapemSpatemSystem {

            testcase TC_IS_TLM_GEN_MSGF_BV_13 () runs on ItsMtc {

                

                f_IS_TLM_GEN_MSGF_BV_13();
@@ -734,7 +734,7 @@ module ItsSpatem_TestCases { 
             * @see       ETSI TS 103 191-2 v1.2.5 TP_IS_TLM_GEN_MSGF_BV_13

             * @reference CEN ISO/TS 19091 [4], clauses 6.7.20, 6.7.21

             */

            testcase TC_IS_TLM_GEN_MSGF_BV_14 () runs on ItsMapemSpatem system ItsMapemSpatemSystem {

            testcase TC_IS_TLM_GEN_MSGF_BV_14 () runs on ItsMtc {

                

                f_IS_TLM_GEN_MSGF_BV_14();

ttcn/AtsMapemSpatem/ItsSpatem_TpFunctions.ttcn

+2000 −336

File changed.

Preview size limit exceeded, changes collapsed.