diff options
author | Christian W. Damus | 2017-11-22 13:10:48 +0000 |
---|---|---|
committer | Christian W. Damus | 2017-11-29 19:26:43 +0000 |
commit | e883122a241111735fd03e77128a7b25a21f3ec8 (patch) | |
tree | 7f473360ab1410d5b7ff69124dfd8d0c19b0a2f4 /tests/junit | |
parent | 1fc9aedc20221172af1dbfd78a347a48638c9328 (diff) | |
download | org.eclipse.papyrus-e883122a241111735fd03e77128a7b25a21f3ec8.tar.gz org.eclipse.papyrus-e883122a241111735fd03e77128a7b25a21f3ec8.tar.xz org.eclipse.papyrus-e883122a241111735fd03e77128a7b25a21f3ec8.zip |
Bug 527580: Integration issues with view-type helpers
Factor out common partial implementation of view-type
helpers for consistency and add
- overridable determination of PolicyChecker for the view
- priority ordering of view-type helper extensions
https://bugs.eclipse.org/bugs/show_bug.cgi?id=527580
(cherry-picked and expanded from Oxygen)
Change-Id: I6e276ca639f4ac664206511b24bc2246472a3fa2
Diffstat (limited to 'tests/junit')
2 files changed, 10 insertions, 10 deletions
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/tests/NotationLabelProviderTest.java b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/tests/NotationLabelProviderTest.java index eabb73cef8d..56f4208b4f1 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/tests/NotationLabelProviderTest.java +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/tests/NotationLabelProviderTest.java @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2016 Christian W. Damus and others. + * Copyright (c) 2016, 2017 Christian W. Damus and others. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -58,7 +58,7 @@ public class NotationLabelProviderTest { diagram.setName(null); assumeThat(fixture.getText(diagram), is("(Class Diagram of <Package> foo)")); package_.setName("bar"); - assumeThat(fixture.getText(diagram), is("(Class Diagram of <Package> bar)")); + assertThat(fixture.getText(diagram), is("(Class Diagram of <Package> bar)")); } @Test diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/src/org/eclipse/papyrus/infra/nattable/tests/tests/TableLabelProviderTest.java b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/src/org/eclipse/papyrus/infra/nattable/tests/tests/TableLabelProviderTest.java index c57f1251f3f..76532712468 100644 --- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/src/org/eclipse/papyrus/infra/nattable/tests/tests/TableLabelProviderTest.java +++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/src/org/eclipse/papyrus/infra/nattable/tests/tests/TableLabelProviderTest.java @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2016 Christian W. Damus and others. + * Copyright (c) 2016, 2017 Christian W. Damus and others. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -72,7 +72,7 @@ public class TableLabelProviderTest { table.setName(null); assumeThat(fixture.getText(table), is("(Test Table of <Package> foo)")); package_.setName("bar"); - assumeThat(fixture.getText(table), is("(Test Table of <Package> bar)")); + assertThat(fixture.getText(table), is("(Test Table of <Package> bar)")); } @Test @@ -122,26 +122,26 @@ public class TableLabelProviderTest { ArchitectureDomain domain = ArchitectureFactory.eINSTANCE.createArchitectureDomain(); domain.setName("Testing"); - + ArchitectureDescriptionLanguage language = ArchitectureFactory.eINSTANCE.createArchitectureDescriptionLanguage(); language.setId("Testing.TestTable"); domain.getContexts().add(language); - + proto = RepresentationFactory.eINSTANCE.createPapyrusTable(); proto.setName("Test Table"); proto.setId("org.eclipse.papyrus.infra.nattable.tests.table.test"); proto.setImplementationID("org.eclipse.papyrus.infra.nattable.tests.TestTable"); - //proto.setConfiguration("TestTable"); + // proto.setConfiguration("TestTable"); language.getRepresentationKinds().add(proto); - + ArchitectureViewpoint viewpoint = ArchitectureFactory.eINSTANCE.createArchitectureViewpoint(); viewpoint.setId("tesing.TestTable.Testing"); viewpoint.getRepresentationKinds().add(proto); language.getViewpoints().add(viewpoint); - + ArchitectureDomainManager.getInstance().getMerger().setDynamicDomains(Collections.singleton(domain)); ArchitectureDomainManager.getInstance().getPreferences().setDefaultContextId("Testing.TestTable"); - + package_ = UMLFactory.eINSTANCE.createPackage(); package_.setName("foo"); |