diff options
| author | cletavernie | 2011-11-15 16:16:55 +0000 |
|---|---|---|
| committer | cletavernie | 2011-11-15 16:16:55 +0000 |
| commit | 7713d935c9368c5758460040ab96c1692184b0db (patch) | |
| tree | 1d7bec105493b447d155cff85d97eea1d59961f8 /tests/junit | |
| parent | 601f8358cc41be8f3f9ecbcf567f79e3eaaa3556 (diff) | |
| download | org.eclipse.papyrus-7713d935c9368c5758460040ab96c1692184b0db.tar.gz org.eclipse.papyrus-7713d935c9368c5758460040ab96c1692184b0db.tar.xz org.eclipse.papyrus-7713d935c9368c5758460040ab96c1692184b0db.zip | |
362162: [Architecture - Refactoring] The plug-ins should be renamed to match their layer's qualified name
https://bugs.eclipse.org/bugs/show_bug.cgi?id=362162
Diffstat (limited to 'tests/junit')
149 files changed, 1043 insertions, 1040 deletions
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.configuration.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.configuration.tests/META-INF/MANIFEST.MF index 7763a12007f..f13ac778dcf 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.configuration.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.configuration.tests/META-INF/MANIFEST.MF @@ -8,13 +8,13 @@ Bundle-Localization: plugin Bundle-SymbolicName: org.eclipse.papyrus.core.queries.configuration.tests;singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.papyrus.core.queries.configuration;visibility:=reexport,
+ org.eclipse.papyrus.infra.queries.core.configuration;bundle-version="0.9.0";visibility:=reexport,
org.eclipse.emf.ecore;visibility:=reexport,
org.eclipse.emf.facet.infra.query;visibility:=reexport,
org.eclipse.emf.ecore.xmi;visibility:=reexport,
org.junit;visibility:=reexport,
- org.eclipse.papyrus.core.queries;bundle-version="0.7.1",
- org.eclipse.papyrus.core.queries.test;bundle-version="0.7.0",
+ org.eclipse.papyrus.infra.queries.core;bundle-version="0.9.0",
+ org.eclipse.papyrus.core.queries.test;bundle-version="0.9.0",
org.eclipse.uml2.uml,
org.eclipse.emf.facet.infra.query.core
Bundle-Version: 0.9.0.qualifier
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/META-INF/MANIFEST.MF b/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/META-INF/MANIFEST.MF index cd2711b6306..ace40730354 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/META-INF/MANIFEST.MF @@ -9,13 +9,13 @@ Bundle-SymbolicName: org.eclipse.papyrus.core.queries.test;singleton:= Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
- org.eclipse.papyrus.core.queries;bundle-version="0.8.0",
+ org.eclipse.papyrus.infra.queries.core;bundle-version="0.9.0",
org.junit;resolution:=optional,
org.eclipse.emf.facet.infra.query;bundle-version="0.1.0",
org.eclipse.emf.facet.infra.query.core;bundle-version="0.1.0",
org.eclipse.emf.facet.infra.common.core;bundle-version="0.1.0",
org.eclipse.uml2.uml,
- org.eclipse.papyrus.core.queries.configuration;bundle-version=" 0.8.0",
+ org.eclipse.papyrus.infra.queries.core.configuration;bundle-version=" 0.9.0",
org.eclipse.emf.ecore
Export-Package: org.eclipse.papyrus.core.queries.test,org.eclipse.papy
rus.core.queries.test.modisco,org.eclipse.papyrus.core.queries.test.m
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/ANDTests.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/ANDTests.java index e2e687814d3..e5924d87f77 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/ANDTests.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/ANDTests.java @@ -11,13 +11,14 @@ *****************************************************************************/
package org.eclipse.papyrus.core.queries.test.modisco;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
import org.eclipse.emf.facet.infra.query.ModelQuery;
-import org.eclipse.papyrus.core.queries.configuration.ModiscoQueryConfiguration;
-import org.eclipse.papyrus.core.queries.modisco.QueryUtil;
import org.eclipse.papyrus.core.queries.test.Activator;
-import org.eclipse.papyrus.core.queries.test.modisco.queries.AND;
+import org.eclipse.papyrus.infra.queries.core.configuration.ModiscoQueryConfiguration;
+import org.eclipse.papyrus.infra.queries.core.modisco.QueryUtil;
import org.junit.After;
import org.junit.Before;
import org.junit.BeforeClass;
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/BooleanMultipleTest_NoParametersTests.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/BooleanMultipleTest_NoParametersTests.java index 983e15f6116..4268608f477 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/BooleanMultipleTest_NoParametersTests.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/BooleanMultipleTest_NoParametersTests.java @@ -12,16 +12,15 @@ package org.eclipse.papyrus.core.queries.test.modisco;
import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
import java.util.ArrayList;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.emf.facet.infra.query.ModelQuery;
import org.eclipse.emf.facet.infra.query.runtime.ModelQueryParameterValue;
-import org.eclipse.papyrus.core.queries.modisco.QueryUtil;
-import org.eclipse.papyrus.core.queries.test.modisco.queries.BooleanTest_NoParameters;
+import org.eclipse.papyrus.infra.queries.core.modisco.QueryUtil;
import org.junit.BeforeClass;
import org.junit.Test;
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/BooleanTest_NoParametersTests.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/BooleanTest_NoParametersTests.java index c1d175aa50e..bc25ff4ad97 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/BooleanTest_NoParametersTests.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/BooleanTest_NoParametersTests.java @@ -20,8 +20,7 @@ import java.util.ArrayList; import org.eclipse.core.runtime.IStatus;
import org.eclipse.emf.facet.infra.query.ModelQuery;
import org.eclipse.emf.facet.infra.query.runtime.ModelQueryParameterValue;
-import org.eclipse.papyrus.core.queries.modisco.QueryUtil;
-import org.eclipse.papyrus.core.queries.test.modisco.queries.BooleanTest_NoParameters;
+import org.eclipse.papyrus.infra.queries.core.modisco.QueryUtil;
import org.junit.BeforeClass;
import org.junit.Test;
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/IsNameLongerThanTests.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/IsNameLongerThanTests.java index 41884966294..fa921ce034b 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/IsNameLongerThanTests.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/IsNameLongerThanTests.java @@ -11,12 +11,15 @@ *****************************************************************************/
package org.eclipse.papyrus.core.queries.test.modisco;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import org.eclipse.emf.facet.infra.query.ModelQuery;
-import org.eclipse.papyrus.core.queries.configuration.ModiscoQueryConfiguration;
-import org.eclipse.papyrus.core.queries.modisco.QueryUtil;
import org.eclipse.papyrus.core.queries.test.Activator;
+import org.eclipse.papyrus.infra.queries.core.configuration.ModiscoQueryConfiguration;
+import org.eclipse.papyrus.infra.queries.core.modisco.QueryUtil;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/IsNamedTests.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/IsNamedTests.java index 09d5f92aac9..2a59952a596 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/IsNamedTests.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/IsNamedTests.java @@ -17,9 +17,9 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail;
import org.eclipse.emf.facet.infra.query.ModelQuery;
-import org.eclipse.papyrus.core.queries.configuration.ModiscoQueryConfiguration;
-import org.eclipse.papyrus.core.queries.modisco.QueryUtil;
import org.eclipse.papyrus.core.queries.test.Activator;
+import org.eclipse.papyrus.infra.queries.core.configuration.ModiscoQueryConfiguration;
+import org.eclipse.papyrus.infra.queries.core.modisco.QueryUtil;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/ListElementsInstanceofClassifiersWithNameContainingBasicTests.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/ListElementsInstanceofClassifiersWithNameContainingBasicTests.java index 4e7036b218a..8c1d7874891 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/ListElementsInstanceofClassifiersWithNameContainingBasicTests.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/ListElementsInstanceofClassifiersWithNameContainingBasicTests.java @@ -11,15 +11,16 @@ *****************************************************************************/
package org.eclipse.papyrus.core.queries.test.modisco;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.util.List;
import org.eclipse.emf.facet.infra.query.ModelQuery;
-import org.eclipse.papyrus.core.queries.configuration.ModiscoQueryConfiguration;
-import org.eclipse.papyrus.core.queries.modisco.QueryUtil;
import org.eclipse.papyrus.core.queries.test.Activator;
-import org.eclipse.papyrus.core.queries.test.modisco.queries.ListElementsInstanceofClassifiers;
+import org.eclipse.papyrus.infra.queries.core.configuration.ModiscoQueryConfiguration;
+import org.eclipse.papyrus.infra.queries.core.modisco.QueryUtil;
import org.junit.BeforeClass;
import org.junit.Test;
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/ListElementsWithNameTest.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/ListElementsWithNameTest.java index d4070a2d916..77a87d3b2fb 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/ListElementsWithNameTest.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/ListElementsWithNameTest.java @@ -11,14 +11,16 @@ *****************************************************************************/
package org.eclipse.papyrus.core.queries.test.modisco;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.util.List;
import org.eclipse.emf.facet.infra.query.ModelQuery;
-import org.eclipse.papyrus.core.queries.configuration.ModiscoQueryConfiguration;
-import org.eclipse.papyrus.core.queries.modisco.QueryUtil;
import org.eclipse.papyrus.core.queries.test.Activator;
+import org.eclipse.papyrus.infra.queries.core.configuration.ModiscoQueryConfiguration;
+import org.eclipse.papyrus.infra.queries.core.modisco.QueryUtil;
import org.junit.After;
import org.junit.Before;
import org.junit.BeforeClass;
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/QueryUtilBasicTests.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/QueryUtilBasicTests.java index e48b5224716..7fb77e77264 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/QueryUtilBasicTests.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/QueryUtilBasicTests.java @@ -18,9 +18,9 @@ import static org.junit.Assert.assertTrue; import org.eclipse.emf.facet.infra.query.ModelQuery;
import org.eclipse.emf.facet.infra.query.core.ModelQuerySetCatalog;
-import org.eclipse.papyrus.core.queries.modisco.ModelQueryNotFoundException;
-import org.eclipse.papyrus.core.queries.modisco.ModelQuerySetNotFoundException;
-import org.eclipse.papyrus.core.queries.modisco.QueryUtil;
+import org.eclipse.papyrus.infra.queries.core.modisco.ModelQueryNotFoundException;
+import org.eclipse.papyrus.infra.queries.core.modisco.ModelQuerySetNotFoundException;
+import org.eclipse.papyrus.infra.queries.core.modisco.QueryUtil;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Assert;
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/QueryUtil_Parameters.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/QueryUtil_Parameters.java index 0721798fe27..b242d26dc93 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/QueryUtil_Parameters.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/QueryUtil_Parameters.java @@ -21,7 +21,7 @@ import java.util.List; import org.eclipse.core.runtime.IStatus;
import org.eclipse.emf.facet.infra.query.ModelQuery;
-import org.eclipse.papyrus.core.queries.modisco.QueryUtil;
+import org.eclipse.papyrus.infra.queries.core.modisco.QueryUtil;
import org.eclipse.uml2.uml.VisibilityKind;
import org.junit.BeforeClass;
import org.junit.Test;
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/StringMultipleTest_NoParametersTests.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/StringMultipleTest_NoParametersTests.java index d3750292791..550373d19ba 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/StringMultipleTest_NoParametersTests.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/StringMultipleTest_NoParametersTests.java @@ -12,16 +12,15 @@ package org.eclipse.papyrus.core.queries.test.modisco;
import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
import java.util.ArrayList;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.emf.facet.infra.query.ModelQuery;
import org.eclipse.emf.facet.infra.query.runtime.ModelQueryParameterValue;
-import org.eclipse.papyrus.core.queries.modisco.QueryUtil;
-import org.eclipse.papyrus.core.queries.test.modisco.queries.BooleanTest_NoParameters;
+import org.eclipse.papyrus.infra.queries.core.modisco.QueryUtil;
import org.junit.BeforeClass;
import org.junit.Test;
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/StringTest_NoParametersTests.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/StringTest_NoParametersTests.java index 13f544bffeb..cb0094e4d28 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/StringTest_NoParametersTests.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/StringTest_NoParametersTests.java @@ -12,16 +12,15 @@ package org.eclipse.papyrus.core.queries.test.modisco;
import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
import java.util.ArrayList;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.emf.facet.infra.query.ModelQuery;
import org.eclipse.emf.facet.infra.query.runtime.ModelQueryParameterValue;
-import org.eclipse.papyrus.core.queries.modisco.QueryUtil;
-import org.eclipse.papyrus.core.queries.test.modisco.queries.BooleanTest_NoParameters;
+import org.eclipse.papyrus.infra.queries.core.modisco.QueryUtil;
import org.junit.BeforeClass;
import org.junit.Test;
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/TestUtil.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/TestUtil.java index c901736208d..5f608e8ffcb 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/TestUtil.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/TestUtil.java @@ -18,7 +18,7 @@ import org.eclipse.emf.ecore.EObject; 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.core.queries.configuration.ModiscoQueryConfiguration;
+import org.eclipse.papyrus.infra.queries.core.configuration.ModiscoQueryConfiguration;
/**
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/AND.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/AND.java index 8ef5da3e12b..372ac3939db 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/AND.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/AND.java @@ -1,8 +1,8 @@ package org.eclipse.papyrus.core.queries.test.modisco.queries; -import org.eclipse.uml2.uml.NamedElement; import org.eclipse.emf.facet.infra.query.core.exception.ModelQueryExecutionException; import org.eclipse.emf.facet.infra.query.core.java.IJavaModelQuery; import org.eclipse.emf.facet.infra.query.core.java.ParameterValueList; +import org.eclipse.uml2.uml.NamedElement; /** test - AND query */ public class AND implements IJavaModelQuery<NamedElement, Boolean> { diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/BooleanMultipleTest_NoParameters.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/BooleanMultipleTest_NoParameters.java index 37afa8536b9..2b453f63916 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/BooleanMultipleTest_NoParameters.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/BooleanMultipleTest_NoParameters.java @@ -15,10 +15,11 @@ package org.eclipse.papyrus.core.queries.test.modisco.queries; import java.util.Arrays; import java.util.Collection; -import org.eclipse.uml2.uml.Element; + import org.eclipse.emf.facet.infra.query.core.exception.ModelQueryExecutionException; import org.eclipse.emf.facet.infra.query.core.java.IJavaModelQuery; import org.eclipse.emf.facet.infra.query.core.java.ParameterValueList; +import org.eclipse.uml2.uml.Element; /** test - boolean return multiple values - no parameters */ public class BooleanMultipleTest_NoParameters implements IJavaModelQuery<Element, Collection<Boolean>> { diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/BooleanTest_Boolean_1_Integer_1.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/BooleanTest_Boolean_1_Integer_1.java index 5738c9903c5..3a2fe753106 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/BooleanTest_Boolean_1_Integer_1.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/BooleanTest_Boolean_1_Integer_1.java @@ -1,8 +1,8 @@ package org.eclipse.papyrus.core.queries.test.modisco.queries; -import org.eclipse.uml2.uml.Element; import org.eclipse.emf.facet.infra.query.core.exception.ModelQueryExecutionException; import org.eclipse.emf.facet.infra.query.core.java.IJavaModelQuery; import org.eclipse.emf.facet.infra.query.core.java.ParameterValueList; +import org.eclipse.uml2.uml.Element; /** test - boolean return value - Boolean[1], Integer[1] */ public class BooleanTest_Boolean_1_Integer_1 implements IJavaModelQuery<Element, Boolean> { diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/BooleanTest_Enum_1.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/BooleanTest_Enum_1.java index 66251744f03..546bb68085d 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/BooleanTest_Enum_1.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/BooleanTest_Enum_1.java @@ -1,8 +1,8 @@ package org.eclipse.papyrus.core.queries.test.modisco.queries; -import org.eclipse.uml2.uml.Element; import org.eclipse.emf.facet.infra.query.core.exception.ModelQueryExecutionException; import org.eclipse.emf.facet.infra.query.core.java.IJavaModelQuery; import org.eclipse.emf.facet.infra.query.core.java.ParameterValueList; +import org.eclipse.uml2.uml.Element; /** test - boolean return value - Enum[1] */ public class BooleanTest_Enum_1 implements IJavaModelQuery<Element, Boolean> { diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/BooleanTest_String_1.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/BooleanTest_String_1.java index beb1207d966..d4aaf417b0a 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/BooleanTest_String_1.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/BooleanTest_String_1.java @@ -1,10 +1,10 @@ package org.eclipse.papyrus.core.queries.test.modisco.queries; -import org.eclipse.papyrus.core.queries.test.modisco.IQueryNames; -import org.eclipse.uml2.uml.Element; import org.eclipse.emf.facet.infra.query.core.exception.ModelQueryExecutionException; import org.eclipse.emf.facet.infra.query.core.java.IJavaModelQuery; import org.eclipse.emf.facet.infra.query.core.java.ParameterValueList; +import org.eclipse.papyrus.core.queries.test.modisco.IQueryNames; +import org.eclipse.uml2.uml.Element; /** test - boolean return value - String[1] */ public class BooleanTest_String_1 implements IJavaModelQuery<Element, Boolean> { diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/BooleanTest_String_3.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/BooleanTest_String_3.java index 0e594594896..4de555ad4e6 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/BooleanTest_String_3.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/BooleanTest_String_3.java @@ -1,8 +1,8 @@ package org.eclipse.papyrus.core.queries.test.modisco.queries; -import org.eclipse.uml2.uml.Element; import org.eclipse.emf.facet.infra.query.core.exception.ModelQueryExecutionException; import org.eclipse.emf.facet.infra.query.core.java.IJavaModelQuery; import org.eclipse.emf.facet.infra.query.core.java.ParameterValueList; +import org.eclipse.uml2.uml.Element; /** test - boolean return value - String[3] */ public class BooleanTest_String_3 implements IJavaModelQuery<Element, Boolean> { diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/BooleanTest_String_Star.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/BooleanTest_String_Star.java index 04246445cc5..12d1e0da49d 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/BooleanTest_String_Star.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/BooleanTest_String_Star.java @@ -1,8 +1,8 @@ package org.eclipse.papyrus.core.queries.test.modisco.queries; -import org.eclipse.uml2.uml.Element; import org.eclipse.emf.facet.infra.query.core.exception.ModelQueryExecutionException; import org.eclipse.emf.facet.infra.query.core.java.IJavaModelQuery; import org.eclipse.emf.facet.infra.query.core.java.ParameterValueList; +import org.eclipse.uml2.uml.Element; /** test - boolean return value - String[-1] */ public class BooleanTest_String_Star implements IJavaModelQuery<Element, Boolean> { diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/CopyOfIsNamed.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/CopyOfIsNamed.java index 187a356d58c..900f94da7fb 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/CopyOfIsNamed.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/CopyOfIsNamed.java @@ -1,10 +1,10 @@ package org.eclipse.papyrus.core.queries.test.modisco.queries; -import org.eclipse.uml2.uml.LiteralString; -import org.eclipse.uml2.uml.NamedElement; import org.eclipse.emf.facet.infra.query.core.exception.ModelQueryExecutionException; import org.eclipse.emf.facet.infra.query.core.java.IJavaModelQuery; import org.eclipse.emf.facet.infra.query.core.java.ParameterValueList; +import org.eclipse.uml2.uml.LiteralString; +import org.eclipse.uml2.uml.NamedElement; /** test - test if the name of the element is equal to the specified name */ public class CopyOfIsNamed implements IJavaModelQuery<NamedElement, Boolean> { diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/IsNameLongerThan.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/IsNameLongerThan.java index d25ced9d92d..75981cdc3e8 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/IsNameLongerThan.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/IsNameLongerThan.java @@ -1,8 +1,8 @@ package org.eclipse.papyrus.core.queries.test.modisco.queries; -import org.eclipse.uml2.uml.NamedElement; import org.eclipse.emf.facet.infra.query.core.exception.ModelQueryExecutionException; import org.eclipse.emf.facet.infra.query.core.java.IJavaModelQuery; import org.eclipse.emf.facet.infra.query.core.java.ParameterValueList; +import org.eclipse.uml2.uml.NamedElement; /** test - check if the element's name is longer than the specified number. The booelan indicates if it is tru when length is equal. */ public class IsNameLongerThan implements IJavaModelQuery<NamedElement, Boolean> { diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/ListElementsInstanceofClassifiers.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/ListElementsInstanceofClassifiers.java index 381494adeb0..b8a0e48eefe 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/ListElementsInstanceofClassifiers.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/ListElementsInstanceofClassifiers.java @@ -4,12 +4,12 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.eclipse.uml2.uml.Classifier; -import org.eclipse.uml2.uml.NamedElement; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.facet.infra.query.core.exception.ModelQueryExecutionException; import org.eclipse.emf.facet.infra.query.core.java.IJavaModelQuery; import org.eclipse.emf.facet.infra.query.core.java.ParameterValueList; +import org.eclipse.uml2.uml.Classifier; +import org.eclipse.uml2.uml.NamedElement; /** test - list the elements given as parameters that are instanceof Classifiers */ public class ListElementsInstanceofClassifiers implements IJavaModelQuery<EObject, Collection<Classifier>> { diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/StringMultipleTest_NoParameters.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/StringMultipleTest_NoParameters.java index 16a65d9c99f..a9f3a8f6f83 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/StringMultipleTest_NoParameters.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/StringMultipleTest_NoParameters.java @@ -15,10 +15,11 @@ package org.eclipse.papyrus.core.queries.test.modisco.queries; import java.util.Arrays; import java.util.Collection; -import org.eclipse.uml2.uml.Element; + import org.eclipse.emf.facet.infra.query.core.exception.ModelQueryExecutionException; import org.eclipse.emf.facet.infra.query.core.java.IJavaModelQuery; import org.eclipse.emf.facet.infra.query.core.java.ParameterValueList; +import org.eclipse.uml2.uml.Element; /** test - string return multiple values - no parameters */ public class StringMultipleTest_NoParameters implements IJavaModelQuery<Element, Collection<String>> { diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/StringTest_NoParameters.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/StringTest_NoParameters.java index 9617278947d..60e1dc0be08 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/StringTest_NoParameters.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/StringTest_NoParameters.java @@ -12,10 +12,10 @@ * *****************************************************************************/ package org.eclipse.papyrus.core.queries.test.modisco.queries; -import org.eclipse.uml2.uml.Element; import org.eclipse.emf.facet.infra.query.core.exception.ModelQueryExecutionException; import org.eclipse.emf.facet.infra.query.core.java.IJavaModelQuery; import org.eclipse.emf.facet.infra.query.core.java.ParameterValueList; +import org.eclipse.uml2.uml.Element; /** test - string return value - no parameters */ public class StringTest_NoParameters implements IJavaModelQuery<Element, String> { diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/META-INF/MANIFEST.MF index 2eb1ab2b44a..dfa6298b68b 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/META-INF/MANIFEST.MF @@ -5,9 +5,9 @@ Bundle-SymbolicName: org.eclipse.papyrus.core.resourceloading.tests Bundle-Version: 0.9.0.qualifier Bundle-Vendor: %providerName Bundle-Localization: fragment -Fragment-Host: org.eclipse.papyrus.core.resourceloading;bundle-version="0.8.0" +Fragment-Host: org.eclipse.papyrus.infra.services.resourceloading;bundle-version="0.9.0" Bundle-RequiredExecutionEnvironment: J2SE-1.5 Require-Bundle: org.junit;bundle-version="4.8.1", org.eclipse.uml2.uml;bundle-version="3.1.0", - org.eclipse.papyrus.core.resourceloading.preferences;bundle-version="0.8.0", - org.eclipse.papyrus.resourceloading.umlprofile;bundle-version="0.8.0" + org.eclipse.papyrus.infra.services.resourceloading.preferences;bundle-version="0.9.0", + org.eclipse.papyrus.uml.resourceloading.profile;bundle-version="0.9.0" diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/test/org/eclipse/papyrus/core/resourceloading/tests/testModel1/AbstractResourceLoadingTestModel1.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/test/org/eclipse/papyrus/core/resourceloading/tests/testModel1/AbstractResourceLoadingTestModel1.java index 36a4d522524..6f8deb7fb2c 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/test/org/eclipse/papyrus/core/resourceloading/tests/testModel1/AbstractResourceLoadingTestModel1.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/test/org/eclipse/papyrus/core/resourceloading/tests/testModel1/AbstractResourceLoadingTestModel1.java @@ -13,9 +13,6 @@ *****************************************************************************/
package org.eclipse.papyrus.core.resourceloading.tests.testModel1;
-import java.io.File;
-import java.net.URL;
-
import junit.framework.TestCase;
import org.eclipse.core.resources.IFile;
@@ -24,20 +21,16 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Platform;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.papyrus.core.Activator;
-import org.eclipse.papyrus.core.resourceloading.OnDemandLoadingModelSetServiceFactory;
-import org.eclipse.papyrus.core.resourceloading.preferences.StrategyChooser;
import org.eclipse.papyrus.core.resourceloading.tests.testModel2.ITestConstants;
-import org.eclipse.papyrus.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.services.resourceloading.OnDemandLoadingModelSetServiceFactory;
+import org.eclipse.papyrus.infra.services.resourceloading.preferences.StrategyChooser;
import org.eclipse.uml2.uml.Property;
import org.eclipse.uml2.uml.Type;
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/test/org/eclipse/papyrus/core/resourceloading/tests/testModel2/AbstractResourceLoadingTestModel2.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/test/org/eclipse/papyrus/core/resourceloading/tests/testModel2/AbstractResourceLoadingTestModel2.java index ca7f6c498c6..3983d884962 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/test/org/eclipse/papyrus/core/resourceloading/tests/testModel2/AbstractResourceLoadingTestModel2.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/test/org/eclipse/papyrus/core/resourceloading/tests/testModel2/AbstractResourceLoadingTestModel2.java @@ -32,9 +32,9 @@ import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.gmf.runtime.notation.Node;
-import org.eclipse.papyrus.core.resourceloading.OnDemandLoadingModelSetServiceFactory;
-import org.eclipse.papyrus.core.resourceloading.preferences.StrategyChooser;
-import org.eclipse.papyrus.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.services.resourceloading.OnDemandLoadingModelSetServiceFactory;
+import org.eclipse.papyrus.infra.services.resourceloading.preferences.StrategyChooser;
import org.eclipse.uml2.uml.Property;
import org.eclipse.uml2.uml.Type;
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/.project b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/.project index 1c62f57281b..93b24f41eef 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/.project +++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/.project @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.papyrus.core.tests</name>
+ <name>org.eclipse.papyrus.infra.core.tests</name>
<comment></comment>
<projects>
</projects>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/META-INF/MANIFEST.MF index 96b415fb6b4..c29df048098 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/META-INF/MANIFEST.MF @@ -5,15 +5,15 @@ Bundle-SymbolicName: org.eclipse.papyrus.core.tests;singleton:=true Bundle-Version: 0.9.0.qualifier Bundle-Vendor: %providerName Bundle-Localization: fragment -Fragment-Host: org.eclipse.papyrus.core;bundle-version="0.8.0" +Fragment-Host: org.eclipse.papyrus.infra.core;bundle-version="0.9.0" Bundle-RequiredExecutionEnvironment: J2SE-1.5 Require-Bundle: org.junit;bundle-version="4.8.1", org.eclipse.uml2.uml;bundle-version="3.1.0", - org.eclipse.papyrus.wizards;bundle-version="0.8.0", - org.eclipse.papyrus.diagram.profile;bundle-version="0.8.0", - org.eclipse.papyrus.sysml.diagram.ui;bundle-version="0.8.0", - org.eclipse.papyrus.sysml.diagram.common;bundle-version="0.8.0" -Export-Package: org.eclipse.papyrus.core.lifecycleevents, - org.eclipse.papyrus.core.services, - org.eclipse.papyrus.core.tests, - org.eclipse.papyrus.resource + org.eclipse.papyrus.uml.diagram.wizards;bundle-version="0.9.0", + org.eclipse.papyrus.uml.diagram.profile;bundle-version="0.9.0", + org.eclipse.papyrus.sysml.diagram.ui;bundle-version="0.9.0", + org.eclipse.papyrus.sysml.diagram.common;bundle-version="0.9.0" +Export-Package: org.eclipse.papyrus.infra.core.lifecycleevents, + org.eclipse.papyrus.infra.core.resource, + org.eclipse.papyrus.infra.core.services, + org.eclipse.papyrus.infra.core.tests diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/build.properties b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/build.properties index b2c376d73bf..57a5eb7092f 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/build.properties +++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/build.properties @@ -3,5 +3,5 @@ output.. = bin/ bin.includes = META-INF/,\
.,\
about.html,\
- org.eclipse.papyrus.core.tests.launch,\
+ org.eclipse.papyrus.infra.core.tests.launch,\
fragment.properties
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/org.eclipse.papyrus.core.tests.launch b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/org.eclipse.papyrus.core.tests.launch index aeabc1de553..9732ba767e9 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/org.eclipse.papyrus.core.tests.launch +++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/org.eclipse.papyrus.core.tests.launch @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
<booleanAttribute key="append.args" value="true"/>
<booleanAttribute key="askclear" value="false"/>
@@ -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.core.tests/src/org/eclipse/papyrus/core/tests/AllTests.java"/>
+<listEntry value="/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/infra/core/tests/AllTests.java"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="1"/>
@@ -23,7 +23,7 @@ <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
<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.MAIN_TYPE" value="org.eclipse.papyrus.core.tests.AllTests"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.infra.core.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.core.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.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; diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/.project b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/.project index 6488a57fe49..f32f0dff98c 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/.project +++ b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/.project @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.papyrus.extendedtypes.tests</name>
+ <name>org.eclipse.papyrus.infra.extendedtypes.tests</name>
<comment></comment>
<projects>
</projects>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/META-INF/MANIFEST.MF index 66a74c27361..7ea150436dd 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/META-INF/MANIFEST.MF @@ -4,8 +4,8 @@ Bundle-Name: %fragmentName Bundle-SymbolicName: org.eclipse.papyrus.extendedtypes.tests;singleton:=true Bundle-Version: 0.9.0.qualifier Bundle-Vendor: %providerName -Fragment-Host: org.eclipse.papyrus.extendedtypes;bundle-version="0.8.0" +Fragment-Host: org.eclipse.papyrus.infra.extendedtypes;bundle-version="0.9.0" Bundle-RequiredExecutionEnvironment: J2SE-1.5 Require-Bundle: org.junit, - org.eclipse.papyrus.uml.service.types;bundle-version="0.7.1" -Export-Package: org.eclipse.papyrus.extendedtypes + org.eclipse.papyrus.uml.service.types;bundle-version="0.9.0" +Export-Package: org.eclipse.papyrus.infra.extendedtypes diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/build.properties b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/build.properties index 8f2ae069083..1666691f10f 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/build.properties +++ b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/build.properties @@ -5,6 +5,6 @@ bin.includes = META-INF/,\ fragment.xml,\
icons/,\
model/,\
- org.eclipse.papyrus.extendedtypes.tests.launch,\
+ org.eclipse.papyrus.infra.extendedtypes.tests.launch,\
fragment.properties,\
about.html
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/fragment.xml b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/fragment.xml index 474fd5681bb..323f3e28aca 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/fragment.xml +++ b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/fragment.xml @@ -2,13 +2,13 @@ <?eclipse version="3.4"?>
<fragment>
<extension
- point="org.eclipse.papyrus.extendedtypes.extendedTypesSetConfiguration">
+ point="org.eclipse.papyrus.infra.extendedtypes.extendedTypesSetConfiguration">
<configuration
description="Test - Model for Extended Element Type Set"
icon="icons/debug.gif"
name="Test1 Model for Extended Element Type Set"
path="model/Test1.extendedtypes"
- id="org.eclipse.papyrus.extendedtypes.tests.test1">
+ id="org.eclipse.papyrus.infra.extendedtypes.tests.test1">
</configuration>
</extension>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/model/Test1.extendedtypes b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/model/Test1.extendedtypes index cea39dc66b8..dd1f5357e25 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/model/Test1.extendedtypes +++ b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/model/Test1.extendedtypes @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?>
-<extendedtypes:ExtendedElementTypeSet xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/core/queries/0.7" xmlns:applystereotypeactionconfiguration="http://www.eclipse.org/papyrus/diagram/types/applystereotypeactionconfiguration/0.7" xmlns:extendedtypes="http://www.eclipse.org/papyrus/diagram/types/extendedtypes/0.7" id="org.eclipse.papyrus.extendedtypes.tests.test1">
- <elementType name="TestClass1ExtendedElementType " id="org.eclipse.papyrus.extendedtypes.tests.Class1" preValidation="configuration:ModiscoQueryConfiguration ../../org.eclipse.papyrus.core.queries.test/resources/IsNameLongerThanQueryConfiguration1.configuration#/">
+<extendedtypes:ExtendedElementTypeSet xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/core/queries/0.7" xmlns:applystereotypeactionconfiguration="http://www.eclipse.org/papyrus/diagram/types/applystereotypeactionconfiguration/0.7" xmlns:extendedtypes="http://www.eclipse.org/papyrus/diagram/types/extendedtypes/0.7" id="org.eclipse.papyrus.infra.extendedtypes.tests.test1">
+ <elementType name="TestClass1ExtendedElementType " id="org.eclipse.papyrus.infra.extendedtypes.tests.Class1" preValidation="configuration:ModiscoQueryConfiguration ../../org.eclipse.papyrus.core.queries.test/resources/IsNameLongerThanQueryConfiguration1.configuration#/">
<iconEntry iconPath="/icons/full/obj16/Class.gif" bundleId="org.eclipse.uml2.uml.edit"/>
<specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
</elementType>
- <elementType name="TestClassInPackageExtendedElementType " id="org.eclipse.papyrus.extendedtypes.tests.ClassInPackageOnly" preValidation="configuration:ModiscoQueryConfiguration ../../org.eclipse.papyrus.core.queries.test/resources/IsNameLongerThanQueryConfiguration1.configuration#/ configuration:ModiscoQueryConfiguration ../../org.eclipse.papyrus.core.queries.test/resources/IsStrictInstanceOfPackage.configuration#/">
+ <elementType name="TestClassInPackageExtendedElementType " id="org.eclipse.papyrus.infra.extendedtypes.tests.ClassInPackageOnly" preValidation="configuration:ModiscoQueryConfiguration ../../org.eclipse.papyrus.core.queries.test/resources/IsNameLongerThanQueryConfiguration1.configuration#/ configuration:ModiscoQueryConfiguration ../../org.eclipse.papyrus.core.queries.test/resources/IsStrictInstanceOfPackage.configuration#/">
<iconEntry iconPath="/icons/full/obj16/Class.gif" bundleId="org.eclipse.uml2.uml.edit"/>
<specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
</elementType>
- <elementType name="TestClassInModelExtendedElementType " id="org.eclipse.papyrus.extendedtypes.tests.ClassInModelOnly" preValidation="configuration:ModiscoQueryConfiguration ../../org.eclipse.papyrus.core.queries.test/resources/IsStrictInstanceOfModel.configuration#/ configuration:ModiscoQueryConfiguration ../../org.eclipse.papyrus.core.queries.test/resources/IsNameLongerThanQueryConfiguration1.configuration#/">
+ <elementType name="TestClassInModelExtendedElementType " id="org.eclipse.papyrus.infra.extendedtypes.tests.ClassInModelOnly" preValidation="configuration:ModiscoQueryConfiguration ../../org.eclipse.papyrus.core.queries.test/resources/IsStrictInstanceOfModel.configuration#/ configuration:ModiscoQueryConfiguration ../../org.eclipse.papyrus.core.queries.test/resources/IsNameLongerThanQueryConfiguration1.configuration#/">
<iconEntry iconPath="/icons/full/obj16/Class.gif" bundleId="org.eclipse.uml2.uml.edit"/>
<specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
</elementType>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/org.eclipse.papyrus.extendedtypes.tests.launch b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/org.eclipse.papyrus.extendedtypes.tests.launch index c293afa2eb1..feda01e5df4 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/org.eclipse.papyrus.extendedtypes.tests.launch +++ b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/org.eclipse.papyrus.extendedtypes.tests.launch @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
<booleanAttribute key="append.args" value="true"/>
<booleanAttribute key="askclear" value="false"/>
@@ -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.extendedtypes.tests/src/org/eclipse/papyrus/diagram/extendedtypes/AllTests.java"/>
+<listEntry value="/org.eclipse.papyrus.extendedtypes.tests/src/org/eclipse/papyrus/infra/extendedtypes/AllTests.java"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="1"/>
@@ -23,7 +23,7 @@ <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
<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.MAIN_TYPE" value="org.eclipse.papyrus.extendedtypes.AllTests"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.infra.extendedtypes.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.extendedtypes.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.extendedtypes.tests/src/org/eclipse/papyrus/extendedtypes/AllTests.java b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/src/org/eclipse/papyrus/infra/extendedtypes/AllTests.java index 9da5797da12..00b90d48b4b 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/src/org/eclipse/papyrus/extendedtypes/AllTests.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/src/org/eclipse/papyrus/infra/extendedtypes/AllTests.java @@ -9,9 +9,9 @@ * Contributors:
* Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.extendedtypes;
+package org.eclipse.papyrus.infra.extendedtypes;
-import org.eclipse.papyrus.extendedtypes.preferences.ExtendedTypesPreferencesTests;
+import org.eclipse.papyrus.infra.extendedtypes.preferences.ExtendedTypesPreferencesTests;
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.extendedtypes.tests/src/org/eclipse/papyrus/extendedtypes/ExtendedEditHelperAdviceTests.java b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/src/org/eclipse/papyrus/infra/extendedtypes/ExtendedEditHelperAdviceTests.java index 70ef1958b9c..2e1300cb9f6 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/src/org/eclipse/papyrus/extendedtypes/ExtendedEditHelperAdviceTests.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/src/org/eclipse/papyrus/infra/extendedtypes/ExtendedEditHelperAdviceTests.java @@ -1,6 +1,6 @@ /*****************************************************************************
* Copyright (c) 2010 CEA LIST.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -9,13 +9,17 @@ * Contributors:
* Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.extendedtypes;
+package org.eclipse.papyrus.infra.extendedtypes;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import org.eclipse.gmf.runtime.emf.type.core.IElementType;
import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.papyrus.infra.extendedtypes.ExtendedEditHelperAdvice;
+import org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeSet;
+import org.eclipse.papyrus.infra.extendedtypes.ExtendedTypesRegistry;
import org.eclipse.uml2.uml.Model;
import org.eclipse.uml2.uml.Package;
import org.eclipse.uml2.uml.UMLFactory;
@@ -84,7 +88,7 @@ public class ExtendedEditHelperAdviceTests implements ITestConstants { classInModelElementType = ExtendedTypesRegistry.getInstance().getType(CLASS_IN_MODEL_TEST_TYPE_ID);
assertNotNull("Class in model element type should not be null", classInModelElementType);
- ExtendedElementTypeSet set = ExtendedTypesRegistry.getInstance().getExtendedElementTypeSet(TEST1_CONFIGURATION_SET_ID, TEST1_MODEL_PATH, org.eclipse.papyrus.extendedtypes.Activator.PLUGIN_ID);
+ ExtendedElementTypeSet set = ExtendedTypesRegistry.getInstance().getExtendedElementTypeSet(TEST1_CONFIGURATION_SET_ID, TEST1_MODEL_PATH, org.eclipse.papyrus.infra.extendedtypes.Activator.PLUGIN_ID);
assertNotNull("extended type set should not be null", set);
for(ExtendedElementTypeConfiguration configuration : set.getElementType()) {
if(CLASS1_TEST_TYPE_CONFIGURATION_ID.equals(configuration.getId())) {
@@ -142,7 +146,7 @@ public class ExtendedEditHelperAdviceTests implements ITestConstants { /**
* Test method for
- * {@link org.eclipse.papyrus.extendedtypes.ExtendedEditHelperAdvice#ExtendedEditHelperAdvice(org.eclipse.papyrus.extendedtypes.ExtendedElementTypeConfiguration)}
+ * {@link org.eclipse.papyrus.infra.extendedtypes.ExtendedEditHelperAdvice#ExtendedEditHelperAdvice(org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeConfiguration)}
* .
*/
@Test
@@ -152,7 +156,7 @@ public class ExtendedEditHelperAdviceTests implements ITestConstants { /**
* Test method for
- * {@link org.eclipse.papyrus.extendedtypes.ExtendedEditHelperAdvice#approveRequest(org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest)}
+ * {@link org.eclipse.papyrus.infra.extendedtypes.ExtendedEditHelperAdvice#approveRequest(org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest)}
* .
*/
@Test
@@ -193,7 +197,7 @@ public class ExtendedEditHelperAdviceTests implements ITestConstants { /**
* Test method for
- * {@link org.eclipse.papyrus.extendedtypes.ExtendedEditHelperAdvice#getBeforeCreateCommand(org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest)}
+ * {@link org.eclipse.papyrus.infra.extendedtypes.ExtendedEditHelperAdvice#getBeforeCreateCommand(org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest)}
* .
*/
@Test
@@ -203,7 +207,7 @@ public class ExtendedEditHelperAdviceTests implements ITestConstants { /**
* Test method for
- * {@link org.eclipse.papyrus.extendedtypes.ExtendedEditHelperAdvice#getAfterCreateCommand(org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest)}
+ * {@link org.eclipse.papyrus.infra.extendedtypes.ExtendedEditHelperAdvice#getAfterCreateCommand(org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest)}
* .
*/
@Test
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/src/org/eclipse/papyrus/extendedtypes/ExtendedTypesRegistryTests.java b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/src/org/eclipse/papyrus/infra/extendedtypes/ExtendedTypesRegistryTests.java index 1288c6321b9..1bc78e0d106 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/src/org/eclipse/papyrus/extendedtypes/ExtendedTypesRegistryTests.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/src/org/eclipse/papyrus/infra/extendedtypes/ExtendedTypesRegistryTests.java @@ -1,6 +1,6 @@ /*****************************************************************************
* Copyright (c) 2010 CEA LIST.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -9,7 +9,7 @@ * Contributors:
* Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.extendedtypes;
+package org.eclipse.papyrus.infra.extendedtypes;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
@@ -63,7 +63,7 @@ public class ExtendedTypesRegistryTests implements ITestConstants { }
/**
- * Test method for {@link org.eclipse.papyrus.extendedtypes.ExtendedTypesRegistry#getInstance()}.
+ * Test method for {@link org.eclipse.papyrus.infra.extendedtypes.ExtendedTypesRegistry#getInstance()}.
*/
@Test
public final void testGetInstance() {
@@ -71,7 +71,7 @@ public class ExtendedTypesRegistryTests implements ITestConstants { }
/**
- * Test method for {@link org.eclipse.papyrus.extendedtypes.ExtendedTypesRegistry#loadExtendedTypeSets()}.
+ * Test method for {@link org.eclipse.papyrus.infra.extendedtypes.ExtendedTypesRegistry#loadExtendedTypeSets()}.
*/
@Test
public final void testLoadExtendedTypeSets() {
@@ -91,7 +91,7 @@ public class ExtendedTypesRegistryTests implements ITestConstants { }
/**
- * Test method for {@link org.eclipse.papyrus.extendedtypes.ExtendedTypesRegistry#createResourceSet()}.
+ * Test method for {@link org.eclipse.papyrus.infra.extendedtypes.ExtendedTypesRegistry#createResourceSet()}.
*/
@Test
public final void testCreateResourceSet() {
@@ -100,7 +100,7 @@ public class ExtendedTypesRegistryTests implements ITestConstants { }
/**
- * Test method for {@link org.eclipse.papyrus.extendedtypes.ExtendedTypesRegistry#getExtendedElementTypeSet(java.lang.String, java.lang.String)}.
+ * Test method for {@link org.eclipse.papyrus.infra.extendedtypes.ExtendedTypesRegistry#getExtendedElementTypeSet(java.lang.String, java.lang.String)}.
*/
@Test
public final void testGetExtendedElementTypeSet() {
@@ -112,7 +112,7 @@ public class ExtendedTypesRegistryTests implements ITestConstants { }
/**
- * Test method for {@link org.eclipse.papyrus.extendedtypes.ExtendedTypesRegistry#getType(java.lang.String)}.
+ * Test method for {@link org.eclipse.papyrus.infra.extendedtypes.ExtendedTypesRegistry#getType(java.lang.String)}.
*/
@Test
public final void testGetType() {
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/src/org/eclipse/papyrus/extendedtypes/ITestConstants.java b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/src/org/eclipse/papyrus/infra/extendedtypes/ITestConstants.java index 0ccf3ceb232..5a12b52ceb7 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/src/org/eclipse/papyrus/extendedtypes/ITestConstants.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/src/org/eclipse/papyrus/infra/extendedtypes/ITestConstants.java @@ -9,7 +9,7 @@ * Contributors:
* Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.extendedtypes;
+package org.eclipse.papyrus.infra.extendedtypes;
/**
@@ -18,17 +18,17 @@ package org.eclipse.papyrus.extendedtypes; public interface ITestConstants {
/** element type id for test1::Class1 */
- public static final String CLASS1_TEST_TYPE_ID = "org.eclipse.papyrus.extendedtypes.tests.Class1";
+ public static final String CLASS1_TEST_TYPE_ID = "org.eclipse.papyrus.infra.extendedtypes.tests.Class1";
/** element type id for test1::ClassInPackage */
- public static final String CLASS_IN_PACKAGE_TEST_TYPE_ID = "org.eclipse.papyrus.extendedtypes.tests.ClassInPackageOnly";
+ public static final String CLASS_IN_PACKAGE_TEST_TYPE_ID = "org.eclipse.papyrus.infra.extendedtypes.tests.ClassInPackageOnly";
/** element type id for test1::ClassInModel */
- public static final String CLASS_IN_MODEL_TEST_TYPE_ID = "org.eclipse.papyrus.extendedtypes.tests.ClassInModelOnly";
+ public static final String CLASS_IN_MODEL_TEST_TYPE_ID = "org.eclipse.papyrus.infra.extendedtypes.tests.ClassInModelOnly";
/** name of the extended type set in Test1 */
- public final static String ExtendedTypeSetName_Test1 = "org.eclipse.papyrus.extendedtypes.tests.test1";
+ public final static String ExtendedTypeSetName_Test1 = "org.eclipse.papyrus.infra.extendedtypes.tests.test1";
/** path to a non existing file */
public static final String NO_FILE = "no_file";
@@ -37,13 +37,13 @@ public interface ITestConstants { public static final String TEST1_MODEL_PATH = "/model/Test1.extendedtypes";
/** identifier of the extende type set configuration */
- public static final String TEST1_CONFIGURATION_SET_ID = "org.eclipse.papyrus.extendedtypes.tests.test1";
+ public static final String TEST1_CONFIGURATION_SET_ID = "org.eclipse.papyrus.infra.extendedtypes.tests.test1";
/** no type identifier */
public static final String NO_TYPE = "no_type";
/** configuration name for test1::Class1 */
- public static final String CLASS1_TEST_TYPE_CONFIGURATION_ID = "org.eclipse.papyrus.extendedtypes.tests.Class1";
+ public static final String CLASS1_TEST_TYPE_CONFIGURATION_ID = "org.eclipse.papyrus.infra.extendedtypes.tests.Class1";
/** configuration name for test1::Class1 */
public static final String CLASS_IN_PACKAGE_TEST_TYPE_CONFIGURATION_ID = CLASS_IN_PACKAGE_TEST_TYPE_ID;
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/src/org/eclipse/papyrus/extendedtypes/preferences/ExtendedTypesPreferencesTests.java b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/src/org/eclipse/papyrus/infra/extendedtypes/preferences/ExtendedTypesPreferencesTests.java index bf8c0743be5..e8f25397ccf 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/src/org/eclipse/papyrus/extendedtypes/preferences/ExtendedTypesPreferencesTests.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/src/org/eclipse/papyrus/infra/extendedtypes/preferences/ExtendedTypesPreferencesTests.java @@ -11,12 +11,13 @@ * Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.extendedtypes.preferences;
+package org.eclipse.papyrus.infra.extendedtypes.preferences;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
+import org.eclipse.papyrus.infra.extendedtypes.preferences.ExtendedTypesPreferences;
import org.eclipse.ui.IMemento;
import org.eclipse.ui.XMLMemento;
import org.junit.After;
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.paletteconfiguration.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/core/org.eclipse.papyrus.paletteconfiguration.tests/META-INF/MANIFEST.MF index 89135fab197..e37a2be16f6 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.paletteconfiguration.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/core/org.eclipse.papyrus.paletteconfiguration.tests/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: Tests fragment for palette configuration plugin Bundle-SymbolicName: org.eclipse.papyrus.paletteconfiguration.tests;singleton:=true Bundle-Version: 0.9.0.qualifier Bundle-Vendor: CEA LIST -Fragment-Host: org.eclipse.papyrus.paletteconfiguration;bundle-version="0.7.1" +Fragment-Host: org.eclipse.papyrus.uml.diagram.paletteconfiguration;bundle-version="0.9.0" Bundle-RequiredExecutionEnvironment: J2SE-1.5 Require-Bundle: org.junit;bundle-version="4.8.1", - org.eclipse.papyrus.core.queries.test;bundle-version="0.7.0" + org.eclipse.papyrus.core.queries.test;bundle-version="0.9.0" diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.paletteconfiguration.tests/src/org/eclipse/papyrus/paletteconfiguration/tests/EXtendedPluginPaletteProviderTests_PapyrusService.java b/tests/junit/plugins/core/org.eclipse.papyrus.paletteconfiguration.tests/src/org/eclipse/papyrus/paletteconfiguration/tests/EXtendedPluginPaletteProviderTests_PapyrusService.java index 91b936ba821..28d0ddb34b6 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.paletteconfiguration.tests/src/org/eclipse/papyrus/paletteconfiguration/tests/EXtendedPluginPaletteProviderTests_PapyrusService.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.paletteconfiguration.tests/src/org/eclipse/papyrus/paletteconfiguration/tests/EXtendedPluginPaletteProviderTests_PapyrusService.java @@ -22,9 +22,9 @@ import org.eclipse.gmf.runtime.common.core.service.IProvider; import org.eclipse.gmf.runtime.common.core.service.Service;
import org.eclipse.gmf.runtime.diagram.ui.internal.services.palette.PaletteToolEntry;
import org.eclipse.gmf.runtime.gef.ui.internal.palette.PaletteStack;
-import org.eclipse.papyrus.diagram.common.service.PapyrusPaletteService;
-import org.eclipse.papyrus.paletteconfiguration.PaletteConfiguration;
-import org.eclipse.papyrus.paletteconfiguration.provider.ExtendedPluginPaletteProvider;
+import org.eclipse.papyrus.uml.diagram.common.service.PapyrusPaletteService;
+import org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteConfiguration;
+import org.eclipse.papyrus.uml.diagram.paletteconfiguration.provider.ExtendedPluginPaletteProvider;
import org.junit.After;
import org.junit.Before;
import org.junit.BeforeClass;
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.paletteconfiguration.tests/src/org/eclipse/papyrus/paletteconfiguration/tests/ExtendedPluginPaletteProviderTests_LoadPaletteConfiguration.java b/tests/junit/plugins/core/org.eclipse.papyrus.paletteconfiguration.tests/src/org/eclipse/papyrus/paletteconfiguration/tests/ExtendedPluginPaletteProviderTests_LoadPaletteConfiguration.java index 9bbc3dbec2a..0d87f16ab86 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.paletteconfiguration.tests/src/org/eclipse/papyrus/paletteconfiguration/tests/ExtendedPluginPaletteProviderTests_LoadPaletteConfiguration.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.paletteconfiguration.tests/src/org/eclipse/papyrus/paletteconfiguration/tests/ExtendedPluginPaletteProviderTests_LoadPaletteConfiguration.java @@ -21,8 +21,8 @@ import java.io.IOException; import java.util.Collection;
import org.eclipse.core.runtime.Platform;
-import org.eclipse.papyrus.paletteconfiguration.PaletteConfiguration;
-import org.eclipse.papyrus.paletteconfiguration.provider.ExtendedPluginPaletteProvider;
+import org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteConfiguration;
+import org.eclipse.papyrus.uml.diagram.paletteconfiguration.provider.ExtendedPluginPaletteProvider;
import org.junit.After;
import org.junit.Before;
import org.junit.BeforeClass;
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.paletteconfiguration.tests/src/org/eclipse/papyrus/paletteconfiguration/tests/ExtendedPluginPaletteProviderTests_RetrievePredefinedEntry.java b/tests/junit/plugins/core/org.eclipse.papyrus.paletteconfiguration.tests/src/org/eclipse/papyrus/paletteconfiguration/tests/ExtendedPluginPaletteProviderTests_RetrievePredefinedEntry.java index 72479fbb153..de6f37c7ad3 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.paletteconfiguration.tests/src/org/eclipse/papyrus/paletteconfiguration/tests/ExtendedPluginPaletteProviderTests_RetrievePredefinedEntry.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.paletteconfiguration.tests/src/org/eclipse/papyrus/paletteconfiguration/tests/ExtendedPluginPaletteProviderTests_RetrievePredefinedEntry.java @@ -21,7 +21,7 @@ import java.util.Map; import org.eclipse.gmf.runtime.diagram.ui.internal.services.palette.PaletteToolEntry;
import org.eclipse.gmf.runtime.gef.ui.internal.palette.PaletteDrawer;
import org.eclipse.gmf.runtime.gef.ui.internal.palette.PaletteStack;
-import org.eclipse.papyrus.paletteconfiguration.provider.ExtendedPluginPaletteProvider;
+import org.eclipse.papyrus.uml.diagram.paletteconfiguration.provider.ExtendedPluginPaletteProvider;
import org.junit.After;
import org.junit.Before;
import org.junit.BeforeClass;
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.properties.runtime.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/core/org.eclipse.papyrus.properties.runtime.tests/META-INF/MANIFEST.MF index 23b422e39e8..d225729aa14 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.properties.runtime.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/core/org.eclipse.papyrus.properties.runtime.tests/META-INF/MANIFEST.MF @@ -8,7 +8,7 @@ Bundle-Vendor: %providerName Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.junit;bundle-version="4.8.1", - org.eclipse.papyrus.properties.runtime;bundle-version="0.8.0", + org.eclipse.papyrus.views.properties.runtime;bundle-version="0.9.0", org.eclipse.gmf.runtime.common.ui.services;bundle-version="1.3.0" Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ActivationPolicy: lazy diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.properties.runtime.tests/test/org/eclipse/papyrus/properties/runtime/tests/controller/PropertyEditorControllerServiceTestCase.java b/tests/junit/plugins/core/org.eclipse.papyrus.properties.runtime.tests/test/org/eclipse/papyrus/properties/runtime/tests/controller/PropertyEditorControllerServiceTestCase.java index 4c9f45aebf5..34e0022e853 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.properties.runtime.tests/test/org/eclipse/papyrus/properties/runtime/tests/controller/PropertyEditorControllerServiceTestCase.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.properties.runtime.tests/test/org/eclipse/papyrus/properties/runtime/tests/controller/PropertyEditorControllerServiceTestCase.java @@ -1,6 +1,6 @@ /*****************************************************************************
* Copyright (c) 2010 CEA LIST.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -19,7 +19,7 @@ import java.lang.reflect.Method; import java.util.ArrayList;
import org.eclipse.gmf.runtime.common.core.service.Service;
-import org.eclipse.papyrus.properties.runtime.controller.PropertyEditorControllerService;
+import org.eclipse.papyrus.views.properties.runtime.controller.PropertyEditorControllerService;
import org.junit.Test;
@@ -56,7 +56,7 @@ public class PropertyEditorControllerServiceTestCase extends PropertyEditorContr // get the name of the 2 providers
for(Object object : providersList) {
- assertTrue("object is a " + object.getClass().getName(), (object instanceof org.eclipse.papyrus.properties.runtime.controller.PropertyEditorControllerService.ProviderDescriptor));
+ assertTrue("object is a " + object.getClass().getName(), (object instanceof org.eclipse.papyrus.views.properties.runtime.controller.PropertyEditorControllerService.ProviderDescriptor));
}
}
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
})
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/.project b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/.project index ce90e46429f..13ca6a9419b 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/.project +++ b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/.project @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.papyrus.sasheditor.tests</name>
+ <name>org.eclipse.papyrus.infra.core.sasheditor.tests</name>
<comment></comment>
<projects>
</projects>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/META-INF/MANIFEST.MF index 7d927d668c2..e293bbfa3bf 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/META-INF/MANIFEST.MF @@ -1,9 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %fragmentName -Bundle-SymbolicName: org.eclipse.papyrus.sasheditor.tests +Bundle-SymbolicName: org.eclipse.papyrus.infra.core.sasheditor.tests Bundle-Version: 0.9.0.qualifier Bundle-Vendor: %providerName -Fragment-Host: org.eclipse.papyrus.sasheditor;bundle-version="0.8.0" +Fragment-Host: org.eclipse.papyrus.infra.core.sasheditor;bundle-version="0.9.0" Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Localization: fragment diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/build.properties b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/build.properties index e2f332e572f..5be548a3c0b 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/build.properties +++ b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/build.properties @@ -2,6 +2,6 @@ source.. = test/ output.. = bin/
bin.includes = META-INF/,\
.,\
- org.eclipse.papyrus.sasheditor.tests.launch,\
+ org.eclipse.papyrus.infra.core.sasheditor.tests.launch,\
fragment.properties,\
about.html
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/org.eclipse.papyrus.sasheditor.tests.launch b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/org.eclipse.papyrus.sasheditor.tests.launch index 737a86888a1..ee8116d51a3 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/org.eclipse.papyrus.sasheditor.tests.launch +++ b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/org.eclipse.papyrus.sasheditor.tests.launch @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
<booleanAttribute key="append.args" value="true"/>
<booleanAttribute key="askclear" value="false"/>
@@ -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.tests/test/org/eclipse/papyrus/sasheditor/AllTests.java"/>
+<listEntry value="/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/AllTests.java"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="1"/>
@@ -23,7 +23,7 @@ <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
<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.MAIN_TYPE" value="org.eclipse.papyrus.sasheditor.tests.AllTests"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.infra.core.sasheditor.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.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.tests/test/org/eclipse/papyrus/sasheditor/contentprovider/IPageMngrTest.java b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/IPageMngrTest.java index 93c42cc28c6..9c7a18887c4 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/sasheditor/contentprovider/IPageMngrTest.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/IPageMngrTest.java @@ -1,10 +1,12 @@ /**
*
*/
-package org.eclipse.papyrus.sasheditor.contentprovider;
+package org.eclipse.papyrus.infra.core.sasheditor.contentprovider;
import junit.framework.TestCase;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider;
+
/**
* Base class for testing real implementation of ContentProvider.
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/sasheditor/contentprovider/simple/AllTests.java b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/AllTests.java index a9047bbf64b..21aedcb434b 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/sasheditor/contentprovider/simple/AllTests.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/AllTests.java @@ -9,16 +9,15 @@ * Contributors:
* Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.sasheditor.contentprovider.simple;
+package org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple;
-import org.eclipse.papyrus.sasheditor.editor.SashMultiPageEditorTest;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
import org.junit.runners.Suite.SuiteClasses;
/**
- * All tests for package org.eclipse.papyrus.sasheditor.contentprovider.simple
+ * All tests for package org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple
*/
@RunWith(Suite.class)
@SuiteClasses({ SimpleSashWindowsContentProviderTest.class })
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/sasheditor/contentprovider/simple/FakePageModel.java b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/FakePageModel.java index 43bdf5ed67c..12e3de11f03 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/sasheditor/contentprovider/simple/FakePageModel.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/FakePageModel.java @@ -11,9 +11,9 @@ * Cedric Dumoulin Cedric.dumoulin@lifl.fr - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.sasheditor.contentprovider.simple;
+package org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple;
-import org.eclipse.papyrus.sasheditor.contentprovider.IPageModel;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel;
import org.eclipse.swt.graphics.Image;
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/sasheditor/contentprovider/simple/SimpleSashWindowsContentProviderTest.java b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/SimpleSashWindowsContentProviderTest.java index 0d90ba92044..0f5872f51b4 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/sasheditor/contentprovider/simple/SimpleSashWindowsContentProviderTest.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/SimpleSashWindowsContentProviderTest.java @@ -11,15 +11,16 @@ * Cedric Dumoulin Cedric.dumoulin@lifl.fr - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.sasheditor.contentprovider.simple;
+package org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple;
import java.util.ArrayList;
import java.util.List;
import junit.framework.TestCase;
-import org.eclipse.papyrus.sasheditor.contentprovider.IPageModel;
-import org.eclipse.papyrus.sasheditor.contentprovider.ITabFolderModel;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowsContentProvider;
import org.eclipse.swt.SWT;
@@ -48,7 +49,7 @@ public class SimpleSashWindowsContentProviderTest extends TestCase { /**
* Test method for
- * {@link org.eclipse.papyrus.sasheditor.contentprovider.simple.SimpleSashWindowsContentProvider#addPage(org.eclipse.papyrus.sasheditor.contentprovider.IPageModel)}
+ * {@link org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowsContentProvider#addPage(org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel)}
* .
*/
public void testAddTabIPageModel() {
@@ -60,7 +61,7 @@ public class SimpleSashWindowsContentProviderTest extends TestCase { /**
* Test method for
- * {@link org.eclipse.papyrus.sasheditor.contentprovider.simple.SimpleSashWindowsContentProvider#movePage(org.eclipse.papyrus.sasheditor.contentprovider.ITabFolderModel, int, int)}
+ * {@link org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowsContentProvider#movePage(org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel, int, int)}
* .
*/
// public void testMoveTabITabFolderModelIntInt() {
@@ -69,7 +70,7 @@ public class SimpleSashWindowsContentProviderTest extends TestCase { /**
* Test method for
- * {@link org.eclipse.papyrus.sasheditor.contentprovider.simple.SimpleSashWindowsContentProvider#movePage(org.eclipse.papyrus.sasheditor.contentprovider.ITabFolderModel, int, org.eclipse.papyrus.sasheditor.contentprovider.ITabFolderModel, int)}
+ * {@link org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowsContentProvider#movePage(org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel, int, org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel, int)}
* .
*/
// public void testMoveTabITabFolderModelIntITabFolderModelInt() {
@@ -78,7 +79,7 @@ public class SimpleSashWindowsContentProviderTest extends TestCase { /**
* Test method for
- * {@link org.eclipse.papyrus.sasheditor.contentprovider.simple.SimpleSashWindowsContentProvider#createFolder(org.eclipse.papyrus.sasheditor.contentprovider.ITabFolderModel, int, org.eclipse.papyrus.sasheditor.contentprovider.ITabFolderModel, int)}
+ * {@link org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowsContentProvider#createFolder(org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel, int, org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel, int)}
* .
*/
public void testCreateFolder() {
@@ -140,7 +141,7 @@ public class SimpleSashWindowsContentProviderTest extends TestCase { /**
* Test method for
- * {@link org.eclipse.papyrus.sasheditor.contentprovider.simple.SimpleSashWindowsContentProvider#createFolder(org.eclipse.papyrus.sasheditor.contentprovider.ITabFolderModel, int, org.eclipse.papyrus.sasheditor.contentprovider.ITabFolderModel, int)}
+ * {@link org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowsContentProvider#createFolder(org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel, int, org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel, int)}
* .
*/
public void testCreateFolder_ITabFolderModel_int() {
@@ -184,7 +185,7 @@ public class SimpleSashWindowsContentProviderTest extends TestCase { assertTrue("Folder contains added item", newFolder.getChildren().contains(movedTab));
}
/**
- * Test method for {@link org.eclipse.papyrus.sasheditor.contentprovider.simple.SimpleSashWindowsContentProvider#removePage(int)}.
+ * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowsContentProvider#removePage(int)}.
*/
// public void testRemoveTabInt() {
// fail("Not yet implemented");
@@ -192,7 +193,7 @@ public class SimpleSashWindowsContentProviderTest extends TestCase { /**
* Test method for
- * {@link org.eclipse.papyrus.sasheditor.contentprovider.simple.SimpleSashWindowsContentProvider#removePage(org.eclipse.papyrus.sasheditor.contentprovider.IPageModel)}
+ * {@link org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowsContentProvider#removePage(org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel)}
* .
*/
// public void testRemoveTabIPageModel() {
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/sasheditor/editor/AllTests.java b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/editor/AllTests.java index 7ab7d1defef..f1eb15bd6d7 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/sasheditor/editor/AllTests.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/editor/AllTests.java @@ -9,7 +9,7 @@ * Contributors:
* Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.sasheditor.editor;
+package org.eclipse.papyrus.infra.core.sasheditor.editor;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@@ -17,7 +17,7 @@ import org.junit.runners.Suite.SuiteClasses; /**
- * All tests for package org.eclipse.papyrus.sasheditor.editor
+ * All tests for package org.eclipse.papyrus.infra.core.sasheditor.editor
*/
@RunWith(Suite.class)
@SuiteClasses({ SashMultiPageEditorTest.class })
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/sasheditor/editor/FakeEditorModel.java b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/editor/FakeEditorModel.java index 9602494f120..13e7919b3f9 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/sasheditor/editor/FakeEditorModel.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/editor/FakeEditorModel.java @@ -1,10 +1,10 @@ /**
*
*/
-package org.eclipse.papyrus.sasheditor.editor;
+package org.eclipse.papyrus.infra.core.sasheditor.editor;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.papyrus.sasheditor.contentprovider.IEditorModel;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IEditorModel;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.IEditorInput;
@@ -29,7 +29,7 @@ public class FakeEditorModel implements IEditorModel { name = "noname";
}
/**
- * @see org.eclipse.papyrus.sasheditor.contentprovider.IPageModel#getTabTitle()
+ * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel#getTabTitle()
*
* @return
*/
@@ -38,7 +38,7 @@ public class FakeEditorModel implements IEditorModel { }
/**
- * @see org.eclipse.papyrus.sasheditor.contentprovider.IPageModel#getTabIcon()
+ * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel#getTabIcon()
*
* @return
*/
@@ -47,7 +47,7 @@ public class FakeEditorModel implements IEditorModel { }
/**
- * @see org.eclipse.papyrus.sasheditor.contentprovider.IPageModel#getRawModel()
+ * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel#getRawModel()
*
* @return
*/
@@ -57,7 +57,7 @@ public class FakeEditorModel implements IEditorModel { }
/**
- * @see org.eclipse.papyrus.sasheditor.contentprovider.IEditorModel#createIEditorPart()
+ * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IEditorModel#createIEditorPart()
*
* @return
* @throws PartInitException
@@ -67,7 +67,7 @@ public class FakeEditorModel implements IEditorModel { }
/**
- * @see org.eclipse.papyrus.sasheditor.contentprovider.IEditorModel#getActionBarContributor()
+ * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IEditorModel#getActionBarContributor()
*
* @return
*/
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/sasheditor/editor/MessagePartModel.java b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/editor/MessagePartModel.java index eafb0e28e85..5cdd6ac0109 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/sasheditor/editor/MessagePartModel.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/editor/MessagePartModel.java @@ -1,6 +1,6 @@ -package org.eclipse.papyrus.sasheditor.editor;
+package org.eclipse.papyrus.infra.core.sasheditor.editor;
-import org.eclipse.papyrus.sasheditor.contentprovider.IComponentModel;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IComponentModel;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.StyledText;
import org.eclipse.swt.graphics.Image;
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/sasheditor/editor/SashMultiPageEditorTest.java b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/editor/SashMultiPageEditorTest.java index 61e08b69f7e..3f99ef889f8 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/sasheditor/editor/SashMultiPageEditorTest.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/editor/SashMultiPageEditorTest.java @@ -1,7 +1,7 @@ /**
*
*/
-package org.eclipse.papyrus.sasheditor.editor;
+package org.eclipse.papyrus.infra.core.sasheditor.editor;
import junit.framework.TestCase;
@@ -12,7 +12,7 @@ import junit.framework.TestCase; public class SashMultiPageEditorTest extends TestCase {
/**
- * Test method for {@link org.eclipse.papyrus.sasheditor.editor.AbstractMultiPageSashEditor#refreshTabs()}.
+ * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.editor.AbstractMultiPageSashEditor#refreshTabs()}.
*/
public void testRefreshTabs() {
// fail("Not yet implemented"); // TODO
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/sasheditor/editor/ShellEditor.java b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/editor/ShellEditor.java index f86f5a598bc..687432e71cc 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/sasheditor/editor/ShellEditor.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/editor/ShellEditor.java @@ -11,12 +11,12 @@ * Cedric Dumoulin Cedric.dumoulin@lifl.fr - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.sasheditor.editor;
+package org.eclipse.papyrus.infra.core.sasheditor.editor;
-import org.eclipse.papyrus.sasheditor.contentprovider.IPageModel;
-import org.eclipse.papyrus.sasheditor.contentprovider.ISashWindowsContentProvider;
-import org.eclipse.papyrus.sasheditor.contentprovider.simple.SimpleSashWindowsContentProvider;
-import org.eclipse.papyrus.sasheditor.internal.SashWindowsContainer;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowsContentProvider;
+import org.eclipse.papyrus.infra.core.sasheditor.editor.SashWindowsContainer;
import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Display;
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/sasheditor/internal/AllTests.java b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/internal/AllTests.java index ff7882c3325..4dcc0bf054e 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/sasheditor/internal/AllTests.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/internal/AllTests.java @@ -9,7 +9,7 @@ * Contributors:
* Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.sasheditor.internal;
+package org.eclipse.papyrus.infra.core.sasheditor.internal;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@@ -17,7 +17,7 @@ import org.junit.runners.Suite.SuiteClasses; /**
- * All tests for package org.eclipse.papyrus.sasheditor.internal
+ * All tests for package org.eclipse.papyrus.infra.core.sasheditor.internal
*/
@RunWith(Suite.class)
@SuiteClasses({ SashContainerEventsProviderTest.class, SashWindowsContainerEventsProviderTest.class, SashWindowsContainerTest.class })
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/sasheditor/internal/FakePagePart.java b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/internal/FakePagePart.java index 7f4e0708461..2ab4d8dbcc1 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/sasheditor/internal/FakePagePart.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/internal/FakePagePart.java @@ -1,7 +1,7 @@ /**
*
*/
-package org.eclipse.papyrus.sasheditor.internal;
+package org.eclipse.papyrus.infra.core.sasheditor.internal;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/sasheditor/internal/FakeSashContainerEventsListener.java b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/internal/FakeSashContainerEventsListener.java index 8569b1cc836..33e19d76bed 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/sasheditor/internal/FakeSashContainerEventsListener.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/internal/FakeSashContainerEventsListener.java @@ -1,12 +1,13 @@ /**
*
*/
-package org.eclipse.papyrus.sasheditor.internal;
+package org.eclipse.papyrus.infra.core.sasheditor.internal;
import java.util.ArrayList;
import java.util.List;
-import org.eclipse.papyrus.sasheditor.editor.IPage;
+import org.eclipse.papyrus.infra.core.sasheditor.editor.IPage;
+import org.eclipse.papyrus.infra.core.sasheditor.editor.SashContainerEventsListener;
/**
@@ -32,13 +33,13 @@ public class FakeSashContainerEventsListener implements SashContainerEventsListe /** */
public int eventCount = 0;
-
+
/** */
public List<String> traces;
-
+
/** */
public List<IPage> events;
-
+
/**
*
* Constructor.
@@ -48,8 +49,8 @@ public class FakeSashContainerEventsListener implements SashContainerEventsListe traces = new ArrayList<String>();
events = new ArrayList<IPage>();
}
-
-
+
+
/**
* @return the eventCount
*/
@@ -57,7 +58,7 @@ public class FakeSashContainerEventsListener implements SashContainerEventsListe return eventCount;
}
-
+
/**
* @return the trace
*/
@@ -92,7 +93,7 @@ public class FakeSashContainerEventsListener implements SashContainerEventsListe public void resetChangeCount() {
eventCount = 0;
}
-
+
/**
*
*/
@@ -100,13 +101,13 @@ public class FakeSashContainerEventsListener implements SashContainerEventsListe traces.clear();
events.clear();
}
-
+
/* ************************** */
/* Methods */
/* ************************** */
-
+
/**
- * @see org.eclipse.papyrus.sasheditor.editor.IPageChangedListener#pageChanged(org.eclipse.papyrus.sasheditor.editor.IPage)
+ * @see org.eclipse.papyrus.infra.core.sasheditor.editor.IPageChangedListener#pageChanged(org.eclipse.papyrus.infra.core.sasheditor.editor.IPage)
*
* @param newPage
*/
@@ -117,7 +118,7 @@ public class FakeSashContainerEventsListener implements SashContainerEventsListe }
/**
- * @see org.eclipse.papyrus.sasheditor.internal.SashContainerEventsListener#pageOpened(org.eclipse.papyrus.sasheditor.editor.IPage)
+ * @see org.eclipse.papyrus.infra.core.sasheditor.internal.SashContainerEventsListener#pageOpened(org.eclipse.papyrus.infra.core.sasheditor.editor.IPage)
*
* @param page
*/
@@ -128,7 +129,7 @@ public class FakeSashContainerEventsListener implements SashContainerEventsListe }
/**
- * @see org.eclipse.papyrus.sasheditor.internal.SashContainerEventsListener#pageClosed(org.eclipse.papyrus.sasheditor.editor.IPage)
+ * @see org.eclipse.papyrus.infra.core.sasheditor.internal.SashContainerEventsListener#pageClosed(org.eclipse.papyrus.infra.core.sasheditor.editor.IPage)
*
* @param page
*/
@@ -139,7 +140,7 @@ public class FakeSashContainerEventsListener implements SashContainerEventsListe }
/**
- * @see org.eclipse.papyrus.sasheditor.internal.SashContainerEventsListener#pageActivated(org.eclipse.papyrus.sasheditor.editor.IPage)
+ * @see org.eclipse.papyrus.infra.core.sasheditor.internal.SashContainerEventsListener#pageActivated(org.eclipse.papyrus.infra.core.sasheditor.editor.IPage)
*
* @param page
*/
@@ -150,7 +151,7 @@ public class FakeSashContainerEventsListener implements SashContainerEventsListe }
/**
- * @see org.eclipse.papyrus.sasheditor.internal.SashContainerEventsListener#pageDeactivated(org.eclipse.papyrus.sasheditor.editor.IPage)
+ * @see org.eclipse.papyrus.infra.core.sasheditor.internal.SashContainerEventsListener#pageDeactivated(org.eclipse.papyrus.infra.core.sasheditor.editor.IPage)
*
* @param page
*/
@@ -161,7 +162,7 @@ public class FakeSashContainerEventsListener implements SashContainerEventsListe }
/**
- * @see org.eclipse.papyrus.sasheditor.internal.SashContainerEventsListener#pageAboutToBeOpened(org.eclipse.papyrus.sasheditor.editor.IPage)
+ * @see org.eclipse.papyrus.infra.core.sasheditor.internal.SashContainerEventsListener#pageAboutToBeOpened(org.eclipse.papyrus.infra.core.sasheditor.editor.IPage)
*
* @param page
*/
@@ -172,7 +173,7 @@ public class FakeSashContainerEventsListener implements SashContainerEventsListe }
/**
- * @see org.eclipse.papyrus.sasheditor.internal.SashContainerEventsListener#pageAboutToBeClosed(org.eclipse.papyrus.sasheditor.editor.IPage)
+ * @see org.eclipse.papyrus.infra.core.sasheditor.internal.SashContainerEventsListener#pageAboutToBeClosed(org.eclipse.papyrus.infra.core.sasheditor.editor.IPage)
*
* @param page
*/
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/sasheditor/internal/SashContainerEventsProviderTest.java b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/internal/SashContainerEventsProviderTest.java index ba345257b71..6231b35f0c5 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/sasheditor/internal/SashContainerEventsProviderTest.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/internal/SashContainerEventsProviderTest.java @@ -1,10 +1,12 @@ /**
*
*/
-package org.eclipse.papyrus.sasheditor.internal;
+package org.eclipse.papyrus.infra.core.sasheditor.internal;
import static org.junit.Assert.assertEquals;
+import org.eclipse.papyrus.infra.core.sasheditor.internal.PagePart;
+import org.eclipse.papyrus.infra.core.sasheditor.internal.SashContainerEventsProvider;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -31,7 +33,7 @@ public class SashContainerEventsProviderTest { }
/**
- * Test method for {@link org.eclipse.papyrus.sasheditor.internal.SashContainerEventsProvider#addListener(org.eclipse.papyrus.sasheditor.internal.SashContainerEventsListener)}.
+ * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.internal.SashContainerEventsProvider#addListener(org.eclipse.papyrus.infra.core.sasheditor.internal.SashContainerEventsListener)}.
*/
@Test
public void testAddActiveEditorChangedListener() {
@@ -49,7 +51,7 @@ public class SashContainerEventsProviderTest { }
/**
- * Test method for {@link org.eclipse.papyrus.sasheditor.internal.SashContainerEventsProvider#removeListener(org.eclipse.papyrus.sasheditor.internal.SashContainerEventsListener)}.
+ * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.internal.SashContainerEventsProvider#removeListener(org.eclipse.papyrus.infra.core.sasheditor.internal.SashContainerEventsListener)}.
*/
@Test
public void testRemoveActiveEditorChangedListener() {
@@ -68,7 +70,7 @@ public class SashContainerEventsProviderTest { }
/**
- * Test method for {@link org.eclipse.papyrus.sasheditor.internal.SashContainerEventsProvider#firePageOpenedEvent(org.eclipse.papyrus.sasheditor.internal.PagePart)}.
+ * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.internal.SashContainerEventsProvider#firePageOpenedEvent(org.eclipse.papyrus.infra.core.sasheditor.internal.PagePart)}.
*/
@Test
public void testFirePageOpenedEvent() {
@@ -87,7 +89,7 @@ public class SashContainerEventsProviderTest { }
/**
- * Test method for {@link org.eclipse.papyrus.sasheditor.internal.SashContainerEventsProvider#firePageClosedEvent(org.eclipse.papyrus.sasheditor.internal.PagePart)}.
+ * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.internal.SashContainerEventsProvider#firePageClosedEvent(org.eclipse.papyrus.infra.core.sasheditor.internal.PagePart)}.
*/
@Test
public void testFirePageClosedEvent() {
@@ -106,7 +108,7 @@ public class SashContainerEventsProviderTest { }
/**
- * Test method for {@link org.eclipse.papyrus.sasheditor.internal.SashContainerEventsProvider#firePageAboutToBeOpenedEvent(org.eclipse.papyrus.sasheditor.internal.PagePart)}.
+ * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.internal.SashContainerEventsProvider#firePageAboutToBeOpenedEvent(org.eclipse.papyrus.infra.core.sasheditor.internal.PagePart)}.
*/
@Test
public void testFirePageAboutToBeOpenedEvent() {
@@ -125,7 +127,7 @@ public class SashContainerEventsProviderTest { }
/**
- * Test method for {@link org.eclipse.papyrus.sasheditor.internal.SashContainerEventsProvider#firePageAboutToBeClosedEvent(org.eclipse.papyrus.sasheditor.internal.PagePart)}.
+ * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.internal.SashContainerEventsProvider#firePageAboutToBeClosedEvent(org.eclipse.papyrus.infra.core.sasheditor.internal.PagePart)}.
*/
@Test
public void testFirePageAboutToBeClosedEvent() {
@@ -144,7 +146,7 @@ public class SashContainerEventsProviderTest { }
/**
- * Test method for {@link org.eclipse.papyrus.sasheditor.internal.SashContainerEventsProvider#firePageActivatedEvent(org.eclipse.papyrus.sasheditor.internal.PagePart)}.
+ * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.internal.SashContainerEventsProvider#firePageActivatedEvent(org.eclipse.papyrus.infra.core.sasheditor.internal.PagePart)}.
*/
@Test
public void testFirePageActivatedEvent() {
@@ -163,7 +165,7 @@ public class SashContainerEventsProviderTest { }
/**
- * Test method for {@link org.eclipse.papyrus.sasheditor.internal.SashContainerEventsProvider#firePageDeactivatedEvent(org.eclipse.papyrus.sasheditor.internal.PagePart)}.
+ * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.internal.SashContainerEventsProvider#firePageDeactivatedEvent(org.eclipse.papyrus.infra.core.sasheditor.internal.PagePart)}.
*/
@Test
public void testFirePageDeactivatedEvent() {
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/sasheditor/internal/SashWindowsContainerEventsProviderTest.java b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/internal/SashWindowsContainerEventsProviderTest.java index 6d6d1e15f15..6b84ab2b5cc 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/sasheditor/internal/SashWindowsContainerEventsProviderTest.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/internal/SashWindowsContainerEventsProviderTest.java @@ -1,7 +1,7 @@ /**
*
*/
-package org.eclipse.papyrus.sasheditor.internal;
+package org.eclipse.papyrus.infra.core.sasheditor.internal;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -10,12 +10,13 @@ import static org.junit.Assert.assertTrue; import java.util.ArrayList;
import java.util.List;
-import org.eclipse.papyrus.sasheditor.contentprovider.IPageModel;
-import org.eclipse.papyrus.sasheditor.contentprovider.ISashWindowsContentProvider;
-import org.eclipse.papyrus.sasheditor.contentprovider.ITabFolderModel;
-import org.eclipse.papyrus.sasheditor.contentprovider.simple.SimpleSashWindowsContentProvider;
-import org.eclipse.papyrus.sasheditor.editor.IPage;
-import org.eclipse.papyrus.sasheditor.editor.MessagePartModel;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowsContentProvider;
+import org.eclipse.papyrus.infra.core.sasheditor.editor.IPage;
+import org.eclipse.papyrus.infra.core.sasheditor.editor.MessagePartModel;
+import org.eclipse.papyrus.infra.core.sasheditor.editor.SashWindowsContainer;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.widgets.Display;
@@ -34,7 +35,7 @@ import org.junit.Test; public class SashWindowsContainerEventsProviderTest {
protected Display display;
-
+
/**
* @throws java.lang.Exception
*/
@@ -66,7 +67,7 @@ public class SashWindowsContainerEventsProviderTest { */
private Display getDisplay() {
return display;
-
+
}
/**
* Create a {@link SashWindowsContainer} to test. Initialize it with provided {@link ISashWindowsContentProvider}.
@@ -75,7 +76,7 @@ public class SashWindowsContainerEventsProviderTest { * @return
*/
protected SashWindowsContainer createSashWindowsContainer(ISashWindowsContentProvider contentProvider) {
-
+
display = getDisplay();
Shell shell = new Shell(display);
shell.setLayout(new FillLayout());
@@ -122,28 +123,28 @@ public class SashWindowsContainerEventsProviderTest { container.visit(visitor);
return visitor.result();
}
-
-
+
+
/**
- * Test method for {@link org.eclipse.papyrus.sasheditor.internal.SashContainerEventsProvider#addListener(org.eclipse.papyrus.sasheditor.internal.SashContainerEventsListener)}.
+ * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.internal.SashContainerEventsProvider#addListener(org.eclipse.papyrus.infra.core.sasheditor.internal.SashContainerEventsListener)}.
*/
@Test
public void testAddActiveEditorChangedListener() {
}
/**
- * Test method for {@link org.eclipse.papyrus.sasheditor.internal.SashContainerEventsProvider#removeListener(org.eclipse.papyrus.sasheditor.internal.SashContainerEventsListener)}.
+ * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.internal.SashContainerEventsProvider#removeListener(org.eclipse.papyrus.infra.core.sasheditor.internal.SashContainerEventsListener)}.
*/
@Test
public void testRemoveActiveEditorChangedListener() {
}
/**
- * Test method for {@link org.eclipse.papyrus.sasheditor.internal.SashContainerEventsProvider#firePageOpenedEvent(org.eclipse.papyrus.sasheditor.internal.PagePart)}.
+ * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.internal.SashContainerEventsProvider#firePageOpenedEvent(org.eclipse.papyrus.infra.core.sasheditor.internal.PagePart)}.
*/
@Test
public void testFirePageOpenedEvent() {
-
+
// Create container and contentProvider
ISashWindowsContentProvider contentProvider = createContentProvider();
SashWindowsContainer container = createSashWindowsContainer(contentProvider);
@@ -157,11 +158,11 @@ public class SashWindowsContainerEventsProviderTest { listener.resetChangeCount();
listener.resetTraces();
-
+
// Add an editor
contentProvider.addPage( new MessagePartModel("newPage") );
container.refreshTabs();
-
+
// check events (there is more than the 2 expected)
assertTrue("event fired", 2<=listener.getEventCount());
int i=0;
@@ -170,7 +171,7 @@ public class SashWindowsContainerEventsProviderTest { }
/**
- * Test method for {@link org.eclipse.papyrus.sasheditor.internal.SashContainerEventsProvider#firePageClosedEvent(org.eclipse.papyrus.sasheditor.internal.PagePart)}.
+ * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.internal.SashContainerEventsProvider#firePageClosedEvent(org.eclipse.papyrus.infra.core.sasheditor.internal.PagePart)}.
*/
@Test
public void testFirePageClosedEvent() {
@@ -185,24 +186,24 @@ public class SashWindowsContainerEventsProviderTest { // Do refresh. This fire events
container.refreshTabs();
-
+
// Add an editor
IPageModel model = new MessagePartModel("newPage");
contentProvider.addPage( model );
container.refreshTabs();
listener.resetChangeCount();
listener.resetTraces();
-
+
IPage page1 = lookupTabFolderPart(container, model);
assertNotNull("Page found", page1);
// Close page
contentProvider.removePage(model);
container.refreshTabs();
-
+
// check events (there is more than the 2 expected)
assertTrue("event fired", 2<=listener.getEventCount());
-
+
assertTrue("close event fired", listener.getEvents().contains(page1));
assertTrue("close event fired", listener.getTraces().contains(FakeSashContainerEventsListener.PAGE_CLOSED));
int index = listener.getTraces().indexOf(FakeSashContainerEventsListener.PAGE_CLOSED);
@@ -210,7 +211,7 @@ public class SashWindowsContainerEventsProviderTest { }
/**
- * Test method for {@link org.eclipse.papyrus.sasheditor.internal.SashContainerEventsProvider#firePageAboutToBeOpenedEvent(org.eclipse.papyrus.sasheditor.internal.PagePart)}.
+ * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.internal.SashContainerEventsProvider#firePageAboutToBeOpenedEvent(org.eclipse.papyrus.infra.core.sasheditor.internal.PagePart)}.
*/
@Test
public void testFirePageAboutToBeOpenedEvent() {
@@ -227,11 +228,11 @@ public class SashWindowsContainerEventsProviderTest { listener.resetChangeCount();
listener.resetTraces();
-
+
// Add an editor
contentProvider.addPage( new MessagePartModel("newPage") );
container.refreshTabs();
-
+
// check events (there is more than the 2 expected)
assertTrue("event fired", 2<=listener.getEventCount());
int i=0;
@@ -239,7 +240,7 @@ public class SashWindowsContainerEventsProviderTest { }
/**
- * Test method for {@link org.eclipse.papyrus.sasheditor.internal.SashContainerEventsProvider#firePageAboutToBeClosedEvent(org.eclipse.papyrus.sasheditor.internal.PagePart)}.
+ * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.internal.SashContainerEventsProvider#firePageAboutToBeClosedEvent(org.eclipse.papyrus.infra.core.sasheditor.internal.PagePart)}.
*/
@Test
public void testFirePageAboutToBeClosedEvent() {
@@ -247,7 +248,7 @@ public class SashWindowsContainerEventsProviderTest { }
/**
- * Test method for {@link org.eclipse.papyrus.sasheditor.internal.SashContainerEventsProvider#firePageActivatedEvent(org.eclipse.papyrus.sasheditor.internal.PagePart)}.
+ * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.internal.SashContainerEventsProvider#firePageActivatedEvent(org.eclipse.papyrus.infra.core.sasheditor.internal.PagePart)}.
*/
@Test
public void testFirePageActivatedEvent() {
@@ -261,14 +262,14 @@ public class SashWindowsContainerEventsProviderTest { container.refreshTabs();
-
+
// Add two pages
IPageModel pageModel1 = new MessagePartModel("newPage1");
IPageModel pageModel2 = new MessagePartModel("newPage2");
contentProvider.addPage(pageModel1);
contentProvider.addPage(pageModel2);
-
-
+
+
// Do refresh. This fire events
container.refreshTabs();
listener.resetChangeCount();
@@ -277,12 +278,12 @@ public class SashWindowsContainerEventsProviderTest { // Activate page 1
IPage page1 = lookupTabFolderPart(container, pageModel1);
container.selectPage(page1);
-
+
// check events (there is more than the 2 expected)
assertEquals("event fired", 1, listener.getEventCount());
int i=0;
assertEquals("right event", FakeSashContainerEventsListener.PAGE_ACTIVATED, listener.getTraces().get(i++));
-
+
// ****************
// Check with a move
listener.resetChangeCount();
@@ -297,12 +298,12 @@ public class SashWindowsContainerEventsProviderTest { assertEquals("event fired", 3, listener.getEventCount());
i=0;
assertEquals("right event", FakeSashContainerEventsListener.PAGE_ACTIVATED, listener.getTraces().get(i++));
-
+
}
/**
- * Test method for {@link org.eclipse.papyrus.sasheditor.internal.SashContainerEventsProvider#firePageDeactivatedEvent(org.eclipse.papyrus.sasheditor.internal.PagePart)}.
+ * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.internal.SashContainerEventsProvider#firePageDeactivatedEvent(org.eclipse.papyrus.infra.core.sasheditor.internal.PagePart)}.
*/
@Test
public void testFirePageDeactivatedEvent() {
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/sasheditor/internal/SashWindowsContainerTest.java b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/internal/SashWindowsContainerTest.java index cee7a3362f3..813729e583c 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/sasheditor/internal/SashWindowsContainerTest.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/internal/SashWindowsContainerTest.java @@ -1,7 +1,7 @@ /**
*
*/
-package org.eclipse.papyrus.sasheditor.internal;
+package org.eclipse.papyrus.infra.core.sasheditor.internal;
import java.util.ArrayList;
import java.util.Collection;
@@ -10,16 +10,17 @@ import java.util.List; import junit.framework.TestCase;
import org.eclipse.jface.action.MenuManager;
-import org.eclipse.papyrus.sasheditor.contentprovider.IPageModel;
-import org.eclipse.papyrus.sasheditor.contentprovider.ISashWindowsContentProvider;
-import org.eclipse.papyrus.sasheditor.contentprovider.ITabFolderModel;
-import org.eclipse.papyrus.sasheditor.contentprovider.simple.SimpleSashWindowsContentProvider;
-import org.eclipse.papyrus.sasheditor.editor.FakeEditorModel;
-import org.eclipse.papyrus.sasheditor.editor.IComponentPage;
-import org.eclipse.papyrus.sasheditor.editor.IEditorPage;
-import org.eclipse.papyrus.sasheditor.editor.IPage;
-import org.eclipse.papyrus.sasheditor.editor.IPageVisitor;
-import org.eclipse.papyrus.sasheditor.editor.MessagePartModel;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowsContentProvider;
+import org.eclipse.papyrus.infra.core.sasheditor.editor.IComponentPage;
+import org.eclipse.papyrus.infra.core.sasheditor.editor.IEditorPage;
+import org.eclipse.papyrus.infra.core.sasheditor.editor.IPageVisitor;
+import org.eclipse.papyrus.infra.core.sasheditor.editor.MessagePartModel;
+import org.eclipse.papyrus.infra.core.sasheditor.editor.SashWindowsContainer;
+import org.eclipse.papyrus.infra.core.sasheditor.internal.LookupFolderPartByRawModelVisitor;
+import org.eclipse.papyrus.infra.core.sasheditor.internal.TabFolderPart;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.widgets.Display;
@@ -112,7 +113,7 @@ public class SashWindowsContainerTest extends TestCase { /**
* Test the method on a model with several folders and page.
- * Test method for {@link org.eclipse.papyrus.sasheditor.internal.SashWindowsContainer#getActiveEditor()}.
+ * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.internal.SashWindowsContainer#getActiveEditor()}.
*/
public void testGetActiveEditor() {
// Create
@@ -138,7 +139,7 @@ public class SashWindowsContainerTest extends TestCase { /**
* Test the method on a model with several folders and page.
- * Test method for {@link org.eclipse.papyrus.sasheditor.internal.SashWindowsContainer#getActiveEditor()}.
+ * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.internal.SashWindowsContainer#getActiveEditor()}.
*/
public void testGetVisiblePages() {
// Create
@@ -180,7 +181,7 @@ public class SashWindowsContainerTest extends TestCase { /**
* Test the method on a model with no pages.
- * Test method for {@link org.eclipse.papyrus.sasheditor.internal.SashWindowsContainer#getActiveEditor()}.
+ * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.internal.SashWindowsContainer#getActiveEditor()}.
*/
public void testGetActiveEditorNoPage() {
// Create
@@ -195,7 +196,7 @@ public class SashWindowsContainerTest extends TestCase { /**
- * Test method for {@link org.eclipse.papyrus.sasheditor.internal.SashWindowsContainer#refreshTabs()}.
+ * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.internal.SashWindowsContainer#refreshTabs()}.
*/
public void testRefreshTabs() {
@@ -208,7 +209,7 @@ public class SashWindowsContainerTest extends TestCase { }
/**
- * Test method for {@link org.eclipse.papyrus.sasheditor.internal.SashWindowsContainer#refreshTabs()}.
+ * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.internal.SashWindowsContainer#refreshTabs()}.
*/
public void testRefreshTabs2() {
@@ -236,7 +237,7 @@ public class SashWindowsContainerTest extends TestCase { }
/**
- * Test method for {@link SashWindowsContainer#visit(org.eclipse.papyrus.sasheditor.editor.IPageVisitor)}
+ * Test method for {@link SashWindowsContainer#visit(org.eclipse.papyrus.infra.core.sasheditor.editor.IPageVisitor)}
*/
public void testVisit() {
// Create
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/sasheditor/tests/AllTests.java b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/AllTests.java index f43023974f5..b87762c4c88 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/sasheditor/tests/AllTests.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/AllTests.java @@ -9,7 +9,7 @@ * Contributors:
* Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.sasheditor.tests;
+package org.eclipse.papyrus.infra.core.sasheditor.tests;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@@ -22,7 +22,7 @@ import org.junit.runners.Suite.SuiteClasses; @RunWith(Suite.class)
@SuiteClasses({
// testModel1
-org.eclipse.papyrus.sasheditor.contentprovider.simple.AllTests.class, org.eclipse.papyrus.sasheditor.editor.AllTests.class, org.eclipse.papyrus.sasheditor.internal.AllTests.class })
+org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.AllTests.class, org.eclipse.papyrus.infra.core.sasheditor.editor.AllTests.class, org.eclipse.papyrus.infra.core.sasheditor.internal.AllTests.class })
public class AllTests {
}
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/core/org.eclipse.papyrus.tests/META-INF/MANIFEST.MF index 7d8d80255d7..35ab1f46a82 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/core/org.eclipse.papyrus.tests/META-INF/MANIFEST.MF @@ -8,10 +8,10 @@ Bundle-Vendor: %providerName Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.junit;bundle-version="4.8.1", - org.eclipse.papyrus.diagram.common;bundle-version="0.8.0", - org.eclipse.papyrus.core.resourceloading;bundle-version="0.8.0", - org.eclipse.papyrus.diagram.clazz.test;bundle-version="0.8.0", - org.eclipse.papyrus.sysml.tests;bundle-version="0.8.0" + org.eclipse.papyrus.uml.diagram.common;bundle-version="0.9.0", + org.eclipse.papyrus.infra.services.resourceloading;bundle-version="0.9.0", + org.eclipse.papyrus.diagram.clazz.test;bundle-version="0.9.0", + org.eclipse.papyrus.sysml.tests;bundle-version="0.9.0" Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllTests.java b/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllTests.java index 37f407735ea..8017d101c7c 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllTests.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllTests.java @@ -1,6 +1,6 @@ /*****************************************************************************
* Copyright (c) 2010 CEA LIST.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -16,7 +16,6 @@ import java.util.Arrays; import java.util.Collection;
import java.util.List;
-import org.eclipse.core.runtime.Platform;
import org.eclipse.papyrus.sysml.tests.SysmlAllTests;
import org.eclipse.papyrus.tests.launcher.FragmentTestSuiteClass;
import org.eclipse.papyrus.tests.launcher.ITestSuiteClass;
@@ -24,7 +23,6 @@ import org.eclipse.papyrus.tests.launcher.PluginTestSuiteClass; import org.junit.runner.RunWith;
import org.junit.runners.Suite;
import org.junit.runners.model.InitializationError;
-import org.osgi.framework.Bundle;
/**
@@ -36,25 +34,25 @@ public class AllTests { /** list of classes to launch */
public static final List<ITestSuiteClass> suiteClasses = Arrays.asList(
- /* **************** plugins *********************** */
- /* core */
- // {oep}.core
- new FragmentTestSuiteClass(org.eclipse.papyrus.core.Activator.PLUGIN_ID, "org.eclipse.papyrus.core.tests.AllTests"),
- // {oep}.sasheditor.tests
- new FragmentTestSuiteClass(org.eclipse.papyrus.sasheditor.Activator.PLUGIN_ID, "org.eclipse.papyrus.sasheditor.tests.AllTests"),
- // {oep}.core.resourceloading.tests
- new FragmentTestSuiteClass(org.eclipse.papyrus.core.resourceloading.Activator.PLUGIN_ID, "org.eclipse.papyrus.core.resourceloading.tests.AllTests"),
+ /* **************** plugins *********************** */
+ /* core */
+ // {oep}.core
+ new FragmentTestSuiteClass(org.eclipse.papyrus.infra.core.Activator.PLUGIN_ID, "org.eclipse.papyrus.core.tests.AllTests"),
+ // {oep}.sasheditor.tests
+ new FragmentTestSuiteClass(org.eclipse.papyrus.infra.core.sasheditor.Activator.PLUGIN_ID, "org.eclipse.papyrus.sasheditor.tests.AllTests"),
+ // {oep}.core.resourceloading.tests
+ new FragmentTestSuiteClass(org.eclipse.papyrus.infra.services.resourceloading.Activator.PLUGIN_ID, "org.eclipse.papyrus.core.resourceloading.tests.AllTests"),
- /* uml */
- // {oep}.diagram.common.tests
- new FragmentTestSuiteClass(org.eclipse.papyrus.diagram.common.Activator.ID, "org.eclipse.papyrus.diagram.common.tests.AllTests"),
- // {oep}.diagram.clazz.tests
- new PluginTestSuiteClass(org.eclipse.papyrus.diagram.clazz.test.AllTests.class),
- // {oep}.sysml.tests
- new PluginTestSuiteClass(SysmlAllTests.class)
-
- //end
- );
+ /* uml */
+ // {oep}.diagram.common.tests
+ new FragmentTestSuiteClass(org.eclipse.papyrus.uml.diagram.common.Activator.ID, "org.eclipse.papyrus.diagram.common.tests.AllTests"),
+ // {oep}.diagram.clazz.tests
+ new PluginTestSuiteClass(org.eclipse.papyrus.diagram.clazz.test.AllTests.class),
+ // {oep}.sysml.tests
+ new PluginTestSuiteClass(SysmlAllTests.class)
+
+ //end
+ );
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/META-INF/MANIFEST.MF index 224b60cf197..d09fcf40c13 100644 --- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/META-INF/MANIFEST.MF @@ -13,12 +13,12 @@ Export-Package: org.eclipse.papyrus.sysml.allocations.tests, org.eclipse.papyrus.sysml.tests,
org.eclipse.papyrus.sysml.utils
Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.papyrus.sysml;visibility:=reexport,
+ org.eclipse.papyrus.sysml;bundle-version="0.9.0";visibility:=reexport,
org.eclipse.emf.ecore;visibility:=reexport,
org.eclipse.uml2.uml;visibility:=reexport,
org.eclipse.emf.ecore.xmi;visibility:=reexport,
org.junit;visibility:=reexport,
- org.eclipse.papyrus.uml.standard;bundle-version="0.8.0",
- org.eclipse.papyrus.umlutils;bundle-version="0.8.0"
+ org.eclipse.papyrus.uml.standard;bundle-version="0.9.0",
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="0.9.0"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/utils/SysMLTestResources.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/utils/SysMLTestResources.java index 45f8d2606fe..f183aaabbc3 100644 --- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/utils/SysMLTestResources.java +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/utils/SysMLTestResources.java @@ -24,7 +24,7 @@ import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.emf.ecore.resource.URIConverter;
import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
import org.eclipse.papyrus.sysml.util.SysmlResource;
-import org.eclipse.papyrus.umlutils.PackageUtil;
+import org.eclipse.papyrus.uml.tools.utils.PackageUtil;
import org.eclipse.uml2.uml.Element;
import org.eclipse.uml2.uml.Model;
import org.eclipse.uml2.uml.Profile;
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/META-INF/MANIFEST.MF index 1adf5f038b6..a382ba7e5f3 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/META-INF/MANIFEST.MF @@ -7,12 +7,12 @@ Bundle-Activator: org.eclipse.papyrus.diagram.clazz.test.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.junit4;bundle-version="4.5.0", - org.eclipse.papyrus.core;bundle-version="0.8.0", - org.eclipse.papyrus.core.adaptor.gmf;bundle-version="0.8.0", - org.eclipse.papyrus.editor;bundle-version="0.8.0", - org.eclipse.papyrus.diagram.clazz;bundle-version="0.8.0", + org.eclipse.papyrus.infra.core;bundle-version="0.9.0", + org.eclipse.papyrus.infra.core.adaptor.gmf;bundle-version="0.9.0", + org.eclipse.papyrus.editor;bundle-version="0.9.0", + org.eclipse.papyrus.uml.diagram.clazz;bundle-version="0.9.0", org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.2.0", - org.eclipse.papyrus.diagram.common;bundle-version="0.8.0" + org.eclipse.papyrus.uml.diagram.common;bundle-version="0.9.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Vendor: %providerName diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/AbstractPapyrusTestCase.java b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/AbstractPapyrusTestCase.java index 347029873e9..9fcfa17372f 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/AbstractPapyrusTestCase.java +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/AbstractPapyrusTestCase.java @@ -25,15 +25,15 @@ import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.core.editor.IMultiDiagramEditor;
-import org.eclipse.papyrus.core.extension.commands.ICreationCommand;
-import org.eclipse.papyrus.core.utils.DiResourceSet;
-import org.eclipse.papyrus.diagram.clazz.CreateClassDiagramCommand;
-import org.eclipse.papyrus.diagram.clazz.UmlClassDiagramForMultiEditor;
-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditor;
-import org.eclipse.papyrus.diagram.common.commands.CreateUMLModelCommand;
import org.eclipse.papyrus.editor.PapyrusMultiDiagramEditor;
-import org.eclipse.papyrus.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.editor.IMultiDiagramEditor;
+import org.eclipse.papyrus.infra.core.extension.commands.ICreationCommand;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.utils.DiResourceSet;
+import org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand;
+import org.eclipse.papyrus.uml.diagram.clazz.UmlClassDiagramForMultiEditor;
+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditor;
+import org.eclipse.papyrus.uml.diagram.common.commands.CreateUMLModelCommand;
import org.eclipse.ui.IEditorDescriptor;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.IWorkbenchPage;
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/AbstractTestMultiLink.java b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/AbstractTestMultiLink.java index 44902c02ebd..d6c72a7a8fc 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/AbstractTestMultiLink.java +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/AbstractTestMultiLink.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2010 CEA LIST.
*
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -42,8 +42,8 @@ import org.eclipse.gmf.runtime.emf.type.core.IElementType; import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
import org.eclipse.gmf.runtime.notation.Diagram;
import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;
-import org.eclipse.papyrus.diagram.common.command.wrappers.GEFtoEMFCommandWrapper;
+import org.eclipse.papyrus.commands.wrappers.GEFtoEMFCommandWrapper;
+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;
import org.eclipse.uml2.uml.Element;
import org.eclipse.uml2.uml.Relationship;
@@ -212,7 +212,7 @@ public abstract class AbstractTestMultiLink extends AbstractPapyrusTestCase { assertTrue(DROP +INITIALIZATION_TEST,((Diagram)getRootView()).getEdges().size()==0);
assertTrue(DROP +INITIALIZATION_TEST,getRootSemanticModel().getOwnedElements().get(5) instanceof Relationship);
Relationship relationship=(Relationship)getRootSemanticModel().getOwnedElements().get(5);
-
+
//DO
DropObjectsRequest dropObjectsRequest= new DropObjectsRequest();
@@ -255,21 +255,21 @@ public abstract class AbstractTestMultiLink extends AbstractPapyrusTestCase { //test to create the branch for dependency to node
- Command cmd = target.getCommand(createConnectionViewRequest(branchType, binaryLink, thirdPlayer));
+ Command cmd = target.getCommand(createConnectionViewRequest(branchType, binaryLink, thirdPlayer));
assertTrue(CONTAINER_CREATION+TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,cmd.canExecute()==true);
- getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().execute(cmd);
+ getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().execute(cmd);
// EditorUtils.getTransactionalEditingDomain().getCommandStack().execute(cmd);
assertTrue(CREATION +TEST_THE_EXECUTION,((Diagram)getRootView()).getEdges().size()==3);
assertTrue(CREATION +TEST_THE_EXECUTION,getRootSemanticModel().getOwnedElements().size()==6);
-
+
//Undo
- getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().undo();
+ getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().undo();
assertTrue(CREATION +TEST_THE_UNDO,((Diagram)getRootView()).getEdges().size()==1);
assertTrue(CREATION +TEST_THE_UNDO,getRootSemanticModel().getOwnedElements().size()==6);
-
-
+
+
//redo
- getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().redo();
+ getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().redo();
assertTrue(CREATION +TEST_THE_REDO,((Diagram)getRootView()).getEdges().size()==3);
assertTrue(CREATION +TEST_THE_REDO,getRootSemanticModel().getOwnedElements().size()==6);
assertTrue(CREATION +TEST_THE_REDO,getDiagramEditPart().getChildren().get(5)!=null);
@@ -277,25 +277,25 @@ public abstract class AbstractTestMultiLink extends AbstractPapyrusTestCase { //test to create the branch from node to multidependency
if(flow){
- cmd = linkNode.getCommand(createConnectionViewRequest(branchType, fourthPlayer,linkNode));
+ cmd = linkNode.getCommand(createConnectionViewRequest(branchType, fourthPlayer,linkNode));
}
else{//test to create the branch from multidependency to node
- cmd = linkNode.getCommand(createConnectionViewRequest(branchType,linkNode, fourthPlayer));
+ cmd = linkNode.getCommand(createConnectionViewRequest(branchType,linkNode, fourthPlayer));
}
assertTrue(CONTAINER_CREATION+TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,cmd.canExecute()==true);
- getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().execute(cmd);
+ getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().execute(cmd);
assertTrue(CREATION +TEST_THE_EXECUTION,((Diagram)getRootView()).getEdges().size()==4);
assertTrue(CREATION +TEST_THE_EXECUTION,getRootSemanticModel().getOwnedElements().size()==6);
-
+
//undo
- getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().undo();
+ getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().undo();
assertTrue(CREATION +TEST_THE_UNDO,((Diagram)getRootView()).getEdges().size()==3);
assertTrue(CREATION +TEST_THE_UNDO,getRootSemanticModel().getOwnedElements().size()==6);
-
+
//redo
- getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().redo();
+ getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().redo();
assertTrue(CREATION +TEST_THE_REDO,((Diagram)getRootView()).getEdges().size()==4);
assertTrue(CREATION +TEST_THE_REDO,getRootSemanticModel().getOwnedElements().size()==6);
}
@@ -312,23 +312,23 @@ public abstract class AbstractTestMultiLink extends AbstractPapyrusTestCase { reconnectRequest.setTargetEditPart(guestPlayer);
reconnectRequest.setType(RequestConstants.REQ_RECONNECT_TARGET);
- Command cmd = guestPlayer.getCommand(reconnectRequest);
+ Command cmd = guestPlayer.getCommand(reconnectRequest);
assertTrue(RECONNECTION_TARGET+TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,cmd.canExecute()==true);
- getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().execute(cmd);
+ getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().execute(cmd);
// EditorUtils.getTransactionalEditingDomain().getCommandStack().execute(cmd);
assertTrue(RECONNECTION_TARGET+TEST_THE_EXECUTION,((Diagram)getRootView()).getEdges().size()==4);
assertTrue(RECONNECTION_TARGET +TEST_THE_EXECUTION,getRootSemanticModel().getOwnedElements().size()==6);
assertTrue(BRANCH_EXISTS_RECONNECTION_ON_TARGET,branch.getTarget().equals(guestPlayer));
-
+
//undo
getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().undo();
assertTrue(BRANCH_EXISTS_RECONNECTION_ON_TARGET+ TEST_THE_UNDO,branch.getTarget().equals(target));
-
+
//redo
getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().redo();
assertTrue(BRANCH_EXISTS_RECONNECTION_ON_TARGET+ TEST_THE_REDO,branch.getTarget().equals(guestPlayer));
-
+
getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().undo();
@@ -344,26 +344,26 @@ public abstract class AbstractTestMultiLink extends AbstractPapyrusTestCase { reconnectRequest.setTargetEditPart(guestPlayer);
reconnectRequest.setType(RequestConstants.REQ_RECONNECT_SOURCE);
- Command cmd = guestPlayer.getCommand(reconnectRequest);
+ Command cmd = guestPlayer.getCommand(reconnectRequest);
assertTrue(RECONNECTION_SOURCE+TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,cmd.canExecute()==true);
- getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().execute(cmd);
+ getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().execute(cmd);
assertTrue(RECONNECTION_SOURCE+TEST_THE_EXECUTION,((Diagram)getRootView()).getEdges().size()==4);
assertTrue(RECONNECTION_SOURCE +TEST_THE_EXECUTION,getRootSemanticModel().getOwnedElements().size()==6);
assertTrue(BRANCH_EXISTS_RECONNECTION_ON_SOURCE+TEST_THE_EXECUTION,branch.getSource().equals(guestPlayer));
-
+
getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().undo();
assertTrue(BRANCH_EXISTS_RECONNECTION_ON_SOURCE+ TEST_THE_UNDO,branch.getSource().equals(source));
-
+
getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().redo();
assertTrue(BRANCH_EXISTS_RECONNECTION_ON_SOURCE+TEST_THE_REDO,branch.getSource().equals(guestPlayer));
-
+
getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().undo();
}
public CreateConnectionViewRequest createConnectionViewRequest(IElementType type , EditPart source, EditPart target){
CreateConnectionViewRequest connectionRequest = CreateViewRequestFactory.getCreateConnectionRequest(type,((IGraphicalEditPart) getDiagramEditPart())
- .getDiagramPreferencesHint());
+ .getDiagramPreferencesHint());
connectionRequest.setSourceEditPart(null);
connectionRequest.setTargetEditPart(source);
@@ -450,7 +450,7 @@ public abstract class AbstractTestMultiLink extends AbstractPapyrusTestCase { public void installbinaryLink(IElementType type) {
//binaryLink
- Command command = target.getCommand(createConnectionViewRequest(type, source, target));
+ Command command = target.getCommand(createConnectionViewRequest(type, source, target));
assertTrue(CONTAINER_CREATION+TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,command.canExecute()==true);
diagramEditor.getEditingDomain().getCommandStack().execute(new GEFtoEMFCommandWrapper(command));
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestChildLabel.java b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestChildLabel.java index 6c3d3833cec..53d569e320d 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestChildLabel.java +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestChildLabel.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2009 CEA LIST.
*
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -32,7 +32,7 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper; import org.eclipse.gmf.runtime.emf.type.core.IElementType;
import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.common.command.wrappers.GEFtoEMFCommandWrapper;
+import org.eclipse.papyrus.commands.wrappers.GEFtoEMFCommandWrapper;
import org.eclipse.uml2.uml.Element;
@@ -42,47 +42,47 @@ import org.eclipse.uml2.uml.Element; * The Class TestChildLabel.
*/
public abstract class TestChildLabel extends AbstractPapyrusTestCase {
-
-
+
+
/** The Constant CREATION. */
protected static final String CREATION = "CREATION:";
-
+
/** The Constant CONTAINER_CREATION. */
protected static final String CONTAINER_CREATION = "CONTAINER CREATION: ";
-
+
/** The Constant DROP. */
protected static final String DROP = "DROP: ";
-
+
/** The Constant DESTROY_DELETION. */
protected static final String DESTROY_DELETION = "DESTROY DELETION: ";
-
+
/** The Constant COMMAND_NULL. */
protected static final String COMMAND_NULL = " command null";
-
+
/** The Constant VIEW_DELETION. */
protected static final String VIEW_DELETION = "VIEW DELETION: ";
-
+
/** The Constant TEST_THE_REDO. */
protected static final String TEST_THE_REDO = "test the redo";
-
+
/** The Constant TEST_THE_UNDO. */
protected static final String TEST_THE_UNDO = "test the undo";
-
+
/** The Constant TEST_THE_EXECUTION. */
protected static final String TEST_THE_EXECUTION = "test the execution";
-
+
/** The Constant TEST_IF_THE_COMMAND_CAN_BE_EXECUTED. */
protected static final String TEST_IF_THE_COMMAND_CAN_BE_EXECUTED = "test if the command can be executed";
-
+
/** The Constant TEST_IF_THE_COMMAND_IS_CREATED. */
protected static final String TEST_IF_THE_COMMAND_IS_CREATED = "test if the command is created";
/** The Constant INITIALIZATION_TEST. */
protected static final String INITIALIZATION_TEST = "Intitial State";
-
+
/** The Constant CHANGE_CONTAINER. */
protected static final String CHANGE_CONTAINER = "CHANGE CONTAINER";
-
+
/** The top node. */
protected GraphicalEditPart topNode;
@@ -93,7 +93,7 @@ public abstract class TestChildLabel extends AbstractPapyrusTestCase { * @param containerType the container type
*/
public void testViewDeletion(IElementType type,int containerType) {
-
+
ListCompartmentEditPart compartment=null;
int index=0;
while (compartment==null && index <getTopEditPart().getChildren().size()){
@@ -106,7 +106,7 @@ public abstract class TestChildLabel extends AbstractPapyrusTestCase { //DELETION OF THE VIEW
assertTrue(VIEW_DELETION +INITIALIZATION_TEST,compartment.getChildren().size()==1);
assertTrue(VIEW_DELETION +INITIALIZATION_TEST,((Element)((View)getTopEditPart().getModel()).getElement()).getOwnedElements().size()==1);
-
+
Request deleteViewRequest = new GroupRequest(RequestConstants.REQ_DELETE);
Command command = ((GraphicalEditPart)compartment.getChildren().get(0)).getCommand(deleteViewRequest);
assertNotNull(VIEW_DELETION +COMMAND_NULL,command);
@@ -115,18 +115,18 @@ public abstract class TestChildLabel extends AbstractPapyrusTestCase { diagramEditor.getEditingDomain().getCommandStack().execute(new GEFtoEMFCommandWrapper(command));
assertTrue(VIEW_DELETION +TEST_THE_EXECUTION,compartment.getChildren().size()==0);
assertTrue(VIEW_DELETION +TEST_THE_EXECUTION,((Element)((View)getTopEditPart().getModel()).getElement()).getOwnedElements().size()==1);
-
+
diagramEditor.getEditingDomain().getCommandStack().undo();
assertTrue(VIEW_DELETION +TEST_THE_UNDO,compartment.getChildren().size()==1);
assertTrue(VIEW_DELETION +TEST_THE_UNDO,((Element)((View)getTopEditPart().getModel()).getElement()).getOwnedElements().size()==1);
-
+
diagramEditor.getEditingDomain().getCommandStack().redo();
assertTrue(VIEW_DELETION +TEST_THE_REDO,compartment.getChildren().size()==0);
assertTrue(VIEW_DELETION +TEST_THE_REDO,((Element)((View)getTopEditPart().getModel()).getElement()).getOwnedElements().size()==1);
-
-
+
+
}
-
+
/**
* Test destroy.
*
@@ -146,7 +146,7 @@ public abstract class TestChildLabel extends AbstractPapyrusTestCase { //DESTROY SEMANTIC+ VIEW
assertTrue(DESTROY_DELETION +INITIALIZATION_TEST,compartment.getChildren().size()==1);
assertTrue(DESTROY_DELETION +INITIALIZATION_TEST,((Element)((View)getTopEditPart().getModel()).getElement()).getOwnedElements().size()==1);
-
+
Request deleteViewRequest = new EditCommandRequestWrapper( new DestroyElementRequest(false));
Command command = ((GraphicalEditPart)compartment.getChildren().get(0)).getCommand(deleteViewRequest);
assertNotNull(DESTROY_DELETION +COMMAND_NULL,command);
@@ -162,8 +162,8 @@ public abstract class TestChildLabel extends AbstractPapyrusTestCase { assertTrue(DESTROY_DELETION +TEST_THE_REDO,compartment.getChildren().size()==0);
assertTrue(DESTROY_DELETION +TEST_THE_REDO,((Element)((View)getTopEditPart().getModel()).getElement()).getOwnedElements().size()==0);
}
-
-
+
+
/**
* Test drop.
*
@@ -183,8 +183,8 @@ public abstract class TestChildLabel extends AbstractPapyrusTestCase { //DROP
assertTrue(DROP +INITIALIZATION_TEST,compartment.getChildren().size()==0);
assertTrue(DROP +INITIALIZATION_TEST,((Element)((View)getTopEditPart().getModel()).getElement()).getOwnedElements().size()==1);
-
-
+
+
DropObjectsRequest dropObjectsRequest= new DropObjectsRequest();
ArrayList<Element> list = new ArrayList<Element>();
list.add(getRootSemanticModel().getOwnedElements().get(0));
@@ -203,9 +203,9 @@ public abstract class TestChildLabel extends AbstractPapyrusTestCase { diagramEditor.getEditingDomain().getCommandStack().redo();
assertTrue(DROP+TEST_THE_REDO,compartment.getChildren().size()!=0);
assertTrue(DROP+TEST_THE_REDO,((Element)((View)getTopEditPart().getModel()).getElement()).getOwnedElements().size()!=0);
- }
-
-
+ }
+
+
/**
* Test change container.
*
@@ -223,12 +223,12 @@ public abstract class TestChildLabel extends AbstractPapyrusTestCase { index++;
}
assertTrue("Container not found", compartment!=null);
-
+
//CHANGE CONTAINER
assertTrue(CHANGE_CONTAINER +INITIALIZATION_TEST,compartment.getChildren().size()==1);
assertTrue(CHANGE_CONTAINER +INITIALIZATION_TEST,((Element)((View)getTopEditPart().getModel()).getElement()).getOwnedElements().size()==1);
-
-
+
+
Request requestcreation=CreateViewRequestFactory.getCreateShapeRequest(topNodeType, getDiagramEditPart().getDiagramPreferencesHint());
Command command=getDiagramEditPart().getCommand(requestcreation);
assertNotNull(CONTAINER_CREATION+COMMAND_NULL,command);
@@ -249,8 +249,8 @@ public abstract class TestChildLabel extends AbstractPapyrusTestCase { index++;
}
assertTrue("NewContainer not found", newCompartment!=null);
-
-
+
+
command=newCompartment.getCommand(changeBoundsRequest);
assertNotNull(CHANGE_CONTAINER,command);
assertTrue(CHANGE_CONTAINER+TEST_IF_THE_COMMAND_IS_CREATED,command!=UnexecutableCommand.INSTANCE);
@@ -267,9 +267,9 @@ public abstract class TestChildLabel extends AbstractPapyrusTestCase { assertTrue(CHANGE_CONTAINER+TEST_THE_REDO,compartment.getChildren().size()==0);
assertTrue(CHANGE_CONTAINER+TEST_THE_REDO,((Element)((View)getTopEditPart().getModel()).getElement()).getOwnedElements().size()==0);
assertTrue(CHANGE_CONTAINER+TEST_THE_EXECUTION,newCompartment.getChildren().size()==1);
-
- }
-
+
+ }
+
/**
* Test to create a node.
*
@@ -289,7 +289,7 @@ public abstract class TestChildLabel extends AbstractPapyrusTestCase { //CREATION
assertTrue(CREATION +INITIALIZATION_TEST,compartment.getChildren().size()==0);
assertTrue(CREATION +INITIALIZATION_TEST,getRootSemanticModel().getOwnedElements().size()==0);
-
+
CreateViewRequest requestcreation=CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());
Command command=compartment.getCommand(requestcreation);
assertNotNull(CREATION+COMMAND_NULL,command);
@@ -302,20 +302,20 @@ public abstract class TestChildLabel extends AbstractPapyrusTestCase { assertTrue(CREATION+TEST_THE_UNDO,((Element)((View)getTopEditPart().getModel()).getElement()).getOwnedElements().size()==0);
diagramEditor.getEditingDomain().getCommandStack().redo();
assertTrue("CREATION: "+TEST_THE_REDO,compartment.getChildren().size()==1);
-
+
}
-
+
/**
* Test to create a top node.
*
* @param type the type
*/
public void testToCreateATopNode(IElementType type) {
-
+
//CREATION
assertTrue(CREATION +INITIALIZATION_TEST,getDiagramEditPart().getChildren().size()==0);
assertTrue(CREATION +INITIALIZATION_TEST,((Element)((View)getDiagramEditPart().getModel()).getElement()).getOwnedElements().size()==0);
-
+
CreateViewRequest requestcreation=CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());
Command command=getDiagramEditPart().getCommand(requestcreation);
assertNotNull(CREATION+COMMAND_NULL,command);
@@ -325,7 +325,7 @@ public abstract class TestChildLabel extends AbstractPapyrusTestCase { assertTrue(CREATION+TEST_THE_EXECUTION,getRootView().getChildren().size()==1);
topNode = (GraphicalEditPart)getDiagramEditPart().getChildren().get(0);
}
-
+
/**
* Gets the top edit part.
*
@@ -334,19 +334,19 @@ public abstract class TestChildLabel extends AbstractPapyrusTestCase { public GraphicalEditPart getTopEditPart(){
return topNode;
}
-
+
/**
* @see org.eclipse.papyrus.diagram.clazz.test.canonical.AbstractPapyrusTestCase#getRootSemanticModel()
*
* @return
*/
-
+
@Override
protected Element getRootSemanticModel() {
// TODO Auto-generated method stub
return (Element)((View)getTopEditPart().getModel()).getElement();
}
-
+
/**
* Test to manage top node.
*
@@ -364,6 +364,6 @@ public abstract class TestChildLabel extends AbstractPapyrusTestCase { testDrop(type,containerType);
testChangeContainer(topNodeType,type, containerType);
}
-
-
+
+
}
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestChildNode.java b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestChildNode.java index f6259b25b52..c3f07472264 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestChildNode.java +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestChildNode.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2009 CEA LIST.
*
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -33,8 +33,8 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper; import org.eclipse.gmf.runtime.emf.type.core.IElementType;
import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;
-import org.eclipse.papyrus.diagram.common.command.wrappers.GEFtoEMFCommandWrapper;
+import org.eclipse.papyrus.commands.wrappers.GEFtoEMFCommandWrapper;
+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;
import org.eclipse.uml2.uml.Element;
@@ -44,10 +44,10 @@ import org.eclipse.uml2.uml.Element; * The Class TestChildNode.
*/
public class TestChildNode extends AbstractPapyrusTestCase {
-
-
-
-
+
+
+
+
/** The root compartment. */
protected ShapeCompartmentEditPart rootCompartment=null;
@@ -60,7 +60,7 @@ public class TestChildNode extends AbstractPapyrusTestCase { //DELETION OF THE VIEW
assertTrue(VIEW_DELETION +INITIALIZATION_TEST,getRootCompartment().getChildren().size()==1);
assertTrue(VIEW_DELETION +INITIALIZATION_TEST,getRootSemanticModel().getOwnedElements().size()==1);
-
+
Request deleteViewRequest = new GroupRequest(RequestConstants.REQ_DELETE);
Command command = ((GraphicalEditPart)getRootCompartment().getChildren().get(0)).getCommand(deleteViewRequest);
assertNotNull(VIEW_DELETION +COMMAND_NULL,command);
@@ -75,9 +75,9 @@ public class TestChildNode extends AbstractPapyrusTestCase { diagramEditor.getEditingDomain().getCommandStack().redo();
assertTrue(VIEW_DELETION +TEST_THE_REDO,getRootCompartment().getChildren().size()==0);
assertTrue(VIEW_DELETION +TEST_THE_REDO,getRootSemanticModel().getOwnedElements().size()==1);
-
+
}
-
+
/**
* Gets the root compartment.
*
@@ -87,7 +87,7 @@ public class TestChildNode extends AbstractPapyrusTestCase { assertNotNull(rootCompartment);
return rootCompartment;
}
-
+
/**
* Test destroy.
*
@@ -97,7 +97,7 @@ public class TestChildNode extends AbstractPapyrusTestCase { //DESTROY SEMANTIC+ VIEW
assertTrue(DESTROY_DELETION +INITIALIZATION_TEST,getRootCompartment().getChildren().size()==1);
assertTrue(DESTROY_DELETION +INITIALIZATION_TEST,getRootSemanticModel().getOwnedElements().size()==1);
-
+
Request deleteViewRequest = new EditCommandRequestWrapper( new DestroyElementRequest(false));
Command command = ((GraphicalEditPart)getRootCompartment().getChildren().get(0)).getCommand(deleteViewRequest);
assertNotNull(DESTROY_DELETION +COMMAND_NULL,command);
@@ -113,8 +113,8 @@ public class TestChildNode extends AbstractPapyrusTestCase { assertTrue(DESTROY_DELETION +TEST_THE_REDO,getRootCompartment().getChildren().size()==0);
assertTrue(DESTROY_DELETION +TEST_THE_REDO,getRootSemanticModel().getOwnedElements().size()==0);
}
-
-
+
+
/**
* Test drop.
*
@@ -124,8 +124,8 @@ public class TestChildNode extends AbstractPapyrusTestCase { //DROP
assertTrue(DROP +INITIALIZATION_TEST,getRootCompartment().getChildren().size()==0);
assertTrue(DROP +INITIALIZATION_TEST,getRootSemanticModel().getOwnedElements().size()==1);
-
-
+
+
DropObjectsRequest dropObjectsRequest= new DropObjectsRequest();
ArrayList<Element> list = new ArrayList<Element>();
list.add(getRootSemanticModel().getOwnedElements().get(0));
@@ -144,9 +144,9 @@ public class TestChildNode extends AbstractPapyrusTestCase { diagramEditor.getEditingDomain().getCommandStack().redo();
assertTrue(DROP+TEST_THE_REDO,getRootCompartment().getChildren().size()!=0);
assertTrue(DROP+TEST_THE_REDO,getRootSemanticModel().getOwnedElements().size()!=0);
- }
-
-
+ }
+
+
/**
* Test change container.
*
@@ -157,8 +157,8 @@ public class TestChildNode extends AbstractPapyrusTestCase { //CHANGE CONTAINER
assertTrue(CHANGE_CONTAINER +INITIALIZATION_TEST,getRootCompartment().getChildren().size()==1);
assertTrue(CHANGE_CONTAINER +INITIALIZATION_TEST,getRootSemanticModel().getOwnedElements().size()==1);
-
-
+
+
Request requestcreation=CreateViewRequestFactory.getCreateShapeRequest(containerType, getRootCompartment().getDiagramPreferencesHint());
Command command=getRootCompartment().getCommand(requestcreation);
assertNotNull(CONTAINER_CREATION+COMMAND_NULL,command);
@@ -179,8 +179,8 @@ public class TestChildNode extends AbstractPapyrusTestCase { index++;
}
assertTrue("Container not found", compartment!=null);
-
-
+
+
command=compartment.getCommand(changeBoundsRequest);
assertNotNull(CHANGE_CONTAINER,command);
assertTrue(CHANGE_CONTAINER+TEST_IF_THE_COMMAND_IS_CREATED,command!=UnexecutableCommand.INSTANCE);
@@ -197,20 +197,20 @@ public class TestChildNode extends AbstractPapyrusTestCase { assertTrue(CHANGE_CONTAINER+TEST_THE_REDO,getRootView().getChildren().size()==1);
assertTrue(CHANGE_CONTAINER+TEST_THE_REDO,getRootSemanticModel().getOwnedElements().size()==1);
assertTrue(CHANGE_CONTAINER+TEST_THE_EXECUTION,compartment.getChildren().size()==1);
-
- }
-
+
+ }
+
/**
* Test to create a node.
*
* @param type the type
*/
public void testToCreateANode(IElementType type) {
-
+
//CREATION
assertTrue(CREATION +INITIALIZATION_TEST,getRootCompartment().getChildren().size()==0);
assertTrue(CREATION +INITIALIZATION_TEST,getRootSemanticModel().getOwnedElements().size()==0);
-
+
CreateViewRequest requestcreation=CreateViewRequestFactory.getCreateShapeRequest(type, getRootCompartment().getDiagramPreferencesHint());
Command command=getRootCompartment().getCommand(requestcreation);
assertNotNull(CREATION+COMMAND_NULL,command);
@@ -223,15 +223,15 @@ public class TestChildNode extends AbstractPapyrusTestCase { assertTrue(CREATION+TEST_THE_UNDO,getRootSemanticModel().getOwnedElements().size()==0);
diagramEditor.getEditingDomain().getCommandStack().redo();
assertTrue("CREATION: "+TEST_THE_REDO,getRootCompartment().getChildren().size()==1);
-
+
}
-
+
/**
* @see org.eclipse.papyrus.diagram.clazz.test.canonical.AbstractPapyrusTestCase#setUp()
*
* @throws Exception
*/
-
+
@Override
protected void setUp() throws Exception {
super.setUp();
@@ -252,20 +252,20 @@ public class TestChildNode extends AbstractPapyrusTestCase { }
index++;
}
-
+
}
-
+
/**
* @see org.eclipse.papyrus.diagram.clazz.test.canonical.AbstractPapyrusTestCase#getRootView()
*
* @return
*/
-
+
@Override
protected View getRootView() {
return (View)getRootCompartment().getModel();
}
-
+
/**
* Test to manage child node.
*
@@ -285,6 +285,6 @@ public class TestChildNode extends AbstractPapyrusTestCase { // the node and element are present
testChangeContainer(type, containerType);
}
-
-
+
+
}
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestClassDiagramChildLabel.java b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestClassDiagramChildLabel.java index cbb4668ac94..d40bf8db9e0 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestClassDiagramChildLabel.java +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestClassDiagramChildLabel.java @@ -13,19 +13,19 @@ *****************************************************************************/
package org.eclipse.papyrus.diagram.clazz.test.canonical;
-import org.eclipse.papyrus.diagram.clazz.edit.parts.ClassAttributeCompartmentEditPart;
-import org.eclipse.papyrus.diagram.clazz.edit.parts.ClassNestedClassifierCompartmentEditPart;
-import org.eclipse.papyrus.diagram.clazz.edit.parts.ClassOperationCompartmentEditPart;
-import org.eclipse.papyrus.diagram.clazz.edit.parts.ComponentAttributeCompartmentEditPart;
-import org.eclipse.papyrus.diagram.clazz.edit.parts.ComponentNestedClassifierCompartmentEditPart;
-import org.eclipse.papyrus.diagram.clazz.edit.parts.ComponentOperationCompartmentEditPart;
-import org.eclipse.papyrus.diagram.clazz.edit.parts.EnumerationEnumerationLiteralCompartmentEditPart;
-import org.eclipse.papyrus.diagram.clazz.edit.parts.InstanceSpecificationSlotCompartmentEditPart;
-import org.eclipse.papyrus.diagram.clazz.edit.parts.InterfaceAttributeCompartmentEditPart;
-import org.eclipse.papyrus.diagram.clazz.edit.parts.InterfaceNestedClassifierCompartmentEditPart;
-import org.eclipse.papyrus.diagram.clazz.edit.parts.InterfaceOperationCompartmentEditPart;
-import org.eclipse.papyrus.diagram.clazz.edit.parts.SignalAttributeCompartmentEditPart;
-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassAttributeCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassNestedClassifierCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassOperationCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentAttributeCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentNestedClassifierCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentOperationCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationEnumerationLiteralCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InstanceSpecificationSlotCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceAttributeCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceNestedClassifierCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceOperationCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SignalAttributeCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;
import org.junit.Test;
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestClassDiagramChildNode.java b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestClassDiagramChildNode.java index 6fbb247b697..44401d1abb4 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestClassDiagramChildNode.java +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestClassDiagramChildNode.java @@ -13,7 +13,7 @@ *****************************************************************************/
package org.eclipse.papyrus.diagram.clazz.test.canonical;
-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;
import org.junit.Test;
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestClassDiagramContainment.java b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestClassDiagramContainment.java index e226da06710..9ce12bad835 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestClassDiagramContainment.java +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestClassDiagramContainment.java @@ -13,7 +13,7 @@ *****************************************************************************/
package org.eclipse.papyrus.diagram.clazz.test.canonical;
-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;
import org.junit.Test;
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestClassDiagramLink.java b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestClassDiagramLink.java index 1e482a36e10..1fdd48e1bd5 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestClassDiagramLink.java +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestClassDiagramLink.java @@ -13,7 +13,7 @@ *****************************************************************************/
package org.eclipse.papyrus.diagram.clazz.test.canonical;
-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;
import org.junit.Test;
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestClassDiagramLinkOwnedBySource.java b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestClassDiagramLinkOwnedBySource.java index b178ba5a734..b315f69a64a 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestClassDiagramLinkOwnedBySource.java +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestClassDiagramLinkOwnedBySource.java @@ -13,7 +13,7 @@ *****************************************************************************/
package org.eclipse.papyrus.diagram.clazz.test.canonical;
-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;
import org.junit.Test;
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestClassDiagramTopNode.java b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestClassDiagramTopNode.java index f2c6d84afa2..7d7419cee55 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestClassDiagramTopNode.java +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestClassDiagramTopNode.java @@ -13,7 +13,7 @@ *****************************************************************************/
package org.eclipse.papyrus.diagram.clazz.test.canonical;
-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;
import org.junit.Test;
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestContainmentLink.java b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestContainmentLink.java index b03a5ff0ac3..4aa2bd479f4 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestContainmentLink.java +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestContainmentLink.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2009 CEA LIST.
*
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -13,48 +13,37 @@ *****************************************************************************/
package org.eclipse.papyrus.diagram.clazz.test.canonical;
-import java.util.ArrayList;
-
import org.eclipse.core.commands.operations.OperationHistoryFactory;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
import org.eclipse.gef.ConnectionEditPart;
-import org.eclipse.gef.EditPart;
import org.eclipse.gef.Request;
import org.eclipse.gef.RequestConstants;
import org.eclipse.gef.commands.Command;
import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gef.requests.ChangeBoundsRequest;
import org.eclipse.gef.requests.GroupRequest;
import org.eclipse.gef.requests.ReconnectRequest;
import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewRequest;
import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
-import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;
import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper;
import org.eclipse.gmf.runtime.emf.commands.core.command.EditingDomainUndoContext;
import org.eclipse.gmf.runtime.emf.type.core.IElementType;
import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.papyrus.core.services.ServiceException;
-import org.eclipse.papyrus.core.utils.ServiceUtilsForActionHandlers;
-import org.eclipse.papyrus.diagram.common.Activator;
-import org.eclipse.papyrus.diagram.common.command.wrappers.GEFtoEMFCommandWrapper;
+import org.eclipse.papyrus.commands.wrappers.GEFtoEMFCommandWrapper;
import org.eclipse.uml2.uml.Element;
public class TestContainmentLink extends TestLink {
-
-
+
+
/**
* Test view deletion.
*
* @param type the type
*/
+ @Override
public void testViewDeletion(IElementType type) {
//DELETION OF THE VIEW
assertTrue(CREATION +INITIALIZATION_TEST,((Diagram)getRootView()).getEdges().size()==1);
@@ -77,22 +66,23 @@ public class TestContainmentLink extends TestLink { assertTrue(CREATION +INITIALIZATION_TEST,((Diagram)getRootView()).getEdges().size()==0);
assertTrue(VIEW_DELETION +TEST_THE_REDO,getRootSemanticModel().getOwnedElements().size()==3);
assertTrue(VIEW_DELETION +TEST_THE_REDO, ((Element)source.resolveSemanticElement()).getOwnedElements().size()==1);
-
+
}
-
+
/**
* Test destroy.
*
* @param type the type
*/
+ @Override
public void testDestroy(IElementType type) {
-
+
//DESTROY SEMANTIC+ VIEW
assertTrue(CREATION +INITIALIZATION_TEST,((Diagram)getRootView()).getEdges().size()==1);
assertTrue(CREATION +INITIALIZATION_TEST, ((Element)source.resolveSemanticElement()).getOwnedElements().size()==1);
assertTrue(DESTROY_DELETION +INITIALIZATION_TEST,getRootSemanticModel().getOwnedElements().size()==3);
-
+
Request deleteViewRequest = new EditCommandRequestWrapper( new DestroyElementRequest(false));
Command command = ((ConnectionEditPart)source.getChildBySemanticHint("3032").getSourceConnections().get(0)).getCommand(deleteViewRequest);
assertNotNull(DESTROY_DELETION +COMMAND_NULL,command);
@@ -102,14 +92,14 @@ public class TestContainmentLink extends TestLink { assertTrue(CREATION +INITIALIZATION_TEST,((Diagram)getRootView()).getEdges().size()==0);
assertTrue(DESTROY_DELETION +TEST_THE_EXECUTION,getRootSemanticModel().getOwnedElements().size()==4);
assertTrue(DESTROY_DELETION +TEST_THE_EXECUTION, ((Element)source.resolveSemanticElement()).getOwnedElements().size()==0);
-
+
EditingDomainUndoContext undoContext= new EditingDomainUndoContext(getEditingDomain());
try{
- OperationHistoryFactory.getOperationHistory().undo(undoContext, new NullProgressMonitor(), null);
+ OperationHistoryFactory.getOperationHistory().undo(undoContext, new NullProgressMonitor(), null);
}catch (Exception e) {
System.err.println(e);
}
-
+
assertTrue(CREATION +INITIALIZATION_TEST,((Diagram)getRootView()).getEdges().size()==1);
assertTrue(DESTROY_DELETION +TEST_THE_UNDO,getRootSemanticModel().getOwnedElements().size()==3);
assertTrue(DESTROY_DELETION +TEST_THE_UNDO, ((Element)source.resolveSemanticElement()).getOwnedElements().size()==1);
@@ -118,39 +108,41 @@ public class TestContainmentLink extends TestLink { assertTrue(DESTROY_DELETION +TEST_THE_REDO,getRootSemanticModel().getOwnedElements().size()==4);
assertTrue(DESTROY_DELETION +TEST_THE_REDO, ((Element)source.resolveSemanticElement()).getOwnedElements().size()==0);
}
-
-
+
+
/**
* Test drop.
*
* @param type the type
*/
+ @Override
public void testDrop(IElementType type) {
//DROP
-
+
//it is impossible to drop but you can recreat the link between this element
assertTrue(DROP +INITIALIZATION_TEST,getDiagramEditPart().getChildren().size()==4);
assertTrue(DROP +INITIALIZATION_TEST,getRootSemanticModel().getOwnedElements().size()==3);
assertTrue(DROP +INITIALIZATION_TEST, ((Element)source.resolveSemanticElement()).getOwnedElements().size()==1);
assertTrue(DROP +TEST_THE_REDO,((Diagram)getRootView()).getEdges().size()==0);
-
-
- }
-
-
-
-
+
+
+ }
+
+
+
+
/**
* Test to create a link.
*
* @param linkType the type
*/
+ @Override
public void testToCreateALink(IElementType linkType) {
assertTrue(CREATION +INITIALIZATION_TEST,getDiagramEditPart().getChildren().size()==4);
assertTrue(CREATION +INITIALIZATION_TEST,getRootSemanticModel().getOwnedElements().size()==4);
assertTrue(CREATION +INITIALIZATION_TEST, ((Element)source.resolveSemanticElement()).getOwnedElements().size()==0);
-
- Command command = target.getCommand(createConnectionViewRequest(linkType, source, target));
+
+ Command command = target.getCommand(createConnectionViewRequest(linkType, source, target));
assertNotNull(CREATION+COMMAND_NULL,command);
assertTrue(CONTAINER_CREATION+TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,command.canExecute()==true);
diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
@@ -162,12 +154,13 @@ public class TestContainmentLink extends TestLink { diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();
assertTrue(CREATION +TEST_THE_EXECUTION,((Diagram)getRootView()).getEdges().size()==1);
assertTrue(CREATION +TEST_THE_EXECUTION, ((Element)source.resolveSemanticElement()).getOwnedElements().size()==1);
-
+
}
+ @Override
public void installEnvironment(IElementType sourceType,IElementType targetType ){
assertTrue(CREATION +INITIALIZATION_TEST,getDiagramEditPart().getChildren().size()==0);
assertTrue(CREATION +INITIALIZATION_TEST,getRootSemanticModel().getOwnedElements().size()==0);
-
+
//create the source
CreateViewRequest requestcreation=CreateViewRequestFactory.getCreateShapeRequest(sourceType, getDiagramEditPart().getDiagramPreferencesHint());
requestcreation.setLocation(new Point(100, 100));
@@ -176,17 +169,17 @@ public class TestContainmentLink extends TestLink { assertTrue(CREATION+TEST_IF_THE_COMMAND_IS_CREATED,command!=UnexecutableCommand.INSTANCE);
assertTrue("CREATION: "+TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,command.canExecute()==true);
diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
-
-
+
+
//create the source player to test reconnect
- requestcreation=CreateViewRequestFactory.getCreateShapeRequest(sourceType, getDiagramEditPart().getDiagramPreferencesHint());
+ requestcreation=CreateViewRequestFactory.getCreateShapeRequest(sourceType, getDiagramEditPart().getDiagramPreferencesHint());
requestcreation.setLocation(new Point(100, 300));
- command=getDiagramEditPart().getCommand(requestcreation);
+ command=getDiagramEditPart().getCommand(requestcreation);
assertNotNull(CREATION+COMMAND_NULL,command);
assertTrue(CREATION+TEST_IF_THE_COMMAND_IS_CREATED,command!=UnexecutableCommand.INSTANCE);
assertTrue("CREATION: "+TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,command.canExecute()==true);
diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
-
+
//create the target
requestcreation=CreateViewRequestFactory.getCreateShapeRequest(targetType, getDiagramEditPart().getDiagramPreferencesHint());
requestcreation.setLocation(new Point(300, 100));
@@ -195,7 +188,7 @@ public class TestContainmentLink extends TestLink { assertTrue(CREATION+TEST_IF_THE_COMMAND_IS_CREATED,command!=UnexecutableCommand.INSTANCE);
assertTrue("CREATION: "+TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,command.canExecute()==true);
diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
-
+
//create the target player to test reconnect
requestcreation=CreateViewRequestFactory.getCreateShapeRequest(targetType, getDiagramEditPart().getDiagramPreferencesHint());
requestcreation.setLocation(new Point(300, 300));
@@ -204,21 +197,22 @@ public class TestContainmentLink extends TestLink { assertTrue(CREATION+TEST_IF_THE_COMMAND_IS_CREATED,command!=UnexecutableCommand.INSTANCE);
assertTrue("CREATION: "+TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,command.canExecute()==true);
diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
-
-
-
-
+
+
+
+
source=(GraphicalEditPart)getDiagramEditPart().getChildren().get(0);
sourcePlayer=(GraphicalEditPart)getDiagramEditPart().getChildren().get(1);
target=(GraphicalEditPart)getDiagramEditPart().getChildren().get(2);
targetPlayer=(GraphicalEditPart)getDiagramEditPart().getChildren().get(3);
-
+
}
-
-
-
-
+
+
+
+
+ @Override
public void testTargetReconnectAMultiLink(IElementType type) {
//target reconnection
@@ -229,27 +223,28 @@ public class TestContainmentLink extends TestLink { reconnectRequest.setTargetEditPart(targetPlayer);
reconnectRequest.setType(RequestConstants.REQ_RECONNECT_TARGET);
- Command cmd = targetPlayer.getCommand(reconnectRequest);
+ Command cmd = targetPlayer.getCommand(reconnectRequest);
assertTrue(RECONNECTION_TARGET+TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,cmd.canExecute()==true);
- getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().execute(cmd);
+ getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().execute(cmd);
// EditorUtils.getTransactionalEditingDomain().getCommandStack().execute(cmd);
assertTrue(RECONNECTION_TARGET+TEST_THE_EXECUTION,((Diagram)getRootView()).getEdges().size()==1);
assertTrue(RECONNECTION_TARGET +TEST_THE_EXECUTION,getRootSemanticModel().getOwnedElements().size()==3);
assertTrue(LINK_EXISTS_RECONNECTION_ON_TARGET,binaryLink.getTarget().equals(targetPlayer));
-
+
//undo
getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().undo();
assertTrue(LINK_EXISTS_RECONNECTION_ON_TARGET+ TEST_THE_UNDO,binaryLink.getTarget().equals(target));
-
+
//redo
getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().redo();
assertTrue(LINK_EXISTS_RECONNECTION_ON_TARGET+ TEST_THE_REDO,binaryLink.getTarget().equals(targetPlayer));
-
+
}
+ @Override
public void testSourceReconnectAMultiLink(IElementType type) {
//target reconnection
@@ -260,13 +255,13 @@ public class TestContainmentLink extends TestLink { reconnectRequest.setTargetEditPart(sourcePlayer);
reconnectRequest.setType(RequestConstants.REQ_RECONNECT_SOURCE);
- Command cmd = sourcePlayer.getCommand(reconnectRequest);
+ Command cmd = sourcePlayer.getCommand(reconnectRequest);
//it is impossible to reconnect source of the link
assertTrue(RECONNECTION_SOURCE+TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,cmd.canExecute()==false);
-
-
+
+
}
-
+
/**
* Test to manage top node.
*
@@ -283,7 +278,7 @@ public class TestContainmentLink extends TestLink { testRecreation(linkType);
testSourceReconnectAMultiLink(linkType);
testTargetReconnectAMultiLink(linkType);
-
+
}
public void testRecreation(IElementType linkType) {
@@ -291,8 +286,8 @@ public class TestContainmentLink extends TestLink { assertTrue(CREATION +INITIALIZATION_TEST,getDiagramEditPart().getChildren().size()==4);
assertTrue(CREATION +INITIALIZATION_TEST,getRootSemanticModel().getOwnedElements().size()==3);
assertTrue(CREATION +INITIALIZATION_TEST, ((Element)source.resolveSemanticElement()).getOwnedElements().size()==1);
-
- Command command = target.getCommand(createConnectionViewRequest(linkType, source, target));
+
+ Command command = target.getCommand(createConnectionViewRequest(linkType, source, target));
assertNotNull(CREATION+COMMAND_NULL,command);
assertTrue(CONTAINER_CREATION+TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,command.canExecute()==true);
diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
@@ -310,6 +305,6 @@ public class TestContainmentLink extends TestLink { assertTrue(CREATION +INITIALIZATION_TEST,getDiagramEditPart().getChildren().size()==4);
assertTrue(CREATION +INITIALIZATION_TEST,getRootSemanticModel().getOwnedElements().size()==3);
assertTrue(CREATION +INITIALIZATION_TEST, ((Element)source.resolveSemanticElement()).getOwnedElements().size()==1);
-
+
}
}
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestDropfunction.java b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestDropfunction.java index 6406d1f23da..8ccf9d0df3d 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestDropfunction.java +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestDropfunction.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2009 CEA LIST.
*
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -28,9 +28,9 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory; import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;
import org.eclipse.gmf.runtime.emf.type.core.IElementType;
import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.clazz.edit.parts.EnumerationEnumerationLiteralCompartmentEditPart;
-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;
-import org.eclipse.papyrus.diagram.common.command.wrappers.GEFtoEMFCommandWrapper;
+import org.eclipse.papyrus.commands.wrappers.GEFtoEMFCommandWrapper;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationEnumerationLiteralCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;
import org.eclipse.uml2.uml.Element;
import org.junit.Test;
@@ -42,13 +42,13 @@ import org.junit.Test; */
public class TestDropfunction extends TestChildLabel {
-public static int MAX=20;
-@Test
-public void testDropWithOrder(){
- testToCreateATopNode(UMLElementTypes.Enumeration_2006);
- testToCreateSetOfNode(UMLElementTypes.EnumerationLiteral_3017, EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID);
- testSetOfDrop(UMLElementTypes.EnumerationLiteral_3017, EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID);
-}
+ public static int MAX=20;
+ @Test
+ public void testDropWithOrder(){
+ testToCreateATopNode(UMLElementTypes.Enumeration_2006);
+ testToCreateSetOfNode(UMLElementTypes.EnumerationLiteral_3017, EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID);
+ testSetOfDrop(UMLElementTypes.EnumerationLiteral_3017, EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID);
+ }
protected void testToCreateSetOfNode(IElementType type,int containerType) {
ListCompartmentEditPart compartment=null;
@@ -64,7 +64,7 @@ public void testDropWithOrder(){ assertTrue(CREATION +INITIALIZATION_TEST,compartment.getChildren().size()==0);
assertTrue(CREATION +INITIALIZATION_TEST,getRootSemanticModel().getOwnedElements().size()==0);
-
+
for(int i=0; i<MAX;i++){
CreateViewRequest requestcreation=CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());
Command command=compartment.getCommand(requestcreation);
@@ -101,8 +101,8 @@ public void testDropWithOrder(){ //DROP
assertTrue(DROP +INITIALIZATION_TEST,compartment.getChildren().size()==0);
assertTrue(DROP +INITIALIZATION_TEST,((Element)((View)getTopEditPart().getModel()).getElement()).getOwnedElements().size()==MAX);
-
-
+
+
DropObjectsRequest dropObjectsRequest= new DropObjectsRequest();
ArrayList<Element> list = new ArrayList<Element>();
for(int i=0; i<MAX;i++){
@@ -117,13 +117,13 @@ public void testDropWithOrder(){ diagramEditor.getEditingDomain().getCommandStack().execute(new GEFtoEMFCommandWrapper(command));
assertTrue(DROP +TEST_THE_EXECUTION,compartment.getChildren().size()==MAX);
assertTrue(DROP +TEST_THE_EXECUTION,((Element)((View)getTopEditPart().getModel()).getElement()).getOwnedElements().size()==MAX);
-
+
for(int i=0; i<MAX;i++){
assertEquals(getRootSemanticModel().getOwnedElements().get(i),((GraphicalEditPart) compartment.getChildren().get(i)).resolveSemanticElement());
- }
-
+ }
+
}
-
+
}
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestLink.java b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestLink.java index 9e91ae32194..0de5c25f37e 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestLink.java +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestLink.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2009 CEA LIST.
*
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -40,10 +40,10 @@ import org.eclipse.gmf.runtime.emf.commands.core.command.EditingDomainUndoContex import org.eclipse.gmf.runtime.emf.type.core.IElementType;
import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.papyrus.core.services.ServiceException;
-import org.eclipse.papyrus.core.utils.ServiceUtilsForActionHandlers;
-import org.eclipse.papyrus.diagram.common.Activator;
-import org.eclipse.papyrus.diagram.common.command.wrappers.GEFtoEMFCommandWrapper;
+import org.eclipse.papyrus.commands.wrappers.GEFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.core.utils.ServiceUtilsForActionHandlers;
+import org.eclipse.papyrus.uml.diagram.common.Activator;
import org.eclipse.uml2.uml.Element;
@@ -54,9 +54,9 @@ import org.eclipse.uml2.uml.Element; * To adapt when source owns the created link
*/
public class TestLink extends AbstractPapyrusTestCase {
-
-
-
+
+
+
protected static final String THE_LINK_RECONNECT_EXISTS = "The Link exist";
protected static final String RECONNECTION_TARGET = "Reconnection of target";
@@ -78,7 +78,7 @@ public class TestLink extends AbstractPapyrusTestCase { //DELETION OF THE VIEW
assertTrue(VIEW_DELETION +INITIALIZATION_TEST, source.getSourceConnections().size()==1);
assertTrue(VIEW_DELETION +INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size()==5);
-
+
Request deleteViewRequest = new GroupRequest(RequestConstants.REQ_DELETE);
Command command = ((ConnectionEditPart)source.getSourceConnections().get(0)).getCommand(deleteViewRequest);
assertNotNull(VIEW_DELETION +COMMAND_NULL,command);
@@ -93,7 +93,7 @@ public class TestLink extends AbstractPapyrusTestCase { diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();
assertTrue(VIEW_DELETION +TEST_THE_REDO,source.getSourceConnections().size()==0);
assertTrue(VIEW_DELETION +TEST_THE_REDO,getRootSemanticModel().getOwnedElements().size()==5);
-
+
}
/**
* Retrieves the TransactionalEditingDomain
@@ -118,13 +118,13 @@ public class TestLink extends AbstractPapyrusTestCase { * @param type the type
*/
public void testDestroy(IElementType type) {
-
+
//DESTROY SEMANTIC+ VIEW
assertTrue(DESTROY_DELETION +INITIALIZATION_TEST,source.getSourceConnections().size()==1);
assertTrue(DESTROY_DELETION +INITIALIZATION_TEST,getRootSemanticModel().getOwnedElements().size()==5);
-
-
+
+
Request deleteViewRequest = new EditCommandRequestWrapper( new DestroyElementRequest(false));
Command command = ((ConnectionEditPart)source.getSourceConnections().get(0)).getCommand(deleteViewRequest);
assertNotNull(DESTROY_DELETION +COMMAND_NULL,command);
@@ -133,22 +133,22 @@ public class TestLink extends AbstractPapyrusTestCase { getEditingDomain().getCommandStack().execute(new GEFtoEMFCommandWrapper(command));
assertTrue(DESTROY_DELETION +INITIALIZATION_TEST,source.getSourceConnections().size()==0);
assertTrue(DESTROY_DELETION +INITIALIZATION_TEST,getRootSemanticModel().getOwnedElements().size()==4);
-
+
EditingDomainUndoContext undoContext= new EditingDomainUndoContext(getEditingDomain());
try{
- OperationHistoryFactory.getOperationHistory().undo(undoContext, new NullProgressMonitor(), null);
+ OperationHistoryFactory.getOperationHistory().undo(undoContext, new NullProgressMonitor(), null);
}catch (Exception e) {
System.err.println(e);
}
-
+
assertTrue(DESTROY_DELETION +INITIALIZATION_TEST,source.getSourceConnections().size()==1);
assertTrue(DESTROY_DELETION +INITIALIZATION_TEST,getRootSemanticModel().getOwnedElements().size()==5);
diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();
assertTrue(DESTROY_DELETION +INITIALIZATION_TEST,source.getSourceConnections().size()==0);
assertTrue(DESTROY_DELETION +INITIALIZATION_TEST,getRootSemanticModel().getOwnedElements().size()==4);
}
-
-
+
+
/**
* Test drop.
*
@@ -159,9 +159,9 @@ public class TestLink extends AbstractPapyrusTestCase { assertTrue(DROP +INITIALIZATION_TEST,getDiagramEditPart().getChildren().size()==4);
assertTrue(DROP +INITIALIZATION_TEST,getRootSemanticModel().getOwnedElements().size()==5);
assertTrue(CREATION +INITIALIZATION_TEST,((Diagram)getRootView()).getEdges().size()==0);
-
-
-
+
+
+
DropObjectsRequest dropObjectsRequest= new DropObjectsRequest();
ArrayList<Element> list = new ArrayList<Element>();
list.add(getRootSemanticModel().getOwnedElements().get(4));
@@ -183,9 +183,9 @@ public class TestLink extends AbstractPapyrusTestCase { assertTrue(DROP +TEST_THE_REDO,getDiagramEditPart().getChildren().size()==4);
assertTrue(DROP +TEST_THE_REDO,getRootSemanticModel().getOwnedElements().size()==5);
assertTrue(DROP +TEST_THE_REDO,((Diagram)getRootView()).getEdges().size()==1);
- }
-
-
+ }
+
+
/**
* Test change container.
*
@@ -196,8 +196,8 @@ public class TestLink extends AbstractPapyrusTestCase { //CHANGE CONTAINER
assertTrue(CHANGE_CONTAINER +INITIALIZATION_TEST,getDiagramEditPart().getChildren().size()==1);
assertTrue(CHANGE_CONTAINER +INITIALIZATION_TEST,getRootSemanticModel().getOwnedElements().size()==1);
-
-
+
+
Request requestcreation=CreateViewRequestFactory.getCreateShapeRequest(containerType, getDiagramEditPart().getDiagramPreferencesHint());
Command command=getDiagramEditPart().getCommand(requestcreation);
assertNotNull(CONTAINER_CREATION+COMMAND_NULL,command);
@@ -218,8 +218,8 @@ public class TestLink extends AbstractPapyrusTestCase { index++;
}
assertTrue("Container not found", compartment!=null);
-
-
+
+
command=compartment.getCommand(changeBoundsRequest);
assertNotNull(CHANGE_CONTAINER,command);
assertTrue(CHANGE_CONTAINER+TEST_IF_THE_COMMAND_IS_CREATED,command!=UnexecutableCommand.INSTANCE);
@@ -236,9 +236,9 @@ public class TestLink extends AbstractPapyrusTestCase { assertTrue(CHANGE_CONTAINER+TEST_THE_REDO,getRootView().getChildren().size()==1);
assertTrue(CHANGE_CONTAINER+TEST_THE_REDO,getRootSemanticModel().getOwnedElements().size()==1);
assertTrue(CHANGE_CONTAINER+TEST_THE_EXECUTION,compartment.getChildren().size()==1);
-
- }
-
+
+ }
+
/**
* Test to create a link.
*
@@ -247,8 +247,8 @@ public class TestLink extends AbstractPapyrusTestCase { public void testToCreateALink(IElementType linkType) {
assertTrue(CREATION +INITIALIZATION_TEST,getDiagramEditPart().getChildren().size()==4);
assertTrue(CREATION +INITIALIZATION_TEST,getRootSemanticModel().getOwnedElements().size()==4);
-
- Command command = target.getCommand(createConnectionViewRequest(linkType, source, target));
+
+ Command command = target.getCommand(createConnectionViewRequest(linkType, source, target));
assertNotNull(CREATION+COMMAND_NULL,command);
assertTrue(CONTAINER_CREATION+TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,command.canExecute()==true);
diagramEditor.getEditingDomain().getCommandStack().execute(new GEFtoEMFCommandWrapper(command));
@@ -260,12 +260,12 @@ public class TestLink extends AbstractPapyrusTestCase { diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();
assertTrue(CREATION +TEST_THE_REDO,((Diagram)getRootView()).getEdges().size()==1);
assertTrue(CREATION +TEST_THE_REDO,getRootSemanticModel().getOwnedElements().size()==5);
-
+
}
public void installEnvironment(IElementType sourceType,IElementType targetType ){
assertTrue(CREATION +INITIALIZATION_TEST,getDiagramEditPart().getChildren().size()==0);
assertTrue(CREATION +INITIALIZATION_TEST,getRootSemanticModel().getOwnedElements().size()==0);
-
+
//create the source
CreateViewRequest requestcreation=CreateViewRequestFactory.getCreateShapeRequest(sourceType, getDiagramEditPart().getDiagramPreferencesHint());
requestcreation.setLocation(new Point(100, 100));
@@ -274,17 +274,17 @@ public class TestLink extends AbstractPapyrusTestCase { assertTrue(CREATION+TEST_IF_THE_COMMAND_IS_CREATED,command!=UnexecutableCommand.INSTANCE);
assertTrue("CREATION: "+TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,command.canExecute()==true);
diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
-
-
+
+
//create the source player to test reconnect
- requestcreation=CreateViewRequestFactory.getCreateShapeRequest(sourceType, getDiagramEditPart().getDiagramPreferencesHint());
+ requestcreation=CreateViewRequestFactory.getCreateShapeRequest(sourceType, getDiagramEditPart().getDiagramPreferencesHint());
requestcreation.setLocation(new Point(100, 300));
- command=getDiagramEditPart().getCommand(requestcreation);
+ command=getDiagramEditPart().getCommand(requestcreation);
assertNotNull(CREATION+COMMAND_NULL,command);
assertTrue(CREATION+TEST_IF_THE_COMMAND_IS_CREATED,command!=UnexecutableCommand.INSTANCE);
assertTrue("CREATION: "+TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,command.canExecute()==true);
diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
-
+
//create the target
requestcreation=CreateViewRequestFactory.getCreateShapeRequest(targetType, getDiagramEditPart().getDiagramPreferencesHint());
requestcreation.setLocation(new Point(300, 100));
@@ -293,7 +293,7 @@ public class TestLink extends AbstractPapyrusTestCase { assertTrue(CREATION+TEST_IF_THE_COMMAND_IS_CREATED,command!=UnexecutableCommand.INSTANCE);
assertTrue("CREATION: "+TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,command.canExecute()==true);
diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
-
+
//create the target player to test reconnect
requestcreation=CreateViewRequestFactory.getCreateShapeRequest(targetType, getDiagramEditPart().getDiagramPreferencesHint());
requestcreation.setLocation(new Point(300, 300));
@@ -302,20 +302,20 @@ public class TestLink extends AbstractPapyrusTestCase { assertTrue(CREATION+TEST_IF_THE_COMMAND_IS_CREATED,command!=UnexecutableCommand.INSTANCE);
assertTrue("CREATION: "+TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,command.canExecute()==true);
diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
-
-
-
-
+
+
+
+
source=(GraphicalEditPart)getDiagramEditPart().getChildren().get(0);
sourcePlayer=(GraphicalEditPart)getDiagramEditPart().getChildren().get(1);
target=(GraphicalEditPart)getDiagramEditPart().getChildren().get(2);
targetPlayer=(GraphicalEditPart)getDiagramEditPart().getChildren().get(3);
-
+
}
-
+
public CreateConnectionViewRequest createConnectionViewRequest(IElementType type , EditPart source, EditPart target){
CreateConnectionViewRequest connectionRequest = CreateViewRequestFactory.getCreateConnectionRequest(type,((IGraphicalEditPart) getDiagramEditPart())
- .getDiagramPreferencesHint());
+ .getDiagramPreferencesHint());
connectionRequest.setSourceEditPart(null);
connectionRequest.setTargetEditPart(source);
@@ -332,9 +332,9 @@ public class TestLink extends AbstractPapyrusTestCase { .setType(RequestConstants.REQ_CONNECTION_END);
return connectionRequest;
}
-
-
-
+
+
+
public void testTargetReconnectAMultiLink(IElementType type) {
//target reconnection
@@ -345,23 +345,23 @@ public class TestLink extends AbstractPapyrusTestCase { reconnectRequest.setTargetEditPart(targetPlayer);
reconnectRequest.setType(RequestConstants.REQ_RECONNECT_TARGET);
- Command cmd = targetPlayer.getCommand(reconnectRequest);
+ Command cmd = targetPlayer.getCommand(reconnectRequest);
assertTrue(RECONNECTION_TARGET+TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,cmd.canExecute()==true);
- getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().execute(cmd);
+ getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().execute(cmd);
// EditorUtils.getTransactionalEditingDomain().getCommandStack().execute(cmd);
assertTrue(RECONNECTION_TARGET+TEST_THE_EXECUTION,((Diagram)getRootView()).getEdges().size()==1);
assertTrue(RECONNECTION_TARGET +TEST_THE_EXECUTION,getRootSemanticModel().getOwnedElements().size()==5);
assertTrue(LINK_EXISTS_RECONNECTION_ON_TARGET,binaryLink.getTarget().equals(targetPlayer));
-
+
//undo
getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().undo();
assertTrue(LINK_EXISTS_RECONNECTION_ON_TARGET+ TEST_THE_UNDO,binaryLink.getTarget().equals(target));
-
+
//redo
getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().redo();
assertTrue(LINK_EXISTS_RECONNECTION_ON_TARGET+ TEST_THE_REDO,binaryLink.getTarget().equals(targetPlayer));
-
+
}
@@ -376,22 +376,22 @@ public class TestLink extends AbstractPapyrusTestCase { reconnectRequest.setTargetEditPart(sourcePlayer);
reconnectRequest.setType(RequestConstants.REQ_RECONNECT_SOURCE);
- Command cmd = sourcePlayer.getCommand(reconnectRequest);
+ Command cmd = sourcePlayer.getCommand(reconnectRequest);
assertTrue(RECONNECTION_SOURCE+TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,cmd.canExecute()==true);
- getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().execute(cmd);
+ getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().execute(cmd);
assertTrue(RECONNECTION_SOURCE+TEST_THE_EXECUTION,((Diagram)getRootView()).getEdges().size()==1);
assertTrue(RECONNECTION_SOURCE +TEST_THE_EXECUTION,getRootSemanticModel().getOwnedElements().size()==5);
assertTrue(LINK_EXISTS_RECONNECTION_ON_SOURCE+TEST_THE_EXECUTION,branch.getSource().equals(sourcePlayer));
-
+
getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().undo();
assertTrue(LINK_EXISTS_RECONNECTION_ON_SOURCE+ TEST_THE_UNDO,branch.getSource().equals(source));
-
+
getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().redo();
assertTrue(LINK_EXISTS_RECONNECTION_ON_SOURCE+TEST_THE_REDO,branch.getSource().equals(sourcePlayer));
-
+
}
-
+
/**
* Test to manage top node.
*
@@ -410,9 +410,9 @@ public class TestLink extends AbstractPapyrusTestCase { testTargetReconnectAMultiLink(linkType);
testToCreateAlinkOnTheSame(linkType,allowedOntheSame);
testToDropAlinkOnTheSame(linkType,allowedOntheSame);
-
+
}
-
+
/**
* test the drop of a link where the source and the target are the same objects
* @param linkType
@@ -421,35 +421,35 @@ public class TestLink extends AbstractPapyrusTestCase { protected void testToDropAlinkOnTheSame(IElementType linkType, boolean allowed) {
//DROP
if(allowed){
- assertTrue(DROP +INITIALIZATION_TEST,getDiagramEditPart().getChildren().size()==4);
- assertTrue(DROP +INITIALIZATION_TEST,getRootSemanticModel().getOwnedElements().size()==6);
- assertTrue(CREATION +INITIALIZATION_TEST,((Diagram)getRootView()).getEdges().size()==2);
-
- DropObjectsRequest dropObjectsRequest= new DropObjectsRequest();
- ArrayList<Element> list = new ArrayList<Element>();
- list.add(getRootSemanticModel().getOwnedElements().get(5));
- dropObjectsRequest.setObjects(list);
- dropObjectsRequest.setLocation(new Point(20,20));
- Command command= getDiagramEditPart().getCommand(dropObjectsRequest);
- assertNotNull(DROP+COMMAND_NULL,command);
- assertTrue(DROP +TEST_IF_THE_COMMAND_IS_CREATED,command!=UnexecutableCommand.INSTANCE);
- assertTrue(DROP+TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,command.canExecute()==true);
- diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
- assertTrue(DROP +TEST_THE_EXECUTION,getDiagramEditPart().getChildren().size()==4);
- assertTrue(DROP +TEST_THE_EXECUTION,getRootSemanticModel().getOwnedElements().size()==6);
- assertTrue(DROP +TEST_THE_EXECUTION,((Diagram)getRootView()).getEdges().size()==3);
- diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();
- assertTrue(DROP +TEST_THE_UNDO,getDiagramEditPart().getChildren().size()==4);
- assertTrue(DROP +TEST_THE_UNDO,getRootSemanticModel().getOwnedElements().size()==6);
- assertTrue(DROP +TEST_THE_UNDO,((Diagram)getRootView()).getEdges().size()==2);
- diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();
- assertTrue(DROP +TEST_THE_REDO,getDiagramEditPart().getChildren().size()==4);
- assertTrue(DROP +TEST_THE_REDO,getRootSemanticModel().getOwnedElements().size()==6);
- assertTrue(DROP +TEST_THE_REDO,((Diagram)getRootView()).getEdges().size()==3);
+ assertTrue(DROP +INITIALIZATION_TEST,getDiagramEditPart().getChildren().size()==4);
+ assertTrue(DROP +INITIALIZATION_TEST,getRootSemanticModel().getOwnedElements().size()==6);
+ assertTrue(CREATION +INITIALIZATION_TEST,((Diagram)getRootView()).getEdges().size()==2);
+
+ DropObjectsRequest dropObjectsRequest= new DropObjectsRequest();
+ ArrayList<Element> list = new ArrayList<Element>();
+ list.add(getRootSemanticModel().getOwnedElements().get(5));
+ dropObjectsRequest.setObjects(list);
+ dropObjectsRequest.setLocation(new Point(20,20));
+ Command command= getDiagramEditPart().getCommand(dropObjectsRequest);
+ assertNotNull(DROP+COMMAND_NULL,command);
+ assertTrue(DROP +TEST_IF_THE_COMMAND_IS_CREATED,command!=UnexecutableCommand.INSTANCE);
+ assertTrue(DROP+TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,command.canExecute()==true);
+ diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+ assertTrue(DROP +TEST_THE_EXECUTION,getDiagramEditPart().getChildren().size()==4);
+ assertTrue(DROP +TEST_THE_EXECUTION,getRootSemanticModel().getOwnedElements().size()==6);
+ assertTrue(DROP +TEST_THE_EXECUTION,((Diagram)getRootView()).getEdges().size()==3);
+ diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();
+ assertTrue(DROP +TEST_THE_UNDO,getDiagramEditPart().getChildren().size()==4);
+ assertTrue(DROP +TEST_THE_UNDO,getRootSemanticModel().getOwnedElements().size()==6);
+ assertTrue(DROP +TEST_THE_UNDO,((Diagram)getRootView()).getEdges().size()==2);
+ diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();
+ assertTrue(DROP +TEST_THE_REDO,getDiagramEditPart().getChildren().size()==4);
+ assertTrue(DROP +TEST_THE_REDO,getRootSemanticModel().getOwnedElements().size()==6);
+ assertTrue(DROP +TEST_THE_REDO,((Diagram)getRootView()).getEdges().size()==3);
}
-
+
}
-
+
/**
* test the creation of a link where the source and the target are the same objects
* @param linkType
@@ -458,24 +458,24 @@ public class TestLink extends AbstractPapyrusTestCase { protected void testToCreateAlinkOnTheSame(IElementType linkType, boolean allowed) {
assertTrue(CREATION +INITIALIZATION_TEST,getDiagramEditPart().getChildren().size()==4);
assertTrue(CREATION +INITIALIZATION_TEST,getRootSemanticModel().getOwnedElements().size()==5);
-
- Command command = target.getCommand(createConnectionViewRequest(linkType, source, source));
+
+ Command command = target.getCommand(createConnectionViewRequest(linkType, source, source));
assertNotNull(CREATION+COMMAND_NULL,command);
assertTrue(CONTAINER_CREATION+TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,command.canExecute()==allowed);
if(allowed){
- diagramEditor.getEditingDomain().getCommandStack().execute(new GEFtoEMFCommandWrapper(command));
- assertTrue(CREATION +INITIALIZATION_TEST,((Diagram)getRootView()).getEdges().size()==2);
- assertTrue(CREATION +INITIALIZATION_TEST,getRootSemanticModel().getOwnedElements().size()==6);
- diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();
- assertTrue(CREATION+TEST_THE_UNDO,getRootView().getChildren().size()==4);
- assertTrue(CREATION+TEST_THE_UNDO,getRootSemanticModel().getOwnedElements().size()==5);
- diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();
- assertTrue(CREATION +TEST_THE_REDO,((Diagram)getRootView()).getEdges().size()==2);
- assertTrue(CREATION +TEST_THE_REDO,getRootSemanticModel().getOwnedElements().size()==6);
+ diagramEditor.getEditingDomain().getCommandStack().execute(new GEFtoEMFCommandWrapper(command));
+ assertTrue(CREATION +INITIALIZATION_TEST,((Diagram)getRootView()).getEdges().size()==2);
+ assertTrue(CREATION +INITIALIZATION_TEST,getRootSemanticModel().getOwnedElements().size()==6);
+ diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();
+ assertTrue(CREATION+TEST_THE_UNDO,getRootView().getChildren().size()==4);
+ assertTrue(CREATION+TEST_THE_UNDO,getRootSemanticModel().getOwnedElements().size()==5);
+ diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();
+ assertTrue(CREATION +TEST_THE_REDO,((Diagram)getRootView()).getEdges().size()==2);
+ assertTrue(CREATION +TEST_THE_REDO,getRootSemanticModel().getOwnedElements().size()==6);
}
-
-
+
+
}
-
-
+
+
}
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestLinkOwnedBySource.java b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestLinkOwnedBySource.java index 0bbf5674684..5768148e7bd 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestLinkOwnedBySource.java +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestLinkOwnedBySource.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2009 CEA LIST.
*
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -18,20 +18,14 @@ import java.util.ArrayList; import org.eclipse.core.commands.operations.OperationHistoryFactory;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
import org.eclipse.gef.ConnectionEditPart;
-import org.eclipse.gef.EditPart;
import org.eclipse.gef.Request;
import org.eclipse.gef.RequestConstants;
import org.eclipse.gef.commands.Command;
import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gef.requests.ChangeBoundsRequest;
import org.eclipse.gef.requests.GroupRequest;
import org.eclipse.gef.requests.ReconnectRequest;
import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewRequest;
import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;
@@ -40,21 +34,19 @@ import org.eclipse.gmf.runtime.emf.commands.core.command.EditingDomainUndoContex import org.eclipse.gmf.runtime.emf.type.core.IElementType;
import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.papyrus.core.services.ServiceException;
-import org.eclipse.papyrus.core.utils.ServiceUtilsForActionHandlers;
-import org.eclipse.papyrus.diagram.common.Activator;
-import org.eclipse.papyrus.diagram.common.command.wrappers.GEFtoEMFCommandWrapper;
+import org.eclipse.papyrus.commands.wrappers.GEFtoEMFCommandWrapper;
import org.eclipse.uml2.uml.Element;
public class TestLinkOwnedBySource extends TestLink {
-
-
+
+
/**
* Test view deletion.
*
* @param type the type
*/
+ @Override
public void testViewDeletion(IElementType type) {
//DELETION OF THE VIEW
assertTrue(VIEW_DELETION +INITIALIZATION_TEST, source.getSourceConnections().size()==1);
@@ -77,22 +69,23 @@ public class TestLinkOwnedBySource extends TestLink { assertTrue(VIEW_DELETION +TEST_THE_REDO,source.getSourceConnections().size()==0);
assertTrue(VIEW_DELETION +TEST_THE_REDO,getRootSemanticModel().getOwnedElements().size()==4);
assertTrue(VIEW_DELETION +TEST_THE_REDO, ((Element)source.resolveSemanticElement()).getOwnedElements().size()==1);
-
+
}
-
+
/**
* Test destroy.
*
* @param type the type
*/
+ @Override
public void testDestroy(IElementType type) {
-
+
//DESTROY SEMANTIC+ VIEW
assertTrue(DESTROY_DELETION +INITIALIZATION_TEST,source.getSourceConnections().size()==1);
assertTrue(DESTROY_DELETION +INITIALIZATION_TEST,getRootSemanticModel().getOwnedElements().size()==4);
assertTrue(DESTROY_DELETION +INITIALIZATION_TEST, ((Element)source.resolveSemanticElement()).getOwnedElements().size()==1);
-
+
Request deleteViewRequest = new EditCommandRequestWrapper( new DestroyElementRequest(false));
Command command = ((ConnectionEditPart)source.getSourceConnections().get(0)).getCommand(deleteViewRequest);
assertNotNull(DESTROY_DELETION +COMMAND_NULL,command);
@@ -102,14 +95,14 @@ public class TestLinkOwnedBySource extends TestLink { assertTrue(DESTROY_DELETION +TEST_THE_EXECUTION,source.getSourceConnections().size()==0);
assertTrue(DESTROY_DELETION +TEST_THE_EXECUTION,getRootSemanticModel().getOwnedElements().size()==4);
assertTrue(DESTROY_DELETION +TEST_THE_EXECUTION, ((Element)source.resolveSemanticElement()).getOwnedElements().size()==0);
-
+
EditingDomainUndoContext undoContext= new EditingDomainUndoContext(getEditingDomain());
try{
- OperationHistoryFactory.getOperationHistory().undo(undoContext, new NullProgressMonitor(), null);
+ OperationHistoryFactory.getOperationHistory().undo(undoContext, new NullProgressMonitor(), null);
}catch (Exception e) {
System.err.println(e);
}
-
+
assertTrue(DESTROY_DELETION +TEST_THE_UNDO,source.getSourceConnections().size()==1);
assertTrue(DESTROY_DELETION +TEST_THE_UNDO,getRootSemanticModel().getOwnedElements().size()==4);
assertTrue(DESTROY_DELETION +TEST_THE_UNDO, ((Element)source.resolveSemanticElement()).getOwnedElements().size()==1);
@@ -118,20 +111,21 @@ public class TestLinkOwnedBySource extends TestLink { assertTrue(DESTROY_DELETION +TEST_THE_REDO,getRootSemanticModel().getOwnedElements().size()==4);
assertTrue(DESTROY_DELETION +TEST_THE_REDO, ((Element)source.resolveSemanticElement()).getOwnedElements().size()==0);
}
-
-
+
+
/**
* Test drop.
*
* @param type the type
*/
+ @Override
public void testDrop(IElementType type) {
//DROP
assertTrue(DROP +INITIALIZATION_TEST,getDiagramEditPart().getChildren().size()==4);
assertTrue(DROP +INITIALIZATION_TEST,getRootSemanticModel().getOwnedElements().size()==4);
assertTrue(DROP +INITIALIZATION_TEST, ((Element)source.resolveSemanticElement()).getOwnedElements().size()==1);
assertTrue(DROP +TEST_THE_REDO,((Diagram)getRootView()).getEdges().size()==0);
-
+
DropObjectsRequest dropObjectsRequest= new DropObjectsRequest();
ArrayList<Element> list = new ArrayList<Element>();
list.add(((Element)source.resolveSemanticElement()).getOwnedElements().get(0));
@@ -156,22 +150,23 @@ public class TestLinkOwnedBySource extends TestLink { assertTrue(DROP +TEST_THE_REDO,getRootSemanticModel().getOwnedElements().size()==4);
assertTrue(DROP +TEST_THE_REDO, ((Element)source.resolveSemanticElement()).getOwnedElements().size()==1);
assertTrue(DROP +TEST_THE_REDO,((Diagram)getRootView()).getEdges().size()==1);
- }
-
-
-
-
+ }
+
+
+
+
/**
* Test to create a link.
*
* @param linkType the type
*/
+ @Override
public void testToCreateALink(IElementType linkType) {
assertTrue(CREATION +INITIALIZATION_TEST,getDiagramEditPart().getChildren().size()==4);
assertTrue(CREATION +INITIALIZATION_TEST,getRootSemanticModel().getOwnedElements().size()==4);
assertTrue(CREATION +INITIALIZATION_TEST, ((Element)source.resolveSemanticElement()).getOwnedElements().size()==0);
-
- Command command = target.getCommand(createConnectionViewRequest(linkType, source, target));
+
+ Command command = target.getCommand(createConnectionViewRequest(linkType, source, target));
assertNotNull(CREATION+COMMAND_NULL,command);
assertTrue(CONTAINER_CREATION+TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,command.canExecute()==true);
diagramEditor.getEditingDomain().getCommandStack().execute(new GEFtoEMFCommandWrapper(command));
@@ -186,12 +181,13 @@ public class TestLinkOwnedBySource extends TestLink { assertTrue(CREATION +TEST_THE_REDO,((Diagram)getRootView()).getEdges().size()==1);
assertTrue(CREATION +TEST_THE_REDO,getRootSemanticModel().getOwnedElements().size()==4);
assertTrue(CREATION +TEST_THE_REDO, ((Element)source.resolveSemanticElement()).getOwnedElements().size()==1);
-
+
}
+ @Override
public void installEnvironment(IElementType sourceType,IElementType targetType ){
assertTrue(CREATION +INITIALIZATION_TEST,getDiagramEditPart().getChildren().size()==0);
assertTrue(CREATION +INITIALIZATION_TEST,getRootSemanticModel().getOwnedElements().size()==0);
-
+
//create the source
CreateViewRequest requestcreation=CreateViewRequestFactory.getCreateShapeRequest(sourceType, getDiagramEditPart().getDiagramPreferencesHint());
requestcreation.setLocation(new Point(100, 100));
@@ -200,17 +196,17 @@ public class TestLinkOwnedBySource extends TestLink { assertTrue(CREATION+TEST_IF_THE_COMMAND_IS_CREATED,command!=UnexecutableCommand.INSTANCE);
assertTrue("CREATION: "+TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,command.canExecute()==true);
diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
-
-
+
+
//create the source player to test reconnect
- requestcreation=CreateViewRequestFactory.getCreateShapeRequest(sourceType, getDiagramEditPart().getDiagramPreferencesHint());
+ requestcreation=CreateViewRequestFactory.getCreateShapeRequest(sourceType, getDiagramEditPart().getDiagramPreferencesHint());
requestcreation.setLocation(new Point(100, 300));
- command=getDiagramEditPart().getCommand(requestcreation);
+ command=getDiagramEditPart().getCommand(requestcreation);
assertNotNull(CREATION+COMMAND_NULL,command);
assertTrue(CREATION+TEST_IF_THE_COMMAND_IS_CREATED,command!=UnexecutableCommand.INSTANCE);
assertTrue("CREATION: "+TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,command.canExecute()==true);
diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
-
+
//create the target
requestcreation=CreateViewRequestFactory.getCreateShapeRequest(targetType, getDiagramEditPart().getDiagramPreferencesHint());
requestcreation.setLocation(new Point(300, 100));
@@ -219,7 +215,7 @@ public class TestLinkOwnedBySource extends TestLink { assertTrue(CREATION+TEST_IF_THE_COMMAND_IS_CREATED,command!=UnexecutableCommand.INSTANCE);
assertTrue("CREATION: "+TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,command.canExecute()==true);
diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
-
+
//create the target player to test reconnect
requestcreation=CreateViewRequestFactory.getCreateShapeRequest(targetType, getDiagramEditPart().getDiagramPreferencesHint());
requestcreation.setLocation(new Point(300, 300));
@@ -228,21 +224,22 @@ public class TestLinkOwnedBySource extends TestLink { assertTrue(CREATION+TEST_IF_THE_COMMAND_IS_CREATED,command!=UnexecutableCommand.INSTANCE);
assertTrue("CREATION: "+TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,command.canExecute()==true);
diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
-
-
-
-
+
+
+
+
source=(GraphicalEditPart)getDiagramEditPart().getChildren().get(0);
sourcePlayer=(GraphicalEditPart)getDiagramEditPart().getChildren().get(1);
target=(GraphicalEditPart)getDiagramEditPart().getChildren().get(2);
targetPlayer=(GraphicalEditPart)getDiagramEditPart().getChildren().get(3);
-
+
}
-
-
-
-
+
+
+
+
+ @Override
public void testTargetReconnectAMultiLink(IElementType type) {
//target reconnection
@@ -253,27 +250,28 @@ public class TestLinkOwnedBySource extends TestLink { reconnectRequest.setTargetEditPart(targetPlayer);
reconnectRequest.setType(RequestConstants.REQ_RECONNECT_TARGET);
- Command cmd = targetPlayer.getCommand(reconnectRequest);
+ Command cmd = targetPlayer.getCommand(reconnectRequest);
assertTrue(RECONNECTION_TARGET+TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,cmd.canExecute()==true);
- getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().execute(cmd);
+ getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().execute(cmd);
// EditorUtils.getTransactionalEditingDomain().getCommandStack().execute(cmd);
assertTrue(RECONNECTION_TARGET+TEST_THE_EXECUTION,((Diagram)getRootView()).getEdges().size()==1);
assertTrue(RECONNECTION_TARGET +TEST_THE_EXECUTION,getRootSemanticModel().getOwnedElements().size()==4);
assertTrue(LINK_EXISTS_RECONNECTION_ON_TARGET,binaryLink.getTarget().equals(targetPlayer));
-
+
//undo
getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().undo();
assertTrue(LINK_EXISTS_RECONNECTION_ON_TARGET+ TEST_THE_UNDO,binaryLink.getTarget().equals(target));
-
+
//redo
getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().redo();
assertTrue(LINK_EXISTS_RECONNECTION_ON_TARGET+ TEST_THE_REDO,binaryLink.getTarget().equals(targetPlayer));
-
+
}
+ @Override
public void testSourceReconnectAMultiLink(IElementType type) {
//target reconnection
@@ -284,81 +282,83 @@ public class TestLinkOwnedBySource extends TestLink { reconnectRequest.setTargetEditPart(sourcePlayer);
reconnectRequest.setType(RequestConstants.REQ_RECONNECT_SOURCE);
- Command cmd = sourcePlayer.getCommand(reconnectRequest);
+ Command cmd = sourcePlayer.getCommand(reconnectRequest);
assertTrue(RECONNECTION_SOURCE+TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,cmd.canExecute()==true);
- getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().execute(cmd);
+ getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().execute(cmd);
assertTrue(RECONNECTION_SOURCE+TEST_THE_EXECUTION,((Diagram)getRootView()).getEdges().size()==1);
assertTrue(RECONNECTION_SOURCE +TEST_THE_EXECUTION,getRootSemanticModel().getOwnedElements().size()==4);
assertTrue(LINK_EXISTS_RECONNECTION_ON_SOURCE+TEST_THE_EXECUTION,branch.getSource().equals(sourcePlayer));
-
+
getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().undo();
assertTrue(LINK_EXISTS_RECONNECTION_ON_SOURCE+ TEST_THE_UNDO,branch.getSource().equals(source));
-
+
getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().redo();
assertTrue(LINK_EXISTS_RECONNECTION_ON_SOURCE+TEST_THE_REDO,branch.getSource().equals(sourcePlayer));
-
+
}
/**
* test the drop of a link where the source and the target are the same objects
* @param linkType
* @param allowed
*/
+ @Override
protected void testToDropAlinkOnTheSame(IElementType linkType, boolean allowed) {
//DROP
if(allowed){
- assertTrue(DROP +INITIALIZATION_TEST,getDiagramEditPart().getChildren().size()==4);
- assertTrue(DROP +INITIALIZATION_TEST,getRootSemanticModel().getOwnedElements().size()==4);
- assertTrue(CREATION +INITIALIZATION_TEST,((Diagram)getRootView()).getEdges().size()==2);
-
- DropObjectsRequest dropObjectsRequest= new DropObjectsRequest();
- ArrayList<Element> list = new ArrayList<Element>();
- list.add(((Element)source.resolveSemanticElement()).getOwnedElements().get(1));
- dropObjectsRequest.setObjects(list);
- dropObjectsRequest.setLocation(new Point(20,20));
- Command command= getDiagramEditPart().getCommand(dropObjectsRequest);
- assertNotNull(DROP+COMMAND_NULL,command);
- assertTrue(DROP +TEST_IF_THE_COMMAND_IS_CREATED,command!=UnexecutableCommand.INSTANCE);
- assertTrue(DROP+TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,command.canExecute()==true);
- diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
- assertTrue(DROP +TEST_THE_EXECUTION,getDiagramEditPart().getChildren().size()==4);
- assertTrue(DROP +TEST_THE_EXECUTION,getRootSemanticModel().getOwnedElements().size()==4);
- assertTrue(DROP +TEST_THE_EXECUTION,((Diagram)getRootView()).getEdges().size()==3);
- diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();
- assertTrue(DROP +TEST_THE_UNDO,getDiagramEditPart().getChildren().size()==4);
- assertTrue(DROP +TEST_THE_UNDO,getRootSemanticModel().getOwnedElements().size()==4);
- assertTrue(DROP +TEST_THE_UNDO,((Diagram)getRootView()).getEdges().size()==2);
- diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();
- assertTrue(DROP +TEST_THE_REDO,getDiagramEditPart().getChildren().size()==4);
- assertTrue(DROP +TEST_THE_REDO,getRootSemanticModel().getOwnedElements().size()==4);
- assertTrue(DROP +TEST_THE_REDO,((Diagram)getRootView()).getEdges().size()==3);
+ assertTrue(DROP +INITIALIZATION_TEST,getDiagramEditPart().getChildren().size()==4);
+ assertTrue(DROP +INITIALIZATION_TEST,getRootSemanticModel().getOwnedElements().size()==4);
+ assertTrue(CREATION +INITIALIZATION_TEST,((Diagram)getRootView()).getEdges().size()==2);
+
+ DropObjectsRequest dropObjectsRequest= new DropObjectsRequest();
+ ArrayList<Element> list = new ArrayList<Element>();
+ list.add(((Element)source.resolveSemanticElement()).getOwnedElements().get(1));
+ dropObjectsRequest.setObjects(list);
+ dropObjectsRequest.setLocation(new Point(20,20));
+ Command command= getDiagramEditPart().getCommand(dropObjectsRequest);
+ assertNotNull(DROP+COMMAND_NULL,command);
+ assertTrue(DROP +TEST_IF_THE_COMMAND_IS_CREATED,command!=UnexecutableCommand.INSTANCE);
+ assertTrue(DROP+TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,command.canExecute()==true);
+ diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+ assertTrue(DROP +TEST_THE_EXECUTION,getDiagramEditPart().getChildren().size()==4);
+ assertTrue(DROP +TEST_THE_EXECUTION,getRootSemanticModel().getOwnedElements().size()==4);
+ assertTrue(DROP +TEST_THE_EXECUTION,((Diagram)getRootView()).getEdges().size()==3);
+ diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();
+ assertTrue(DROP +TEST_THE_UNDO,getDiagramEditPart().getChildren().size()==4);
+ assertTrue(DROP +TEST_THE_UNDO,getRootSemanticModel().getOwnedElements().size()==4);
+ assertTrue(DROP +TEST_THE_UNDO,((Diagram)getRootView()).getEdges().size()==2);
+ diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();
+ assertTrue(DROP +TEST_THE_REDO,getDiagramEditPart().getChildren().size()==4);
+ assertTrue(DROP +TEST_THE_REDO,getRootSemanticModel().getOwnedElements().size()==4);
+ assertTrue(DROP +TEST_THE_REDO,((Diagram)getRootView()).getEdges().size()==3);
}
-
+
}
/**
* test the creation of a link where the source and the target are the same objects
* @param linkType
* @param allowed
*/
+ @Override
protected void testToCreateAlinkOnTheSame(IElementType linkType, boolean allowed) {
assertTrue(CREATION +INITIALIZATION_TEST,getDiagramEditPart().getChildren().size()==4);
assertTrue(CREATION +INITIALIZATION_TEST,getRootSemanticModel().getOwnedElements().size()==4);
-
- Command command = target.getCommand(createConnectionViewRequest(linkType, source, source));
+
+ Command command = target.getCommand(createConnectionViewRequest(linkType, source, source));
assertNotNull(CREATION+COMMAND_NULL,command);
assertTrue(CONTAINER_CREATION+TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,command.canExecute()==allowed);
if(allowed){
- diagramEditor.getEditingDomain().getCommandStack().execute(new GEFtoEMFCommandWrapper(command));
- assertTrue(CREATION +INITIALIZATION_TEST,((Diagram)getRootView()).getEdges().size()==2);
- assertTrue(CREATION +INITIALIZATION_TEST,getRootSemanticModel().getOwnedElements().size()==4);
- diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();
- assertTrue(CREATION+TEST_THE_UNDO,getRootView().getChildren().size()==4);
- assertTrue(CREATION+TEST_THE_UNDO,getRootSemanticModel().getOwnedElements().size()==4);
- diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();
- assertTrue(CREATION +TEST_THE_REDO,((Diagram)getRootView()).getEdges().size()==2);
- assertTrue(CREATION +TEST_THE_REDO,getRootSemanticModel().getOwnedElements().size()==4);
+ diagramEditor.getEditingDomain().getCommandStack().execute(new GEFtoEMFCommandWrapper(command));
+ assertTrue(CREATION +INITIALIZATION_TEST,((Diagram)getRootView()).getEdges().size()==2);
+ assertTrue(CREATION +INITIALIZATION_TEST,getRootSemanticModel().getOwnedElements().size()==4);
+ diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();
+ assertTrue(CREATION+TEST_THE_UNDO,getRootView().getChildren().size()==4);
+ assertTrue(CREATION+TEST_THE_UNDO,getRootSemanticModel().getOwnedElements().size()==4);
+ diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();
+ assertTrue(CREATION +TEST_THE_REDO,((Diagram)getRootView()).getEdges().size()==2);
+ assertTrue(CREATION +TEST_THE_REDO,getRootSemanticModel().getOwnedElements().size()==4);
}
-
-
+
+
}
}
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestMutliLink.java b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestMutliLink.java index 51fb39804df..4d4c6c73aad 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestMutliLink.java +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestMutliLink.java @@ -1,6 +1,6 @@ package org.eclipse.papyrus.diagram.clazz.test.canonical;
-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;
import org.junit.Test;
public class TestMutliLink extends AbstractTestMultiLink {
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestTopNode.java b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestTopNode.java index 0bb0fe3a981..fd86f34b6e8 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestTopNode.java +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestTopNode.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2009 CEA LIST.
*
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -35,10 +35,10 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper; import org.eclipse.gmf.runtime.emf.commands.core.command.EditingDomainUndoContext;
import org.eclipse.gmf.runtime.emf.type.core.IElementType;
import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.papyrus.core.services.ServiceException;
-import org.eclipse.papyrus.core.utils.ServiceUtilsForActionHandlers;
-import org.eclipse.papyrus.diagram.common.Activator;
-import org.eclipse.papyrus.diagram.common.command.wrappers.GEFtoEMFCommandWrapper;
+import org.eclipse.papyrus.commands.wrappers.GEFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.core.utils.ServiceUtilsForActionHandlers;
+import org.eclipse.papyrus.uml.diagram.common.Activator;
import org.eclipse.uml2.uml.Element;
@@ -48,9 +48,9 @@ import org.eclipse.uml2.uml.Element; * The Class TestTopNode.
*/
public class TestTopNode extends AbstractPapyrusTestCase {
-
-
-
+
+
+
/**
* Test view deletion.
@@ -61,7 +61,7 @@ public class TestTopNode extends AbstractPapyrusTestCase { //DELETION OF THE VIEW
assertTrue(VIEW_DELETION +INITIALIZATION_TEST,getDiagramEditPart().getChildren().size()==1);
assertTrue(VIEW_DELETION +INITIALIZATION_TEST,getRootSemanticModel().getOwnedElements().size()==1);
-
+
Request deleteViewRequest = new GroupRequest(RequestConstants.REQ_DELETE);
Command command = ((GraphicalEditPart)getDiagramEditPart().getChildren().get(0)).getCommand(deleteViewRequest);
assertNotNull(VIEW_DELETION +COMMAND_NULL,command);
@@ -76,7 +76,7 @@ public class TestTopNode extends AbstractPapyrusTestCase { diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();
assertTrue(VIEW_DELETION +TEST_THE_REDO,getDiagramEditPart().getChildren().size()==0);
assertTrue(VIEW_DELETION +TEST_THE_REDO,getRootSemanticModel().getOwnedElements().size()==1);
-
+
}
/**
* Retrieves the TransactionalEditingDomain
@@ -101,12 +101,12 @@ public class TestTopNode extends AbstractPapyrusTestCase { * @param type the type
*/
public void testDestroy(IElementType type) {
-
+
//DESTROY SEMANTIC+ VIEW
assertTrue(DESTROY_DELETION +INITIALIZATION_TEST,getDiagramEditPart().getChildren().size()==1);
assertTrue(DESTROY_DELETION +INITIALIZATION_TEST,getRootSemanticModel().getOwnedElements().size()==1);
-
+
Request deleteViewRequest = new EditCommandRequestWrapper( new DestroyElementRequest(false));
Command command = ((GraphicalEditPart)getDiagramEditPart().getChildren().get(0)).getCommand(deleteViewRequest);
assertNotNull(DESTROY_DELETION +COMMAND_NULL,command);
@@ -117,14 +117,14 @@ public class TestTopNode extends AbstractPapyrusTestCase { getEditingDomain().getCommandStack().execute(new GEFtoEMFCommandWrapper(command));
assertTrue(DESTROY_DELETION +TEST_THE_EXECUTION,getDiagramEditPart().getChildren().size()==0);
assertTrue(DESTROY_DELETION +TEST_THE_EXECUTION,getRootSemanticModel().getOwnedElements().size()==0);
-
+
EditingDomainUndoContext undoContext= new EditingDomainUndoContext(getEditingDomain());
try{
- OperationHistoryFactory.getOperationHistory().undo(undoContext, new NullProgressMonitor(), null);
+ OperationHistoryFactory.getOperationHistory().undo(undoContext, new NullProgressMonitor(), null);
}catch (Exception e) {
System.err.println(e);
}
-
+
//diagramEditor.getEditingDomain().getCommandStack().undo();
//diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();
assertTrue(DESTROY_DELETION +TEST_THE_UNDO,getDiagramEditPart().getChildren().size()==1);
@@ -133,8 +133,8 @@ public class TestTopNode extends AbstractPapyrusTestCase { assertTrue(DESTROY_DELETION +TEST_THE_REDO,getDiagramEditPart().getChildren().size()==0);
assertTrue(DESTROY_DELETION +TEST_THE_REDO,getRootSemanticModel().getOwnedElements().size()==0);
}
-
-
+
+
/**
* Test drop.
*
@@ -144,8 +144,8 @@ public class TestTopNode extends AbstractPapyrusTestCase { //DROP
assertTrue(DROP +INITIALIZATION_TEST,getDiagramEditPart().getChildren().size()==0);
assertTrue(DROP +INITIALIZATION_TEST,getRootSemanticModel().getOwnedElements().size()==1);
-
-
+
+
DropObjectsRequest dropObjectsRequest= new DropObjectsRequest();
ArrayList<Element> list = new ArrayList<Element>();
list.add(getRootSemanticModel().getOwnedElements().get(0));
@@ -164,9 +164,9 @@ public class TestTopNode extends AbstractPapyrusTestCase { diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();
assertTrue(DROP+TEST_THE_REDO,getDiagramEditPart().getChildren().size()!=0);
assertTrue(DROP+TEST_THE_REDO,getRootSemanticModel().getOwnedElements().size()!=0);
- }
-
-
+ }
+
+
/**
* Test change container.
*
@@ -177,8 +177,8 @@ public class TestTopNode extends AbstractPapyrusTestCase { //CHANGE CONTAINER
assertTrue(CHANGE_CONTAINER +INITIALIZATION_TEST,getDiagramEditPart().getChildren().size()==1);
assertTrue(CHANGE_CONTAINER +INITIALIZATION_TEST,getRootSemanticModel().getOwnedElements().size()==1);
-
-
+
+
Request requestcreation=CreateViewRequestFactory.getCreateShapeRequest(containerType, getDiagramEditPart().getDiagramPreferencesHint());
Command command=getDiagramEditPart().getCommand(requestcreation);
assertNotNull(CONTAINER_CREATION+COMMAND_NULL,command);
@@ -199,8 +199,8 @@ public class TestTopNode extends AbstractPapyrusTestCase { index++;
}
assertTrue("Container not found", compartment!=null);
-
-
+
+
command=compartment.getCommand(changeBoundsRequest);
assertNotNull(CHANGE_CONTAINER,command);
assertTrue(CHANGE_CONTAINER+TEST_IF_THE_COMMAND_IS_CREATED,command!=UnexecutableCommand.INSTANCE);
@@ -217,20 +217,20 @@ public class TestTopNode extends AbstractPapyrusTestCase { assertTrue(CHANGE_CONTAINER+TEST_THE_REDO,getRootView().getChildren().size()==1);
assertTrue(CHANGE_CONTAINER+TEST_THE_REDO,getRootSemanticModel().getOwnedElements().size()==1);
assertTrue(CHANGE_CONTAINER+TEST_THE_EXECUTION,compartment.getChildren().size()==1);
-
- }
-
+
+ }
+
/**
* Test to create a node.
*
* @param type the type
*/
public void testToCreateANode(IElementType type) {
-
+
//CREATION
assertTrue(CREATION +INITIALIZATION_TEST,getDiagramEditPart().getChildren().size()==0);
assertTrue(CREATION +INITIALIZATION_TEST,getRootSemanticModel().getOwnedElements().size()==0);
-
+
CreateViewRequest requestcreation=CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());
Command command=getDiagramEditPart().getCommand(requestcreation);
assertNotNull(CREATION+COMMAND_NULL,command);
@@ -243,9 +243,9 @@ public class TestTopNode extends AbstractPapyrusTestCase { assertTrue(CREATION+TEST_THE_UNDO,getRootSemanticModel().getOwnedElements().size()==0);
diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();
assertTrue("CREATION: "+TEST_THE_REDO,getDiagramEditPart().getChildren().size()==1);
-
+
}
-
+
/**
* Test to manage top node.
*
@@ -260,6 +260,6 @@ public class TestTopNode extends AbstractPapyrusTestCase { testDrop(type);
testChangeContainer(type, containerType);
}
-
-
+
+
}
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/load/Load100ClassTest.java b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/load/Load100ClassTest.java index b10738ee628..b33122c3ad9 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/load/Load100ClassTest.java +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/load/Load100ClassTest.java @@ -18,8 +18,8 @@ import org.eclipse.gef.commands.UnexecutableCommand; import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;
import org.eclipse.papyrus.diagram.clazz.test.canonical.AbstractPapyrusTestCase;
+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;
import org.junit.Test;
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/load/Load10ClassTest.java b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/load/Load10ClassTest.java index a0b856f87fc..96eed58f384 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/load/Load10ClassTest.java +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/load/Load10ClassTest.java @@ -18,8 +18,8 @@ import org.eclipse.gef.commands.UnexecutableCommand; import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;
import org.eclipse.papyrus.diagram.clazz.test.canonical.AbstractPapyrusTestCase;
+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;
import org.junit.Test;
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/load/Load200ClassTest.java b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/load/Load200ClassTest.java index 12b7f0c3d6e..e5c6804540b 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/load/Load200ClassTest.java +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/load/Load200ClassTest.java @@ -18,8 +18,8 @@ import org.eclipse.gef.commands.UnexecutableCommand; import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;
import org.eclipse.papyrus.diagram.clazz.test.canonical.AbstractPapyrusTestCase;
+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;
import org.junit.Test;
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/load/Load300ClassTest.java b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/load/Load300ClassTest.java index 5241b221883..7c5f3b13b51 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/load/Load300ClassTest.java +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/load/Load300ClassTest.java @@ -18,8 +18,8 @@ import org.eclipse.gef.commands.UnexecutableCommand; import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;
import org.eclipse.papyrus.diagram.clazz.test.canonical.AbstractPapyrusTestCase;
+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;
import org.junit.Test;
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/load/Load400ClassTest.java b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/load/Load400ClassTest.java index ecf0c20e8e0..c2ad98106f8 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/load/Load400ClassTest.java +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/load/Load400ClassTest.java @@ -18,8 +18,8 @@ import org.eclipse.gef.commands.UnexecutableCommand; import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;
import org.eclipse.papyrus.diagram.clazz.test.canonical.AbstractPapyrusTestCase;
+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;
import org.junit.Test;
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/load/Load500ClassTest.java b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/load/Load500ClassTest.java index 4c6ef189412..50be53a0d41 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/load/Load500ClassTest.java +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/load/Load500ClassTest.java @@ -18,8 +18,8 @@ import org.eclipse.gef.commands.UnexecutableCommand; import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;
import org.eclipse.papyrus.diagram.clazz.test.canonical.AbstractPapyrusTestCase;
+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;
import org.junit.Test;
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.common.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.common.tests/META-INF/MANIFEST.MF index 59afff7897e..8de05ca8291 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.common.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.common.tests/META-INF/MANIFEST.MF @@ -8,6 +8,6 @@ Require-Bundle: org.eclipse.core.runtime, org.junit4 Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ActivationPolicy: lazy -Fragment-Host: org.eclipse.papyrus.diagram.common;bundle-version="0.8.0" +Fragment-Host: org.eclipse.papyrus.uml.diagram.common;bundle-version="0.9.0" Export-Package: org.eclipse.papyrus.diagram.common.tests.parser Bundle-Localization: plugin diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.common.tests/test/org/eclipse/papyrus/diagram/common/tests/parser/HTMLCleanerTestCase.java b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.common.tests/test/org/eclipse/papyrus/diagram/common/tests/parser/HTMLCleanerTestCase.java index c496ef3e01d..2636fce55c4 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.common.tests/test/org/eclipse/papyrus/diagram/common/tests/parser/HTMLCleanerTestCase.java +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.common.tests/test/org/eclipse/papyrus/diagram/common/tests/parser/HTMLCleanerTestCase.java @@ -15,7 +15,7 @@ package org.eclipse.papyrus.diagram.common.tests.parser; import junit.framework.TestCase;
-import org.eclipse.papyrus.diagram.common.parser.HTMLCleaner;
+import org.eclipse.papyrus.uml.diagram.common.parser.HTMLCleaner;
import org.junit.Before;
import org.junit.Test;
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.common.tests/test/org/eclipse/papyrus/diagram/common/tests/parser/HTMLCornerBentFigureTestCase.java b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.common.tests/test/org/eclipse/papyrus/diagram/common/tests/parser/HTMLCornerBentFigureTestCase.java index 6b36d7c37a8..2a550875ba9 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.common.tests/test/org/eclipse/papyrus/diagram/common/tests/parser/HTMLCornerBentFigureTestCase.java +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.common.tests/test/org/eclipse/papyrus/diagram/common/tests/parser/HTMLCornerBentFigureTestCase.java @@ -14,7 +14,7 @@ package org.eclipse.papyrus.diagram.common.tests.parser; import org.eclipse.draw2d.Figure;
import org.eclipse.draw2d.text.FlowPage;
import org.eclipse.gmf.runtime.draw2d.ui.text.TextFlowEx;
-import org.eclipse.papyrus.diagram.common.figure.node.HTMLCornerBentFigure;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.HTMLCornerBentFigure;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Font;
import org.eclipse.swt.graphics.FontData;
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.thousandcreation/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/org.eclipse.papyrus.thousandcreation/META-INF/MANIFEST.MF index e480ffa7e9a..162e9a96973 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.thousandcreation/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.thousandcreation/META-INF/MANIFEST.MF @@ -6,9 +6,9 @@ Bundle-Version: 0.9.0.qualifier Bundle-Activator: thousandcreation.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, - org.eclipse.papyrus.modelexplorer;bundle-version="0.8.0", + org.eclipse.papyrus.views.modelexplorer;bundle-version="0.9.0", org.eclipse.uml2.uml;bundle-version="3.1.0", - org.eclipse.papyrus.core;bundle-version="0.8.0" + org.eclipse.papyrus.infra.core;bundle-version="0.9.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Vendor: %providerName diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.thousandcreation/test/thousandcreation/HugeModelGenerationAction.java b/tests/junit/plugins/uml/org.eclipse.papyrus.thousandcreation/test/thousandcreation/HugeModelGenerationAction.java index d67eb9d4528..5c348eea1e1 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.thousandcreation/test/thousandcreation/HugeModelGenerationAction.java +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.thousandcreation/test/thousandcreation/HugeModelGenerationAction.java @@ -19,12 +19,9 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.transaction.RecordingCommand;
import org.eclipse.emf.transaction.TransactionalEditingDomain;
import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.InputDialog;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.core.utils.EditorUtils;
-import org.eclipse.swt.widgets.Display;
+import org.eclipse.papyrus.infra.core.utils.EditorUtils;
import org.eclipse.ui.IActionDelegate;
import org.eclipse.uml2.uml.Package;
|