Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2256 from osate/2128_detection_reporting_port
Detection reporting port
- Loading branch information
Showing
26 changed files
with
14,836 additions
and
12,909 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
184 changes: 184 additions & 0 deletions
184
...te.aadl2.errormodel.tests/src/org/osate/aadl2/errormodel/tests/issues/Issue2128Test.xtend
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,184 @@ | ||
| package org.osate.aadl2.errormodel.tests.issues | ||
|
|
||
| import com.google.inject.Inject | ||
| import com.itemis.xtext.testing.FluentIssueCollection | ||
| import com.itemis.xtext.testing.XtextTest | ||
| import org.eclipse.emf.common.util.URI | ||
| import org.eclipse.xtext.resource.IResourceServiceProvider | ||
| import org.eclipse.xtext.testing.InjectWith | ||
| import org.eclipse.xtext.testing.XtextRunner | ||
| import org.eclipse.xtext.testing.validation.ValidationTestHelper | ||
| import org.junit.Test | ||
| import org.junit.runner.RunWith | ||
| import org.osate.aadl2.AadlPackage | ||
| import org.osate.aadl2.DefaultAnnexSubclause | ||
| import org.osate.aadl2.errormodel.tests.ErrorModelInjectorProvider | ||
| import org.osate.testsupport.AssertHelper | ||
| import org.osate.testsupport.TestHelper | ||
| import org.osate.xtext.aadl2.errormodel.errorModel.ErrorModelPackage | ||
| import org.osate.xtext.aadl2.errormodel.errorModel.ErrorModelSubclause | ||
|
|
||
| import static extension org.junit.Assert.assertEquals | ||
| import static extension org.junit.Assert.assertNull | ||
| import static extension org.osate.testsupport.AssertHelper.assertError | ||
|
|
||
| @RunWith(XtextRunner) | ||
| @InjectWith(ErrorModelInjectorProvider) | ||
| class Issue2128Test extends XtextTest { | ||
| @Inject | ||
| extension ValidationTestHelper | ||
|
|
||
| @Inject | ||
| TestHelper<AadlPackage> testHelper | ||
|
|
||
| extension AssertHelper assertHelper = IResourceServiceProvider.Registry.INSTANCE.getResourceServiceProvider( | ||
| URI.createFileURI("dummy.emv2")).get(AssertHelper) | ||
|
|
||
| @Test | ||
| def void testScoping() { | ||
| val issue2128Scoping = ''' | ||
| package issue_2128_scoping | ||
| public | ||
| abstract a1 | ||
| features | ||
| fg1: feature group fgt1; | ||
| end a1; | ||
| abstract implementation a1.i | ||
| internal features | ||
| event_source_1: event; | ||
| annex EMV2 {** | ||
| component error behavior | ||
| detections | ||
| detection1: all -[access]-> fg1.fg2.fg3.port3 !; | ||
| end component; | ||
| **}; | ||
| end a1.i; | ||
| feature group fgt1 | ||
| features | ||
| port1: in out data port; | ||
| fg2: feature group fgt2; | ||
| end fgt1; | ||
| feature group fgt2 | ||
| features | ||
| port2: in out data port; | ||
| fg3: feature group fgt3; | ||
| end fgt2; | ||
| feature group fgt3 | ||
| features | ||
| port3: in out data port; | ||
| end fgt3; | ||
| end issue_2128_scoping; | ||
| ''' | ||
| val reference = ErrorModelPackage.eINSTANCE.reportingPortReference_Element | ||
| testHelper.parseString(issue2128Scoping) => [ | ||
| assertNoIssues | ||
| "issue_2128_scoping".assertEquals(name) | ||
| publicSection.ownedClassifiers.get(1) => [ | ||
| "a1.i".assertEquals(name) | ||
| val defaultSubclause = ownedAnnexSubclauses.head as DefaultAnnexSubclause | ||
| (defaultSubclause.parsedAnnexSubclause as ErrorModelSubclause).errorDetections.head => [ | ||
| "detection1".assertEquals(name) | ||
| detectionReportingPort => [ | ||
| "port3".assertEquals(element.name) | ||
| assertScope(reference, #["port3"]) | ||
| previous => [ | ||
| "fg3".assertEquals(element.name) | ||
| assertScope(reference, #["port2", "fg3"]) | ||
| previous => [ | ||
| "fg2".assertEquals(element.name) | ||
| assertScope(reference, #["port1", "fg2"]) | ||
| previous => [ | ||
| "fg1".assertEquals(element.name) | ||
| assertScope(reference, #["fg1", "event_source_1"]) | ||
| previous.assertNull | ||
| ] | ||
| ] | ||
| ] | ||
| ] | ||
| ] | ||
| ] | ||
| ] | ||
| } | ||
|
|
||
| @Test | ||
| def void testValidation() { | ||
| val issue2128Validation = ''' | ||
| package issue_2128_validation | ||
| public | ||
| abstract a1 | ||
| features | ||
| abstract_feature_1: feature; | ||
| port1: in out data port; | ||
| data_access_1: provides data access; | ||
| fg1: feature group fgt1; | ||
| end a1; | ||
| abstract implementation a1.i | ||
| internal features | ||
| event_source_1: event; | ||
| annex EMV2 {** | ||
| component error behavior | ||
| detections | ||
| --Valid | ||
| detection1: all -[access]-> abstract_feature_1 !; | ||
| detection2: all -[access]-> port1 !; | ||
| detection3: all -[access]-> event_source_1 !; | ||
| detection4: all -[access]-> fg1.abstract_feature_2 !; | ||
| detection5: all -[access]-> fg1.port2 !; | ||
| --Invalid | ||
| detection6: all -[access]-> fg1 !; | ||
| detection7: all -[access]-> data_access_1 !; | ||
| detection8: all -[access]-> fg1.fg2 !; | ||
| detection9: all -[access]-> fg1.data_access_2 !; | ||
| end component; | ||
| **}; | ||
| end a1.i; | ||
| feature group fgt1 | ||
| features | ||
| abstract_feature_2: feature; | ||
| port2: in out data port; | ||
| data_access_2: provides data access; | ||
| fg2: feature group; | ||
| end fgt1; | ||
| end issue_2128_validation; | ||
| ''' | ||
| val testFileResult = issues = testHelper.testString(issue2128Validation) | ||
| val issueCollection = new FluentIssueCollection(testFileResult.resource, newArrayList, newArrayList) | ||
| testFileResult.resource.contents.head as AadlPackage => [ | ||
| "issue_2128_validation".assertEquals(name) | ||
| publicSection.ownedClassifiers.get(1) => [ | ||
| "a1.i".assertEquals(name) | ||
| (ownedAnnexSubclauses.head as DefaultAnnexSubclause).parsedAnnexSubclause as ErrorModelSubclause => [ | ||
| errorDetections.get(5) => [ | ||
| "detection6".assertEquals(name) | ||
| detectionReportingPort.assertError(testFileResult.issues, issueCollection, | ||
| "'fg1' is not a port, abstract feature, or internal feature.") | ||
| ] | ||
| errorDetections.get(6) => [ | ||
| "detection7".assertEquals(name) | ||
| detectionReportingPort.assertError(testFileResult.issues, issueCollection, | ||
| "'data_access_1' is not a port, abstract feature, or internal feature.") | ||
| ] | ||
| errorDetections.get(7) => [ | ||
| "detection8".assertEquals(name) | ||
| detectionReportingPort.assertError(testFileResult.issues, issueCollection, | ||
| "'fg2' is not a port, abstract feature, or internal feature.") | ||
| ] | ||
| errorDetections.get(8) => [ | ||
| "detection9".assertEquals(name) | ||
| detectionReportingPort.assertError(testFileResult.issues, issueCollection, | ||
| "'data_access_2' is not a port, abstract feature, or internal feature.") | ||
| ] | ||
| ] | ||
| ] | ||
| ] | ||
| issueCollection.sizeIs(testFileResult.issues.size) | ||
| assertConstraints(issueCollection) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.