Author: dgolovin Date: 2009-10-09 20:23:50 -0400 (Fri, 09 Oct 2009) New Revision: 18028 Removed: trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/screenshots/ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/screenshots/ Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/META-INF/MANIFEST.MF trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/JSFAllTests.java trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/META-INF/MANIFEST.MF trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/resources/SWTBot.properties trunk/jst/tests/org.jboss.tools.jst.ui.firstrun.bot.test/META-INF/MANIFEST.MF trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/META-INF/MANIFEST.MF trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/New_configuration.launch trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/SeamTestLauncher.java trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/TestControl.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/META-INF/MANIFEST.MF Log: SWTBot support added to build Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/META-INF/MANIFEST.MF =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/META-INF/MANIFEST.MF 2009-10-09 22:13:14 UTC (rev 18027) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/META-INF/MANIFEST.MF 2009-10-10 00:23:50 UTC (rev 18028) @@ -8,13 +8,15 @@ org.eclipse.core.runtime, org.eclipse.swtbot.eclipse.core;bundle-version="2.0.0", org.eclipse.swtbot.eclipse.finder;bundle-version="2.0.0", + org.eclipse.swtbot.swt.finder;bundle-version="2.0.0", + org.apache.log4j;bundle-version="1.2.13", + org.junit4;bundle-version="4.5.0", org.eclipse.swtbot.eclipse.spy;bundle-version="2.0.0", org.eclipse.swtbot.eclipse.ui;bundle-version="2.0.0", - org.eclipse.swtbot.swt.finder;bundle-version="2.0.0", - org.apache.log4j;bundle-version="1.2.13", - org.junit4;bundle-version="4.5.0" + org.eclipse.swtbot.junit4_x;bundle-version="2.0.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Import-Package: org.jboss.tools.ui.bot.test, org.jboss.tools.vpe.ui.bot.test -Export-Package: org.jboss.tools.jsf.ui.bot.test +Export-Package: org.jboss.tools.jsf.ui.bot.test, + org.jboss.tools.jsf.ui.bot.test.cssdialog.jbide Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/JSFAllTests.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/JSFAllTests.java 2009-10-09 22:13:14 UTC (rev 18027) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/JSFAllTests.java 2009-10-10 00:23:50 UTC (rev 18028) @@ -1,23 +1,21 @@ package org.jboss.tools.jsf.ui.bot.test; -import org.eclipse.swtbot.swt.finder.SWTBotTestCase; +import junit.extensions.TestSetup; +import junit.framework.Test; +import junit.framework.TestSuite; + import org.jboss.tools.jsf.ui.bot.test.cssdialog.jbide.JBIDE3148and4441Test; import org.jboss.tools.jsf.ui.bot.test.cssdialog.jbide.JBIDE3577Test; import org.jboss.tools.jsf.ui.bot.test.cssdialog.jbide.JBIDE3579Test; import org.jboss.tools.jsf.ui.bot.test.cssdialog.jbide.JBIDE3920Test; import org.jboss.tools.jsf.ui.bot.test.cssdialog.jbide.JBIDE4391Test; -import junit.extensions.TestSetup; -import junit.framework.Test; -import junit.framework.TestSuite; - - /** * * This is a sample swtbot testcase for an eclipse application. * */ -public class JSFAllTests extends SWTBotTestCase{ +public class JSFAllTests{ public static Test suite(){ TestSuite suite = new TestSuite("CSS dialog JBIDE tests"); suite.addTestSuite(JBIDE3148and4441Test.class); @@ -25,6 +23,6 @@ suite.addTestSuite(JBIDE3577Test.class); suite.addTestSuite(JBIDE3579Test.class); suite.addTestSuite(JBIDE3920Test.class); - return new TestSetup(suite); + return suite; } } \ No newline at end of file Modified: trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/META-INF/MANIFEST.MF =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/META-INF/MANIFEST.MF 2009-10-09 22:13:14 UTC (rev 18027) +++ trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/META-INF/MANIFEST.MF 2009-10-10 00:23:50 UTC (rev 18028) @@ -2,22 +2,19 @@ Bundle-ManifestVersion: 2 Bundle-Name: Test Bundle-SymbolicName: org.jboss.tools.jst.ui.bot.test;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 1.0.0 Bundle-Activator: org.jboss.tools.ui.bot.test.Activator Require-Bundle: org.eclipse.core.runtime, - org.eclipse.swtbot.eclipse.core;bundle-version="2.0.0", org.eclipse.swtbot.eclipse.finder;bundle-version="2.0.0", - org.eclipse.swtbot.eclipse.spy;bundle-version="2.0.0", - org.eclipse.swtbot.eclipse.ui;bundle-version="2.0.0", org.eclipse.swtbot.swt.finder;bundle-version="2.0.0", - org.apache.log4j;bundle-version="1.2.13", org.hamcrest;bundle-version="1.1.0", org.jboss.tools.jst.jsp;bundle-version="2.0.0", - org.jboss.tools.common.text.ext;bundle-version="2.0.0", org.jboss.tools.jst.web;bundle-version="2.0.0", org.eclipse.ui, + org.apache.log4j;bundle-version="1.2.13", + org.jboss.tools.common.text.ext;bundle-version="2.0.0", org.eclipse.ui.ide;bundle-version="3.5.0", - org.junit;bundle-version="3.8.2" + org.junit4;bundle-version="4.5.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Export-Package: org.jboss.tools.test, Modified: trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/resources/SWTBot.properties =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/resources/SWTBot.properties 2009-10-09 22:13:14 UTC (rev 18027) +++ trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/resources/SWTBot.properties 2009-10-10 00:23:50 UTC (rev 18028) @@ -1,2 +1 @@ SWTBotPreferences.PLAYBACK_DELAY=25 -SWTBotPreferences.TIMEOUT=1000 Modified: trunk/jst/tests/org.jboss.tools.jst.ui.firstrun.bot.test/META-INF/MANIFEST.MF =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.ui.firstrun.bot.test/META-INF/MANIFEST.MF 2009-10-09 22:13:14 UTC (rev 18027) +++ trunk/jst/tests/org.jboss.tools.jst.ui.firstrun.bot.test/META-INF/MANIFEST.MF 2009-10-10 00:23:50 UTC (rev 18028) @@ -6,17 +6,13 @@ Bundle-Activator: org.jboss.tools.ui.runtime.bot.test.Activator Bundle-Vendor: %BundleVendor Require-Bundle: org.eclipse.core.runtime, - org.eclipse.core.resources, - org.jboss.tools.seam.core, org.eclipse.ui, org.eclipse.wst.server.core, org.eclipse.jdt.launching, - org.eclipse.ui.workbench, org.eclipse.datatools.connectivity;visibility:=reexport, org.eclipse.datatools.connectivity.db.generic, - org.jboss.tools.common, org.jboss.tools.jst.ui.bot.test;bundle-version="1.0.0", - org.jboss.tools.jst.firstrun;bundle-version="2.0.0" + org.eclipse.core.resources;bundle-version="3.5.0" Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin Modified: trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/META-INF/MANIFEST.MF =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/META-INF/MANIFEST.MF 2009-10-09 22:13:14 UTC (rev 18027) +++ trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/META-INF/MANIFEST.MF 2009-10-10 00:23:50 UTC (rev 18028) @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: SWTBotTests -Bundle-SymbolicName: org.jboss.tools.seam.ui.bot.test +Bundle-SymbolicName: org.jboss.tools.seam.ui.bot.test;singleton:=true Bundle-Version: 1.0.0.qualifier Bundle-Activator: org.jboss.tools.seam.ui.bot.test.Activator Require-Bundle: org.eclipse.ui, @@ -13,11 +13,7 @@ org.eclipse.swtbot.eclipse.ui;bundle-version="2.0.0", org.eclipse.swtbot.swt.finder;bundle-version="2.0.0", org.apache.log4j;bundle-version="1.2.13", - org.eclipse.swtbot.junit4_x;bundle-version="2.0.0", - org.junit4;bundle-version="4.5.0", - org.eclipse.swtbot.eclipse.junit4.headless;bundle-version="2.0.0", - org.junit;bundle-version="3.8.2" + org.junit4;bundle-version="4.5.0" Eclipse-RegisterBuddy: org.apache.log4j Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Import-Package: junit.framework Modified: trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/New_configuration.launch =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/New_configuration.launch 2009-10-09 22:13:14 UTC (rev 18027) +++ trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/New_configuration.launch 2009-10-10 00:23:50 UTC (rev 18028) @@ -27,7 +27,7 @@ <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}"/> <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.jboss.tools.seam.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="-Xms1024m -Xmx2048m"/> +<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms128m -Xmx512m -XX:MaxPermSize=256m&#10;-Djbosstools.test.jboss.home=/home/eskimo/jbdevstudio/jboss-eap/jboss-as&#10;-Djbosstools.test.seam.1.2.1.eap.home=/home/eskimo/jbdevstudio/jboss-eap/seam&#10;-Djbosstools.test.seam.2fp.eap.home=/home/eskimo/jbdevstudio/jboss-eap/seam&#10;-Djbosstools.test.seam.2.0.1.GA.home=/home/eskimo/Java/jboss-seam-2.0.1.GA&#10;-Djbosstools.test.seam.2.1.0.GA.home=/home/eskimo/Java/jboss-seam-2.1.1.GA"/> <stringAttribute key="pde.version" value="3.3"/> <stringAttribute key="product" value="org.eclipse.sdk.ide"/> <booleanAttribute key="run_in_ui_thread" value="true"/> Modified: trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/SeamTestLauncher.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/SeamTestLauncher.java 2009-10-09 22:13:14 UTC (rev 18027) +++ trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/SeamTestLauncher.java 2009-10-10 00:23:50 UTC (rev 18028) @@ -8,6 +8,7 @@ import org.jboss.tools.seam.ui.bot.test.create.CreateConversations; import org.jboss.tools.seam.ui.bot.test.create.CreateEntities; import org.jboss.tools.seam.ui.bot.test.create.DeleteSeamProjects; +import org.jboss.tools.ui.bot.test.JBTSWTBotTestCase; import junit.extensions.TestSetup; import junit.framework.Test; @@ -20,7 +21,7 @@ * This is a swtbot testcase for an eclipse application. * */ -public class SeamTestLauncher extends SWTBotTestCase{ +public class SeamTestLauncher { public static Test suite(){ TestSuite suite = new TestSuite("Seam tests"); suite.addTestSuite(CreateSeamRuntimes.class); @@ -29,7 +30,6 @@ suite.addTestSuite(CreateActions.class); suite.addTestSuite(CreateConversations.class); suite.addTestSuite(CreateEntities.class); - suite.addTestSuite(DeleteSeamProjects.class); - return new TestSetup(suite); + return suite; } } \ No newline at end of file Modified: trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/TestControl.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/TestControl.java 2009-10-09 22:13:14 UTC (rev 18027) +++ trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/TestControl.java 2009-10-10 00:23:50 UTC (rev 18028) @@ -4,11 +4,12 @@ import java.io.InputStream; import java.util.Properties; -import org.eclipse.core.runtime.Platform; import org.eclipse.swtbot.swt.finder.SWTBot; import org.eclipse.swtbot.swt.finder.waits.Conditions; import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; +import org.hamcrest.CoreMatchers; +import org.hamcrest.Matcher; import org.jboss.tools.test.TestProperties; import org.jboss.tools.ui.bot.test.JBTSWTBotTestCase; import org.jboss.tools.ui.bot.test.WidgetVariables; @@ -112,7 +113,6 @@ if (!bot.perspectiveByLabel("Seam").isActive()) { bot.perspectiveByLabel("Seam").activate(); } - } private static void substituteSystemProperties(Properties projectProperties2) { @@ -189,7 +189,7 @@ bot.radio(type).click(); bot.comboBoxWithLabel("Connection profile:").setSelection(projectProperties.getProperty("connName")); bot.button("Finish").click(); - bot.waitUntil(Conditions.shellCloses(bot.activeShell()),15000); + bot.waitUntil(Conditions.shellCloses(bot.activeShell()),30000); } /**Creates any Seam Action, Form etc. */ @@ -233,5 +233,4 @@ bot.sleep(1000); } } - } Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/META-INF/MANIFEST.MF =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/META-INF/MANIFEST.MF 2009-10-09 22:13:14 UTC (rev 18027) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/META-INF/MANIFEST.MF 2009-10-10 00:23:50 UTC (rev 18028) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: SWTBotTests Bundle-SymbolicName: org.jboss.tools.vpe.ui.bot.test -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 1.0.0 Bundle-Activator: org.jboss.tools.vpe.ui.bot.test.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime,