Author: vpakan(a)redhat.com Date: 2012-04-18 03:06:04 -0400 (Wed, 18 Apr 2012) New Revision: 40265 Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/projects/ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/projects/jsf12importtest.zip trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/compatibility/ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/compatibility/ImportJSF12ProjectFromJBDS4x.java Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/JSFAllBotTests.java trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/gen/ActionItem.java Log: Added test of importing JSF1.2 project created with JBDS 4.1.x Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/projects/jsf12importtest.zip =================================================================== (Binary files differ) Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/projects/jsf12importtest.zip ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/JSFAllBotTests.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/JSFAllBotTests.java 2012-04-18 03:25:49 UTC (rev 40264) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/JSFAllBotTests.java 2012-04-18 07:06:04 UTC (rev 40265) @@ -1,5 +1,6 @@ package org.jboss.tools.jsf.ui.bot.test; +import org.jboss.tools.jsf.ui.bot.test.compatibility.ImportJSF12ProjectFromJBDS4x; import org.jboss.tools.jsf.ui.bot.test.cssdialog.jbide.CSSSelectorJBIDE3288; import org.jboss.tools.jsf.ui.bot.test.cssdialog.jbide.JBIDE3148and4441Test; import org.jboss.tools.jsf.ui.bot.test.cssdialog.jbide.JBIDE3577Test; @@ -56,7 +57,8 @@ WebXmlEditorTest.class, CreateNewTemplateFromJSFProject.class, PropertiesEditorTest.class, - CreateJSF2CompositeComponentMenuTest.class + CreateJSF2CompositeComponentMenuTest.class, + ImportJSF12ProjectFromJBDS4x.class }) public class JSFAllBotTests{ } \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/compatibility/ImportJSF12ProjectFromJBDS4x.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/compatibility/ImportJSF12ProjectFromJBDS4x.java (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/compatibility/ImportJSF12ProjectFromJBDS4x.java 2012-04-18 07:06:04 UTC (rev 40265) @@ -0,0 +1,118 @@ + /******************************************************************************* + * Copyright (c) 2007-2012 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ + +package org.jboss.tools.jsf.ui.bot.test.compatibility; + +import java.io.File; +import java.io.IOException; + +import org.eclipse.swtbot.swt.finder.widgets.SWTBotCheckBox; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; +import org.jboss.tools.jsf.ui.bot.test.JSFAutoTestCase; +import org.jboss.tools.ui.bot.ext.SWTBotExt; +import org.jboss.tools.ui.bot.ext.SWTEclipseExt; +import org.jboss.tools.ui.bot.ext.Timing; +import org.jboss.tools.ui.bot.ext.gen.ActionItem.Import.OtherJSFProject; +import org.jboss.tools.ui.bot.ext.helper.FileHelper; +import org.jboss.tools.ui.bot.ext.types.IDELabel; +import org.jboss.tools.ui.bot.ext.view.ProblemsView; +import org.jboss.tools.ui.bot.ext.wizards.SWTBotImportWizard; +/** + * Test importing JSF 1.2 project created using JBDS 4.1.x + * @author Vladimir Pakan + * + */ +public class ImportJSF12ProjectFromJBDS4x extends JSFAutoTestCase{ + + private SWTBotExt botExt; + private static final String PROJECT_TO_IMPORT_NAME = "jsf12importtest"; + + public void setUp() throws Exception { + super.setUp(); + this.botExt = new SWTBotExt(); + } + + public void testImportJSFProject() { + // copy and unzip JSF 1.2 project to tmp directory + try{ + final String projectToImportZipName = ImportJSF12ProjectFromJBDS4x.PROJECT_TO_IMPORT_NAME + ".zip"; + final String resourceProjectToImportLocation = getPathToResources("projects" + File.separator + projectToImportZipName); + final String tmpDir = System.getProperty("java.io.tmpdir","."); + FileHelper.copyFilesBinary(new File(resourceProjectToImportLocation), + new File(tmpDir)); + FileHelper.unzipArchive(new File(tmpDir,projectToImportZipName), + new File(tmpDir)); + final String projectToImportLocation = tmpDir + File.separator + ImportJSF12ProjectFromJBDS4x.PROJECT_TO_IMPORT_NAME; + new SWTBotImportWizard().open(OtherJSFProject.LABEL); + bot.textWithLabel(OtherJSFProject.TEXT_WEBXML_LOCATION) + .setText(projectToImportLocation + + File.separator + "WebContent" + + File.separator + "WEB-INF" + + File.separator + "web.xml"); + bot.button(IDELabel.Button.NEXT).click(); + SWTBotCheckBox chbServerRuntime = bot.checkBox(1); + if (chbServerRuntime.isChecked()){ + chbServerRuntime.deselect(); + } + bot.button(IDELabel.Button.FINISH).click(); + util.waitForAll(Timing.time10S()); + // wait till Building workspace job is started + util.waitForNonIgnoredJobs(Timing.time60S()); + // check if project is present within package explorer + assertTrue("Imported project " + ImportJSF12ProjectFromJBDS4x.PROJECT_TO_IMPORT_NAME + " is not present in Packag Explorer", + eclipse.isProjectInPackageExplorer(PROJECT_TO_IMPORT_NAME)); + SWTBotTreeItem[] errors = ProblemsView.getFilteredErrorsTreeItems(botExt, + null, + File.separator + ImportJSF12ProjectFromJBDS4x.PROJECT_TO_IMPORT_NAME, + null, + null); + // check if imported project has no errors and no warnings + assertTrue("There were these errors when importing " + + ImportJSF12ProjectFromJBDS4x.PROJECT_TO_IMPORT_NAME + + " project" + + SWTEclipseExt.getFormattedTreeNodesText(errors), + errors == null || errors.length == 0); + SWTBotTreeItem[] warnings = ProblemsView.getFilteredErrorsTreeItems(botExt, + null, + File.separator + ImportJSF12ProjectFromJBDS4x.PROJECT_TO_IMPORT_NAME, + null, + null); + assertTrue("There were these warnings when importing " + + ImportJSF12ProjectFromJBDS4x.PROJECT_TO_IMPORT_NAME + + " project" + + SWTEclipseExt.getFormattedTreeNodesText(warnings), + errors == null || errors.length == 0); + }catch (IOException ioe){ + throw new RuntimeException("Unable to copy and unzip necessary files from plugin's resources directory",ioe); + }catch (Exception e){ + throw new RuntimeException(e); + } + } + + @Override + public void tearDown() throws Exception { + if (eclipse.isProjectInPackageExplorer(PROJECT_TO_IMPORT_NAME)){ + packageExplorer.deleteProject(ImportJSF12ProjectFromJBDS4x.PROJECT_TO_IMPORT_NAME, true); + } + super.tearDown(); + } + + @Override + protected void closeUnuseDialogs() { + // not used + } + + @Override + protected boolean isUnuseDialogOpened() { + return false; + } + +} Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/compatibility/ImportJSF12ProjectFromJBDS4x.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/gen/ActionItem.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/gen/ActionItem.java 2012-04-18 03:25:49 UTC (rev 40264) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/gen/ActionItem.java 2012-04-18 07:06:04 UTC (rev 40265) @@ -6618,7 +6618,7 @@ /** * text field labeled 'web.xml Location*' */ - public static final String TEXT_WEBXML_LOCATION = "web.xml Location*"; + public static final String TEXT_WEBXML_LOCATION = "web.xml Location:*"; /** * text field labeled 'Project Name*' */