Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkmoore2010-08-16 17:16:17 +0000
committerkmoore2010-08-16 17:16:17 +0000
commite80da5d1385f126d11c6838e26fb74ab61d5bc95 (patch)
tree490c126ff0a81533c54cdfd25078bfb7765a5fe7
parent8907bb0af7b4dbea624fd84a5061ed0501a8cadc (diff)
downloadwebtools.dali-e80da5d1385f126d11c6838e26fb74ab61d5bc95.tar.gz
webtools.dali-e80da5d1385f126d11c6838e26fb74ab61d5bc95.tar.xz
webtools.dali-e80da5d1385f126d11c6838e26fb74ab61d5bc95.zip
don't install the utility facet, this seems to solve our failing test issues
-rw-r--r--jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/model/JpaProjectManagerTests.java7
1 files changed, 3 insertions, 4 deletions
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/model/JpaProjectManagerTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/model/JpaProjectManagerTests.java
index 78c6e3979a..28a9cedfe6 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/model/JpaProjectManagerTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/model/JpaProjectManagerTests.java
@@ -88,7 +88,6 @@ public class JpaProjectManagerTests extends TestCase {
*/
private TestFacetedProject buildTestProject() throws Exception {
TestJavaProject tjp = TestJavaProject.buildJavaProject(this.getClass().getSimpleName(), true);
- tjp.installFacet("jst.utility", "1.0");
tjp.createCompilationUnit("test.pkg", "TestEntity.java", "@Entity public class TestEntity {}");
tjp.createCompilationUnit("test.pkg", "TestEntity2.java", "@Entity public class TestEntity2 {}");
return tjp;
@@ -202,7 +201,7 @@ public class JpaProjectManagerTests extends TestCase {
inStream.close();
String oldDocument = new String(buf);
- String oldString = "<installed facet=\"jst.utility\" version=\"1.0\"/>";
+ String oldString = "<installed facet=\"java\" version=\"1.5\"/>";
String newString = oldString + CR + " " + "<installed facet=\"jpt.jpa\" version=\"1.0\"/>";
String newDocument = oldDocument.replaceAll(oldString, newString);
@@ -240,8 +239,8 @@ public class JpaProjectManagerTests extends TestCase {
inStream.close();
String oldDocument = new String(buf);
- String oldString = "<installed facet=\"jst.utility\" version=\"1.0\"/>" + CR + " " + "<installed facet=\"jpt.jpa\" version=\"1.0\"/>";
- String newString = "<installed facet=\"jst.utility\" version=\"1.0\"/>";
+ String oldString = "<installed facet=\"java\" version=\"1.5\"/>" + CR + " " + "<installed facet=\"jpt.jpa\" version=\"1.0\"/>";
+ String newString = "<installed facet=\"java\" version=\"1.5\"/>";
String newDocument = oldDocument.replaceAll(oldString, newString);
facetSettingsFile.setContents(new ByteArrayInputStream(newDocument.getBytes()), false, false, null);

Back to the top