[435089] [CBI] org.eclipse.jst.jsp.core.tests.JSPCoreTestSuite hangs when run

tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/translation/JSPJavaTranslatorCoreTest.java

diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/translation/JSPJavaTranslatorCoreTest.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/translation/JSPJavaTranslatorCoreTest.java
index 4e43453..47d3c16 100644
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/translation/JSPJavaTranslatorCoreTest.java
+++ b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/translation/JSPJavaTranslatorCoreTest.java
@@ -341,7 +341,7 @@
 		 */
 		String testName = "testTranslatorMessagesWithIncludes";
 		// Create new project
-		IProject project = BundleResourceUtil.createSimpleProject(testName, null, null);
+		IProject project = BundleResourceUtil.createJavaWebProject(testName);
 		assertTrue(project.exists());
 		BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/" + testName, "/" + testName);
 
@@ -663,10 +663,9 @@
 		IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(testName);
 		if (!project.isAccessible()) {
 			// Create new project
-			project = BundleResourceUtil.createSimpleProject(testName, null, null);
+			project = BundleResourceUtil.createJavaWebProject(testName);
 			assertTrue(project.exists());
 			BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/" + testName, "/" + testName);
-			BundleResourceUtil.addWebContainer(project);
 		}
 		waitForBuildAndValidation(project);
 		TaglibHelper helper = new TaglibHelper(project);
@@ -688,10 +687,9 @@
 	public void test_javaVariableIncludes() throws Exception {
 		String testFolderName = "jspx_javaVariable_includes";
 		// Create new project
-		IProject project = BundleResourceUtil.createSimpleProject(testFolderName, null, null);
+		IProject project = BundleResourceUtil.createJavaWebProject(testFolderName);
 		assertTrue(project.exists());
 		BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/" + testFolderName, "/" + testFolderName);
-		BundleResourceUtil.addWebContainer(project);
 
 		waitForBuildAndValidation(project);