diff options
| author | Juergen Haug | 2017-12-22 17:30:28 +0000 |
|---|---|---|
| committer | Juergen Haug | 2017-12-22 17:49:45 +0000 |
| commit | b10d6486b25556fa49ac744ae7de856eb0538f1a (patch) | |
| tree | 805acd6e6d30ff0eaf1bf2077234da9980e46b3a | |
| parent | 7aedbdb21c075615f986b908ffb7eb7a83cc9c82 (diff) | |
| download | org.eclipse.etrice-b10d6486b25556fa49ac744ae7de856eb0538f1a.tar.gz org.eclipse.etrice-b10d6486b25556fa49ac744ae7de856eb0538f1a.tar.xz org.eclipse.etrice-b10d6486b25556fa49ac744ae7de856eb0538f1a.zip | |
updated TestInstanceCreate to new generation
Change-Id: Icaa1120885f1e14756f7bca73b03feec3f9026b7
2 files changed, 12 insertions, 4 deletions
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/AbstractGenerator.java b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/AbstractGenerator.java index fcd4bff1c..d0205d622 100644 --- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/AbstractGenerator.java +++ b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/AbstractGenerator.java @@ -445,7 +445,8 @@ public abstract class AbstractGenerator implements IDetailCodeTranslator { */ protected Root createGeneratorModel(boolean asLibrary, String genModelPath) { // create instance and mapping for test instances - List<Resource> testInstanceResources = new TestInstanceCreator(logger).createInstancesAndMapping(getResourceSet()); + List<Resource> testInstanceResources = new TestInstanceCreator(logger).createInstancesAndMapping( + modelLoader.getMainModelURIs(), getResourceSet()); if (testInstanceResources==null) { logger.logError("-- terminating", null); return null; diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/TestInstanceCreator.xtend b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/TestInstanceCreator.xtend index 2063e672a..ac21fb5d2 100644 --- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/TestInstanceCreator.xtend +++ b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/TestInstanceCreator.xtend @@ -11,6 +11,8 @@ import org.eclipse.etrice.core.room.RoomFactory import org.eclipse.etrice.core.room.RoomModel import org.eclipse.etrice.core.room.StructureClass import org.eclipse.xtend.lib.annotations.FinalFieldsConstructor +import java.util.Collection +import org.eclipse.emf.common.util.URI @FinalFieldsConstructor class TestInstanceCreator { @@ -37,13 +39,18 @@ class TestInstanceCreator { * @param rs ResourceSet for new resources * @return false, if creation failed and generation should stop */ - def List<Resource> createInstancesAndMapping(ResourceSet rs) { + def List<Resource> createInstancesAndMapping(Collection<URI> modelsURIs, ResourceSet rs) { val roomModels = newArrayList val physModels = newArrayList - rs.resources.forEach[contents.forall[switch it { RoomModel: roomModels += it PhysicalModel: physModels += it }]] + rs.resources.forEach[contents.forEach[switch it { + RoomModel: if(modelsURIs.contains(eResource.URI)) roomModels += it + PhysicalModel: physModels += it + }]] // try find annotated SubSystemClass - val allTestSubSystems = roomModels.fold(newArrayList, [list, model | list += model.subSystemClasses.filter[hasTestAnnotation] return list]) + val allTestSubSystems = roomModels.fold(newArrayList, [list, model | + list += model.subSystemClasses.filter[hasTestAnnotation] return list + ]) val List<StructureClass> allAnnotatedClasses = newArrayList(allTestSubSystems) val result = newArrayList |