[jbosstools-commits] JBoss Tools SVN: r43115 - in trunk/forge/tests/org.jboss.tools.forge.ui.bot.test: resources/properties and 1 other directories.

[jbosstools-commits at lists.jboss.org]

Author: psrna
Date: 2012-08-20 10:44:20 -0400 (Mon, 20 Aug 2012)
New Revision: 43115

Modified:
   trunk/forge/tests/org.jboss.tools.forge.ui.bot.test/pom.xml
   trunk/forge/tests/org.jboss.tools.forge.ui.bot.test/resources/properties/swtbot.properties
   trunk/forge/tests/org.jboss.tools.forge.ui.bot.test/src/org/jboss/tools/forge/ui/bot/test/suite/ForgeTest.java
Log:
* @Require server added


Modified: trunk/forge/tests/org.jboss.tools.forge.ui.bot.test/pom.xml
===================================================================
--- trunk/forge/tests/org.jboss.tools.forge.ui.bot.test/pom.xml	2012-08-20 14:43:52 UTC (rev 43114)
+++ trunk/forge/tests/org.jboss.tools.forge.ui.bot.test/pom.xml	2012-08-20 14:44:20 UTC (rev 43115)
@@ -14,7 +14,7 @@
 	<properties>
 		<jbosstools.test.jboss-as.home>${requirementsDirectory}/jboss-as-7.1.1.Final</jbosstools.test.jboss-as.home>
 		<additionalSystemProperties></additionalSystemProperties>
-		<systemProperties>${additionalSystemProperties} -Dtest.configurations.dir=resources/properties -Djbosstools.test.jboss-as.home=${jbosstools.test.jboss-as.home}</systemProperties>
+		<systemProperties>${additionalSystemProperties} -DJAVA_HOME=${JAVA_HOME} -Dtest.configurations.dir=resources/properties -Djbosstools.test.jboss-as.home=${jbosstools.test.jboss-as.home}</systemProperties>
 	</properties>
 
 	<profiles>

Modified: trunk/forge/tests/org.jboss.tools.forge.ui.bot.test/resources/properties/swtbot.properties
===================================================================
--- trunk/forge/tests/org.jboss.tools.forge.ui.bot.test/resources/properties/swtbot.properties	2012-08-20 14:43:52 UTC (rev 43114)
+++ trunk/forge/tests/org.jboss.tools.forge.ui.bot.test/resources/properties/swtbot.properties	2012-08-20 14:44:20 UTC (rev 43115)
@@ -3,9 +3,10 @@
 # <java version>,<jre/jdk home>
 # JAVA=1.6,/usr/java/jdk1.6.0_25/jre
 # JAVA=1.6,${JAVA_HOME}
+JAVA=1.x,${JAVA_HOME}
 #EAP|JBOSS_AS|EPP|SOA,<server version>,<jre version to run with>|default,<server home>
 # note : when server is type of SOA, version is version of SOA (not the bundled EAP)
-SERVER=AS,7.0,default,${jbosstools.test.jboss-as.home}
+SERVER=AS,7.1,1.x,${jbosstools.test.jboss-as.home}
 #<seam version>,<seam runtime home>
 #SEAM=2.2,/opt/jbdevstudio4.1.1.GA/jboss-eap/seam
 #<esb versoin>,<esb runtime home>

Modified: trunk/forge/tests/org.jboss.tools.forge.ui.bot.test/src/org/jboss/tools/forge/ui/bot/test/suite/ForgeTest.java
===================================================================
--- trunk/forge/tests/org.jboss.tools.forge.ui.bot.test/src/org/jboss/tools/forge/ui/bot/test/suite/ForgeTest.java	2012-08-20 14:43:52 UTC (rev 43114)
+++ trunk/forge/tests/org.jboss.tools.forge.ui.bot.test/src/org/jboss/tools/forge/ui/bot/test/suite/ForgeTest.java	2012-08-20 14:44:20 UTC (rev 43115)
@@ -1,7 +1,6 @@
 package org.jboss.tools.forge.ui.bot.test.suite;
 
 import static org.eclipse.swtbot.swt.finder.matchers.WidgetMatcherFactory.widgetOfType;
-
 import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView;
 import org.eclipse.swtbot.swt.finder.SWTBot;
 import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell;
@@ -10,16 +9,21 @@
 import org.jboss.tools.forge.ui.bot.test.util.ConsoleUtils;
 import org.jboss.tools.forge.ui.bot.test.util.ViewUtils;
 import org.jboss.tools.ui.bot.ext.SWTTestExt;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
 import org.jboss.tools.ui.bot.ext.types.IDELabel;
 import org.jboss.tools.ui.bot.ext.view.ProjectExplorer;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
+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;
 
 /**
  * 
  * @author psrna
  *
  */
+ at Require(server = @Server(type = ServerType.ALL, state = ServerState.Present))
 public class ForgeTest extends SWTTestExt {
 
 	protected static final String PROJECT_NAME = "testproject";
@@ -164,6 +168,7 @@
 	}
 	
 	public static void startForge(){
+		log.info("Trying to start forge...");
 		
 		if(!isForgeViewActive())
 			openForgeView();
@@ -175,7 +180,7 @@
 		//not working with juno ^^^
 		//workaround:
 		ViewUtils.getToolbarButton("Start the default Forge runtime").click();	
-		
+
 		util.waitForNonIgnoredJobs();
 	}