Author: mareshkau Date: 2008-01-10 08:01:02 -0500 (Thu, 10 Jan 2008) New Revision: 5577 Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tools/jsf/vpe/facelets/test/FaceletsAllTests.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tools/jsf/vpe/facelets/test/FaceletsComponentTest.java Log: http://jira.jboss.com/jira/browse/JBIDE-1562, junit tests was adjusted, was added VpeTest setup class which allows correctly import-remove test project from workspace(only once for each test suite, not for every test case).Some code was refactored. Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tools/jsf/vpe/facelets/test/FaceletsAllTests.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tools/jsf/vpe/facelets/test/FaceletsAllTests.java 2008-01-10 13:00:56 UTC (rev 5576) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tools/jsf/vpe/facelets/test/FaceletsAllTests.java 2008-01-10 13:01:02 UTC (rev 5577) @@ -1,5 +1,11 @@ package org.jboss.tools.jsf.vpe.facelets.test; +import java.util.ArrayList; +import java.util.List; + +import org.jboss.tools.vpe.ui.test.VpeTestSetup; +import org.jboss.tools.vpe.ui.test.beans.ImportBean; + import junit.framework.Test; import junit.framework.TestSuite; @@ -13,7 +19,12 @@ suite.addTestSuite(FaceletsComponentTest.class); // $JUnit-END$ - return suite; + List<ImportBean> importProjects = new ArrayList<ImportBean>(); + ImportBean importBean = new ImportBean(); + importBean.setImportProjectName(FaceletsComponentTest.IMPORT_PROJECT_NAME); + importBean.setImportProjectPath(FaceletsTestPlugin.getPluginResourcePath()); + importProjects.add(importBean); + return new VpeTestSetup(suite,importProjects); } } Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tools/jsf/vpe/facelets/test/FaceletsComponentTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tools/jsf/vpe/facelets/test/FaceletsComponentTest.java 2008-01-10 13:00:56 UTC (rev 5576) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tools/jsf/vpe/facelets/test/FaceletsComponentTest.java 2008-01-10 13:01:02 UTC (rev 5577) @@ -33,15 +33,14 @@ public class FaceletsComponentTest extends VpeTest { // import project name - private static final String IMPORT_PROJECT_NAME = "faceletsTest"; + public static final String IMPORT_PROJECT_NAME = "faceletsTest"; public FaceletsComponentTest(String name) { - super(name, IMPORT_PROJECT_NAME, FaceletsTestPlugin - .getPluginResourcePath()); + super(name); } public void testDebug() throws Throwable { - performTestForJsfComponent("components/debug.xhtml"); // $NON-NLS-1$ + performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/debug.xhtml",IMPORT_PROJECT_NAME)); // $NON-NLS-1$ } public void testDefine() throws Throwable { @@ -51,7 +50,7 @@ // get test page path IFile file = (IFile) TestUtil.getComponentPath( - "components/define.xhtml", getImportProjectName()); + "components/define.xhtml", IMPORT_PROJECT_NAME); assertNotNull("Could not open specified file " + file.getFullPath(), file); @@ -102,7 +101,7 @@ } public void testInsert() throws Throwable { - performTestForJsfComponent("components/insert.xhtml"); // $NON-NLS-1$ + performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/insert.xhtml",IMPORT_PROJECT_NAME)); // $NON-NLS-1$ } }