Get JEM Tests working in build process. They had been failing for a bit.
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/JavaProjectUtil.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/JavaProjectUtil.java index 6df0a32..cea0011 100644 --- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/JavaProjectUtil.java +++ b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/JavaProjectUtil.java
@@ -11,7 +11,7 @@ *******************************************************************************/ /* * $RCSfile: JavaProjectUtil.java,v $ - * $Revision: 1.4 $ $Date: 2004/06/02 15:57:16 $ + * $Revision: 1.5 $ $Date: 2004/06/14 16:07:28 $ */ @@ -23,9 +23,11 @@ import org.eclipse.ant.core.AntRunner; import org.eclipse.core.resources.*; import org.eclipse.core.runtime.*; +import org.eclipse.core.runtime.jobs.IJobManager; import org.eclipse.jdt.core.*; import org.osgi.framework.Bundle; +import org.eclipse.jem.internal.proxy.core.ProxyMessages; import org.eclipse.jem.internal.proxy.core.ProxyPlugin; /** @@ -242,4 +244,17 @@ } }, project.getProject(), 0, pm); } + + public static void waitForAutoBuild() throws CoreException { + IJobManager jobManager = Platform.getJobManager(); + if (jobManager.find(ResourcesPlugin.FAMILY_AUTO_BUILD).length > 0) { + try { + jobManager.join(ResourcesPlugin.FAMILY_AUTO_BUILD, new NullProgressMonitor()); + } catch (InterruptedException e) { + throw new CoreException( + new Status(IStatus.ERROR, JavaTestsPlugin.getPlugin().getBundle().getSymbolicName(), IStatus.ERROR, "", e)); //$NON-NLS-1$ + } + } + + } } \ No newline at end of file
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/beaninfo/BeanInfoSuite.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/beaninfo/BeanInfoSuite.java index 3ab8cc8..cc23c70 100644 --- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/beaninfo/BeanInfoSuite.java +++ b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/beaninfo/BeanInfoSuite.java
@@ -11,7 +11,7 @@ *******************************************************************************/ /* * $RCSfile: BeanInfoSuite.java,v $ - * $Revision: 1.6 $ $Date: 2004/06/02 15:57:16 $ + * $Revision: 1.7 $ $Date: 2004/06/14 16:07:28 $ */ import java.net.URL; @@ -79,6 +79,7 @@ assertNotNull(projects[0]); assertNotNull(projects[1]); assertNotNull(projects[2]); + JavaProjectUtil.waitForAutoBuild(); System.out.println("-- Data initialized --"); //$NON-NLS-1$ BeaninfoNature nature = BeaninfoNature.getRuntime(projects[0]);
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/instantiation/InstantiationSuite.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/instantiation/InstantiationSuite.java index c51125a..5c56430 100644 --- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/instantiation/InstantiationSuite.java +++ b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/instantiation/InstantiationSuite.java
@@ -11,7 +11,7 @@ *******************************************************************************/ /* * $RCSfile: InstantiationSuite.java,v $ - * $Revision: 1.6 $ $Date: 2004/06/02 15:57:16 $ + * $Revision: 1.7 $ $Date: 2004/06/14 16:07:28 $ */ import java.net.URL; @@ -76,6 +76,7 @@ zipPaths); assertNotNull(projects[0]); assertNotNull(projects[1]); + JavaProjectUtil.waitForAutoBuild(); System.out.println("-- Data initialized --"); //$NON-NLS-1$ BeaninfoNature nature = BeaninfoNature.getRuntime(projects[0]);
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/modelListeners/ListenersSuite.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/modelListeners/ListenersSuite.java index 5e645f3..d842568 100644 --- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/modelListeners/ListenersSuite.java +++ b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/modelListeners/ListenersSuite.java
@@ -11,7 +11,7 @@ *******************************************************************************/ /* * $RCSfile: ListenersSuite.java,v $ - * $Revision: 1.1 $ $Date: 2004/06/09 22:47:00 $ + * $Revision: 1.2 $ $Date: 2004/06/14 16:07:28 $ */ import java.net.URL; @@ -74,6 +74,7 @@ zipPaths); assertNotNull(projects[0]); assertNotNull(projects[1]); + JavaProjectUtil.waitForAutoBuild(); System.out.println("-- Data initialized --"); //$NON-NLS-1$ }
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/remote/RemoteProxySuite.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/remote/RemoteProxySuite.java index 35db385..4c35b1f 100644 --- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/remote/RemoteProxySuite.java +++ b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/remote/RemoteProxySuite.java
@@ -11,7 +11,7 @@ *******************************************************************************/ /* * $RCSfile: RemoteProxySuite.java,v $ - * $Revision: 1.4 $ $Date: 2004/06/02 15:57:16 $ + * $Revision: 1.5 $ $Date: 2004/06/14 16:07:28 $ */ import java.net.URL; @@ -105,6 +105,7 @@ .getFile(); IProject[] projects = JavaProjectUtil.importProjects(new String[] { TEST_PROJECT_NAME }, new String[] { zipPath }); assertNotNull(projects[0]); + JavaProjectUtil.waitForAutoBuild(); project = projects[0]; System.out.println("-- Data initialized --"); //$NON-NLS-1$