diff options
Diffstat (limited to 'tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test')
36 files changed, 202 insertions, 213 deletions
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/services/ServiceA10.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/services/ServiceA10.java deleted file mode 100644 index a36eb59ce2f..00000000000 --- a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/services/ServiceA10.java +++ /dev/null @@ -1,6 +0,0 @@ -package org.eclipse.papyrus.core.services;
-
-
-public class ServiceA10 extends ServiceA {
-
-}
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/services/ServiceB.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/services/ServiceB.java deleted file mode 100644 index c8db40311b6..00000000000 --- a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/services/ServiceB.java +++ /dev/null @@ -1,6 +0,0 @@ -package org.eclipse.papyrus.core.services;
-
-
-public class ServiceB extends ServiceA {
-
-}
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/services/ServiceC.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/services/ServiceC.java deleted file mode 100644 index 31276d53126..00000000000 --- a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/services/ServiceC.java +++ /dev/null @@ -1,6 +0,0 @@ -package org.eclipse.papyrus.core.services;
-
-
-public class ServiceC extends ServiceA {
-
-}
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/services/ServicePojoA.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/services/ServicePojoA.java deleted file mode 100644 index 5602c3c6e12..00000000000 --- a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/services/ServicePojoA.java +++ /dev/null @@ -1,6 +0,0 @@ -package org.eclipse.papyrus.core.services;
-
-
-public class ServicePojoA extends ServiceA {
-
-}
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/lifecycleevents/FakeSaveEvent.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/infra/core/lifecycleevents/FakeSaveEvent.java index 524b8b57ca2..7d48635ad75 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/lifecycleevents/FakeSaveEvent.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/infra/core/lifecycleevents/FakeSaveEvent.java @@ -1,12 +1,9 @@ /**
*
*/
-package org.eclipse.papyrus.core.lifecycleevents;
+package org.eclipse.papyrus.infra.core.lifecycleevents;
-import javax.imageio.spi.ServiceRegistry;
-
-import org.eclipse.papyrus.core.editor.IMultiDiagramEditor;
-import org.eclipse.papyrus.core.lifecycleevents.DoSaveEvent;
+import org.eclipse.papyrus.infra.core.lifecycleevents.DoSaveEvent;
/**
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/lifecycleevents/FakeSaveEventListener.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/infra/core/lifecycleevents/FakeSaveEventListener.java index fec3a0a9f54..e06c6aa4b05 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/lifecycleevents/FakeSaveEventListener.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/infra/core/lifecycleevents/FakeSaveEventListener.java @@ -1,15 +1,13 @@ /**
*
*/
-package org.eclipse.papyrus.core.lifecycleevents;
+package org.eclipse.papyrus.infra.core.lifecycleevents;
import java.util.ArrayList;
-import java.util.HashSet;
import java.util.List;
-import java.util.Set;
-import org.eclipse.papyrus.core.lifecycleevents.DoSaveEvent;
-import org.eclipse.papyrus.core.lifecycleevents.ISaveEventListener;
+import org.eclipse.papyrus.infra.core.lifecycleevents.DoSaveEvent;
+import org.eclipse.papyrus.infra.core.lifecycleevents.ISaveEventListener;
/**
@@ -21,7 +19,7 @@ public class FakeSaveEventListener implements ISaveEventListener { List<DoSaveEvent> receivedEvents = new ArrayList<DoSaveEvent>();
/**
- * @see org.eclipse.papyrus.core.lifecycleevents.ISaveEventListener#doSave(org.eclipse.papyrus.core.lifecycleevents.DoSaveEvent)
+ * @see org.eclipse.papyrus.infra.core.lifecycleevents.ISaveEventListener#doSave(org.eclipse.papyrus.infra.core.lifecycleevents.DoSaveEvent)
*
* @param event
*/
@@ -31,7 +29,7 @@ public class FakeSaveEventListener implements ISaveEventListener { }
/**
- * @see org.eclipse.papyrus.core.lifecycleevents.ISaveEventListener#doSaveAs(org.eclipse.papyrus.core.lifecycleevents.DoSaveEvent)
+ * @see org.eclipse.papyrus.infra.core.lifecycleevents.ISaveEventListener#doSaveAs(org.eclipse.papyrus.infra.core.lifecycleevents.DoSaveEvent)
*
* @param event
*/
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/lifecycleevents/LifeCycleEventsProviderTest.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/infra/core/lifecycleevents/LifeCycleEventsProviderTest.java index a1c4c811a5b..b94a14adcd8 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/lifecycleevents/LifeCycleEventsProviderTest.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/infra/core/lifecycleevents/LifeCycleEventsProviderTest.java @@ -1,14 +1,14 @@ /**
*
*/
-package org.eclipse.papyrus.core.lifecycleevents;
-
-import org.eclipse.papyrus.core.lifecycleevents.DoSaveEvent;
-import org.eclipse.papyrus.core.lifecycleevents.ISaveEventListener;
-import org.eclipse.papyrus.core.lifecycleevents.LifeCycleEventsProvider;
+package org.eclipse.papyrus.infra.core.lifecycleevents;
import junit.framework.TestCase;
+import org.eclipse.papyrus.infra.core.lifecycleevents.DoSaveEvent;
+import org.eclipse.papyrus.infra.core.lifecycleevents.ISaveEventListener;
+import org.eclipse.papyrus.infra.core.lifecycleevents.LifeCycleEventsProvider;
+
/**
* @author cedric dumoulin
@@ -33,7 +33,7 @@ public class LifeCycleEventsProviderTest extends TestCase { }
/**
- * Test method for {@link org.eclipse.papyrus.core.lifecycleevents.LifeCycleEventsProvider#addDoSaveListener(org.eclipse.papyrus.core.lifecycleevents.ISaveEventListener)}.
+ * Test method for {@link org.eclipse.papyrus.infra.core.lifecycleevents.LifeCycleEventsProvider#addDoSaveListener(org.eclipse.papyrus.infra.core.lifecycleevents.ISaveEventListener)}.
*/
public void testAddSaveListener() {
@@ -48,7 +48,7 @@ public class LifeCycleEventsProviderTest extends TestCase { }
/**
- * Test method for {@link org.eclipse.papyrus.core.lifecycleevents.LifeCycleEventsProvider#removeDoSaveListener(org.eclipse.papyrus.core.lifecycleevents.ISaveEventListener)}.
+ * Test method for {@link org.eclipse.papyrus.infra.core.lifecycleevents.LifeCycleEventsProvider#removeDoSaveListener(org.eclipse.papyrus.infra.core.lifecycleevents.ISaveEventListener)}.
*/
public void testRemoveSaveListener() {
ISaveEventListener listener = new FakeSaveEventListener();
@@ -62,7 +62,7 @@ public class LifeCycleEventsProviderTest extends TestCase { }
/**
- * Test method for {@link org.eclipse.papyrus.core.lifecycleevents.LifeCycleEventsProvider#addAboutToDoSaveListener(org.eclipse.papyrus.core.lifecycleevents.ISaveEventListener)}.
+ * Test method for {@link org.eclipse.papyrus.infra.core.lifecycleevents.LifeCycleEventsProvider#addAboutToDoSaveListener(org.eclipse.papyrus.infra.core.lifecycleevents.ISaveEventListener)}.
*/
public void testAddAboutToSaveListener() {
ISaveEventListener listener = new FakeSaveEventListener();
@@ -75,7 +75,7 @@ public class LifeCycleEventsProviderTest extends TestCase { }
/**
- * Test method for {@link org.eclipse.papyrus.core.lifecycleevents.LifeCycleEventsProvider#removeAboutToDoSaveListener(org.eclipse.papyrus.core.lifecycleevents.ISaveEventListener)}.
+ * Test method for {@link org.eclipse.papyrus.infra.core.lifecycleevents.LifeCycleEventsProvider#removeAboutToDoSaveListener(org.eclipse.papyrus.infra.core.lifecycleevents.ISaveEventListener)}.
*/
public void testRemoveAboutToSaveListener() {
ISaveEventListener listener = new FakeSaveEventListener();
@@ -89,7 +89,7 @@ public class LifeCycleEventsProviderTest extends TestCase { }
/**
- * Test method for {@link org.eclipse.papyrus.core.lifecycleevents.LifeCycleEventsProvider#addPostDoSaveListener(org.eclipse.papyrus.core.lifecycleevents.ISaveEventListener)}.
+ * Test method for {@link org.eclipse.papyrus.infra.core.lifecycleevents.LifeCycleEventsProvider#addPostDoSaveListener(org.eclipse.papyrus.infra.core.lifecycleevents.ISaveEventListener)}.
*/
public void testAddPostSaveListener() {
ISaveEventListener listener = new FakeSaveEventListener();
@@ -102,7 +102,7 @@ public class LifeCycleEventsProviderTest extends TestCase { }
/**
- * Test method for {@link org.eclipse.papyrus.core.lifecycleevents.LifeCycleEventsProvider#removePostDoSaveListener(org.eclipse.papyrus.core.lifecycleevents.ISaveEventListener)}.
+ * Test method for {@link org.eclipse.papyrus.infra.core.lifecycleevents.LifeCycleEventsProvider#removePostDoSaveListener(org.eclipse.papyrus.infra.core.lifecycleevents.ISaveEventListener)}.
*/
public void testRemovePostSaveListener() {
ISaveEventListener listener = new FakeSaveEventListener();
@@ -116,7 +116,7 @@ public class LifeCycleEventsProviderTest extends TestCase { }
/**
- * Test method for {@link org.eclipse.papyrus.core.lifecycleevents.LifeCycleEventsProvider#fireAboutToDoSaveEvent(org.eclipse.papyrus.core.lifecycleevents.DoSaveEvent)}.
+ * Test method for {@link org.eclipse.papyrus.infra.core.lifecycleevents.LifeCycleEventsProvider#fireAboutToDoSaveEvent(org.eclipse.papyrus.infra.core.lifecycleevents.DoSaveEvent)}.
*/
public void testFireAboutToSaveEvent() {
FakeSaveEventListener listener = new FakeSaveEventListener();
@@ -129,7 +129,7 @@ public class LifeCycleEventsProviderTest extends TestCase { }
/**
- * Test method for {@link org.eclipse.papyrus.core.lifecycleevents.LifeCycleEventsProvider#fireAboutToDoSaveAsEvent(org.eclipse.papyrus.core.lifecycleevents.DoSaveEvent)}.
+ * Test method for {@link org.eclipse.papyrus.infra.core.lifecycleevents.LifeCycleEventsProvider#fireAboutToDoSaveAsEvent(org.eclipse.papyrus.infra.core.lifecycleevents.DoSaveEvent)}.
*/
public void testFireAboutToSaveAsEvent() {
FakeSaveEventListener listener = new FakeSaveEventListener();
@@ -142,7 +142,7 @@ public class LifeCycleEventsProviderTest extends TestCase { }
/**
- * Test method for {@link org.eclipse.papyrus.core.lifecycleevents.LifeCycleEventsProvider#fireDoSaveEvent(org.eclipse.papyrus.core.lifecycleevents.DoSaveEvent)}.
+ * Test method for {@link org.eclipse.papyrus.infra.core.lifecycleevents.LifeCycleEventsProvider#fireDoSaveEvent(org.eclipse.papyrus.infra.core.lifecycleevents.DoSaveEvent)}.
*/
public void testFireSaveEvent() {
FakeSaveEventListener listener = new FakeSaveEventListener();
@@ -155,7 +155,7 @@ public class LifeCycleEventsProviderTest extends TestCase { }
/**
- * Test method for {@link org.eclipse.papyrus.core.lifecycleevents.LifeCycleEventsProvider#fireDoSaveAsEvent(org.eclipse.papyrus.core.lifecycleevents.DoSaveEvent)}.
+ * Test method for {@link org.eclipse.papyrus.infra.core.lifecycleevents.LifeCycleEventsProvider#fireDoSaveAsEvent(org.eclipse.papyrus.infra.core.lifecycleevents.DoSaveEvent)}.
*/
public void testFireSaveAsEvent() {
FakeSaveEventListener listener = new FakeSaveEventListener();
@@ -168,7 +168,7 @@ public class LifeCycleEventsProviderTest extends TestCase { }
/**
- * Test method for {@link org.eclipse.papyrus.core.lifecycleevents.LifeCycleEventsProvider#firePostDoSaveEvent(org.eclipse.papyrus.core.lifecycleevents.DoSaveEvent)}.
+ * Test method for {@link org.eclipse.papyrus.infra.core.lifecycleevents.LifeCycleEventsProvider#firePostDoSaveEvent(org.eclipse.papyrus.infra.core.lifecycleevents.DoSaveEvent)}.
*/
public void testFirePostSaveEvent() {
FakeSaveEventListener listener = new FakeSaveEventListener();
@@ -181,7 +181,7 @@ public class LifeCycleEventsProviderTest extends TestCase { }
/**
- * Test method for {@link org.eclipse.papyrus.core.lifecycleevents.LifeCycleEventsProvider#firePostDoSaveAsEvent(org.eclipse.papyrus.core.lifecycleevents.DoSaveEvent)}.
+ * Test method for {@link org.eclipse.papyrus.infra.core.lifecycleevents.LifeCycleEventsProvider#firePostDoSaveAsEvent(org.eclipse.papyrus.infra.core.lifecycleevents.DoSaveEvent)}.
*/
public void testFirePostSaveAsEvent() {
FakeSaveEventListener listener = new FakeSaveEventListener();
@@ -194,7 +194,7 @@ public class LifeCycleEventsProviderTest extends TestCase { }
/**
- * Test method for {@link org.eclipse.papyrus.core.lifecycleevents.LifeCycleEventsProvider#fireAllDoSaveEvent(org.eclipse.papyrus.core.lifecycleevents.DoSaveEvent)}.
+ * Test method for {@link org.eclipse.papyrus.infra.core.lifecycleevents.LifeCycleEventsProvider#fireAllDoSaveEvent(org.eclipse.papyrus.infra.core.lifecycleevents.DoSaveEvent)}.
*/
public void testFireAllSaveEvent() {
FakeSaveEventListener preListener = new FakeSaveEventListener();
@@ -214,7 +214,7 @@ public class LifeCycleEventsProviderTest extends TestCase { }
/**
- * Test method for {@link org.eclipse.papyrus.core.lifecycleevents.LifeCycleEventsProvider#fireAllDoSaveAsEvent(org.eclipse.papyrus.core.lifecycleevents.DoSaveEvent)}.
+ * Test method for {@link org.eclipse.papyrus.infra.core.lifecycleevents.LifeCycleEventsProvider#fireAllDoSaveAsEvent(org.eclipse.papyrus.infra.core.lifecycleevents.DoSaveEvent)}.
*/
public void testFireAllSaveAsEvent() {
FakeSaveEventListener preListener = new FakeSaveEventListener();
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/lifecycleevents/SaveAndDirtyServiceTest.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/infra/core/lifecycleevents/SaveAndDirtyServiceTest.java index 8fcd273c236..c12701d87e2 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/lifecycleevents/SaveAndDirtyServiceTest.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/infra/core/lifecycleevents/SaveAndDirtyServiceTest.java @@ -12,9 +12,9 @@ *
*****************************************************************************/
-package org.eclipse.papyrus.core.lifecycleevents;
+package org.eclipse.papyrus.infra.core.lifecycleevents;
-import static org.junit.Assert.*;
+import static org.junit.Assert.fail;
import org.junit.After;
import org.junit.Before;
@@ -42,7 +42,7 @@ public class SaveAndDirtyServiceTest { }
/**
- * Test method for {@link org.eclipse.papyrus.core.lifecycleevents.SaveAndDirtyService#doSave(org.eclipse.core.runtime.IProgressMonitor)}.
+ * Test method for {@link org.eclipse.papyrus.infra.core.lifecycleevents.SaveAndDirtyService#doSave(org.eclipse.core.runtime.IProgressMonitor)}.
*/
@Test
public void testDoSave() {
@@ -50,7 +50,7 @@ public class SaveAndDirtyServiceTest { }
/**
- * Test method for {@link org.eclipse.papyrus.core.lifecycleevents.SaveAndDirtyService#doSaveAs()}.
+ * Test method for {@link org.eclipse.papyrus.infra.core.lifecycleevents.SaveAndDirtyService#doSaveAs()}.
*/
@Test
public void testDoSaveAs() {
@@ -58,7 +58,7 @@ public class SaveAndDirtyServiceTest { }
/**
- * Test method for {@link org.eclipse.papyrus.core.lifecycleevents.SaveAndDirtyService#isDirty()}.
+ * Test method for {@link org.eclipse.papyrus.infra.core.lifecycleevents.SaveAndDirtyService#isDirty()}.
*/
@Test
public void testIsDirty() {
@@ -66,7 +66,7 @@ public class SaveAndDirtyServiceTest { }
/**
- * Test method for {@link org.eclipse.papyrus.core.lifecycleevents.SaveAndDirtyService#isSaveAsAllowed()}.
+ * Test method for {@link org.eclipse.papyrus.infra.core.lifecycleevents.SaveAndDirtyService#isSaveAsAllowed()}.
*/
@Test
public void testIsSaveAsAllowed() {
@@ -74,7 +74,7 @@ public class SaveAndDirtyServiceTest { }
/**
- * Test method for {@link org.eclipse.papyrus.core.lifecycleevents.SaveAndDirtyService#isSaveOnCloseNeeded()}.
+ * Test method for {@link org.eclipse.papyrus.infra.core.lifecycleevents.SaveAndDirtyService#isSaveOnCloseNeeded()}.
*/
@Test
public void testIsSaveOnCloseNeeded() {
@@ -82,7 +82,7 @@ public class SaveAndDirtyServiceTest { }
/**
- * Test method for {@link org.eclipse.papyrus.core.lifecycleevents.SaveAndDirtyService#registerIsaveablePart(org.eclipse.ui.ISaveablePart)}.
+ * Test method for {@link org.eclipse.papyrus.infra.core.lifecycleevents.SaveAndDirtyService#registerIsaveablePart(org.eclipse.ui.ISaveablePart)}.
*/
@Test
public void testRegisterIsaveablePart() {
@@ -90,7 +90,7 @@ public class SaveAndDirtyServiceTest { }
/**
- * Test method for {@link org.eclipse.papyrus.core.lifecycleevents.SaveAndDirtyService#removeIsaveablePart(org.eclipse.ui.ISaveablePart)}.
+ * Test method for {@link org.eclipse.papyrus.infra.core.lifecycleevents.SaveAndDirtyService#removeIsaveablePart(org.eclipse.ui.ISaveablePart)}.
*/
@Test
public void testRemoveIsaveablePart() {
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/resource/AbstractModelWithSharedResourceTest.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/infra/core/resource/AbstractModelWithSharedResourceTest.java index bf780ba86a4..b62b8b42eab 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/resource/AbstractModelWithSharedResourceTest.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/infra/core/resource/AbstractModelWithSharedResourceTest.java @@ -1,7 +1,7 @@ /**
*
*/
-package org.eclipse.papyrus.resource;
+package org.eclipse.papyrus.infra.core.resource;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -19,9 +19,9 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EcoreFactory;
-import org.eclipse.papyrus.resource.ModelMultiException;
-import org.eclipse.papyrus.resource.ModelSet;
-import org.eclipse.papyrus.resource.AbstractModelWithSharedResource.ModelKind;
+import org.eclipse.papyrus.infra.core.resource.AbstractModelWithSharedResource.ModelKind;
+import org.eclipse.papyrus.infra.core.resource.ModelMultiException;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -51,7 +51,7 @@ public class AbstractModelWithSharedResourceTest { /**
* Test that the resource is created only once.
- * Test method for {@link org.eclipse.papyrus.resource.AbstractModelWithSharedResource#createModel(org.eclipse.core.runtime.IPath)}.
+ * Test method for {@link org.eclipse.papyrus.infra.core.resource.AbstractModelWithSharedResource#createModel(org.eclipse.core.runtime.IPath)}.
*/
@Test
public void testCreateModel() {
@@ -67,7 +67,7 @@ public class AbstractModelWithSharedResourceTest { modelSet.registerModel(model1);
modelSet.registerModel(model2);
- IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject("org.eclipse.papyrus.core");
+ IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject("org.eclipse.papyrus.infra.core");
IFile model1File = p.getFile("tmp/model1." + model1Key);
@@ -96,7 +96,7 @@ public class AbstractModelWithSharedResourceTest { modelSet.registerModel(model1);
modelSet.registerModel(model2);
- IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject("org.eclipse.papyrus.core");
+ IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject("org.eclipse.papyrus.infra.core");
if(!p.exists())
p.create(new NullProgressMonitor());
p.open(new NullProgressMonitor());
@@ -112,7 +112,7 @@ public class AbstractModelWithSharedResourceTest { }
/**
- * Test method for {@link org.eclipse.papyrus.resource.AbstractModelWithSharedResource#loadModel(org.eclipse.core.runtime.IPath)}.
+ * Test method for {@link org.eclipse.papyrus.infra.core.resource.AbstractModelWithSharedResource#loadModel(org.eclipse.core.runtime.IPath)}.
* @throws CoreException
* @throws IOException
* @throws ModelMultiException
@@ -133,7 +133,7 @@ public class AbstractModelWithSharedResourceTest { modelSet.registerModel(model1);
modelSet.registerModel(model2);
- IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject("org.eclipse.papyrus.core");
+ IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject("org.eclipse.papyrus.infra.core");
IFile model1File = p.getFile("tmp/model1." + model1Key);
@@ -147,7 +147,7 @@ public class AbstractModelWithSharedResourceTest { }
/**
- * Test method for {@link org.eclipse.papyrus.resource.AbstractModelWithSharedResource#saveModel()}.
+ * Test method for {@link org.eclipse.papyrus.infra.core.resource.AbstractModelWithSharedResource#saveModel()}.
* @throws IOException
* @throws CoreException
*/
@@ -163,7 +163,7 @@ public class AbstractModelWithSharedResourceTest { modelSet.registerModel(model1);
modelSet.registerModel(model2);
- IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject("org.eclipse.papyrus.core");
+ IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject("org.eclipse.papyrus.infra.core");
if(!p.exists())
p.create(new NullProgressMonitor());
p.open(new NullProgressMonitor());
@@ -188,7 +188,7 @@ public class AbstractModelWithSharedResourceTest { }
/**
- * Test method for {@link org.eclipse.papyrus.resource.AbstractModelWithSharedResource#getModelRoot()}.
+ * Test method for {@link org.eclipse.papyrus.infra.core.resource.AbstractModelWithSharedResource#getModelRoot()}.
*/
@Test
public void testGetModelRoot() {
@@ -202,7 +202,7 @@ public class AbstractModelWithSharedResourceTest { modelSet.registerModel(model1);
modelSet.registerModel(model2);
- IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject("org.eclipse.papyrus.core");
+ IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject("org.eclipse.papyrus.infra.core");
IFile model1File = p.getFile("tmp/model1." + model1Key);
@@ -221,7 +221,7 @@ public class AbstractModelWithSharedResourceTest { }
/**
- * Test method for {@link org.eclipse.papyrus.resource.AbstractModelWithSharedResource#getModelRoot()}.
+ * Test method for {@link org.eclipse.papyrus.infra.core.resource.AbstractModelWithSharedResource#getModelRoot()}.
*/
@Test
public void testGetModelRoots() {
@@ -235,7 +235,7 @@ public class AbstractModelWithSharedResourceTest { modelSet.registerModel(model1);
modelSet.registerModel(model2);
- IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject("org.eclipse.papyrus.core");
+ IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject("org.eclipse.papyrus.infra.core");
IFile model1File = p.getFile("tmp/model1." + model1Key);
@@ -274,7 +274,7 @@ public class AbstractModelWithSharedResourceTest { }
/**
- * Test method for {@link org.eclipse.papyrus.resource.AbstractModelWithSharedResource#addModelRoot(org.eclipse.emf.ecore.EObject)}.
+ * Test method for {@link org.eclipse.papyrus.infra.core.resource.AbstractModelWithSharedResource#addModelRoot(org.eclipse.emf.ecore.EObject)}.
*/
@Test
public void testAddModelRoot() {
@@ -288,7 +288,7 @@ public class AbstractModelWithSharedResourceTest { modelSet.registerModel(model1);
modelSet.registerModel(model2);
- IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject("org.eclipse.papyrus.core");
+ IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject("org.eclipse.papyrus.infra.core");
IFile model1File = p.getFile("tmp/model1." + model1Key);
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/resource/FakeModel.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/infra/core/resource/FakeModel.java index 2d08383e105..c9b90861d15 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/resource/FakeModel.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/infra/core/resource/FakeModel.java @@ -1,11 +1,9 @@ /**
*
*/
-package org.eclipse.papyrus.resource;
+package org.eclipse.papyrus.infra.core.resource;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.papyrus.resource.AbstractBaseModel;
-import org.eclipse.papyrus.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.resource.AbstractBaseModel;
/**
@@ -21,7 +19,7 @@ public class FakeModel extends AbstractBaseModel { }
/**
- * @see org.eclipse.papyrus.resource.AbstractBaseModel#getIdentifier()
+ * @see org.eclipse.papyrus.infra.core.resource.AbstractBaseModel#getIdentifier()
*
* @return
*/
@@ -32,7 +30,7 @@ public class FakeModel extends AbstractBaseModel { }
/**
- * @see org.eclipse.papyrus.resource.AbstractBaseModel#getModelFileExtension()
+ * @see org.eclipse.papyrus.infra.core.resource.AbstractBaseModel#getModelFileExtension()
*
* @return
*/
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/resource/FakeModelManagerSnippet.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/infra/core/resource/FakeModelManagerSnippet.java index 6c3c582d1dd..fdd2f8ff2f6 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/resource/FakeModelManagerSnippet.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/infra/core/resource/FakeModelManagerSnippet.java @@ -1,10 +1,10 @@ /**
*
*/
-package org.eclipse.papyrus.resource;
+package org.eclipse.papyrus.infra.core.resource;
-import org.eclipse.papyrus.resource.IModelSetSnippet;
-import org.eclipse.papyrus.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.resource.IModelSetSnippet;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
/**
@@ -43,7 +43,7 @@ public class FakeModelManagerSnippet implements IModelSetSnippet { }
/**
- * @see org.eclipse.papyrus.resource.IModelSetSnippet#start(org.eclipse.papyrus.resource.ModelSet)
+ * @see org.eclipse.papyrus.infra.core.resource.IModelSetSnippet#start(org.eclipse.papyrus.infra.core.resource.ModelSet)
*
* @param modelsManager
*/
@@ -52,7 +52,7 @@ public class FakeModelManagerSnippet implements IModelSetSnippet { }
/**
- * @see org.eclipse.papyrus.resource.IModelSetSnippet#dispose(org.eclipse.papyrus.resource.ModelSet)
+ * @see org.eclipse.papyrus.infra.core.resource.IModelSetSnippet#dispose(org.eclipse.papyrus.infra.core.resource.ModelSet)
*
* @param modelsManager
*/
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/resource/FakeModelWithSharedResource.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/infra/core/resource/FakeModelWithSharedResource.java index 07ffcf4722a..55d5c267d8b 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/resource/FakeModelWithSharedResource.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/infra/core/resource/FakeModelWithSharedResource.java @@ -1,11 +1,12 @@ /**
*
*/
-package org.eclipse.papyrus.resource;
+package org.eclipse.papyrus.infra.core.resource;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.papyrus.resource.AbstractModelWithSharedResource;
+import org.eclipse.papyrus.infra.core.resource.AbstractModelWithSharedResource;
+import org.eclipse.papyrus.infra.core.resource.AbstractModelWithSharedResource.ModelKind;
/**
@@ -59,7 +60,7 @@ public class FakeModelWithSharedResource<T extends EObject> extends AbstractMode /**
*
- * @see org.eclipse.papyrus.resource.AbstractModelWithSharedResource#isModelRoot(org.eclipse.emf.ecore.EObject)
+ * @see org.eclipse.papyrus.infra.core.resource.AbstractModelWithSharedResource#isModelRoot(org.eclipse.emf.ecore.EObject)
*
* @param object
* @return
@@ -71,7 +72,7 @@ public class FakeModelWithSharedResource<T extends EObject> extends AbstractMode /**
*
- * @see org.eclipse.papyrus.resource.AbstractBaseModel#getIdentifier()
+ * @see org.eclipse.papyrus.infra.core.resource.AbstractBaseModel#getIdentifier()
*
* @return
*/
@@ -82,7 +83,7 @@ public class FakeModelWithSharedResource<T extends EObject> extends AbstractMode /**
*
- * @see org.eclipse.papyrus.resource.AbstractBaseModel#getModelFileExtension()
+ * @see org.eclipse.papyrus.infra.core.resource.AbstractBaseModel#getModelFileExtension()
*
* @return
*/
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/resource/ModelSetTest.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/infra/core/resource/ModelSetTest.java index 03e8476c774..c770f8c3a99 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/resource/ModelSetTest.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/infra/core/resource/ModelSetTest.java @@ -1,4 +1,4 @@ -package org.eclipse.papyrus.resource;
+package org.eclipse.papyrus.infra.core.resource;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -18,10 +18,10 @@ import org.eclipse.emf.ecore.EcoreFactory; import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.papyrus.resource.ModelException;
-import org.eclipse.papyrus.resource.ModelIdentifiers;
-import org.eclipse.papyrus.resource.ModelMultiException;
-import org.eclipse.papyrus.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.resource.ModelException;
+import org.eclipse.papyrus.infra.core.resource.ModelIdentifiers;
+import org.eclipse.papyrus.infra.core.resource.ModelMultiException;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -38,7 +38,7 @@ public class ModelSetTest { /**
* Name of the plugin that is created.
*/
- final protected String PLUGIN_PROJECT_NAME = "org.eclipse.papyrus.core";
+ final protected String PLUGIN_PROJECT_NAME = "org.eclipse.papyrus.infra.core";
/**
*
@@ -57,7 +57,7 @@ public class ModelSetTest { }
/**
- * Test method for {@link org.eclipse.papyrus.resource.ModelSet.registerModel(IModel)} .
+ * Test method for {@link org.eclipse.papyrus.infra.core.resource.ModelSet.registerModel(IModel)} .
*/
@Test
public void testRegisterModel() {
@@ -72,7 +72,7 @@ public class ModelSetTest { }
/**
- * Test method for {@link org.eclipse.papyrus.resource.ModelSet#getModel(String)} .
+ * Test method for {@link org.eclipse.papyrus.infra.core.resource.ModelSet#getModel(String)} .
*/
@Test
public void testGetModel() {
@@ -89,7 +89,7 @@ public class ModelSetTest { }
/**
- * Test method for {@link org.eclipse.papyrus.resource.ModelSet#getTransactionalEditingDomain()} .
+ * Test method for {@link org.eclipse.papyrus.infra.core.resource.ModelSet#getTransactionalEditingDomain()} .
*/
@Test
public void testGetTransactionalEditingDomain() {
@@ -99,7 +99,7 @@ public class ModelSetTest { }
/**
- * Test method for {@link org.eclipse.papyrus.resource.ModelSet#createsModels(IFile)} .
+ * Test method for {@link org.eclipse.papyrus.infra.core.resource.ModelSet#createsModels(IFile)} .
*/
@Test
public void testCreatesModels() throws IOException, CoreException {
@@ -114,7 +114,7 @@ public class ModelSetTest { mngr.registerModel(model1);
mngr.registerModel(model2);
- IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject("org.eclipse.papyrus.core");
+ IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject("org.eclipse.papyrus.infra.core");
IFile model1File = p.getFile("tmp/model1." + model1Key);
@@ -126,7 +126,7 @@ public class ModelSetTest { }
/**
- * Test method for {@link org.eclipse.papyrus.resource.ModelSet#loadModels(IFile)} .
+ * Test method for {@link org.eclipse.papyrus.infra.core.resource.ModelSet#loadModels(IFile)} .
*
* @throws ModelMultiException
*/
@@ -148,7 +148,7 @@ public class ModelSetTest { mngr.registerModel(model1);
mngr.registerModel(model2);
- IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject("org.eclipse.papyrus.core");
+ IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject("org.eclipse.papyrus.infra.core");
IFile model1File = p.getFile("tmp/model1." + model1Key);
IFile model2File = p.getFile("tmp/model1." + model2Key);
@@ -164,7 +164,7 @@ public class ModelSetTest { }
/**
- * Test method for {@link org.eclipse.papyrus.resource.ModelSet#save(IProgressMonitor)} .
+ * Test method for {@link org.eclipse.papyrus.infra.core.resource.ModelSet#save(IProgressMonitor)} .
*/
@Test
public void testSave() throws CoreException, IOException {
@@ -179,7 +179,7 @@ public class ModelSetTest { mngr.registerModel(model1);
mngr.registerModel(model2);
- IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject("org.eclipse.papyrus.core");
+ IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject("org.eclipse.papyrus.infra.core");
if(!p.exists())
p.create(new NullProgressMonitor());
p.open(new NullProgressMonitor());
@@ -244,7 +244,7 @@ public class ModelSetTest { }
/**
- * Test method for {@link org.eclipse.papyrus.resource.ModelSet#saveAs(IPath)} .
+ * Test method for {@link org.eclipse.papyrus.infra.core.resource.ModelSet#saveAs(IPath)} .
*/
@Test
public void testSaveAs() throws CoreException, IOException {
@@ -259,7 +259,7 @@ public class ModelSetTest { mngr.registerModel(model1);
mngr.registerModel(model2);
- IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject("org.eclipse.papyrus.core");
+ IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject("org.eclipse.papyrus.infra.core");
if(!p.exists())
p.create(new NullProgressMonitor());
p.open(new NullProgressMonitor());
@@ -287,7 +287,7 @@ public class ModelSetTest { }
/**
- * Test method for {@link org.eclipse.papyrus.resource.ModelSet#unload()} .
+ * Test method for {@link org.eclipse.papyrus.infra.core.resource.ModelSet#unload()} .
*/
@Test
public void testUnload() {
@@ -302,7 +302,7 @@ public class ModelSetTest { mngr.registerModel(model1);
mngr.registerModel(model2);
- IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject("org.eclipse.papyrus.core");
+ IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject("org.eclipse.papyrus.infra.core");
IFile model1File = p.getFile("tmp/model1." + model1Key);
@@ -315,7 +315,7 @@ public class ModelSetTest { }
/**
- * Test method for {@link org.eclipse.papyrus.resource.ModelSet#addModelSetSnippet(IModelManagerSnippet)} .
+ * Test method for {@link org.eclipse.papyrus.infra.core.resource.ModelSet#addModelSetSnippet(IModelManagerSnippet)} .
*/
@Test
public void testAddModelSetSnippet() {
@@ -327,7 +327,7 @@ public class ModelSetTest { mngr.addModelSetSnippet(new FakeModelManagerSnippet(trace, "snippet2"));
// Do create
- IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject("org.eclipse.papyrus.core");
+ IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject("org.eclipse.papyrus.infra.core");
IFile model1File = p.getFile("tmp/model1.ecore");
mngr.createsModels(model1File);
@@ -350,7 +350,7 @@ public class ModelSetTest { mngr.addModelSetSnippet(new FakeModelManagerSnippet(trace, "snippet2"));
// Do create
- IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject("org.eclipse.papyrus.core");
+ IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject("org.eclipse.papyrus.infra.core");
IFile model1File = p.getFile("tmp/model1.ecore");
mngr.createsModels(model1File);
@@ -386,7 +386,7 @@ public class ModelSetTest { mngr.addModelSetSnippet(new FakeModelManagerSnippet(trace, "snippet2"));
// Do create
- IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject("org.eclipse.papyrus.core");
+ IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject("org.eclipse.papyrus.infra.core");
IFile model1File = p.getFile("tmp/model1.ecore");
mngr.loadModels(model1File);
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/resource/TestTrace.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/infra/core/resource/TestTrace.java index 7975598d9bd..5703afaa9d1 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/resource/TestTrace.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/infra/core/resource/TestTrace.java @@ -1,7 +1,7 @@ /**
*
*/
-package org.eclipse.papyrus.resource;
+package org.eclipse.papyrus.infra.core.resource;
import java.util.ArrayList;
import java.util.List;
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/services/ComposedServiceTest.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/infra/core/services/ComposedServiceTest.java index 5a331e62383..8d969b6d789 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/services/ComposedServiceTest.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/infra/core/services/ComposedServiceTest.java @@ -1,13 +1,14 @@ -package org.eclipse.papyrus.core.services;
+package org.eclipse.papyrus.infra.core.services;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
import java.util.List;
-import org.eclipse.papyrus.core.services.ServiceDescriptor;
-import org.eclipse.papyrus.core.services.ServiceException;
-import org.eclipse.papyrus.core.services.ServiceStartKind;
-import org.eclipse.papyrus.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.core.services.ServiceDescriptor;
+import org.eclipse.papyrus.infra.core.services.ServiceStartKind;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/services/FakeComposedService.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/infra/core/services/FakeComposedService.java index af3b9953870..406df72a75c 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/services/FakeComposedService.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/infra/core/services/FakeComposedService.java @@ -1,11 +1,10 @@ /**
*
*/
-package org.eclipse.papyrus.core.services;
+package org.eclipse.papyrus.infra.core.services;
-import org.eclipse.papyrus.core.services.ComposedService;
-import org.eclipse.papyrus.core.services.ServiceException;
-import org.eclipse.papyrus.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.core.services.ComposedService;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/services/FakeComposedServicePart.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/infra/core/services/FakeComposedServicePart.java index 2bef4af6870..87619847f31 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/services/FakeComposedServicePart.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/infra/core/services/FakeComposedServicePart.java @@ -1,9 +1,9 @@ /**
*
*/
-package org.eclipse.papyrus.core.services;
+package org.eclipse.papyrus.infra.core.services;
-import org.eclipse.papyrus.core.services.ComposedServicePart;
+import org.eclipse.papyrus.infra.core.services.ComposedServicePart;
/**
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/services/FakeComposedServicePartA.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/infra/core/services/FakeComposedServicePartA.java index b079ae71848..9a7f28f1589 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/services/FakeComposedServicePartA.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/infra/core/services/FakeComposedServicePartA.java @@ -1,7 +1,7 @@ /**
*
*/
-package org.eclipse.papyrus.core.services;
+package org.eclipse.papyrus.infra.core.services;
/**
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/services/FakeComposedServicePartB.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/infra/core/services/FakeComposedServicePartB.java index a22bfbb3ab6..18f7e61102e 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/services/FakeComposedServicePartB.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/infra/core/services/FakeComposedServicePartB.java @@ -1,7 +1,7 @@ /**
*
*/
-package org.eclipse.papyrus.core.services;
+package org.eclipse.papyrus.infra.core.services;
/**
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/services/FakeService.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/infra/core/services/FakeService.java index 85df0d40751..ff5fb013c78 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/services/FakeService.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/infra/core/services/FakeService.java @@ -1,7 +1,7 @@ -package org.eclipse.papyrus.core.services;
+package org.eclipse.papyrus.infra.core.services;
-import org.eclipse.papyrus.core.services.IService;
-import org.eclipse.papyrus.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.core.services.IService;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
/**
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/services/FakeServiceFactory.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/infra/core/services/FakeServiceFactory.java index ab4dc4865cd..33c3d6a955e 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/services/FakeServiceFactory.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/infra/core/services/FakeServiceFactory.java @@ -1,6 +1,6 @@ -package org.eclipse.papyrus.core.services;
+package org.eclipse.papyrus.infra.core.services;
-import org.eclipse.papyrus.core.services.IServiceFactory;
+import org.eclipse.papyrus.infra.core.services.IServiceFactory;
/**
@@ -41,7 +41,7 @@ public class FakeServiceFactory extends FakeService implements IServiceFactory { /**
* Create the service
- * @see org.eclipse.papyrus.core.services.IServiceFactory#createServiceInstance()
+ * @see org.eclipse.papyrus.infra.core.services.IServiceFactory#createServiceInstance()
*
* @return
*/
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/services/FakeWithRequiredServiceFactory.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/infra/core/services/FakeWithRequiredServiceFactory.java index b68491b40ad..7aac2aa47d9 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/services/FakeWithRequiredServiceFactory.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/infra/core/services/FakeWithRequiredServiceFactory.java @@ -1,8 +1,7 @@ -package org.eclipse.papyrus.core.services;
+package org.eclipse.papyrus.infra.core.services;
-import org.eclipse.papyrus.core.services.IServiceFactory;
-import org.eclipse.papyrus.core.services.ServiceException;
-import org.eclipse.papyrus.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.core.services.IServiceFactory;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
/**
@@ -37,7 +36,7 @@ public class FakeWithRequiredServiceFactory extends FakeServiceFactory implement /**
*
- * @see org.eclipse.papyrus.core.services.FakeService#init(org.eclipse.papyrus.core.services.ServicesRegistry)
+ * @see org.eclipse.papyrus.infra.core.services.FakeService#init(org.eclipse.papyrus.infra.core.services.ServicesRegistry)
*
* @param servicesRegistry
*/
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/services/ServiceA.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/infra/core/services/ServiceA.java index 5626b492453..13855e71761 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/services/ServiceA.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/infra/core/services/ServiceA.java @@ -1,10 +1,10 @@ -package org.eclipse.papyrus.core.services;
+package org.eclipse.papyrus.infra.core.services;
import java.util.ArrayList;
import java.util.List;
-import org.eclipse.papyrus.core.services.IService;
-import org.eclipse.papyrus.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.core.services.IService;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
public class ServiceA implements IService {
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/infra/core/services/ServiceA10.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/infra/core/services/ServiceA10.java new file mode 100644 index 00000000000..b8520e27ea7 --- /dev/null +++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/infra/core/services/ServiceA10.java @@ -0,0 +1,6 @@ +package org.eclipse.papyrus.infra.core.services;
+
+
+public class ServiceA10 extends ServiceA {
+
+}
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/infra/core/services/ServiceB.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/infra/core/services/ServiceB.java new file mode 100644 index 00000000000..7a675ef39e2 --- /dev/null +++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/infra/core/services/ServiceB.java @@ -0,0 +1,6 @@ +package org.eclipse.papyrus.infra.core.services;
+
+
+public class ServiceB extends ServiceA {
+
+}
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/infra/core/services/ServiceC.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/infra/core/services/ServiceC.java new file mode 100644 index 00000000000..926ab731aff --- /dev/null +++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/infra/core/services/ServiceC.java @@ -0,0 +1,6 @@ +package org.eclipse.papyrus.infra.core.services;
+
+
+public class ServiceC extends ServiceA {
+
+}
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/infra/core/services/ServicePojoA.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/infra/core/services/ServicePojoA.java new file mode 100644 index 00000000000..111d15ca791 --- /dev/null +++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/infra/core/services/ServicePojoA.java @@ -0,0 +1,6 @@ +package org.eclipse.papyrus.infra.core.services;
+
+
+public class ServicePojoA extends ServiceA {
+
+}
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/services/ServicesRegistryTest.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/infra/core/services/ServicesRegistryTest.java index 64c42d347c4..0eefb8e16ee 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/services/ServicesRegistryTest.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/infra/core/services/ServicesRegistryTest.java @@ -1,23 +1,22 @@ /**
*
*/
-package org.eclipse.papyrus.core.services;
+package org.eclipse.papyrus.infra.core.services;
import java.util.Arrays;
import java.util.List;
import junit.framework.TestCase;
-import org.eclipse.papyrus.core.services.IService;
-import org.eclipse.papyrus.core.services.ServiceDescriptor;
-import org.eclipse.papyrus.core.services.ServiceException;
-import org.eclipse.papyrus.core.services.ServiceMultiException;
-import org.eclipse.papyrus.core.services.ServiceNotFoundException;
-import org.eclipse.papyrus.core.services.ServiceStartKind;
-import org.eclipse.papyrus.core.services.ServiceState;
-import org.eclipse.papyrus.core.services.ServicesRegistry;
-import org.eclipse.papyrus.core.services.FakeServiceFactory.FakeCreatedService;
-import org.eclipse.papyrus.core.services.ServiceA.TraceKind;
+import org.eclipse.papyrus.infra.core.services.IService;
+import org.eclipse.papyrus.infra.core.services.ServiceDescriptor;
+import org.eclipse.papyrus.infra.core.services.FakeServiceFactory.FakeCreatedService;
+import org.eclipse.papyrus.infra.core.services.ServiceA.TraceKind;
+import org.eclipse.papyrus.infra.core.services.ServiceDescriptor.ServiceTypeKind;
+import org.eclipse.papyrus.infra.core.services.ServiceMultiException;
+import org.eclipse.papyrus.infra.core.services.ServiceStartKind;
+import org.eclipse.papyrus.infra.core.services.ServiceState;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
/**
@@ -57,7 +56,7 @@ public class ServicesRegistryTest extends TestCase { }
/**
- * Test method for {@link org.eclipse.papyrus.core.services.ServicesRegistry#add(org.eclipse.papyrus.core.services.ServiceDescriptor)} .
+ * Test method for {@link org.eclipse.papyrus.infra.core.services.ServicesRegistry#add(org.eclipse.papyrus.infra.core.services.ServiceDescriptor)} .
* @throws ServiceMultiException
*/
public void testAdd() throws ServiceMultiException {
@@ -95,7 +94,7 @@ public class ServicesRegistryTest extends TestCase { }
/**
- * Test method for {@link org.eclipse.papyrus.core.services.ServicesRegistry#getService(java.lang.Object)}.
+ * Test method for {@link org.eclipse.papyrus.infra.core.services.ServicesRegistry#getService(java.lang.Object)}.
*
* @throws ServiceException
*/
@@ -136,7 +135,7 @@ public class ServicesRegistryTest extends TestCase { }
/**
- * Test method for {@link org.eclipse.papyrus.core.services.ServicesRegistry#getService(java.lang.Object)}.
+ * Test method for {@link org.eclipse.papyrus.infra.core.services.ServicesRegistry#getService(java.lang.Object)}.
*
* @throws ServiceException
*/
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/services/TestTrace.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/infra/core/services/TestTrace.java index 66feb56a032..ab960a90f89 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/services/TestTrace.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/infra/core/services/TestTrace.java @@ -1,7 +1,7 @@ /**
*
*/
-package org.eclipse.papyrus.core.services;
+package org.eclipse.papyrus.infra.core.services;
import java.util.ArrayList;
import java.util.List;
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/tests/AllTests.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/infra/core/tests/AllTests.java index 3b09fe80ae6..6cc97b2d108 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/tests/AllTests.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/infra/core/tests/AllTests.java @@ -9,18 +9,18 @@ * Contributors:
* Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.core.tests;
+package org.eclipse.papyrus.infra.core.tests;
-import org.eclipse.papyrus.core.lifecycleevents.LifeCycleEventsProviderTest;
-import org.eclipse.papyrus.core.services.ComposedServiceTest;
-import org.eclipse.papyrus.core.services.ServicesRegistryTest;
-import org.eclipse.papyrus.core.wizard.TestCreateModelWizard;
-import org.eclipse.papyrus.core.wizard.TestCreateSysMLModelWizard;
-import org.eclipse.papyrus.core.wizard.TestInitModelWizard;
-import org.eclipse.papyrus.core.wizard.TestNewProjectWizard;
-import org.eclipse.papyrus.core.wizard.TestNewSysMLProjectWizard;
-import org.eclipse.papyrus.resource.AbstractModelWithSharedResourceTest;
-import org.eclipse.papyrus.resource.ModelSetTest;
+import org.eclipse.papyrus.infra.core.lifecycleevents.LifeCycleEventsProviderTest;
+import org.eclipse.papyrus.infra.core.resource.AbstractModelWithSharedResourceTest;
+import org.eclipse.papyrus.infra.core.resource.ModelSetTest;
+import org.eclipse.papyrus.infra.core.services.ComposedServiceTest;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistryTest;
+import org.eclipse.papyrus.infra.core.wizard.TestCreateModelWizard;
+import org.eclipse.papyrus.infra.core.wizard.TestCreateSysMLModelWizard;
+import org.eclipse.papyrus.infra.core.wizard.TestInitModelWizard;
+import org.eclipse.papyrus.infra.core.wizard.TestNewProjectWizard;
+import org.eclipse.papyrus.infra.core.wizard.TestNewSysMLProjectWizard;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
import org.junit.runners.Suite.SuiteClasses;
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/wizard/TestCreateModelWizard.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/infra/core/wizard/TestCreateModelWizard.java index a3b4c342eed..a1258a9ebec 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/wizard/TestCreateModelWizard.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/infra/core/wizard/TestCreateModelWizard.java @@ -1,10 +1,10 @@ -package org.eclipse.papyrus.core.wizard; +package org.eclipse.papyrus.infra.core.wizard; -import org.eclipse.papyrus.diagram.profile.CreateProfileModelCommand; -import org.eclipse.papyrus.wizards.InitModelWizard; -import org.eclipse.papyrus.wizards.pages.NewModelFilePage; -import org.eclipse.papyrus.wizards.pages.SelectDiagramCategoryPage; -import org.eclipse.papyrus.wizards.pages.SelectDiagramKindPage; +import org.eclipse.papyrus.uml.diagram.profile.CreateProfileModelCommand; +import org.eclipse.papyrus.uml.diagram.wizards.InitModelWizard; +import org.eclipse.papyrus.uml.diagram.wizards.pages.NewModelFilePage; +import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectDiagramCategoryPage; +import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectDiagramKindPage; import org.eclipse.ui.IWorkbenchWizard; diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/wizard/TestCreateSysMLModelWizard.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/infra/core/wizard/TestCreateSysMLModelWizard.java index 7cd4b80e86f..6e725ae60bb 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/wizard/TestCreateSysMLModelWizard.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/infra/core/wizard/TestCreateSysMLModelWizard.java @@ -1,10 +1,9 @@ -package org.eclipse.papyrus.core.wizard; +package org.eclipse.papyrus.infra.core.wizard; import org.eclipse.papyrus.sysml.diagram.common.commands.CreateSysMLModelCommand; import org.eclipse.papyrus.sysml.diagram.ui.NewSysMLModelWizard; -import org.eclipse.papyrus.wizards.InitModelWizard; -import org.eclipse.papyrus.wizards.pages.NewModelFilePage; -import org.eclipse.papyrus.wizards.pages.SelectDiagramKindPage; +import org.eclipse.papyrus.uml.diagram.wizards.pages.NewModelFilePage; +import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectDiagramKindPage; import org.eclipse.ui.IWorkbenchWizard; diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/wizard/TestInitModelWizard.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/infra/core/wizard/TestInitModelWizard.java index 4af13873dad..a23fdd8cef5 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/wizard/TestInitModelWizard.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/infra/core/wizard/TestInitModelWizard.java @@ -1,14 +1,12 @@ -package org.eclipse.papyrus.core.wizard; +package org.eclipse.papyrus.infra.core.wizard; import org.eclipse.core.resources.IFile; -import org.eclipse.jface.wizard.IWizardPage; -import org.eclipse.papyrus.diagram.profile.CreateProfileModelCommand; -import org.eclipse.papyrus.sysml.diagram.common.commands.CreateSysMLModelCommand; -import org.eclipse.papyrus.wizards.InitModelWizard; -import org.eclipse.papyrus.wizards.pages.NewModelFilePage; -import org.eclipse.papyrus.wizards.pages.SelectDiagramCategoryPage; -import org.eclipse.papyrus.wizards.pages.SelectDiagramKindPage; -import org.eclipse.papyrus.wizards.pages.SelectRootElementPage; +import org.eclipse.papyrus.uml.diagram.profile.CreateProfileModelCommand; +import org.eclipse.papyrus.uml.diagram.wizards.InitModelWizard; +import org.eclipse.papyrus.uml.diagram.wizards.pages.NewModelFilePage; +import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectDiagramCategoryPage; +import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectDiagramKindPage; +import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectRootElementPage; import org.eclipse.ui.IWorkbenchWizard; diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/wizard/TestNewModelWizardBase.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/infra/core/wizard/TestNewModelWizardBase.java index c71c8f1e2d7..1c7e5e3bb27 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/wizard/TestNewModelWizardBase.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/infra/core/wizard/TestNewModelWizardBase.java @@ -1,4 +1,4 @@ -package org.eclipse.papyrus.core.wizard; +package org.eclipse.papyrus.infra.core.wizard; import junit.framework.TestCase; @@ -8,23 +8,23 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.wizard.IWizardPage; import org.eclipse.jface.wizard.WizardDialog; -import org.eclipse.papyrus.wizards.Activator; +import org.eclipse.papyrus.uml.diagram.wizards.Activator; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchWizard; public abstract class TestNewModelWizardBase extends TestCase { - - protected static final IStructuredSelection EMPTY_SELECTION = new StructuredSelection(); - + + protected static final IStructuredSelection EMPTY_SELECTION = new StructuredSelection(); + protected abstract IWorkbenchWizard createWizard(); @Override protected void setUp() throws Exception { super.setUp(); } - + protected IStructuredSelection getSelection() { return EMPTY_SELECTION; } @@ -32,26 +32,26 @@ public abstract class TestNewModelWizardBase extends TestCase { protected IWorkbenchWizard initWizardDialog() { IWorkbenchWizard wizard = createWizard(); initWizardDialog(wizard); - return wizard; + return wizard; } - + protected IWorkbenchWizard initWizardDialog(IWorkbenchWizard wizard) { wizard.init(getWorkbench(), getSelection()); WizardDialog dialog= new WizardDialog(getShell(), wizard); PixelConverter converter= new PixelConverter(JFaceResources.getDialogFont()); dialog.setMinimumPageSize(converter.convertWidthInCharsToPixels(70), converter.convertHeightInCharsToPixels(20)); dialog.create(); - return wizard; + return wizard; } - + protected Shell getShell() { return getWorkbench().getActiveWorkbenchWindow().getShell(); } - + protected IWorkbench getWorkbench() { return Activator.getDefault().getWorkbench(); } - + protected void testOrderOfPages(IWorkbenchWizard wizard, Class[] expectedPages) { IWizardPage next = wizard.getPages()[0]; for (int i = 0; i < expectedPages.length; i++) { @@ -64,7 +64,7 @@ public abstract class TestNewModelWizardBase extends TestCase { } String noMorePagesExpectedMessageFormat = "page %s is not expected"; assertNull(String.format(noMorePagesExpectedMessageFormat, next), next); - + } protected void testPageInstanceOf(IWizardPage next, Class expectedClass, int index) { diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/wizard/TestNewProjectWizard.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/infra/core/wizard/TestNewProjectWizard.java index 903d192ab51..ef0437e1bf0 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/wizard/TestNewProjectWizard.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/infra/core/wizard/TestNewProjectWizard.java @@ -1,8 +1,8 @@ -package org.eclipse.papyrus.core.wizard; +package org.eclipse.papyrus.infra.core.wizard; -import org.eclipse.papyrus.wizards.NewPapyrusProjectWizard; -import org.eclipse.papyrus.wizards.pages.SelectDiagramCategoryPage; -import org.eclipse.papyrus.wizards.pages.SelectDiagramKindPage; +import org.eclipse.papyrus.uml.diagram.wizards.NewPapyrusProjectWizard; +import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectDiagramCategoryPage; +import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectDiagramKindPage; import org.eclipse.ui.IWorkbenchWizard; import org.eclipse.ui.dialogs.WizardNewProjectCreationPage; diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/wizard/TestNewSysMLProjectWizard.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/infra/core/wizard/TestNewSysMLProjectWizard.java index e21cbc49dcb..099d62e0db5 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/wizard/TestNewSysMLProjectWizard.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/infra/core/wizard/TestNewSysMLProjectWizard.java @@ -1,8 +1,8 @@ -package org.eclipse.papyrus.core.wizard; +package org.eclipse.papyrus.infra.core.wizard; import org.eclipse.papyrus.sysml.diagram.common.commands.CreateSysMLModelCommand; import org.eclipse.papyrus.sysml.diagram.ui.NewSysMLProjectWizard; -import org.eclipse.papyrus.wizards.pages.SelectDiagramKindPage; +import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectDiagramKindPage; import org.eclipse.ui.IWorkbenchWizard; import org.eclipse.ui.dialogs.WizardNewProjectCreationPage; |