[jbosstools-commits] JBoss Tools SVN: r20188 - in trunk/vpe: plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wizards and 3 other directories.

Author: dmaliarevich Date: 2010-02-08 13:46:05 -0500 (Mon, 08 Feb 2010) New Revision: 20188 Added: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/resources/TestProject/WebContent/pages/storedTags.xml trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/wizard/ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/wizard/VpeImportExportUnknownTagsWizardsTest.java Modified: trunk/vpe/plugins/org.jboss.tools.vpe/META-INF/MANIFEST.MF trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wizards/ExportUnknownTagsTemplatesWizardPage.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wizards/ImportUnknownTagsTemplatesWizardPage.java trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeUiTests.java Log: https://jira.jboss.org/jira/browse/JBIDE-2795, JUnits were added. Modified: trunk/vpe/plugins/org.jboss.tools.vpe/META-INF/MANIFEST.MF =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/META-INF/MANIFEST.MF 2010-02-08 18:24:25 UTC (rev 20187) +++ trunk/vpe/plugins/org.jboss.tools.vpe/META-INF/MANIFEST.MF 2010-02-08 18:46:05 UTC (rev 20188) @@ -35,6 +35,7 @@ org.jboss.tools.vpe.editor.toolbar.format.css, org.jboss.tools.vpe.editor.toolbar.format.handler, org.jboss.tools.vpe.editor.util, + org.jboss.tools.vpe.editor.wizards, org.jboss.tools.vpe.editor.xpl, org.jboss.tools.vpe.messages, org.jboss.tools.vpe.selbar Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wizards/ExportUnknownTagsTemplatesWizardPage.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wizards/ExportUnknownTagsTemplatesWizardPage.java 2010-02-08 18:24:25 UTC (rev 20187) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wizards/ExportUnknownTagsTemplatesWizardPage.java 2010-02-08 18:46:05 UTC (rev 20188) @@ -248,7 +248,7 @@ public String getValueAt(int row, int column) { String result = "List is empty"; //$NON-NLS-1$ - if (null != tagsList) { + if ((null != tagsList) && ((row >= 0) && (tagsList.size() > 0) && (row < tagsList.size()))) { VpeAnyData tagItem = (VpeAnyData)tagsList.get(row); switch(column){ case 0: Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wizards/ImportUnknownTagsTemplatesWizardPage.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wizards/ImportUnknownTagsTemplatesWizardPage.java 2010-02-08 18:24:25 UTC (rev 20187) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wizards/ImportUnknownTagsTemplatesWizardPage.java 2010-02-08 18:46:05 UTC (rev 20188) @@ -83,10 +83,7 @@ setDescription(VpeUIMessages.IMPORT_UNKNOWN_TAGS_PAGE_DESCRIPTION); setImageDescriptor(ReferenceWizardPage.getImageDescriptor()); } - - - @Override public void createControl(Composite parent) { /* @@ -258,7 +255,7 @@ public String getValueAt(int row, int column) { String result = "List is empty"; //$NON-NLS-1$ - if (null != tagsList) { + if ((null != tagsList) && ((row >= 0) && (tagsList.size() > 0) && (row < tagsList.size()))) { VpeAnyData tagItem = (VpeAnyData)tagsList.get(row); switch(column){ case 0: @@ -302,7 +299,6 @@ return isPageComplete; } - public boolean finish() { /* * Currently used templates list Added: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/resources/TestProject/WebContent/pages/storedTags.xml =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/resources/TestProject/WebContent/pages/storedTags.xml (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/resources/TestProject/WebContent/pages/storedTags.xml 2010-02-08 18:46:05 UTC (rev 20188) @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<vpe:templates> + <vpe:template-taglib prefix="lib" uri="someuri"/> + <vpe:template-taglib prefix="taglibName" uri="http://some/tag/uri"/> + <vpe:tag case-sensitive="no" name="taglibName:tagName"> + <vpe:template children="yes" modify="no"> + <vpe:any tag-for-display="b"/> + </vpe:template> + </vpe:tag> + <vpe:tag case-sensitive="no" name="lib:tag"> + <vpe:template children="yes" modify="no"> + <vpe:any style="s" tag-for-display="a" value="v"/> + </vpe:template> + </vpe:tag> +</vpe:templates> Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeUiTests.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeUiTests.java 2010-02-08 18:24:25 UTC (rev 20187) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeUiTests.java 2010-02-08 18:46:05 UTC (rev 20188) @@ -19,6 +19,7 @@ import org.jboss.tools.vpe.ui.test.dialog.VpeResourcesDialogTest; import org.jboss.tools.vpe.ui.test.editor.CustomSashFormTest; import org.jboss.tools.vpe.ui.test.preferences.VpeEditorPreferencesPageTest; +import org.jboss.tools.vpe.ui.test.wizard.VpeImportExportUnknownTagsWizardsTest; import junit.framework.Test; import junit.framework.TestSuite; @@ -36,6 +37,7 @@ suite.addTestSuite(CustomSashFormTest.class); suite.addTestSuite(VpePopupMenuTest.class); suite.addTestSuite(VpeEditAnyDialogTest.class); + suite.addTestSuite(VpeImportExportUnknownTagsWizardsTest.class); /* * Add projects that will be used in junit tests. Added: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/wizard/VpeImportExportUnknownTagsWizardsTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/wizard/VpeImportExportUnknownTagsWizardsTest.java (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/wizard/VpeImportExportUnknownTagsWizardsTest.java 2010-02-08 18:46:05 UTC (rev 20188) @@ -0,0 +1,139 @@ +/******************************************************************************* + * Copyright (c) 2007-2010 Exadel, Inc. and Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Exadel, Inc. and Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.vpe.ui.test.wizard; + +import java.util.List; + +import org.eclipse.core.runtime.IPath; +import org.eclipse.jface.viewers.StructuredSelection; +import org.eclipse.jface.wizard.WizardDialog; +import org.eclipse.ui.PlatformUI; +import org.jboss.tools.vpe.editor.template.VpeAnyData; +import org.jboss.tools.vpe.editor.template.VpeTemplateManager; +import org.jboss.tools.vpe.editor.wizards.ExportUnknownTagsTemplatesWizard; +import org.jboss.tools.vpe.editor.wizards.ExportUnknownTagsTemplatesWizardPage; +import org.jboss.tools.vpe.editor.wizards.ImportUnknownTagsTemplatesWizard; +import org.jboss.tools.vpe.editor.wizards.ImportUnknownTagsTemplatesWizardPage; +import org.jboss.tools.vpe.messages.VpeUIMessages; +import org.jboss.tools.vpe.ui.test.TestUtil; +import org.jboss.tools.vpe.ui.test.VpeTest; +import org.jboss.tools.vpe.ui.test.VpeUiTests; + +public class VpeImportExportUnknownTagsWizardsTest extends VpeTest { + + private final String EMPTY_RESULT = "List is empty"; //$NON-NLS-1$ + private final String TEMPLATES_FILE_PATH = "storedTags.xml"; //$NON-NLS-1$ + private List<VpeAnyData> tagsList; + + public VpeImportExportUnknownTagsWizardsTest(String name) { + super(name); + } + + public void testExport() throws Throwable { + ExportUnknownTagsTemplatesWizard wizard = new ExportUnknownTagsTemplatesWizard(); + wizard.init(PlatformUI.getWorkbench(), new StructuredSelection()); + wizard.addPages(); + ExportUnknownTagsTemplatesWizardPage page = (ExportUnknownTagsTemplatesWizardPage) wizard + .getPage(VpeUIMessages.EXPORT_UNKNOWN_TAGS_TEMPLATES_WIZARD_PAGE); + + WizardDialog dialog = new WizardDialog(PlatformUI.getWorkbench() + .getActiveWorkbenchWindow().getShell(), wizard); + dialog.setBlockOnOpen(false); + dialog.open(); + /* + * Cannot flip to next page + */ + assertFalse(page.canFlipToNextPage()); + /* + * Cannot finish the wizard + */ + assertFalse(wizard.canFinish()); + /* + * Check that templates list is empty + */ + String taglib = page.getValueAt(0, 0); + assertEquals(EMPTY_RESULT, taglib); + /* + * Close the dialog + */ + dialog.close(); + + /* + * Load stored templates to the JBDS. + */ + IPath path = TestUtil.getComponentPath(TEMPLATES_FILE_PATH, + VpeUiTests.IMPORT_PROJECT_NAME).getLocation(); + tagsList = VpeTemplateManager.getInstance().getAnyTemplates(path); + VpeTemplateManager.getInstance().setAnyTemplates(tagsList); + + /* + * Open the dialog once again + */ + wizard = new ExportUnknownTagsTemplatesWizard(); + wizard.init(PlatformUI.getWorkbench(), new StructuredSelection()); + wizard.addPages(); + page = (ExportUnknownTagsTemplatesWizardPage) wizard + .getPage(VpeUIMessages.EXPORT_UNKNOWN_TAGS_TEMPLATES_WIZARD_PAGE); + dialog = new WizardDialog(PlatformUI.getWorkbench() + .getActiveWorkbenchWindow().getShell(), wizard); + dialog.setBlockOnOpen(false); + dialog.open(); + /* + * Cannot flip to next page + */ + assertFalse(page.canFlipToNextPage()); + /* + * Cannot finish the wizard + */ + assertFalse(wizard.canFinish()); + /* + * Check that templates list has some values + */ + taglib = page.getValueAt(0, 0); + assertEquals("taglibName:tagName", taglib); //$NON-NLS-1$ + + taglib = page.getValueAt(1, 0); + assertEquals("lib:tag", taglib); //$NON-NLS-1$ + /* + * Close the dialog + */ + dialog.close(); + } + + public void testImport() throws Throwable { + ImportUnknownTagsTemplatesWizard wizard = new ImportUnknownTagsTemplatesWizard(); + wizard.init(PlatformUI.getWorkbench(), new StructuredSelection()); + wizard.addPages(); + ImportUnknownTagsTemplatesWizardPage page = (ImportUnknownTagsTemplatesWizardPage) wizard + .getPage(VpeUIMessages.IMPORT_UNKNOWN_TAGS_TEMPLATES_WIZARD_PAGE); + + WizardDialog dialog = new WizardDialog(PlatformUI.getWorkbench() + .getActiveWorkbenchWindow().getShell(), wizard); + dialog.setBlockOnOpen(false); + dialog.open(); + /* + * Cannot flip to next page + */ + assertFalse(page.canFlipToNextPage()); + /* + * Cannot finish the wizard + */ + assertFalse(wizard.canFinish()); + /* + * Check that templates list is empty + */ + String taglib = page.getValueAt(0, 0); + assertEquals(EMPTY_RESULT, taglib); + /* + * Close the dialog + */ + dialog.close(); + } +}