Ensure that projects created in test setups always have different names for each test case. This way, even if tearDown fails to delete the project, there won't be any problems with other tests.
diff --git a/jsf/tests/org.eclipse.jst.jsf.designtime.tests/src/org/eclipse/jst/jsf/designtime/tests/TestAbstractDataModelVariableFactory.java b/jsf/tests/org.eclipse.jst.jsf.designtime.tests/src/org/eclipse/jst/jsf/designtime/tests/TestAbstractDataModelVariableFactory.java
index 10a762c..9fb6422 100644
--- a/jsf/tests/org.eclipse.jst.jsf.designtime.tests/src/org/eclipse/jst/jsf/designtime/tests/TestAbstractDataModelVariableFactory.java
+++ b/jsf/tests/org.eclipse.jst.jsf.designtime.tests/src/org/eclipse/jst/jsf/designtime/tests/TestAbstractDataModelVariableFactory.java
@@ -45,7 +45,7 @@
JSFTestUtil.setInternetProxyPreferences(true, "www-proxy.us.oracle.com","80");
final WebProjectTestEnvironment projectTestEnvironment =
- new WebProjectTestEnvironment("TestAbstractDataModelFactory"+getName());
+ new WebProjectTestEnvironment("TestAbstractDataModelVariableFactory_"+getName());
projectTestEnvironment.createProject(false);
_jsfFacetedTestEnvironment = new JSFFacetedTestEnvironment(projectTestEnvironment);
diff --git a/jsf/tests/org.eclipse.jst.jsf.designtime.tests/src/org/eclipse/jst/jsf/designtime/tests/TestDefaultDTMethodResolver.java b/jsf/tests/org.eclipse.jst.jsf.designtime.tests/src/org/eclipse/jst/jsf/designtime/tests/TestDefaultDTMethodResolver.java
index b916c88..d440850 100644
--- a/jsf/tests/org.eclipse.jst.jsf.designtime.tests/src/org/eclipse/jst/jsf/designtime/tests/TestDefaultDTMethodResolver.java
+++ b/jsf/tests/org.eclipse.jst.jsf.designtime.tests/src/org/eclipse/jst/jsf/designtime/tests/TestDefaultDTMethodResolver.java
@@ -34,7 +34,7 @@
JSFTestUtil.setInternetProxyPreferences(true, "www-proxy.us.oracle.com","80");
final WebProjectTestEnvironment projectTestEnvironment =
- new WebProjectTestEnvironment("TestDefaultMethodResolver"+getName());
+ new WebProjectTestEnvironment("TestDefaultMethodResolver_"+getName());
projectTestEnvironment.createProject(false);
_jsfFactedTestEnvironment = new JSFFacetedTestEnvironment(projectTestEnvironment);
diff --git a/jsf/tests/org.eclipse.jst.jsf.designtime.tests/src/org/eclipse/jst/jsf/designtime/tests/TestDefaultDTVariableResolver.java b/jsf/tests/org.eclipse.jst.jsf.designtime.tests/src/org/eclipse/jst/jsf/designtime/tests/TestDefaultDTVariableResolver.java
index d4003bf..8ef3111 100644
--- a/jsf/tests/org.eclipse.jst.jsf.designtime.tests/src/org/eclipse/jst/jsf/designtime/tests/TestDefaultDTVariableResolver.java
+++ b/jsf/tests/org.eclipse.jst.jsf.designtime.tests/src/org/eclipse/jst/jsf/designtime/tests/TestDefaultDTVariableResolver.java
@@ -52,7 +52,7 @@
JSFTestUtil.setInternetProxyPreferences(true, "www-proxy.us.oracle.com","80");
final WebProjectTestEnvironment projectTestEnvironment =
- new WebProjectTestEnvironment("TestDefaultPropertyResolver"+getName());
+ new WebProjectTestEnvironment("TestDefaultPropertyResolver_"+getName());
projectTestEnvironment.createProject(false);
final IResource res = projectTestEnvironment.loadResourceInWebRoot(DesignTimeTestsPlugin.getDefault().getBundle()
diff --git a/jsf/tests/org.eclipse.jst.jsf.designtime.tests/src/org/eclipse/jst/jsf/designtime/tests/TestDefaultPropertyResolver.java b/jsf/tests/org.eclipse.jst.jsf.designtime.tests/src/org/eclipse/jst/jsf/designtime/tests/TestDefaultPropertyResolver.java
index 0c4b437..5b79ebf 100644
--- a/jsf/tests/org.eclipse.jst.jsf.designtime.tests/src/org/eclipse/jst/jsf/designtime/tests/TestDefaultPropertyResolver.java
+++ b/jsf/tests/org.eclipse.jst.jsf.designtime.tests/src/org/eclipse/jst/jsf/designtime/tests/TestDefaultPropertyResolver.java
@@ -79,7 +79,7 @@
JSFTestUtil.setInternetProxyPreferences(true, "www-proxy.uk.oracle.com","80");
final WebProjectTestEnvironment projectTestEnvironment =
- new WebProjectTestEnvironment("TestDefaultPropertyResolver"+getName());
+ new WebProjectTestEnvironment("TestDefaultPropertyResolver_"+getName());
projectTestEnvironment.createProject(false);
_jsfFactedTestEnvironment = new JSFFacetedTestEnvironment(projectTestEnvironment);
diff --git a/jsf/tests/org.eclipse.jst.jsf.designtime.tests/src/org/eclipse/jst/jsf/designtime/tests/TestJSPDefaultSymbolFactory.java b/jsf/tests/org.eclipse.jst.jsf.designtime.tests/src/org/eclipse/jst/jsf/designtime/tests/TestJSPDefaultSymbolFactory.java
index e57387f..2beefd6 100644
--- a/jsf/tests/org.eclipse.jst.jsf.designtime.tests/src/org/eclipse/jst/jsf/designtime/tests/TestJSPDefaultSymbolFactory.java
+++ b/jsf/tests/org.eclipse.jst.jsf.designtime.tests/src/org/eclipse/jst/jsf/designtime/tests/TestJSPDefaultSymbolFactory.java
@@ -38,7 +38,7 @@
JSFTestUtil.setInternetProxyPreferences(true, "www-proxy.us.oracle.com","80");
final WebProjectTestEnvironment projectTestEnvironment =
- new WebProjectTestEnvironment("TestJSPDefaultSymbolFactory"+getName());
+ new WebProjectTestEnvironment("TestJSPDefaultSymbolFactory_"+getName());
projectTestEnvironment.createProject(false);
final JDTTestEnvironment jdtTestEnvironment =
diff --git a/jsf/tests/org.eclipse.jst.jsf.designtime.tests/src/org/eclipse/jst/jsf/designtime/tests/TestResourceBundleMapSource.java b/jsf/tests/org.eclipse.jst.jsf.designtime.tests/src/org/eclipse/jst/jsf/designtime/tests/TestResourceBundleMapSource.java
index 15a9b10..4e26290 100644
--- a/jsf/tests/org.eclipse.jst.jsf.designtime.tests/src/org/eclipse/jst/jsf/designtime/tests/TestResourceBundleMapSource.java
+++ b/jsf/tests/org.eclipse.jst.jsf.designtime.tests/src/org/eclipse/jst/jsf/designtime/tests/TestResourceBundleMapSource.java
@@ -60,19 +60,19 @@
JSFTestUtil.setValidationEnabled(false);
- List<IResource> resources = initProject("BundleResourceTestProject1",
+ List<IResource> resources = initProject("BundleResourceTestProject1_"+getName(),
"/testdata/bundle1.resources.data",
BUNDLE1_PATH, BUNDLE1_NAME);
_bundle1 = (IFile) resources.get(0);
_project1 = (IProject) resources.get(1);
- resources = initProject("BundleResourceTestProject2",
+ resources = initProject("BundleResourceTestProject2_"+getName(),
"/testdata/bundle2.resources.data",
BUNDLE1_PATH, BUNDLE1_NAME);
//_bundle2 = (IFile) resources.get(0);
_project2 = (IProject) resources.get(1);
- resources = initProject("BundleResourceTestProject3"
+ resources = initProject("BundleResourceTestProject3_"+getName()
, "/testdata/bundle1.resources.data", BUNDLE1_PATH, BUNDLE1_NAME);
_project3 = (IProject) resources.get(1);
}
diff --git a/jsf/tests/org.eclipse.jst.jsf.designtime.tests/src/org/eclipse/jst/jsf/designtime/tests/TestResourceBundleSymbolSourceProvider.java b/jsf/tests/org.eclipse.jst.jsf.designtime.tests/src/org/eclipse/jst/jsf/designtime/tests/TestResourceBundleSymbolSourceProvider.java
index 7f7d39f..67b56d1 100644
--- a/jsf/tests/org.eclipse.jst.jsf.designtime.tests/src/org/eclipse/jst/jsf/designtime/tests/TestResourceBundleSymbolSourceProvider.java
+++ b/jsf/tests/org.eclipse.jst.jsf.designtime.tests/src/org/eclipse/jst/jsf/designtime/tests/TestResourceBundleSymbolSourceProvider.java
@@ -39,7 +39,7 @@
_projectTestEnvironment =
new WebProjectTestEnvironment(
- "TestResourceBundleSymbolSourceProvider"+getName()
+ "TestResourceBundleSymbolSourceProvider_"+getName()
, JavaFacetUtils.JAVA_50
, ProjectFacetsManager.getProjectFacet( "jst.web" ).getVersion("2.5")
);