diff options
author | Michael Valenta | 2005-04-01 14:03:40 +0000 |
---|---|---|
committer | Michael Valenta | 2005-04-01 14:03:40 +0000 |
commit | 237d372564e2201c9a0e9b55424c88c582018092 (patch) | |
tree | 7247c211d3059f95f01504c634c6452ebb264812 | |
parent | 219b052fea5b42b2540b59a9c8ae0047a6f830bf (diff) | |
download | eclipse.platform.team-237d372564e2201c9a0e9b55424c88c582018092.tar.gz eclipse.platform.team-237d372564e2201c9a0e9b55424c88c582018092.tar.xz eclipse.platform.team-237d372564e2201c9a0e9b55424c88c582018092.zip |
Attempt to fix intermittant test failureI20050401
2 files changed, 5 insertions, 1 deletions
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/EclipseTest.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/EclipseTest.java index 5bd2b8ca4..b05e9b5ca 100644 --- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/EclipseTest.java +++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/EclipseTest.java @@ -874,7 +874,7 @@ public class EclipseTest extends ResourceTest { waitForDecorator(); } - private static void waitForDecorator() { + protected static void waitForDecorator() { // Wait for the decorator job Job[] decorators = Platform.getJobManager().find(DecoratorManager.FAMILY_DECORATE); for (int i = 0; i < decorators.length; i++) { diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/ImportTest.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/ImportTest.java index c93530908..5def88682 100644 --- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/ImportTest.java +++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/ImportTest.java @@ -133,16 +133,19 @@ public class ImportTest extends EclipseTest { assertEquals(project, copy, true, true); // 1. Delete the project but not it's contents and checkout the project again + waitForDecorator(); project.delete(false, false, DEFAULT_MONITOR); project = checkoutProject(project, null, null); assertEquals(project, copy, true, true); // 2. Delete the project and its contents and use the module name instead of the project + waitForDecorator(); project.delete(true, false, DEFAULT_MONITOR); project = checkoutProject(null, project.getName(), null); assertEquals(project, copy, true, true); // 3. Create a project in a custom location and check out over it + waitForDecorator(); project.delete(true, false, DEFAULT_MONITOR); IProjectDescription desc = ResourcesPlugin.getWorkspace().newProjectDescription(project.getName()); //desc.setLocation(new Path("C:\\temp\\project")); @@ -151,6 +154,7 @@ public class ImportTest extends EclipseTest { assertEquals(project, copy, true, true); // 4. Checkout something that doesn't contain a .project + waitForDecorator(); project.delete(true, false, DEFAULT_MONITOR); project = checkoutProject(null, project.getName() + "/folder1", null); //assertEquals(project, copy.getFolder("folder1")); |