diff options
| author | Jan Belle | 2018-09-28 08:37:35 +0000 |
|---|---|---|
| committer | Jan Belle | 2018-09-28 11:52:11 +0000 |
| commit | cb1b76052fbc2f85f4db45a3caf08cdf96b5b502 (patch) | |
| tree | d7abafb363608ab8635089190d52c5977e2987de /tests/org.eclipse.etrice.ui.behavior.tests/src/org/eclipse/etrice/ui/behavior/commands | |
| parent | f8f82d046d2b781b44af7c418e1d30c12e329e5b (diff) | |
| download | org.eclipse.etrice-cb1b76052fbc2f85f4db45a3caf08cdf96b5b502.tar.gz org.eclipse.etrice-cb1b76052fbc2f85f4db45a3caf08cdf96b5b502.tar.xz org.eclipse.etrice-cb1b76052fbc2f85f4db45a3caf08cdf96b5b502.zip | |
[core] Avoid repeated injector creation
* Create custom validator extensions using dependeny injection.
* Add factories for generator model builders.
Change-Id: I8d72e336ab981c0c218f17aca9d38688c46ac3fe
Diffstat (limited to 'tests/org.eclipse.etrice.ui.behavior.tests/src/org/eclipse/etrice/ui/behavior/commands')
| -rw-r--r-- | tests/org.eclipse.etrice.ui.behavior.tests/src/org/eclipse/etrice/ui/behavior/commands/TestFSMGenModel.xtend | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/org.eclipse.etrice.ui.behavior.tests/src/org/eclipse/etrice/ui/behavior/commands/TestFSMGenModel.xtend b/tests/org.eclipse.etrice.ui.behavior.tests/src/org/eclipse/etrice/ui/behavior/commands/TestFSMGenModel.xtend index 2c5b6f990..dc4c947b1 100644 --- a/tests/org.eclipse.etrice.ui.behavior.tests/src/org/eclipse/etrice/ui/behavior/commands/TestFSMGenModel.xtend +++ b/tests/org.eclipse.etrice.ui.behavior.tests/src/org/eclipse/etrice/ui/behavior/commands/TestFSMGenModel.xtend @@ -39,12 +39,13 @@ import static org.junit.Assert.assertFalse import static org.junit.Assert.assertNotNull import static org.junit.Assert.assertTrue import org.eclipse.etrice.generator.base.logging.NullLogger +import org.eclipse.etrice.core.genmodel.fsm.ExtendedFsmGenBuilderFactory class TestFSMGenModel extends TestBase { val injector = new RoomStandaloneSetup().createInjectorAndDoEMFRegistration() protected IDiagnostician diagnostician = new NullDiagnostician - protected extension ExtendedFsmGenBuilder builder = new ExtendedFsmGenBuilder(injector, diagnostician) + protected extension ExtendedFsmGenBuilder builder = injector.getInstance(ExtendedFsmGenBuilderFactory).create(diagnostician) protected def createResourceSetWithGc(String roomFile, String actorName) { prepare(BehaviorTestActivator.^default.getBundle()) @@ -116,7 +117,7 @@ class TestFSMGenModel extends TestBase { assertEquals(stateGraphItemsNames, namesFromGenModel) } - private def <T extends Comparable> toSortedSet(Iterable<T> iterable) { + private def <T extends Comparable<?>> toSortedSet(Iterable<T> iterable) { Sets.<T>newTreeSet(iterable) } |