[383656] - enable diagram editor tests in the hudson

Change-Id: Ifc6717f2904ca97e48b968a582225f69134d3e88

8 files changed, 14 insertions, 9 deletions

diff --git a/jpa_diagram_editor/development/org.eclipse.jpt.jpadiagrameditor.releng/pom.xml b/jpa_diagram_editor/development/org.eclipse.jpt.jpadiagrameditor.releng/pom.xml
index 587e752f65..69d4dbd0fa 100644
--- a/jpa_diagram_editor/development/org.eclipse.jpt.jpadiagrameditor.releng/pom.xml
+++ b/jpa_diagram_editor/development/org.eclipse.jpt.jpadiagrameditor.releng/pom.xml
@@ -84,6 +84,13 @@
 				<module>../../tests/org.eclipse.jpt.jpadiagrameditor.ui.tests</module>
 			</modules>
 		</profile>
+		<profile>
+			<id>alltests</id>
+			<modules>				
+				<module>../../tests/org.eclipse.jpt.jpadiagrameditor.ui.tests</module>
+				<module>../../tests/org.eclipse.jpt.jpadiagrameditor.swtbot.tests</module>
+			</modules>
+		</profile>
 	</profiles>
 	
 </project>
\ No newline at end of file
diff --git a/jpa_diagram_editor/development/org.eclipse.jpt.jpadiagrameditor.releng/resources/javax.persistence_2.0.4.v201112161009.jar b/jpa_diagram_editor/development/org.eclipse.jpt.jpadiagrameditor.releng/resources/javax.persistence_2.0.4.v201112161009.jar
new file mode 100644
index 0000000000..44d63b7351
--- /dev/null
+++ b/jpa_diagram_editor/development/org.eclipse.jpt.jpadiagrameditor.releng/resources/javax.persistence_2.0.4.v201112161009.jar
diff --git a/jpa_diagram_editor/features/org.eclipse.jpt.jpadiagrameditor.feature/feature.xml b/jpa_diagram_editor/features/org.eclipse.jpt.jpadiagrameditor.feature/feature.xml
index e2d4038d85..09e5a6252a 100644
--- a/jpa_diagram_editor/features/org.eclipse.jpt.jpadiagrameditor.feature/feature.xml
+++ b/jpa_diagram_editor/features/org.eclipse.jpt.jpadiagrameditor.feature/feature.xml
@@ -20,7 +20,7 @@
 

    <requires>

       <import feature="org.eclipse.graphiti.feature" version="0.10.0" match="greaterOrEqual"/>

-      <import feature="org.eclipse.jpt.jpa.feature" version="3.1.0" match="greaterOrEqual"/>

+      <import feature="org.eclipse.jpt.jpa.feature" version="3.2.0" match="greaterOrEqual"/>

    </requires>

 

    <plugin

diff --git a/jpa_diagram_editor/features/org.eclipse.jpt.jpadiagrameditor.tests.feature/feature.xml b/jpa_diagram_editor/features/org.eclipse.jpt.jpadiagrameditor.tests.feature/feature.xml
index 80118ee72f..7977f86d91 100644
--- a/jpa_diagram_editor/features/org.eclipse.jpt.jpadiagrameditor.tests.feature/feature.xml
+++ b/jpa_diagram_editor/features/org.eclipse.jpt.jpadiagrameditor.tests.feature/feature.xml
@@ -22,7 +22,7 @@
    <requires>
       <import plugin="org.easymock" version="2.4.0" match="compatible"/>
       <import feature="org.eclipse.graphiti.feature" version="0.10.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.jpt.jpa.feature" version="3.1.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.jpt.jpa.feature" version="3.2.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/META-INF/MANIFEST.MF b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/META-INF/MANIFEST.MF
index 724df47d5f..811b74a173 100644
--- a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/META-INF/MANIFEST.MF
+++ b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-SymbolicName: org.eclipse.jpt.jpadiagrameditor.ui.tests;singleton:=true
-Bundle-Version: 1.0.200.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Activator: org.eclipse.jpt.jpadiagrameditor.ui.tests.internal.JPAEditorTestsActivator
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
diff --git a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/pom.xml b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/pom.xml
index 821d9bf210..2bbd80b289 100644
--- a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/pom.xml
+++ b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/pom.xml
@@ -20,10 +20,10 @@
 				<artifactId>tycho-surefire-plugin</artifactId>

 				<version>${tycho-version}</version>

 				<configuration>

-					<!-- testSuite>org.eclipse.jpt.jpadiagrameditor.ui.tests</testSuite>

-					<testClass>org.eclipse.jpt.jpadiagrameditor.ui.tests.internal.AllJpaEditorTests</testClass-->

+					<testSuite>org.eclipse.jpt.jpadiagrameditor.ui.tests</testSuite>

+					<testClass>org.eclipse.jpt.jpadiagrameditor.ui.tests.internal.AllJpaEditorTests</testClass>

 					<useUIHarness>true</useUIHarness>

-					<useUIThread>false</useUIThread>

+					<useUIThread>true</useUIThread>

 					<systemProperties combine.children="append">

 						<org.eclipse.jpt.jpa.jar>${org.eclipse.jpt.jpa.jar}</org.eclipse.jpt.jpa.jar>

 					</systemProperties>

diff --git a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/AllJpaEditorTests.java b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/AllJpaEditorTests.java
index 2faa1af05a..0bfeb20161 100644
--- a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/AllJpaEditorTests.java
+++ b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/AllJpaEditorTests.java
@@ -18,7 +18,6 @@ package org.eclipse.jpt.jpadiagrameditor.ui.tests.internal;
 import java.io.File;
 import java.util.NoSuchElementException;
 
-import org.eclipse.jpt.jpadiagrameditor.ui.tests.internal.editor.CreateDiagramTest;
 import org.eclipse.jpt.jpadiagrameditor.ui.tests.internal.editor.EditorTest;
 import org.eclipse.jpt.jpadiagrameditor.ui.tests.internal.feature.AddAttributeFeatureTest;
 import org.eclipse.jpt.jpadiagrameditor.ui.tests.internal.feature.AddJPAEntityFeatureTest;
diff --git a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/editor/EditorTest.java b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/editor/EditorTest.java
index b6484a2b10..2fea541d2a 100644
--- a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/editor/EditorTest.java
+++ b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/editor/EditorTest.java
@@ -90,7 +90,6 @@ public class EditorTest {
 		// test
 		JpaSelectionManager manager = EasyMock
 				.createMock(JpaSelectionManager.class);
-		manager.setSelection(isA(JpaStructureNode.class));
 		replay(manager);
 
 		JPADiagramEditor.ISelectionManagerFactory factory = EasyMock
@@ -100,7 +99,7 @@ public class EditorTest {
 		replay(factory);
 		JPADiagramEditor editor = createEditor(provider, factory);
 		// test
-		editor.selectionChanged(part, new StructuredSelection(editPart));
+		editor.selectionChanged(part, new StructuredSelection(pe));
 		verify(manager);
 	}