Commit 64451af9 authored by Faezeh KHORRAM's avatar Faezeh KHORRAM 💬
Browse files

remove extra @step annotations

parent 4a2fece9
......@@ -86,7 +86,7 @@ class TestDescriptionAspect{
class TestConfigurationAspect{
public String MUTPath;
public String DSLPath;
@Step
def void activateConfiguration(EngineFactory launcher){
//finding the address of MUT From the annotations of the SUT component (the component with role==0)
for (Annotation a:_self.componentInstance.filter[ci | ci.role.toString == "SUT"].get(0).annotation){
......@@ -100,7 +100,7 @@ class TestConfigurationAspect{
}
_self.setUpLauncher(launcher)
}
@Step
def void activateConfiguration(EngineFactory launcher, String MUTPath){
_self.MUTPath = MUTPath
launcher.MUTPath = _self.MUTPath
......
......@@ -50,7 +50,7 @@ import org.etsi.mts.tdl.Target
@Aspect (className = BehaviourDescription)
class BehaviourDescriptionAspect{
@Step
def boolean callBehavior(){
return _self.behaviour.performBehavior()
}
......@@ -58,7 +58,7 @@ class BehaviourDescriptionAspect{
@Aspect (className = Behaviour)
class BehaviourAspect{
public Behaviour enabledBehaviour;
@Step
def boolean performBehavior(){
_self.enabledBehaviour = _self
return false
......@@ -66,7 +66,7 @@ class BehaviourAspect{
}
@Aspect (className = AtomicBehaviour)
class AtomicBehaviourAspect extends BehaviourAspect{
@Step
@OverrideAspectMethod
def boolean performBehavior(){
return false
......@@ -74,7 +74,7 @@ class AtomicBehaviourAspect extends BehaviourAspect{
}
@Aspect (className = CombinedBehaviour)
class CombinedBehaviourAspect extends BehaviourAspect{
@Step
@OverrideAspectMethod
def boolean performBehavior(){
return false
......@@ -82,7 +82,7 @@ class CombinedBehaviourAspect extends BehaviourAspect{
}
@Aspect (className = PeriodicBehaviour)
class PeriodicBehaviourAspect extends BehaviourAspect{
@Step
@OverrideAspectMethod
def boolean performBehavior(){
return _self.block.traverseBlock()
......@@ -90,7 +90,7 @@ class PeriodicBehaviourAspect extends BehaviourAspect{
}
@Aspect (className = ExceptionalBehaviour)
class ExceptionalBehaviourAspect extends BehaviourAspect{
@Step
@OverrideAspectMethod
def boolean performBehavior(){
return false
......@@ -98,7 +98,7 @@ class ExceptionalBehaviourAspect extends BehaviourAspect{
}
@Aspect (className = ActionBehaviour)
class ActionBehaviourAspect extends AtomicBehaviourAspect{
@Step
@OverrideAspectMethod
def boolean performBehavior(){
return false
......@@ -146,7 +146,7 @@ class InteractoinAspect extends AtomicBehaviourAspect{
}
@Aspect (className = TimerOperation)
class TimerOperationAspect extends AtomicBehaviourAspect{
@Step
@OverrideAspectMethod
def boolean performBehavior(){
return false
......@@ -154,7 +154,7 @@ class TimerOperationAspect extends AtomicBehaviourAspect{
}
@Aspect (className = TimeOperation)
class TimeOperationAspect extends AtomicBehaviourAspect{
@Step
@OverrideAspectMethod
def boolean performBehavior(){
return false
......@@ -282,7 +282,7 @@ class QuiescenceAspect extends TimeOperationAspect{
}
@Aspect (className = SingleCombinedBehaviour)
class SingleCombinedBehaviourAspect extends CombinedBehaviourAspect{
@Step
@OverrideAspectMethod
def boolean performBehavior(){
return _self.block.traverseBlock()
......@@ -290,7 +290,7 @@ class SingleCombinedBehaviourAspect extends CombinedBehaviourAspect{
}
@Aspect (className = MultipleCombinedBehaviour)
class MultipleCombinedBehaviourAspect extends CombinedBehaviourAspect{
@Step
@OverrideAspectMethod
def boolean performBehavior(){
return false
......@@ -298,7 +298,7 @@ class MultipleCombinedBehaviourAspect extends CombinedBehaviourAspect{
}
@Aspect (className = BoundedLoopBehaviour)
class BoundedLoopBehaviourAspect extends SingleCombinedBehaviourAspect{
@Step
@OverrideAspectMethod
def boolean performBehavior(){
return _self.block.traverseBlock()
......@@ -306,7 +306,7 @@ class BoundedLoopBehaviourAspect extends SingleCombinedBehaviourAspect{
}
@Aspect (className = UnboundedLoopBehaviour)
class UnBoundedLoopBehaviourAspect extends SingleCombinedBehaviourAspect{
@Step
@OverrideAspectMethod
def boolean performBehavior(){
return _self.block.traverseBlock()
......@@ -314,7 +314,7 @@ class UnBoundedLoopBehaviourAspect extends SingleCombinedBehaviourAspect{
}
@Aspect (className = CompoundBehaviour)
class CompoundBehaviourAspect extends SingleCombinedBehaviourAspect{
@Step
@OverrideAspectMethod
def boolean performBehavior(){
return _self.block.traverseBlock()
......@@ -322,7 +322,7 @@ class CompoundBehaviourAspect extends SingleCombinedBehaviourAspect{
}
@Aspect (className = OptionalBehaviour)
class OptionalBehaviourAspect extends SingleCombinedBehaviourAspect{
@Step
@OverrideAspectMethod
def boolean performBehavior(){
return _self.block.traverseBlock()
......@@ -330,7 +330,7 @@ class OptionalBehaviourAspect extends SingleCombinedBehaviourAspect{
}
@Aspect (className = ConditionalBehaviour)
class ConditionalBehaviourAspect extends MultipleCombinedBehaviourAspect{
@Step
@OverrideAspectMethod
def boolean performBehavior(){
return false
......@@ -338,7 +338,7 @@ class ConditionalBehaviourAspect extends MultipleCombinedBehaviourAspect{
}
@Aspect (className = AlternativeBehaviour)
class AlternativeBehaviourAspect extends MultipleCombinedBehaviourAspect{
@Step
@OverrideAspectMethod
def boolean performBehavior(){
var result = true
......@@ -355,7 +355,7 @@ class AlternativeBehaviourAspect extends MultipleCombinedBehaviourAspect{
}
@Aspect (className = ParallelBehaviour)
class ParallelBehaviourAspect extends MultipleCombinedBehaviourAspect{
@Step
@OverrideAspectMethod
def boolean performBehavior(){
return false
......@@ -363,7 +363,7 @@ class ParallelBehaviourAspect extends MultipleCombinedBehaviourAspect{
}
@Aspect (className = DefaultBehaviour)
class DefaultBehaviourAspect extends ExceptionalBehaviourAspect{
@Step
@OverrideAspectMethod
def boolean performBehavior(){
return _self.block.traverseBlock()
......@@ -371,7 +371,7 @@ class DefaultBehaviourAspect extends ExceptionalBehaviourAspect{
}
@Aspect (className = InterruptBehaviour)
class InterruptBehaviourAspect extends ExceptionalBehaviourAspect{
@Step
@OverrideAspectMethod
def boolean performBehavior(){
return _self.block.traverseBlock()
......@@ -379,7 +379,7 @@ class InterruptBehaviourAspect extends ExceptionalBehaviourAspect{
}
@Aspect (className = Block)
class BlockAspect{
@Step
def boolean traverseBlock(){
var result = true
for (Behaviour b:_self.behaviour){
......
......@@ -43,7 +43,7 @@ class GateInstanceAspect {
def void setLauncher(EngineFactory launcher) {
_self.gateLauncher = launcher;
}
@Step
def String assertArgument(DataUse argument) {
//if the argument is a string
if (argument instanceof LiteralValueUse){
......@@ -131,7 +131,7 @@ class GateInstanceAspect {
}
}
@Step
def String sendArgument2sut(DataUse argument) {
if (argument instanceof DataInstanceUse) {
var arg = (argument as DataInstanceUse)
......@@ -159,7 +159,7 @@ class GateInstanceAspect {
}
return "FAIL: Cannot send data to the MUT"
}
@Step
def String setModelState(DataInstanceUse arg){
//get the current MUTResource
var MUTResource = _self.gateLauncher.MUTResource;
......
package org.imt.k3tdl.k3dsa
import fr.inria.diverse.k3.al.annotationprocessor.Aspect
import fr.inria.diverse.k3.al.annotationprocessor.OverrideAspectMethod
import fr.inria.diverse.k3.al.annotationprocessor.Step
import java.util.ArrayList
import org.eclipse.emf.common.util.EList
import org.eclipse.emf.common.util.URI
......@@ -27,6 +25,7 @@ import org.etsi.mts.tdl.SpecialValueUse
import org.etsi.mts.tdl.StaticDataUse
import org.etsi.mts.tdl.StructuredDataInstance
import org.etsi.mts.tdl.StructuredDataType
import org.imt.tdl.testResult.TestResultUtil
import static extension org.imt.k3tdl.k3dsa.DataInstanceAspect.*
import static extension org.imt.k3tdl.k3dsa.DataTypeAspect.*
......@@ -36,8 +35,6 @@ import static extension org.imt.k3tdl.k3dsa.MemberAssignmentAspect.*
import static extension org.imt.k3tdl.k3dsa.ParameterBindingAspect.*
import static extension org.imt.k3tdl.k3dsa.StaticDataUseAspect.*
import static extension org.imt.k3tdl.k3dsa.StructuredDataInstanceAspect.*
import org.imt.tdl.testResult.TestResultUtil
import java.util.List
@Aspect (className = DataType)
class DataTypeAspect{
......@@ -151,7 +148,7 @@ class StructuredDataInstanceAspect extends DataInstanceAspect{
}
return null
}
@Step
def String setMatchedMUTElement(EObject matchedObject, Resource MUTResource, String DSLPath){
var String status = ""
for (i : 0 ..<_self.memberAssignment.size){
......@@ -241,7 +238,7 @@ class DataInstanceUseAspect extends StaticDataUseAspect{
}
return "PASS";
}
@Step
def String setMatchedMUTElement(Resource MUTResource, String DSLPath){
//the second parameter is isAssertion that has to be set as false
//so only static elements will be matched to then set the values of its dynamic features
......@@ -307,7 +304,6 @@ class DataInstanceUseAspect extends StaticDataUseAspect{
}
@OverrideAspectMethod
@Step
def String updateData(Resource MUTResource, EObject object, EStructuralFeature matchedFeature, String DSLPath){
val ArrayList<EObject> matchedObjects = new ArrayList
if (_self.item != null && _self.item.size > 0){//there are several intances of data
......@@ -456,7 +452,7 @@ class LiteralValueUseAspect extends StaticDataUseAspect{
}
return "FAIL: The expected data is: " + parameterValue + ", but the current data is: " + featureValue
}
@Step
@OverrideAspectMethod
def String updateData(EObject object, EStructuralFeature matchedFeature){
var String parameterValue = _self.value
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment