Author: jlukas(a)redhat.com Date: 2010-11-10 05:00:09 -0500 (Wed, 10 Nov 2010) New Revision: 26402 Added: trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/StrutsAllBotTests.launch Modified: trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/.classpath trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/META-INF/MANIFEST.MF trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/tutorial/TutorialTest.java trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/utils/StrutsUIEditorBot.java Log: minor updates realted to swtbot 2.0.1 Modified: trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/.classpath =================================================================== --- trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/.classpath 2010-11-10 07:27:01 UTC (rev 26401) +++ trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/.classpath 2010-11-10 10:00:09 UTC (rev 26402) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> Modified: trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/META-INF/MANIFEST.MF =================================================================== --- trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/META-INF/MANIFEST.MF 2010-11-10 07:27:01 UTC (rev 26401) +++ trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/META-INF/MANIFEST.MF 2010-11-10 10:00:09 UTC (rev 26402) @@ -19,8 +19,7 @@ org.jboss.tools.struts.ui;bundle-version="3.1.0", org.jboss.tools.jst.ui.bot.test;bundle-version="1.0.0", org.jboss.tools.ui.bot.ext;bundle-version="1.0.0", - org.junit4;bundle-version="4.5.0", - org.eclipse.ui.browser;bundle-version="3.3.0" + org.junit4;bundle-version="4.5.0" Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-Vendor: JBoss by Red Hat Added: trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/StrutsAllBotTests.launch =================================================================== --- trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/StrutsAllBotTests.launch (rev 0) +++ trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/StrutsAllBotTests.launch 2010-11-10 10:00:09 UTC (rev 26402) @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<launchConfiguration type="org.eclipse.swtbot.eclipse.ui.launcher.JunitLaunchConfig"> +<booleanAttribute key="append.args" value="true"/> +<booleanAttribute key="askclear" value="false"/> +<booleanAttribute key="automaticAdd" value="true"/> +<booleanAttribute key="automaticValidate" value="false"/> +<stringAttribute key="bootstrap" value=""/> +<stringAttribute key="checked" value="[NONE]"/> +<booleanAttribute key="clearConfig" value="true"/> +<booleanAttribute key="clearws" value="true"/> +<booleanAttribute key="clearwslog" value="false"/> +<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/> +<booleanAttribute key="default" value="true"/> +<booleanAttribute key="includeOptional" value="true"/> +<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> +<listEntry value="/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/StrutsAllBotTests.java"/> +</listAttribute> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> +<listEntry value="1"/> +</listAttribute> +<mapAttribute key="org.eclipse.debug.core.environmentVariables"> +<mapEntry key="DISPLAY" value=":1"/> +</mapAttribute> +<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/> +<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/> +<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/> +<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/> +<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jboss.tools.struts.ui.bot.test.StrutsAllBotTests"/> +<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/> +<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.jboss.tools.struts.ui.bot.test"/> +<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> +<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -XX:MaxPermSize=256m -Xms256m -Xmx512m -Dswtbot.test.properties.file=${env_var:HOME}/swtbot.properties -Dusage_reporting_enabled=false"/> +<stringAttribute key="pde.version" value="3.3"/> +<stringAttribute key="product" value="org.eclipse.platform.ide"/> +<booleanAttribute key="show_selected_only" value="false"/> +<stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/> +<booleanAttribute key="tracing" value="false"/> +<booleanAttribute key="useCustomFeatures" value="false"/> +<booleanAttribute key="useDefaultConfig" value="true"/> +<booleanAttribute key="useDefaultConfigArea" value="false"/> +<booleanAttribute key="useProduct" value="true"/> +</launchConfiguration> Modified: trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/tutorial/TutorialTest.java =================================================================== --- trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/tutorial/TutorialTest.java 2010-11-10 07:27:01 UTC (rev 26401) +++ trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/tutorial/TutorialTest.java 2010-11-10 10:00:09 UTC (rev 26402) @@ -160,9 +160,11 @@ s.select(); w1 = s.widget; DndSupport.dnd((TreeItem) w1, (FigureCanvas) c); + bot.sleep(500); ge.clickContextMenu("Auto-Layout"); SWTBotShell sh = bot.activeShell(); sh.bot().button("OK").click(); + bot.sleep(500); //2.2.2. Creating an Action Mappings new SWTBotGefContextMenu(c, "Action...").click(); @@ -177,15 +179,20 @@ ge.activateTool("Create New Connection"); SWTBotGefEditPart part = ge.mainEditPart(); part.descendants(new PartMatcher("inputname.jsp")).get(0).click(); + bot.sleep(500); part.descendants(new PartMatcher("GetNameForm")).get(0).click(); + bot.sleep(500); //2.2.4. Creating a Forward ge.activateTool("Create New Connection"); part.descendants(new PartMatcher("GetNameForm")).get(0).click(); + bot.sleep(500); part.descendants(new PartMatcher("greeting.jsp")).get(0).click(); + bot.sleep(500); ge.clickContextMenu("Auto-Layout"); sh = bot.activeShell(); sh.bot().button("OK").click(); + bot.sleep(500); botEditor.save(); ge.selectPage("Tree"); Modified: trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/utils/StrutsUIEditorBot.java =================================================================== --- trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/utils/StrutsUIEditorBot.java 2010-11-10 07:27:01 UTC (rev 26401) +++ trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/utils/StrutsUIEditorBot.java 2010-11-10 10:00:09 UTC (rev 26402) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2010 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 + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ package org.jboss.tools.struts.ui.bot.test.utils; import java.lang.reflect.Field;