diff options
| author | kmoore | 2008-08-15 21:28:35 +0000 |
|---|---|---|
| committer | kmoore | 2008-08-15 21:28:35 +0000 |
| commit | 6771179bb35233b4fbce9580a07532d403bf9bb8 (patch) | |
| tree | 04ea63c92c0e78e61c2665965f6d2ddfa12a6a79 /jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource | |
| parent | 3096256dac9260b13ea7707b9be06e671d5fb8bf (diff) | |
| download | webtools.dali-6771179bb35233b4fbce9580a07532d403bf9bb8.tar.gz webtools.dali-6771179bb35233b4fbce9580a07532d403bf9bb8.tar.xz webtools.dali-6771179bb35233b4fbce9580a07532d403bf9bb8.zip | |
changed our tests so that the test projects can be deleted, and reuse the same name. The change to close the InputStream in bug 244268 made this possible
Diffstat (limited to 'jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource')
2 files changed, 6 insertions, 8 deletions
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/OrmModelTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/OrmModelTests.java index ae285fe380..c2e2078cce 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/OrmModelTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/OrmModelTests.java @@ -13,7 +13,6 @@ package org.eclipse.jpt.core.tests.internal.resource; import junit.framework.TestCase; import org.eclipse.jpt.core.resource.orm.OrmArtifactEdit; import org.eclipse.jpt.core.resource.orm.OrmResource; -import org.eclipse.jpt.core.tests.internal.ProjectUtility; import org.eclipse.jpt.core.tests.internal.projects.TestJpaProject; public class OrmModelTests extends TestCase @@ -30,13 +29,13 @@ public class OrmModelTests extends TestCase @Override protected void setUp() throws Exception { super.setUp(); - ProjectUtility.deleteAllProjects(); - jpaProject = TestJpaProject.buildJpaProject(BASE_PROJECT_NAME, false); // false = no auto-build + this.jpaProject = TestJpaProject.buildJpaProject(BASE_PROJECT_NAME, false); // false = no auto-build } @Override protected void tearDown() throws Exception { - jpaProject = null; + this.jpaProject.getProject().delete(true, true, null); + this.jpaProject = null; super.tearDown(); } diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/PersistenceModelTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/PersistenceModelTests.java index 89a1030986..14ed9d2317 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/PersistenceModelTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/PersistenceModelTests.java @@ -13,7 +13,6 @@ package org.eclipse.jpt.core.tests.internal.resource; import junit.framework.TestCase; import org.eclipse.jpt.core.resource.persistence.PersistenceArtifactEdit; import org.eclipse.jpt.core.resource.persistence.PersistenceResource; -import org.eclipse.jpt.core.tests.internal.ProjectUtility; import org.eclipse.jpt.core.tests.internal.projects.TestJpaProject; public class PersistenceModelTests extends TestCase @@ -30,13 +29,13 @@ public class PersistenceModelTests extends TestCase @Override protected void setUp() throws Exception { super.setUp(); - ProjectUtility.deleteAllProjects(); - jpaProject = TestJpaProject.buildJpaProject(BASE_PROJECT_NAME, false); // false = no auto-build + this.jpaProject = TestJpaProject.buildJpaProject(BASE_PROJECT_NAME, false); // false = no auto-build } @Override protected void tearDown() throws Exception { - jpaProject = null; + this.jpaProject.getProject().delete(true, true, null); + this.jpaProject = null; super.tearDown(); } |