Author: fbricon Date: 2011-07-20 15:36:21 -0400 (Wed, 20 Jul 2011) New Revision: 33079 Added: trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/plugin_customization.ini trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar/ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar/pom.xml trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/AbstractMavenSWTBotTest.java trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/MavenProfileSelectionTest.java Modified: trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/META-INF/MANIFEST.MF trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/Activator.java trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/CreateMavenizedSeamProjectTest.java trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/MavenAllBotTests.java Log: JBIDE-8969 : tried (and failed) to add UI tests for the profile selection; Added dependency to m2e test framework in the process, to improve the "waiting workspace jobs to finish working" flow and allow us to import existing maven projects. Property changes on: trunk/maven/tests/org.jboss.tools.maven.ui.bot.test ___________________________________________________________________ Modified: svn:ignore - target buildlog.latest.txt bin build + target buildlog.latest.txt bin build screenshots Modified: trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/META-INF/MANIFEST.MF =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/META-INF/MANIFEST.MF 2011-07-20 19:06:13 UTC (rev 33078) +++ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/META-INF/MANIFEST.MF 2011-07-20 19:36:21 UTC (rev 33079) @@ -37,7 +37,8 @@ org.eclipse.jst.jee.ui, org.eclipse.jst.jee.web, org.eclipse.m2e.lifecyclemapping.defaults;bundle-version="[1.0,1.1)", - org.eclipse.m2e.launching;bundle-version="[1.0,1.1)" + org.eclipse.m2e.launching;bundle-version="[1.0,1.1)", + org.eclipse.m2e.tests.common;bundle-version="[1.0.0,1.1.0)" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Eclipse-RegisterBuddy: org.apache.log4j Added: trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/plugin_customization.ini =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/plugin_customization.ini (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/plugin_customization.ini 2011-07-20 19:36:21 UTC (rev 33079) @@ -0,0 +1 @@ +org.eclipse.m2e.core/eclipse.m2.updateIndexes=false \ No newline at end of file Added: trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar/pom.xml =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar/pom.xml (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar/pom.xml 2011-07-20 19:36:21 UTC (rev 33079) @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.tools.maven.tests</groupId> + <artifactId>simple-jar</artifactId> + <version>1.0.0-SNAPSHOT</version> + <profiles> + <profile> + <id>active-profile</id> + <activation><activeByDefault>true</activeByDefault></activation> + </profile> + <profile> + <id>inactive-profile</id> + </profile> + </profiles> +</project> + Added: trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/AbstractMavenSWTBotTest.java =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/AbstractMavenSWTBotTest.java (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/AbstractMavenSWTBotTest.java 2011-07-20 19:36:21 UTC (rev 33079) @@ -0,0 +1,141 @@ +/************************************************************************************* + * Copyright (c) 2008-2011 Red Hat, Inc. and others. + * All rights reserved. This program and the accompanying materials + * are 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 + * + * Contributors: + * JBoss by Red Hat - Initial implementation. + ************************************************************************************/ +package org.jboss.tools.maven.ui.bot.test; + +import java.util.List; + +import org.eclipse.core.runtime.CoreException; +import org.eclipse.m2e.tests.common.AbstractMavenProjectTestCase; +import org.eclipse.m2e.tests.common.JobHelpers; +import org.eclipse.m2e.tests.common.WorkspaceHelpers; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot; +import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor; +import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView; +import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException; +import org.eclipse.swtbot.swt.finder.finders.UIThreadRunnable; +import org.eclipse.swtbot.swt.finder.junit.SWTBotJunit4ClassRunner; +import org.eclipse.swtbot.swt.finder.results.Result; +import org.eclipse.swtbot.swt.finder.results.VoidResult; +import org.eclipse.swtbot.swt.finder.utils.SWTBotPreferences; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell; +import org.eclipse.ui.IWorkbenchPreferenceConstants; +import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.internal.IPreferenceConstants; +import org.eclipse.ui.internal.WorkbenchPlugin; +import org.eclipse.ui.internal.util.PrefUtil; +import org.eclipse.wst.validation.ValidationFramework; +import org.jboss.tools.test.util.ResourcesUtils; +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.runner.RunWith; + +(a)RunWith(SWTBotJunit4ClassRunner.class) +public abstract class AbstractMavenSWTBotTest extends AbstractMavenProjectTestCase { + + public static final String PACKAGE_EXPLORER = "Package Explorer"; //$NON-NLS-1$ + + protected static SWTWorkbenchBot bot; + + @BeforeClass + public static void beforeClass() throws Exception { + bot = initSWTBot(); + WorkbenchPlugin.getDefault().getPreferenceStore() + .setValue(IPreferenceConstants.RUN_IN_BACKGROUND, true); + + PrefUtil.getAPIPreferenceStore().setValue( + IWorkbenchPreferenceConstants.ENABLE_ANIMATIONS, false); + + } + + public static SWTWorkbenchBot initSWTBot() throws CoreException { + SWTWorkbenchBot swtbot = new SWTWorkbenchBot(); + SWTBotPreferences.KEYBOARD_LAYOUT = "EN_US"; + SWTBotPreferences.TIMEOUT = 1000; + SWTBotPreferences.PLAYBACK_DELAY = 5; + waitForIdle(); + try { + SWTBotView view = swtbot.viewByTitle("Welcome"); + if (view != null) { + view.close(); + } + } catch (WidgetNotFoundException ignore) { + } + + SWTBotShell[] shells = swtbot.shells(); + for (SWTBotShell shell : shells) { + final Shell widget = shell.widget; + Object parent = UIThreadRunnable.syncExec(shell.display, + new Result<Object>() { + public Object run() { + return widget.isDisposed() ? null : widget.getParent(); + } + }); + if (parent == null) { + continue; + } + shell.close(); + } + + List<? extends SWTBotEditor> editors = swtbot.editors(); + for (SWTBotEditor e : editors) { + e.close(); + } + + return swtbot; + } + + @Before + public void setUp() throws Exception { + activateSchell(); + super.setUp(); + } + + public static void activateSchell() { + UIThreadRunnable.syncExec(new VoidResult() { + public void run() { + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell() + .forceActive(); + } + }); + } + + @After + public void tearDown() throws Exception { + + } + + @AfterClass + public final static void cleanUp() throws Exception { + boolean buildAutomatically = ResourcesUtils.setBuildAutomatically(false); + ValidationFramework.getDefault().suspendAllValidation(true); + try { + executeAfterClass(); + WorkspaceHelpers.cleanWorkspace(); + } finally { + ResourcesUtils.setBuildAutomatically(buildAutomatically); + ValidationFramework.getDefault().suspendAllValidation(false); + } + waitForIdle(); + } + + protected static void executeAfterClass() throws Exception { + } + + + public static void waitForIdle() { + JobHelpers.waitForLaunchesToComplete(30*1000); + JobHelpers.waitForJobsToComplete(); + } + +} Modified: trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/Activator.java =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/Activator.java 2011-07-20 19:06:13 UTC (rev 33078) +++ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/Activator.java 2011-07-20 19:36:21 UTC (rev 33079) @@ -1,3 +1,13 @@ +/************************************************************************************* + * Copyright (c) 2008-2011 Red Hat, Inc. and others. + * All rights reserved. This program and the accompanying materials + * are 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 + * + * Contributors: + * JBoss by Red Hat - Initial implementation. + ************************************************************************************/ package org.jboss.tools.maven.ui.bot.test; import org.eclipse.ui.plugin.AbstractUIPlugin; Modified: trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/CreateMavenizedSeamProjectTest.java =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/CreateMavenizedSeamProjectTest.java 2011-07-20 19:06:13 UTC (rev 33078) +++ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/CreateMavenizedSeamProjectTest.java 2011-07-20 19:36:21 UTC (rev 33079) @@ -11,6 +11,7 @@ package org.jboss.tools.maven.ui.bot.test; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -21,6 +22,7 @@ import java.util.List; import java.util.Properties; +import org.eclipse.core.resources.IFolder; import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; @@ -45,7 +47,12 @@ import org.eclipse.datatools.connectivity.drivers.IPropertySet; import org.eclipse.datatools.connectivity.drivers.PropertySetImpl; import org.eclipse.datatools.connectivity.drivers.models.TemplateDescriptor; +import org.eclipse.jface.bindings.keys.KeyStroke; +import org.eclipse.jface.bindings.keys.ParseException; import org.eclipse.m2e.core.internal.IMavenConstants; +import org.eclipse.m2e.tests.common.AbstractMavenProjectTestCase; +import org.eclipse.m2e.tests.common.JobHelpers; +import org.eclipse.m2e.tests.common.WorkspaceHelpers; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Event; @@ -57,6 +64,7 @@ import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException; import org.eclipse.swtbot.swt.finder.finders.UIThreadRunnable; import org.eclipse.swtbot.swt.finder.junit.SWTBotJunit4ClassRunner; +import org.eclipse.swtbot.swt.finder.keyboard.Keystrokes; import org.eclipse.swtbot.swt.finder.results.Result; import org.eclipse.swtbot.swt.finder.results.VoidResult; import org.eclipse.swtbot.swt.finder.utils.SWTBotPreferences; @@ -103,7 +111,7 @@ @RunWith(SWTBotJunit4ClassRunner.class) public class CreateMavenizedSeamProjectTest { - protected static final long IDLE_TIME = 20 * 60 * 1000L; + protected static final long IDLE_TIME = 1 * 60 * 1000L; private static final String CONNECTION_PROFILE_NAME = "DefaultDS"; @@ -169,7 +177,7 @@ @BeforeClass public final static void beforeClass() throws Exception { - initSWTBot(); + bot = AbstractMavenSWTBotTest.initSWTBot(); switchPerspective("org.jboss.tools.seam.ui.SeamPerspective"); @@ -192,61 +200,12 @@ createNewSeamWebProjectWizard(PROJECT_NAME_WAR, DEPLOY_TYPE_WAR); } - private static void initSWTBot() throws CoreException { - bot = new SWTWorkbenchBot(); - SWTBotPreferences.KEYBOARD_LAYOUT = "EN_US"; - SWTBotPreferences.TIMEOUT = 1000; - SWTBotPreferences.PLAYBACK_DELAY = 5; - waitForIdle(); - try { - SWTBotView view = bot.viewByTitle("Welcome"); - if (view != null) { - view.close(); - } - } catch (WidgetNotFoundException ignore) { - } - SWTBotShell[] shells = bot.shells(); - for (SWTBotShell shell : shells) { - final Shell widget = shell.widget; - Object parent = UIThreadRunnable.syncExec(shell.display, - new Result<Object>() { - public Object run() { - return widget.isDisposed() ? null : widget.getParent(); - } - }); - if (parent == null) { - continue; - } - shell.close(); - } - List<? extends SWTBotEditor> editors = bot.editors(); - for (SWTBotEditor e : editors) { - e.close(); - } - - removeProjects(); - - WorkbenchPlugin.getDefault().getPreferenceStore() - .setValue(IPreferenceConstants.RUN_IN_BACKGROUND, true); - - PrefUtil.getAPIPreferenceStore().setValue( - IWorkbenchPreferenceConstants.ENABLE_ANIMATIONS, false); + private static void removeProjects() throws Exception { + WorkspaceHelpers.cleanWorkspace(); } - private static void removeProjects() throws CoreException { - final IWorkspace workspace = ResourcesPlugin.getWorkspace(); - workspace.run(new IWorkspaceRunnable() { - public void run(IProgressMonitor monitor) throws CoreException { - IProject[] projects = workspace.getRoot().getProjects(); - for (int i = 0; i < projects.length; i++) { - projects[i].delete(true, true, monitor); - } - } - }, new NullProgressMonitor()); - } - private static void removeServers() throws CoreException { IServer server = ServerCore.findServer(JBOSS_AS_SERVER_NAME); IServerWorkingCopy wc = server.createWorkingCopy(); @@ -282,12 +241,7 @@ } private static void activateSchell() { - UIThreadRunnable.syncExec(new VoidResult() { - public void run() { - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell() - .forceActive(); - } - }); + AbstractMavenSWTBotTest.activateSchell(); } @After @@ -509,7 +463,6 @@ bot.button("Finish").click(); waitForIdle(); - } @Test @@ -588,36 +541,24 @@ bot.textWithLabel("Goals:").setText("clean package"); bot.button("Run").click(); - waitForIdle(); IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(PROJECT_NAME_WAR); - project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor()); - IPath webInfPath = new Path("target/" + PROJECT_NAME_WAR + "-0.0.1-SNAPSHOT/WEB-INF"); - assertFalse(project.getFolder(webInfPath.append("src")).exists()); - assertFalse(project.getFolder(webInfPath.append("dev")).exists()); - assertTrue(project.getFolder(webInfPath.append("lib")).exists()); + project.getFolder("target").refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor()); + + IFolder warFolder = project.getFolder("target/" + PROJECT_NAME_WAR + "-0.0.1-SNAPSHOT"); + + assertTrue(warFolder +" is missing ", warFolder.exists()); + IPath webInfPath = new Path("WEB-INF"); + assertFalse(warFolder.getFolder(webInfPath.append("src")).exists()); + assertFalse(warFolder.getFolder(webInfPath.append("dev")).exists()); + assertTrue(warFolder.getFolder(webInfPath.append("lib")).exists()); + } private static void waitForIdle() { - long start = System.currentTimeMillis(); - int delay = 50; - while (!Job.getJobManager().isIdle()) { - delay(delay); - if ((System.currentTimeMillis() - start) > IDLE_TIME) { - Job[] jobs = Job.getJobManager().find(null); - StringBuffer str = new StringBuffer(); - for (Job job : jobs) { - if (job.getThread() != null) { - str.append("\n").append(job.getName()).append(" (") - .append(job.getClass()).append(")"); - } - } - throw new RuntimeException( - "Long running tasks detected:" + str.toString()); //$NON-NLS-1$ - } - } + AbstractMavenSWTBotTest.waitForIdle(); } public static void delay(long waitTimeMillis) { @@ -640,6 +581,7 @@ } } + // see https://jira.jboss.org/browse/JBIDE-6767 @Test public void testLibraries() throws Exception { Modified: trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/MavenAllBotTests.java =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/MavenAllBotTests.java 2011-07-20 19:06:13 UTC (rev 33078) +++ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/MavenAllBotTests.java 2011-07-20 19:36:21 UTC (rev 33079) @@ -1,3 +1,13 @@ +/************************************************************************************* + * Copyright (c) 2008-2011 Red Hat, Inc. and others. + * All rights reserved. This program and the accompanying materials + * are 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 + * + * Contributors: + * JBoss by Red Hat - Initial implementation. + ************************************************************************************/ package org.jboss.tools.maven.ui.bot.test; import org.junit.runner.RunWith; @@ -10,9 +20,11 @@ */ @Suite.SuiteClasses({ + //MavenProfileSelectionTest.class, FIXME enable tests for profiles CreateMavenizedSeamProjectTest.class, }) @RunWith(Suite.class) public class MavenAllBotTests { + } \ No newline at end of file Added: trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/MavenProfileSelectionTest.java =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/MavenProfileSelectionTest.java (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/MavenProfileSelectionTest.java 2011-07-20 19:36:21 UTC (rev 33079) @@ -0,0 +1,56 @@ +/************************************************************************************* + * Copyright (c) 2008-2011 Red Hat, Inc. and others. + * All rights reserved. This program and the accompanying materials + * are 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 + * + * Contributors: + * JBoss by Red Hat - Initial implementation. + ************************************************************************************/ +package org.jboss.tools.maven.ui.bot.test; + +import org.eclipse.core.resources.IProject; +import org.eclipse.jface.bindings.keys.KeyStroke; +import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView; +import org.eclipse.swtbot.swt.finder.SWTBot; +import org.eclipse.swtbot.swt.finder.junit.SWTBotJunit4ClassRunner; +import org.eclipse.swtbot.swt.finder.keyboard.Keystrokes; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; +import org.junit.Test; +import org.junit.runner.RunWith; + +@SuppressWarnings("restriction") +(a)RunWith(SWTBotJunit4ClassRunner.class) +public class MavenProfileSelectionTest extends AbstractMavenSWTBotTest { + + @Test + //FIXME Test fail due to Modal Dialog. Need to find a solution + public void testOpenMavenProfiles() throws Exception { + + IProject project = importProject("projects/simple-jar/pom.xml"); + waitForJobsToComplete(); + //Select the project + final SWTBotView packageExplorer = bot.viewByTitle(PACKAGE_EXPLORER); + SWTBot innerBot = packageExplorer.bot(); + innerBot.activeShell().activate(); + final SWTBotTree tree = innerBot.tree(); + final SWTBotTreeItem projectItem = tree.getTreeItem(project.getName()); + projectItem.select(); + //Open the profiles dialog + projectItem.pressShortcut(Keystrokes.CTRL, Keystrokes.ALT, KeyStroke.getInstance("P")); + + //FIXME Either the dialog doesn't open abd the test fails + //or SWTBot is blocked by the modal dialog + final SWTBotShell selectDialogShell = bot.shell("Select Maven profiles"); + assertNotNull("selectDialogShell not found", selectDialogShell); + assertEquals("Select Maven profiles", selectDialogShell.getText()); + + selectDialogShell.activate(); + Thread.sleep(5000); + //TODO implement real tests + bot.button("Cancel").click(); + } +}