Author: lzoubek(a)redhat.com Date: 2011-08-17 11:33:54 -0400 (Wed, 17 Aug 2011) New Revision: 34012 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/AssignActivityTest.java trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/FaultModelingTest.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/SimpleModelingTest.java trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/WizardTest.java trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/CreateRuntimeFromESB.java trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/CreateRuntimeFromSOA.java trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/Editing.java trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/NewProjectUsingBundledInEAP.java trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/NewProjectUsingBundledInSOA.java trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/NewProjectUsingRuntime.java trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/HelloWorld.java trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/HelloWorldAction.java trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/HelloWorldFileAction.java trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksCSV2XML.java trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksXML2POJO.java trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksXML2XMLDateManipulation.java trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksXML2XMLSimple.java trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/WebServiceConsumer1.java trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/WebServiceProducer.java trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/BasicHibernateTest.java trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/CodeGenerationLauncherTest.java trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/ConfigurationContextTest.java trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/ConfigurationFileTest.java trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/ConsolePerspectiveTest.java trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/ConsoleTest.java trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/CriteriaEditorsTest.java trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/DaliTest.java trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/HibernatePerspectiveTest.java trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/JIRATest.java trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/MappingFileTest.java trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/MappingsDiagramTest.java trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/ReverseEngineerFileTest.java trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/ViewsTest.java trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateSeamProjects.java trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/examples/Booking22EAR.java trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/examples/DVDStore22EAR.java trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/smoke/CreateNewStrutsProjectTest.java trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/tutorial/TutorialTest.java trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedDefaultServer.java trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedDisabledServer.java trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedEPPServer.java trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedJbossASServer.java trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedLocalServer.java trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedNotRunningServer.java trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedRemoteServer.java trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedWithESB.java trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedWithSeam.java trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnonatedRunningServer.java trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/ClassWithoutTests.java trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/RequirementAwareSuite.java trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/Annotations.java trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/TestConfigurator.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/eap/EAPFromJavaTest.java trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/eap/EAPFromWSDLTest.java trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/jbt/SampleWSTest.java trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/jbt/WsTesterTest.java trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wtp/BottomUpWSTest.java trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wtp/TopDownWSTest.java trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wtp/WsClientTest.java Log: swtbotext: renamed Requirement annotation 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-17 15:20:25 UTC (rev 34011) +++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/ActivityModelingTest.java 2011-08-17 15:33:54 UTC (rev 34012) @@ -10,7 +10,7 @@ import org.jboss.tools.bpel.ui.bot.test.util.ResourceHelper; import org.jboss.tools.ui.bot.ext.SWTUtilExt; -import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; import org.jboss.tools.ui.bot.ext.config.Annotations.Server; import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType; @@ -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") +@Require(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-17 15:20:25 UTC (rev 34011) +++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/AssignActivityTest.java 2011-08-17 15:33:54 UTC (rev 34012) @@ -16,7 +16,7 @@ import org.jboss.tools.bpel.ui.bot.test.util.ResourceHelper; import org.jboss.tools.bpel.util.SendSoapMessage; -import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; import org.jboss.tools.ui.bot.ext.config.Annotations.Server; import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType; @@ -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") +@Require(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"; Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/FaultModelingTest.java =================================================================== --- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/FaultModelingTest.java 2011-08-17 15:20:25 UTC (rev 34011) +++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/FaultModelingTest.java 2011-08-17 15:33:54 UTC (rev 34012) @@ -9,7 +9,7 @@ import org.jboss.tools.bpel.ui.bot.test.suite.BPELTest; import org.jboss.tools.bpel.ui.bot.test.util.ResourceHelper; -import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; import org.jboss.tools.ui.bot.ext.config.Annotations.Server; import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType; @@ -25,7 +25,7 @@ * * @author mbaluch */ -@SWTBotTestRequires(clearProjects = true, server = @Server(type = ServerType.SOA, state = ServerState.Disabled)) +@Require(clearProjects = true, server = @Server(type = ServerType.SOA, state = ServerState.Disabled)) public class FaultModelingTest extends BPELTest { static 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/OdeDeployTest.java =================================================================== --- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/OdeDeployTest.java 2011-08-17 15:20:25 UTC (rev 34011) +++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/OdeDeployTest.java 2011-08-17 15:33:54 UTC (rev 34012) @@ -10,7 +10,7 @@ import org.jboss.tools.bpel.ui.bot.test.suite.BPELTest; import org.jboss.tools.bpel.ui.bot.test.util.ResourceHelper; import org.jboss.tools.bpel.util.SendSoapMessage; -import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; import org.jboss.tools.ui.bot.ext.config.Annotations.Server; import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType; @@ -26,7 +26,7 @@ * @author psrna * */ -@SWTBotTestRequires(server = @Server(type = ServerType.SOA, state = ServerState.Running), perspective="BPEL") +@Require(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"; Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/SimpleModelingTest.java =================================================================== --- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/SimpleModelingTest.java 2011-08-17 15:20:25 UTC (rev 34011) +++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/SimpleModelingTest.java 2011-08-17 15:33:54 UTC (rev 34012) @@ -13,7 +13,7 @@ import org.jboss.tools.ui.bot.ext.config.Annotations.Server; import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType; -import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; import org.jboss.tools.ui.bot.ext.view.PackageExplorer; import org.jboss.tools.ui.bot.ext.view.ServersView; @@ -21,7 +21,7 @@ import org.junit.Before; import org.junit.Test; -@SWTBotTestRequires(clearProjects = true, server = @Server(type = ServerType.SOA, state = ServerState.Present)) +@Require(clearProjects = true, server = @Server(type = ServerType.SOA, state = ServerState.Present)) public class SimpleModelingTest extends BPELTest { static 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/WizardTest.java =================================================================== --- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/WizardTest.java 2011-08-17 15:20:25 UTC (rev 34011) +++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/WizardTest.java 2011-08-17 15:33:54 UTC (rev 34012) @@ -12,7 +12,7 @@ import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; import org.jboss.tools.bpel.ui.bot.test.suite.BPELTest; -import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; import org.jboss.tools.ui.bot.ext.config.Annotations.Server; import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType; @@ -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") +@Require(clearProjects = true, server = @Server(type = ServerType.SOA, state = ServerState.Present), perspective="BPEL") public class WizardTest extends BPELTest { Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/CreateRuntimeFromESB.java =================================================================== --- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/CreateRuntimeFromESB.java 2011-08-17 15:20:25 UTC (rev 34011) +++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/CreateRuntimeFromESB.java 2011-08-17 15:33:54 UTC (rev 34012) @@ -7,7 +7,7 @@ import org.jboss.tools.ui.bot.ext.gen.ActionItem; import org.jboss.tools.ui.bot.ext.types.IDELabel; import org.junit.Test; -@SWTBotTestRequires(esb=@ESB()) +@Require(esb=@ESB()) public class CreateRuntimeFromESB extends SWTTestExt { @Test Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/CreateRuntimeFromSOA.java =================================================================== --- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/CreateRuntimeFromSOA.java 2011-08-17 15:20:25 UTC (rev 34011) +++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/CreateRuntimeFromSOA.java 2011-08-17 15:33:54 UTC (rev 34012) @@ -8,7 +8,7 @@ import org.jboss.tools.ui.bot.ext.types.IDELabel; import org.junit.Test; -@SWTBotTestRequires(server=(a)Server(type=ServerType.SOA,state=ServerState.Present)) +@Require(server=(a)Server(type=ServerType.SOA,state=ServerState.Present)) public class CreateRuntimeFromSOA extends SWTTestExt { @Test Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/Editing.java =================================================================== --- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/Editing.java 2011-08-17 15:20:25 UTC (rev 34011) +++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/Editing.java 2011-08-17 15:33:54 UTC (rev 34012) @@ -33,7 +33,7 @@ import org.jboss.tools.esb.ui.bot.tests.editor.ESBProviderFactory; import org.jboss.tools.ui.bot.ext.SWTEclipseExt; import org.jboss.tools.ui.bot.ext.SWTTestExt; -import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; import org.jboss.tools.ui.bot.ext.gen.ActionItem; import org.jboss.tools.ui.bot.ext.gen.ActionItem.NewObject.ESBESBFile; import org.jboss.tools.ui.bot.ext.gen.ActionItem.NewObject.ESBESBProject; @@ -47,7 +47,7 @@ import org.junit.BeforeClass; import org.junit.Test; -@SWTBotTestRequires(perspective = "Java", runOnce = true) +@Require(perspective = "Java", runOnce = true) public class Editing extends SWTTestExt { public static String menu_addService = "Add Service..."; Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/NewProjectUsingBundledInEAP.java =================================================================== --- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/NewProjectUsingBundledInEAP.java 2011-08-17 15:20:25 UTC (rev 34011) +++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/NewProjectUsingBundledInEAP.java 2011-08-17 15:33:54 UTC (rev 34012) @@ -2,7 +2,7 @@ import org.eclipse.swtbot.swt.finder.SWTBot; import org.jboss.tools.ui.bot.ext.SWTTestExt; -import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; import org.jboss.tools.ui.bot.ext.config.Annotations.Server; import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType; @@ -18,7 +18,7 @@ * @author lzoubek * */ -@SWTBotTestRequires(server=(a)Server(type=ServerType.EAP,state=ServerState.Present)) +@Require(server=(a)Server(type=ServerType.EAP,state=ServerState.Present)) public class NewProjectUsingBundledInEAP extends SWTTestExt { @AfterClass Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/NewProjectUsingBundledInSOA.java =================================================================== --- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/NewProjectUsingBundledInSOA.java 2011-08-17 15:20:25 UTC (rev 34011) +++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/NewProjectUsingBundledInSOA.java 2011-08-17 15:33:54 UTC (rev 34012) @@ -8,7 +8,7 @@ import org.jboss.tools.ui.bot.ext.types.IDELabel; import org.junit.Test; -@SWTBotTestRequires(server=(a)Server(type=ServerType.SOA,state=ServerState.Present)) +@Require(server=(a)Server(type=ServerType.SOA,state=ServerState.Present)) public class NewProjectUsingBundledInSOA extends SWTTestExt{ Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/NewProjectUsingRuntime.java =================================================================== --- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/NewProjectUsingRuntime.java 2011-08-17 15:20:25 UTC (rev 34011) +++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/NewProjectUsingRuntime.java 2011-08-17 15:33:54 UTC (rev 34012) @@ -3,14 +3,14 @@ import org.eclipse.swtbot.swt.finder.SWTBot; import org.jboss.tools.ui.bot.ext.SWTTestExt; import org.jboss.tools.ui.bot.ext.config.Annotations.ESB; -import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; import org.jboss.tools.ui.bot.ext.gen.ActionItem; import org.jboss.tools.ui.bot.ext.gen.ActionItem.NewObject.ESBESBProject; import org.jboss.tools.ui.bot.ext.types.IDELabel; import org.junit.AfterClass; import org.junit.Test; -@SWTBotTestRequires(esb=@ESB()) +@Require(esb=@ESB()) public class NewProjectUsingRuntime extends SWTTestExt{ @AfterClass Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/HelloWorld.java =================================================================== --- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/HelloWorld.java 2011-08-17 15:20:25 UTC (rev 34011) +++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/HelloWorld.java 2011-08-17 15:33:54 UTC (rev 34012) @@ -1,12 +1,12 @@ package org.jboss.tools.esb.ui.bot.tests.examples; -import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; import org.jboss.tools.ui.bot.ext.config.Annotations.Server; import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType; import org.junit.AfterClass; -@SWTBotTestRequires(server=(a)Server(type=ServerType.SOA,state=ServerState.Running)) +@Require(server=(a)Server(type=ServerType.SOA,state=ServerState.Running)) public class HelloWorld extends ESBExampleTest { @Override public String getExampleName() { Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/HelloWorldAction.java =================================================================== --- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/HelloWorldAction.java 2011-08-17 15:20:25 UTC (rev 34011) +++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/HelloWorldAction.java 2011-08-17 15:33:54 UTC (rev 34012) @@ -1,11 +1,11 @@ package org.jboss.tools.esb.ui.bot.tests.examples; -import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; import org.jboss.tools.ui.bot.ext.config.Annotations.Server; import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType; -@SWTBotTestRequires(server=(a)Server(type=ServerType.SOA,state=ServerState.Running)) +@Require(server=(a)Server(type=ServerType.SOA,state=ServerState.Running)) public class HelloWorldAction extends ESBExampleTest { @Override public String getExampleName() { Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/HelloWorldFileAction.java =================================================================== --- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/HelloWorldFileAction.java 2011-08-17 15:20:25 UTC (rev 34011) +++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/HelloWorldFileAction.java 2011-08-17 15:33:54 UTC (rev 34012) @@ -1,11 +1,11 @@ package org.jboss.tools.esb.ui.bot.tests.examples; -import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; import org.jboss.tools.ui.bot.ext.config.Annotations.Server; import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType; -@SWTBotTestRequires(server=(a)Server(type=ServerType.SOA,state=ServerState.Running)) +@Require(server=(a)Server(type=ServerType.SOA,state=ServerState.Running)) public class HelloWorldFileAction extends ESBExampleTest { @Override public String getExampleName() { Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksCSV2XML.java =================================================================== --- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksCSV2XML.java 2011-08-17 15:20:25 UTC (rev 34011) +++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksCSV2XML.java 2011-08-17 15:33:54 UTC (rev 34012) @@ -1,11 +1,11 @@ package org.jboss.tools.esb.ui.bot.tests.examples; -import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; import org.jboss.tools.ui.bot.ext.config.Annotations.Server; import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType; -@SWTBotTestRequires(server=(a)Server(type=ServerType.SOA,state=ServerState.Running)) +@Require(server=(a)Server(type=ServerType.SOA,state=ServerState.Running)) public class SmooksCSV2XML extends ESBExampleTest { @Override public String getExampleName() { Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksXML2POJO.java =================================================================== --- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksXML2POJO.java 2011-08-17 15:20:25 UTC (rev 34011) +++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksXML2POJO.java 2011-08-17 15:33:54 UTC (rev 34012) @@ -1,12 +1,12 @@ package org.jboss.tools.esb.ui.bot.tests.examples; import org.jboss.tools.ui.bot.ext.Timing; -import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; import org.jboss.tools.ui.bot.ext.config.Annotations.Server; import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType; -@SWTBotTestRequires(server=(a)Server(type=ServerType.SOA,state=ServerState.Running)) +@Require(server=(a)Server(type=ServerType.SOA,state=ServerState.Running)) public class SmooksXML2POJO extends ESBExampleTest { @Override public String getExampleName() { Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksXML2XMLDateManipulation.java =================================================================== --- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksXML2XMLDateManipulation.java 2011-08-17 15:20:25 UTC (rev 34011) +++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksXML2XMLDateManipulation.java 2011-08-17 15:33:54 UTC (rev 34012) @@ -1,12 +1,12 @@ package org.jboss.tools.esb.ui.bot.tests.examples; import org.jboss.tools.ui.bot.ext.Timing; -import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; import org.jboss.tools.ui.bot.ext.config.Annotations.Server; import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType; -@SWTBotTestRequires(server=(a)Server(type=ServerType.SOA,state=ServerState.Running)) +@Require(server=(a)Server(type=ServerType.SOA,state=ServerState.Running)) public class SmooksXML2XMLDateManipulation extends ESBExampleTest { @Override public String getExampleName() { Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksXML2XMLSimple.java =================================================================== --- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksXML2XMLSimple.java 2011-08-17 15:20:25 UTC (rev 34011) +++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksXML2XMLSimple.java 2011-08-17 15:33:54 UTC (rev 34012) @@ -1,12 +1,12 @@ package org.jboss.tools.esb.ui.bot.tests.examples; import org.jboss.tools.ui.bot.ext.Timing; -import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; import org.jboss.tools.ui.bot.ext.config.Annotations.Server; import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType; -@SWTBotTestRequires(server=(a)Server(type=ServerType.SOA,state=ServerState.Running)) +@Require(server=(a)Server(type=ServerType.SOA,state=ServerState.Running)) public class SmooksXML2XMLSimple extends ESBExampleTest { @Override public String getExampleName() { Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/WebServiceConsumer1.java =================================================================== --- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/WebServiceConsumer1.java 2011-08-17 15:20:25 UTC (rev 34011) +++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/WebServiceConsumer1.java 2011-08-17 15:33:54 UTC (rev 34012) @@ -1,11 +1,11 @@ package org.jboss.tools.esb.ui.bot.tests.examples; -import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; import org.jboss.tools.ui.bot.ext.config.Annotations.Server; import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType; -@SWTBotTestRequires(server=(a)Server(type=ServerType.SOA,state=ServerState.Running)) +@Require(server=(a)Server(type=ServerType.SOA,state=ServerState.Running)) public class WebServiceConsumer1 extends ESBExampleTest { @Override public String getExampleName() { Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/WebServiceProducer.java =================================================================== --- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/WebServiceProducer.java 2011-08-17 15:20:25 UTC (rev 34011) +++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/WebServiceProducer.java 2011-08-17 15:33:54 UTC (rev 34012) @@ -1,11 +1,11 @@ package org.jboss.tools.esb.ui.bot.tests.examples; -import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; import org.jboss.tools.ui.bot.ext.config.Annotations.Server; import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType; -@SWTBotTestRequires(server=(a)Server(type=ServerType.SOA,state=ServerState.Running),perspective=&quot;Java&quot;) +@Require(server=(a)Server(type=ServerType.SOA,state=ServerState.Running),perspective=&quot;Java&quot;) public class WebServiceProducer extends ESBExampleTest { @Override public String getExampleName() { Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/BasicHibernateTest.java =================================================================== --- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/BasicHibernateTest.java 2011-08-17 15:20:25 UTC (rev 34011) +++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/BasicHibernateTest.java 2011-08-17 15:33:54 UTC (rev 34012) @@ -2,7 +2,7 @@ import org.jboss.tools.hibernate.ui.bot.testsuite.HibernateTest; import org.jboss.tools.ui.bot.ext.config.Annotations.DB; -import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; import org.jboss.tools.ui.bot.ext.gen.ActionItem.Perspective; import org.jboss.tools.ui.bot.ext.gen.ActionItem.View.HibernateHibernateConfigurations; import org.jboss.tools.ui.bot.ext.types.IDELabel; @@ -12,7 +12,7 @@ /** * Basic Hibernate tests */ -@SWTBotTestRequires( db=@DB,perspective="Hibernate") +@Require( db=@DB,perspective="Hibernate") public class BasicHibernateTest extends HibernateTest { @BeforeClass /** Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/CodeGenerationLauncherTest.java =================================================================== --- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/CodeGenerationLauncherTest.java 2011-08-17 15:20:25 UTC (rev 34011) +++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/CodeGenerationLauncherTest.java 2011-08-17 15:33:54 UTC (rev 34012) @@ -20,7 +20,7 @@ import org.jboss.tools.hibernate.ui.bot.testsuite.HibernateTest; import org.jboss.tools.hibernate.ui.bot.testsuite.Project; import org.jboss.tools.ui.bot.ext.config.Annotations.DB; -import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; import org.jboss.tools.ui.bot.ext.gen.ActionItem; import org.jboss.tools.ui.bot.ext.types.IDELabel; import org.jboss.tools.ui.bot.ext.types.PerspectiveType; @@ -28,7 +28,7 @@ import org.junit.BeforeClass; import org.junit.Test; -@SWTBotTestRequires( db=@DB, perspective="Hibernate") +@Require( db=@DB, perspective="Hibernate") public class CodeGenerationLauncherTest extends HibernateTest { SWTBotShell mainShell = null; Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/ConfigurationContextTest.java =================================================================== --- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/ConfigurationContextTest.java 2011-08-17 15:20:25 UTC (rev 34011) +++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/ConfigurationContextTest.java 2011-08-17 15:33:54 UTC (rev 34012) @@ -11,10 +11,10 @@ package org.jboss.tools.hibernate.ui.bot.testcase; import org.jboss.tools.hibernate.ui.bot.testsuite.HibernateTest; -import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; import org.junit.Test; -@SWTBotTestRequires( clearProjects = false, perspective="Hibernate") +@Require( clearProjects = false, perspective="Hibernate") public class ConfigurationContextTest extends HibernateTest { /** Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/ConfigurationFileTest.java =================================================================== --- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/ConfigurationFileTest.java 2011-08-17 15:20:25 UTC (rev 34011) +++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/ConfigurationFileTest.java 2011-08-17 15:33:54 UTC (rev 34012) @@ -27,7 +27,7 @@ import org.hamcrest.Matcher; import org.jboss.tools.hibernate.ui.bot.testsuite.HibernateTest; import org.jboss.tools.hibernate.ui.bot.testsuite.Project; -import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; import org.jboss.tools.ui.bot.ext.config.TestConfigurator; import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper; import org.jboss.tools.ui.bot.ext.helper.DatabaseHelper; @@ -39,7 +39,7 @@ import org.junit.Test; import org.xml.sax.SAXException; -@SWTBotTestRequires(clearProjects = false, perspective="Hibernate") +@Require(clearProjects = false, perspective="Hibernate") public class ConfigurationFileTest extends HibernateTest { @BeforeClass Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/ConsolePerspectiveTest.java =================================================================== --- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/ConsolePerspectiveTest.java 2011-08-17 15:20:25 UTC (rev 34011) +++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/ConsolePerspectiveTest.java 2011-08-17 15:33:54 UTC (rev 34012) @@ -11,12 +11,12 @@ package org.jboss.tools.hibernate.ui.bot.testcase; import org.jboss.tools.hibernate.ui.bot.testsuite.HibernateTest; -import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; import org.jboss.tools.ui.bot.ext.gen.ActionItem; import org.jboss.tools.ui.bot.ext.types.IDELabel; import org.junit.Test; -@SWTBotTestRequires(clearProjects = false, perspective="Hibernate") +@Require(clearProjects = false, perspective="Hibernate") public class ConsolePerspectiveTest extends HibernateTest { /** Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/ConsoleTest.java =================================================================== --- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/ConsoleTest.java 2011-08-17 15:20:25 UTC (rev 34011) +++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/ConsoleTest.java 2011-08-17 15:33:54 UTC (rev 34012) @@ -19,7 +19,7 @@ import org.jboss.tools.hibernate.ui.bot.testsuite.Project; import org.jboss.tools.ui.bot.ext.SWTEclipseExt; import org.jboss.tools.ui.bot.ext.config.Annotations.DB; -import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; import org.jboss.tools.ui.bot.ext.config.TestConfigurator; import org.jboss.tools.ui.bot.ext.gen.ActionItem; import org.jboss.tools.ui.bot.ext.helper.DatabaseHelper; @@ -30,7 +30,7 @@ import org.junit.BeforeClass; import org.junit.Test; -@SWTBotTestRequires( clearProjects = false, db=@DB, perspective="Hibernate") +@Require( clearProjects = false, db=@DB, perspective="Hibernate") public class ConsoleTest extends HibernateTest { @BeforeClass Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/CriteriaEditorsTest.java =================================================================== --- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/CriteriaEditorsTest.java 2011-08-17 15:20:25 UTC (rev 34011) +++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/CriteriaEditorsTest.java 2011-08-17 15:33:54 UTC (rev 34012) @@ -11,10 +11,10 @@ package org.jboss.tools.hibernate.ui.bot.testcase; import org.jboss.tools.hibernate.ui.bot.testsuite.HibernateTest; -import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; import org.junit.Test; -@SWTBotTestRequires(clearProjects = false, perspective="Hibernate") +@Require(clearProjects = false, perspective="Hibernate") public class CriteriaEditorsTest extends HibernateTest { /** Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/DaliTest.java =================================================================== --- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/DaliTest.java 2011-08-17 15:20:25 UTC (rev 34011) +++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/DaliTest.java 2011-08-17 15:33:54 UTC (rev 34012) @@ -18,7 +18,7 @@ import org.jboss.tools.hibernate.ui.bot.testsuite.HibernateTest; import org.jboss.tools.hibernate.ui.bot.testsuite.Project; import org.jboss.tools.ui.bot.ext.config.Annotations.DB; -import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; import org.jboss.tools.ui.bot.ext.config.Annotations.Server; import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; import org.jboss.tools.ui.bot.ext.config.TestConfigurator; @@ -36,7 +36,7 @@ import org.junit.Test; import org.osgi.framework.Version; -@SWTBotTestRequires( clearProjects = false, db=@DB, perspective="JPA" , server=@Server(state = ServerState.Present)) +@Require( clearProjects = false, db=@DB, perspective="JPA" , server=@Server(state = ServerState.Present)) public class DaliTest extends HibernateTest { private static boolean projectCreated = false; Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/HibernatePerspectiveTest.java =================================================================== --- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/HibernatePerspectiveTest.java 2011-08-17 15:20:25 UTC (rev 34011) +++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/HibernatePerspectiveTest.java 2011-08-17 15:33:54 UTC (rev 34012) @@ -11,12 +11,12 @@ package org.jboss.tools.hibernate.ui.bot.testcase; import org.jboss.tools.hibernate.ui.bot.testsuite.HibernateTest; -import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; import org.jboss.tools.ui.bot.ext.gen.ActionItem; import org.jboss.tools.ui.bot.ext.types.IDELabel; import org.junit.Test; -@SWTBotTestRequires(clearProjects = false, perspective="Hibernate") +@Require(clearProjects = false, perspective="Hibernate") public class HibernatePerspectiveTest extends HibernateTest { /** Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/JIRATest.java =================================================================== --- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/JIRATest.java 2011-08-17 15:20:25 UTC (rev 34011) +++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/JIRATest.java 2011-08-17 15:33:54 UTC (rev 34012) @@ -12,10 +12,10 @@ import org.jboss.tools.hibernate.ui.bot.testsuite.HibernateTest; import org.jboss.tools.ui.bot.ext.config.Annotations.DB; -import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; import org.junit.Test; -@SWTBotTestRequires( clearProjects = false, db=@DB, perspective="Hibernate") +@Require( clearProjects = false, db=@DB, perspective="Hibernate") public class JIRATest extends HibernateTest { /** Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/MappingFileTest.java =================================================================== --- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/MappingFileTest.java 2011-08-17 15:20:25 UTC (rev 34011) +++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/MappingFileTest.java 2011-08-17 15:33:54 UTC (rev 34012) @@ -16,7 +16,7 @@ import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; import org.jboss.tools.hibernate.ui.bot.testsuite.HibernateTest; import org.jboss.tools.hibernate.ui.bot.testsuite.Project; -import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; import org.jboss.tools.ui.bot.ext.parts.ObjectMultiPageEditorBot; import org.jboss.tools.ui.bot.ext.parts.SWTBotEditorExt; import org.jboss.tools.ui.bot.ext.types.EntityType; @@ -25,7 +25,7 @@ import org.junit.BeforeClass; import org.junit.Test; -@SWTBotTestRequires( clearProjects = false, perspective="Hibernate") +@Require( clearProjects = false, perspective="Hibernate") public class MappingFileTest extends HibernateTest { @BeforeClass Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/MappingsDiagramTest.java =================================================================== --- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/MappingsDiagramTest.java 2011-08-17 15:20:25 UTC (rev 34011) +++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/MappingsDiagramTest.java 2011-08-17 15:33:54 UTC (rev 34012) @@ -11,10 +11,10 @@ package org.jboss.tools.hibernate.ui.bot.testcase; import org.jboss.tools.hibernate.ui.bot.testsuite.HibernateTest; -import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; import org.junit.Test; -@SWTBotTestRequires(clearProjects = false, perspective="Hibernate") +@Require(clearProjects = false, perspective="Hibernate") public class MappingsDiagramTest extends HibernateTest { /** Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/ReverseEngineerFileTest.java =================================================================== --- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/ReverseEngineerFileTest.java 2011-08-17 15:20:25 UTC (rev 34011) +++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/ReverseEngineerFileTest.java 2011-08-17 15:33:54 UTC (rev 34012) @@ -12,14 +12,14 @@ import org.jboss.tools.hibernate.ui.bot.testsuite.HibernateTest; import org.jboss.tools.hibernate.ui.bot.testsuite.Project; -import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; import org.jboss.tools.ui.bot.ext.types.EntityType; import org.jboss.tools.ui.bot.ext.types.IDELabel; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; -@SWTBotTestRequires(clearProjects = false, perspective="Hibernate") +@Require(clearProjects = false, perspective="Hibernate") public class ReverseEngineerFileTest extends HibernateTest { @BeforeClass Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/ViewsTest.java =================================================================== --- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/ViewsTest.java 2011-08-17 15:20:25 UTC (rev 34011) +++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/ViewsTest.java 2011-08-17 15:33:54 UTC (rev 34012) @@ -12,10 +12,10 @@ import org.jboss.tools.hibernate.ui.bot.testsuite.HibernateTest; import org.jboss.tools.ui.bot.ext.config.Annotations.DB; -import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; import org.junit.Test; -@SWTBotTestRequires( db=@DB, perspective="Hibernate") +@Require( db=@DB, perspective="Hibernate") public class ViewsTest extends HibernateTest { /** Modified: trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateSeamProjects.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateSeamProjects.java 2011-08-17 15:20:25 UTC (rev 34011) +++ trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateSeamProjects.java 2011-08-17 15:33:54 UTC (rev 34012) @@ -19,7 +19,7 @@ import org.jboss.tools.ui.bot.ext.SWTUtilExt; import org.jboss.tools.ui.bot.ext.config.Annotations.DB; import org.jboss.tools.ui.bot.ext.config.TestConfigurator; -import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; import org.jboss.tools.ui.bot.ext.config.Annotations.Seam; import org.jboss.tools.ui.bot.ext.config.Annotations.Server; import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; @@ -33,7 +33,7 @@ //@SWTBotTestRequires(server=@Server(state=ServerState.NotRunning),perspective=&quot;Seam&quot;,seam=(a)Seam()) -@SWTBotTestRequires(server=@Server,perspective="Seam",seam=@Seam(),db=@DB) +@Require(server=@Server,perspective="Seam",seam=@Seam(),db=@DB) public class CreateSeamProjects extends AbstractSeamTestBase { protected static final String VALIDATION = "Validation"; Modified: trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/examples/Booking22EAR.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/examples/Booking22EAR.java 2011-08-17 15:20:25 UTC (rev 34011) +++ trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/examples/Booking22EAR.java 2011-08-17 15:33:54 UTC (rev 34012) @@ -1,11 +1,11 @@ package org.jboss.tools.seam.ui.bot.test.examples; -import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; import org.jboss.tools.ui.bot.ext.config.Annotations.Seam; import org.jboss.tools.ui.bot.ext.config.Annotations.Server; import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; -@SWTBotTestRequires(server=@Server(state=ServerState.Running),seam=(a)Seam(version=&quot;2.2&quot;)) +@Require(server=@Server(state=ServerState.Running),seam=(a)Seam(version=&quot;2.2&quot;)) public class Booking22EAR extends SeamExample { @Override Modified: trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/examples/DVDStore22EAR.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/examples/DVDStore22EAR.java 2011-08-17 15:20:25 UTC (rev 34011) +++ trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/examples/DVDStore22EAR.java 2011-08-17 15:33:54 UTC (rev 34012) @@ -1,11 +1,11 @@ package org.jboss.tools.seam.ui.bot.test.examples; -import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; import org.jboss.tools.ui.bot.ext.config.Annotations.Seam; import org.jboss.tools.ui.bot.ext.config.Annotations.Server; import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; -@SWTBotTestRequires(server=@Server(state=ServerState.Running),seam=(a)Seam(version=&quot;2.2&quot;)) +@Require(server=@Server(state=ServerState.Running),seam=(a)Seam(version=&quot;2.2&quot;)) public class DVDStore22EAR extends SeamExample { @Override Modified: trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/smoke/CreateNewStrutsProjectTest.java =================================================================== --- trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/smoke/CreateNewStrutsProjectTest.java 2011-08-17 15:20:25 UTC (rev 34011) +++ trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/smoke/CreateNewStrutsProjectTest.java 2011-08-17 15:33:54 UTC (rev 34012) @@ -16,7 +16,7 @@ import org.jboss.tools.struts.ui.bot.test.StrutsAllBotTests; import org.jboss.tools.ui.bot.ext.SWTEclipseExt; import org.jboss.tools.ui.bot.ext.SWTTestExt; -import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; import org.jboss.tools.ui.bot.ext.config.Annotations.Server; import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; import org.jboss.tools.ui.bot.ext.types.EntityType; @@ -31,7 +31,7 @@ * @author Lukas Jungmann * */ -@SWTBotTestRequires(server = @Server(state = ServerState.NotRunning), perspective = "Web Development") +@Require(server = @Server(state = ServerState.NotRunning), perspective = "Web Development") public class CreateNewStrutsProjectTest extends SWTTestExt { /** 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 2011-08-17 15:20:25 UTC (rev 34011) +++ trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/tutorial/TutorialTest.java 2011-08-17 15:33:54 UTC (rev 34012) @@ -54,7 +54,7 @@ import org.jboss.tools.ui.bot.ext.SWTBotExt; import org.jboss.tools.ui.bot.ext.SWTEclipseExt; import org.jboss.tools.ui.bot.ext.SWTTestExt; -import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; import org.jboss.tools.ui.bot.ext.config.Annotations.Server; import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper; @@ -75,7 +75,7 @@ * @author jlukas * @see <a href="http://download.jboss.org/jbosstools/nightly-docs/en/struts_to... Tutorial</a> */ -@SWTBotTestRequires(server = @Server(state = ServerState.NotRunning), perspective = "Web Development") +@Require(server = @Server(state = ServerState.NotRunning), perspective = "Web Development") @RunWith(RequirementAwareSuite.class) @SuiteClasses({TutorialTest.class}) public class TutorialTest extends SWTTestExt { Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/RequirementAwareSuite.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/RequirementAwareSuite.java 2011-08-17 15:20:25 UTC (rev 34011) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/RequirementAwareSuite.java 2011-08-17 15:33:54 UTC (rev 34012) @@ -13,7 +13,7 @@ import org.apache.log4j.Logger; import org.eclipse.swtbot.swt.finder.junit.ScreenshotCaptureListener; -import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; import org.jboss.tools.ui.bot.ext.config.TestConfiguration; import org.jboss.tools.ui.bot.ext.config.TestConfigurator; import org.jboss.tools.ui.bot.ext.config.requirement.RequirementBase; @@ -37,7 +37,7 @@ /** * JUnit4 requirement aware testsuite runner. If suite class is annotated by @ * RunWith({@link RequirementAwareSuite}) class, test classes can have - * {@link SWTBotTestRequires} annotations + * {@link Require} annotations * * @author lzoubek(a)redhat.com */ Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/Annotations.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/Annotations.java 2011-08-17 15:20:25 UTC (rev 34011) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/Annotations.java 2011-08-17 15:33:54 UTC (rev 34012) @@ -15,10 +15,10 @@ * by default all sub-annotations are optional and are disabled, please go through * documentation of all items. * <ul> - * <li>{@link SWTBotTestRequires#clearProjects()}</li> - * <li>{@link SWTBotTestRequires#clearWorkspace()}</li> - * <li>{@link SWTBotTestRequires#perspective()}</li> - * <li>{@link SWTBotTestRequires#runOnce()}</li> + * <li>{@link Require#clearProjects()}</li> + * <li>{@link Require#clearWorkspace()}</li> + * <li>{@link Require#perspective()}</li> + * <li>{@link Require#runOnce()}</li> * <li>{@link Server}</li> * <li>{@link Seam}</li> * <li>{@link ESB}</li> @@ -30,7 +30,7 @@ */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) - public @interface SWTBotTestRequires { + public @interface Require { /** * optionally require server */ Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/TestConfigurator.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/TestConfigurator.java 2011-08-17 15:20:25 UTC (rev 34011) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/TestConfigurator.java 2011-08-17 15:33:54 UTC (rev 34012) @@ -16,7 +16,7 @@ import org.jboss.tools.ui.bot.ext.config.Annotations.DB; import org.jboss.tools.ui.bot.ext.config.Annotations.ESB; import org.jboss.tools.ui.bot.ext.config.Annotations.JBPM; -import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; import org.jboss.tools.ui.bot.ext.config.Annotations.Seam; import org.jboss.tools.ui.bot.ext.config.Annotations.Server; import org.jboss.tools.ui.bot.ext.config.Annotations.ServerLocation; @@ -322,7 +322,7 @@ * @return */ public static boolean isRequiresAnyRuntime(Class<?> klass) { - SWTBotTestRequires an = getAnnotation(klass); + Require an = getAnnotation(klass); if (an==null) { return false; } @@ -331,28 +331,28 @@ || an.server().required(); } /** - * returns true if given class has {@link SWTBotTestRequires#runOnce()} annotation set to true + * returns true if given class has {@link Require#runOnce()} annotation set to true * @param klass * @return */ public static boolean isRequiresRunOnce(Class<?> klass) { - SWTBotTestRequires an = getAnnotation(klass); + Require an = getAnnotation(klass); if (an==null) { return false; } return an.runOnce(); } /** - * finds {@link SWTBotTestRequires} annotation in given class or recursive in super classes + * finds {@link Require} annotation in given class or recursive in super classes * @param klass * @return */ - private static SWTBotTestRequires getAnnotation(Class<?> klass) { + private static Require getAnnotation(Class<?> klass) { if (klass==null || Object.class.equals(klass)) { return null; } - SWTBotTestRequires requies = klass - .getAnnotation(SWTBotTestRequires.class); + Require requies = klass + .getAnnotation(Require.class); if (requies != null) { return requies; } @@ -360,13 +360,13 @@ } /** * returns list of requirements if given class (Test) can run, all this is - * done by exploring class'es annotations (see {@link SWTBotTestRequires}) and check against + * done by exploring class'es annotations (see {@link Require}) and check against * current configuration * if given class does not meet {@link TestConfigurator#currentConfig} method returns null */ public static List<RequirementBase> getClassRequirements(Class<?> klass) { - SWTBotTestRequires requies = getAnnotation(klass); + Require requies = getAnnotation(klass); // internal list List<RequirementBase> reqs = new ArrayList<RequirementBase>(); reqs.add(RequirementBase.createPrepareViews()); Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedDefaultServer.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedDefaultServer.java 2011-08-17 15:20:25 UTC (rev 34011) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedDefaultServer.java 2011-08-17 15:33:54 UTC (rev 34012) @@ -1,12 +1,12 @@ package org.jboss.tools.ui.bot.ext.test.config; import org.jboss.tools.ui.bot.ext.SWTTestExt; -import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; import org.jboss.tools.ui.bot.ext.config.Annotations.Server; import org.junit.Test; -@SWTBotTestRequires(server=@Server(),perspective="Java EE") +@Require(server=@Server(),perspective="Java EE") public class AnnotatedDefaultServer extends SWTTestExt { @Test Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedDisabledServer.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedDisabledServer.java 2011-08-17 15:20:25 UTC (rev 34011) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedDisabledServer.java 2011-08-17 15:33:54 UTC (rev 34012) @@ -3,13 +3,13 @@ import org.eclipse.swtbot.swt.finder.SWTBot; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable; import org.jboss.tools.ui.bot.ext.SWTTestExt; -import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; import org.jboss.tools.ui.bot.ext.config.Annotations.Server; import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; import org.jboss.tools.ui.bot.ext.gen.ActionItem; import org.junit.Test; -@SWTBotTestRequires(server=(a)Server(state=ServerState.Disabled)) +@Require(server=(a)Server(state=ServerState.Disabled)) public class AnnotatedDisabledServer extends SWTTestExt { @Test Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedEPPServer.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedEPPServer.java 2011-08-17 15:20:25 UTC (rev 34011) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedEPPServer.java 2011-08-17 15:33:54 UTC (rev 34012) @@ -1,13 +1,13 @@ package org.jboss.tools.ui.bot.ext.test.config; import org.jboss.tools.ui.bot.ext.SWTTestExt; -import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; import org.jboss.tools.ui.bot.ext.config.Annotations.Server; import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType; import org.junit.Test; -@SWTBotTestRequires(server=(a)Server(type=ServerType.EPP),perspective=&quot;Java EE") +@Require(server=(a)Server(type=ServerType.EPP),perspective=&quot;Java EE") public class AnnotatedEPPServer extends SWTTestExt { @Test Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedJbossASServer.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedJbossASServer.java 2011-08-17 15:20:25 UTC (rev 34011) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedJbossASServer.java 2011-08-17 15:33:54 UTC (rev 34012) @@ -1,13 +1,13 @@ package org.jboss.tools.ui.bot.ext.test.config; import org.jboss.tools.ui.bot.ext.SWTTestExt; -import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; import org.jboss.tools.ui.bot.ext.config.Annotations.Server; import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType; import org.junit.Test; -@SWTBotTestRequires(server=(a)Server(type=ServerType.JbossAS),perspective=&quot;Java EE") +@Require(server=(a)Server(type=ServerType.JbossAS),perspective=&quot;Java EE") public class AnnotatedJbossASServer extends SWTTestExt { @Test Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedLocalServer.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedLocalServer.java 2011-08-17 15:20:25 UTC (rev 34011) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedLocalServer.java 2011-08-17 15:33:54 UTC (rev 34012) @@ -1,11 +1,11 @@ package org.jboss.tools.ui.bot.ext.test.config; import org.jboss.tools.ui.bot.ext.SWTTestExt; -import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; import org.jboss.tools.ui.bot.ext.config.Annotations.Server; import org.jboss.tools.ui.bot.ext.config.Annotations.ServerLocation; import org.junit.Test; -@SWTBotTestRequires(server=(a)Server(location=ServerLocation.Local),perspective=&quot;Java EE") +@Require(server=(a)Server(location=ServerLocation.Local),perspective=&quot;Java EE") public class AnnotatedLocalServer extends SWTTestExt{ @Test public void configuredState() { Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedNotRunningServer.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedNotRunningServer.java 2011-08-17 15:20:25 UTC (rev 34011) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedNotRunningServer.java 2011-08-17 15:33:54 UTC (rev 34012) @@ -4,7 +4,7 @@ import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; import org.jboss.tools.ui.bot.ext.SWTTestExt; -import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; import org.jboss.tools.ui.bot.ext.config.Annotations.Server; import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper; @@ -12,7 +12,7 @@ import org.junit.Test; -@SWTBotTestRequires(server=(a)Server(state=ServerState.NotRunning),perspective=&quot;Java EE") +@Require(server=(a)Server(state=ServerState.NotRunning),perspective=&quot;Java EE") public class AnnotatedNotRunningServer extends SWTTestExt { @Test Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedRemoteServer.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedRemoteServer.java 2011-08-17 15:20:25 UTC (rev 34011) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedRemoteServer.java 2011-08-17 15:33:54 UTC (rev 34012) @@ -1,11 +1,11 @@ package org.jboss.tools.ui.bot.ext.test.config; import org.jboss.tools.ui.bot.ext.SWTTestExt; -import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; import org.jboss.tools.ui.bot.ext.config.Annotations.Server; import org.jboss.tools.ui.bot.ext.config.Annotations.ServerLocation; import org.junit.Test; -@SWTBotTestRequires(server=(a)Server(location=ServerLocation.Remote),perspective=&quot;Java EE") +@Require(server=(a)Server(location=ServerLocation.Remote),perspective=&quot;Java EE") public class AnnotatedRemoteServer extends SWTTestExt{ @Test public void configuredState() { Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedWithESB.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedWithESB.java 2011-08-17 15:20:25 UTC (rev 34011) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedWithESB.java 2011-08-17 15:33:54 UTC (rev 34012) @@ -4,11 +4,11 @@ import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable; import org.jboss.tools.ui.bot.ext.SWTTestExt; import org.jboss.tools.ui.bot.ext.config.Annotations.ESB; -import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; import org.jboss.tools.ui.bot.ext.gen.ActionItem; import org.junit.Test; -@SWTBotTestRequires(esb=@ESB(),perspective="Java EE") +@Require(esb=@ESB(),perspective="Java EE") public class AnnotatedWithESB extends SWTTestExt { @Test Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedWithSeam.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedWithSeam.java 2011-08-17 15:20:25 UTC (rev 34011) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedWithSeam.java 2011-08-17 15:33:54 UTC (rev 34012) @@ -7,7 +7,7 @@ import org.jboss.tools.ui.bot.ext.gen.ActionItem; import org.junit.Test; -@SWTBotTestRequires(seam=@Seam(),perspective="Java EE") +@Require(seam=@Seam(),perspective="Java EE") public class AnnotatedWithSeam extends SWTTestExt { @Test Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnonatedRunningServer.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnonatedRunningServer.java 2011-08-17 15:20:25 UTC (rev 34011) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnonatedRunningServer.java 2011-08-17 15:33:54 UTC (rev 34012) @@ -1,13 +1,13 @@ package org.jboss.tools.ui.bot.ext.test.config; import org.jboss.tools.ui.bot.ext.SWTTestExt; -import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; import org.jboss.tools.ui.bot.ext.config.Annotations.Server; import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; import org.junit.Test; -@SWTBotTestRequires(server=(a)Server(state=ServerState.Running),perspective=&quot;Java EE") +@Require(server=(a)Server(state=ServerState.Running),perspective=&quot;Java EE") public class AnonatedRunningServer extends SWTTestExt { @Test Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/ClassWithoutTests.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/ClassWithoutTests.java 2011-08-17 15:20:25 UTC (rev 34011) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/ClassWithoutTests.java 2011-08-17 15:33:54 UTC (rev 34012) @@ -1,8 +1,8 @@ package org.jboss.tools.ui.bot.ext.test.config; -import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; -@SWTBotTestRequires() +@Require() public class ClassWithoutTests { } Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java 2011-08-17 15:20:25 UTC (rev 34011) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java 2011-08-17 15:33:54 UTC (rev 34012) @@ -28,7 +28,7 @@ import org.jboss.tools.ui.bot.ext.SWTJBTExt; import org.jboss.tools.ui.bot.ext.SWTTestExt; import org.jboss.tools.ui.bot.ext.Timing; -import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; import org.jboss.tools.ui.bot.ext.config.Annotations.Server; import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; import org.jboss.tools.ui.bot.ext.gen.ActionItem; @@ -51,7 +51,7 @@ import org.w3c.dom.Element; import org.w3c.dom.Node; -@SWTBotTestRequires(server = @Server(state = ServerState.Present), +@Require(server = @Server(state = ServerState.Present), clearProjects=false, clearWorkspace=false, perspective="Web Development" Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/eap/EAPFromJavaTest.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/eap/EAPFromJavaTest.java 2011-08-17 15:20:25 UTC (rev 34011) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/eap/EAPFromJavaTest.java 2011-08-17 15:33:54 UTC (rev 34012) @@ -20,7 +20,7 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEclipseEditor; -import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; import org.jboss.tools.ui.bot.ext.config.Annotations.Server; import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType; import org.jboss.tools.ws.ui.bot.test.uiutils.actions.NewFileWizardAction; @@ -33,7 +33,7 @@ import org.junit.Before; import org.junit.Test; -@SWTBotTestRequires(server = +@Require(server = @Server(type = ServerType.EAP), perspective = "Java EE") public class EAPFromJavaTest extends WSTestBase { Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/eap/EAPFromWSDLTest.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/eap/EAPFromWSDLTest.java 2011-08-17 15:20:25 UTC (rev 34011) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/eap/EAPFromWSDLTest.java 2011-08-17 15:33:54 UTC (rev 34012) @@ -21,7 +21,7 @@ import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.NullProgressMonitor; -import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; import org.jboss.tools.ui.bot.ext.config.Annotations.Server; import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType; import org.jboss.tools.ws.ui.bot.test.uiutils.wizards.WsWizardBase.Slider_Level; @@ -33,7 +33,7 @@ import org.junit.Before; import org.junit.Test; -@SWTBotTestRequires(server = +@Require(server = @Server(type = ServerType.EAP), perspective = "Java EE") public class EAPFromWSDLTest extends WSTestBase { Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/jbt/SampleWSTest.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/jbt/SampleWSTest.java 2011-08-17 15:20:25 UTC (rev 34011) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/jbt/SampleWSTest.java 2011-08-17 15:33:54 UTC (rev 34012) @@ -30,7 +30,7 @@ import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; import org.jboss.tools.ui.bot.ext.Timing; -import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; import org.jboss.tools.ui.bot.ext.config.Annotations.Server; import org.jboss.tools.ws.ui.bot.test.uiutils.actions.NewSampleWSWizardAction; import org.jboss.tools.ws.ui.bot.test.uiutils.actions.TreeItemAction; @@ -42,7 +42,7 @@ import org.junit.Ignore; import org.junit.Test; -@SWTBotTestRequires(server = +@Require(server = @Server(), perspective = "Java EE") public class SampleWSTest extends WSTestBase { Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/jbt/WsTesterTest.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/jbt/WsTesterTest.java 2011-08-17 15:20:25 UTC (rev 34011) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/jbt/WsTesterTest.java 2011-08-17 15:33:54 UTC (rev 34012) @@ -27,7 +27,7 @@ import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView; import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell; import org.jboss.tools.ui.bot.ext.SWTTestExt; -import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; import org.jboss.tools.ws.ui.bot.test.widgets.SelectWSDLDialog; import org.jboss.tools.ws.ui.bot.test.widgets.WsTesterView; import org.jboss.tools.ws.ui.bot.test.widgets.WsTesterView.Request_Arg_Type; @@ -41,7 +41,7 @@ * * @author jlukas */ -@SWTBotTestRequires(perspective = "Java") +@Require(perspective = "Java") public class WsTesterTest extends SWTTestExt { private static final Logger L = Logger.getLogger(WsTesterTest.class.getName()); Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wtp/BottomUpWSTest.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wtp/BottomUpWSTest.java 2011-08-17 15:20:25 UTC (rev 34011) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wtp/BottomUpWSTest.java 2011-08-17 15:33:54 UTC (rev 34012) @@ -10,13 +10,13 @@ ******************************************************************************/ package org.jboss.tools.ws.ui.bot.test.wtp; -import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; import org.jboss.tools.ui.bot.ext.config.Annotations.Server; import org.jboss.tools.ws.ui.bot.test.uiutils.wizards.WsWizardBase.Slider_Level; import org.junit.Test; -@SWTBotTestRequires(server=@Server(),perspective="Java EE") +@Require(server=@Server(),perspective="Java EE") public class BottomUpWSTest extends WSTestBase { //http://localhost:8080/BottomUpWS/ClassA?wsdl Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wtp/TopDownWSTest.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wtp/TopDownWSTest.java 2011-08-17 15:20:25 UTC (rev 34011) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wtp/TopDownWSTest.java 2011-08-17 15:33:54 UTC (rev 34012) @@ -10,12 +10,12 @@ ******************************************************************************/ package org.jboss.tools.ws.ui.bot.test.wtp; -import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; import org.jboss.tools.ui.bot.ext.config.Annotations.Server; import org.jboss.tools.ws.ui.bot.test.uiutils.wizards.WsWizardBase.Slider_Level; import org.junit.Test; -@SWTBotTestRequires(server=@Server(),perspective="Java EE") +@Require(server=@Server(),perspective="Java EE") public class TopDownWSTest extends WSTestBase { @Override Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wtp/WsClientTest.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wtp/WsClientTest.java 2011-08-17 15:20:25 UTC (rev 34011) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wtp/WsClientTest.java 2011-08-17 15:33:54 UTC (rev 34012) @@ -12,13 +12,13 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.ResourcesPlugin; -import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; import org.jboss.tools.ui.bot.ext.config.Annotations.Server; import org.jboss.tools.ws.ui.bot.test.uiutils.wizards.WsWizardBase.Slider_Level; import org.junit.Assert; import org.junit.Test; -@SWTBotTestRequires(server=@Server(),perspective="Java EE") +@Require(server=@Server(),perspective="Java EE") public class WsClientTest extends WSTestBase { @Override