From 1963a2e69f3e88de92a52ecae2d030a23fc7ee3e Mon Sep 17 00:00:00 2001 From: Arthur Daussy Date: Mon, 7 Jul 2014 16:05:23 +0200 Subject: [PATCH] Correction of unit tests for ProfiledUMLCompareItemProviderAdapterFactory. After renaming the classes in a previous revision I forgot to rename the related TU. Change-Id: I163b64941c936ac3e9c303c1ce28d3393c9b9912 Signed-off-by: Arthur Daussy --- plugins/org.eclipse.emf.compare.uml2.edit/META-INF/MANIFEST.MF | 3 ++- .../rcp/ui/tests/profile/DynamicProfileIntegrationDisplayTest.java | 4 ++-- .../rcp/ui/tests/profile/StaticProfileIntegrationDisplayTest.java | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.uml2.edit/META-INF/MANIFEST.MF index 498fa67f5..023712995 100644 --- a/plugins/org.eclipse.emf.compare.uml2.edit/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.compare.uml2.edit/META-INF/MANIFEST.MF @@ -24,4 +24,5 @@ Import-Package: com.google.common.base;version="[11.0.0,16.0.0)", org.eclipse.emf.compare.provider Export-Package: org.eclipse.emf.compare.uml2.internal.provider;x-internal:=true, org.eclipse.emf.compare.uml2.internal.provider.custom;x-friends:="org.eclipse.emf.compare.diagram.papyrus.tests,org.eclipse.emf.compare.uml2.rcp.ui.tests", - org.eclipse.emf.compare.uml2.internal.provider.decorator;x-friends:="org.eclipse.emf.compare.diagram.papyrus.tests,org.eclipse.emf.compare.uml2.tests,org.eclipse.emf.compare.uml2.rcp.ui.tests" + org.eclipse.emf.compare.uml2.internal.provider.decorator;x-friends:="org.eclipse.emf.compare.diagram.papyrus.tests,org.eclipse.emf.compare.uml2.tests,org.eclipse.emf.compare.uml2.rcp.ui.tests", + org.eclipse.emf.compare.uml2.internal.provider.profile;x-friends:="org.eclipse.emf.compare.uml2.rcp.ui.tests" diff --git a/plugins/org.eclipse.emf.compare.uml2.rcp.ui.tests/src/org/eclipse/emf/compare/uml2/rcp/ui/tests/profile/DynamicProfileIntegrationDisplayTest.java b/plugins/org.eclipse.emf.compare.uml2.rcp.ui.tests/src/org/eclipse/emf/compare/uml2/rcp/ui/tests/profile/DynamicProfileIntegrationDisplayTest.java index 1431066fa..fa0277d48 100644 --- a/plugins/org.eclipse.emf.compare.uml2.rcp.ui.tests/src/org/eclipse/emf/compare/uml2/rcp/ui/tests/profile/DynamicProfileIntegrationDisplayTest.java +++ b/plugins/org.eclipse.emf.compare.uml2.rcp.ui.tests/src/org/eclipse/emf/compare/uml2/rcp/ui/tests/profile/DynamicProfileIntegrationDisplayTest.java @@ -34,10 +34,10 @@ import org.eclipse.emf.compare.rcp.ui.structuremergeviewer.groups.IDifferenceGro import org.eclipse.emf.compare.tests.framework.AbstractInputData; import org.eclipse.emf.compare.uml2.internal.postprocessor.StereotypedElementChangePostProcessor; import org.eclipse.emf.compare.uml2.internal.postprocessor.UMLPostProcessor; -import org.eclipse.emf.compare.uml2.internal.provider.custom.ProfileIntegrationItemProviderAdapterFactory; import org.eclipse.emf.compare.uml2.internal.provider.custom.UMLCompareCustomItemProviderAdapterFactory; import org.eclipse.emf.compare.uml2.internal.provider.decorator.UMLCompareItemProviderDecoratorAdapterFactory; import org.eclipse.emf.compare.uml2.internal.provider.decorator.UMLProfileItemProviderAdapterFactoryDecorator; +import org.eclipse.emf.compare.uml2.internal.provider.profile.ProfiledUMLCompareItemProviderAdapterFactory; import org.eclipse.emf.compare.uml2.profile.test.uml2comparetestprofile.UML2CompareTestProfilePackage; import org.eclipse.emf.compare.uml2.rcp.ui.internal.structuremergeviewer.filters.UMLRefinedElementsFilter; import org.eclipse.emf.compare.uml2.rcp.ui.tests.groups.AbstractDifferenceOrderTest; @@ -101,7 +101,7 @@ public class DynamicProfileIntegrationDisplayTest extends AbstractDifferenceOrde @Override protected List getAdaptersFactory() { - return Lists. newArrayList(new ProfileIntegrationItemProviderAdapterFactory(), + return Lists. newArrayList(new ProfiledUMLCompareItemProviderAdapterFactory(), new UMLProfileItemProviderAdapterFactoryDecorator(), new CompareItemProviderAdapterFactorySpec(), new TreeItemProviderAdapterFactorySpec(), new UMLCompareCustomItemProviderAdapterFactory(), new UMLItemProviderAdapterFactory(), diff --git a/plugins/org.eclipse.emf.compare.uml2.rcp.ui.tests/src/org/eclipse/emf/compare/uml2/rcp/ui/tests/profile/StaticProfileIntegrationDisplayTest.java b/plugins/org.eclipse.emf.compare.uml2.rcp.ui.tests/src/org/eclipse/emf/compare/uml2/rcp/ui/tests/profile/StaticProfileIntegrationDisplayTest.java index a53c07160..8b2d76b5f 100644 --- a/plugins/org.eclipse.emf.compare.uml2.rcp.ui.tests/src/org/eclipse/emf/compare/uml2/rcp/ui/tests/profile/StaticProfileIntegrationDisplayTest.java +++ b/plugins/org.eclipse.emf.compare.uml2.rcp.ui.tests/src/org/eclipse/emf/compare/uml2/rcp/ui/tests/profile/StaticProfileIntegrationDisplayTest.java @@ -33,10 +33,10 @@ import org.eclipse.emf.compare.rcp.ui.structuremergeviewer.groups.IDifferenceGro import org.eclipse.emf.compare.tests.framework.AbstractInputData; import org.eclipse.emf.compare.uml2.internal.postprocessor.StereotypedElementChangePostProcessor; import org.eclipse.emf.compare.uml2.internal.postprocessor.UMLPostProcessor; -import org.eclipse.emf.compare.uml2.internal.provider.custom.ProfileIntegrationItemProviderAdapterFactory; import org.eclipse.emf.compare.uml2.internal.provider.custom.UMLCompareCustomItemProviderAdapterFactory; import org.eclipse.emf.compare.uml2.internal.provider.decorator.UMLCompareItemProviderDecoratorAdapterFactory; import org.eclipse.emf.compare.uml2.internal.provider.decorator.UMLProfileItemProviderAdapterFactoryDecorator; +import org.eclipse.emf.compare.uml2.internal.provider.profile.ProfiledUMLCompareItemProviderAdapterFactory; import org.eclipse.emf.compare.uml2.profile.test.uml2comparetestprofile.provider.UML2CompareTestProfileItemProviderAdapterFactory; import org.eclipse.emf.compare.uml2.rcp.ui.internal.structuremergeviewer.filters.UMLRefinedElementsFilter; import org.eclipse.emf.compare.uml2.rcp.ui.tests.groups.AbstractDifferenceOrderTest; @@ -80,7 +80,7 @@ public class StaticProfileIntegrationDisplayTest extends AbstractDifferenceOrder protected List getAdaptersFactory() { // Adds UML2CompareTestProfileItemProviderAdapterFactory item adapter factory to use the custom icon // defined in it. - return Lists. newArrayList(new ProfileIntegrationItemProviderAdapterFactory(), + return Lists. newArrayList(new ProfiledUMLCompareItemProviderAdapterFactory(), new UMLProfileItemProviderAdapterFactoryDecorator(), new CompareItemProviderAdapterFactorySpec(), new TreeItemProviderAdapterFactorySpec(), new UMLCompareCustomItemProviderAdapterFactory(), -- 2.11.4.GIT