[jbosstools-commits] JBoss Tools SVN: r5751 - trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test.
Author: akazakov
Date: 2008-01-16 14:43:17 -0500 (Wed, 16 Jan 2008)
New Revision: 5751
Modified:
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamEARTest.java
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java
Log:
Fixed some issues with joing jobs.
Modified:
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamEARTest.java
===================================================================
---
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamEARTest.java 2008-01-16
18:28:06 UTC (rev 5750)
+++
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamEARTest.java 2008-01-16
19:43:17 UTC (rev 5751)
@@ -10,20 +10,19 @@
******************************************************************************/
package org.jboss.tools.seam.core.test;
+import junit.framework.TestCase;
+
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IncrementalProjectBuilder;
import org.eclipse.core.runtime.NullProgressMonitor;
-import org.jboss.tools.common.model.XJob;
import org.jboss.tools.common.test.util.TestProjectProvider;
import org.jboss.tools.seam.core.ISeamComponent;
import org.jboss.tools.seam.core.ISeamProject;
import org.jboss.tools.seam.core.SeamCorePlugin;
-import org.jboss.tools.seam.internal.core.SeamProject;
import org.jboss.tools.test.util.JUnitUtils;
+import org.jboss.tools.test.util.xpl.EditorTestHelper;
-import junit.framework.TestCase;
-
/**
* @author V.Kabanovich
*
@@ -40,10 +39,10 @@
protected void setUp() throws Exception {
TestProjectProvider providerEAR = new
TestProjectProvider("org.jboss.tools.seam.core.test", null,
"Test1-ear", makeCopy);
projectEAR = providerEAR.getProject();
-
+
TestProjectProvider providerWAR = new
TestProjectProvider("org.jboss.tools.seam.core.test", null, "Test1",
makeCopy);
projectWAR = providerWAR.getProject();
-
+
TestProjectProvider providerEJB = new
TestProjectProvider("org.jboss.tools.seam.core.test", null,
"Test1-ejb", makeCopy);
projectEJB = providerEJB.getProject();
@@ -55,26 +54,19 @@
JUnitUtils.fail("Error in refreshing",e);
}
- try {
- XJob.waitForJob();
- } catch (InterruptedException e) {
- JUnitUtils.fail("Interrupted",e);
- }
+ EditorTestHelper.joinBackgroundActivities();
}
private ISeamProject getSeamProject(IProject project) {
try {
- XJob.waitForJob();
+ EditorTestHelper.joinBackgroundActivities();
+// XJob.waitForJob();
} catch (Exception e) {
JUnitUtils.fail("Interrupted",e);
}
try {
project.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
- try {
- XJob.waitForJob();
- } catch (InterruptedException e) {
- JUnitUtils.fail("Interrupted",e);
- }
+ EditorTestHelper.joinBackgroundActivities();
} catch (Exception e) {
JUnitUtils.fail("Cannot build", e);
}
@@ -104,13 +96,11 @@
*/
public void testCreatingProject() {
}
-
+
public void testProject() {
ISeamProject seamProject = getSeamProject(projectWAR);
ISeamComponent c = seamProject.getComponent("authenticator");
-
+
assertNotNull("War project must see component 'authenticator' declared in
ejb project", c);
-
}
-
-}
+}
\ No newline at end of file
Modified:
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java
===================================================================
---
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java 2008-01-16
18:28:06 UTC (rev 5750)
+++
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java 2008-01-16
19:43:17 UTC (rev 5751)
@@ -910,15 +910,14 @@
}
return numbers;
}
-
+
private void refreshProject(IProject project){
- waitForJob();
+ waitForJob();
}
-
+
public static void waitForJob() {
EditorTestHelper.joinJobs(1000,10000,500);
//then wait for a while to Workspace runnable is finished
- EditorTestHelper.joinJobs(2000, 2000, 0);
+ EditorTestHelper.joinJobs(2000, 2000, 500);
}
-
-}
+}
\ No newline at end of file