Bug 327818 - Test failure in org.eclipse.jst.jsf.core.tests.AllTests - DNF

diff --git a/jsf/tests/org.eclipse.jst.jsf.core.tests/src/org/eclipse/jst/jsf/core/tests/AllTests.java b/jsf/tests/org.eclipse.jst.jsf.core.tests/src/org/eclipse/jst/jsf/core/tests/AllTests.java
index 5393dbe..f823bfe 100644
--- a/jsf/tests/org.eclipse.jst.jsf.core.tests/src/org/eclipse/jst/jsf/core/tests/AllTests.java
+++ b/jsf/tests/org.eclipse.jst.jsf.core.tests/src/org/eclipse/jst/jsf/core/tests/AllTests.java

@@ -44,6 +44,7 @@
 import org.eclipse.jst.jsf.core.tests.util.TestTypeUtil;
 import org.eclipse.jst.jsf.core.tests.validation.TestJSPSemanticsValidator_AttributeValues;
 import org.eclipse.jst.jsf.core.tests.validation.TestJSPSemanticsValidator_Containment;
+import org.eclipse.jst.jsf.test.util.JSFTestUtil;
 
 /**
  * The full test suite for core.tests
@@ -58,6 +59,8 @@
 	public static Test suite() {
 		TestSuite suite = new TestSuite("Test for org.eclipse.jst.jsf.core.tests");
 		//$JUnit-BEGIN$
+		suite.addTestSuite(JSFTestUtil.getPreventJavaScriptJobsTestCase());
+
 		suite.addTestSuite(TestContentTypes.class);
 
         suite.addTestSuite(TestJDTBeanPropertyWorkingCopy.class);
@@ -114,6 +117,8 @@
         //JSFAppConfig Tests
         suite.addTestSuite(CompositeJSFAppConfigLocatorProviderStrategyTests.class);
         suite.addTestSuite(JSFAppConfigManagerFactoryTests.class);
+
+        suite.addTestSuite(JSFTestUtil.getAllowJavaScriptJobsTestCase());
 		//$JUnit-END$
 		return suite;
 	}

diff --git a/jsf/tests/org.eclipse.jst.jsf.designtime.tests/src/org/eclipse/jst/jsf/designtime/tests/AllTests.java b/jsf/tests/org.eclipse.jst.jsf.designtime.tests/src/org/eclipse/jst/jsf/designtime/tests/AllTests.java
index f75224a..5afd188 100644
--- a/jsf/tests/org.eclipse.jst.jsf.designtime.tests/src/org/eclipse/jst/jsf/designtime/tests/AllTests.java
+++ b/jsf/tests/org.eclipse.jst.jsf.designtime.tests/src/org/eclipse/jst/jsf/designtime/tests/AllTests.java

@@ -63,7 +63,7 @@
         final TestSuite suite = new TestSuite(
                 "Test for org.eclipse.jst.jsf.designtime.tests");
         // $JUnit-BEGIN$
-        suite.addTest(JSFTestUtil.getPreventJavaScriptJobsTest());
+        suite.addTestSuite(JSFTestUtil.getPreventJavaScriptJobsTestCase());
 
         suite.addTestSuite(TestStartupHandler.class);
         suite.addTestSuite(TestDefaultBeanSymbolSourceProvider.class);
@@ -83,7 +83,7 @@
         suite.addTestSuite(TestJSF20DefaultBeanSymbolSourceProvider.class);
         //addTestSuite(suite, JSPViewSuite.class);
 
-        suite.addTest(JSFTestUtil.getAllowJavaScriptJobsTest());
+        suite.addTestSuite(JSFTestUtil.getAllowJavaScriptJobsTestCase());
         // $JUnit-END$
         return suite;
     }

diff --git a/jsf/tests/org.eclipse.jst.jsf.test.util/src/org/eclipse/jst/jsf/test/util/JSFTestUtil.java b/jsf/tests/org.eclipse.jst.jsf.test.util/src/org/eclipse/jst/jsf/test/util/JSFTestUtil.java
index a6fc4a2..484754f 100644
--- a/jsf/tests/org.eclipse.jst.jsf.test.util/src/org/eclipse/jst/jsf/test/util/JSFTestUtil.java
+++ b/jsf/tests/org.eclipse.jst.jsf.test.util/src/org/eclipse/jst/jsf/test/util/JSFTestUtil.java

@@ -25,8 +25,7 @@
 import java.util.zip.ZipFile;
 
 import junit.framework.Assert;
-import junit.framework.Test;
-import junit.framework.TestResult;
+import junit.framework.TestCase;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IResource;
@@ -444,28 +443,22 @@
     	}
     }
 
-    public static Test getPreventJavaScriptJobsTest() {
-    	return new PreventJavaScriptJobsTest();
+    public static Class<? extends TestCase> getPreventJavaScriptJobsTestCase() {
+    	return PreventJavaScriptJobsTestCase.class;
     }
 
-    public static Test getAllowJavaScriptJobsTest() {
-    	return new AllowJavaScriptJobsTest();
+    public static Class<? extends TestCase> getAllowJavaScriptJobsTestCase() {
+    	return AllowJavaScriptJobsTestCase.class;
     }
 
-    static class PreventJavaScriptJobsTest implements Test {
-    	public int countTestCases() {
-    		return 1;
-    	}
-    	public void run(TestResult result) {
+    public static class PreventJavaScriptJobsTestCase extends TestCase {
+    	public void testPreventJavaScriptJobs() throws Exception {
     		preventJavaScriptJobs();
     	}
     }
 
-    static class AllowJavaScriptJobsTest implements Test {
-    	public int countTestCases() {
-    		return 1;
-    	}
-    	public void run(TestResult result) {
+    public static class AllowJavaScriptJobsTestCase extends TestCase {
+    	public void testAllowJavaScriptJobs() throws Exception {
     		allowJavaScriptJobs();
     	}
     }