[jbosstools-commits] JBoss Tools SVN: r25786 - in trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config: requirement and 1 other directory.
Author: lzoubek(a)redhat.com
Date: 2010-10-13 10:06:37 -0400 (Wed, 13 Oct 2010)
New Revision: 25786
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/TestConfigurator.java
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/requirement/AddServer.java
Log:
SWBot ext: added new server annotation
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 2010-10-13
14:05:59 UTC (rev 25785)
+++
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/Annotations.java 2010-10-13
14:06:37 UTC (rev 25786)
@@ -148,6 +148,10 @@
}
public enum ServerState {
/**
+ * server is present, no matter if runs or not
+ */
+ Present,
+ /**
* server will run
*/
Running,
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 2010-10-13
14:05:59 UTC (rev 25785)
+++
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/TestConfigurator.java 2010-10-13
14:06:37 UTC (rev 25786)
@@ -137,11 +137,14 @@
removeServer.getDependsOn().add(RequirementBase.createStopServer());
return removeServer;
}
- if (ServerState.NotRunning.equals(s.state())) {
+ else if (ServerState.NotRunning.equals(s.state())) {
RequirementBase stopServer = RequirementBase.createStopServer();
stopServer.getDependsOn().add(RequirementBase.createAddServer());
return stopServer;
}
+ else if (ServerState.Present.equals(s.state())) {
+ return RequirementBase.createAddServer();
+ }
return RequirementBase.createStartServer();
}
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 2010-10-13
14:05:59 UTC (rev 25785)
+++
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/requirement/AddServer.java 2010-10-13
14:06:37 UTC (rev 25786)
@@ -67,6 +67,9 @@
if ("5.0".equals(TestConfigurator.currentConfig.getServer().version)) {
SWTTestExt.configuredState.getServer().bundledESBVersion="4.7";
}
+ if ("5.1".equals(TestConfigurator.currentConfig.getServer().version)) {
+ SWTTestExt.configuredState.getServer().bundledESBVersion="4.9";
+ }
}
}
@@ -125,6 +128,10 @@
return new
ServerInfo(JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform50Runtime.LABEL,
JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform50.LABEL);
}
+ if ("5.1".equals(version)) {
+ return new
ServerInfo(JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform50Runtime.LABEL,
+ JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform50.LABEL);
+ }
}
else if (TestConfigurator.Values.SERVER_TYPE_JBOSSAS.equals(serverType)) {