Skip to content

Commit e7a57ab

Browse files
authored
Merge pull request #808 from Systems-Modeling/ST6RI-974
ST6RI-974 Validation missing for connection and flow definitions having ends that are usages
2 parents 1852fda + 364c697 commit e7a57ab

8 files changed

Lines changed: 369 additions & 21 deletions

File tree

‎org.omg.sysml.xpect.tests/library.systems/Flows.sysml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,9 @@ standard library package Flows {
4545

4646
ref payload :>> MessageAction::payload, Transfer::payload;
4747

48+
end occurrence source: Occurrence :>> Transfer::source;
49+
end occurrence target: Occurrence :>> Transfer::target;
50+
4851
private ref action thisConnection = self;
4952

5053
in event occurrence sourceEvent [1] default thisConnection.start {
@@ -101,6 +104,8 @@ standard library package Flows {
101104
/*
102105
* messages is the base feature of all FlowUsages.
103106
*/
107+
end occurrence source: Occurrence :>> Message::source, transfers::source;
108+
end occurrence target: Occurrence :>> Message::target, transfers::target;
104109
}
105110

106111
abstract flow flows: Flow[0..*] nonunique :> messages, flowTransfers {
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
//*
2+
XPECT_SETUP org.omg.sysml.xpect.tests.validation.invalid.SysMLTests
3+
ResourceSet {
4+
ThisFile {}
5+
File {from ="/library.kernel/Base.kerml"}
6+
File {from ="/library.kernel/Links.kerml"}
7+
File {from ="/library.kernel/Occurrences.kerml"}
8+
File {from ="/library.kernel/Objects.kerml"}
9+
File {from ="/library.systems/Items.sysml"}
10+
File {from ="/library.systems/Parts.sysml"}
11+
File {from ="/library.systems/Ports.sysml"}
12+
File {from ="/library.systems/Connections.sysml"}
13+
}
14+
Workspace {
15+
JavaProject {
16+
SrcFolder {
17+
ThisFile {}
18+
File {from ="/library.kernel/Base.kerml"}
19+
File {from ="/library.kernel/Links.kerml"}
20+
File {from ="/library.kernel/Occurrences.kerml"}
21+
File {from ="/library.kernel/Objects.kerml"}
22+
File {from ="/library.systems/Items.sysml"}
23+
File {from ="/library.systems/Parts.sysml"}
24+
File {from ="/library.systems/Ports.sysml"}
25+
File {from ="/library.systems/Connections.sysml"}
26+
}
27+
}
28+
}
29+
END_SETUP
30+
*/
31+
package ConnectionUsage_End_Invalid {
32+
// XPECT errors --> "A connection definition end must be a usage." at "abstract connection def B :> Links::BinaryLink;"
33+
abstract connection def B :> Links::BinaryLink;
34+
}
35+

‎org.omg.sysml.xpect.tests/src/org/omg/sysml/xpect/tests/validation/invalid/ConnectionUsage_Invalid.sysml.xt‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ XPECT_SETUP org.omg.sysml.xpect.tests.validation.invalid.SysMLTests
33
ResourceSet {
44
ThisFile {}
55
File {from ="/library.kernel/Base.kerml"}
6+
File {from ="/library.kernel/Links.kerml"}
67
File {from ="/library.kernel/Occurrences.kerml"}
78
File {from ="/library.kernel/Objects.kerml"}
89
File {from ="/library.kernel/Performances.kerml"}
@@ -17,6 +18,7 @@ XPECT_SETUP org.omg.sysml.xpect.tests.validation.invalid.SysMLTests
1718
SrcFolder {
1819
ThisFile {}
1920
File {from ="/library.kernel/Base.kerml"}
21+
File {from ="/library.kernel/Links.kerml"}
2022
File {from ="/library.kernel/Occurrences.kerml"}
2123
File {from ="/library.kernel/Objects.kerml"}
2224
File {from ="/library.kernel/Performances.kerml"}
@@ -30,7 +32,7 @@ XPECT_SETUP org.omg.sysml.xpect.tests.validation.invalid.SysMLTests
3032
}
3133
END_SETUP
3234
*/
33-
package P {
35+
package ConnectionUsage_Invalid {
3436
part def A;
3537
part def B;
3638
part def C;
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
//*
2+
XPECT_SETUP org.omg.sysml.xpect.tests.validation.invalid.SysMLTests
3+
ResourceSet {
4+
ThisFile {}
5+
File {from ="/library.kernel/Base.kerml"}
6+
File {from ="/library.kernel/Links.kerml"}
7+
File {from ="/library.kernel/Occurrences.kerml"}
8+
File {from ="/library.kernel/Objects.kerml"}
9+
File {from ="/library.systems/Items.sysml"}
10+
File {from ="/library.systems/Parts.sysml"}
11+
File {from ="/library.systems/Ports.sysml"}
12+
File {from ="/library.systems/Flows.sysml"}
13+
}
14+
Workspace {
15+
JavaProject {
16+
SrcFolder {
17+
ThisFile {}
18+
File {from ="/library.kernel/Base.kerml"}
19+
File {from ="/library.kernel/Links.kerml"}
20+
File {from ="/library.kernel/Occurrences.kerml"}
21+
File {from ="/library.kernel/Objects.kerml"}
22+
File {from ="/library.systems/Items.sysml"}
23+
File {from ="/library.systems/Parts.sysml"}
24+
File {from ="/library.systems/Ports.sysml"}
25+
File {from ="/library.systems/Flows.sysml"}
26+
}
27+
}
28+
}
29+
END_SETUP
30+
*/
31+
package Flow_End_Invalid {
32+
// XPECT errors --> "A flow definition end must be a usage." at "abstract flow def B :> Links::BinaryLink;"
33+
abstract flow def B :> Links::BinaryLink;
34+
}
35+

org.omg.sysml.xpect.tests/src/org/omg/sysml/xpect/tests/validation/invalid/FlowConnectionUsage_Invalid.sysml.xt renamed to org.omg.sysml.xpect.tests/src/org/omg/sysml/xpect/tests/validation/invalid/FlowUsage_Invalid.sysml.xt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ XPECT_SETUP org.omg.sysml.xpect.tests.validation.invalid.SysMLTests
3636
}
3737
END_SETUP
3838
*/
39-
package P {
39+
package FlowUsage_Invalid {
4040
part def A;
4141

4242
abstract flow def F;
@@ -49,11 +49,11 @@ package P {
4949
flow def I :> H {
5050
end a;
5151
end b;
52-
// XPECT errors --> "A flow connection definition can have at most two ends." at "end c;"
52+
// XPECT errors --> "A flow definition can have at most two ends." at "end c;"
5353
end c;
5454
}
5555

56-
// XPECT errors --> "A flow connection definition can have at most two ends." at "flow def J :> I;"
56+
// XPECT errors --> "A flow definition can have at most two ends." at "flow def J :> I;"
5757
flow def J :> I;
5858

5959
part apart : A {
@@ -63,14 +63,14 @@ package P {
6363
message : F from b to c;
6464
message : F, G from b to c;
6565

66-
// XPECT errors --> "A flow connection must be typed by flow connection definitions." at "message :A from b to c;"
66+
// XPECT errors --> "A flow usage must be typed by flow definitions." at "message :A from b to c;"
6767
//* XPECT warnings ---
6868
"Duplicate of inherited member name 'self' from Action, Part" at "message :A from b to c;"
6969
"Duplicate of inherited member name 'start' from Action, Part" at "message :A from b to c;"
7070
"Duplicate of inherited member name 'done' from Action, Part" at "message :A from b to c;"
7171
--- */
7272
message :A from b to c;
73-
// XPECT errors --> "A flow connection must be typed by flow connection definitions." at "message :apart from b to c;"
73+
// XPECT errors --> "A flow usage must be typed by flow definitions." at "message :apart from b to c;"
7474
//* XPECT warnings ---
7575
"Duplicate of inherited member name 'self' from Action, Part" at "message :apart from b to c;"
7676
"Duplicate of inherited member name 'start' from Action, Part" at "message :apart from b to c;"

‎org.omg.sysml.xtext/src/org/omg/sysml/xtext/validation/SysMLValidator.xtend‎

Lines changed: 42 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@ import org.omg.sysml.util.FeatureUtil
133133
import org.omg.sysml.util.UsageUtil
134134
import org.omg.sysml.lang.sysml.MetadataFeature
135135
import org.omg.sysml.util.TypeUtil
136+
import org.omg.sysml.lang.sysml.ConnectionDefinition
136137

137138
/**
138139
* This class contains custom validation rules.
@@ -234,14 +235,19 @@ class SysMLValidator extends KerMLValidator {
234235
public static val INVALID_PORT_USAGE_NESTED_USAGES_NOT_COMPOSITE = "validatePortUsageNestedUsagesNotComposite"
235236
public static val INVALID_PORT_USAGE_NESTED_USAGES_NOT_COMPOSITE_MSG = "Nested usages in a port usage (other than ports) must be referential."
236237

238+
public static val INVALID_CONNECTION_DEFINITION_ENDS_ARE_USAGES = "validateConnectionDefinitionEndsAreUsages_"
239+
public static val INVALID_CONNECTION_DEFINITION_ENDS_ARE_USAGES_MSG = "A connection definition end must be a usage."
240+
237241
public static val INVALID_CONNECTION_USAGE_TYPE = "validateConnectionUsageType_"
238242
public static val INVALID_CONNECTION_USAGE_TYPE_MSG = "A connection must be typed by connection definitions."
239243

244+
public static val INVALID_FLOW_DEFINITION_ENDS_ARE_USAGES = "validateFlowDefinitionEndsAreUsages_"
245+
public static val INVALID_FLOW_DEFINITION_ENDS_ARE_USAGES_MSG = "A flow definition end must be a usage."
240246
public static val INVALID_FLOW_DEFINITION_END = "validateFlowDefinitionConnectionEnds"
241-
public static val INVALID_FLOW_DEFINITION_END_MSG = "A flow connection definition can have at most two ends."
247+
public static val INVALID_FLOW_DEFINITION_END_MSG = "A flow definition can have at most two ends."
242248

243249
public static val INVALID_FLOW_USAGE_TYPE = "validateFlowUsageType_"
244-
public static val INVALID_FLOW_USAGE_TYPE_MSG = "A flow connection must be typed by flow connection definitions."
250+
public static val INVALID_FLOW_USAGE_TYPE_MSG = "A flow usage must be typed by flow definitions."
245251

246252
public static val INVALID_INTERFACE_DEFINITION_END = "validateInterfaceDefinitionEnd_"
247253
public static val INVALID_INTERFACE_DEFINITION_END_MSG = "An interface definition end must be a port."
@@ -700,6 +706,12 @@ class SysMLValidator extends KerMLValidator {
700706
val usages = usg.nestedUsage.filter[u | !(u instanceof PortUsage)]
701707
checkAllNotComposite(usages, INVALID_PORT_USAGE_NESTED_USAGES_NOT_COMPOSITE_MSG, INVALID_PORT_USAGE_NESTED_USAGES_NOT_COMPOSITE)
702708
}
709+
710+
@Check
711+
def checkConnectionDefinition(ConnectionDefinition cdef) {
712+
// validateConnectionDefinitionEndsAreUsages_
713+
checkEndsAreUsages(cdef, INVALID_CONNECTION_DEFINITION_ENDS_ARE_USAGES_MSG, INVALID_CONNECTION_DEFINITION_ENDS_ARE_USAGES)
714+
}
703715

704716
@Check
705717
def checkConnectionUsage(ConnectionUsage usg) {
@@ -710,8 +722,10 @@ class SysMLValidator extends KerMLValidator {
710722

711723
@Check
712724
def checkFlowDefinition(FlowDefinition cdef) {
713-
// validateConnectionDefinitionConnectionEnds
714-
val ends = cdef.endFeature
725+
// validateFlowDefinitionEndsAreUsages_
726+
val ends = checkEndsAreUsages(cdef, INVALID_FLOW_DEFINITION_ENDS_ARE_USAGES_MSG, INVALID_FLOW_DEFINITION_ENDS_ARE_USAGES)
727+
728+
// validateFlowDefinitionEnds
715729
if (ends.size > 2) {
716730
val ownedEnds = cdef.ownedEndFeature
717731
if (ownedEnds.size <= 2) {
@@ -957,7 +971,7 @@ class SysMLValidator extends KerMLValidator {
957971
// validateStateDefinitionParallelSubactions is checked by checkTransitionUsage and checkSuccession
958972

959973
// validateStateDefinitionStateSubactionKind
960-
checkStateSubactions(defn);
974+
checkStateSubactions(defn,INVALID_STATE_DEFINITION_SUBACTION_KIND)
961975
}
962976

963977
@Check
@@ -977,14 +991,7 @@ class SysMLValidator extends KerMLValidator {
977991
// validateStateUsageParallelSubactions is checked by checkTransitionUsage and checkSuccession
978992

979993
// validateStateUsageStateSubactionKind
980-
checkStateSubactions(usg)
981-
}
982-
983-
protected def checkStateSubactions(Type type) {
984-
val errorId = type instanceof Definition? INVALID_STATE_DEFINITION_SUBACTION_KIND: INVALID_STATE_USAGE_SUBACTION_KIND
985-
checkAtMostOneRelationship(type, UsageUtil.getStateSubactionMembershipsOf(type, StateSubactionKind.ENTRY), INVALID_STATE_SUBACTION_KIND_ENTRY_MSG, errorId);
986-
checkAtMostOneRelationship(type, UsageUtil.getStateSubactionMembershipsOf(type, StateSubactionKind.DO), INVALID_STATE_SUBACTION_KIND_DO_MSG, errorId);
987-
checkAtMostOneRelationship(type, UsageUtil.getStateSubactionMembershipsOf(type, StateSubactionKind.EXIT), INVALID_STATE_SUBACTION_KIND_EXIT_MSG, errorId);
994+
checkStateSubactions(usg, INVALID_STATE_USAGE_SUBACTION_KIND)
988995
}
989996

990997
@Check
@@ -1365,6 +1372,28 @@ class SysMLValidator extends KerMLValidator {
13651372

13661373
/* Utility Methods */
13671374

1375+
protected def checkStateSubactions(Type type, String errorId) {
1376+
checkAtMostOneRelationship(type, UsageUtil.getStateSubactionMembershipsOf(type, StateSubactionKind.ENTRY), INVALID_STATE_SUBACTION_KIND_ENTRY_MSG, errorId);
1377+
checkAtMostOneRelationship(type, UsageUtil.getStateSubactionMembershipsOf(type, StateSubactionKind.DO), INVALID_STATE_SUBACTION_KIND_DO_MSG, errorId);
1378+
checkAtMostOneRelationship(type, UsageUtil.getStateSubactionMembershipsOf(type, StateSubactionKind.EXIT), INVALID_STATE_SUBACTION_KIND_EXIT_MSG, errorId);
1379+
}
1380+
1381+
protected def checkEndsAreUsages(Type type, String msg, String errorId) {
1382+
val ends = TypeUtil.getAllEndFeaturesOf(type)
1383+
val nonUsageEnds = ends.filter[end | !(end instanceof Usage)]
1384+
val ownedNonUsageEnds = nonUsageEnds.filter[end | end.owner === type]
1385+
if (!nonUsageEnds.isEmpty) {
1386+
if (ownedNonUsageEnds.isEmpty()) {
1387+
error(msg, type, null, errorId)
1388+
} else {
1389+
for (end: ownedNonUsageEnds) {
1390+
error(msg, end, null, errorId)
1391+
}
1392+
}
1393+
}
1394+
return ends;
1395+
}
1396+
13681397
protected def boolean checkNotAny(Iterable<? extends EObject> list, String msg, EStructuralFeature eFeature, String eId) {
13691398
var check = true
13701399
for (obj: list) {

0 commit comments

Comments
 (0)