Author: dgolovin
Date: 2008-01-09 03:00:04 -0500 (Wed, 09 Jan 2008)
New Revision: 5537
Modified:
trunk/seam/tests/org.jboss.tools.seam.core.test/META-INF/MANIFEST.MF
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/ScannerTest.java
Log:
EditorTestHelper.joinBackgroundActivities(); used to test how it works.
SetUp method was switched from TestProjectProvider to importProject that creates copy of
project in current workspace.
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/META-INF/MANIFEST.MF 2008-01-09
07:55:02 UTC (rev 5536)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/META-INF/MANIFEST.MF 2008-01-09
08:00:04 UTC (rev 5537)
@@ -21,5 +21,8 @@
org.eclipse.ui.workbench,
org.eclipse.wst.common.modulecore,
org.eclipse.wst.common.frameworks,
- org.eclipse.jface
+ org.eclipse.jface,
+ org.jboss.tools.jst.firstrun,
+ org.eclipse.wst.server.core,
+ org.eclipse.datatools.connectivity
Provide-Package: org.jboss.tools.seam.core.test
Modified:
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/ScannerTest.java
===================================================================
---
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/ScannerTest.java 2008-01-09
07:55:02 UTC (rev 5536)
+++
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/ScannerTest.java 2008-01-09
08:00:04 UTC (rev 5537)
@@ -50,46 +50,27 @@
import org.jboss.tools.seam.internal.core.scanner.lib.ClassPath;
import org.jboss.tools.seam.internal.core.scanner.lib.LibraryScanner;
import org.jboss.tools.test.util.JUnitUtils;
+import org.jboss.tools.test.util.ResourcesUtils;
+import org.jboss.tools.test.util.xpl.EditorTestHelper;
public class ScannerTest extends TestCase {
- TestProjectProvider provider = null;
IProject project = null;
boolean makeCopy = true;
- public ScannerTest() {}
+ public ScannerTest() {
+ super("Seam Scanner test");
+ }
protected void setUp() throws Exception {
- provider = new TestProjectProvider("org.jboss.tools.seam.core.test", null,
"TestScanner", true);
- project = provider.getProject();
- try {
- project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
- } catch (Exception e) {
- JUnitUtils.fail("Error in refreshing",e);
- }
- try {
- XJob.waitForJob();
- } catch (InterruptedException e) {
- JUnitUtils.fail("Interrupted",e);
- }
+ project = ResourcesUtils.importProject(
+ "org.jboss.tools.seam.core.test","/projects/TestScanner" , new
NullProgressMonitor());
+ project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
+ EditorTestHelper.joinBackgroundActivities();
+ project.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
+ EditorTestHelper.joinBackgroundActivities();
}
-
+
private ISeamProject getSeamProject() {
- try {
- 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);
- }
- } catch (Exception e) {
- e.printStackTrace();
- JUnitUtils.fail("Cannot build",e);
- }
ISeamProject seamProject = null;
try {
seamProject = (ISeamProject)project.getNature(SeamProject.NATURE_ID);
@@ -321,7 +302,7 @@
try {
project.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
- XJob.waitForJob();
+ EditorTestHelper.joinBackgroundActivities();
} catch (Exception e) {
JUnitUtils.fail("Cannot build",e);
}
@@ -501,4 +482,9 @@
assertTrue("Component inner_JBIDE_1374 declared in inner static class is not
found.", c != null);
}
+ @Override
+ protected void tearDown() throws Exception {
+ EditorTestHelper.joinBackgroundActivities();
+ project.delete(true,true, null);
+ }
}
Show replies by date