Skip to content

Commit acd6fca

Browse files
committed
renamed and new error codes
1 parent 74f8442 commit acd6fca

File tree

2 files changed

+11
-12
lines changed

2 files changed

+11
-12
lines changed

language/src/main/java/de/monticore/lang/sysmlv2/cocos/MKPX_CoCo5.java renamed to language/src/main/java/de/monticore/lang/sysmlv2/cocos/SubcomponentOutputConnectionDirectionCoCo.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
import java.util.Optional;
1515

1616
/**
17-
* MKPX_CoCo5 = KBE_CoCo1
17+
* SubcomponentOutputConnectionDirectionCoCo
1818
* Checks that outputs of subcomponents can only be connected to:
1919
* 1. Inputs of subcomponents, or
2020
* 2. Outputs of the parent component.
2121
*/
22-
public class MKPX_CoCo5 implements SysMLPartsASTConnectionUsageCoCo {
22+
public class SubcomponentOutputConnectionDirectionCoCo implements SysMLPartsASTConnectionUsageCoCo {
2323

2424
@Override
2525
public void check(ASTConnectionUsage node) {
@@ -67,14 +67,14 @@ public void check(ASTConnectionUsage node) {
6767
(portIsOutput(srcPort) && portIsInput(srcPort)) ||
6868
(portIsOutput(tgtPort) && portIsInput(tgtPort))
6969
) {
70-
Log.warn("0xMKPX05 Warning: Connection involves an 'inout' port which may have ambiguous directionality.",
70+
Log.warn("0x10AA5 Warning: Connection involves an 'inout' port which may have ambiguous directionality.",
7171
node.get_SourcePositionStart(),
7272
node.get_SourcePositionEnd());
7373
}
7474

7575
if (!allowed) {
7676
Log.error(
77-
"0xMKPX05 Illegal connection: outputs of subcomponents can only be " +
77+
"0x10AA5 Illegal connection: outputs of subcomponents can only be " +
7878
"connected to inputs of subcomponents or outputs of the parent component.",
7979
node.get_SourcePositionStart(),
8080
node.get_SourcePositionEnd()

language/src/test/java/cocos/MKPXCoCo5Test.java renamed to language/src/test/java/cocos/SubcomponentOutputConnectionDirectionCoCoTest.java

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@
22
package cocos;
33

44
import de.monticore.lang.sysmlparts._cocos.SysMLPartsASTConnectionUsageCoCo;
5-
import de.monticore.lang.sysmlparts._cocos.SysMLPartsASTPartDefCoCo;
65
import de.monticore.lang.sysmlv2.SysMLv2Mill;
76
import de.monticore.lang.sysmlv2._ast.ASTSysMLModel;
87
import de.monticore.lang.sysmlv2._cocos.SysMLv2CoCoChecker;
98
import de.monticore.lang.sysmlv2._parser.SysMLv2Parser;
10-
import de.monticore.lang.sysmlv2.cocos.MKPX_CoCo5;
9+
import de.monticore.lang.sysmlv2.cocos.SubcomponentOutputConnectionDirectionCoCo;
1110
import de.se_rwth.commons.logging.Log;
1211
import org.junit.jupiter.api.BeforeAll;
1312
import org.junit.jupiter.api.BeforeEach;
@@ -19,7 +18,7 @@
1918
import static org.junit.jupiter.api.Assertions.assertFalse;
2019
import static org.junit.jupiter.api.Assertions.assertTrue;
2120

22-
public class MKPXCoCo5Test {
21+
public class SubcomponentOutputConnectionDirectionCoCoTest {
2322

2423
private static final String MODEL_PATH = "src/test/resources/parser";
2524

@@ -60,7 +59,7 @@ public void testValid() throws IOException {
6059
ASTSysMLModel ast = SysMLv2Mill.parser().parse_String(validModel).get();
6160
SysMLv2Mill.scopesGenitorDelegator().createFromAST(ast);
6261
var checker = new SysMLv2CoCoChecker();
63-
checker.addCoCo((SysMLPartsASTConnectionUsageCoCo) new MKPX_CoCo5());
62+
checker.addCoCo((SysMLPartsASTConnectionUsageCoCo) new SubcomponentOutputConnectionDirectionCoCo());
6463
checker.checkAll(ast);
6564
assertTrue(Log.getFindings().isEmpty());
6665
}
@@ -80,11 +79,11 @@ public void testInvalidSubOutToSubOut() throws IOException {
8079
ASTSysMLModel ast = SysMLv2Mill.parser().parse_String(invalidModel).get();
8180
SysMLv2Mill.scopesGenitorDelegator().createFromAST(ast);
8281
var checker = new SysMLv2CoCoChecker();
83-
checker.addCoCo((SysMLPartsASTConnectionUsageCoCo) new MKPX_CoCo5());
82+
checker.addCoCo((SysMLPartsASTConnectionUsageCoCo) new SubcomponentOutputConnectionDirectionCoCo());
8483
Log.enableFailQuick(false);
8584
checker.checkAll(ast);
8685
assertTrue(Log.getFindings().stream()
87-
.anyMatch(f -> f.getMsg().contains("0xMKPX05")));
86+
.anyMatch(f -> f.getMsg().contains("0x10AA5")));
8887
}
8988

9089
@Test
@@ -102,11 +101,11 @@ public void testInvalidSubOutToMainIn() throws IOException {
102101
ASTSysMLModel ast = SysMLv2Mill.parser().parse_String(invalidModel).get();
103102
SysMLv2Mill.scopesGenitorDelegator().createFromAST(ast);
104103
var checker = new SysMLv2CoCoChecker();
105-
checker.addCoCo((SysMLPartsASTConnectionUsageCoCo) new MKPX_CoCo5());
104+
checker.addCoCo((SysMLPartsASTConnectionUsageCoCo) new SubcomponentOutputConnectionDirectionCoCo());
106105
Log.enableFailQuick(false);
107106
checker.checkAll(ast);
108107
assertTrue(Log.getFindings().stream()
109-
.anyMatch(f -> f.getMsg().contains("0xMKPX05")));
108+
.anyMatch(f -> f.getMsg().contains("0x10AA5")));
110109
}
111110
}
112111
}

0 commit comments

Comments
 (0)