Bug 350995 - Remove JUnit test dependencies from non-test projects. Relax version constraints.
diff --git a/org.eclipse.amp.agf.test/META-INF/MANIFEST.MF b/org.eclipse.amp.agf.test/META-INF/MANIFEST.MF
deleted file mode 100644
index 3131e17..0000000
--- a/org.eclipse.amp.agf.test/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,25 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Tests for Agent Graphics functionality
-Bundle-SymbolicName: org.eclipse.amp.agf.test
-Bundle-Version: 0.9.0.qualifier
-Bundle-Vendor: eclipse.org
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.amp.axf.ide,
- org.eclipse.swtbot.eclipse.finder,
- org.eclipse.swtbot.swt.finder,
- org.eclipse.core.resources,
- org.eclipse.amp.axf.core,
- org.eclipse.amp.axf.views,
- org.eclipse.amp.agf.chart,
- org.eclipse.amp.agf.core,
- org.eclipse.amp.agf.ide,
- org.eclipse.amp.escape.ide,
- org.eclipse.amp.escape.ascape,
- org.ascape.core,
- org.junit;bundle-version="4.8.1"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-
-
diff --git a/org.eclipse.amp.agf.test/src/org/eclipse/amp/agf/chart/test/ResourceManagerTest.java b/org.eclipse.amp.agf.test/src/org/eclipse/amp/agf/chart/test/ResourceManagerTest.java
deleted file mode 100644
index ba76567..0000000
--- a/org.eclipse.amp.agf.test/src/org/eclipse/amp/agf/chart/test/ResourceManagerTest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package org.eclipse.amp.agf.chart.test;
-
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import org.eclipse.amp.agf.chart.ChartEditPart;
-import org.eclipse.amp.agf.chart.ChartEditPart.ResourceManager;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.junit.Before;
-import org.junit.Test;
-
-public class ResourceManagerTest {
-
- private ResourceManager classToTest;
- @Before
- public void setUp() throws Exception {
- classToTest = new ChartEditPart().getResourceManager();
- }
- /**
- * Would old gc be desposed?
- * Can we set null to dispose the gc
- */
- @Test
- public void testSetGc(){
- Shell shell = new Shell();
- GC gc = new GC(shell);
- assertFalse(gc.isDisposed());
-
- classToTest.setGc(gc);
- assertFalse(gc.isDisposed());
-
- GC gc2 = new GC(shell);
- classToTest.setGc(gc2);
- assertTrue(gc.isDisposed());
- assertFalse(gc2.isDisposed());
-
- try{
- classToTest.setGc(null);
- assertTrue(gc2.isDisposed());
- }catch(Exception e){
- fail(e.getMessage());
- }
- shell.dispose();
- }
- /**
- * Would old image be desposed?
- * Can we set null to dispose the image
- */
- @Test
- public void testSetImage(){
- Shell shell = new Shell();
- Image image = new Image(Display.getCurrent(), 10, 10);
- assertFalse(image.isDisposed());
-
- classToTest.setImage(image);
- assertFalse(image.isDisposed());
-
- Image image2 = new Image(Display.getCurrent(), 10, 10);
- classToTest.setImage(image2);
- assertTrue(image.isDisposed());
- assertFalse(image2.isDisposed());
-
- try{
- classToTest.setImage(null);
- assertTrue(image2.isDisposed());
- }catch(Exception e){
- fail(e.getMessage());
- }
- shell.dispose();
- }
-}
diff --git a/org.eclipse.amp.agf.test/.classpath b/org.eclipse.amp.agf/tests/org.eclipse.amp.agf.core.test/.classpath
similarity index 78%
rename from org.eclipse.amp.agf.test/.classpath
rename to org.eclipse.amp.agf/tests/org.eclipse.amp.agf.core.test/.classpath
index 1fa3e68..64c5e31 100644
--- a/org.eclipse.amp.agf.test/.classpath
+++ b/org.eclipse.amp.agf/tests/org.eclipse.amp.agf.core.test/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/org.eclipse.amp.agf.test/.project b/org.eclipse.amp.agf/tests/org.eclipse.amp.agf.core.test/.project
similarity index 93%
rename from org.eclipse.amp.agf.test/.project
rename to org.eclipse.amp.agf/tests/org.eclipse.amp.agf.core.test/.project
index 6f0bad9..d81af4f 100644
--- a/org.eclipse.amp.agf.test/.project
+++ b/org.eclipse.amp.agf/tests/org.eclipse.amp.agf.core.test/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.amp.agf.test</name>
+ <name>org.eclipse.amp.agf.core.test</name>
<comment></comment>
<projects>
</projects>
diff --git a/org.eclipse.amp.agf/tests/org.eclipse.amp.agf.core.test/META-INF/MANIFEST.MF b/org.eclipse.amp.agf/tests/org.eclipse.amp.agf.core.test/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..6ffff11
--- /dev/null
+++ b/org.eclipse.amp.agf/tests/org.eclipse.amp.agf.core.test/META-INF/MANIFEST.MF
@@ -0,0 +1,8 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Test for org.eclipse.amp.agf.core
+Bundle-SymbolicName: org.eclipse.amp.agf.core.test
+Bundle-Version: 1.0.0.qualifier
+Fragment-Host: org.eclipse.amp.agf.core
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Require-Bundle: org.junit;bundle-version="4.8.1"
diff --git a/org.eclipse.amp.agf.test/build.properties b/org.eclipse.amp.agf/tests/org.eclipse.amp.agf.core.test/build.properties
similarity index 100%
rename from org.eclipse.amp.agf.test/build.properties
rename to org.eclipse.amp.agf/tests/org.eclipse.amp.agf.core.test/build.properties
diff --git a/org.eclipse.amp.agf/plugins/org.eclipse.amp.agf.core/test/org/eclipse/amp/agf/gef/EditPartPartListenerTest.java b/org.eclipse.amp.agf/tests/org.eclipse.amp.agf.core.test/src/org/eclipse/amp/agf/gef/EditPartPartListenerTest.java
similarity index 90%
rename from org.eclipse.amp.agf/plugins/org.eclipse.amp.agf.core/test/org/eclipse/amp/agf/gef/EditPartPartListenerTest.java
rename to org.eclipse.amp.agf/tests/org.eclipse.amp.agf.core.test/src/org/eclipse/amp/agf/gef/EditPartPartListenerTest.java
index 80232d1..c741fca 100644
--- a/org.eclipse.amp.agf/plugins/org.eclipse.amp.agf.core/test/org/eclipse/amp/agf/gef/EditPartPartListenerTest.java
+++ b/org.eclipse.amp.agf/tests/org.eclipse.amp.agf.core.test/src/org/eclipse/amp/agf/gef/EditPartPartListenerTest.java
@@ -15,30 +15,34 @@
import org.junit.Test;
public class EditPartPartListenerTest {
-
+
private EditPartPartListener classToTest;
- private MokViewPart viewPart;
+
+ private MockViewPart viewPart;
+
private SimpleWorkbenchPartRef ref;
-
+
@Before
public void setUp() throws Exception {
ref = new SimpleWorkbenchPartRef();
- viewPart = new MokViewPart();
+ viewPart = new MockViewPart();
classToTest = new EditPartPartListener(viewPart);
}
+
/**
- * The refresh should only be donne if the id is equals
+ * The refresh should only be done if the id is equal
*/
@Test
public void testPartActivated() {
classToTest.partActivated(ref);
assertTrue(viewPart.refreshed);
-
+
viewPart.refreshed = false;
viewPart.id = "ww";
classToTest.partActivated(ref);
assertFalse(viewPart.refreshed);
}
+
/**
* The listener should be detached on closing the view
*/
@@ -46,28 +50,30 @@
public void testPartClosed() {
classToTest.partClosed(ref);
assertTrue(viewPart.removed);
-
+
viewPart.removed = false;
viewPart.id = "WW";
classToTest.partClosed(ref);
assertFalse(viewPart.removed);
}
- private class MokViewPart extends EditPartViewPart{
-
+ private class MockViewPart extends EditPartViewPart {
+
boolean refreshed = false;
+
boolean removed = false;
+
String id = "partId";
-
- public MokViewPart() {
- //
+
+ public MockViewPart() {
+ //
}
@Override
public RootEditPart createRoot() {
return null;
}
-
+
@Override
protected void refresh() {
refreshed = true;
@@ -82,13 +88,13 @@
protected void removePartListener(IPartListener2 lis) {
removed = true;
}
-
+
}
-
- private class SimpleWorkbenchPartRef implements IWorkbenchPartReference{
+
+ private class SimpleWorkbenchPartRef implements IWorkbenchPartReference {
public SimpleWorkbenchPartRef() {
- //
+ //
}
public IWorkbenchPart getPart(boolean restore) {
@@ -116,7 +122,7 @@
}
public void removePropertyListener(IPropertyListener listener) {
- //
+ //
}
public IWorkbenchPage getPage() {
@@ -140,11 +146,11 @@
}
public void addPartPropertyListener(IPropertyChangeListener listener) {
- //
+ //
}
public void removePartPropertyListener(IPropertyChangeListener listener) {
- //
+ //
}
}
}
diff --git a/org.eclipse.amp.agf.test/.classpath b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen.test/.classpath
similarity index 78%
copy from org.eclipse.amp.agf.test/.classpath
copy to org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen.test/.classpath
index 1fa3e68..64c5e31 100644
--- a/org.eclipse.amp.agf.test/.classpath
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen.test/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/org.eclipse.amp.agf.test/.project b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen.test/.project
similarity index 92%
copy from org.eclipse.amp.agf.test/.project
copy to org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen.test/.project
index 6f0bad9..167ec56 100644
--- a/org.eclipse.amp.agf.test/.project
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen.test/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.amp.agf.test</name>
+ <name>org.eclipse.amp.amf.sd.gen.test</name>
<comment></comment>
<projects>
</projects>
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen.test/META-INF/MANIFEST.MF b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen.test/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..e8c3fb2
--- /dev/null
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen.test/META-INF/MANIFEST.MF
@@ -0,0 +1,8 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Tests for org.eclipse.amp.amf.sd.gen
+Bundle-SymbolicName: org.eclipse.amp.amf.sd.gen.test
+Bundle-Version: 1.0.0.qualifier
+Fragment-Host: org.eclipse.amp.amf.sd.gen
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Require-Bundle: org.junit;bundle-version="4.8.1"
diff --git a/org.eclipse.amp.agf.test/build.properties b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen.test/build.properties
similarity index 100%
copy from org.eclipse.amp.agf.test/build.properties
copy to org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen.test/build.properties
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen/test/org/eclipse/amp/amf/sd/gen/builder/AbstractJavaSDTest.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen.test/src/org/eclipse/amp/amf/sd/gen/builder/AbstractJavaSDTest.java
similarity index 95%
rename from org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen/test/org/eclipse/amp/amf/sd/gen/builder/AbstractJavaSDTest.java
rename to org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen.test/src/org/eclipse/amp/amf/sd/gen/builder/AbstractJavaSDTest.java
index d803f8a..8ff6185 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen/test/org/eclipse/amp/amf/sd/gen/builder/AbstractJavaSDTest.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen.test/src/org/eclipse/amp/amf/sd/gen/builder/AbstractJavaSDTest.java
@@ -27,13 +27,13 @@
@Override
protected void setUp() throws Exception {
super.setUp();
- emptyProjectDir("bin");
+ cleanOutProjectDir("bin");
}
@Override
protected void tearDown() throws Exception {
super.tearDown();
- emptyProjectDir("bin");
+ cleanOutProjectDir("bin");
}
protected AbstractJavaSDTest(String projectName) throws Exception {
@@ -142,15 +142,14 @@
* deleted. If it doesn't exist, it will be created.
*
* @param relativePath
- * @return <code>true</code> if successful
*/
- protected boolean emptyProjectDir(String relativePath) {
+ protected void cleanOutProjectDir(String relativePath) {
String absolutePath = getProjectFilePath(relativePath);
File dir = new File(absolutePath);
if (!dir.exists()) {
- return dir.mkdir();
+ assert dir.mkdir() : "Directory could not be created: " + dir;
}
- return delete(dir, false);
+ assert delete(dir, false) : "Directory could not be cleaned out: " + dir;
}
protected String getProjectFilePath(String relativePath) {
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen/test/org/eclipse/amp/amf/sd/gen/builder/GenNotOverrideTest.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen.test/src/org/eclipse/amp/amf/sd/gen/builder/GenNotOverrideTest.java
similarity index 98%
rename from org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen/test/org/eclipse/amp/amf/sd/gen/builder/GenNotOverrideTest.java
rename to org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen.test/src/org/eclipse/amp/amf/sd/gen/builder/GenNotOverrideTest.java
index c908a08..5434c16 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen/test/org/eclipse/amp/amf/sd/gen/builder/GenNotOverrideTest.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen.test/src/org/eclipse/amp/amf/sd/gen/builder/GenNotOverrideTest.java
@@ -40,7 +40,7 @@
@Override
protected void setUp() throws Exception {
super.setUp();
- emptyProjectDir("srcgen");
+ cleanOutProjectDir("srcgen");
doGenerate(MODEL_JAVA_FILE, "/bin/GenNotOverride/my_SD/SDModel.class");
@@ -93,7 +93,7 @@
@Override
protected void tearDown() throws Exception {
super.tearDown();
- emptyProjectDir("srcgen");
+ cleanOutProjectDir("srcgen");
}
/**
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen/test/org/eclipse/amp/amf/sd/gen/builder/XPandCodeGenTest.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen.test/src/org/eclipse/amp/amf/sd/gen/builder/XPandCodeGenTest.java
similarity index 98%
rename from org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen/test/org/eclipse/amp/amf/sd/gen/builder/XPandCodeGenTest.java
rename to org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen.test/src/org/eclipse/amp/amf/sd/gen/builder/XPandCodeGenTest.java
index b88434e..2502f9f 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen/test/org/eclipse/amp/amf/sd/gen/builder/XPandCodeGenTest.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen.test/src/org/eclipse/amp/amf/sd/gen/builder/XPandCodeGenTest.java
@@ -48,7 +48,7 @@
if (!dir.exists()) {
dir.mkdir();
}
- emptyProjectDir("srcgen");
+ cleanOutProjectDir("srcgen");
String[] expectedFilesToBeGenerated = new String[javaFiles.length * 2];
for (int i = 0; i < javaFiles.length; i++) {
@@ -64,7 +64,7 @@
@Override
protected void tearDown() throws Exception {
super.tearDown();
- emptyProjectDir("srcgen");
+ cleanOutProjectDir("srcgen");
}
public void testMy() throws IOException, CoreException {
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen/testProject/GenNotOverride/.classpath b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen.test/testProject/GenNotOverride/.classpath
similarity index 100%
rename from org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen/testProject/GenNotOverride/.classpath
rename to org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen.test/testProject/GenNotOverride/.classpath
diff --git "a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen/testProject/GenNotOverride/.externalToolBuilders/org.eclipse.amp.amf.gen.ide.docBuilder \0501\051.launch" "b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen.test/testProject/GenNotOverride/.externalToolBuilders/org.eclipse.amp.amf.gen.ide.docBuilder \0501\051.launch"
similarity index 100%
rename from "org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen/testProject/GenNotOverride/.externalToolBuilders/org.eclipse.amp.amf.gen.ide.docBuilder \0501\051.launch"
rename to "org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen.test/testProject/GenNotOverride/.externalToolBuilders/org.eclipse.amp.amf.gen.ide.docBuilder \0501\051.launch"
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen/testProject/GenNotOverride/.externalToolBuilders/org.eclipse.amp.escape.amf.ide.escapeBuilder3D.launch b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen.test/testProject/GenNotOverride/.externalToolBuilders/org.eclipse.amp.escape.amf.ide.escapeBuilder3D.launch
similarity index 100%
rename from org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen/testProject/GenNotOverride/.externalToolBuilders/org.eclipse.amp.escape.amf.ide.escapeBuilder3D.launch
rename to org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen.test/testProject/GenNotOverride/.externalToolBuilders/org.eclipse.amp.escape.amf.ide.escapeBuilder3D.launch
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen/testProject/GenNotOverride/.project b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen.test/testProject/GenNotOverride/.project
similarity index 100%
rename from org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen/testProject/GenNotOverride/.project
rename to org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen.test/testProject/GenNotOverride/.project
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen/testProject/GenNotOverride/META-INF/MANIFEST.MF b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen.test/testProject/GenNotOverride/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen/testProject/GenNotOverride/META-INF/MANIFEST.MF
rename to org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen.test/testProject/GenNotOverride/META-INF/MANIFEST.MF
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen/testProject/GenNotOverride/My.metaabm b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen.test/testProject/GenNotOverride/My.metaabm
similarity index 100%
rename from org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen/testProject/GenNotOverride/My.metaabm
rename to org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen.test/testProject/GenNotOverride/My.metaabm
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen/testProject/GenNotOverride/build.properties b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen.test/testProject/GenNotOverride/build.properties
similarity index 100%
rename from org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen/testProject/GenNotOverride/build.properties
rename to org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen.test/testProject/GenNotOverride/build.properties
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen/testProject/XPandCodeGenTest/.classpath b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen.test/testProject/XPandCodeGenTest/.classpath
similarity index 100%
rename from org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen/testProject/XPandCodeGenTest/.classpath
rename to org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen.test/testProject/XPandCodeGenTest/.classpath
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen/testProject/XPandCodeGenTest/.externalToolBuilders/org.eclipse.amp.amf.gen.ide.docBuilder.launch b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen.test/testProject/XPandCodeGenTest/.externalToolBuilders/org.eclipse.amp.amf.gen.ide.docBuilder.launch
similarity index 100%
rename from org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen/testProject/XPandCodeGenTest/.externalToolBuilders/org.eclipse.amp.amf.gen.ide.docBuilder.launch
rename to org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen.test/testProject/XPandCodeGenTest/.externalToolBuilders/org.eclipse.amp.amf.gen.ide.docBuilder.launch
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen/testProject/XPandCodeGenTest/.project b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen.test/testProject/XPandCodeGenTest/.project
similarity index 100%
rename from org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen/testProject/XPandCodeGenTest/.project
rename to org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen.test/testProject/XPandCodeGenTest/.project
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen/testProject/XPandCodeGenTest/META-INF/MANIFEST.MF b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen.test/testProject/XPandCodeGenTest/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen/testProject/XPandCodeGenTest/META-INF/MANIFEST.MF
rename to org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen.test/testProject/XPandCodeGenTest/META-INF/MANIFEST.MF
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen/testProject/XPandCodeGenTest/My.metaabm b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen.test/testProject/XPandCodeGenTest/My.metaabm
similarity index 100%
rename from org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen/testProject/XPandCodeGenTest/My.metaabm
rename to org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen.test/testProject/XPandCodeGenTest/My.metaabm
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen/testProject/XPandCodeGenTest/build.properties b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen.test/testProject/XPandCodeGenTest/build.properties
similarity index 100%
rename from org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen/testProject/XPandCodeGenTest/build.properties
rename to org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen.test/testProject/XPandCodeGenTest/build.properties
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen/.classpath b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen/.classpath
index f3b093b..64c5e31 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen/.classpath
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen/.classpath
@@ -3,6 +3,5 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="src" path="test"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen/META-INF/MANIFEST.MF b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen/META-INF/MANIFEST.MF
index c4d7e33..750dc8e 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen/META-INF/MANIFEST.MF
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen/META-INF/MANIFEST.MF
@@ -19,7 +19,6 @@
org.eclipse.amp.amf.gen,
org.eclipse.emf.codegen,
org.eclipse.xpand,
- org.junit,
org.eclipse.core.filesystem,
org.eclipse.amp.escape.runtime,
org.eclipse.amp.escape.amf.ide;visibility:=reexport
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen/build.properties b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen/build.properties
index 0ebbf6f..809d013 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen/build.properties
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd.gen/build.properties
@@ -1,9 +1,7 @@
-source.. = src,\
- test/
+source.. = src
bin.includes = META-INF/,\
.,\
plugin.xml,\
jMerge/,\
- testProject/XPandCodeGenTest/My.metaabm,\
about.html,\
plugin.properties
diff --git a/org.eclipse.amp.amf/tests/org.eclipse.amp.amf.parameters.test/build.properties b/org.eclipse.amp.amf/tests/org.eclipse.amp.amf.parameters.test/build.properties
index e6a59fc..908a782 100644
--- a/org.eclipse.amp.amf/tests/org.eclipse.amp.amf.parameters.test/build.properties
+++ b/org.eclipse.amp.amf/tests/org.eclipse.amp.amf.parameters.test/build.properties
@@ -2,6 +2,6 @@
output.. = bin/
bin.includes = META-INF/,\
.,\
- res/,\
- about.html
+ about.html,\
+ relative/
src.includes = about.html
diff --git a/org.eclipse.amp.axf/plugins/org.eclipse.amp.axf.ide.test/fragment.xml b/org.eclipse.amp.axf/plugins/org.eclipse.amp.axf.ide.test/fragment.xml
deleted file mode 100644
index 2812aef..0000000
--- a/org.eclipse.amp.axf/plugins/org.eclipse.amp.axf.ide.test/fragment.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<fragment>
- <extension
- point="org.eclipse.ui.views">
- <view
- allowMultiple="true"
- class="org.eclipse.amp.axf.ide.EmtyView"
- id="org.eclipse.amp.axf.ide.EmtyView"
- name="EmtyView"
- restorable="true">
- </view>
- </extension>
-
-</fragment>
diff --git a/org.eclipse.amp.axf/tests/org.eclipse.amp.axf.ide.test/.classpath b/org.eclipse.amp.axf/tests/org.eclipse.amp.axf.ide.test/.classpath
index a7d4b62..64c5e31 100644
--- a/org.eclipse.amp.axf/tests/org.eclipse.amp.axf.ide.test/.classpath
+++ b/org.eclipse.amp.axf/tests/org.eclipse.amp.axf.ide.test/.classpath
@@ -3,6 +3,5 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/org.eclipse.amp.axf/tests/org.eclipse.amp.axf.ide.test/build.properties b/org.eclipse.amp.axf/tests/org.eclipse.amp.axf.ide.test/build.properties
index 62a7813..d16ffb7 100644
--- a/org.eclipse.amp.axf/tests/org.eclipse.amp.axf.ide.test/build.properties
+++ b/org.eclipse.amp.axf/tests/org.eclipse.amp.axf.ide.test/build.properties
@@ -3,6 +3,5 @@
bin.includes = META-INF/,\
.,\
res/,\
- about.html,\
- fragment.xml
+ about.html
src.includes = res/
diff --git a/org.eclipse.amp.axf/plugins/org.eclipse.amp.axf.ide.test/src/org/eclipse/amp/axf/ide/EmtyView.java b/org.eclipse.amp.axf/tests/org.eclipse.amp.axf.ide.test/src/org/eclipse/amp/axf/ide/EmptyView.java
similarity index 71%
rename from org.eclipse.amp.axf/plugins/org.eclipse.amp.axf.ide.test/src/org/eclipse/amp/axf/ide/EmtyView.java
rename to org.eclipse.amp.axf/tests/org.eclipse.amp.axf.ide.test/src/org/eclipse/amp/axf/ide/EmptyView.java
index 1a8662a..544ae7d 100644
--- a/org.eclipse.amp.axf/plugins/org.eclipse.amp.axf.ide.test/src/org/eclipse/amp/axf/ide/EmtyView.java
+++ b/org.eclipse.amp.axf/tests/org.eclipse.amp.axf.ide.test/src/org/eclipse/amp/axf/ide/EmptyView.java
@@ -2,6 +2,6 @@
import org.eclipse.amp.axf.view.ModelViewPart;
-public class EmtyView extends ModelViewPart {
- public final static String VIEW_ID = "org.eclipse.amp.axf.ide.EmtyView";
+public class EmptyView extends ModelViewPart {
+ public final static String VIEW_ID = "org.eclipse.amp.axf.ide.EmptyView";
}
diff --git a/org.eclipse.amp.axf/tests/org.eclipse.amp.axf.ide.test/src/org/eclipse/amp/axf/ide/EngineStateServiceTest.java b/org.eclipse.amp.axf/tests/org.eclipse.amp.axf.ide.test/src/org/eclipse/amp/axf/ide/EngineStateServiceTest.java
index 6bafa1f..3b8e64f 100644
--- a/org.eclipse.amp.axf/tests/org.eclipse.amp.axf.ide.test/src/org/eclipse/amp/axf/ide/EngineStateServiceTest.java
+++ b/org.eclipse.amp.axf/tests/org.eclipse.amp.axf.ide.test/src/org/eclipse/amp/axf/ide/EngineStateServiceTest.java
@@ -19,6 +19,9 @@
import org.junit.Before;
import org.junit.Test;
+/**
+ * @author jonas.ruettimann
+ */
public class EngineStateServiceTest {
private EngineStateServiceMock classToTest;
diff --git a/org.eclipse.amp.axf/plugins/org.eclipse.amp.axf.ide.test/src/org/eclipse/amp/axf/ide/ModelViewManagerTest.java b/org.eclipse.amp.axf/tests/org.eclipse.amp.axf.ide.test/src/org/eclipse/amp/axf/ide/ModelViewManagerTest.java
similarity index 82%
rename from org.eclipse.amp.axf/plugins/org.eclipse.amp.axf.ide.test/src/org/eclipse/amp/axf/ide/ModelViewManagerTest.java
rename to org.eclipse.amp.axf/tests/org.eclipse.amp.axf.ide.test/src/org/eclipse/amp/axf/ide/ModelViewManagerTest.java
index 1f6f9d2..ad55d1e 100644
--- a/org.eclipse.amp.axf/plugins/org.eclipse.amp.axf.ide.test/src/org/eclipse/amp/axf/ide/ModelViewManagerTest.java
+++ b/org.eclipse.amp.axf/tests/org.eclipse.amp.axf.ide.test/src/org/eclipse/amp/axf/ide/ModelViewManagerTest.java
@@ -33,27 +33,31 @@
}
/**
- * The Method should also be callable if the main Thread is the caller Bug: The Application has a deadlock if the main
- * Thread call the method
+ * The method should also be callable if the main {@link Thread} is the caller
+ * Bug: The Application has a deadlock if the main {@link Thread} calls the
+ * method
*/
@Test
public void testCreateViewPart() {
ObserverThread thread = new ObserverThread();
thread.mainThread = Thread.currentThread();
thread.start();
- classToTest.createViewPart(EmtyView.VIEW_ID, modelInput, "viewName");
- if(thread.mainThreadInterrupted){
+ classToTest.createViewPart(EmptyView.VIEW_ID, modelInput, "viewName");
+ if (thread.mainThreadInterrupted) {
fail("Deadlock in createViewPart?");
}
thread.interrupt();
}
- private class ObserverThread extends Thread{
+ private class ObserverThread extends Thread {
Thread mainThread;
+
boolean mainThreadInterrupted = false;
+
public ObserverThread() {
- //
+ //
}
+
@Override
public void run() {
try {
@@ -65,7 +69,7 @@
}
}
}
-
+
private class SimpleModel extends ScapeWrapperModel implements IModel {
IEngine engine;
diff --git a/org.eclipse.amp.agf.test/.classpath b/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ide.test/.classpath
similarity index 77%
copy from org.eclipse.amp.agf.test/.classpath
copy to org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ide.test/.classpath
index 1fa3e68..64c5e31 100644
--- a/org.eclipse.amp.agf.test/.classpath
+++ b/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ide.test/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/org.eclipse.amp.agf.test/.project b/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ide.test/.project
similarity index 92%
copy from org.eclipse.amp.agf.test/.project
copy to org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ide.test/.project
index 6f0bad9..2e95b8d 100644
--- a/org.eclipse.amp.agf.test/.project
+++ b/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ide.test/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.amp.agf.test</name>
+ <name>org.eclipse.amp.escape.ide.test</name>
<comment></comment>
<projects>
</projects>
diff --git a/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ide.test/META-INF/MANIFEST.MF b/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ide.test/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..0252d9b
--- /dev/null
+++ b/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ide.test/META-INF/MANIFEST.MF
@@ -0,0 +1,8 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Tests for org.eclipse.amp.escape.ide
+Bundle-SymbolicName: org.eclipse.amp.escape.ide.test
+Bundle-Version: 1.0.0.qualifier
+Fragment-Host: org.eclipse.amp.escape.ide
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Require-Bundle: org.junit;bundle-version="4.8.1"
diff --git a/org.eclipse.amp.agf.test/build.properties b/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ide.test/build.properties
similarity index 100%
copy from org.eclipse.amp.agf.test/build.properties
copy to org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ide.test/build.properties
diff --git a/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ide/test/org/eclipse/amp/escape/ide/ProjectLoaderTest.java b/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ide.test/src/org/eclipse/amp/escape/ide/ProjectLoaderTest.java
similarity index 100%
rename from org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ide/test/org/eclipse/amp/escape/ide/ProjectLoaderTest.java
rename to org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ide.test/src/org/eclipse/amp/escape/ide/ProjectLoaderTest.java
diff --git a/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ide/testFiles/bundleUnavailableButNecessary.MF b/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ide.test/testFiles/bundleUnavailableButNecessary.MF
similarity index 100%
rename from org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ide/testFiles/bundleUnavailableButNecessary.MF
rename to org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ide.test/testFiles/bundleUnavailableButNecessary.MF
diff --git a/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ide/testFiles/bundleUnavalilableButOptional.MF b/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ide.test/testFiles/bundleUnavalilableButOptional.MF
similarity index 100%
rename from org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ide/testFiles/bundleUnavalilableButOptional.MF
rename to org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ide.test/testFiles/bundleUnavalilableButOptional.MF
diff --git a/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ide/testFiles/defaultManifest.MF b/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ide.test/testFiles/defaultManifest.MF
similarity index 100%
rename from org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ide/testFiles/defaultManifest.MF
rename to org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ide.test/testFiles/defaultManifest.MF
diff --git a/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ide/testFiles/optionalBundles.MF b/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ide.test/testFiles/optionalBundles.MF
similarity index 100%
rename from org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ide/testFiles/optionalBundles.MF
rename to org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ide.test/testFiles/optionalBundles.MF
diff --git a/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ide/.classpath b/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ide/.classpath
index eb8854a..64c5e31 100644
--- a/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ide/.classpath
+++ b/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ide/.classpath
@@ -3,7 +3,5 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="src" path="test"/>
- <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ide/build.properties b/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ide/build.properties
index 7ac59f9..2dd7206 100644
--- a/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ide/build.properties
+++ b/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ide/build.properties
@@ -8,8 +8,6 @@
about.html,\
about.ini,\
about.properties,\
- amp32.png,\
- schema/
+ amp32.png
source.. = src/
-src.includes = about.html,\
- schema/
+src.includes = about.html
