[211532] create persistence.xml and orm.xml in jobs to fix(?) deadlock
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/model/JpaModelTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/model/JpaModelTests.java
index 23d454e..4e33704 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/model/JpaModelTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/model/JpaModelTests.java
@@ -106,11 +106,13 @@
assertEquals(1, JptCorePlugin.jpaModel().jpaProjectsSize());
IJpaProject jpaProject = JptCorePlugin.jpaProject(testProject.getProject());
assertNotNull(jpaProject);
- assertEquals(4, jpaProject.jpaFilesSize());
+// assertEquals(4, jpaProject.jpaFilesSize());
assertNotNull(jpaProject.jpaFile(this.file(testProject, "src/test.pkg/TestEntity.java")));
assertNotNull(jpaProject.jpaFile(this.file(testProject, "src/test.pkg/TestEntity2.java")));
- assertNotNull(jpaProject.jpaFile(this.file(testProject, "src/META-INF/persistence.xml")));
- assertNotNull(jpaProject.jpaFile(this.file(testProject, "src/META-INF/orm.xml")));
+ // persistence.xml and orm.xml are created in the background, so they probably
+ // won't be there yet...
+// assertNotNull(jpaProject.jpaFile(this.file(testProject, "src/META-INF/persistence.xml")));
+// assertNotNull(jpaProject.jpaFile(this.file(testProject, "src/META-INF/orm.xml")));
testProject.uninstallFacet("jpt.jpa", "1.0");
assertEquals(0, JptCorePlugin.jpaModel().jpaProjectsSize());
@@ -130,11 +132,13 @@
testProject.getProject().open(null);
jpaProject = JptCorePlugin.jpaProject(testProject.getProject());
assertNotNull(jpaProject);
- assertEquals(4, jpaProject.jpaFilesSize());
+// assertEquals(4, jpaProject.jpaFilesSize());
assertNotNull(jpaProject.jpaFile(this.file(testProject, "src/test.pkg/TestEntity.java")));
assertNotNull(jpaProject.jpaFile(this.file(testProject, "src/test.pkg/TestEntity2.java")));
- assertNotNull(jpaProject.jpaFile(this.file(testProject, "src/META-INF/persistence.xml")));
- assertNotNull(jpaProject.jpaFile(this.file(testProject, "src/META-INF/orm.xml")));
+ // persistence.xml and orm.xml are created in the background, so they probably
+ // won't be there yet...
+// assertNotNull(jpaProject.jpaFile(this.file(testProject, "src/META-INF/persistence.xml")));
+// assertNotNull(jpaProject.jpaFile(this.file(testProject, "src/META-INF/orm.xml")));
}
public void testProjectDeleteReimport() throws Exception {
@@ -159,11 +163,13 @@
assertTrue(JptCorePlugin.projectHasJpaFacet(project));
jpaProject = JptCorePlugin.jpaProject(project);
assertNotNull(jpaProject);
- assertEquals(4, jpaProject.jpaFilesSize());
+// assertEquals(4, jpaProject.jpaFilesSize());
assertNotNull(jpaProject.jpaFile(this.file(testProject, "src/test.pkg/TestEntity.java")));
assertNotNull(jpaProject.jpaFile(this.file(testProject, "src/test.pkg/TestEntity2.java")));
- assertNotNull(jpaProject.jpaFile(this.file(testProject, "src/META-INF/persistence.xml")));
- assertNotNull(jpaProject.jpaFile(this.file(testProject, "src/META-INF/orm.xml")));
+ // persistence.xml and orm.xml are created in the background, so they probably
+ // won't be there yet...
+// assertNotNull(jpaProject.jpaFile(this.file(testProject, "src/META-INF/persistence.xml")));
+// assertNotNull(jpaProject.jpaFile(this.file(testProject, "src/META-INF/orm.xml")));
}
public void testEditFacetSettingsFile() throws Exception {
