Author: lzoubek(a)redhat.com Date: 2010-05-10 06:16:54 -0400 (Mon, 10 May 2010) New Revision: 21982 Added: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/JavaBean.java Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/resources/SWTBotTest-default.properties trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/RequirementAwareSuite.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/Annotations.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/ESBBean.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/SeamBean.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/ServerBean.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/TestConfigurator.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/requirement/AddJava.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/requirement/AddServer.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/requirement/RequirementBase.java Log: SWTbot extensions : support EPP, print configuration debug info, all config props are optional now, major changes of JAVA config property Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/resources/SWTBotTest-default.properties =================================================================== --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/resources/SWTBotTest-default.properties 2010-05-09 17:22:54 UTC (rev 21981) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/resources/SWTBotTest-default.properties 2010-05-10 10:16:54 UTC (rev 21982) @@ -1,9 +1,10 @@ # SWTBotTest properties -# all defined paths should exist -JAVA_HOME_15=/usr/java/jdk-1.5.0_12/jre -JAVA_HOME_16=/opt/sun-jdk-1.6.0.19/jre -# EAP|JBOSS_AS,<server version>,<jre version to run with>|default,<server home> +# 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,<server version>,<jre version to run with>|default,<server home> SERVER=EAP,5.0,1.6,/data/jboss/jboss-eap-5.0/jboss-as #<seam version>,<seam runtime home> SEAM=2.2,/data/jboss/jboss-eap-5.0/seam +#<esb versoin>,<esb runtime home> ESB=4.7,/data/jboss/esb-4.7 Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/RequirementAwareSuite.java =================================================================== --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/RequirementAwareSuite.java 2010-05-09 17:22:54 UTC (rev 21981) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/RequirementAwareSuite.java 2010-05-10 10:16:54 UTC (rev 21982) @@ -87,13 +87,11 @@ + "' - incorrect configuration"); return null; } - log.info("Returning runner for test class " - + klass.getCanonicalName()); - // ensure creating runner instance - Runner runner = new ReqAwareClassRunner(klass, reqs); + log.info("Returning runner for class '" + + klass.getCanonicalName()+"'"); // increment number of tests planned to run by 1 (class contains at least 1 test method) cleanUp.incrPlanned(); - return runner; + return new ReqAwareClassRunner(klass, reqs); } log.info("Skipping class '" + klass.getCanonicalName() + "' - annotations do not met configuration"); @@ -136,6 +134,7 @@ @Override public void testFinished(Description description) throws Exception { incrFinished(); + log.info("Finished test : "+description.getDisplayName()); log.info("Finished tests : "+getFinished()+"/"+getPlanned()); if (getFinished() >= getPlanned()) { log.info("All tests finished, performing cleanup requirements "); Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/Annotations.java =================================================================== --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/Annotations.java 2010-05-09 17:22:54 UTC (rev 21981) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/Annotations.java 2010-05-10 10:16:54 UTC (rev 21982) @@ -162,6 +162,10 @@ */ JbossAS, /** + * EAP with portal + */ + EPP, + /** * all server types acceptable */ ALL Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/ESBBean.java =================================================================== --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/ESBBean.java 2010-05-09 17:22:54 UTC (rev 21981) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/ESBBean.java 2010-05-10 10:16:54 UTC (rev 21982) @@ -6,6 +6,9 @@ public static ESBBean fromString(String propValue) throws Exception{ try { + if (propValue==null) { + return null; + } String[] esbParams = propValue.split(","); ESBBean bean = new ESBBean(); bean.esbHome=esbParams[1]; @@ -16,4 +19,9 @@ throw new Exception("Cannot parse ESB property line",ex); } } + @Override + public String toString() { + return String.format("ESB runtime version=%s, home=%s", + this.version, this.esbHome); + } } Added: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/JavaBean.java =================================================================== --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/JavaBean.java (rev 0) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/JavaBean.java 2010-05-10 10:16:54 UTC (rev 21982) @@ -0,0 +1,27 @@ +package org.jboss.tools.ui.bot.ext.config; + +public class JavaBean { + public String version; + public String javaHome; + + public static JavaBean fromString(String propValue) throws Exception{ + try { + if (propValue==null) { + return null; + } + String[] esbParams = propValue.split(","); + JavaBean bean = new JavaBean(); + bean.javaHome=esbParams[1]; + bean.version=esbParams[0]; + return bean; + } + catch (Exception ex) { + throw new Exception("Cannot parse JAVA property line",ex); + } + } + @Override + public String toString() { + return String.format("JAVA runtime version=%s, home=%s", + this.version, this.javaHome); + } +} Property changes on: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/JavaBean.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/SeamBean.java =================================================================== --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/SeamBean.java 2010-05-09 17:22:54 UTC (rev 21981) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/SeamBean.java 2010-05-10 10:16:54 UTC (rev 21982) @@ -1,21 +1,28 @@ package org.jboss.tools.ui.bot.ext.config; - public class SeamBean { public String version; public String seamHome; - - public static SeamBean fromString(String propValue) throws Exception{ + + public static SeamBean fromString(String propValue) throws Exception { try { + if (propValue == null) { + return null; + } String[] seamParams = propValue.split(","); SeamBean bean = new SeamBean(); - bean.seamHome=seamParams[1]; - bean.version=seamParams[0]; + bean.seamHome = seamParams[1]; + bean.version = seamParams[0]; return bean; - } - catch (Exception ex) { - throw new Exception("Cannot parse SEAM property line",ex); - } + } catch (Exception ex) { + throw new Exception("Cannot parse SEAM property line", ex); + } } + + @Override + public String toString() { + return String.format("Seam runtime version=%s, home=%s", + this.version, this.seamHome); + } } Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/ServerBean.java =================================================================== --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/ServerBean.java 2010-05-09 17:22:54 UTC (rev 21981) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/ServerBean.java 2010-05-10 10:16:54 UTC (rev 21982) @@ -10,12 +10,8 @@ public String version; public String runtimeHome; public String withJavaVersion; - public ServerType type; + public String type; - public enum ServerType { - EAP, - JBOSS_AS - } /** * creates bean instance from property string * @param propValue property value @@ -24,17 +20,24 @@ */ public static ServerBean fromString(String propValue) throws Exception { try { + if (propValue==null) { + return null; + } String[] serverParams = propValue.split(","); ServerBean bean = new ServerBean(); bean.withJavaVersion = serverParams[2]; bean.runtimeHome=serverParams[3]; bean.version=serverParams[1]; - bean.type = Enum.valueOf(ServerType.class, serverParams[0]); + bean.type = serverParams[0]; return bean; } catch (Exception ex) { throw new Exception("Cannot parse SERVER property line",ex); } } + @Override + public String toString() { + return String.format("Server type=%s,version=%s,home=%s,withJava=%s", this.type,this.version,this.runtimeHome,this.withJavaVersion); + } } Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/TestConfigurator.java =================================================================== --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/TestConfigurator.java 2010-05-09 17:22:54 UTC (rev 21981) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/TestConfigurator.java 2010-05-10 10:16:54 UTC (rev 21982) @@ -22,17 +22,17 @@ import org.jboss.tools.ui.bot.ext.config.requirement.RequirementBase; public class TestConfigurator { - private static final Logger log = Logger - .getLogger(TestConfigurator.class); + private static final Logger log = Logger.getLogger(TestConfigurator.class); + public class Keys { public static final String SERVER = "SERVER"; public static final String SEAM = "SEAM"; - public static final String JAVA_HOME_15 = "JAVA_HOME_15"; - public static final String JAVA_HOME_16 = "JAVA_HOME_16"; + public static final String JAVA = "JAVA"; public static final String ESB = "ESB"; } public class Values { + public static final String SERVER_TYPE_EPP = "EPP"; public static final String SERVER_TYPE_EAP = "EAP"; public static final String SERVER_TYPE_JBOSSAS = "JBOSS_AS"; public static final String SERVER_WITH_DEFAULT_JAVA = "default"; @@ -43,6 +43,7 @@ public static ServerBean server; public static SeamBean seam; public static ESBBean esb; + public static JavaBean java; static { try { // try to load from file first @@ -51,10 +52,13 @@ if (propFile != null) { try { if (new File(propFile).exists()) { - log.info("Loading exeternaly provided configuration file '"+propFile+"'"); - swtTestProperties.load(new FileInputStream(propFile)); + log + .info("Loading exeternaly provided configuration file '" + + propFile + "'"); + swtTestProperties.load(new FileInputStream(propFile)); } else { - throw new IOException(SWTBOT_TEST_PROPERTIES_FILE+" "+propFile+" does not exist!"); + throw new IOException(SWTBOT_TEST_PROPERTIES_FILE + " " + + propFile + " does not exist!"); } } catch (FileNotFoundException e) { // TODO Auto-generated catch block @@ -65,7 +69,7 @@ } } else { try { - log.info("Loading default configuration"); + log.info("Loading default configuration, override by pointing java system property '"+SWTBOT_TEST_PROPERTIES_FILE+"' to your custom property file"); swtTestProperties.load(new FileInputStream(SWTTestExt.util .getResourceFile(Activator.PLUGIN_ID, "/SWTBotTest-default.properties"))); @@ -80,38 +84,69 @@ // properties got loaded try { + java = JavaBean.fromString(getProperty(Keys.JAVA)); + printConfig(Keys.JAVA, java); server = ServerBean.fromString(getProperty(Keys.SERVER)); + printConfig(Keys.SERVER, server); seam = SeamBean.fromString(getProperty(Keys.SEAM)); + printConfig(Keys.SEAM, seam); esb = ESBBean.fromString(getProperty(Keys.ESB)); + printConfig(Keys.ESB, esb); } catch (Exception e) { // TODO Auto-generated catch block e.printStackTrace(); } } -/** - * check config values if they seem to be valid (existing dirs) - * @throws FileNotFoundException - */ - public static boolean checkConfig() { + + private static void printConfig(String propName, Object bean) { + if (bean == null) { + log.info("Property " + propName + + " not found, server not configured"); + } else { + log.info("Configured " + bean.toString()); + } + } + + /** + * check config values if they seem to be valid (existing dirs) + * + * @throws FileNotFoundException + */ + public static boolean checkConfig() { try { - checkDirExists(getProperty(Keys.JAVA_HOME_15)); - checkDirExists(getProperty(Keys.JAVA_HOME_16)); - checkDirExists(seam.seamHome); - checkDirExists(server.runtimeHome); - checkDirExists(esb.esbHome); - return true; - } - catch (Exception ex) { - log.error("'"+ex.getMessage()+ "' - incorrect configuration, set your custom properties file via '"+SWTBOT_TEST_PROPERTIES_FILE+"' java property"); + if (java != null) + checkDirExists(java.javaHome); + if (seam != null) + checkDirExists(seam.seamHome); + if (server != null) + checkDirExists(server.runtimeHome); + if (esb != null) + checkDirExists(esb.esbHome); + // special checks capturing dependency of server on java + if (java==null && server!=null && !server.withJavaVersion.equals(Values.SERVER_WITH_DEFAULT_JAVA)) { + throw new Exception("Server is configured to run with java version="+server.withJavaVersion+" but no JAVA is configured"); + } + if (java!=null && !java.version.equals(server.withJavaVersion)) { + throw new Exception("Server is configured to run with java version="+server.withJavaVersion+" but JAVA is configured with "+java.version); + } + return true; + } catch (Exception ex) { + log + .error("'" + + ex.getMessage() + + "' - incorrect configuration, update your configuraton"); return false; } - + } + private static void checkDirExists(String dir) throws FileNotFoundException { if (!new File(dir).exists() || !new File(dir).isDirectory()) { - throw new FileNotFoundException("File '"+dir+"' does not exist or is not directory"); + throw new FileNotFoundException("File '" + dir + + "' does not exist or is not directory"); } } + /** * returns null when given Server annotation does not match global test * configuration (e.g. Test wants Server type EAP but we are running on @@ -122,18 +157,26 @@ * @return StartServer requirement otherwise */ private static RequirementBase getServerRequirement(Server s) { - if (!s.required()) { + // tests omitting server must run even when server not configured + if (ServerState.Disabled.equals(s.state()) && server == null) { + return RequirementBase.createRemoveServer(); + } + if (!s.required() || server == null) { return null; - } + } if (!s.type().equals(ServerType.ALL)) { if (s.type().equals(ServerType.EAP) - && !server.type.equals(ServerBean.ServerType.EAP)) { + && !server.type.equals(Values.SERVER_TYPE_EAP)) { return null; } if (s.type().equals(ServerType.JbossAS) - && !server.type.equals(ServerBean.ServerType.JBOSS_AS)) { + && !server.type.equals(Values.SERVER_TYPE_JBOSSAS)) { return null; } + if (s.type().equals(ServerType.EPP) + && !server.type.equals(Values.SERVER_TYPE_EPP)) { + return null; + } } if (!matches(server.version, s.operator(), s.version())) { return null; @@ -160,7 +203,7 @@ * @return AddSeam requirement otherwise */ private static RequirementBase getSeamRequirement(Seam s) { - if (!s.required()) { + if (!s.required() || seam == null) { return null; } if (!matches(seam.version, s.operator(), s.version())) { @@ -168,8 +211,9 @@ } return RequirementBase.createAddSeam(); } + private static RequirementBase getESBRequirement(ESB e) { - if (!e.required()) { + if (!e.required() || esb == null) { return null; } if (!matches(esb.version, e.operator(), e.version())) { Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/requirement/AddJava.java =================================================================== --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/requirement/AddJava.java 2010-05-09 17:22:54 UTC (rev 21981) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/requirement/AddJava.java 2010-05-10 10:16:54 UTC (rev 21982) @@ -1,6 +1,5 @@ package org.jboss.tools.ui.bot.ext.config.requirement; -import static org.junit.Assert.fail; import org.jboss.tools.ui.bot.ext.SWTTestExt; import org.jboss.tools.ui.bot.ext.config.TestConfigurator; /** @@ -10,13 +9,11 @@ */ public class AddJava extends RequirementBase { - private final String version; /** - * requirement for adding JRE + * requirement for adding JRE/JDK * @param version to add */ - public AddJava(String version) { - this.version = version; + public AddJava() { } @Override public boolean checkFulfilled() { @@ -29,20 +26,10 @@ SWTTestExt.configuredState.getJreList().add(getAddedAsName()); } public String getAddedAsName() { - return "JRE-"+version; + return "JRE-"+TestConfigurator.java.version; } private String getJavaHome() { - if ("1.5".equals(version)) { - return TestConfigurator.getProperty(TestConfigurator.Keys.JAVA_HOME_15); - } - if ("1.6".equals(version)) { - return TestConfigurator.getProperty(TestConfigurator.Keys.JAVA_HOME_16); - } - failParsing(); - return null; + return TestConfigurator.java.javaHome; } - private void failParsing() { - fail("Unable to add JRE runtime, unsupported verson :"+version); - } } Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/requirement/AddServer.java =================================================================== --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/requirement/AddServer.java 2010-05-09 17:22:54 UTC (rev 21981) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/requirement/AddServer.java 2010-05-10 10:16:54 UTC (rev 21982) @@ -17,7 +17,7 @@ import org.jboss.tools.ui.bot.ext.gen.ActionItem.ServerRuntime.JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform43Runtime; import org.jboss.tools.ui.bot.ext.gen.ActionItem.ServerRuntime.JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform50Runtime; /** - * adds server (version and type depends on {@link TestConfigurator#server} + * adds server (version and type depends on {@link TestConfigurator#server}) * @author lzoubek * */ @@ -26,8 +26,8 @@ private String javaName=null; public AddServer() { String javaVer = getNeededJavaVersion(TestConfigurator.server.withJavaVersion); - if (javaVer!=null) { - AddJava addJava = createAddJRE(javaVer); + if (javaVer!=null && TestConfigurator.java!=null &&javaVer.equals(TestConfigurator.java.version)) { + AddJava addJava = createAddJava(); getDependsOn().add(addJava); javaName=addJava.getAddedAsName(); } @@ -36,16 +36,16 @@ @Override public void handle() { - ServerInfo serverInfo = getRuntime(TestConfigurator.server.type.toString(),TestConfigurator.server.version); + ServerInfo serverInfo = getRuntime(TestConfigurator.server.type,TestConfigurator.server.version); String runtimeHome=TestConfigurator.server.runtimeHome; - String runtimeName=TestConfigurator.server.type.toString()+"-"+TestConfigurator.server.version; + String runtimeName=TestConfigurator.server.type+"-"+TestConfigurator.server.version; SWTTestExt.eclipse.addJbossServerRuntime(serverInfo.runtime, runtimeHome, runtimeName, javaName); SWTTestExt.eclipse.addServer(serverInfo.server, runtimeName); SWTTestExt.configuredState.getServer().isConfigured=true; SWTTestExt.configuredState.getServer().name=runtimeName; SWTTestExt.configuredState.getServer().version=TestConfigurator.server.version; - SWTTestExt.configuredState.getServer().type=TestConfigurator.server.type.toString(); + SWTTestExt.configuredState.getServer().type=TestConfigurator.server.type; SWTTestExt.configuredState.getServer().withJavaVersion = TestConfigurator.server.withJavaVersion; } @@ -77,7 +77,19 @@ JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform50.LABEL); } - } else if (TestConfigurator.Values.SERVER_TYPE_JBOSSAS.equals(serverType)) { + }if (TestConfigurator.Values.SERVER_TYPE_EPP.equals(serverType)) { + if ("4.3".equals(version)) { + return new ServerInfo(JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform43Runtime.LABEL, + JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform43.LABEL + ); + } + if ("5.0".equals(version)) { + return new ServerInfo(JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform50Runtime.LABEL, + JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform50.LABEL); + } + + } + else if (TestConfigurator.Values.SERVER_TYPE_JBOSSAS.equals(serverType)) { if ("4.2".equals(version)) { return new ServerInfo(JBossCommunityJBoss42Runtime.LABEL,JBossCommunityJBossAS42.LABEL); } Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/requirement/RequirementBase.java =================================================================== --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/requirement/RequirementBase.java 2010-05-09 17:22:54 UTC (rev 21981) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/requirement/RequirementBase.java 2010-05-10 10:16:54 UTC (rev 21982) @@ -120,8 +120,8 @@ return req; } - public static AddJava createAddJRE(String version) { - AddJava req = new AddJava(version); + public static AddJava createAddJava() { + AddJava req = new AddJava(); return req; }