Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests')
-rw-r--r--tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/.project2
-rw-r--r--tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/META-INF/MANIFEST.MF4
-rw-r--r--tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/OSGI-INF/l10n/bundle.properties4
-rw-r--r--tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/org.eclipse.papyrus.sasheditor.di.tests.launch4
-rw-r--r--tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/di/DiSashModelMngrTest.java (renamed from tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/test/org/eclipse/papyrus/sasheditor/contentprovider/di/DiSashModelMngrTest.java)20
-rw-r--r--tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/di/FakeModelFactory.java (renamed from tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/test/org/eclipse/papyrus/sasheditor/contentprovider/di/FakeModelFactory.java)7
-rw-r--r--tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/di/internal/ContentChangeListener.java (renamed from tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/test/org/eclipse/papyrus/sasheditor/contentprovider/di/internal/ContentChangeListener.java)4
-rw-r--r--tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/di/internal/DiContentProviderTest.java (renamed from tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/test/org/eclipse/papyrus/sasheditor/contentprovider/di/internal/DiContentProviderTest.java)36
-rw-r--r--tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/di/internal/FakePageModelFactory.java (renamed from tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/test/org/eclipse/papyrus/sasheditor/contentprovider/di/internal/FakePageModelFactory.java)8
-rw-r--r--tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/di/internal/PageMngrImplTest.java (renamed from tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/test/org/eclipse/papyrus/sasheditor/contentprovider/di/internal/PageMngrImplTest.java)27
-rw-r--r--tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/tests/AllTests.java (renamed from tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/test/org/eclipse/papyrus/sasheditor/di/tests/AllTests.java)12
11 files changed, 71 insertions, 57 deletions
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/.project b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/.project
index 2486b00d8e0..65b43a58362 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/.project
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.papyrus.sasheditor.di.tests</name>
+ <name>org.eclipse.papyrus.infra.core.sasheditor.di.tests</name>
<comment></comment>
<projects>
</projects>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/META-INF/MANIFEST.MF
index abaf6757c56..56b947221ad 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/META-INF/MANIFEST.MF
@@ -1,9 +1,9 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.eclipse.papyrus.sasheditor.di.tests
+Bundle-SymbolicName: org.eclipse.papyrus.infra.core.sasheditor.di.tests
Bundle-Version: 0.9.0.qualifier
Bundle-Vendor: %Bundle-Vendor
-Fragment-Host: org.eclipse.papyrus.sasheditor.di;bundle-version="0.8.0"
+Fragment-Host: org.eclipse.papyrus.infra.core.sasheditor.di;bundle-version="0.9.0"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.junit;bundle-version="4.8.1"
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/OSGI-INF/l10n/bundle.properties b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/OSGI-INF/l10n/bundle.properties
index a4018e5c560..121355228de 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/OSGI-INF/l10n/bundle.properties
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/OSGI-INF/l10n/bundle.properties
@@ -1,3 +1,3 @@
-#Properties file for org.eclipse.papyrus.sasheditor.di.tests
+#Properties file for org.eclipse.papyrus.infra.core.sasheditor.di.tests
Bundle-Vendor = Eclipse Modeling Project
-Bundle-Name = Test fragment for org.eclipse.papyrus.sasheditor.di plugin (Incubation) \ No newline at end of file
+Bundle-Name = Test fragment for org.eclipse.papyrus.infra.core.sasheditor.di plugin (Incubation) \ No newline at end of file
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/org.eclipse.papyrus.sasheditor.di.tests.launch b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/org.eclipse.papyrus.sasheditor.di.tests.launch
index e99ec0950a1..abe0b8ec1ee 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/org.eclipse.papyrus.sasheditor.di.tests.launch
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/org.eclipse.papyrus.sasheditor.di.tests.launch
@@ -14,7 +14,7 @@
<booleanAttribute key="includeOptional" value="true"/>
<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.papyrus.sasheditor.di.tests/test/org/eclipse/papyrus/sasheditor/di/tests/AllTests.java"/>
+<listEntry value="/org.eclipse.papyrus.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/tests/AllTests.java"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="1"/>
@@ -24,7 +24,7 @@
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.sasheditor.di.tests.AllTests"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.infra.core.sasheditor.di.tests.AllTests"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.sasheditor.di.tests"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/test/org/eclipse/papyrus/sasheditor/contentprovider/di/DiSashModelMngrTest.java b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/di/DiSashModelMngrTest.java
index ed0da3a5d58..b4e7e232560 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/test/org/eclipse/papyrus/sasheditor/contentprovider/di/DiSashModelMngrTest.java
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/di/DiSashModelMngrTest.java
@@ -12,7 +12,7 @@
*
*****************************************************************************/
-package org.eclipse.papyrus.sasheditor.contentprovider.di;
+package org.eclipse.papyrus.infra.core.sasheditor.contentprovider.di;
import java.io.File;
@@ -23,8 +23,10 @@ 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.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
-import org.eclipse.papyrus.sashwindows.di.SashWindowsMngr;
-import org.eclipse.papyrus.sashwindows.di.util.DiUtils;
+import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.DiSashModelMngr;
+import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.IPageModelFactory;
+import org.eclipse.papyrus.infra.core.sashwindows.di.SashWindowsMngr;
+import org.eclipse.papyrus.infra.core.sashwindows.di.util.DiUtils;
/**
@@ -49,6 +51,7 @@ public class DiSashModelMngrTest extends TestCase {
*
* @throws java.lang.Exception
*/
+ @Override
protected void setUp() throws Exception {
super.setUp();
fakeModelFactory = new FakeModelFactory();
@@ -59,6 +62,7 @@ public class DiSashModelMngrTest extends TestCase {
*
* @throws java.lang.Exception
*/
+ @Override
protected void tearDown() throws Exception {
super.tearDown();
}
@@ -80,7 +84,7 @@ public class DiSashModelMngrTest extends TestCase {
/**
* Test method for
- * {@link org.eclipse.papyrus.sasheditor.contentprovider.di.DiSashModelMngr#DiSashModelMngr(org.eclipse.papyrus.sasheditor.contentprovider.di.IPageModelFactory)}
+ * {@link org.eclipse.papyrus.infra.core.sasheditor.contentprovider.di.DiSashModelMngr#DiSashModelMngr(org.eclipse.papyrus.infra.core.sasheditor.contentprovider.di.IPageModelFactory)}
* .
*/
public void testDiSashModelMngrIPageModelFactory() {
@@ -96,7 +100,7 @@ public class DiSashModelMngrTest extends TestCase {
/**
* Test method for
- * {@link org.eclipse.papyrus.sasheditor.contentprovider.di.DiSashModelMngr#DiSashModelMngr(org.eclipse.papyrus.sasheditor.contentprovider.di.IPageModelFactory, org.eclipse.emf.ecore.resource.Resource)}
+ * {@link org.eclipse.papyrus.infra.core.sasheditor.contentprovider.di.DiSashModelMngr#DiSashModelMngr(org.eclipse.papyrus.infra.core.sasheditor.contentprovider.di.IPageModelFactory, org.eclipse.emf.ecore.resource.Resource)}
* .
*/
public void testDiSashModelMngrIPageModelFactoryResource() {
@@ -118,7 +122,7 @@ public class DiSashModelMngrTest extends TestCase {
/**
* Test method for
- * {@link org.eclipse.papyrus.sasheditor.contentprovider.di.DiSashModelMngr#DiSashModelMngr(org.eclipse.papyrus.sasheditor.contentprovider.di.IPageModelFactory, org.eclipse.papyrus.sashwindows.di.DiSashModel)}
+ * {@link org.eclipse.papyrus.infra.core.sasheditor.contentprovider.di.DiSashModelMngr#DiSashModelMngr(org.eclipse.papyrus.infra.core.sasheditor.contentprovider.di.IPageModelFactory, org.eclipse.papyrus.sashwindows.di.DiSashModel)}
* .
*/
public void testDiSashModelMngrIPageModelFactoryDiSashModel() {
@@ -134,7 +138,7 @@ public class DiSashModelMngrTest extends TestCase {
}
/**
- * Test method for {@link org.eclipse.papyrus.sasheditor.contentprovider.di.DiSashModelMngr#getIPageMngr()}.
+ * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.contentprovider.di.DiSashModelMngr#getIPageMngr()}.
*/
public void testGetIPageMngr() {
DiSashModelMngr modelMngr = new DiSashModelMngr(fakeModelFactory);
@@ -143,7 +147,7 @@ public class DiSashModelMngrTest extends TestCase {
}
/**
- * Test method for {@link org.eclipse.papyrus.sasheditor.contentprovider.di.DiSashModelMngr#getISashWindowsContentProvider()}.
+ * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.contentprovider.di.DiSashModelMngr#getISashWindowsContentProvider()}.
*/
public void testGetISashWindowsContentProvider() {
DiSashModelMngr modelMngr = new DiSashModelMngr(fakeModelFactory);
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/test/org/eclipse/papyrus/sasheditor/contentprovider/di/FakeModelFactory.java b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/di/FakeModelFactory.java
index 7ba837b7df8..903a9865713 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/test/org/eclipse/papyrus/sasheditor/contentprovider/di/FakeModelFactory.java
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/di/FakeModelFactory.java
@@ -12,9 +12,10 @@
*
*****************************************************************************/
-package org.eclipse.papyrus.sasheditor.contentprovider.di;
+package org.eclipse.papyrus.infra.core.sasheditor.contentprovider.di;
-import org.eclipse.papyrus.sasheditor.contentprovider.IPageModel;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel;
+import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.IPageModelFactory;
/**
@@ -23,7 +24,7 @@ import org.eclipse.papyrus.sasheditor.contentprovider.IPageModel;
public class FakeModelFactory implements IPageModelFactory {
/**
- * @see org.eclipse.papyrus.sasheditor.contentprovider.di.IPageModelFactory#createIPageModel(org.eclipse.emf.ecore.EObject)
+ * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.di.IPageModelFactory#createIPageModel(org.eclipse.emf.ecore.EObject)
*
* @param pageIdentifier
* @return
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/test/org/eclipse/papyrus/sasheditor/contentprovider/di/internal/ContentChangeListener.java b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/di/internal/ContentChangeListener.java
index 4712fc39cea..76e45159c68 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/test/org/eclipse/papyrus/sasheditor/contentprovider/di/internal/ContentChangeListener.java
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/di/internal/ContentChangeListener.java
@@ -12,9 +12,9 @@
*
*****************************************************************************/
-package org.eclipse.papyrus.sasheditor.contentprovider.di.internal;
+package org.eclipse.papyrus.infra.core.sasheditor.contentprovider.di.internal;
-import org.eclipse.papyrus.sasheditor.contentprovider.IContentChangedListener;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IContentChangedListener;
/**
* Listener on ContentChange for Tests.
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/test/org/eclipse/papyrus/sasheditor/contentprovider/di/internal/DiContentProviderTest.java b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/di/internal/DiContentProviderTest.java
index 27c3501b66e..edfeb8189b6 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/test/org/eclipse/papyrus/sasheditor/contentprovider/di/internal/DiContentProviderTest.java
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/di/internal/DiContentProviderTest.java
@@ -1,20 +1,22 @@
-package org.eclipse.papyrus.sasheditor.contentprovider.di.internal;
+package org.eclipse.papyrus.infra.core.sasheditor.contentprovider.di.internal;
import java.util.ArrayList;
import java.util.List;
import junit.framework.TestCase;
-import org.eclipse.papyrus.sasheditor.contentprovider.IAbstractPanelModel;
-import org.eclipse.papyrus.sasheditor.contentprovider.IContentChangedListener;
-import org.eclipse.papyrus.sasheditor.contentprovider.ISashPanelModel;
-import org.eclipse.papyrus.sasheditor.contentprovider.ITabFolderModel;
-import org.eclipse.papyrus.sasheditor.contentprovider.di.IPageModelFactory;
-import org.eclipse.papyrus.sashwindows.di.AbstractPanel;
-import org.eclipse.papyrus.sashwindows.di.PageRef;
-import org.eclipse.papyrus.sashwindows.di.SashModel;
-import org.eclipse.papyrus.sashwindows.di.TabFolder;
-import org.eclipse.papyrus.sashwindows.di.util.DiUtils;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IAbstractPanelModel;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IContentChangedListener;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashPanelModel;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel;
+import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.IPageModelFactory;
+import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal.DiContentProvider;
+import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal.TabFolderModel;
+import org.eclipse.papyrus.infra.core.sashwindows.di.AbstractPanel;
+import org.eclipse.papyrus.infra.core.sashwindows.di.PageRef;
+import org.eclipse.papyrus.infra.core.sashwindows.di.SashModel;
+import org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder;
+import org.eclipse.papyrus.infra.core.sashwindows.di.util.DiUtils;
import org.eclipse.swt.SWT;
@@ -44,6 +46,7 @@ public class DiContentProviderTest extends TestCase {
/*
*
*/
+ @Override
protected void setUp() throws Exception {
super.setUp();
@@ -59,6 +62,7 @@ public class DiContentProviderTest extends TestCase {
*
* @throws Exception
*/
+ @Override
protected void tearDown() throws Exception {
super.tearDown();
}
@@ -69,8 +73,9 @@ public class DiContentProviderTest extends TestCase {
* @return
*/
private ITabFolderModel lookupFolderModel() {
- if(contentProvider == null)
+ if(contentProvider == null) {
return null;
+ }
Object rawModel = contentProvider.getRootModel();
IAbstractPanelModel panelModel = contentProvider.createChildSashModel(rawModel);
@@ -87,16 +92,17 @@ public class DiContentProviderTest extends TestCase {
*/
private ITabFolderModel lookupFolderModel(IAbstractPanelModel panelModel) {
- if(panelModel instanceof ITabFolderModel)
+ if(panelModel instanceof ITabFolderModel) {
return (ITabFolderModel)panelModel;
- else {
+ } else {
ISashPanelModel sashModel = (ISashPanelModel)panelModel;
// Iterate on children
for(Object child : sashModel.getChildren()) {
IAbstractPanelModel childModel = contentProvider.createChildSashModel(child);
ITabFolderModel res = lookupFolderModel(childModel);
- if(res != null)
+ if(res != null) {
return res;
+ }
}
}
// Not found
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/test/org/eclipse/papyrus/sasheditor/contentprovider/di/internal/FakePageModelFactory.java b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/di/internal/FakePageModelFactory.java
index 8d3e35a040e..9ea13df7621 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/test/org/eclipse/papyrus/sasheditor/contentprovider/di/internal/FakePageModelFactory.java
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/di/internal/FakePageModelFactory.java
@@ -12,10 +12,10 @@
*
*****************************************************************************/
-package org.eclipse.papyrus.sasheditor.contentprovider.di.internal;
+package org.eclipse.papyrus.infra.core.sasheditor.contentprovider.di.internal;
-import org.eclipse.papyrus.sasheditor.contentprovider.IPageModel;
-import org.eclipse.papyrus.sasheditor.contentprovider.di.IPageModelFactory;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel;
+import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.IPageModelFactory;
/**
@@ -24,7 +24,7 @@ import org.eclipse.papyrus.sasheditor.contentprovider.di.IPageModelFactory;
public class FakePageModelFactory implements IPageModelFactory {
/**
- * @see org.eclipse.papyrus.sasheditor.contentprovider.di.IPageModelFactory#createIPageModel(java.lang.Object)
+ * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.di.IPageModelFactory#createIPageModel(java.lang.Object)
*
* @param pageIdentifier
* @return
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/test/org/eclipse/papyrus/sasheditor/contentprovider/di/internal/PageMngrImplTest.java b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/di/internal/PageMngrImplTest.java
index e966ec8cc0e..d5102ee7707 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/test/org/eclipse/papyrus/sasheditor/contentprovider/di/internal/PageMngrImplTest.java
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/di/internal/PageMngrImplTest.java
@@ -12,17 +12,20 @@
*
*****************************************************************************/
-package org.eclipse.papyrus.sasheditor.contentprovider.di.internal;
+package org.eclipse.papyrus.infra.core.sasheditor.contentprovider.di.internal;
import java.util.ArrayList;
import java.util.List;
import junit.framework.TestCase;
-import org.eclipse.papyrus.sasheditor.contentprovider.di.IPageModelFactory;
-import org.eclipse.papyrus.sashwindows.di.PageRef;
-import org.eclipse.papyrus.sashwindows.di.SashWindowsMngr;
-import org.eclipse.papyrus.sashwindows.di.util.DiUtils;
+import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.IPageModelFactory;
+import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal.ContentChangedEventProvider;
+import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal.DiContentProvider;
+import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal.PageMngrImpl;
+import org.eclipse.papyrus.infra.core.sashwindows.di.PageRef;
+import org.eclipse.papyrus.infra.core.sashwindows.di.SashWindowsMngr;
+import org.eclipse.papyrus.infra.core.sashwindows.di.util.DiUtils;
/**
@@ -75,7 +78,7 @@ public class PageMngrImplTest extends TestCase {
}
/**
- * Test method for {@link org.eclipse.papyrus.sasheditor.contentprovider.di.internal.PageMngrImpl#addPage(org.eclipse.emf.ecore.EObject)}.
+ * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.contentprovider.di.internal.PageMngrImpl#addPage(org.eclipse.emf.ecore.EObject)}.
*/
public void testAddPage() {
// A listener on change event.
@@ -106,7 +109,7 @@ public class PageMngrImplTest extends TestCase {
}
/**
- * Test method for {@link org.eclipse.papyrus.sasheditor.contentprovider.di.internal.PageMngrImpl#allPages()}.
+ * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.contentprovider.di.internal.PageMngrImpl#allPages()}.
*/
public void testAllPages() {
// A listener on change event.
@@ -135,7 +138,7 @@ public class PageMngrImplTest extends TestCase {
}
/**
- * Test method for {@link org.eclipse.papyrus.sasheditor.contentprovider.di.internal.PageMngrImpl#closePage(org.eclipse.emf.ecore.EObject)}.
+ * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.contentprovider.di.internal.PageMngrImpl#closePage(org.eclipse.emf.ecore.EObject)}.
*/
public void testClosePage() {
// A listener on change event.
@@ -179,7 +182,7 @@ public class PageMngrImplTest extends TestCase {
}
/**
- * Test method for {@link org.eclipse.papyrus.sasheditor.contentprovider.di.internal.PageMngrImpl#closeAllOpenedPages())}.
+ * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.contentprovider.di.internal.PageMngrImpl#closeAllOpenedPages())}.
*/
public void testCloseAllOpenedPages() {
// A listener on change event.
@@ -225,7 +228,7 @@ public class PageMngrImplTest extends TestCase {
}
/**
- * Test method for {@link org.eclipse.papyrus.sasheditor.contentprovider.di.internal.PageMngrImpl#closeAllOpenedPages())}.
+ * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.contentprovider.di.internal.PageMngrImpl#closeAllOpenedPages())}.
*/
public void testCloseOtherOpenedPages() {
// A listener on change event.
@@ -275,7 +278,7 @@ public class PageMngrImplTest extends TestCase {
}
/**
- * Test method for {@link org.eclipse.papyrus.sasheditor.contentprovider.di.internal.PageMngrImpl#openPage(org.eclipse.emf.ecore.EObject)}.
+ * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.contentprovider.di.internal.PageMngrImpl#openPage(org.eclipse.emf.ecore.EObject)}.
*/
public void testOpenPage() {
// A listener on change event.
@@ -311,7 +314,7 @@ public class PageMngrImplTest extends TestCase {
}
/**
- * Test method for {@link org.eclipse.papyrus.sasheditor.contentprovider.di.internal.PageMngrImpl#removePage(org.eclipse.emf.ecore.EObject)}.
+ * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.contentprovider.di.internal.PageMngrImpl#removePage(org.eclipse.emf.ecore.EObject)}.
*/
public void testRemovePage() {
// A listener on change event.
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/test/org/eclipse/papyrus/sasheditor/di/tests/AllTests.java b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/tests/AllTests.java
index e2240868184..dc54cb7a090 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/test/org/eclipse/papyrus/sasheditor/di/tests/AllTests.java
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/tests/AllTests.java
@@ -11,11 +11,11 @@
* Cedric Dumoulin Cedric.dumoulin@lifl.fr - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.sasheditor.di.tests;
+package org.eclipse.papyrus.infra.core.sasheditor.di.tests;
-import org.eclipse.papyrus.sasheditor.contentprovider.di.DiSashModelMngrTest;
-import org.eclipse.papyrus.sasheditor.contentprovider.di.internal.DiContentProviderTest;
-import org.eclipse.papyrus.sasheditor.contentprovider.di.internal.PageMngrImplTest;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.di.DiSashModelMngrTest;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.di.internal.DiContentProviderTest;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.di.internal.PageMngrImplTest;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
import org.junit.runners.Suite.SuiteClasses;
@@ -25,9 +25,9 @@ import org.junit.runners.Suite.SuiteClasses;
*/
@RunWith(Suite.class)
@SuiteClasses({
- // package org.eclipse.papyrus.sasheditor.contentprovider.di
+ // package org.eclipse.papyrus.infra.core.sasheditor.contentprovider.di
DiSashModelMngrTest.class,
- // package org.eclipse.papyrus.sasheditor.contentprovider.di.internal
+ // package org.eclipse.papyrus.infra.core.sasheditor.contentprovider.di.internal
DiContentProviderTest.class,
PageMngrImplTest.class
})

Back to the top