Bug 541459 - fix Bug_006708.testBug fails on Windows
Delete existig projects: some test doesn't proper clean up.
Change-Id: Ia60715df529dbb15fd79a9b318a2d7e8e0600822
Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
diff --git a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_006708.java b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_006708.java
index 16e5a5f..ac55ff0 100644
--- a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_006708.java
+++ b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_006708.java
@@ -40,25 +40,37 @@
return new TestSuite(Bug_006708.class);
}
- public void testBug() {
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ IWorkspace workspace = ResourcesPlugin.getWorkspace();
+ IProject p1 = workspace.getRoot().getProject("p1");
+ if (p1.exists()) {
+ p1.delete(true, null);
+ }
+ IProject p2 = workspace.getRoot().getProject("p2");
+ if (p2.exists()) {
+ p2.delete(true, null);
+ }
+ }
+
+ public void testBug() throws CoreException {
IWorkspace workspace = ResourcesPlugin.getWorkspace();
- try {
- IProject sourceProj = workspace.getRoot().getProject("P1");
- sourceProj.create(null);
- sourceProj.open(null);
- IFile source = sourceProj.getFile("Source.txt");
- source.create(new ByteArrayInputStream("abcdef".getBytes()), false, null);
+ IProject sourceProj = workspace.getRoot().getProject("P1");
+ assertFalse("Project P1 exists already", sourceProj.exists());
+ sourceProj.create(null);
+ sourceProj.open(null);
+ IFile source = sourceProj.getFile("Source.txt");
+ source.create(new ByteArrayInputStream("abcdef".getBytes()), false, null);
- IProject destProj = workspace.getRoot().getProject("P2");
- destProj.create(null);
- destProj.open(null);
- IFile dest = destProj.getFile("Dest.txt");
+ IProject destProj = workspace.getRoot().getProject("P2");
+ assertFalse("Project P2 exists already", destProj.exists());
+ destProj.create(null);
+ destProj.open(null);
+ IFile dest = destProj.getFile("Dest.txt");
- source.copy(dest.getFullPath(), false, null);
- dest.setContents(new ByteArrayInputStream("ghijkl".getBytes()), false, true, null);
- } catch (CoreException e) {
- fail("1.0", e);
- }
+ source.copy(dest.getFullPath(), false, null);
+ dest.setContents(new ByteArrayInputStream("ghijkl".getBytes()), false, true, null);
}
}
