move SessionSetup to setup package

6 files changed, 6 insertions, 11 deletions

diff --git a/tests/org.eclipse.gmf.tests/src/org/eclipse/gmf/tests/AllTests.java b/tests/org.eclipse.gmf.tests/src/org/eclipse/gmf/tests/AllTests.java
index 90c4a29a6..7ba3dc8d9 100644
--- a/tests/org.eclipse.gmf.tests/src/org/eclipse/gmf/tests/AllTests.java
+++ b/tests/org.eclipse.gmf.tests/src/org/eclipse/gmf/tests/AllTests.java
@@ -18,6 +18,7 @@ import junit.framework.TestSuite;
 import org.eclipse.gmf.tests.gef.DiagramNodeTest;
 import org.eclipse.gmf.tests.gen.CompilationTest;
 import org.eclipse.gmf.tests.gen.HandcodedImplTest;
+import org.eclipse.gmf.tests.setup.SessionSetup;
 import org.eclipse.gmf.tests.setup.TestSetupTest;
 import org.eclipse.gmf.tests.tr.EPNamingStrategyTest;
 import org.eclipse.gmf.tests.tr.GenModelTransformerBasicRTTest;
diff --git a/tests/org.eclipse.gmf.tests/src/org/eclipse/gmf/tests/gef/DiagramNodeTest.java b/tests/org.eclipse.gmf.tests/src/org/eclipse/gmf/tests/gef/DiagramNodeTest.java
index a3ead53b0..79e3c3590 100644
--- a/tests/org.eclipse.gmf.tests/src/org/eclipse/gmf/tests/gef/DiagramNodeTest.java
+++ b/tests/org.eclipse.gmf.tests/src/org/eclipse/gmf/tests/gef/DiagramNodeTest.java
@@ -48,9 +48,9 @@ import org.eclipse.gmf.runtime.notation.Location;
 import org.eclipse.gmf.runtime.notation.Node;
 import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.Size;
-import org.eclipse.gmf.tests.SessionSetup;
 import org.eclipse.gmf.tests.setup.RTSetup;
 import org.eclipse.gmf.tests.setup.RTSource;
+import org.eclipse.gmf.tests.setup.SessionSetup;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.RGB;
 import org.eclipse.swt.widgets.Composite;
diff --git a/tests/org.eclipse.gmf.tests/src/org/eclipse/gmf/tests/gen/CompilationTest.java b/tests/org.eclipse.gmf.tests/src/org/eclipse/gmf/tests/gen/CompilationTest.java
index d15a0135d..bfa2db5fc 100644
--- a/tests/org.eclipse.gmf.tests/src/org/eclipse/gmf/tests/gen/CompilationTest.java
+++ b/tests/org.eclipse.gmf.tests/src/org/eclipse/gmf/tests/gen/CompilationTest.java
@@ -25,9 +25,9 @@ import org.eclipse.gmf.codegen.gmfgen.GenDiagram;
 import org.eclipse.gmf.codegen.gmfgen.GenLink;
 import org.eclipse.gmf.codegen.gmfgen.GenNode;
 import org.eclipse.gmf.tests.Plugin;
-import org.eclipse.gmf.tests.SessionSetup;
 import org.eclipse.gmf.tests.setup.DiaGenSource;
 import org.eclipse.gmf.tests.setup.GenProjectBaseSetup;
+import org.eclipse.gmf.tests.setup.SessionSetup;
 
 public class CompilationTest extends TestCase {
 
diff --git a/tests/org.eclipse.gmf.tests/src/org/eclipse/gmf/tests/gen/HandcodedImplTest.java b/tests/org.eclipse.gmf.tests/src/org/eclipse/gmf/tests/gen/HandcodedImplTest.java
index 2e0950c98..a0adc873e 100644
--- a/tests/org.eclipse.gmf.tests/src/org/eclipse/gmf/tests/gen/HandcodedImplTest.java
+++ b/tests/org.eclipse.gmf.tests/src/org/eclipse/gmf/tests/gen/HandcodedImplTest.java
@@ -31,7 +31,7 @@ import org.eclipse.gmf.codegen.gmfgen.GenDiagram;
 import org.eclipse.gmf.codegen.gmfgen.GenLink;
 import org.eclipse.gmf.codegen.gmfgen.GenLinkLabel;
 import org.eclipse.gmf.codegen.gmfgen.Palette;
-import org.eclipse.gmf.tests.SessionSetup;
+import org.eclipse.gmf.tests.setup.SessionSetup;
 import org.eclipse.jdt.core.JavaConventions;
 
 /**
diff --git a/tests/org.eclipse.gmf.tests/src/org/eclipse/gmf/tests/SessionSetup.java b/tests/org.eclipse.gmf.tests/src/org/eclipse/gmf/tests/setup/SessionSetup.java
index 0e8e0a919..26ada63ec 100644
--- a/tests/org.eclipse.gmf.tests/src/org/eclipse/gmf/tests/SessionSetup.java
+++ b/tests/org.eclipse.gmf.tests/src/org/eclipse/gmf/tests/setup/SessionSetup.java
@@ -9,14 +9,8 @@
  * Contributors:
  *    Artem Tikhomirov (Borland) - initial API and implementation
  */
-package org.eclipse.gmf.tests;
+package org.eclipse.gmf.tests.setup;
 
-import org.eclipse.gmf.tests.setup.DiaGenSetup;
-import org.eclipse.gmf.tests.setup.DiaGenSource;
-import org.eclipse.gmf.tests.setup.DomainModelSetup;
-import org.eclipse.gmf.tests.setup.DomainModelSource;
-import org.eclipse.gmf.tests.setup.GenProjectSetup;
-import org.eclipse.gmf.tests.setup.RuntimeWorkspaceSetup;
 
 /**
  * @author artem
diff --git a/tests/org.eclipse.gmf.tests/src/org/eclipse/gmf/tests/tr/AbstractMappingTransformerTest.java b/tests/org.eclipse.gmf.tests/src/org/eclipse/gmf/tests/tr/AbstractMappingTransformerTest.java
index 69a6a9c48..baea2cb31 100644
--- a/tests/org.eclipse.gmf.tests/src/org/eclipse/gmf/tests/tr/AbstractMappingTransformerTest.java
+++ b/tests/org.eclipse.gmf.tests/src/org/eclipse/gmf/tests/tr/AbstractMappingTransformerTest.java
@@ -20,9 +20,9 @@ import org.eclipse.gmf.mappings.CanvasMapping;
 import org.eclipse.gmf.mappings.LinkMapping;
 import org.eclipse.gmf.mappings.Mapping;
 import org.eclipse.gmf.mappings.NodeMapping;
-import org.eclipse.gmf.tests.SessionSetup;
 import org.eclipse.gmf.tests.setup.DiaDefSetup;
 import org.eclipse.gmf.tests.setup.MapSetup;
+import org.eclipse.gmf.tests.setup.SessionSetup;
 
 public abstract class AbstractMappingTransformerTest extends TestCase implements DiaDefSetup.Config {
 	private MapSetup myMapDef;