From 457a01ed859228c1c8a4f6e32ddfafe61ac1bb5c Mon Sep 17 00:00:00 2001
From: Adam Knapp <adam.knapp@sigmatechnology.se>
Date: Tue, 12 Jan 2021 13:37:19 +0100
Subject: [PATCH] Test update according to bugfixes
Change-Id: I326314be1c581e088222ab825aba23bfd0eab75c
Signed-off-by: Adam Knapp <adam.knapp@sigmatechnology.se>
---
.../OOP_tests/negative_tests/50101_classes.script | 7 ++++---
.../OOP_tests/negative_tests/50101_objects.script | 3 ++-
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/conformance_test/OOP_tests/negative_tests/50101_classes.script b/conformance_test/OOP_tests/negative_tests/50101_classes.script
index a631563ab..3bdfe550d 100644
--- a/conformance_test/OOP_tests/negative_tests/50101_classes.script
+++ b/conformance_test/OOP_tests/negative_tests/50101_classes.script
@@ -998,6 +998,7 @@ error: at or before token `template': syntax error, unexpected TemplateKeyword,
** @purpose 5.1.1.0, Ensure that passing of object references to the create operation of a component type or a function started on another component is not allowed.
** @verdict pass reject
*****************************************************************/
+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=568744 - fixed
module NegSem_50101_top_level_004 "TTCN-3:2018 Object-Oriented" {
type component GeneralComp {
@@ -1032,16 +1033,16 @@ module NegSem_50101_top_level_004 "TTCN-3:2018 Object-Oriented" {
setverdict(pass);
}
- /* testcase TC_NegSem_50101_top_level_004_02() runs on GeneralComp {
+ testcase TC_NegSem_50101_top_level_004_02() runs on GeneralComp {
var MyEmptyClass v_MyClass := MyEmptyClass.create();
var MyNotEmptyComponent v_MyComponent := MyNotEmptyComponent.create alive;
v_MyComponent.start(doSomething(v_MyClass)); //not allowed
setverdict(pass);
}
-*/
+
control {
execute(TC_NegSem_50101_top_level_004_01());
- // execute(TC_NegSem_50101_top_level_004_02());
+ execute(TC_NegSem_50101_top_level_004_02());
}
}
<END_MODULE>
diff --git a/conformance_test/OOP_tests/negative_tests/50101_objects.script b/conformance_test/OOP_tests/negative_tests/50101_objects.script
index c978a1014..ee3b63d00 100644
--- a/conformance_test/OOP_tests/negative_tests/50101_objects.script
+++ b/conformance_test/OOP_tests/negative_tests/50101_objects.script
@@ -75,6 +75,7 @@ This TD contains negative OOP test modules from ETSI TTCN3 Conformance Test's 5
** @purpose 5.1.2.2, Ensure that Object References shall not be passed as actual parameter or part of an actual parameter.
** @verdict pass reject
*****************************************************************/
+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=568748 - fixed
module NegSem_5010202_ObjectReferences_001 "TTCN-3:2018 Object-Oriented" {
type component GeneralComp {
@@ -99,7 +100,7 @@ module NegSem_5010202_ObjectReferences_001 "TTCN-3:2018 Object-Oriented" {
testcase TC_NegSem_5010202_ObjectReferences_001() runs on GeneralComp {
var MyClass v_a := MyClass.create(7);
var GeneralComp v_MyGeneralComp := GeneralComp.create;
- v_MyGeneralComp.start(f_something(v_a)); //not allowed // C++ error is thrown
+ v_MyGeneralComp.start(f_something(v_a)); //not allowed
if (v_a.getX() == 7) {
setverdict(pass);
} else {
--
GitLab