[jbosstools-commits] JBoss Tools SVN: r42327 - trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test.

[jbosstools-commits at lists.jboss.org]

Author: dazarov
Date: 2012-06-29 16:27:46 -0400 (Fri, 29 Jun 2012)
New Revision: 42327

Modified:
   trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java
Log:
org.jboss.tools.jsf.test failure https://issues.jboss.org/browse/JBIDE-12259

Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java	2012-06-29 20:26:12 UTC (rev 42326)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java	2012-06-29 20:27:46 UTC (rev 42327)
@@ -41,29 +41,29 @@
 		ValidationExceptionTest.initLogger();
 
 		TestSuite suite = new TestSuite("Test model loading for JSF projects"); //$NON-NLS-1$
-//		suite.addTestSuite(JSFTemplateTest.class);
-//		suite.addTestSuite(JSFFacetOnExistingProjectTest.class);
-//
-//		TestSuite jsf2 = new TestSuite(JSF2ModelTest.class.getName());
-//		jsf2.addTestSuite(JSF2ModelTest.class);
-//		ProjectImportTestSetup testSetup = new ProjectImportTestSetup(jsf2,
-//				"org.jboss.tools.jsf.base.test",
-//				new String[]{"projects/JSF2Beans", "projects/JSF2Web"},
-//				new String[]{"JSF2Beans", "JSF2Web"});
-//		suite.addTest(testSetup);
+		suite.addTestSuite(JSFTemplateTest.class);
+		suite.addTestSuite(JSFFacetOnExistingProjectTest.class);
 
-		//TestSuite old = new TestSuite("Tests are using JSFKickStartOldFormat"); //$NON-NLS-1$
-		//old.addTestSuite(JSFModelTest.class);
-		//old.addTestSuite(ModelFormat_2_0_0_Test.class);
-		//old.addTestSuite(JSFBeansTest.class);
-		//suite.addTestSuite(WebContentTest.class);
-		//suite.addTestSuite(XHTMLValidatorTest.class);
-		//suite.addTestSuite(XHTMLDetectorAndValidatorTest.class);
-		//suite.addTestSuite(XMLCatalogTest.class);
-		//suite.addTestSuite(JSFPaletteTest.class);
-		//suite.addTest(new ProjectImportTestSetup(old,
-		//		"org.jboss.tools.jsf.test", "projects/JSFKickStartOldFormat", //$NON-NLS-1$ //$NON-NLS-2$
-		//		"JSFKickStartOldFormat")); //$NON-NLS-1$
+		TestSuite jsf2 = new TestSuite(JSF2ModelTest.class.getName());
+		jsf2.addTestSuite(JSF2ModelTest.class);
+		ProjectImportTestSetup testSetup = new ProjectImportTestSetup(jsf2,
+				"org.jboss.tools.jsf.base.test",
+				new String[]{"projects/JSF2Beans", "projects/JSF2Web"},
+				new String[]{"JSF2Beans", "JSF2Web"});
+		suite.addTest(testSetup);
+
+		TestSuite old = new TestSuite("Tests are using JSFKickStartOldFormat"); //$NON-NLS-1$
+		old.addTestSuite(JSFModelTest.class);
+		old.addTestSuite(ModelFormat_2_0_0_Test.class);
+		old.addTestSuite(JSFBeansTest.class);
+		suite.addTestSuite(WebContentTest.class);
+		suite.addTestSuite(XHTMLValidatorTest.class);
+		suite.addTestSuite(XHTMLDetectorAndValidatorTest.class);
+		suite.addTestSuite(XMLCatalogTest.class);
+		suite.addTestSuite(JSFPaletteTest.class);
+		suite.addTest(new ProjectImportTestSetup(old,
+				"org.jboss.tools.jsf.test", "projects/JSFKickStartOldFormat", //$NON-NLS-1$ //$NON-NLS-2$
+				"JSFKickStartOldFormat")); //$NON-NLS-1$
 		suite.addTest(new ProjectImportTestSetup(new TestSuite(
 				JSFPromptingProviderTest.class),
 				"org.jboss.tools.jsf.test", //$NON-NLS-1$