Commit 54013cc8 authored by Philip Makedonski's avatar Philip Makedonski
Browse files

+ further fixes for erroneous constraints on alternative and exceptional behaviour, #103, #126

parent 5855d2c1

plugins/org.etsi.mts.tdl.model/model/tdl-constraints.ocl

+2 −2
Original line number Diff line number Diff line
@@ -777,7 +777,7 @@ context AlternativeBehaviour 
          in

          self.block.behaviour->select(oclIsKindOf(OptionalBehaviour))->isEmpty()

          or 

          self.block.behaviour->select(oclIsKindOf(OptionalBehaviour)) .oclAsType(OptionalBehaviour).block

          self.block.behaviour->select(oclIsKindOf(OptionalBehaviour)) .oclAsType(OptionalBehaviour).block.behaviour 

              ->first().oclAsType(Interaction).sourceGate.component->forAll(c | targetComponent->includes(c))

          or not self.getParentTestDescription().isLocallyOrdered
@@ -857,7 +857,7 @@ context ExceptionalBehaviour 
          ->includingAll(initial->select(oclIsKindOf(Quiescence)).oclAsType(Quiescence).componentInstance)

          -> includingAll(initial->select(oclIsKindOf(TimeOut)).oclAsType(TimeOut).componentInstance)

          in

          self.block.behaviour->select(oclIsKindOf(OptionalBehaviour)).oclAsType(OptionalBehaviour)->forAll(op | op.block->asSequence()

          self.block.behaviour->select(oclIsKindOf(OptionalBehaviour)).oclAsType(OptionalBehaviour)->forAll(op | op.block.behaviour->asSequence()

              ->first().oclAsType(Interaction).sourceGate.component->forAll(c | targetComponent->includes(c)))

          or not self.getParentTestDescription().isLocallyOrdered