[jbosstools-commits] JBoss Tools SVN: r23386 - in trunk: vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test and 1 other directory.
Author: vpakan(a)redhat.com
Date: 2010-07-13 13:02:52 -0400 (Tue, 13 Jul 2010)
New Revision: 23386
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/AddRemoveJSFCapabilitiesTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java
Log:
Added functionality to use JBoss EAP 5.0 as target Server Runtime.
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 2010-07-13
15:08:59 UTC (rev 23385)
+++
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/AddRemoveJSFCapabilitiesTest.java 2010-07-13
17:02:52 UTC (rev 23386)
@@ -11,8 +11,6 @@
package org.jboss.tools.jsf.ui.bot.test.smoke;
-import static org.jboss.tools.ui.bot.ext.SWTTestExt.eclipse;
-
import java.io.File;
import org.eclipse.swtbot.swt.finder.SWTBot;
@@ -84,7 +82,7 @@
bot.textWithLabel("web.xml Location*").setText(webXmlFileLocation);
bot.button(WidgetVariables.NEXT_BUTTON).click();
- SWTJBTExt.addServerToServerViewOnWizardPage(bot,
IDELabel.ServerGroup.JBOSS_EAP_4_3, IDELabel.ServerType.JBOSS_EAP_4_3);
+ SWTJBTExt.addServerToServerViewOnWizardPage(bot, JBOSS_SERVER_GROUP,
JBOSS_SERVER_TYPE);
bot.sleep(1000L);
bot.button(IDELabel.Button.FINISH).click();
eclipse.closeWarningWindowIfOpened(true);
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 2010-07-13
15:08:59 UTC (rev 23385)
+++
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java 2010-07-13
17:02:52 UTC (rev 23386)
@@ -44,6 +44,7 @@
protected final static String JBOSS_EAP_HOME;
protected final static String JBT_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;
/* (non-Javadoc)
@@ -74,12 +75,13 @@
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;
}
JBT_TEST_PROJECT_NAME = projectProperties.getProperty("JSFProjectName");
//$NON-NLS-1$
}