Author: psrna Date: 2011-08-09 04:44:16 -0400 (Tue, 09 Aug 2011) New Revision: 33712 Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/.classpath trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/.project trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/META-INF/MANIFEST.MF trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/org.jboss.tools.bpel.ui.bot.test.properties trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/ActivityModelingTest.java trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/AssignActivityTest.java trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/OdeDeployTest.java trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/WizardTest.java trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/assertion/BPELValidator.java trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/suite/BPELTest.java trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/wizard/NewWizardTest.java Log: bpel bot test fixes Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/.classpath =================================================================== --- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/.classpath 2011-08-09 01:50:39 UTC (rev 33711) +++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/.classpath 2011-08-09 08:44:16 UTC (rev 33712) @@ -1,7 +1,8 @@ -<?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/JavaSE-1.6"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="src"/> - <classpathentry kind="output" path="bin"/> -</classpath> +<?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/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="src"/> + <classpathentry kind="lib" path="/home/psrna/data/testing/bin/5.0.0.M2/studio/plugins/org.hamcrest.core_1.1.0.v20090501071000"/> + <classpathentry kind="output" path="bin"/> +</classpath> Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/.project =================================================================== --- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/.project 2011-08-09 01:50:39 UTC (rev 33711) +++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/.project 2011-08-09 08:44:16 UTC (rev 33712) @@ -31,4 +31,11 @@ <nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> </natures> + <linkedResources> + <link> + <name>lib-org.hamcrest.core_1.1.0.v20090501071000</name> + <type>2</type> + <location>/home/psrna/data/testing/bin/5.0.0.M2/studio/plugins/org.hamcrest.core_1.1.0.v20090501071000</location> + </link> + </linkedResources> </projectDescription> Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/META-INF/MANIFEST.MF =================================================================== --- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/META-INF/MANIFEST.MF 2011-08-09 01:50:39 UTC (rev 33711) +++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/META-INF/MANIFEST.MF 2011-08-09 08:44:16 UTC (rev 33712) @@ -12,8 +12,8 @@ org.junit, org.eclipse.core.resources, org.apache.log4j;bundle-version="1.2.15", - org.eclipse.bpel.model;bundle-version="0.6.0", - org.eclipse.gef;bundle-version="3.6.2", + org.eclipse.bpel.model;bundle-version="0.4.0", + org.eclipse.gef;bundle-version="3.6.1", org.eclipse.wst.wsdl;bundle-version="1.2.103", org.eclipse.emf.ecore;bundle-version="2.6.1", org.jboss.tools.ui.bot.ext;bundle-version="3.2.0", Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/org.jboss.tools.bpel.ui.bot.test.properties =================================================================== --- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/org.jboss.tools.bpel.ui.bot.test.properties 2011-08-09 01:50:39 UTC (rev 33711) +++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/org.jboss.tools.bpel.ui.bot.test.properties 2011-08-09 08:44:16 UTC (rev 33712) @@ -5,7 +5,7 @@ #EAP|JBOSS_AS|EPP|SOA,<server version>,<jre version to run with>|default,<server home> # note : when server is type of SOA, version is version of SOA (not the bundled EAP) #SERVER=JBOSS_AS,5.0,1.6,/home/psrna/data/jboss/jboss/jboss-as -SERVER=SOA,5.1,1.6,/home/psrna/data/jboss/soa-5.1.0/jboss-as +SERVER=SOA,5.1,1.6,/home/psrna/data/jboss/soa-5.2/jboss-as #<seam version>,<seam runtime home> #SEAM=2.2,/home/psrna/data/jboss/soa-5.1.0.ER6-eds/seam #<esb versoin>,<esb runtime home> Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/ActivityModelingTest.java =================================================================== --- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/ActivityModelingTest.java 2011-08-09 01:50:39 UTC (rev 33711) +++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/ActivityModelingTest.java 2011-08-09 08:44:16 UTC (rev 33712) @@ -21,7 +21,7 @@ import org.junit.Before; import org.junit.Test; -@SWTBotTestRequires(clearProjects = true, /*server = @Server(type = ServerType.SOA, state = ServerState.Present),*/ perspective="BPEL Perspective") +@SWTBotTestRequires(clearProjects = true, /*server = @Server(type = ServerType.SOA, state = ServerState.Present),*/ perspective="BPEL") public class ActivityModelingTest extends BPELTest { static final String BUNDLE = "org.jboss.tools.bpel.ui.bot.test"; Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/AssignActivityTest.java =================================================================== --- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/AssignActivityTest.java 2011-08-09 01:50:39 UTC (rev 33711) +++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/AssignActivityTest.java 2011-08-09 08:44:16 UTC (rev 33712) @@ -31,7 +31,7 @@ import org.junit.Before; import org.junit.Test; -@SWTBotTestRequires(clearProjects = true, server = @Server(type = ServerType.SOA, state = ServerState.Running), perspective="BPEL Perspective") +@SWTBotTestRequires(clearProjects = true, server = @Server(type = ServerType.SOA, state = ServerState.Running), perspective="BPEL") public class AssignActivityTest extends BPELTest { static String BUNDLE = "org.jboss.tools.bpel.ui.bot.test"; @@ -155,13 +155,7 @@ Assert.assertFalse(console.getConsoleText().contains("[ASSIGN] Assignment Fault:")); Assert.assertEquals("Fixed Expression", response); */ - log.info("############## START SLEEPING ################"); - bot.sleep(TIME_20S); - bot.sleep(TIME_20S); - bot.sleep(TIME_20S); - bot.sleep(TIME_20S); - bot.sleep(TIME_20S); - bot.sleep(TIME_20S); + } void openFile(String projectName, String... path) throws Exception { Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/OdeDeployTest.java =================================================================== --- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/OdeDeployTest.java 2011-08-09 01:50:39 UTC (rev 33711) +++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/OdeDeployTest.java 2011-08-09 08:44:16 UTC (rev 33712) @@ -26,7 +26,7 @@ * @author psrna * */ -@SWTBotTestRequires(server = @Server(type = ServerType.SOA, state = ServerState.Running), perspective="BPEL Perspective") +@SWTBotTestRequires(server = @Server(type = ServerType.SOA, state = ServerState.Running), perspective="BPEL") public class OdeDeployTest extends BPELTest { final static String BUNDLE = "org.jboss.tools.bpel.ui.bot.test"; @@ -59,6 +59,7 @@ bot.viewByTitle("Servers").setFocus(); SWTBotTree tree = bot.viewByTitle("Servers").bot().tree(); + bot.sleep(TIME_5S); SWTBotTreeItem server = tree.getTreeItem(serverName + " [Started, Synchronized]").select(); ContextMenuHelper.prepareTreeItemForContextMenu(tree, server); @@ -117,10 +118,21 @@ @Test public void deployProjectTest() throws Exception { + bot.sleep(TIME_20S); + bot.sleep(TIME_20S); + bot.sleep(TIME_20S); + bot.sleep(TIME_20S); + bot.sleep(TIME_20S); + bot.sleep(TIME_20S); + bot.sleep(TIME_20S); + bot.sleep(TIME_20S); + bot.sleep(TIME_20S); + + String serverName = OdeDeployTest.configuredState.getServer().name; // Publish the process projExplorer.runOnServer("say_hello"); - bot.sleep(TIME_5S); + Assert.assertFalse(console.getConsoleText().contains("DEPLOYMENTS IN ERROR:")); bot.viewByTitle("Servers").show(); Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/WizardTest.java =================================================================== --- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/WizardTest.java 2011-08-09 01:50:39 UTC (rev 33711) +++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/WizardTest.java 2011-08-09 08:44:16 UTC (rev 33712) @@ -20,7 +20,7 @@ import org.junit.Assert; import org.junit.Test; -@SWTBotTestRequires(clearProjects = true, server = @Server(type = ServerType.SOA, state = ServerState.Present), perspective="BPEL Perspective") +@SWTBotTestRequires(clearProjects = true, server = @Server(type = ServerType.SOA, state = ServerState.Present), perspective="BPEL") public class WizardTest extends BPELTest { @@ -120,6 +120,7 @@ SWTBotShell shell = bot.shell("Properties for " + projectName).activate(); bot.tree().select("Targeted Runtimes"); + bot.checkBox("Show &all runtimes").select(); boolean hasRuntime = bot.table().containsItem(configuredState.getServer().name); shell.close(); Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/assertion/BPELValidator.java =================================================================== --- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/assertion/BPELValidator.java 2011-08-09 01:50:39 UTC (rev 33711) +++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/assertion/BPELValidator.java 2011-08-09 08:44:16 UTC (rev 33712) @@ -12,6 +12,7 @@ import org.eclipse.bpel.model.impl.ElseImpl; import org.eclipse.bpel.model.impl.EmptyImpl; import org.eclipse.bpel.model.impl.ExitImpl; +import org.eclipse.wst.wsdl.internal.impl.ExtensibleElementImpl; import org.eclipse.bpel.model.impl.FaultHandlerImpl; import org.eclipse.bpel.model.impl.FlowImpl; import org.eclipse.bpel.model.impl.ForEachImpl; @@ -30,7 +31,6 @@ import org.eclipse.bpel.model.impl.ValidateImpl; import org.eclipse.bpel.model.impl.WaitImpl; import org.eclipse.bpel.model.impl.WhileImpl; -import org.eclipse.wst.wsdl.internal.impl.ExtensibleElementImpl; import org.junit.Assert; Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/suite/BPELTest.java =================================================================== --- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/suite/BPELTest.java 2011-08-09 01:50:39 UTC (rev 33711) +++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/suite/BPELTest.java 2011-08-09 08:44:16 UTC (rev 33712) @@ -55,7 +55,8 @@ bot.shell("New").activate(); SWTBotTree tree = bot.tree(); - tree.expandNode("BPEL 2.0").expandNode("New BPEL Process File").select(); + tree.expandNode("BPEL 2.0").expandNode("BPEL Process File").select(); + //tree.expandNode("BPEL 2.0").expandNode("New BPEL Process File").select(); assertTrue(bot.button("Next >").isEnabled()); bot.button("Next >").click(); @@ -108,7 +109,8 @@ bot.shell("New").activate(); SWTBotTree tree = bot.tree(); - tree.expandNode("BPEL 2.0").expandNode("Apache ODE Deployment Descriptor").select(); + tree.expandNode("BPEL 2.0").expandNode("BPEL Deployment Descriptor").select(); + //tree.expandNode("BPEL 2.0").expandNode("Apache ODE Deployment Descriptor").select(); assertTrue(bot.button("Next >").isEnabled()); bot.button("Next >").click(); Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/wizard/NewWizardTest.java =================================================================== --- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/wizard/NewWizardTest.java 2011-08-09 01:50:39 UTC (rev 33711) +++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/wizard/NewWizardTest.java 2011-08-09 08:44:16 UTC (rev 33712) @@ -30,7 +30,8 @@ bot.menu("File").menu("New").menu("Other...").click(); bot.shell("New").activate(); SWTBotTree tree = bot.tree(); - tree.expandNode("BPEL 2.0").expandNode("New BPEL Process File").select(); + tree.expandNode("BPEL 2.0").expandNode("BPEL Process File").select(); + //tree.expandNode("BPEL 2.0").expandNode("New BPEL Process File").select(); assertTrue(bot.button("Next >").isEnabled()); bot.button("Next >").click(); @@ -60,7 +61,7 @@ tree.expandNode("BPEL 2.0").expandNode("BPEL Project").select(); assertTrue(bot.button("Next >").isEnabled()); bot.button("Next >").click(); - bot.shell("New BPEL Project").activate(); + bot.shell("BPEL Project").activate(); assertFalse(bot.button("Finish").isEnabled()); bot.textWithLabel("Project name:").setText("A");