JBoss Tools SVN: r34015 - trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test.
by jbosstools-commits＠lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2011-08-17 13:39:20 -0400 (Wed, 17 Aug 2011)
New Revision: 34015
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/JSFAllBotTests.java
Log:
Test are run with RequirementAwareSuite runner now.
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/JSFAllBotTests.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/JSFAllBotTests.java 2011-08-17 16:54:59 UTC (rev 34014)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/JSFAllBotTests.java 2011-08-17 17:39:20 UTC (rev 34015)
@@ -1,8 +1,5 @@
package org.jboss.tools.jsf.ui.bot.test;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.jboss.tools.jsf.ui.bot.test.cssdialog.jbide.CSSSelectorJBIDE3288;
import org.jboss.tools.jsf.ui.bot.test.cssdialog.jbide.JBIDE3148and4441Test;
import org.jboss.tools.jsf.ui.bot.test.cssdialog.jbide.JBIDE3577Test;
@@ -20,32 +17,34 @@
import org.jboss.tools.jsf.ui.bot.test.smoke.OpenOnTest;
import org.jboss.tools.jsf.ui.bot.test.templates.SetTemplateForUnknownTagTest;
import org.jboss.tools.jsf.ui.bot.test.templates.UnknownTemplateTest;
+import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite.SuiteClasses;
/**
*
- * This is a sample swtbot testcase for an eclipse application.
+ * These are all JSF SWTBot tests for JBDS.
*
*/
+(a)RunWith(RequirementAwareSuite.class)
+@SuiteClasses ({
+ CreateNewJSFProjectTest.class,
+ AddRemoveJSFCapabilitiesTest.class,
+ JBIDE3148and4441Test.class,
+ JBIDE4391Test.class,
+ JBIDE3577Test.class,
+ JBIDE3579Test.class,
+ JBIDE3920Test.class,
+ UnknownTemplateTest.class,
+ SetTemplateForUnknownTagTest.class,
+ CSSSelectorJBIDE3288.class,
+ JSF2MoveParticipantTest.class,
+ JSF2RenameParticipantTest.class,
+ JSF2AttributeRenameTest.class,
+ OpenOnTest.class,
+ CodeCompletionTest.class,
+ FacesConfigCodeCompletionTest.class,
+ MarkersTest.class
+})
public class JSFAllBotTests{
- public static Test suite(){
- TestSuite suite = new TestSuite("JSF all tests"); //$NON-NLS-1$
- suite.addTestSuite(CreateNewJSFProjectTest.class);
- suite.addTestSuite(AddRemoveJSFCapabilitiesTest.class);
- suite.addTestSuite(JBIDE3148and4441Test.class);
- suite.addTestSuite(JBIDE4391Test.class);
- suite.addTestSuite(JBIDE3577Test.class);
- suite.addTestSuite(JBIDE3579Test.class);
- suite.addTestSuite(JBIDE3920Test.class);
- suite.addTestSuite(UnknownTemplateTest.class);
- suite.addTestSuite(SetTemplateForUnknownTagTest.class);
- suite.addTestSuite(CSSSelectorJBIDE3288.class);
- suite.addTestSuite(JSF2MoveParticipantTest.class);
- suite.addTestSuite(JSF2RenameParticipantTest.class);
- suite.addTestSuite(JSF2AttributeRenameTest.class);
- suite.addTestSuite(OpenOnTest.class);
- suite.addTestSuite(CodeCompletionTest.class);
- suite.addTestSuite(FacesConfigCodeCompletionTest.class);
- suite.addTestSuite(MarkersTest.class);
- return suite;
- }
}
\ No newline at end of file
14 years, 8 months
- 1
- 0
JBoss Tools SVN: r34014 - trunk/build/aggregate/bottests-site/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke.
by jbosstools-commits＠lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2011-08-17 12:54:59 -0400 (Wed, 17 Aug 2011)
New Revision: 34014
Modified:
trunk/build/aggregate/bottests-site/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/DomainSpecificLanguageEditorTest.java
trunk/build/aggregate/bottests-site/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/ManageDroolsProject.java
Log:
SWTEclipseExt.getFormattedTreeNodesText() method has changed signature.
Modified: trunk/build/aggregate/bottests-site/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/DomainSpecificLanguageEditorTest.java
===================================================================
--- trunk/build/aggregate/bottests-site/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/DomainSpecificLanguageEditorTest.java 2011-08-17 15:50:35 UTC (rev 34013)
+++ trunk/build/aggregate/bottests-site/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/DomainSpecificLanguageEditorTest.java 2011-08-17 16:54:59 UTC (rev 34014)
@@ -139,7 +139,7 @@
assertTrue("File "
+ sampleDrlFileName
+ " was not udpated properly. There are these errors: "
- + SWTEclipseExt.getFormattedTreeNodesText(bot.tree(), errors),
+ + SWTEclipseExt.getFormattedTreeNodesText(errors),
errors == null || errors.length == 0);
SWTBotTreeItem[] warnings = ProblemsView
@@ -151,7 +151,7 @@
assertTrue("File "
+ sampleDrlFileName
+ " was not udpated properly. There are these warnings: "
- + SWTEclipseExt.getFormattedTreeNodesText(bot.tree(), warnings),
+ + SWTEclipseExt.getFormattedTreeNodesText(warnings),
warnings == null || warnings.length == 0);
}
/**
Modified: trunk/build/aggregate/bottests-site/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/ManageDroolsProject.java
===================================================================
--- trunk/build/aggregate/bottests-site/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/ManageDroolsProject.java 2011-08-17 15:50:35 UTC (rev 34013)
+++ trunk/build/aggregate/bottests-site/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/ManageDroolsProject.java 2011-08-17 16:54:59 UTC (rev 34014)
@@ -84,13 +84,13 @@
assertTrue("Project "
+ droolsProjectName
+ " was not created properly. There are these errors: "
- + SWTEclipseExt.getFormattedTreeNodesText(bot.tree(), errors),
+ + SWTEclipseExt.getFormattedTreeNodesText(errors),
errors == null || errors.length == 0);
SWTBotTreeItem[] warnings = ProblemsView.getFilteredWarningsTreeItems(bot,null ,projectPath, null,null);
assertTrue("Project "
+ droolsProjectName
+ " was not created properly. There are these warnings: "
- + SWTEclipseExt.getFormattedTreeNodesText(bot.tree(), warnings),
+ + SWTEclipseExt.getFormattedTreeNodesText(warnings),
warnings == null || warnings.length == 0);
}
14 years, 8 months
- 1
- 0
JBoss Tools SVN: r34013 - trunk/modeshape/tests/org.jboss.tools.modeshape.rest.ui.bot.test/src/org/jboss/tools/modeshape/rest/ui/bot/tests.
by jbosstools-commits＠lists.jboss.org
Author: psrna
Date: 2011-08-17 11:50:35 -0400 (Wed, 17 Aug 2011)
New Revision: 34013
Modified:
trunk/modeshape/tests/org.jboss.tools.modeshape.rest.ui.bot.test/src/org/jboss/tools/modeshape/rest/ui/bot/tests/Publishing.java
trunk/modeshape/tests/org.jboss.tools.modeshape.rest.ui.bot.test/src/org/jboss/tools/modeshape/rest/ui/bot/tests/TeiidFilesPublishing.java
Log:
* maintenance
Modified: trunk/modeshape/tests/org.jboss.tools.modeshape.rest.ui.bot.test/src/org/jboss/tools/modeshape/rest/ui/bot/tests/Publishing.java
===================================================================
--- trunk/modeshape/tests/org.jboss.tools.modeshape.rest.ui.bot.test/src/org/jboss/tools/modeshape/rest/ui/bot/tests/Publishing.java 2011-08-17 15:33:54 UTC (rev 34012)
+++ trunk/modeshape/tests/org.jboss.tools.modeshape.rest.ui.bot.test/src/org/jboss/tools/modeshape/rest/ui/bot/tests/Publishing.java 2011-08-17 15:50:35 UTC (rev 34013)
@@ -18,7 +18,7 @@
import org.jboss.tools.ui.bot.ext.SWTEclipseExt;
import org.jboss.tools.ui.bot.ext.SWTTestExt;
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.ServerType;
import org.jboss.tools.ui.bot.ext.gen.ActionItem;
@@ -35,7 +35,7 @@
* @author psrna
*
*/
-@SWTBotTestRequires(server=(a)Server(type=ServerType.SOA,version="5.1"),perspective="Java EE")
+@Require(server=(a)Server(type=ServerType.SOA,version="5.1"),perspective="Java EE")
public class Publishing extends SWTTestExt{
private static final String CONNERR_MSG = "Unable to connect using the specified server properties." +
Modified: trunk/modeshape/tests/org.jboss.tools.modeshape.rest.ui.bot.test/src/org/jboss/tools/modeshape/rest/ui/bot/tests/TeiidFilesPublishing.java
===================================================================
--- trunk/modeshape/tests/org.jboss.tools.modeshape.rest.ui.bot.test/src/org/jboss/tools/modeshape/rest/ui/bot/tests/TeiidFilesPublishing.java 2011-08-17 15:33:54 UTC (rev 34012)
+++ trunk/modeshape/tests/org.jboss.tools.modeshape.rest.ui.bot.test/src/org/jboss/tools/modeshape/rest/ui/bot/tests/TeiidFilesPublishing.java 2011-08-17 15:50:35 UTC (rev 34013)
@@ -23,7 +23,7 @@
import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell;
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.ServerType;
import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper;
@@ -38,7 +38,7 @@
* @author psrna
*
*/
-@SWTBotTestRequires(server=(a)Server(type=ServerType.SOA,version="5.1"), perspective="Teiid Designer")
+@Require(server=(a)Server(type=ServerType.SOA,version="5.1"), perspective="Teiid Designer")
public class TeiidFilesPublishing extends SWTTestExt{
private static final String CONNERR_MSG = "Unable to connect using the specified server properties." +
14 years, 8 months
- 1
- 0
JBoss Tools SVN: r34012 - in trunk: esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests and 13 other directories.
by jbosstools-commits＠lists.jboss.org
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="Java")
+@Require(server=(a)Server(type=ServerType.SOA,state=ServerState.Running),perspective="Java")
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=(a)Server(state=ServerState.NotRunning),perspective="Seam",seam=@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="2.2"))
+@Require(server=@Server(state=ServerState.Running),seam=(a)Seam(version="2.2"))
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="2.2"))
+@Require(server=@Server(state=ServerState.Running),seam=(a)Seam(version="2.2"))
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_tools_tutoria...">Struts 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="Java EE")
+@Require(server=(a)Server(type=ServerType.EPP),perspective="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="Java EE")
+@Require(server=(a)Server(type=ServerType.JbossAS),perspective="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="Java EE")
+@Require(server=(a)Server(location=ServerLocation.Local),perspective="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="Java EE")
+@Require(server=(a)Server(state=ServerState.NotRunning),perspective="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="Java EE")
+@Require(server=(a)Server(location=ServerLocation.Remote),perspective="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="Java EE")
+@Require(server=(a)Server(state=ServerState.Running),perspective="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
14 years, 8 months
- 1
- 0
JBoss Tools SVN: r34011 - in trunk/tests/plugins/org.jboss.tools.ui.bot.ext: src/org/jboss/tools/ui/bot/ext/config and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: lzoubek(a)redhat.com
Date: 2011-08-17 11:20:25 -0400 (Wed, 17 Aug 2011)
New Revision: 34011
Modified:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/resources/SWTBotTest-default.properties
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/ServerBean.java
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/requirement/AddServer.java
Log:
botext:rename JBOSS_AS server config proeperty to AS
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/resources/SWTBotTest-default.properties
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/resources/SWTBotTest-default.properties 2011-08-17 14:39:34 UTC (rev 34010)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/resources/SWTBotTest-default.properties 2011-08-17 15:20:25 UTC (rev 34011)
@@ -2,7 +2,7 @@
# all properties are optional, all defined paths should exist
# <java version>,<jre/jdk home>
JAVA=1.6,/opt/sun-jdk-1.6.0.19/jre
-#EAP|JBOSS_AS|EPP|SOA,<server version>,<jre version to run with>|default,<server home>,<optional remote system host>,<optional remote home>
+#EAP|AS|EPP|SOA,<server version>,<jre version to run with>|default,<server home>,<optional remote system host>,<optional remote home>
# note : when server is type of SOA, version is version of SOA (not the bundled EAP)
SERVER=EAP,5.0,1.6,/data/jboss/jboss-eap-5.0/jboss-as
#SERVER=EAP,5.0,1.6,/data/jboss/jboss-eap-5.0/jboss-as,remote.example.com,/opt/jboss-eap-5.0/jboss-as
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/ServerBean.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/ServerBean.java 2011-08-17 14:39:34 UTC (rev 34010)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/ServerBean.java 2011-08-17 15:20:25 UTC (rev 34011)
@@ -28,7 +28,7 @@
// where to unzip it?
File runtimeOutput;
File runtimeHomeAbs = new File(runtimeHome).getAbsoluteFile();
- if (TestConfigurator.Values.SERVER_TYPE_JBOSSAS.equals(type)) {
+ if (TestConfigurator.Values.SERVER_TYPE_AS.equals(type)) {
runtimeOutput=runtimeHomeAbs.getParentFile();
}
else {
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 14:39:34 UTC (rev 34010)
+++ 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)
@@ -58,7 +58,7 @@
public static final String SERVER_TYPE_EPP = "EPP";
public static final String SERVER_TYPE_EAP = "EAP";
public static final String SERVER_TYPE_SOA = "SOA";
- public static final String SERVER_TYPE_JBOSSAS = "JBOSS_AS";
+ public static final String SERVER_TYPE_AS = "AS";
public static final String SERVER_WITH_DEFAULT_JAVA = "default";
}
/**
@@ -208,7 +208,7 @@
}
if (s.type().equals(ServerType.JbossAS)
&& !currentConfig.getServer().type
- .equals(Values.SERVER_TYPE_JBOSSAS)) {
+ .equals(Values.SERVER_TYPE_AS)) {
ReasonLogger.serverTypeMatch(s.type().toString(), currentConfig.getServer().type);
return null;
}
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/requirement/AddServer.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/requirement/AddServer.java 2011-08-17 14:39:34 UTC (rev 34010)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/requirement/AddServer.java 2011-08-17 15:20:25 UTC (rev 34011)
@@ -140,7 +140,7 @@
}
}
- else if (TestConfigurator.Values.SERVER_TYPE_JBOSSAS.equals(serverType)) {
+ else if (TestConfigurator.Values.SERVER_TYPE_AS.equals(serverType)) {
if ("4.2".equals(version)) {
return new ServerInfo(JBossCommunityJBoss42Runtime.LABEL,JBossCommunityJBossAS42.LABEL);
}
14 years, 8 months
- 1
- 0
JBoss Tools SVN: r34010 - in trunk: jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide and 11 other directories.
by jbosstools-commits＠lists.jboss.org
Author: lzoubek(a)redhat.com
Date: 2011-08-17 10:39:34 -0400 (Wed, 17 Aug 2011)
New Revision: 34010
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/JSFAutoTestCase.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/CSSSelectorJBIDE3288.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3148and4441Test.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3577Test.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3579Test.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3920Test.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE4391Test.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2AbstractRefactorTest.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2AttributeRenameTest.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2MoveParticipantTest.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2RenameParticipantTest.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/AddRemoveJSFCapabilitiesTest.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/CodeCompletionTest.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/FacesConfigCodeCompletionTest.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/MarkersTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllBotTests.java
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/editor/EditingActionsTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/InsertActionsTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/MinMaxPanesTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/TextEditingActionsTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/TextSelectionTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VPEEditorTestCase.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/AddSubstitutedELExpressionFolderScopeTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/EditingELValueTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/ManipulatingELValueTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/SubstitutedELTestCase.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/BorderForUnknownTagsTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ChangeEditorTabForTheFirstOpenPageTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/GlobalELVariablesTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/PreferencesTestCase.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/PromptForTagAttributesDuringTagInsertTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ShowResourceBundlesUsageasELexpressionsTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/selectionbar/SelectionBarTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/AbstractTagTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/CoreHTMLTagsTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/JSFTagsTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/palette/CancelTagLibDefenitionTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/palette/ImportTagsFromTLDFileTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/smoke/CodeCompletionTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/smoke/MarkersTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/ExternalizeAllStringsDialogTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/NewXHTMLPageWizardTest.java
Log:
fixing vpe bot tests to run with ReqAwareSuite
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/JSFAutoTestCase.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/JSFAutoTestCase.java 2011-08-17 14:36:59 UTC (rev 34009)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/JSFAutoTestCase.java 2011-08-17 14:39:34 UTC (rev 34010)
@@ -73,7 +73,7 @@
}
@Override
- protected void tearDown() throws Exception {
+ public void tearDown() throws Exception {
// Restore page state before tests
if (editor != null) {
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/CSSSelectorJBIDE3288.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/CSSSelectorJBIDE3288.java 2011-08-17 14:36:59 UTC (rev 34009)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/CSSSelectorJBIDE3288.java 2011-08-17 14:39:34 UTC (rev 34010)
@@ -54,13 +54,13 @@
SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot();
SWTBotTree tree = innerBot.tree();
try {
- tree.expandNode(projectProperties.getProperty("JSFProjectName")). //$NON-NLS-1$
+ tree.expandNode(JBT_TEST_PROJECT_NAME). //$NON-NLS-1$
expandNode("WebContent").expandNode("pages").getNode(CSS_FILE_NAME+".css").doubleClick(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
bot.editorByTitle(CSS_FILE_NAME+".css").setFocus(); //$NON-NLS-1$
bot.menu("Edit").menu("Select All").click(); //$NON-NLS-1$//$NON-NLS-2$
bot.menu("Edit").menu("Delete").click(); //$NON-NLS-1$ //$NON-NLS-2$
} catch (WidgetNotFoundException e) {
- tree.expandNode(projectProperties.getProperty("JSFProjectName")).expandNode("WebContent").getNode("pages").select(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ tree.expandNode(JBT_TEST_PROJECT_NAME).expandNode("WebContent").getNode("pages").select(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
open.newObject(ActionItem.NewObject.WebCSS.LABEL);
bot.shell("New CSS File").activate(); //$NON-NLS-1$
bot.textWithLabel("File name:").setText(CSS_FILE_NAME); //$NON-NLS-1$
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3148and4441Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3148and4441Test.java 2011-08-17 14:36:59 UTC (rev 34009)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3148and4441Test.java 2011-08-17 14:39:34 UTC (rev 34010)
@@ -20,13 +20,13 @@
SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot();
SWTBotTree tree = innerBot.tree();
try {
- tree.expandNode(projectProperties.getProperty("JSFProjectName")). //$NON-NLS-1$
+ tree.expandNode(JBT_TEST_PROJECT_NAME). //$NON-NLS-1$
getNode(CSS_FILE_NAME+".css").doubleClick(); //$NON-NLS-1$
bot.editorByTitle(CSS_FILE_NAME+".css").setFocus(); //$NON-NLS-1$
bot.menu("Edit").menu("Select All").click(); //$NON-NLS-1$//$NON-NLS-2$
bot.menu("Edit").menu("Delete").click(); //$NON-NLS-1$ //$NON-NLS-2$
} catch (WidgetNotFoundException e) {
- tree.getTreeItem(projectProperties.getProperty("JSFProjectName")).select(); //$NON-NLS-1$
+ tree.getTreeItem(JBT_TEST_PROJECT_NAME).select(); //$NON-NLS-1$
open.newObject(ActionItem.NewObject.WebCSS.LABEL);
bot.shell("New CSS File").activate(); //$NON-NLS-1$
bot.textWithLabel("File name:").setText(CSS_FILE_NAME); //$NON-NLS-1$
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3577Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3577Test.java 2011-08-17 14:36:59 UTC (rev 34009)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3577Test.java 2011-08-17 14:39:34 UTC (rev 34010)
@@ -20,13 +20,13 @@
SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot();
SWTBotTree tree = innerBot.tree();
try {
- tree.expandNode(projectProperties.getProperty("JSFProjectName")). //$NON-NLS-1$
+ tree.expandNode(JBT_TEST_PROJECT_NAME). //$NON-NLS-1$
getNode(CSS_FILE_NAME+".css").doubleClick(); //$NON-NLS-1$
bot.editorByTitle(CSS_FILE_NAME+".css").setFocus(); //$NON-NLS-1$
bot.menu("Edit").menu("Select All").click(); //$NON-NLS-1$ //$NON-NLS-2$
bot.menu("Edit").menu("Delete").click(); //$NON-NLS-1$//$NON-NLS-2$
} catch (WidgetNotFoundException e) {
- tree.getTreeItem(projectProperties.getProperty("JSFProjectName")).select(); //$NON-NLS-1$
+ tree.getTreeItem(JBT_TEST_PROJECT_NAME).select(); //$NON-NLS-1$
open.newObject(ActionItem.NewObject.WebCSS.LABEL);
bot.shell("New CSS File").activate(); //$NON-NLS-1$
bot.textWithLabel("File name:").setText(CSS_FILE_NAME); //$NON-NLS-1$
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3579Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3579Test.java 2011-08-17 14:36:59 UTC (rev 34009)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3579Test.java 2011-08-17 14:39:34 UTC (rev 34010)
@@ -20,13 +20,13 @@
SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot();
SWTBotTree tree = innerBot.tree();
try {
- tree.expandNode(projectProperties.getProperty("JSFProjectName")). //$NON-NLS-1$
+ tree.expandNode(JBT_TEST_PROJECT_NAME). //$NON-NLS-1$
getNode(CSS_FILE_NAME+".css").doubleClick(); //$NON-NLS-1$
bot.editorByTitle(CSS_FILE_NAME+".css").setFocus(); //$NON-NLS-1$
bot.menu("Edit").menu("Select All").click(); //$NON-NLS-1$//$NON-NLS-2$
bot.menu("Edit").menu("Delete").click(); //$NON-NLS-1$ //$NON-NLS-2$
} catch (WidgetNotFoundException e) {
- tree.getTreeItem(projectProperties.getProperty("JSFProjectName")).select(); //$NON-NLS-1$
+ tree.getTreeItem(JBT_TEST_PROJECT_NAME).select(); //$NON-NLS-1$
open.newObject(ActionItem.NewObject.WebCSS.LABEL); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
bot.shell("New CSS File").activate(); //$NON-NLS-1$
bot.textWithLabel("File name:").setText(CSS_FILE_NAME); //$NON-NLS-1$
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3920Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3920Test.java 2011-08-17 14:36:59 UTC (rev 34009)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3920Test.java 2011-08-17 14:39:34 UTC (rev 34010)
@@ -17,13 +17,13 @@
SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot();
SWTBotTree tree = innerBot.tree();
try {
- tree.expandNode(projectProperties.getProperty("JSFProjectName")). //$NON-NLS-1$
+ tree.expandNode(JBT_TEST_PROJECT_NAME). //$NON-NLS-1$
getNode(CSS_FILE_NAME+".css").doubleClick(); //$NON-NLS-1$
bot.editorByTitle(CSS_FILE_NAME+".css").setFocus(); //$NON-NLS-1$
bot.menu("Edit").menu("Select All").click(); //$NON-NLS-1$//$NON-NLS-2$
bot.menu("Edit").menu("Delete").click(); //$NON-NLS-1$ //$NON-NLS-2$
} catch (WidgetNotFoundException e) {
- tree.getTreeItem(projectProperties.getProperty("JSFProjectName")).select(); //$NON-NLS-1$
+ tree.getTreeItem(JBT_TEST_PROJECT_NAME).select(); //$NON-NLS-1$
open.newObject(ActionItem.NewObject.WebCSS.LABEL); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
bot.shell("New CSS File").activate(); //$NON-NLS-1$
bot.textWithLabel("File name:").setText(CSS_FILE_NAME); //$NON-NLS-1$
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE4391Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE4391Test.java 2011-08-17 14:36:59 UTC (rev 34009)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE4391Test.java 2011-08-17 14:39:34 UTC (rev 34010)
@@ -20,13 +20,13 @@
SWTBot innerBot= bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot();
SWTBotTree tree = innerBot.tree();
try {
- tree.expandNode(projectProperties.getProperty("JSFProjectName")). //$NON-NLS-1$
+ tree.expandNode(JBT_TEST_PROJECT_NAME). //$NON-NLS-1$
getNode(CSS_FILE_NAME+".css").doubleClick(); //$NON-NLS-1$
bot.editorByTitle(CSS_FILE_NAME+".css").setFocus(); //$NON-NLS-1$
bot.menu("Edit").menu("Select All").click(); //$NON-NLS-1$ //$NON-NLS-2$
bot.menu("Edit").menu("Delete").click(); //$NON-NLS-1$ //$NON-NLS-2$
} catch (WidgetNotFoundException e) {
- tree.getTreeItem(projectProperties.getProperty("JSFProjectName")).select(); //$NON-NLS-1$
+ tree.getTreeItem(JBT_TEST_PROJECT_NAME).select(); //$NON-NLS-1$
open.newObject(ActionItem.NewObject.WebCSS.LABEL);; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
bot.shell("New CSS File").activate(); //$NON-NLS-1$
bot.textWithLabel("File name:").setText(CSS_FILE_NAME); //$NON-NLS-1$
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2AbstractRefactorTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2AbstractRefactorTest.java 2011-08-17 14:36:59 UTC (rev 34009)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2AbstractRefactorTest.java 2011-08-17 14:39:34 UTC (rev 34010)
@@ -16,33 +16,33 @@
.bot();
SWTBotTree tree = innerBot.tree();
try {
- tree.expandNode(projectProperties.getProperty("JSFProjectName")).expandNode("WebContent").expandNode("resources").select(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ tree.expandNode(JBT_TEST_PROJECT_NAME).expandNode("WebContent").expandNode("resources").select(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
} catch (WidgetNotFoundException e) {
- tree.getTreeItem(projectProperties.getProperty("JSFProjectName")).expandNode("WebContent").select(); //$NON-NLS-1$ //$NON-NLS-2$
+ tree.getTreeItem(JBT_TEST_PROJECT_NAME).expandNode("WebContent").select(); //$NON-NLS-1$ //$NON-NLS-2$
bot.menu("File").menu("New").menu("Folder").click(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
bot.textWithLabel("Folder name:").setText("resources"); //$NON-NLS-1$ //$NON-NLS-2$
bot.button("Finish").click(); //$NON-NLS-1$
}
try {
- tree.expandNode(projectProperties.getProperty("JSFProjectName")).expandNode("WebContent").expandNode("resources").expandNode("mycomp").select(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ tree.expandNode(JBT_TEST_PROJECT_NAME).expandNode("WebContent").expandNode("resources").expandNode("mycomp").select(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
} catch (WidgetNotFoundException e) {
- tree.getTreeItem(projectProperties.getProperty("JSFProjectName")).expandNode("WebContent").expandNode("resources").select(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ tree.getTreeItem(JBT_TEST_PROJECT_NAME).expandNode("WebContent").expandNode("resources").select(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
bot.menu("File").menu("New").menu("Folder").click(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
bot.textWithLabel("Folder name:").setText("mycomp"); //$NON-NLS-1$ //$NON-NLS-2$
bot.button("Finish").click(); //$NON-NLS-1$
}
try {
- tree.expandNode(projectProperties.getProperty("JSFProjectName")).expandNode("WebContent").expandNode("resources").expandNode("mycomp").select(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ tree.expandNode(JBT_TEST_PROJECT_NAME).expandNode("WebContent").expandNode("resources").expandNode("mycomp").select(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
} catch (WidgetNotFoundException e) {
- tree.getTreeItem(projectProperties.getProperty("JSFProjectName")).expandNode("WebContent").expandNode("resources").select(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ tree.getTreeItem(JBT_TEST_PROJECT_NAME).expandNode("WebContent").expandNode("resources").select(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
bot.menu("File").menu("New").menu("Folder").click(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
bot.textWithLabel("Folder name:").setText("mycomp"); //$NON-NLS-1$ //$NON-NLS-2$
bot.button("Finish").click(); //$NON-NLS-1$
}
try {
- tree.expandNode(projectProperties.getProperty("JSFProjectName")).expandNode("WebContent").expandNode("resources").expandNode("mycomp").expandNode("echo.xhtml"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
+ tree.expandNode(JBT_TEST_PROJECT_NAME).expandNode("WebContent").expandNode("resources").expandNode("mycomp").expandNode("echo.xhtml"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
} catch (WidgetNotFoundException e) {
- tree.getTreeItem(projectProperties.getProperty("JSFProjectName")).expandNode("WebContent").expandNode("resources").expandNode("mycomp").select(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ tree.getTreeItem(JBT_TEST_PROJECT_NAME).expandNode("WebContent").expandNode("resources").expandNode("mycomp").select(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
bot.menu("File").menu("New").menu("Other...").click(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
bot.shell("New").activate(); //$NON-NLS-1$
tree = bot.tree();
@@ -67,10 +67,10 @@
.bot();
SWTBotTree tree = innerBot.tree();
try {
- tree.expandNode(projectProperties.getProperty("JSFProjectName")).expandNode("WebContent"). //$NON-NLS-1$ //$NON-NLS-2$
+ tree.expandNode(JBT_TEST_PROJECT_NAME).expandNode("WebContent"). //$NON-NLS-1$ //$NON-NLS-2$
getNode(JSF2_Test_Page_Name + ".xhtml").doubleClick(); //$NON-NLS-1$
} catch (WidgetNotFoundException e) {
- tree.getTreeItem(projectProperties.getProperty("JSFProjectName")).select(); //$NON-NLS-1$
+ tree.getTreeItem(JBT_TEST_PROJECT_NAME).select(); //$NON-NLS-1$
bot.menu("File").menu("New").menu("Other...").click(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
bot.shell("New").activate(); //$NON-NLS-1$
tree = bot.tree();
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2AttributeRenameTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2AttributeRenameTest.java 2011-08-17 14:36:59 UTC (rev 34009)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2AttributeRenameTest.java 2011-08-17 14:39:34 UTC (rev 34010)
@@ -33,7 +33,7 @@
SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER)
.bot();
SWTBotTree tree = innerBot.tree();
- tree.expandNode(projectProperties.getProperty("JSFProjectName")).expandNode("WebContent").expandNode(JSF2_Test_Page_Name + ".xhtml").doubleClick(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ tree.expandNode(JBT_TEST_PROJECT_NAME).expandNode("WebContent").expandNode(JSF2_Test_Page_Name + ".xhtml").doubleClick(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
delay();
SWTBotEclipseEditor editor = bot.editorByTitle(
JSF2_Test_Page_Name + ".xhtml").toTextEditor(); //$NON-NLS-1$
@@ -43,7 +43,7 @@
editor.close();
innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot();
tree = innerBot.tree();
- tree.expandNode(projectProperties.getProperty("JSFProjectName")).expandNode("WebContent").expandNode("resources").expandNode("mycomp").expandNode("echo.xhtml").doubleClick(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
+ tree.expandNode(JBT_TEST_PROJECT_NAME).expandNode("WebContent").expandNode("resources").expandNode("mycomp").expandNode("echo.xhtml").doubleClick(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
delay();
editor = bot.editorByTitle("echo.xhtml").toTextEditor(); //$NON-NLS-1$
assertEquals(
@@ -56,7 +56,7 @@
SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER)
.bot();
SWTBotTree tree = innerBot.tree();
- tree.expandNode(projectProperties.getProperty("JSFProjectName")).expandNode("WebContent").expandNode("resources").expandNode("mycomp").expandNode("echo.xhtml").doubleClick(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
+ tree.expandNode(JBT_TEST_PROJECT_NAME).expandNode("WebContent").expandNode("resources").expandNode("mycomp").expandNode("echo.xhtml").doubleClick(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
SWTBotEclipseEditor editor = bot
.editorByTitle("echo.xhtml").toTextEditor(); //$NON-NLS-1$
bot.menu("Edit").menu("Select All").click(); //$NON-NLS-1$ //$NON-NLS-2$
@@ -68,15 +68,15 @@
}
@Override
- protected void tearDown() throws Exception {
+ public void tearDown() throws Exception {
SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER)
.bot();
SWTBotTree tree = innerBot.tree();
- tree.expandNode(projectProperties.getProperty("JSFProjectName")).expandNode("WebContent").expandNode(JSF2_Test_Page_Name + ".xhtml").select(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ tree.expandNode(JBT_TEST_PROJECT_NAME).expandNode("WebContent").expandNode(JSF2_Test_Page_Name + ".xhtml").select(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
bot.menu("Edit").menu("Delete").click(); //$NON-NLS-1$ //$NON-NLS-2$
bot.button("OK").click(); //$NON-NLS-1$
delay();
- tree.expandNode(projectProperties.getProperty("JSFProjectName")).expandNode("WebContent").expandNode("resources").expandNode("mycomp").expandNode("echo.xhtml").select(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
+ tree.expandNode(JBT_TEST_PROJECT_NAME).expandNode("WebContent").expandNode("resources").expandNode("mycomp").expandNode("echo.xhtml").select(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
bot.menu("Edit").menu("Delete").click(); //$NON-NLS-1$ //$NON-NLS-2$
bot.button("OK").click(); //$NON-NLS-1$
delay();
@@ -86,8 +86,8 @@
private void checkPreview() throws IOException {
delay();
SWTBotTree tree = bot.tree();
- tree.expandNode("Composite attribute name changes").expandNode("echo.xhtml - " + projectProperties.getProperty("JSFProjectName") + "/WebContent/resources/mycomp").expandNode("Rename composite attribute name"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
- tree.expandNode("Composite attribute name changes").expandNode("jsf2TestPage.xhtml - " + projectProperties.getProperty("JSFProjectName") + "/WebContent").expandNode("Rename composite attribute"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
+ tree.expandNode("Composite attribute name changes").expandNode("echo.xhtml - " + JBT_TEST_PROJECT_NAME + "/WebContent/resources/mycomp").expandNode("Rename composite attribute name"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
+ tree.expandNode("Composite attribute name changes").expandNode("jsf2TestPage.xhtml - " + JBT_TEST_PROJECT_NAME + "/WebContent").expandNode("Rename composite attribute"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
SWTBotStyledText styledText = bot.styledText(0);
assertEquals(
loadFileContent("refactor/compositeComponent.html"), styledText.getText()); //$NON-NLS-1$
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2MoveParticipantTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2MoveParticipantTest.java 2011-08-17 14:36:59 UTC (rev 34009)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2MoveParticipantTest.java 2011-08-17 14:39:34 UTC (rev 34010)
@@ -21,7 +21,7 @@
.bot();
SWTBotTree tree = innerBot.tree();
tree
- .expandNode(projectProperties.getProperty("JSFProjectName")).expandNode("WebContent").expandNode(JSF2_Test_Page_Name + ".xhtml").doubleClick(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ .expandNode(JBT_TEST_PROJECT_NAME).expandNode("WebContent").expandNode(JSF2_Test_Page_Name + ".xhtml").doubleClick(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
delay();
SWTBotEclipseEditor editor = bot.editorByTitle(
JSF2_Test_Page_Name + ".xhtml").toTextEditor(); //$NON-NLS-1$
@@ -36,12 +36,12 @@
.bot();
SWTBotTree tree = innerBot.tree();
tree
- .expandNode(projectProperties.getProperty("JSFProjectName")).expandNode("WebContent").expandNode("resources").expandNode("mycomp").select(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ .expandNode(JBT_TEST_PROJECT_NAME).expandNode("WebContent").expandNode("resources").expandNode("mycomp").select(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
bot.menu("Refactor").menu("Move...").click(); //$NON-NLS-1$ //$NON-NLS-2$
innerBot = bot.shell("Move").bot(); //$NON-NLS-1$
tree = innerBot.tree();
tree
- .expandNode(projectProperties.getProperty("JSFProjectName")).expandNode("WebContent").expandNode("resources").expandNode("mycomp1").select(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ .expandNode(JBT_TEST_PROJECT_NAME).expandNode("WebContent").expandNode("resources").expandNode("mycomp1").select(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
bot.button("Preview >").click(); //$NON-NLS-1$
checkPreview();
bot.button("OK").click(); //$NON-NLS-1$
@@ -55,11 +55,11 @@
SWTBotTree tree = innerBot.tree();
try {
tree
- .expandNode(projectProperties.getProperty("JSFProjectName")).expandNode("WebContent").expandNode("resources").expandNode("mycomp1").select(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ .expandNode(JBT_TEST_PROJECT_NAME).expandNode("WebContent").expandNode("resources").expandNode("mycomp1").select(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
} catch (WidgetNotFoundException e) {
tree
.getTreeItem(
- projectProperties.getProperty("JSFProjectName")).expandNode("WebContent").expandNode("resources").select(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ JBT_TEST_PROJECT_NAME).expandNode("WebContent").expandNode("resources").select(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
bot.menu("File").menu("New").menu("Folder").click(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
bot.textWithLabel("Folder name:").setText("mycomp1"); //$NON-NLS-1$ //$NON-NLS-2$
bot.button("Finish").click(); //$NON-NLS-1$
@@ -68,18 +68,18 @@
}
@Override
- protected void tearDown() throws Exception {
+ public void tearDown() throws Exception {
SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER)
.bot();
SWTBotTree tree = innerBot.tree();
delay();
tree
- .expandNode(projectProperties.getProperty("JSFProjectName")).expandNode("WebContent").expandNode(JSF2_Test_Page_Name + ".xhtml").select(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ .expandNode(JBT_TEST_PROJECT_NAME).expandNode("WebContent").expandNode(JSF2_Test_Page_Name + ".xhtml").select(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
bot.menu("Edit").menu("Delete").click(); //$NON-NLS-1$ //$NON-NLS-2$
bot.button("OK").click(); //$NON-NLS-1$
delay();
tree
- .expandNode(projectProperties.getProperty("JSFProjectName")).expandNode("WebContent").expandNode("resources").expandNode("mycomp1").select(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ .expandNode(JBT_TEST_PROJECT_NAME).expandNode("WebContent").expandNode("resources").expandNode("mycomp1").select(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
bot.menu("Edit").menu("Delete").click(); //$NON-NLS-1$ //$NON-NLS-2$
bot.button("OK").click(); //$NON-NLS-1$
delay();
@@ -90,7 +90,7 @@
delay();
SWTBotTree tree = bot.tree();
tree
- .expandNode("Rename composite URI changes").expandNode("jsf2TestPage.xhtml - " + projectProperties.getProperty("JSFProjectName") + "/WebContent").expandNode("Rename composite URI"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
+ .expandNode("Rename composite URI changes").expandNode("jsf2TestPage.xhtml - " + JBT_TEST_PROJECT_NAME + "/WebContent").expandNode("Rename composite URI"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
}
}
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2RenameParticipantTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2RenameParticipantTest.java 2011-08-17 14:36:59 UTC (rev 34009)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2RenameParticipantTest.java 2011-08-17 14:39:34 UTC (rev 34010)
@@ -19,7 +19,7 @@
.bot();
SWTBotTree tree = innerBot.tree();
tree
- .expandNode(projectProperties.getProperty("JSFProjectName")).expandNode("WebContent").expandNode("resources").expandNode("mycomp").expandNode("echo.xhtml").select(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
+ .expandNode(JBT_TEST_PROJECT_NAME).expandNode("WebContent").expandNode("resources").expandNode("mycomp").expandNode("echo.xhtml").select(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
bot.menu("Refactor").menu("Rename...").click(); //$NON-NLS-1$ //$NON-NLS-2$
bot.textWithLabel("New name:").setText("echo1.xhtml"); //$NON-NLS-1$ //$NON-NLS-2$
bot.button("Preview >").click(); //$NON-NLS-1$
@@ -33,7 +33,7 @@
.bot();
SWTBotTree tree = innerBot.tree();
tree
- .expandNode(projectProperties.getProperty("JSFProjectName")).expandNode("WebContent").expandNode(JSF2_Test_Page_Name + ".xhtml").doubleClick(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ .expandNode(JBT_TEST_PROJECT_NAME).expandNode("WebContent").expandNode(JSF2_Test_Page_Name + ".xhtml").doubleClick(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
delay();
SWTBotEclipseEditor editor = bot.editorByTitle(
JSF2_Test_Page_Name + ".xhtml").toTextEditor(); //$NON-NLS-1$
@@ -44,17 +44,17 @@
}
@Override
- protected void tearDown() throws Exception {
+ public void tearDown() throws Exception {
SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER)
.bot();
SWTBotTree tree = innerBot.tree();
tree
- .expandNode(projectProperties.getProperty("JSFProjectName")).expandNode("WebContent").expandNode(JSF2_Test_Page_Name + ".xhtml").select(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ .expandNode(JBT_TEST_PROJECT_NAME).expandNode("WebContent").expandNode(JSF2_Test_Page_Name + ".xhtml").select(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
bot.menu("Edit").menu("Delete").click(); //$NON-NLS-1$ //$NON-NLS-2$
bot.button("OK").click(); //$NON-NLS-1$
delay();
tree
- .expandNode(projectProperties.getProperty("JSFProjectName")).expandNode("WebContent").expandNode("resources").expandNode("mycomp").expandNode("echo1.xhtml").select(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
+ .expandNode(JBT_TEST_PROJECT_NAME).expandNode("WebContent").expandNode("resources").expandNode("mycomp").expandNode("echo1.xhtml").select(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
bot.menu("Edit").menu("Delete").click(); //$NON-NLS-1$ //$NON-NLS-2$
bot.button("OK").click(); //$NON-NLS-1$
delay();
@@ -65,7 +65,7 @@
delay();
SWTBotTree tree = bot.tree();
tree
- .expandNode("Rename composite component changes").expandNode("jsf2TestPage.xhtml - " + projectProperties.getProperty("JSFProjectName") + "/WebContent").expandNode("Rename composite component"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
+ .expandNode("Rename composite component changes").expandNode("jsf2TestPage.xhtml - " + JBT_TEST_PROJECT_NAME + "/WebContent").expandNode("Rename composite component"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
}
}
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/AddRemoveJSFCapabilitiesTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/AddRemoveJSFCapabilitiesTest.java 2011-08-17 14:36:59 UTC (rev 34009)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/AddRemoveJSFCapabilitiesTest.java 2011-08-17 14:39:34 UTC (rev 34010)
@@ -82,7 +82,7 @@
bot.textWithLabel("web.xml Location:*").setText(webXmlFileLocation);
bot.button(WidgetVariables.NEXT_BUTTON).click();
- SWTJBTExt.addServerToServerViewOnWizardPage(bot, JBOSS_SERVER_GROUP, JBOSS_SERVER_TYPE);
+ // SWTJBTExt.addServerToServerViewOnWizardPage(bot, JBOSS_SERVER_GROUP, JBOSS_SERVER_TYPE);
bot.sleep(1000L);
bot.button(IDELabel.Button.FINISH).click();
eclipse.closeWarningWindowIfOpened(true);
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/CodeCompletionTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/CodeCompletionTest.java 2011-08-17 14:36:59 UTC (rev 34009)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/CodeCompletionTest.java 2011-08-17 14:39:34 UTC (rev 34010)
@@ -391,7 +391,7 @@
}
@Override
- protected void tearDown() throws Exception {
+public void tearDown() throws Exception {
if (editor != null){
editor.setText(originalEditorText);
editor.saveAndClose();
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/FacesConfigCodeCompletionTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/FacesConfigCodeCompletionTest.java 2011-08-17 14:36:59 UTC (rev 34009)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/FacesConfigCodeCompletionTest.java 2011-08-17 14:39:34 UTC (rev 34010)
@@ -30,7 +30,7 @@
private SWTBotEditor facesConfigEditor;
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
facesConfigEditor = eclipse.openFile(VPEAutoTestCase.JBT_TEST_PROJECT_NAME,
"WebContent",
@@ -40,7 +40,7 @@
.selectPage(IDELabel.FacesConfigEditor.SOURCE_TAB_LABEL);
}
@Override
- protected void tearDown() throws Exception {
+public void tearDown() throws Exception {
if (facesConfigEditor != null){
facesConfigEditor.saveAndClose();
}
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/MarkersTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/MarkersTest.java 2011-08-17 14:36:59 UTC (rev 34009)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/MarkersTest.java 2011-08-17 14:39:34 UTC (rev 34010)
@@ -73,14 +73,14 @@
}
}
@Override
- protected void setUp() throws Exception {
+public void setUp() throws Exception {
super.setUp();
openPage(TEST_PAGE);
editor = SWTTestExt.bot.swtBotEditorExtByTitle(TEST_PAGE);
originalEditorText = editor.getText();
}
@Override
- protected void tearDown() throws Exception {
+public void tearDown() throws Exception {
if (editor != null){
editor.setText(originalEditorText);
editor.saveAndClose();
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllBotTests.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllBotTests.java 2011-08-17 14:36:59 UTC (rev 34009)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllBotTests.java 2011-08-17 14:39:34 UTC (rev 34010)
@@ -4,6 +4,7 @@
import junit.framework.Test;
import junit.framework.TestSuite;
import org.eclipse.swtbot.swt.finder.SWTBotTestCase;
+import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
import org.jboss.tools.vpe.ui.bot.test.editor.BlockCommentTest;
import org.jboss.tools.vpe.ui.bot.test.editor.EditingActionsTest;
import org.jboss.tools.vpe.ui.bot.test.editor.InsertActionsTest;
@@ -89,95 +90,97 @@
import org.jboss.tools.vpe.ui.bot.test.wizard.ImportUnknownTagsWizardTest;
import org.jboss.tools.vpe.ui.bot.test.wizard.NewXHTMLPageWizardTest;
import org.jboss.tools.vpe.ui.bot.test.wizard.VPESourceCodeTemplatesPreferencePageTest;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite.SuiteClasses;
+(a)RunWith(RequirementAwareSuite.class)
+@SuiteClasses ({
+ VisualEditorContextMenuTest.class,
+ EditingActionsTest.class,
+ NewXHTMLPageWizardTest.class,
+ CodeCompletionTest.class,
+ ExternalizeStringsDialogTest.class,
+ CancelTagLibDefenitionTest.class,
+ ImportTagsFromTLDFileTest.class,
+ ToggleCommentTest.class,
+ BlockCommentTest.class,
+ ChangeEditorTabForTheFirstOpenPageTest.class,
+ JBIDE4556Test.class,
+ VerificationOfNameSpacesTest.class,
+ BorderForUnknownTagsTest.class,
+ ShowResourceBundlesUsageasELexpressionsTest.class,
+ ShowSelectionTagBarTest.class,
+ AlwaysHideSelectionBarWithoutPromptTest.class,
+ ShowNonVisualTagsTest.class,
+ AddSubstitutedELExpressionFolderScopeTest.class,
+ EditorSynchronizationTest.class,
+ JSPPageCreationTest.class,
+ XHTMLPageCreationTest.class,
+ RenameFacesConfigFileTest.class,
+ RenameJSPFileTest.class,
+ RenameXHTMLFileTest.class,
+ ImportUnknownTagsWizardTest.class,
+ VPESourceCodeTemplatesPreferencePageTest.class,
+ JspFileEditingTest.class,
+ ManagePaletteGroupsTest.class,
+ PaletteEditorTest.class,
+ ToolbarTextFormattingTest.class,
+ InsertActionsTest.class,
+ TextEditingActionsTest.class,
+ PromptForTagAttributesDuringTagInsertTest.class,
+ IncludedTagLibsTest.class,
+ SubstitutedELExressionsTest.class,
+ MinMaxPanesTest.class,
+ EditingELValueTest.class,
+ ManipulatingELValueTest.class,
+ SelectionBarTest.class,
+ IncludedCssFilesTest.class,
+ GlobalELVariablesTest.class,
+ IncludedCssFilesJSPTest.class,
+ StylesOnThePageTest.class,
+ TextSelectionTest.class,
+ CoreHTMLTagsTest.class,
+ JSFTagsTest.class,
+ ColumnsTagTest.class,
+ ComboBoxTagTest.class,
+ FileUploadTagTest.class,
+ InplaceInputTagTest.class,
+ InplaceSelectInputTagTest.class,
+ PickListTagTest.class,
+ ProgressTagTest.class,
+ PanelMenuTagTest.class,
+ ListShuttleTagTest.class,
+ DataDefinitionTagTest.class,
+ EditorTagTest.class,
+ TreeTagTest.class,
+ CalendarTagTest.class,
+ PanelTagTest.class,
+ DataTableTagTest.class,
+ SpacerTagTest.class,
+ DataScrollerTagTest.class,
+ ColumnTagTest.class,
+ ActionParamTagTest.class,
+ AjaxValidatorTagTest.class,
+ BeanValidatorTagTest.class,
+ ColumnGroupTagTest.class,
+ DataGridTagTest.class,
+ VirtualEarthTagTest.class,
+ DataListTagTest.class,
+ DataOrderedListTagTest.class,
+ ExtendedDataTableTagTest.class,
+ ToolbarAndToolbarGroupTagTest.class,
+ TogglePanelAndToogleControlTagTest.class,
+ CommandButtonTagTest.class,
+ CommandLinkTagTest.class,
+ HtmlCommandLinkTagTest.class,
+ IncludeTagTest.class,
+ AjaxInvisibleTagsTest.class,
+ LogTagTest.class,
+ OpenOnTest.class,
+ XhtmlFilePerformanceTest.class,
+ MarkersTest.class,
+ JBIDE9445Test_DuplicateSourceMenu.class
+})
public class VPEAllBotTests extends SWTBotTestCase{
- public static Test suite(){
- TestSuite suite = new TestSuite("VPE All Tests"); //$NON-NLS-1$
- suite.addTestSuite(VisualEditorContextMenuTest.class);
- suite.addTestSuite(EditingActionsTest.class);
- suite.addTestSuite(NewXHTMLPageWizardTest.class);
- suite.addTestSuite(CodeCompletionTest.class);
- suite.addTestSuite(ExternalizeStringsDialogTest.class);
- suite.addTestSuite(CancelTagLibDefenitionTest.class);
- suite.addTestSuite(ImportTagsFromTLDFileTest.class);
- suite.addTestSuite(ToggleCommentTest.class);
- suite.addTestSuite(BlockCommentTest.class);
- suite.addTestSuite(ChangeEditorTabForTheFirstOpenPageTest.class);
- suite.addTestSuite(JBIDE4556Test.class);
- suite.addTestSuite(VerificationOfNameSpacesTest.class);
- suite.addTestSuite(BorderForUnknownTagsTest.class);
- suite.addTestSuite(ShowResourceBundlesUsageasELexpressionsTest.class);
- suite.addTestSuite(ShowSelectionTagBarTest.class);
- suite.addTestSuite(AlwaysHideSelectionBarWithoutPromptTest.class);
- suite.addTestSuite(ShowNonVisualTagsTest.class);
- suite.addTestSuite(AddSubstitutedELExpressionFolderScopeTest.class);
- suite.addTestSuite(EditorSynchronizationTest.class);
- suite.addTestSuite(JSPPageCreationTest.class);
- suite.addTestSuite(XHTMLPageCreationTest.class);
- suite.addTestSuite(RenameFacesConfigFileTest.class);
- suite.addTestSuite(RenameJSPFileTest.class);
- suite.addTestSuite(RenameXHTMLFileTest.class);
- suite.addTestSuite(ImportUnknownTagsWizardTest.class);
- suite.addTestSuite(VPESourceCodeTemplatesPreferencePageTest.class);
- suite.addTestSuite(JspFileEditingTest.class);
- suite.addTestSuite(ManagePaletteGroupsTest.class);
- suite.addTestSuite(PaletteEditorTest.class);
- suite.addTestSuite(ToolbarTextFormattingTest.class);
- suite.addTestSuite(InsertActionsTest.class);
- suite.addTestSuite(TextEditingActionsTest.class);
- suite.addTestSuite(PromptForTagAttributesDuringTagInsertTest.class);
- suite.addTestSuite(IncludedTagLibsTest.class);
- suite.addTestSuite(SubstitutedELExressionsTest.class);
- suite.addTestSuite(MinMaxPanesTest.class);
- suite.addTestSuite(EditingELValueTest.class);
- suite.addTestSuite(ManipulatingELValueTest.class);
- suite.addTestSuite(SelectionBarTest.class);
- suite.addTestSuite(IncludedCssFilesTest.class);
- suite.addTestSuite(GlobalELVariablesTest.class);
- suite.addTestSuite(IncludedCssFilesJSPTest.class);
- suite.addTestSuite(StylesOnThePageTest.class);
- suite.addTestSuite(TextSelectionTest.class);
- suite.addTestSuite(CoreHTMLTagsTest.class);
- suite.addTestSuite(JSFTagsTest.class);
- suite.addTestSuite(ColumnsTagTest.class);
- suite.addTestSuite(ComboBoxTagTest.class);
- suite.addTestSuite(FileUploadTagTest.class);
- suite.addTestSuite(InplaceInputTagTest.class);
- suite.addTestSuite(InplaceSelectInputTagTest.class);
- suite.addTestSuite(PickListTagTest.class);
- suite.addTestSuite(ProgressTagTest.class);
- suite.addTestSuite(PanelMenuTagTest.class);
- suite.addTestSuite(ListShuttleTagTest.class);
- suite.addTestSuite(DataDefinitionTagTest.class);
- suite.addTestSuite(EditorTagTest.class);
- suite.addTestSuite(TreeTagTest.class);
- suite.addTestSuite(CalendarTagTest.class);
- suite.addTestSuite(PanelTagTest.class);
- suite.addTestSuite(DataTableTagTest.class);
- suite.addTestSuite(SpacerTagTest.class);
- suite.addTestSuite(DataScrollerTagTest.class);
- suite.addTestSuite(ColumnTagTest.class);
- suite.addTestSuite(ActionParamTagTest.class);
- suite.addTestSuite(AjaxValidatorTagTest.class);
- suite.addTestSuite(BeanValidatorTagTest.class);
- suite.addTestSuite(ColumnGroupTagTest.class);
- suite.addTestSuite(DataGridTagTest.class);
- suite.addTestSuite(VirtualEarthTagTest.class);
- suite.addTestSuite(DataListTagTest.class);
- suite.addTestSuite(DataOrderedListTagTest.class);
- suite.addTestSuite(ExtendedDataTableTagTest.class);
- suite.addTestSuite(ToolbarAndToolbarGroupTagTest.class);
- suite.addTestSuite(TogglePanelAndToogleControlTagTest.class);
- suite.addTestSuite(CommandButtonTagTest.class);
- suite.addTestSuite(CommandLinkTagTest.class);
- suite.addTestSuite(HtmlCommandLinkTagTest.class);
- suite.addTestSuite(IncludeTagTest.class);
- suite.addTestSuite(AjaxInvisibleTagsTest.class);
- suite.addTestSuite(LogTagTest.class);
- suite.addTestSuite(OpenOnTest.class);
- suite.addTestSuite(XhtmlFilePerformanceTest.class);
- suite.addTestSuite(MarkersTest.class);
- suite.addTestSuite(JBIDE9445Test_DuplicateSourceMenu.class);
- return new TestSetup(suite);
- }
+
}
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 14:36:59 UTC (rev 34009)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java 2011-08-17 14:39:34 UTC (rev 34010)
@@ -18,6 +18,7 @@
import org.eclipse.swtbot.swt.finder.finders.UIThreadRunnable;
import org.eclipse.swtbot.swt.finder.results.VoidResult;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotCheckBox;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
@@ -25,16 +26,24 @@
import org.jboss.tools.vpe.ui.bot.test.Activator;
import org.jboss.tools.ui.bot.ext.SWTBotExt;
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.Server;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
import org.jboss.tools.ui.bot.ext.gen.ActionItem;
+import org.jboss.tools.ui.bot.ext.gen.ActionItem.NewObject.JBossToolsWebJSFJSFProject;
import org.jboss.tools.vpe.editor.xpl.CustomSashForm;
import org.jboss.tools.ui.bot.ext.types.IDELabel;
+import org.jboss.tools.ui.bot.ext.wizards.SWTBotWizard;
import org.jboss.tools.ui.bot.test.JBTSWTBotTestCase;
import org.jboss.tools.ui.bot.test.SWTBotJSPMultiPageEditor;
import org.jboss.tools.ui.bot.test.WidgetVariables;
import org.jboss.tools.vpe.editor.VpeController;
import org.jboss.tools.vpe.editor.VpeEditorPart;
import org.jboss.tools.vpe.editor.mapping.VpeNodeMapping;
+import org.junit.After;
+import org.junit.Before;
import org.mozilla.interfaces.nsIDOMDocument;
import org.mozilla.interfaces.nsIDOMElement;
import org.mozilla.interfaces.nsIDOMNode;
@@ -42,105 +51,31 @@
import org.w3c.dom.Element;
import org.w3c.dom.Node;
-public abstract class VPEAutoTestCase extends JBTSWTBotTestCase{
-
- protected static Properties projectProperties;
+@SWTBotTestRequires(server = @Server(state = ServerState.Present),
+ clearProjects=false,
+ clearWorkspace=false,
+ perspective="Web Development"
+ )
+public abstract class VPEAutoTestCase extends JBTSWTBotTestCase {
+
protected static final String TEST_PAGE = "inputUserName.jsp"; //$NON-NLS-1$
protected static final String FACELETS_TEST_PAGE = "inputname.xhtml"; //$NON-NLS-1$
- protected static String PROJECT_PROPERTIES = "projectProperties.properties"; //$NON-NLS-1$
protected static String JSF2_TEST_PAGE = "inputname.xhtml"; //$NON-NLS-1$
-
+
+ protected final static String JBT_TEST_PROJECT_NAME = "JBIDETestProject"; //$NON-NLS-1$
+ protected final static String FACELETS_TEST_PROJECT_NAME = "FaceletsTestProject"; //$NON-NLS-1$
+ protected final static String JSF2_TEST_PROJECT_NAME = "JSF2TestProject"; //$NON-NLS-1$
+
/**
- * Variable defines JBoss EAP 4.3 server location on a file system
- */
-
- protected final static String JBOSS_EAP_HOME;
- protected final static String JBT_TEST_PROJECT_NAME;
- protected final static String FACELETS_TEST_PROJECT_NAME;
- protected final static String JSF2_TEST_PROJECT_NAME;
- protected final static String JBOSS_SERVER_GROUP;
- protected final static String JBOSS_SERVER_TYPE;
- protected final static String JBOSS_SERVER_RUNTIME_TYPE;
- protected final static String JBOSS_AS_FOR_JSF2_HOME;
- protected final static String JBOSS_AS_FOR_JSF2_SERVER_GROUP;
- protected final static String JBOSS_AS_FOR_JSF2_SERVER_TYPE;
- protected final static String JBOSS_AS_FOR_JSF2_SERVER_RUNTIME_TYPE;
-
- /* (non-Javadoc)
- * This static block read properties from
- * org.jboss.tools.vpe.ui.bot.test/resources/projectProperties.properties file
- * and set up parameters for project which you would like to create. You may change a number of parameters
- * in static block and their values in property file.
- */
-
- static {
- try {
- InputStream inputStream = VPEAutoTestCase.class.getResourceAsStream("/"+PROJECT_PROPERTIES); //$NON-NLS-1$
- projectProperties = new TestProperties();
- projectProperties.load(inputStream);
- inputStream.close();
- }
- catch (IOException e) {
- IStatus status = new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Can't load properties from " + PROJECT_PROPERTIES + " file", e); //$NON-NLS-1$ //$NON-NLS-2$
- Activator.getDefault().getLog().log(status);
- e.printStackTrace();
- }
- catch (IllegalStateException e) {
- IStatus status = new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Property file " + PROJECT_PROPERTIES + " was not found", e); //$NON-NLS-1$ //$NON-NLS-2$
- Activator.getDefault().getLog().log(status);
- e.printStackTrace();
- }
- if (projectProperties.containsKey("JBossEap5.x")){
- JBOSS_EAP_HOME = projectProperties.getProperty("JBossEap5.x"); //$NON-NLS-1$
- JBOSS_SERVER_GROUP = IDELabel.ServerGroup.JBOSS_EAP_5_x;
- JBOSS_SERVER_RUNTIME_TYPE = IDELabel.ServerRuntimeType.JBOSS_EAP_5_x;
- JBOSS_SERVER_TYPE = IDELabel.ServerType.JBOSS_EAP_5_x;
- }else if (projectProperties.containsKey("JBossEap5.0")){
- JBOSS_EAP_HOME = projectProperties.getProperty("JBossEap5.0"); //$NON-NLS-1$
- JBOSS_SERVER_GROUP = IDELabel.ServerGroup.JBOSS_EAP_5_0;
- JBOSS_SERVER_RUNTIME_TYPE = IDELabel.ServerRuntimeType.JBOSS_EAP_5_0;
- JBOSS_SERVER_TYPE = IDELabel.ServerType.JBOSS_EAP_5_0;
- }
- else {
- JBOSS_EAP_HOME = projectProperties.getProperty("JBossEap4.3"); //$NON-NLS-1$
- JBOSS_SERVER_GROUP = IDELabel.ServerGroup.JBOSS_EAP_4_3;
- JBOSS_SERVER_RUNTIME_TYPE = IDELabel.ServerRuntimeType.JBOSS_EAP_4_3;
- JBOSS_SERVER_TYPE = IDELabel.ServerType.JBOSS_EAP_4_3;
- }
- // Setup JSF2 project related properties
- if (projectProperties.containsKey("JBossASForJSF2")){
- JBOSS_AS_FOR_JSF2_HOME = projectProperties.getProperty("JBossASForJSF2");
- String version = projectProperties.getProperty("JBossASForJSF2Version","6.0");
- if (version.equals("6.0")){
- JBOSS_AS_FOR_JSF2_SERVER_GROUP = IDELabel.ServerGroup.JBOSS_AS_6_0;
- JBOSS_AS_FOR_JSF2_SERVER_RUNTIME_TYPE = IDELabel.ServerRuntimeType.JBOSS_AS_6_0;
- JBOSS_AS_FOR_JSF2_SERVER_TYPE = IDELabel.ServerType.JBOSS_AS_6_0;
- }
- else{
- throw new RuntimeException("Unsupported version of JBoss AS runtime for JSF2 [version=" + version +
- "location='" + JBOSS_AS_FOR_JSF2_HOME + "' specified.");
- }
- }
- else{
- JBOSS_AS_FOR_JSF2_HOME = JBOSS_EAP_HOME;
- JBOSS_AS_FOR_JSF2_SERVER_GROUP = JBOSS_SERVER_GROUP;
- JBOSS_AS_FOR_JSF2_SERVER_TYPE = JBOSS_SERVER_TYPE;
- JBOSS_AS_FOR_JSF2_SERVER_RUNTIME_TYPE = JBOSS_SERVER_RUNTIME_TYPE;
- }
- JBT_TEST_PROJECT_NAME = projectProperties.getProperty("JSFProjectName"); //$NON-NLS-1$
- FACELETS_TEST_PROJECT_NAME = projectProperties.getProperty("FaceletsProjectName"); //$NON-NLS-1$
- JSF2_TEST_PROJECT_NAME = projectProperties.getProperty("JSF2ProjectName"); //$NON-NLS-1$
- }
-
- /**
* @see #clearWorkbench()
* @see #createJSFProject(String)
*/
-
- protected void setUp() throws Exception {
+ @Before
+ public void setUp() throws Exception {
super.setUp();
clearWorkbench();
- SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot();
+ SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER)
+ .bot();
SWTBotTree tree = innerBot.tree();
/*
* Test JSF project
@@ -159,83 +94,54 @@
createFaceletsProject(FACELETS_TEST_PROJECT_NAME);
}
/*
- * Test JSF2 project
- */
- try {
- tree.getTreeItem(JSF2_TEST_PROJECT_NAME);
- } catch (WidgetNotFoundException e) {
- createJSF2Project(JSF2_TEST_PROJECT_NAME);
- }
+ * Test JSF2 project
+ */
+ try {
+ tree.getTreeItem(JSF2_TEST_PROJECT_NAME);
+ } catch (WidgetNotFoundException e) {
+ // FIXME uncomment
+ //createJSF2Project(JSF2_TEST_PROJECT_NAME);
+ }
}
-
+
/**
- * Tears down the fixture. Verify Error Log. Close all dialogs which may be not closed
- * after test executing.
+ * Tears down the fixture. Verify Error Log. Close all dialogs which may be
+ * not closed after test executing.
+ *
* @see #clearWorkbench()
*/
-
- @Override
- protected void tearDown() throws Exception {
- clearWorkbench();
- new SWTJBTExt(bot).removeProjectFromServers(JBT_TEST_PROJECT_NAME);
+
+ @After
+ public void tearDown() throws Exception {
+ clearWorkbench();
+ new SWTJBTExt(bot).removeProjectFromServers(JBT_TEST_PROJECT_NAME);
super.tearDown();
}
-
+
/**
* Create JSF Project with <b>jsfProjectName</b>
- * @param jsfProjectName - name of created project
+ *
+ * @param jsfProjectName
+ * - name of created project
*/
- protected void createJSFProject(String jsfProjectName){
- bot.menu("File").menu("New").menu("Other...").click(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- bot.shell("New").activate(); //$NON-NLS-1$
- SWTBotTree tree = bot.tree();
- delay();
- tree.expandNode("JBoss Tools Web").expandNode("JSF").select("JSF Project"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- bot.button("Next >").click(); //$NON-NLS-1$
- bot.textWithLabel("Project Name*").setText(jsfProjectName); //$NON-NLS-1$
- bot.comboBoxWithLabel("Template*").setSelection("JSFKickStartWithoutLibs"); //$NON-NLS-1$ //$NON-NLS-2$
- bot.button("Next >").click(); //$NON-NLS-1$
- try {
- bot.comboBoxWithLabel("Runtime*").setSelection("JBoss EAP 4.3 Runtime"); //$NON-NLS-1$ //$NON-NLS-2$
- delay();
- bot.button("Finish").click(); //$NON-NLS-1$
- try {
- bot.button("Yes").click(); //$NON-NLS-1$
- openErrorLog();
- openPackageExplorer();
- } catch (WidgetNotFoundException e) {
- }
- } catch (Exception e) {
- bot.button(0).click();
- delay();
- SWTBotTree innerTree = bot.tree();
- delay();
- innerTree.expandNode(JBOSS_SERVER_GROUP).select(JBOSS_SERVER_RUNTIME_TYPE); //$NON-NLS-1$ //$NON-NLS-2$
- bot.sleep(Timing.time1S());
- bot.button("Next >").click(); //$NON-NLS-1$
- bot.sleep(Timing.time1S());
- bot.textWithLabel("Home Directory").setText(JBOSS_EAP_HOME); //$NON-NLS-1$
- bot.sleep(Timing.time1S());
- bot.button("Finish").click(); //$NON-NLS-1$
- bot.sleep(Timing.time10S());
- bot.button("Finish").click(); //$NON-NLS-1$
- bot.sleep(Timing.time10S());
- try {
- bot.button("Yes").click(); //$NON-NLS-1$
- openErrorLog();
- openPackageExplorer();
- } catch (WidgetNotFoundException e2) {
- }
- }
- waitForBlockingJobsAcomplished(60*1000L, BUILDING_WS);
+ protected void createJSFProject(String jsfProjectName) {
+ SWTBot wiz = open.newObject(JBossToolsWebJSFJSFProject.LABEL);
+ wiz.textWithLabel("Project Name*").setText(jsfProjectName); //$NON-NLS-1$
+ wiz.comboBoxWithLabel("Template*").setSelection("JSFKickStartWithoutLibs"); //$NON-NLS-1$ //$NON-NLS-2$
+ wiz.button("Next >").click(); //$NON-NLS-1$
+ wiz.comboBoxWithLabel("Runtime:*").setSelection(SWTTestExt.configuredState.getServer().name); //$NON-NLS-1$ //$NON-NLS-2$
+ open.finish(wiz);
+ waitForBlockingJobsAcomplished(60 * 1000L, BUILDING_WS);
setException(null);
}
-
+
/**
* Create Facelets Project with <b>faceletsProjectName</b>
- * @param faceletsProjectName - name of created project
+ *
+ * @param faceletsProjectName
+ * - name of created project
*/
- protected void createFaceletsProject(String faceletsProjectName){
+ protected void createFaceletsProject(String faceletsProjectName) {
bot.menu("File").menu("New").menu("Other...").click(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
bot.shell("New").activate(); //$NON-NLS-1$
SWTBotTree tree = bot.tree();
@@ -246,63 +152,54 @@
bot.comboBoxWithLabel("JSF Environment*").setSelection("JSF 1.2 with Facelets"); //$NON-NLS-1$ //$NON-NLS-2$
bot.comboBoxWithLabel("Template*").setSelection("FaceletsKickStartWithoutLibs"); //$NON-NLS-1$ //$NON-NLS-2$
bot.button("Next >").click(); //$NON-NLS-1$
+
+ bot.comboBoxWithLabel("Runtime:*").setSelection(SWTTestExt.configuredState.getServer().name); //$NON-NLS-1$ //$NON-NLS-2$
+ delay();
+ bot.button("Finish").click(); //$NON-NLS-1$
try {
- bot.comboBoxWithLabel("Runtime*").setSelection("JBoss EAP 4.3 Runtime"); //$NON-NLS-1$ //$NON-NLS-2$
- delay();
- bot.button("Finish").click(); //$NON-NLS-1$
- try {
- bot.button("Yes").click(); //$NON-NLS-1$
- openErrorLog();
- openPackageExplorer();
- } catch (WidgetNotFoundException e) {
- }
- } catch (Exception e) {
- bot.button(0).click();
- SWTBotTree innerTree = bot.tree();
- delay();
- innerTree.expandNode(JBOSS_SERVER_GROUP).select(JBOSS_SERVER_RUNTIME_TYPE);
- delay();
- bot.button("Next >").click(); //$NON-NLS-1$
- bot.textWithLabel("Home Directory").setText(JBOSS_EAP_HOME); //$NON-NLS-1$
- bot.button("Finish").click(); //$NON-NLS-1$
- delay();
- bot.button("Finish").click(); //$NON-NLS-1$
- try {
- bot.button("Yes").click(); //$NON-NLS-1$
- openErrorLog();
- openPackageExplorer();
- } catch (WidgetNotFoundException e2) {
- }
+ bot.button("Yes").click(); //$NON-NLS-1$
+ openErrorLog();
+ openPackageExplorer();
+ } catch (WidgetNotFoundException e) {
}
- waitForBlockingJobsAcomplished(60*1000L, BUILDING_WS);
+
+ waitForBlockingJobsAcomplished(60 * 1000L, BUILDING_WS);
setException(null);
}
-
+
/**
- * Test content of elements from <b>editor</b> by IDs.<p>
+ * Test content of elements from <b>editor</b> by IDs.
+ * <p>
* Tested elements from source editor should have id's attributes that
* correspond to expected one from <b>expectedVPEContentFile</b>.
- * @param expectedVPEContentFile - file name, for example, <i>"ShowNonVisualTags.xml"</i>
- * with expected VPE DOM Elements and id's attributes correspond to source <b>editor</b> element
- * @param editor - {@link JSPMultiPageEditor} that contains source code with tested elements and current id.
+ *
+ * @param expectedVPEContentFile
+ * - file name, for example, <i>"ShowNonVisualTags.xml"</i> with
+ * expected VPE DOM Elements and id's attributes correspond to
+ * source <b>editor</b> element
+ * @param editor
+ * - {@link JSPMultiPageEditor} that contains source code with
+ * tested elements and current id.
* @throws Throwable
* @see SWTBotJSPMultiPageEditor
* @see Throwable
*/
@Deprecated
- protected void performContentTestByIDs(String expectedVPEContentFile, SWTBotJSPMultiPageEditor editor) throws Throwable{
-
+ protected void performContentTestByIDs(String expectedVPEContentFile,
+ SWTBotJSPMultiPageEditor editor) throws Throwable {
+
JSPMultiPageEditor multiPageEditor = editor.getJspMultiPageEditor();
assertNotNull(multiPageEditor);
-
+
VpeController controller = TestUtil.getVpeController(multiPageEditor);
-
+
String expectedVPEContentFilePath = getPathToResources(expectedVPEContentFile);
-
- File xmlTestFile = new File (expectedVPEContentFilePath);
-
+
+ File xmlTestFile = new File(expectedVPEContentFilePath);
+
Document xmlTestDocument = TestDomUtil.getDocument(xmlTestFile);
- assertNotNull("Can't get test file, possibly file not exists "+xmlTestFile,xmlTestDocument); //$NON-NLS-1$
+ assertNotNull(
+ "Can't get test file, possibly file not exists " + xmlTestFile, xmlTestDocument); //$NON-NLS-1$
List<String> ids = TestDomUtil.getTestIds(xmlTestDocument);
@@ -314,16 +211,16 @@
if (getException() != null) {
throw getException();
}
-
+
}
-
+
private void compareElements(VpeController controller,
Document xmlTestDocument, String elementId, String xmlTestId)
throws ComparisonException {
// get element by id
nsIDOMElement vpeElement = findElementById(controller, elementId);
- assertNotNull("Cann't find element with id="+elementId,vpeElement); //$NON-NLS-1$
+ assertNotNull("Cann't find element with id=" + elementId, vpeElement); //$NON-NLS-1$
// get test element by id - get <test id="..." > element and get his
// first child
@@ -354,41 +251,40 @@
return (nsIDOMElement) nodeMapping.getVisualNode();
}
-
+
private Element findSourceElementById(VpeController controller,
String elementId) {
return getSourceDocument(controller).getElementById(elementId);
}
-
+
private Document getSourceDocument(VpeController controller) {
return controller.getSourceBuilder().getSourceDocument();
}
-
+
protected String getPathToResources(String testPage) throws IOException {
- String filePath = FileLocator
- .toFileURL(
- Platform.getBundle(Activator.PLUGIN_ID)
- .getEntry("/"))
- .getFile()+
- "resources/"
- +
- testPage; //$NON-NLS-1$//$NON-NLS-2$
+ String filePath = FileLocator.toFileURL(
+ Platform.getBundle(Activator.PLUGIN_ID).getEntry("/"))
+ .getFile()
+ + "resources/" + testPage; //$NON-NLS-1$//$NON-NLS-2$
File file = new File(filePath);
if (!file.exists()) {
- filePath = FileLocator.toFileURL(Platform.getBundle(Activator.PLUGIN_ID).getEntry("/")).getFile()+testPage; //$NON-NLS-1$
+ filePath = FileLocator
+ .toFileURL(
+ Platform.getBundle(Activator.PLUGIN_ID).getEntry(
+ "/")).getFile() + testPage; //$NON-NLS-1$
}
return filePath;
}
-
+
@Override
protected void activePerspective() {
if (!bot.perspectiveByLabel("Web Development").isActive()) { //$NON-NLS-1$
bot.perspectiveByLabel("Web Development").activate(); //$NON-NLS-1$
}
}
-
- protected void openPalette(){
+
+ protected void openPalette() {
try {
bot.viewByTitle(WidgetVariables.PALETTE);
} catch (WidgetNotFoundException e) {
@@ -400,15 +296,16 @@
bot.button("OK").click(); //$NON-NLS-1$
}
}
-
+
/**
- * Close all dialogs and editors, which may be not closed
- * after test executing.
+ * Close all dialogs and editors, which may be not closed after test
+ * executing.
+ *
* @see #isUnuseDialogOpened()
* @see #closeUnuseDialogs()
*/
-
- protected void clearWorkbench(){
+
+ protected void clearWorkbench() {
while (isUnuseDialogOpened()) {
closeUnuseDialogs();
}
@@ -419,264 +316,295 @@
}
}
}
-
+
/**
- * Test content for elements from all VPE DOM that are nested with <i>BODY</i> descriptor
- * @param expectedVPEContentFile - file name, for example, <i>"VerificationOfNameSpaces.xml"</i>
- * with expected VPE DOM Elements that are nested with <i>BODY</i> descriptor
- * @param editor - {@link JSPMultiPageEditor} that contains source code of currently tested page.
+ * Test content for elements from all VPE DOM that are nested with
+ * <i>BODY</i> descriptor
+ *
+ * @param expectedVPEContentFile
+ * - file name, for example,
+ * <i>"VerificationOfNameSpaces.xml"</i> with expected VPE DOM
+ * Elements that are nested with <i>BODY</i> descriptor
+ * @param editor
+ * - {@link JSPMultiPageEditor} that contains source code of
+ * currently tested page.
* @throws Throwable
*/
-
- protected void performContentTestByDocument(String expectedVPEContentFile, SWTBotJSPMultiPageEditor editor) throws Throwable{
+
+ protected void performContentTestByDocument(String expectedVPEContentFile,
+ SWTBotJSPMultiPageEditor editor) throws Throwable {
JSPMultiPageEditor multiPageEditor = editor.getJspMultiPageEditor();
assertNotNull(multiPageEditor);
-
- nsIDOMDocument visualDocument = ((VpeEditorPart)multiPageEditor.getVisualEditor()).getVisualEditor().getDomDocument();
-
+
+ nsIDOMDocument visualDocument = ((VpeEditorPart) multiPageEditor
+ .getVisualEditor()).getVisualEditor().getDomDocument();
+
String expectedVPEContentFilePath = getPathToResources(expectedVPEContentFile);
-
- File xmlTestFile = new File (expectedVPEContentFilePath);
-
+
+ File xmlTestFile = new File(expectedVPEContentFilePath);
+
Document xmlTestDocument = TestDomUtil.getDocument(xmlTestFile);
- assertNotNull("Can't get test file, possibly file not exists "+xmlTestFile,xmlTestDocument); //$NON-NLS-1$
-
+ assertNotNull(
+ "Can't get test file, possibly file not exists " + xmlTestFile, xmlTestDocument); //$NON-NLS-1$
+
compareDocuments(visualDocument, xmlTestDocument);
}
-
- private void compareDocuments (nsIDOMDocument visualDocument, Document xmlTestDocument) throws ComparisonException{
- nsIDOMNode visualBodyNode = visualDocument.getElementsByTagName("BODY").item(0); //$NON-NLS-1$
- Node testBodyNode = xmlTestDocument.getElementsByTagName("BODY").item(0); //$NON-NLS-1$
+
+ private void compareDocuments(nsIDOMDocument visualDocument,
+ Document xmlTestDocument) throws ComparisonException {
+ nsIDOMNode visualBodyNode = visualDocument
+ .getElementsByTagName("BODY").item(0); //$NON-NLS-1$
+ Node testBodyNode = xmlTestDocument
+ .getElementsByTagName("BODY").item(0); //$NON-NLS-1$
TestDomUtil.compareNodes(visualBodyNode, testBodyNode);
}
/**
* Try to close all unnecessary dialogs, that could prevent next tests fails
*/
-
+
protected abstract void closeUnuseDialogs();
/**
* Verify if any dialog that should be closed is opened
*/
-
+
protected abstract boolean isUnuseDialogOpened();
+
/**
* Opens page pageName
+ *
* @param pageName
*/
- protected void openPage(String pageName){
- openPage(pageName,VPEAutoTestCase.JBT_TEST_PROJECT_NAME);
- }
+ protected void openPage(String pageName) {
+ openPage(pageName, VPEAutoTestCase.JBT_TEST_PROJECT_NAME);
+ }
+
/**
- * Opens page pageName from projectName
- * @param pageName
- * @param projectName
- */
- protected void openPage(String pageName , String projectName){
- SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot();
- SWTBotTree tree = innerBot.tree();
- tree.expandNode(projectName)
- .expandNode("WebContent")
- .expandNode("pages")
- .getNode(pageName)
- .doubleClick(); //$NON-NLS-1$ //$NON-NLS-2$
- bot.sleep(Timing.time3S());
- }
+ * Opens page pageName from projectName
+ *
+ * @param pageName
+ * @param projectName
+ */
+ protected void openPage(String pageName, String projectName) {
+ SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER)
+ .bot();
+ SWTBotTree tree = innerBot.tree();
+ tree.expandNode(projectName).expandNode("WebContent")
+ .expandNode("pages").getNode(pageName).doubleClick(); //$NON-NLS-1$ //$NON-NLS-2$
+ bot.sleep(Timing.time3S());
+ }
+
/**
* Opens Test Page
*/
- protected void openPage(){
- openPage(VPEAutoTestCase.TEST_PAGE,VPEAutoTestCase.JBT_TEST_PROJECT_NAME);
- }
+ protected void openPage() {
+ openPage(VPEAutoTestCase.TEST_PAGE,
+ VPEAutoTestCase.JBT_TEST_PROJECT_NAME);
+ }
+
/**
* Creates new empty JSP page within test project
+ *
* @param pageName
- * @param subDirs - complete path to page location within workspace
+ * @param subDirs
+ * - complete path to page location within workspace
*/
- protected void createJspPage (String pageName , String... subDirs){
- SWTBotTreeItem tiPageParent = null;
- if (subDirs == null || subDirs.length == 0) {
- tiPageParent = packageExplorer.selectTreeItem("pages", new String[] {VPEAutoTestCase.JBT_TEST_PROJECT_NAME,"WebContent"});
- }
- else{
- String[] subPath = Arrays.copyOfRange(subDirs, 0, subDirs.length - 1);
- tiPageParent = packageExplorer.selectTreeItem(subDirs[subDirs.length - 1], subPath);
- }
- tiPageParent.expand();
- try {
- tiPageParent.getNode(pageName).doubleClick();
- } catch (WidgetNotFoundException e) {
- open.newObject(ActionItem.NewObject.WebJSP.LABEL);
- bot.shell(IDELabel.Shell.NEW_JSP_FILE).activate();
- bot.textWithLabel(ActionItem.NewObject.WebJSP.TEXT_FILE_NAME).setText(pageName);
- bot.button(IDELabel.Button.NEXT).click();
- bot.table().select(IDELabel.NewJSPFileDialog.JSP_TEMPLATE);
- bot.button(IDELabel.Button.FINISH).click();
- }
- bot.sleep(Timing.time2S());
+ protected void createJspPage(String pageName, String... subDirs) {
+ SWTBotTreeItem tiPageParent = null;
+ if (subDirs == null || subDirs.length == 0) {
+ tiPageParent = packageExplorer.selectTreeItem("pages",
+ new String[] { VPEAutoTestCase.JBT_TEST_PROJECT_NAME,
+ "WebContent" });
+ } else {
+ String[] subPath = Arrays.copyOfRange(subDirs, 0,
+ subDirs.length - 1);
+ tiPageParent = packageExplorer.selectTreeItem(
+ subDirs[subDirs.length - 1], subPath);
+ }
+ tiPageParent.expand();
+ try {
+ tiPageParent.getNode(pageName).doubleClick();
+ } catch (WidgetNotFoundException e) {
+ open.newObject(ActionItem.NewObject.WebJSP.LABEL);
+ bot.shell(IDELabel.Shell.NEW_JSP_FILE).activate();
+ bot.textWithLabel(ActionItem.NewObject.WebJSP.TEXT_FILE_NAME)
+ .setText(pageName);
+ bot.button(IDELabel.Button.NEXT).click();
+ bot.table().select(IDELabel.NewJSPFileDialog.JSP_TEMPLATE);
+ bot.button(IDELabel.Button.FINISH).click();
+ }
+ bot.sleep(Timing.time2S());
}
+
/**
* Deletes page pageName
+ *
* @param pageName
*/
- protected void deletePage(String pageName){
- SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot();
- innerBot.tree().expandNode(JBT_TEST_PROJECT_NAME).expandNode("WebContent") //$NON-NLS-1$
- .expandNode("pages").getNode("testPage.jsp").select(); //$NON-NLS-1$//$NON-NLS-2$
- bot.menu("Edit").menu("Delete").click(); //$NON-NLS-1$ //$NON-NLS-2$
- bot.shell("Confirm Delete").activate(); //$NON-NLS-1$
- bot.button("OK").click(); //$NON-NLS-1$
+ protected void deletePage(String pageName) {
+ SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER)
+ .bot();
+ innerBot.tree().expandNode(JBT_TEST_PROJECT_NAME)
+ .expandNode("WebContent") //$NON-NLS-1$
+ .expandNode("pages").getNode("testPage.jsp").select(); //$NON-NLS-1$//$NON-NLS-2$
+ bot.menu("Edit").menu("Delete").click(); //$NON-NLS-1$ //$NON-NLS-2$
+ bot.shell("Confirm Delete").activate(); //$NON-NLS-1$
+ bot.button("OK").click(); //$NON-NLS-1$
}
- /**
- * Maximize Source Pane
- * @param botExt
- * @param pageName
- */
- public void maximizeSourcePane(SWTBotExt botExt, String pageName) {
- botExt.swtBotEditorExtByTitle(pageName).selectPage(
- IDELabel.VisualPageEditor.VISUAL_SOURCE_TAB_LABEL);
- final org.jboss.tools.vpe.editor.xpl.CustomSashForm csf =
- bot.widgets(widgetOfType(CustomSashForm.class)).get(0);
- UIThreadRunnable.syncExec(new VoidResult() {
- @Override
- public void run() {
- csf.maxDown();
- }
- });
- }
- /**
- * Maximize Visual Pane
- * @param botExt
- * @param pageName
- */
- public void maximizeVisualPane(SWTBotExt botExt, String pageName) {
- botExt.swtBotEditorExtByTitle(pageName).selectPage(
- IDELabel.VisualPageEditor.VISUAL_SOURCE_TAB_LABEL);
+ /**
+ * Maximize Source Pane
+ *
+ * @param botExt
+ * @param pageName
+ */
+ public void maximizeSourcePane(SWTBotExt botExt, String pageName) {
+ botExt.swtBotEditorExtByTitle(pageName).selectPage(
+ IDELabel.VisualPageEditor.VISUAL_SOURCE_TAB_LABEL);
- final org.jboss.tools.vpe.editor.xpl.CustomSashForm csf =
- bot.widgets(widgetOfType(CustomSashForm.class)).get(0);
- UIThreadRunnable.syncExec(new VoidResult() {
- @Override
- public void run() {
- csf.maxUp();
- }
- });
- }
- /**
- * Restore Source Pane
- * @param botExt
- * @param pageName
- */
- public void restoreSourcePane(SWTBotExt botExt, String pageName) {
- botExt.swtBotEditorExtByTitle(pageName).selectPage(
- IDELabel.VisualPageEditor.VISUAL_SOURCE_TAB_LABEL);
+ final org.jboss.tools.vpe.editor.xpl.CustomSashForm csf = bot.widgets(
+ widgetOfType(CustomSashForm.class)).get(0);
+ UIThreadRunnable.syncExec(new VoidResult() {
+ @Override
+ public void run() {
+ csf.maxDown();
+ }
+ });
+ }
- final org.jboss.tools.vpe.editor.xpl.CustomSashForm csf =
- bot.widgets(widgetOfType(CustomSashForm.class)).get(0);
- UIThreadRunnable.syncExec(new VoidResult() {
- @Override
- public void run() {
- csf.downClicked();
- }
- });
- }
- /**
- * Restore Visual Pane
- * @param botExt
- * @param pageName
- */
- public void restoreVisualPane(SWTBotExt botExt, String pageName) {
- botExt.swtBotEditorExtByTitle(pageName).selectPage(
- IDELabel.VisualPageEditor.VISUAL_SOURCE_TAB_LABEL);
+ /**
+ * Maximize Visual Pane
+ *
+ * @param botExt
+ * @param pageName
+ */
+ public void maximizeVisualPane(SWTBotExt botExt, String pageName) {
+ botExt.swtBotEditorExtByTitle(pageName).selectPage(
+ IDELabel.VisualPageEditor.VISUAL_SOURCE_TAB_LABEL);
- final org.jboss.tools.vpe.editor.xpl.CustomSashForm csf =
- bot.widgets(widgetOfType(CustomSashForm.class)).get(0);
- UIThreadRunnable.syncExec(new VoidResult() {
- @Override
- public void run() {
- csf.upClicked();
- }
- });
- }
- /**
- * Creates new empty xhtml page within test project
- * @param pageName
- * @param subDirs - complete path to page location within workspace
- */
- protected void createXhtmlPage (String pageName , String... subDirs){
- SWTBotTreeItem tiPageParent = null;
- if (subDirs == null || subDirs.length == 0) {
- tiPageParent = packageExplorer.selectTreeItem("pages", new String[] {VPEAutoTestCase.JBT_TEST_PROJECT_NAME,"WebContent"});
- }
- else{
- String[] subPath = Arrays.copyOfRange(subDirs, 0, subDirs.length - 1);
- tiPageParent = packageExplorer.selectTreeItem(subDirs[subDirs.length - 1], subPath);
- }
- tiPageParent.expand();
- try {
- tiPageParent.getNode(pageName).doubleClick();
- } catch (WidgetNotFoundException e) {
- open.newObject(ActionItem.NewObject.JBossToolsWebXHTMLFile.LABEL);
- bot.shell(IDELabel.Shell.NEW_XHTML_FILE).activate();
- bot.textWithLabel(ActionItem.NewObject.JBossToolsWebXHTMLFile.TEXT_FILE_NAME).setText(pageName);
- bot.button(IDELabel.Button.NEXT).click();
- SWTBotCheckBox cbUseTemplate = bot.checkBox(IDELabel.NewXHTMLFileDialog.USE_XHTML_TEMPLATE_CHECK_BOX);
- if (cbUseTemplate.isChecked()){
- cbUseTemplate.deselect();
- }
- bot.button(IDELabel.Button.FINISH).click();
- }
- bot.sleep(Timing.time2S());
+ final org.jboss.tools.vpe.editor.xpl.CustomSashForm csf = bot.widgets(
+ widgetOfType(CustomSashForm.class)).get(0);
+ UIThreadRunnable.syncExec(new VoidResult() {
+ @Override
+ public void run() {
+ csf.maxUp();
+ }
+ });
+ }
- }
+ /**
+ * Restore Source Pane
+ *
+ * @param botExt
+ * @param pageName
+ */
+ public void restoreSourcePane(SWTBotExt botExt, String pageName) {
+ botExt.swtBotEditorExtByTitle(pageName).selectPage(
+ IDELabel.VisualPageEditor.VISUAL_SOURCE_TAB_LABEL);
- /**
- * Create JSF2 Project with <b>jsf2ProjectName</b>
- * @param jsf2ProjectName - name of created project
- */
- protected void createJSF2Project(String jsf2ProjectName){
- open.newObject(ActionItem.NewObject.JBossToolsWebJSFJSFProject.LABEL);
- bot.textWithLabel(IDELabel.NewJsfProjectDialog.PROJECT_NAME_LABEL).setText(jsf2ProjectName);
- bot.comboBoxWithLabel(IDELabel.NewJsfProjectDialog.JSF_ENVIRONMENT_LABEL)
- .setSelection("JSF 2.0");//$NON-NLS-1$
- bot.comboBoxWithLabel(IDELabel.NewJsfProjectDialog.TEMPLATE_LABEL)
- .setSelection("JSFKickStartWithoutLibs");//$NON-NLS-1$
- bot.button(IDELabel.Button.NEXT).click();
- try {
- bot.comboBoxWithLabel(IDELabel.NewJsfProjectDialog.RUNTIME_LABEL)
- .setSelection(JBOSS_AS_FOR_JSF2_SERVER_RUNTIME_TYPE);
- delay();
- bot.button(IDELabel.Button.FINISH).click();
- try {
- bot.button(IDELabel.Button.YES).click();
- openErrorLog();
- openPackageExplorer();
- } catch (WidgetNotFoundException e) {
- }
- } catch (Exception e) {
- bot.button(0).click();
- SWTBotTree innerTree = bot.tree();
- delay();
- innerTree.expandNode(JBOSS_AS_FOR_JSF2_SERVER_GROUP).select(JBOSS_AS_FOR_JSF2_SERVER_RUNTIME_TYPE);
- delay();
- bot.button(IDELabel.Button.NEXT).click();
- bot.textWithLabel(IDELabel.NewJsfProjectDialog.HOME_DIRECTORY_LABEL).setText(JBOSS_AS_FOR_JSF2_HOME);
- bot.button(IDELabel.Button.FINISH).click();
- delay();
- bot.button(IDELabel.Button.FINISH).click();
- try {
- bot.button(IDELabel.Button.YES).click();
- openErrorLog();
- openPackageExplorer();
- } catch (WidgetNotFoundException e2) {
- }
- }
- waitForBlockingJobsAcomplished(60*1000L, BUILDING_WS);
- setException(null);
- }
+ final org.jboss.tools.vpe.editor.xpl.CustomSashForm csf = bot.widgets(
+ widgetOfType(CustomSashForm.class)).get(0);
+ UIThreadRunnable.syncExec(new VoidResult() {
+ @Override
+ public void run() {
+ csf.downClicked();
+ }
+ });
+ }
+ /**
+ * Restore Visual Pane
+ *
+ * @param botExt
+ * @param pageName
+ */
+ public void restoreVisualPane(SWTBotExt botExt, String pageName) {
+ botExt.swtBotEditorExtByTitle(pageName).selectPage(
+ IDELabel.VisualPageEditor.VISUAL_SOURCE_TAB_LABEL);
+
+ final org.jboss.tools.vpe.editor.xpl.CustomSashForm csf = bot.widgets(
+ widgetOfType(CustomSashForm.class)).get(0);
+ UIThreadRunnable.syncExec(new VoidResult() {
+ @Override
+ public void run() {
+ csf.upClicked();
+ }
+ });
+ }
+
+ /**
+ * Creates new empty xhtml page within test project
+ *
+ * @param pageName
+ * @param subDirs
+ * - complete path to page location within workspace
+ */
+ protected void createXhtmlPage(String pageName, String... subDirs) {
+ SWTBotTreeItem tiPageParent = null;
+ if (subDirs == null || subDirs.length == 0) {
+ tiPageParent = packageExplorer.selectTreeItem("pages",
+ new String[] { VPEAutoTestCase.JBT_TEST_PROJECT_NAME,
+ "WebContent" });
+ } else {
+ String[] subPath = Arrays.copyOfRange(subDirs, 0,
+ subDirs.length - 1);
+ tiPageParent = packageExplorer.selectTreeItem(
+ subDirs[subDirs.length - 1], subPath);
+ }
+ tiPageParent.expand();
+ try {
+ tiPageParent.getNode(pageName).doubleClick();
+ } catch (WidgetNotFoundException e) {
+ open.newObject(ActionItem.NewObject.JBossToolsWebXHTMLFile.LABEL);
+ bot.shell(IDELabel.Shell.NEW_XHTML_FILE).activate();
+ bot.textWithLabel(
+ ActionItem.NewObject.JBossToolsWebXHTMLFile.TEXT_FILE_NAME)
+ .setText(pageName);
+ bot.button(IDELabel.Button.NEXT).click();
+ SWTBotCheckBox cbUseTemplate = bot
+ .checkBox(IDELabel.NewXHTMLFileDialog.USE_XHTML_TEMPLATE_CHECK_BOX);
+ if (cbUseTemplate.isChecked()) {
+ cbUseTemplate.deselect();
+ }
+ bot.button(IDELabel.Button.FINISH).click();
+ }
+ bot.sleep(Timing.time2S());
+
+ }
+
+ /**
+ * Create JSF2 Project with <b>jsf2ProjectName</b>
+ *
+ * @param jsf2ProjectName
+ * - name of created project
+ */
+ protected void createJSF2Project(String jsf2ProjectName) {
+ SWTBot wiz = open
+ .newObject(ActionItem.NewObject.JBossToolsWebJSFJSFProject.LABEL);
+ wiz.textWithLabel(IDELabel.NewJsfProjectDialog.PROJECT_NAME_LABEL)
+ .setText(jsf2ProjectName);
+ wiz.comboBoxWithLabel(
+ IDELabel.NewJsfProjectDialog.JSF_ENVIRONMENT_LABEL)
+ .setSelection("JSF 2.0");//$NON-NLS-1$
+ wiz.comboBoxWithLabel(IDELabel.NewJsfProjectDialog.TEMPLATE_LABEL)
+ .setSelection("JSFKickStartWithoutLibs");//$NON-NLS-1$
+ wiz.button(IDELabel.Button.NEXT).click();
+ wiz.comboBoxWithLabel("Runtime:*").setSelection(
+ SWTTestExt.configuredState.getServer().name);
+ delay();
+ bot.button(IDELabel.Button.FINISH).click();
+ try {
+ bot.button(IDELabel.Button.YES).click();
+ openErrorLog();
+ openPackageExplorer();
+ } catch (WidgetNotFoundException e) {
+ }
+
+ waitForBlockingJobsAcomplished(60 * 1000L, BUILDING_WS);
+ setException(null);
+ }
+
}
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/EditingActionsTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/EditingActionsTest.java 2011-08-17 14:36:59 UTC (rev 34009)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/EditingActionsTest.java 2011-08-17 14:39:34 UTC (rev 34010)
@@ -56,7 +56,7 @@
botExt = new SWTBotExt();
}
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
eclipse.maximizeActiveShell();
createJspPage(EditingActionsTest.TEST_PAGE_NAME);
@@ -353,7 +353,7 @@
return false;
}
@Override
- protected void tearDown() throws Exception {
+ public void tearDown() throws Exception {
jspEditor.close();
super.tearDown();
}
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/InsertActionsTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/InsertActionsTest.java 2011-08-17 14:36:59 UTC (rev 34009)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/InsertActionsTest.java 2011-08-17 14:39:34 UTC (rev 34010)
@@ -44,7 +44,7 @@
botExt = new SWTBotExt();
}
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
eclipse.maximizeActiveShell();
createJspPage(InsertActionsTest.TEST_PAGE_NAME);
@@ -164,7 +164,7 @@
}
@Override
- protected void tearDown() throws Exception {
+ public void tearDown() throws Exception {
jspTextEditor.close();
super.tearDown();
}
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/MinMaxPanesTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/MinMaxPanesTest.java 2011-08-17 14:36:59 UTC (rev 34009)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/MinMaxPanesTest.java 2011-08-17 14:39:34 UTC (rev 34010)
@@ -111,7 +111,7 @@
}
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
eclipse.maximizeActiveShell();
createJspPage(MinMaxPanesTest.TEST_PAGE_NAME);
@@ -121,7 +121,7 @@
webBrowser = new SWTBotWebBrowser(MinMaxPanesTest.TEST_PAGE_NAME,botExt);
}
@Override
- protected void tearDown() throws Exception {
+ public void tearDown() throws Exception {
jspTextEditor.close();
super.tearDown();
}
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/TextEditingActionsTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/TextEditingActionsTest.java 2011-08-17 14:36:59 UTC (rev 34009)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/TextEditingActionsTest.java 2011-08-17 14:39:34 UTC (rev 34010)
@@ -59,7 +59,7 @@
botExt = new SWTBotExt();
}
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
eclipse.maximizeActiveShell();
createJspPage(TextEditingActionsTest.TEST_PAGE_NAME);
@@ -214,7 +214,7 @@
return false;
}
@Override
- protected void tearDown() throws Exception {
+ public void tearDown() throws Exception {
jspEditor.close();
super.tearDown();
}
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/TextSelectionTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/TextSelectionTest.java 2011-08-17 14:36:59 UTC (rev 34009)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/TextSelectionTest.java 2011-08-17 14:39:34 UTC (rev 34010)
@@ -55,7 +55,7 @@
botExt = new SWTBotExt();
}
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
eclipse.maximizeActiveShell();
createJspPage(TextSelectionTest.TEST_PAGE_NAME);
@@ -174,7 +174,7 @@
return false;
}
@Override
- protected void tearDown() throws Exception {
+ public void tearDown() throws Exception {
jspEditor.close();
super.tearDown();
}
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VPEEditorTestCase.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VPEEditorTestCase.java 2011-08-17 14:36:59 UTC (rev 34009)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VPEEditorTestCase.java 2011-08-17 14:39:34 UTC (rev 34010)
@@ -67,7 +67,7 @@
}
@Override
- protected void tearDown() throws Exception {
+ public void tearDown() throws Exception {
//Restore page state before tests
if (editor != null){
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/AddSubstitutedELExpressionFolderScopeTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/AddSubstitutedELExpressionFolderScopeTest.java 2011-08-17 14:36:59 UTC (rev 34009)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/AddSubstitutedELExpressionFolderScopeTest.java 2011-08-17 14:39:34 UTC (rev 34010)
@@ -126,7 +126,7 @@
}
@Override
- protected void tearDown() throws Exception {
+ public void tearDown() throws Exception {
bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).setFocus();
SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot();
innerBot.tree().expandNode(JBT_TEST_PROJECT_NAME).expandNode("WebContent") //$NON-NLS-1$
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/EditingELValueTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/EditingELValueTest.java 2011-08-17 14:36:59 UTC (rev 34009)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/EditingELValueTest.java 2011-08-17 14:39:34 UTC (rev 34010)
@@ -40,7 +40,7 @@
botExt = new SWTBotExt();
}
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
eclipse.maximizeActiveShell();
}
@@ -128,7 +128,7 @@
return false;
}
@Override
- protected void tearDown() throws Exception {
+public void tearDown() throws Exception {
if (jspGreetingPageEditor != null){
jspGreetingPageEditor.show();
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/ManipulatingELValueTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/ManipulatingELValueTest.java 2011-08-17 14:36:59 UTC (rev 34009)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/ManipulatingELValueTest.java 2011-08-17 14:39:34 UTC (rev 34010)
@@ -43,7 +43,7 @@
botExt = new SWTBotExt();
}
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
eclipse.maximizeActiveShell();
}
@@ -109,7 +109,7 @@
return false;
}
@Override
- protected void tearDown() throws Exception {
+public void tearDown() throws Exception {
deleteAllELSubstitutions();
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/SubstitutedELTestCase.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/SubstitutedELTestCase.java 2011-08-17 14:36:59 UTC (rev 34009)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/SubstitutedELTestCase.java 2011-08-17 14:39:34 UTC (rev 34010)
@@ -38,12 +38,12 @@
}
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
}
@Override
- protected void tearDown() throws Exception {
+ public void tearDown() throws Exception {
bot.toolbarButtonWithTooltip(PAGE_DESIGN).click();
bot.shell(PAGE_DESIGN).activate();
bot.tabItem(SUBSTITUTED_EL).activate();
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/BorderForUnknownTagsTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/BorderForUnknownTagsTest.java 2011-08-17 14:36:59 UTC (rev 34009)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/BorderForUnknownTagsTest.java 2011-08-17 14:39:34 UTC (rev 34010)
@@ -59,7 +59,7 @@
}
@Override
- protected void tearDown() throws Exception {
+ public void tearDown() throws Exception {
//Restore page state before tests
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ChangeEditorTabForTheFirstOpenPageTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ChangeEditorTabForTheFirstOpenPageTest.java 2011-08-17 14:36:59 UTC (rev 34009)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ChangeEditorTabForTheFirstOpenPageTest.java 2011-08-17 14:39:34 UTC (rev 34010)
@@ -44,7 +44,7 @@
}
@Override
- protected void tearDown() throws Exception {
+ public void tearDown() throws Exception {
//Delete test page if it has been created
SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot();
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/GlobalELVariablesTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/GlobalELVariablesTest.java 2011-08-17 14:36:59 UTC (rev 34009)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/GlobalELVariablesTest.java 2011-08-17 14:39:34 UTC (rev 34010)
@@ -86,7 +86,7 @@
}
@Override
- protected void tearDown() throws Exception {
+public void tearDown() throws Exception {
bot.menu(IDELabel.Menu.WINDOW).menu(IDELabel.Menu.PREFERENCES).click();
SWTBotTree preferenceTree = this.bot.tree();
preferenceTree.expandNode(IDELabel.PreferencesDialog.JBOSS_TOOLS)
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/PreferencesTestCase.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/PreferencesTestCase.java 2011-08-17 14:36:59 UTC (rev 34009)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/PreferencesTestCase.java 2011-08-17 14:39:34 UTC (rev 34010)
@@ -61,14 +61,14 @@
}
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
openPage();
setPreferencesToDefault(true);
}
@Override
- protected void tearDown() throws Exception {
+ public void tearDown() throws Exception {
openPage();
setPreferencesToDefault(true);
super.tearDown();
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/PromptForTagAttributesDuringTagInsertTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/PromptForTagAttributesDuringTagInsertTest.java 2011-08-17 14:36:59 UTC (rev 34009)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/PromptForTagAttributesDuringTagInsertTest.java 2011-08-17 14:39:34 UTC (rev 34010)
@@ -25,7 +25,7 @@
botExt = new SWTBotExt();
}
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
eclipse.maximizeActiveShell();
createJspPage(PromptForTagAttributesDuringTagInsertTest.TEST_PAGE_NAME);
@@ -75,7 +75,7 @@
}
@Override
- protected void tearDown() throws Exception {
+ public void tearDown() throws Exception {
super.tearDown();
}
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ShowResourceBundlesUsageasELexpressionsTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ShowResourceBundlesUsageasELexpressionsTest.java 2011-08-17 14:36:59 UTC (rev 34009)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ShowResourceBundlesUsageasELexpressionsTest.java 2011-08-17 14:39:34 UTC (rev 34010)
@@ -26,7 +26,7 @@
}
@Override
- protected void tearDown() throws Exception {
+ public void tearDown() throws Exception {
//Restore page state before tests
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/selectionbar/SelectionBarTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/selectionbar/SelectionBarTest.java 2011-08-17 14:36:59 UTC (rev 34009)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/selectionbar/SelectionBarTest.java 2011-08-17 14:39:34 UTC (rev 34010)
@@ -124,7 +124,7 @@
}
@Override
- protected void tearDown() throws Exception {
+ public void tearDown() throws Exception {
if (sashStatus.equals("VisualPageMaximized")){
restoreSourcePane(botExt, VPEAutoTestCase.TEST_PAGE);
} else if (sashStatus.equals("SourcePageMaximized")){
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/AbstractTagTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/AbstractTagTest.java 2011-08-17 14:36:59 UTC (rev 34009)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/AbstractTagTest.java 2011-08-17 14:39:34 UTC (rev 34010)
@@ -38,7 +38,7 @@
botExt = new SWTBotExt();
}
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
eclipse.maximizeActiveShell();
initTestPage ();
@@ -74,7 +74,7 @@
return false;
}
@Override
- protected void tearDown() throws Exception {
+ public void tearDown() throws Exception {
sourceEditor.close();
super.tearDown();
}
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/CoreHTMLTagsTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/CoreHTMLTagsTest.java 2011-08-17 14:36:59 UTC (rev 34009)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/CoreHTMLTagsTest.java 2011-08-17 14:39:34 UTC (rev 34010)
@@ -39,7 +39,7 @@
botExt = new SWTBotExt();
}
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
eclipse.maximizeActiveShell();
createJspPage(CoreHTMLTagsTest.TEST_PAGE_NAME);
@@ -79,7 +79,7 @@
return false;
}
@Override
- protected void tearDown() throws Exception {
+ public void tearDown() throws Exception {
jspEditor.close();
super.tearDown();
}
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/JSFTagsTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/JSFTagsTest.java 2011-08-17 14:36:59 UTC (rev 34009)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/JSFTagsTest.java 2011-08-17 14:39:34 UTC (rev 34010)
@@ -37,7 +37,7 @@
botExt = new SWTBotExt();
}
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
eclipse.maximizeActiveShell();
createJspPage(JSFTagsTest.TEST_PAGE_NAME);
@@ -102,7 +102,7 @@
return false;
}
@Override
- protected void tearDown() throws Exception {
+public void tearDown() throws Exception {
jspEditor.close();
super.tearDown();
}
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/palette/CancelTagLibDefenitionTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/palette/CancelTagLibDefenitionTest.java 2011-08-17 14:36:59 UTC (rev 34009)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/palette/CancelTagLibDefenitionTest.java 2011-08-17 14:39:34 UTC (rev 34010)
@@ -23,7 +23,7 @@
//Test cancel TLD
SWTBotTree tree = bot.tree();
delay();
- SWTBotTreeItem item = tree.expandNode(projectProperties.getProperty("JSFProjectName"));
+ SWTBotTreeItem item = tree.expandNode(JBT_TEST_PROJECT_NAME);
delay();
item.getNode("html_basic.tld [h]").select(); //$NON-NLS-1$ //$NON-NLS-2$
delay();
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/palette/ImportTagsFromTLDFileTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/palette/ImportTagsFromTLDFileTest.java 2011-08-17 14:36:59 UTC (rev 34009)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/palette/ImportTagsFromTLDFileTest.java 2011-08-17 14:39:34 UTC (rev 34010)
@@ -68,7 +68,7 @@
bot.shell("Edit TLD").activate(); //$NON-NLS-1$
SWTBotTree tree = bot.tree();
delay();
- tree.expandNode(projectProperties.getProperty("JSFProjectName")).expandNode("html_basic.tld [h]").select(); //$NON-NLS-1$ //$NON-NLS-2$
+ tree.expandNode(JBT_TEST_PROJECT_NAME).expandNode("html_basic.tld [h]").select(); //$NON-NLS-1$ //$NON-NLS-2$
bot.button("OK").click(); //$NON-NLS-1$
//Test set group
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/smoke/CodeCompletionTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/smoke/CodeCompletionTest.java 2011-08-17 14:36:59 UTC (rev 34009)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/smoke/CodeCompletionTest.java 2011-08-17 14:39:34 UTC (rev 34010)
@@ -28,14 +28,14 @@
private String originalEditorText;
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
openPage(TEST_PAGE);
editor = SWTTestExt.bot.swtBotEditorExtByTitle(TEST_PAGE);
originalEditorText = editor.getText();
}
@Override
- protected void tearDown() throws Exception {
+ public void tearDown() throws Exception {
if (editor != null){
editor.setText(originalEditorText);
editor.saveAndClose();
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/smoke/MarkersTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/smoke/MarkersTest.java 2011-08-17 14:36:59 UTC (rev 34009)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/smoke/MarkersTest.java 2011-08-17 14:39:34 UTC (rev 34010)
@@ -84,14 +84,14 @@
}
}
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
openPage(TEST_PAGE);
editor = SWTTestExt.bot.swtBotEditorExtByTitle(TEST_PAGE);
originalEditorText = editor.getText();
}
@Override
- protected void tearDown() throws Exception {
+ public void tearDown() throws Exception {
if (editor != null){
editor.setText(originalEditorText);
editor.saveAndClose();
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/ExternalizeAllStringsDialogTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/ExternalizeAllStringsDialogTest.java 2011-08-17 14:36:59 UTC (rev 34009)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/ExternalizeAllStringsDialogTest.java 2011-08-17 14:39:34 UTC (rev 34010)
@@ -3,11 +3,6 @@
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor;
import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.IDE;
-import org.jboss.tools.jst.jsp.i18n.ExternalizeAllStringsWizard;
-import org.jboss.tools.jst.jsp.i18n.ExternalizeStringsDialog;
import org.jboss.tools.jst.jsp.messages.JstUIMessages;
import org.jboss.tools.ui.bot.ext.SWTTestExt;
import org.jboss.tools.vpe.ui.bot.test.VPEAutoTestCase;
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/NewXHTMLPageWizardTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/NewXHTMLPageWizardTest.java 2011-08-17 14:36:59 UTC (rev 34009)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/NewXHTMLPageWizardTest.java 2011-08-17 14:39:34 UTC (rev 34010)
@@ -14,6 +14,7 @@
import org.jboss.tools.ui.bot.ext.gen.ActionItem;
import org.jboss.tools.ui.bot.ext.types.IDELabel;
import org.jboss.tools.vpe.ui.bot.test.VPEAutoTestCase;
+import org.junit.Test;
/**
* @author mareshkau
@@ -36,6 +37,7 @@
/**
* Test new xhtml page wizard basic functionality.
*/
+ @Test
public void testNewXHTMLPageWizard() {
/*
* Open wizard page
14 years, 8 months
- 1
- 0
JBoss Tools SVN: r34009 - trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config.
by jbosstools-commits＠lists.jboss.org
Author: lzoubek(a)redhat.com
Date: 2011-08-17 10:36:59 -0400 (Wed, 17 Aug 2011)
New Revision: 34009
Modified:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/TestConfigurator.java
Log:
swtbotext: search for Requirement annotations recursively to superclasses
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 14:36:04 UTC (rev 34008)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/TestConfigurator.java 2011-08-17 14:36:59 UTC (rev 34009)
@@ -322,8 +322,7 @@
* @return
*/
public static boolean isRequiresAnyRuntime(Class<?> klass) {
- SWTBotTestRequires an = klass
- .getAnnotation(SWTBotTestRequires.class);
+ SWTBotTestRequires an = getAnnotation(klass);
if (an==null) {
return false;
}
@@ -337,14 +336,29 @@
* @return
*/
public static boolean isRequiresRunOnce(Class<?> klass) {
- SWTBotTestRequires an = klass
- .getAnnotation(SWTBotTestRequires.class);
+ SWTBotTestRequires an = getAnnotation(klass);
if (an==null) {
return false;
}
return an.runOnce();
}
/**
+ * finds {@link SWTBotTestRequires} annotation in given class or recursive in super classes
+ * @param klass
+ * @return
+ */
+ private static SWTBotTestRequires getAnnotation(Class<?> klass) {
+ if (klass==null || Object.class.equals(klass)) {
+ return null;
+ }
+ SWTBotTestRequires requies = klass
+ .getAnnotation(SWTBotTestRequires.class);
+ if (requies != null) {
+ return requies;
+ }
+ return getAnnotation(klass.getSuperclass());
+ }
+ /**
* 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
* current configuration
@@ -352,8 +366,7 @@
*/
public static List<RequirementBase> getClassRequirements(Class<?> klass) {
- SWTBotTestRequires requies = klass
- .getAnnotation(SWTBotTestRequires.class);
+ SWTBotTestRequires requies = getAnnotation(klass);
// internal list
List<RequirementBase> reqs = new ArrayList<RequirementBase>();
reqs.add(RequirementBase.createPrepareViews());
14 years, 8 months
- 1
- 0
JBoss Tools SVN: r34008 - trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext.
by jbosstools-commits＠lists.jboss.org
Author: lzoubek(a)redhat.com
Date: 2011-08-17 10:36:04 -0400 (Wed, 17 Aug 2011)
New Revision: 34008
Modified:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/RequirementAwareSuite.java
Log:
swtbotext: support junit3 test* methods
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 14:06:33 UTC (rev 34007)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/RequirementAwareSuite.java 2011-08-17 14:36:04 UTC (rev 34008)
@@ -1,5 +1,6 @@
package org.jboss.tools.ui.bot.ext;
+import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -128,6 +129,7 @@
}
}
+
public List<RequirementBase> getRequirements() {
return Collections.unmodifiableList(this.requirements);
@@ -135,14 +137,18 @@
@Override
protected List<FrameworkMethod> computeTestMethods() {
- List<FrameworkMethod> testMethods = getTestClass()
- .getAnnotatedMethods(Test.class);
+ List<FrameworkMethod> testMethods = new ArrayList<FrameworkMethod>();
+ for (Method mm : getTestClass().getJavaClass().getMethods()) {
+ if (mm.getName().startsWith("test") || mm.getAnnotation(Test.class)!=null) {
+ testMethods.add(new FrameworkMethod(mm));
+ }
+ }
for (FrameworkMethod method : testMethods) {
method.getAnnotation(Category.class);
}
return testMethods;
-
}
+
@Override
public void run(RunNotifier notifier) {
@@ -184,9 +190,12 @@
log.error("Fulfilling failed", e);
}
log.info("Done");
+
+
return super.withBeforeClasses(statement);
}
}
+
private static final Logger log = Logger
.getLogger(RequirementAwareSuite.class);
14 years, 8 months
- 1
- 0
JBoss Tools SVN: r34007 - in trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/src/org/jboss/ide/eclipse/as/egit/internal/test: util and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-08-17 10:06:33 -0400 (Wed, 17 Aug 2011)
New Revision: 34007
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/src/org/jboss/ide/eclipse/as/egit/internal/test/EGitUtilsTest.java
trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/src/org/jboss/ide/eclipse/as/egit/internal/test/util/TestUtils.java
Log:
[JBIDE-9513] implementing #push, corrected TestUtils#getRepositoryPath(IResource)
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/src/org/jboss/ide/eclipse/as/egit/internal/test/EGitUtilsTest.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/src/org/jboss/ide/eclipse/as/egit/internal/test/EGitUtilsTest.java 2011-08-17 14:06:24 UTC (rev 34006)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/src/org/jboss/ide/eclipse/as/egit/internal/test/EGitUtilsTest.java 2011-08-17 14:06:33 UTC (rev 34007)
@@ -85,7 +85,7 @@
}
@Test
- public void commitsFileInProject() throws Exception {
+ public void canCommitFileInProject() throws Exception {
IFile file = testUtils.addFileToProject(
testProject.getProject(),
"a.txt", "some text");
@@ -97,4 +97,9 @@
testUtils.assertRepositoryContainsFiles(repository, new String[] { testUtils.getRepositoryPath(file) });
}
+ @Test
+ public void canPushRepoToAntoherRepo() {
+// EgitUtils.push(project, destinationRepository)
+ }
+
}
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/src/org/jboss/ide/eclipse/as/egit/internal/test/util/TestUtils.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/src/org/jboss/ide/eclipse/as/egit/internal/test/util/TestUtils.java 2011-08-17 14:06:24 UTC (rev 34006)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/src/org/jboss/ide/eclipse/as/egit/internal/test/util/TestUtils.java 2011-08-17 14:06:33 UTC (rev 34007)
@@ -30,6 +30,7 @@
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
+import org.eclipse.egit.core.project.RepositoryMapping;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.treewalk.TreeWalk;
@@ -255,8 +256,8 @@
}
public String getRepositoryPath(IResource resource) {
- String fullPath = resource.getFullPath().toString();
- return fullPath.substring(1, fullPath.length());
+ RepositoryMapping mapping = RepositoryMapping.getMapping(resource);
+ return mapping.getRepoRelativePath(resource);
}
}
14 years, 8 months
- 1
- 0
JBoss Tools SVN: r34006 - trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-08-17 10:06:24 -0400 (Wed, 17 Aug 2011)
New Revision: 34006
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/EgitUtils.java
Log:
[JBIDE-9513] implementing #push, corrected TestUtils#getRepositoryPath(IResource)
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/EgitUtils.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/EgitUtils.java 2011-08-17 12:54:20 UTC (rev 34005)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/EgitUtils.java 2011-08-17 14:06:24 UTC (rev 34006)
@@ -7,20 +7,32 @@
*
* Contributors:
* Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
+ ******************************************************************************/
package org.jboss.ide.eclipse.as.egit.core;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
+import java.util.List;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
import org.eclipse.egit.core.op.CommitOperation;
+import org.eclipse.egit.core.op.PushOperation;
+import org.eclipse.egit.core.op.PushOperationSpecification;
import org.eclipse.egit.core.project.RepositoryMapping;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.lib.UserConfig;
+import org.eclipse.jgit.transport.RemoteConfig;
+import org.eclipse.jgit.transport.RemoteRefUpdate;
+import org.eclipse.jgit.transport.URIish;
+import org.eclipse.osgi.util.NLS;
+import org.jboss.ide.eclipse.as.egit.core.internal.EGitCoreActivator;
/**
* @author André Dietisheim
@@ -30,7 +42,7 @@
public static void commit(IProject project) throws CoreException {
commit(project, null);
}
-
+
public static void commit(IProject project, IProgressMonitor monitor) throws CoreException {
IFile[] commitables = new IFile[] {};
@@ -45,18 +57,57 @@
getSubject(userConfig.getCommitterName(), userConfig.getCommitterEmail()),
"Initial commit");
op.setCommitAll(true);
- op.setRepository(repository );
+ op.setRepository(repository);
op.execute(monitor);
}
- public static void push(IProject project) throws CoreException {
- push(project, null);
+ public static void push(IProject project, Repository destinationRepository) throws CoreException {
+ push(project, destinationRepository, null);
}
- public static void push(IProject project, IProgressMonitor monitor) throws CoreException {
-
+ public static void push(IProject project, Repository destinationRepository, IProgressMonitor monitor)
+ throws CoreException {
+ push(getRepository(project), destinationRepository, monitor);
}
+ public static void push(Repository sourceRepository, Repository destinationRepository, IProgressMonitor monitor)
+ throws CoreException {
+ try {
+ PushOperationSpecification spec = new PushOperationSpecification();
+ URIish destinationURIisch = getPushUri(destinationRepository);
+ List<RemoteRefUpdate> refUpdates = new ArrayList<RemoteRefUpdate>();
+ RemoteRefUpdate update =
+ new RemoteRefUpdate(destinationRepository, "HEAD", "refs/heads/test", false, null, null);
+ refUpdates.add(update);
+ spec.addURIRefUpdates(destinationURIisch, refUpdates);
+ PushOperation pop =
+ new PushOperation(sourceRepository, spec, false, 0);
+ pop.run(monitor);
+ } catch (Exception e) {
+ IStatus status = new Status(IStatus.ERROR, EGitCoreActivator.PLUGIN_ID,
+ NLS.bind("Could not push repo {0} to {1}", sourceRepository.toString(),
+ destinationRepository.toString()), e);
+ throw new CoreException(status);
+ }
+ }
+
+ /**
+ * Gets the first push uri configured for the given repository or <code>null</code>.
+ *
+ * @param repository the repository
+ * @return the push uri
+ * @throws URISyntaxException the uRI syntax exception
+ */
+ private static URIish getPushUri(Repository repository) throws URISyntaxException {
+// return new URIish("file:///" + destinationRepository.getDirectory().toString());
+ RemoteConfig remoteConfig = new RemoteConfig(repository.getConfig(), "");
+ List<URIish> pushURIs = remoteConfig.getPushURIs();
+ if (pushURIs == null || pushURIs.isEmpty()) {
+ return null;
+ }
+ return pushURIs.get(0);
+ }
+
private static Repository getRepository(IProject project) {
RepositoryMapping repositoryMapping = RepositoryMapping.getMapping(project);
if (repositoryMapping == null) {
@@ -64,11 +115,11 @@
}
return repositoryMapping.getRepository();
}
-
+
private static UserConfig getUserConfig(Repository repository) {
return repository.getConfig().get(UserConfig.KEY);
}
-
+
private static String getSubject(String name, String email) {
return new StringBuilder().append(name).append(" <").append(email).append('>').toString();
}
14 years, 8 months
- 1
- 0