diff --git a/conformance_test/core_language_tests/negative_tests/06_types_and_values.script b/conformance_test/core_language_tests/negative_tests/06_types_and_values.script
index b2edfbff374befb8a1d48f3cc49cf090ea12f444..95790d25664a32a424327fd1f3ee46f611612b1d 100644
--- a/conformance_test/core_language_tests/negative_tests/06_types_and_values.script
+++ b/conformance_test/core_language_tests/negative_tests/06_types_and_values.script
@@ -8172,12 +8172,12 @@ module NegSem_060303_component_types_004 {
port P p2;
}
- function f_test() runs on GeneralComp mtc GeneralComp {
+ function f_test() runs on GeneralComp mtc GeneralCompEx {
setverdict(fail);
}
- testcase TC_NegSem_060303_component_types_004() runs on GeneralCompEx {
- f_test(); // is not allowed, because GeneralCompEx is not compatible with the mtc of the function
+ testcase TC_NegSem_060303_component_types_004() runs on GeneralComp {
+ f_test(); // is not allowed, because GeneralComp is not compatible with the mtc of the function
setverdict(pass);
}
@@ -8188,7 +8188,7 @@ module NegSem_060303_component_types_004 {
<END_MODULE>
<RESULT COUNT 1>
-error: Mtc clause mismatch: A definition that runs on component type `@NegSem_060303_component_types_004.GeneralCompEx' cannot call function `@NegSem_060303_component_types_004.f_test', which mtc clause is `@NegSem_060303_component_types_004.GeneralComp'
+error: Mtc clause mismatch: A definition that runs on component type `@NegSem_060303_component_types_004.GeneralComp' cannot call function `@NegSem_060303_component_types_004.f_test', which mtc clause is `@NegSem_060303_component_types_004.GeneralCompEx'
<END_RESULT>
<END_TC>
@@ -8199,23 +8199,23 @@ error: Mtc clause mismatch: A definition that runs on component type `@NegSem_06
.*---------------------------------------------------------------------*
:xmp tab=0.
-<TC - 060303_005 Ensure that the IUT correctly handles component compatibility of mtc and runs on clause >
+<TC - 060303_005 Ensure that the IUT correctly handles component compatibility of system and runs on clause >
<COMPILE>
<MODULE TTCN NegSem_060303_component_types_005 NegSem_060303_component_types_005.ttcn >
/******************************************************************************
** @version 0.0.1
- ** @purpose 1:6.3.3, Ensure that the IUT correctly handles component compatibility of mtc and runs on clause
+ ** @purpose 1:6.3.3, Ensure that the IUT correctly handles component compatibility of system and runs on clause
** @verdict pass reject
***************************************************/
// The following requirements are tested:
-// Mtc compatibility: a function or altstep referring to component type "A" in its mtc clause may be called or
-// started in any context that has a mtc clause of type "B" or a testcase with a runs on clause of type "B" if all the
-// port definitions of "A" have identical definitions in "B". If the type of the mtc is unknown in the calling
-// function, this can lead to runtime errors if the component type "A" is not mtc-compatible with the type of the
-// running mtc.
+//System compatibility: a function or altstep referring to component type "A" in its system clause may be called
+//or started in any context that has a system clause of type "B" or a test case with a runs on clause of type "B"
+//and no system clause if all the port definitions of "A" have identical definitions in "B". If the type of the
+//system is unknown in the calling function, this can lead to runtime errors if the component type "A" is not
+//system-compatible with the type of the system the current test case was started on.
module NegSem_060303_component_types_005 {
@@ -8231,12 +8231,12 @@ module NegSem_060303_component_types_005 {
port P p2;
}
- function f_test() runs on GeneralComp mtc GeneralCompEx {
+ function f_test() runs on GeneralComp system GeneralCompEx {
setverdict(fail);
}
testcase TC_NegSem_060303_component_types_005() runs on GeneralComp {
- f_test(); // is not allowed, because GeneralComp is not compatible with the mtc of the function
+ f_test(); // is not allowed, because GeneralCompEx is not compatible with the system of the function
setverdict(pass);
}
@@ -8247,7 +8247,7 @@ module NegSem_060303_component_types_005 {
<END_MODULE>
<RESULT COUNT 1>
-error: Mtc clause mismatch: A definition that runs on component type `@NegSem_060303_component_types_005.GeneralComp' cannot call function `@NegSem_060303_component_types_005.f_test', which mtc clause is `@NegSem_060303_component_types_005.GeneralCompEx'
+error: System clause mismatch: A definition with system component type `@NegSem_060303_component_types_005.GeneralComp' cannot call function `@NegSem_060303_component_types_005.f_test', which system clause is `@NegSem_060303_component_types_005.GeneralCompEx'
<END_RESULT>
<END_TC>
@@ -8290,11 +8290,11 @@ module NegSem_060303_component_types_006 {
port P p2;
}
- function f_test() runs on GeneralComp system GeneralComp {
+ function f_test() runs on GeneralComp system GeneralCompEx {
setverdict(fail);
}
- testcase TC_NegSem_060303_component_types_006() runs on GeneralCompEx {
+ testcase TC_NegSem_060303_component_types_006() runs on GeneralComp system GeneralComp {
f_test(); // is not allowed, because GeneralCompEx is not compatible with the system of the function
setverdict(pass);
}
@@ -8306,66 +8306,7 @@ module NegSem_060303_component_types_006 {
<END_MODULE>
<RESULT COUNT 1>
-error: System clause mismatch: A definition with system component type `@NegSem_060303_component_types_006.GeneralCompEx' cannot call function `@NegSem_060303_component_types_006.f_test', which system clause is `@NegSem_060303_component_types_006.GeneralComp'
-<END_RESULT>
-
-<END_TC>
-:exmp
-
-*---------------------------------------------------------------------*
-:h3. NegSem_060303_component_types_007 negative test
-.*---------------------------------------------------------------------*
-:xmp tab=0.
-
-<TC - 060303_007 Ensure that the IUT correctly handles component compatibility of system and runs on clause >
-
-<COMPILE>
-
-<MODULE TTCN NegSem_060303_component_types_007 NegSem_060303_component_types_007.ttcn >
-/******************************************************************************
- ** @version 0.0.1
- ** @purpose 1:6.3.3, Ensure that the IUT correctly handles component compatibility of system and runs on clause
- ** @verdict pass reject
- ***************************************************/
-
-// The following requirements are tested:
-//System compatibility: a function or altstep referring to component type "A" in its system clause may be called
-//or started in any context that has a system clause of type "B" or a test case with a runs on clause of type "B"
-//and no system clause if all the port definitions of "A" have identical definitions in "B". If the type of the
-//system is unknown in the calling function, this can lead to runtime errors if the component type "A" is not
-//system-compatible with the type of the system the current test case was started on.
-
-module NegSem_060303_component_types_007 {
-
- type port P message {
- inout integer;
- } with {extension "internal"}
-
- type component GeneralComp {
- port P p;
- }
-
- type component GeneralCompEx extends GeneralComp {
- port P p2;
- }
-
- function f_test() runs on GeneralComp system GeneralComp {
- setverdict(fail);
- }
-
- testcase TC_NegSem_060303_component_types_007() runs on GeneralComp system GeneralCompEx {
- f_test(); // is not allowed, because GeneralCompEx is not compatible with the system of the function
- setverdict(pass);
- }
-
- control{
- execute(TC_NegSem_060303_component_types_007());
- }
-}
-<END_MODULE>
-
-<RESULT COUNT 1>
-error: System clause mismatch: A definition with system component type `@NegSem_060303_component_types_007.GeneralCompEx' cannot call function `@NegSem_060303_component_types_007.f_test', which system clause is `@NegSem_060303_component_types_007.GeneralComp'
+error: System clause mismatch: A definition with system component type `@NegSem_060303_component_types_006.GeneralComp' cannot call function `@NegSem_060303_component_types_006.f_test', which system clause is `@NegSem_060303_component_types_006.GeneralCompEx'
<END_RESULT>
<END_TC>
diff --git a/conformance_test/core_language_tests/positive_tests/06_types_and_values/0603_type_compatibility/060303_component_types/NegSem_060303_component_types_004.ttcn b/conformance_test/core_language_tests/positive_tests/06_types_and_values/0603_type_compatibility/060303_component_types/NegSem_060303_component_types_004.ttcn
index c87ce2527ae78705f164579955b7dc418ac3c923..1784baa31f92dd1eb29628ef6246b840ddfa6143 100644
--- a/conformance_test/core_language_tests/positive_tests/06_types_and_values/0603_type_compatibility/060303_component_types/NegSem_060303_component_types_004.ttcn
+++ b/conformance_test/core_language_tests/positive_tests/06_types_and_values/0603_type_compatibility/060303_component_types/NegSem_060303_component_types_004.ttcn
@@ -29,12 +29,12 @@ module NegSem_060303_component_types_004 {
port P p2;
}
- function f_test() runs on GeneralComp mtc GeneralComp {
+ function f_test() runs on GeneralComp mtc GeneralCompEx {
setverdict(fail);
}
- testcase TC_NegSem_060303_component_types_004() runs on GeneralCompEx {
- f_test(); // is not allowed, because GeneralCompEx is not compatible with the mtc of the function
+ testcase TC_NegSem_060303_component_types_004() runs on GeneralComp {
+ f_test(); // is not allowed, because GeneralComp is not compatible with the mtc of the function
setverdict(pass);
}
diff --git a/conformance_test/core_language_tests/positive_tests/06_types_and_values/0603_type_compatibility/060303_component_types/NegSem_060303_component_types_005.ttcn b/conformance_test/core_language_tests/positive_tests/06_types_and_values/0603_type_compatibility/060303_component_types/NegSem_060303_component_types_005.ttcn
index 2a104f896785c1543ac70f0b3fa640e7ffa037cc..129598e281ef29e4baeef0546452965837f5d6b6 100644
--- a/conformance_test/core_language_tests/positive_tests/06_types_and_values/0603_type_compatibility/060303_component_types/NegSem_060303_component_types_005.ttcn
+++ b/conformance_test/core_language_tests/positive_tests/06_types_and_values/0603_type_compatibility/060303_component_types/NegSem_060303_component_types_005.ttcn
@@ -4,16 +4,16 @@
* Adrien Kirjak
*
** @version 0.0.1
- ** @purpose 1:6.3.3, Ensure that the IUT correctly handles component compatibility of mtc and runs on clause
+ ** @purpose 1:6.3.3, Ensure that the IUT correctly handles component compatibility of system and runs on clause
** @verdict pass reject
***************************************************/
// The following requirements are tested:
-// Mtc compatibility: a function or altstep referring to component type "A" in its mtc clause may be called or
-// started in any context that has a mtc clause of type "B" or a testcase with a runs on clause of type "B" if all the
-// port definitions of "A" have identical definitions in "B". If the type of the mtc is unknown in the calling
-// function, this can lead to runtime errors if the component type "A" is not mtc-compatible with the type of the
-// running mtc.
+//System compatibility: a function or altstep referring to component type "A" in its system clause may be called
+//or started in any context that has a system clause of type "B" or a test case with a runs on clause of type "B"
+//and no system clause if all the port definitions of "A" have identical definitions in "B". If the type of the
+//system is unknown in the calling function, this can lead to runtime errors if the component type "A" is not
+//system-compatible with the type of the system the current test case was started on.
module NegSem_060303_component_types_005 {
@@ -29,12 +29,12 @@ module NegSem_060303_component_types_005 {
port P p2;
}
- function f_test() runs on GeneralComp mtc GeneralCompEx {
+ function f_test() runs on GeneralComp system GeneralCompEx {
setverdict(fail);
}
testcase TC_NegSem_060303_component_types_005() runs on GeneralComp {
- f_test(); // is not allowed, because GeneralComp is not compatible with the mtc of the function
+ f_test(); // is not allowed, because GeneralCompEx is not compatible with the system of the function
setverdict(pass);
}
diff --git a/conformance_test/core_language_tests/positive_tests/06_types_and_values/0603_type_compatibility/060303_component_types/NegSem_060303_component_types_006.ttcn b/conformance_test/core_language_tests/positive_tests/06_types_and_values/0603_type_compatibility/060303_component_types/NegSem_060303_component_types_006.ttcn
index 20645600c47c6569bfb9fa27bac8358e2b5f47fd..466f3a614ad31a4c221c3842a0ceb0d27a38121b 100644
--- a/conformance_test/core_language_tests/positive_tests/06_types_and_values/0603_type_compatibility/060303_component_types/NegSem_060303_component_types_006.ttcn
+++ b/conformance_test/core_language_tests/positive_tests/06_types_and_values/0603_type_compatibility/060303_component_types/NegSem_060303_component_types_006.ttcn
@@ -4,7 +4,7 @@
* Adrien Kirjak
*
** @version 0.0.1
- ** @purpose 1:6.3.3, Ensure that the IUT correctly handles component compatibility of system and runs on clause
+ ** @purpose 1:6.3.3, Ensure that the IUT correctly handles component compatibility of different system clauses
** @verdict pass reject
***************************************************/
@@ -29,11 +29,11 @@ module NegSem_060303_component_types_006 {
port P p2;
}
- function f_test() runs on GeneralComp system GeneralComp {
+ function f_test() runs on GeneralComp system GeneralCompEx {
setverdict(fail);
}
- testcase TC_NegSem_060303_component_types_006() runs on GeneralCompEx {
+ testcase TC_NegSem_060303_component_types_006() runs on GeneralComp system GeneralComp {
f_test(); // is not allowed, because GeneralCompEx is not compatible with the system of the function
setverdict(pass);
}
diff --git a/conformance_test/core_language_tests/positive_tests/06_types_and_values/0603_type_compatibility/060303_component_types/NegSem_060303_component_types_007.ttcn b/conformance_test/core_language_tests/positive_tests/06_types_and_values/0603_type_compatibility/060303_component_types/NegSem_060303_component_types_007.ttcn
deleted file mode 100644
index 907897266de0ad3fa898daf580cab8f532e25294..0000000000000000000000000000000000000000
--- a/conformance_test/core_language_tests/positive_tests/06_types_and_values/0603_type_compatibility/060303_component_types/NegSem_060303_component_types_007.ttcn
+++ /dev/null
@@ -1,44 +0,0 @@
-/******************************************************************************
- * Copyright (C) 2017 ETSI All Rights Reserved.
- *
- * Adrien Kirjak
- *
- ** @version 0.0.1
- ** @purpose 1:6.3.3, Ensure that the IUT correctly handles component compatibility of system and runs on clause
- ** @verdict pass reject
- ***************************************************/
-
-// The following requirements are tested:
-//System compatibility: a function or altstep referring to component type "A" in its system clause may be called
-//or started in any context that has a system clause of type "B" or a test case with a runs on clause of type "B"
-//and no system clause if all the port definitions of "A" have identical definitions in "B". If the type of the
-//system is unknown in the calling function, this can lead to runtime errors if the component type "A" is not
-//system-compatible with the type of the system the current test case was started on.
-
-module NegSem_060303_component_types_007 {
-
- type port P message {
- inout integer;
- } with {extension "internal"}
-
- type component GeneralComp {
- port P p;
- }
-
- type component GeneralCompEx extends GeneralComp {
- port P p2;
- }
-
- function f_test() runs on GeneralComp system GeneralComp {
- setverdict(fail);
- }
-
- testcase TC_NegSem_060303_component_types_007() runs on GeneralComp system GeneralCompEx {
- f_test(); // is not allowed, because GeneralCompEx is not compatible with the system of the function
- setverdict(pass);
- }
-
- control{
- execute(TC_NegSem_060303_component_types_007());
- }
-}
diff --git a/conformance_test/core_language_tests/positive_tests/06_types_and_values/0603_type_compatibility/060303_component_types/Sem_060303_component_types_004.ttcn b/conformance_test/core_language_tests/positive_tests/06_types_and_values/0603_type_compatibility/060303_component_types/Sem_060303_component_types_004.ttcn
index 84e1f3ac467cdb72cf1f45673a468f831c13b8df..6f447d92b2a1fb01d953c3f13b4fcbd813ceb8e6 100644
--- a/conformance_test/core_language_tests/positive_tests/06_types_and_values/0603_type_compatibility/060303_component_types/Sem_060303_component_types_004.ttcn
+++ b/conformance_test/core_language_tests/positive_tests/06_types_and_values/0603_type_compatibility/060303_component_types/Sem_060303_component_types_004.ttcn
@@ -28,7 +28,6 @@ module Sem_060303_component_types_004 {
type component GeneralCompEx {
port P p1;
- port P p2;
}
function f_test() runs on GeneralComp mtc GeneralCompEx {
diff --git a/conformance_test/core_language_tests/positive_tests/06_types_and_values/0603_type_compatibility/060303_component_types/Sem_060303_component_types_005.ttcn b/conformance_test/core_language_tests/positive_tests/06_types_and_values/0603_type_compatibility/060303_component_types/Sem_060303_component_types_005.ttcn
index 864189ae703193116abd5af3708fee6ca6cbcaab..8b56a52106d7210af6806965d50b6fa65547a31d 100644
--- a/conformance_test/core_language_tests/positive_tests/06_types_and_values/0603_type_compatibility/060303_component_types/Sem_060303_component_types_005.ttcn
+++ b/conformance_test/core_language_tests/positive_tests/06_types_and_values/0603_type_compatibility/060303_component_types/Sem_060303_component_types_005.ttcn
@@ -28,14 +28,13 @@ module Sem_060303_component_types_005 {
type component GeneralCompEx {
port P p1;
- port P p2;
}
- function f_test() runs on GeneralCompEx system GeneralComp {
+ function f_test() runs on GeneralComp system GeneralCompEx {
setverdict(pass);
}
- testcase TC_Sem_060303_component_types_005() runs on GeneralCompEx {
+ testcase TC_Sem_060303_component_types_005() runs on GeneralComp {
f_test(); // GeneralCompEx and GeneralComp are system compatible
setverdict(pass);
}
diff --git a/conformance_test/core_language_tests/positive_tests/06_types_and_values/0603_type_compatibility/060303_component_types/Sem_060303_component_types_006.ttcn b/conformance_test/core_language_tests/positive_tests/06_types_and_values/0603_type_compatibility/060303_component_types/Sem_060303_component_types_006.ttcn
index a701ad918a1215e242518c4bc4a75e1007008c8c..4d68d8fbacc4ab549203a191417e60a07b8c53e4 100644
--- a/conformance_test/core_language_tests/positive_tests/06_types_and_values/0603_type_compatibility/060303_component_types/Sem_060303_component_types_006.ttcn
+++ b/conformance_test/core_language_tests/positive_tests/06_types_and_values/0603_type_compatibility/060303_component_types/Sem_060303_component_types_006.ttcn
@@ -28,14 +28,13 @@ module Sem_060303_component_types_006 {
type component GeneralCompEx {
port P p1;
- port P p2;
}
- function f_test() runs on GeneralComp system GeneralComp {
+ function f_test() runs on GeneralComp system GeneralCompEx {
setverdict(pass);
}
- testcase TC_Sem_060303_component_types_006() runs on GeneralComp system GeneralCompEx{
+ testcase TC_Sem_060303_component_types_006() runs on GeneralComp system GeneralComp{
f_test(); // GeneralCompEx and GeneralComp are system compatible
setverdict(pass);
}
diff --git a/conformance_test/core_language_tests/positive_tests/pos_conf_tests.tpd b/conformance_test/core_language_tests/positive_tests/pos_conf_tests.tpd
index 1d7c49934eb5772e3dea3c922402a8eaf56c52be..106af07321968aa8e9480fb3ba987fffffd04268 100644
--- a/conformance_test/core_language_tests/positive_tests/pos_conf_tests.tpd
+++ b/conformance_test/core_language_tests/positive_tests/pos_conf_tests.tpd
@@ -1293,7 +1293,6 @@
<!-- <FileResource projectRelativePath="06_types_and_values/0603_type_compatibility/060303_component_types/NegSem_060303_component_types_004.ttcn" relativeURI="06_types_and_values/0603_type_compatibility/060303_component_types/NegSem_060303_component_types_004.ttcn"/>-->
<!-- <FileResource projectRelativePath="06_types_and_values/0603_type_compatibility/060303_component_types/NegSem_060303_component_types_005.ttcn" relativeURI="06_types_and_values/0603_type_compatibility/060303_component_types/NegSem_060303_component_types_005.ttcn"/>-->
<!-- <FileResource projectRelativePath="06_types_and_values/0603_type_compatibility/060303_component_types/NegSem_060303_component_types_006.ttcn" relativeURI="06_types_and_values/0603_type_compatibility/060303_component_types/NegSem_060303_component_types_006.ttcn"/>-->
-<!-- <FileResource projectRelativePath="06_types_and_values/0603_type_compatibility/060303_component_types/NegSem_060303_component_types_007.ttcn" relativeURI="06_types_and_values/0603_type_compatibility/060303_component_types/NegSem_060303_component_types_007.ttcn"/>-->
<FileResource projectRelativePath="06_types_and_values/0603_type_compatibility/060303_component_types/Sem_060303_component_types_001.ttcn" relativeURI="06_types_and_values/0603_type_compatibility/060303_component_types/Sem_060303_component_types_001.ttcn"/>
<FileResource projectRelativePath="06_types_and_values/0603_type_compatibility/060303_component_types/Sem_060303_component_types_002.ttcn" relativeURI="06_types_and_values/0603_type_compatibility/060303_component_types/Sem_060303_component_types_002.ttcn"/>
<!-- <FileResource projectRelativePath="06_types_and_values/0603_type_compatibility/060303_component_types/Sem_060303_component_types_003.ttcn" relativeURI="06_types_and_values/0603_type_compatibility/060303_component_types/Sem_060303_component_types_003.ttcn"/>-->
diff --git a/usrguide/SoC_TITAN.docx b/usrguide/SoC_TITAN.docx
index d70672a68df079ae53133a2d1809c7fb84be2d5e..6f2e186bd3e582ffb2acedc5a55735f6534d5ea0 100644
Binary files a/usrguide/SoC_TITAN.docx and b/usrguide/SoC_TITAN.docx differ