Author: svasilyev Date: 2008-02-15 16:17:53 -0500 (Fri, 15 Feb 2008) New Revision: 6358 Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.myfaces.test/src/org/jboss/tools/jsf/vpe/myfaces/test/MyFacesAllTests.java Removed: trunk/jsf/tests/org.jboss.tools.jsf.vpe.myfaces.test/src/org/jboss/tools/jsf/vpe/myfaces/test/MyFacesAllTests.java Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.myfaces.test/META-INF/MANIFEST.MF trunk/jsf/tests/org.jboss.tools.jsf.vpe.myfaces.test/src/org/jboss/tools/jsf/vpe/myfaces/test/MyFacesComponentTest.java Log: Some code adjustment Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.myfaces.test/META-INF/MANIFEST.MF =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.myfaces.test/META-INF/MANIFEST.MF 2008-02-15 20:53:36 UTC (rev 6357) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.myfaces.test/META-INF/MANIFEST.MF 2008-02-15 21:17:53 UTC (rev 6358) @@ -6,17 +6,8 @@ Bundle-Activator: org.jboss.tools.jsf.vpe.myfaces.test.MyFacesTestPlugin Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, - org.jboss.tools.vpe, - org.junit, + org.jboss.tools.vpe.ui.test, org.eclipse.core.resources, - org.eclipse.ui.ide, - org.jboss.tools.common, - org.jboss.tools.jst.jsp, - org.jboss.tools.common.text.ext, - org.jboss.tools.common.model, - org.jboss.tools.vpe.xulrunner, - org.mozilla.xpcom, - org.jboss.tools.vpe.ui.test;visibility:=reexport, - org.jboss.tools.jsf.vpe.myfaces + org.junit Eclipse-LazyStart: true Export-Package: org.jboss.tools.jsf.vpe.myfaces.test Deleted: trunk/jsf/tests/org.jboss.tools.jsf.vpe.myfaces.test/src/org/jboss/tools/jsf/vpe/myfaces/test/MyFacesAllTests.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.myfaces.test/src/org/jboss/tools/jsf/vpe/myfaces/test/MyFacesAllTests.java 2008-02-15 20:53:36 UTC (rev 6357) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.myfaces.test/src/org/jboss/tools/jsf/vpe/myfaces/test/MyFacesAllTests.java 2008-02-15 21:17:53 UTC (rev 6358) @@ -1,40 +0,0 @@ -package org.jboss.tools.jsf.vpe.myfaces.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; - -/** - * The Class MyFacesAllTests. - */ -public class MyFacesAllTests { - - /** - * Suite. - * - * @return the test - */ - public static Test suite() { - - TestSuite suite = new TestSuite("Tests for Vpe MyFaces components"); //$NON-NLS-1$ - - // $JUnit-BEGIN$ - suite.addTestSuite(MyFacesComponentTest.class); - // $JUnit-END$ - - List<ImportBean> projectToImport = new ArrayList<ImportBean>(); - ImportBean importBean = new ImportBean(); - importBean - .setImportProjectName(MyFacesComponentTest.IMPORT_PROJECT_NAME); - importBean.setImportProjectPath(MyFacesTestPlugin - .getPluginResourcePath()); - projectToImport.add(importBean); - - return new VpeTestSetup(suite, projectToImport); - } -} Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.myfaces.test/src/org/jboss/tools/jsf/vpe/myfaces/test/MyFacesAllTests.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.myfaces.test/src/org/jboss/tools/jsf/vpe/myfaces/test/MyFacesAllTests.java (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.myfaces.test/src/org/jboss/tools/jsf/vpe/myfaces/test/MyFacesAllTests.java 2008-02-15 21:17:53 UTC (rev 6358) @@ -0,0 +1,40 @@ +package org.jboss.tools.jsf.vpe.myfaces.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; + +/** + * The Class MyFacesAllTests. + */ +public class MyFacesAllTests { + + /** + * Suite. + * + * @return the test + */ + public static Test suite() { + + TestSuite suite = new TestSuite("Tests for Vpe MyFaces components"); //$NON-NLS-1$ + + // $JUnit-BEGIN$ + suite.addTestSuite(MyFacesComponentTest.class); + // $JUnit-END$ + + List<ImportBean> projectToImport = new ArrayList<ImportBean>(); + ImportBean importBean = new ImportBean(); + importBean + .setImportProjectName(MyFacesComponentTest.IMPORT_PROJECT_NAME); + importBean.setImportProjectPath(MyFacesTestPlugin + .getPluginResourcePath()); + projectToImport.add(importBean); + + return new VpeTestSetup(suite, projectToImport); + } +} Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.myfaces.test/src/org/jboss/tools/jsf/vpe/myfaces/test/MyFacesComponentTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.myfaces.test/src/org/jboss/tools/jsf/vpe/myfaces/test/MyFacesComponentTest.java 2008-02-15 20:53:36 UTC (rev 6357) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.myfaces.test/src/org/jboss/tools/jsf/vpe/myfaces/test/MyFacesComponentTest.java 2008-02-15 21:17:53 UTC (rev 6358) @@ -8,7 +8,7 @@ public class MyFacesComponentTest extends VpeTest { // import project name - public static final String IMPORT_PROJECT_NAME = "myFacesTest"; + public static final String IMPORT_PROJECT_NAME = "myFacesTest"; //$NON-NLS-1$ public MyFacesComponentTest(String name) { super(name); @@ -17,217 +17,217 @@ public void testAliasBean() throws PartInitException, Throwable { performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/aliasBean.jsp", IMPORT_PROJECT_NAME)); // $NON-NLS-1$ + "components/aliasBean.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ } public void testCheckbox() throws PartInitException, Throwable { performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/checkbox.jsp", IMPORT_PROJECT_NAME)); // $NON-NLS-1$ + "components/checkbox.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ } public void testCommandButton() throws PartInitException, Throwable { performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/commandButton.jsp", IMPORT_PROJECT_NAME)); // $NON-NLS-1$ + "components/commandButton.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ } public void testCommandLink() throws PartInitException, Throwable { performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/commandLink.jsp", IMPORT_PROJECT_NAME)); // $NON-NLS-1$ + "components/commandLink.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ } public void testCommandNavigation() throws PartInitException, Throwable { performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/commandNavigation.jsp", IMPORT_PROJECT_NAME)); // $NON-NLS-1$ + "components/commandNavigation.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ } public void testCommandSortHeader() throws PartInitException, Throwable { performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/commandSortHeader.jsp", IMPORT_PROJECT_NAME)); // $NON-NLS-1$ + "components/commandSortHeader.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ } public void testDataList() throws PartInitException, Throwable { performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/dataList.jsp", IMPORT_PROJECT_NAME)); // $NON-NLS-1$ + "components/dataList.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ } public void testDataScroller() throws PartInitException, Throwable { performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/dataScroller.jsp", IMPORT_PROJECT_NAME)); // $NON-NLS-1$ + "components/dataScroller.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ } public void testDataTable() throws PartInitException, Throwable { performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/dataTable.jsp", IMPORT_PROJECT_NAME)); // $NON-NLS-1$ + "components/dataTable.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ } public void testJscookMenu() throws PartInitException, Throwable { performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/jscookMenu.jsp", IMPORT_PROJECT_NAME)); // $NON-NLS-1$ + "components/jscookMenu.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ } public void testInputDate() throws PartInitException, Throwable { performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/inputDate.jsp", IMPORT_PROJECT_NAME)); // $NON-NLS-1$ + "components/inputDate.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ } public void testIconProvider() throws PartInitException, Throwable { performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/iconProvider.jsp", IMPORT_PROJECT_NAME)); // $NON-NLS-1$ + "components/iconProvider.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ } public void testInputText() throws PartInitException, Throwable { performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/inputText.jsp", IMPORT_PROJECT_NAME)); // $NON-NLS-1$ + "components/inputText.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ } public void testInputTextarea() throws PartInitException, Throwable { performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/inputTextarea.jsp", IMPORT_PROJECT_NAME)); // $NON-NLS-1$ + "components/inputTextarea.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ } public void testInputFileUpload() throws PartInitException, Throwable { performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/inputFileUpload.jsp", IMPORT_PROJECT_NAME)); // $NON-NLS-1$ + "components/inputFileUpload.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ } public void testInputCalendar() throws PartInitException, Throwable { performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/inputCalendar.jsp", IMPORT_PROJECT_NAME)); // $NON-NLS-1$ + "components/inputCalendar.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ } public void testMessage() throws PartInitException, Throwable { performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/message.jsp", IMPORT_PROJECT_NAME)); // $NON-NLS-1$ + "components/message.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ } public void testMessages() throws PartInitException, Throwable { performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/messages.jsp", IMPORT_PROJECT_NAME)); // $NON-NLS-1$ + "components/messages.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ } public void testOutputLabel() throws PartInitException, Throwable { performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/outputLabel.jsp", IMPORT_PROJECT_NAME)); // $NON-NLS-1$ + "components/outputLabel.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ } public void testNavigationMenuItem() throws PartInitException, Throwable { performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/navigationMenuItem.jsp", IMPORT_PROJECT_NAME)); // $NON-NLS-1$ + "components/navigationMenuItem.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ } public void testNavigationMenuItems() throws PartInitException, Throwable { performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/navigationMenuItems.jsp", IMPORT_PROJECT_NAME)); // $NON-NLS-1$ + "components/navigationMenuItems.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ } public void testOutputText() throws PartInitException, Throwable { performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/outputText.jsp", IMPORT_PROJECT_NAME)); // $NON-NLS-1$ + "components/outputText.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ } public void testPanelNavigation() throws PartInitException, Throwable { performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/panelNavigation.jsp", IMPORT_PROJECT_NAME)); // $NON-NLS-1$ + "components/panelNavigation.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ } public void testPanelTab() throws PartInitException, Throwable { performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/panelTab.jsp", IMPORT_PROJECT_NAME)); // $NON-NLS-1$ + "components/panelTab.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ } public void testPanelTabbedPane() throws PartInitException, Throwable { performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/panelTabbedPane.jsp", IMPORT_PROJECT_NAME)); // $NON-NLS-1$ + "components/panelTabbedPane.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ } public void testPanelLayout() throws PartInitException, Throwable { performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/panelLayout.jsp", IMPORT_PROJECT_NAME)); // $NON-NLS-1$ + "components/panelLayout.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ } public void testPanelStack() throws PartInitException, Throwable { performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/panelStack.jsp", IMPORT_PROJECT_NAME)); // $NON-NLS-1$ + "components/panelStack.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ } public void testRadio() throws PartInitException, Throwable { performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/radio.jsp", IMPORT_PROJECT_NAME)); // $NON-NLS-1$ + "components/radio.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ } public void testSaveState() throws PartInitException, Throwable { performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/saveState.jsp", IMPORT_PROJECT_NAME)); // $NON-NLS-1$ + "components/saveState.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ } public void testSelectManyCheckbox() throws PartInitException, Throwable { performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/selectManyCheckbox.jsp", IMPORT_PROJECT_NAME)); // $NON-NLS-1$ + "components/selectManyCheckbox.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ } public void testSelectOneRadio() throws PartInitException, Throwable { performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/selectOneRadio.jsp", IMPORT_PROJECT_NAME)); // $NON-NLS-1$ + "components/selectOneRadio.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ } public void testSelectOneMenu() throws PartInitException, Throwable { performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/selectOneMenu.jsp", IMPORT_PROJECT_NAME)); // $NON-NLS-1$ + "components/selectOneMenu.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ } public void testStylesheet() throws PartInitException, Throwable { performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/stylesheet.jsp", IMPORT_PROJECT_NAME)); // $NON-NLS-1$ + "components/stylesheet.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ } public void testTabChangeListener() throws PartInitException, Throwable { performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/tabChangeListener.jsp", IMPORT_PROJECT_NAME)); // $NON-NLS-1$ + "components/tabChangeListener.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ } public void testTree() throws PartInitException, Throwable { performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/tree.jsp", IMPORT_PROJECT_NAME)); // $NON-NLS-1$ + "components/tree.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ } public void testTreeSelectionListener() throws PartInitException, Throwable { performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/treeSelectionListener.jsp", IMPORT_PROJECT_NAME)); // $NON-NLS-1$ + "components/treeSelectionListener.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ } public void testUpdateActionListener() throws PartInitException, Throwable { performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/updateActionListener.jsp", IMPORT_PROJECT_NAME)); // $NON-NLS-1$ + "components/updateActionListener.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ } public void testValidateEmail() throws PartInitException, Throwable { performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/validateEmail.jsp", IMPORT_PROJECT_NAME)); // $NON-NLS-1$ + "components/validateEmail.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ } public void testValidateRegExpr() throws PartInitException, Throwable { performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/validateRegExpr.jsp", IMPORT_PROJECT_NAME)); // $NON-NLS-1$ + "components/validateRegExpr.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ } public void testValidateCreditCard() throws PartInitException, Throwable { performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/validateCreditCard.jsp", IMPORT_PROJECT_NAME)); // $NON-NLS-1$ + "components/validateCreditCard.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ } public void testValidateEqual() throws PartInitException, Throwable { performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/validateEqual.jsp", IMPORT_PROJECT_NAME)); // $NON-NLS-1$ + "components/validateEqual.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ } public void testValidateISBN() throws PartInitException, Throwable { performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/validateISBN.jsp", IMPORT_PROJECT_NAME)); // $NON-NLS-1$ + "components/validateISBN.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ } public void testPopup() throws PartInitException, Throwable { performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/popup.jsp", IMPORT_PROJECT_NAME)); // $NON-NLS-1$ + "components/popup.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ } }