diff options
author | cbateman | 2008-01-26 04:06:47 +0000 |
---|---|---|
committer | cbateman | 2008-01-26 04:06:47 +0000 |
commit | d9411bdf375c4c4466cc62304e0cd5ac6601de1e (patch) | |
tree | 821214f40302e5403c35c360a5fbd7c768b254fd | |
parent | 9110e0d25e53f7155fbfff12b3c1068feccb2b69 (diff) | |
download | webtools.jsf.tests-d9411bdf375c4c4466cc62304e0cd5ac6601de1e.tar.gz webtools.jsf.tests-d9411bdf375c4c4466cc62304e0cd5ac6601de1e.tar.xz webtools.jsf.tests-d9411bdf375c4c4466cc62304e0cd5ac6601de1e.zip |
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.
7 files changed, 9 insertions, 9 deletions
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 @@ public class TestAbstractDataModelVariableFactory extends TestCase 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 @@ public class TestDefaultDTMethodResolver extends TestCase 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 @@ public class TestDefaultDTVariableResolver extends TestCase 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 @@ public class TestDefaultPropertyResolver extends TestCase 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 @@ public class TestJSPDefaultSymbolFactory extends TestCase 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 @@ public class TestResourceBundleMapSource extends TestCase 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 @@ public class TestResourceBundleSymbolSourceProvider extends TestCase _projectTestEnvironment = new WebProjectTestEnvironment( - "TestResourceBundleSymbolSourceProvider"+getName() + "TestResourceBundleSymbolSourceProvider_"+getName() , JavaFacetUtils.JAVA_50 , ProjectFacetsManager.getProjectFacet( "jst.web" ).getVersion("2.5") ); |