Author: ljelinko Date: 2012-08-29 06:27:50 -0400 (Wed, 29 Aug 2012) New Revision: 43291 Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/EAP5CompatibilitySuite.java trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/EAP6CompatibilitySuite.java Removed: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/EAPCompatibilitySuite.java Modified: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/AllTestsSuite.java Log: Merged as tests from 3.3 branch Modified: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/AllTestsSuite.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/AllTestsSuite.java 2012-08-29 10:27:37 UTC (rev 43290) +++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/AllTestsSuite.java 2012-08-29 10:27:50 UTC (rev 43291) @@ -4,18 +4,42 @@ import org.jboss.ide.eclipse.as.ui.bot.test.as3.DeployJSPProjectAS3Server; import org.jboss.ide.eclipse.as.ui.bot.test.as3.OperateAS3Server; import org.jboss.ide.eclipse.as.ui.bot.test.as3.UndeployJSPProjectAS3Server; -import org.jboss.ide.eclipse.as.ui.bot.test.as4.CreateAS4Server; -import org.jboss.ide.eclipse.as.ui.bot.test.as4.DeployJSPProjectAS4Server; -import org.jboss.ide.eclipse.as.ui.bot.test.as4.OperateAS4Server; -import org.jboss.ide.eclipse.as.ui.bot.test.as4.UndeployJSPProjectAS4Server; -import org.jboss.ide.eclipse.as.ui.bot.test.as5.CreateAS5Server; -import org.jboss.ide.eclipse.as.ui.bot.test.as5.DeployJSPProjectAS5Server; -import org.jboss.ide.eclipse.as.ui.bot.test.as5.OperateAS5Server; -import org.jboss.ide.eclipse.as.ui.bot.test.as5.UndeployJSPProjectAS5Server; +import org.jboss.ide.eclipse.as.ui.bot.test.as40.CreateAS40Server; +import org.jboss.ide.eclipse.as.ui.bot.test.as40.DeployJSPProjectAS40Server; +import org.jboss.ide.eclipse.as.ui.bot.test.as40.OperateAS40Server; +import org.jboss.ide.eclipse.as.ui.bot.test.as40.UndeployJSPProjectAS40Server; +import org.jboss.ide.eclipse.as.ui.bot.test.as42.CreateAS42Server; +import org.jboss.ide.eclipse.as.ui.bot.test.as42.DeployJSPProjectAS42Server; +import org.jboss.ide.eclipse.as.ui.bot.test.as42.OperateAS42Server; +import org.jboss.ide.eclipse.as.ui.bot.test.as42.UndeployJSPProjectAS42Server; +import org.jboss.ide.eclipse.as.ui.bot.test.as50.CreateAS50Server; +import org.jboss.ide.eclipse.as.ui.bot.test.as50.DeployJSPProjectAS50Server; +import org.jboss.ide.eclipse.as.ui.bot.test.as50.OperateAS50Server; +import org.jboss.ide.eclipse.as.ui.bot.test.as50.UndeployJSPProjectAS50Server; +import org.jboss.ide.eclipse.as.ui.bot.test.as51.CreateAS51Server; +import org.jboss.ide.eclipse.as.ui.bot.test.as51.DeployJSPProjectAS51Server; +import org.jboss.ide.eclipse.as.ui.bot.test.as51.OperateAS51Server; +import org.jboss.ide.eclipse.as.ui.bot.test.as51.UndeployJSPProjectAS51Server; import org.jboss.ide.eclipse.as.ui.bot.test.as6.CreateAS6Server; import org.jboss.ide.eclipse.as.ui.bot.test.as6.DeployJSPProjectAS6Server; import org.jboss.ide.eclipse.as.ui.bot.test.as6.OperateAS6Server; import org.jboss.ide.eclipse.as.ui.bot.test.as6.UndeployJSPProjectAS6Server; +import org.jboss.ide.eclipse.as.ui.bot.test.as70.CreateAS70Server; +import org.jboss.ide.eclipse.as.ui.bot.test.as70.DeployJSPProjectAS70Server; +import org.jboss.ide.eclipse.as.ui.bot.test.as70.OperateAS70Server; +import org.jboss.ide.eclipse.as.ui.bot.test.as70.UndeployJSPProjectAS70Server; +import org.jboss.ide.eclipse.as.ui.bot.test.as71.CreateAS71Server; +import org.jboss.ide.eclipse.as.ui.bot.test.as71.DeployJSPProjectAS71Server; +import org.jboss.ide.eclipse.as.ui.bot.test.as71.OperateAS71Server; +import org.jboss.ide.eclipse.as.ui.bot.test.as71.UndeployJSPProjectAS71Server; +import org.jboss.ide.eclipse.as.ui.bot.test.eap4.CreateEAP4Server; +import org.jboss.ide.eclipse.as.ui.bot.test.eap4.DeployJSPProjectEAP4Server; +import org.jboss.ide.eclipse.as.ui.bot.test.eap4.OperateEAP4Server; +import org.jboss.ide.eclipse.as.ui.bot.test.eap4.UndeployJSPProjectEAP4Server; +import org.jboss.ide.eclipse.as.ui.bot.test.eap5.CreateEAP5Server; +import org.jboss.ide.eclipse.as.ui.bot.test.eap5.DeployJSPProjectEAP5Server; +import org.jboss.ide.eclipse.as.ui.bot.test.eap5.OperateEAP5Server; +import org.jboss.ide.eclipse.as.ui.bot.test.eap5.UndeployJSPProjectEAP5Server; import org.jboss.ide.eclipse.as.ui.bot.test.eap6.CreateEAP6Server; import org.jboss.ide.eclipse.as.ui.bot.test.eap6.DeployJSPProjectEAP6Server; import org.jboss.ide.eclipse.as.ui.bot.test.eap6.OperateEAP6Server; @@ -28,27 +52,51 @@ @RunWith(RequirementAwareSuite.class) @Suite.SuiteClasses({ - CreateEAP6Server.class, + CreateEAP6Server.class, + CreateEAP5Server.class, + CreateEAP4Server.class, + CreateAS71Server.class, + CreateAS70Server.class, CreateAS6Server.class, - CreateAS5Server.class, - CreateAS4Server.class, + CreateAS51Server.class, + CreateAS50Server.class, + CreateAS42Server.class, + CreateAS40Server.class, CreateAS3Server.class, OperateEAP6Server.class, + OperateEAP5Server.class, + OperateEAP4Server.class, + OperateAS71Server.class, + OperateAS70Server.class, OperateAS6Server.class, - OperateAS5Server.class, - OperateAS4Server.class, + OperateAS51Server.class, + OperateAS50Server.class, + OperateAS42Server.class, OperateAS3Server.class, + OperateAS40Server.class, DeployJSPProjectEAP6Server.class, + DeployJSPProjectEAP5Server.class, + DeployJSPProjectEAP4Server.class, + DeployJSPProjectAS71Server.class, + DeployJSPProjectAS70Server.class, DeployJSPProjectAS6Server.class, - DeployJSPProjectAS5Server.class, - DeployJSPProjectAS4Server.class, + DeployJSPProjectAS51Server.class, + DeployJSPProjectAS50Server.class, + DeployJSPProjectAS42Server.class, DeployJSPProjectAS3Server.class, + DeployJSPProjectAS40Server.class, HotDeployJSPFile.class, UndeployJSPProjectEAP6Server.class, + UndeployJSPProjectEAP5Server.class, + UndeployJSPProjectEAP4Server.class, + UndeployJSPProjectAS71Server.class, + UndeployJSPProjectAS70Server.class, UndeployJSPProjectAS6Server.class, - UndeployJSPProjectAS5Server.class, - UndeployJSPProjectAS4Server.class, + UndeployJSPProjectAS51Server.class, + UndeployJSPProjectAS50Server.class, + UndeployJSPProjectAS42Server.class, UndeployJSPProjectAS3Server.class, + UndeployJSPProjectAS40Server.class, DeleteServer.class }) public class AllTestsSuite { Copied: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/EAP5CompatibilitySuite.java (from rev 42995, branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/EAP5CompatibilitySuite.java) =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/EAP5CompatibilitySuite.java (rev 0) +++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/EAP5CompatibilitySuite.java 2012-08-29 10:27:50 UTC (rev 43291) @@ -0,0 +1,24 @@ +package org.jboss.ide.eclipse.as.ui.bot.test; + +import org.jboss.ide.eclipse.as.ui.bot.test.eap5.CreateEAP5Server; +import org.jboss.ide.eclipse.as.ui.bot.test.eap5.DeployJSPProjectEAP5Server; +import org.jboss.ide.eclipse.as.ui.bot.test.eap5.OperateEAP5Server; +import org.jboss.ide.eclipse.as.ui.bot.test.eap5.UndeployJSPProjectEAP5Server; +import org.jboss.ide.eclipse.as.ui.bot.test.template.DeleteServer; +import org.jboss.ide.eclipse.as.ui.bot.test.template.HotDeployJSPFile; +import org.jboss.tools.ui.bot.ext.RequirementAwareSuite; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; + +(a)RunWith(RequirementAwareSuite.class) +(a)Suite.SuiteClasses({ + CreateEAP5Server.class, + OperateEAP5Server.class, + DeployJSPProjectEAP5Server.class, + HotDeployJSPFile.class, + UndeployJSPProjectEAP5Server.class, + DeleteServer.class +}) +public class EAP5CompatibilitySuite { + +} Copied: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/EAP6CompatibilitySuite.java (from rev 42995, branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/EAP6CompatibilitySuite.java) =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/EAP6CompatibilitySuite.java (rev 0) +++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/EAP6CompatibilitySuite.java 2012-08-29 10:27:50 UTC (rev 43291) @@ -0,0 +1,24 @@ +package org.jboss.ide.eclipse.as.ui.bot.test; + +import org.jboss.ide.eclipse.as.ui.bot.test.eap6.CreateEAP6Server; +import org.jboss.ide.eclipse.as.ui.bot.test.eap6.DeployJSPProjectEAP6Server; +import org.jboss.ide.eclipse.as.ui.bot.test.eap6.OperateEAP6Server; +import org.jboss.ide.eclipse.as.ui.bot.test.eap6.UndeployJSPProjectEAP6Server; +import org.jboss.ide.eclipse.as.ui.bot.test.template.DeleteServer; +import org.jboss.ide.eclipse.as.ui.bot.test.template.HotDeployJSPFile; +import org.jboss.tools.ui.bot.ext.RequirementAwareSuite; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; + +(a)RunWith(RequirementAwareSuite.class) +(a)Suite.SuiteClasses({ + CreateEAP6Server.class, + OperateEAP6Server.class, + DeployJSPProjectEAP6Server.class, + HotDeployJSPFile.class, + UndeployJSPProjectEAP6Server.class, + DeleteServer.class +}) +public class EAP6CompatibilitySuite { + +} Deleted: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/EAPCompatibilitySuite.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/EAPCompatibilitySuite.java 2012-08-29 10:27:37 UTC (rev 43290) +++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/EAPCompatibilitySuite.java 2012-08-29 10:27:50 UTC (rev 43291) @@ -1,24 +0,0 @@ -package org.jboss.ide.eclipse.as.ui.bot.test; - -import org.jboss.ide.eclipse.as.ui.bot.test.eap6.CreateEAP6Server; -import org.jboss.ide.eclipse.as.ui.bot.test.eap6.DeployJSPProjectEAP6Server; -import org.jboss.ide.eclipse.as.ui.bot.test.eap6.OperateEAP6Server; -import org.jboss.ide.eclipse.as.ui.bot.test.eap6.UndeployJSPProjectEAP6Server; -import org.jboss.ide.eclipse.as.ui.bot.test.template.DeleteServer; -import org.jboss.ide.eclipse.as.ui.bot.test.template.HotDeployJSPFile; -import org.jboss.tools.ui.bot.ext.RequirementAwareSuite; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; - -(a)RunWith(RequirementAwareSuite.class) -(a)Suite.SuiteClasses({ - CreateEAP6Server.class, - OperateEAP6Server.class, - DeployJSPProjectEAP6Server.class, - HotDeployJSPFile.class, - UndeployJSPProjectEAP6Server.class, - DeleteServer.class -}) -public class EAPCompatibilitySuite { - -}