Author: yzhishko
Date: 2009-10-16 12:11:16 -0400 (Fri, 16 Oct 2009)
New Revision: 18133
Modified:
trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/resources/seam21Settings.properties
trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/TestControl.java
trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateSeamProjects.java
Log:
SWT Bot Seam tests were corrected.
Modified:
trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/resources/seam21Settings.properties
===================================================================
---
trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/resources/seam21Settings.properties 2009-10-16
13:50:15 UTC (rev 18132)
+++
trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/resources/seam21Settings.properties 2009-10-16
16:11:16 UTC (rev 18133)
@@ -1,4 +1,4 @@
seamRuntimeName=Seam 2.1.1.GA
seamRuntimePath=${jbosstools.test.seam.2.1.0.GA.home}
testProjectName=seamTest21
-configName=Dynamic Web Project with Seam 2.1 (technology preview)
+configName=Dynamic Web Project with Seam 2.1
\ No newline at end of file
Modified:
trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/TestControl.java
===================================================================
---
trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/TestControl.java 2009-10-16
13:50:15 UTC (rev 18132)
+++
trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/TestControl.java 2009-10-16
16:11:16 UTC (rev 18133)
@@ -26,6 +26,9 @@
private static final String SEAM_SET_12 = "seam12Settings.properties";
private static final String SEAM_SET_2FP = "seam2fpSettings.properties";
private static final String SEAM_SET_21 = "seam21Settings.properties";
+ protected static final String VALIDATION = "Validation";
+ protected static final String DEPLOY_SOURCE = "Deploying datasource to
server";
+ protected static final String REG_IN_SERVER = "Register in server";
public static String JBOSS_EAP_HOME;
public static String SEAM_12_SETTINGS_HOME;
@@ -148,6 +151,7 @@
protected void createSeamRuntime(Properties runtimeSet, String homeFolder){
bot.menu("Window").menu("Preferences").click();
SWTBotTree tree = bot.tree();
+ delay();
tree.expandNode("JBoss Tools")
.expandNode("Web")
.expandNode("Seam")
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 2009-10-16
13:50:15 UTC (rev 18132)
+++
trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateSeamProjects.java 2009-10-16
16:11:16 UTC (rev 18133)
@@ -5,48 +5,44 @@
public class CreateSeamProjects extends TestControl{
public void testCreateSeamProject12war(){
- createSeamProject(seam12Settings, jbossEAPRuntime, TYPE_WAR);
-// waitForBlockingJobsAcomplished(180000, BUILDING_WS);
+ waitForBlockingJobsAcomplished(180000, BUILDING_WS, VALIDATION +
+ " " + seam12Settings.getProperty("testProjectName")
+ +TYPE_WAR, DEPLOY_SOURCE, REG_IN_SERVER);
}
-// public void testCreateSeamProject12ear(){
-// createSeamProject(seam12Settings, jbossEAPRuntime, TYPE_EAR);
-// try {
-// waitForBlockingJobsAcomplished(180000, BUILDING_WS);
-// } catch (InterruptedException e) {
-// }
-// }
-//
-// public void testCreateSeamProject2fpwar(){
-// createSeamProject(seam2fpSettings, jbossEAPRuntime, TYPE_WAR);
-// try {
-// waitForBlockingJobsAcomplished(180000, BUILDING_WS);
-// } catch (InterruptedException e) {
-// }
-// }
-//
-// public void testCreateSeamProject2fpear(){
-// createSeamProject(seam2fpSettings, jbossEAPRuntime, TYPE_EAR);
-// try {
-// waitForBlockingJobsAcomplished(180000, BUILDING_WS);
-// } catch (InterruptedException e) {
-// }
-// }
-//
-// public void testCreateSeamProject21war(){
-// createSeamProject(seam21Settings, jbossEAPRuntime, TYPE_WAR);
-// try {
-// waitForBlockingJobsAcomplished(180000, BUILDING_WS);
-// } catch (InterruptedException e) {
-// }
-// }
-//
-// public void testCreateSeamProject21ear(){
-// createSeamProject(seam21Settings, jbossEAPRuntime, TYPE_EAR);
-// try {
-// waitForBlockingJobsAcomplished(180000, BUILDING_WS);
-// } catch (InterruptedException e) {
-// }
-// }
+ public void testCreateSeamProject12ear(){
+ createSeamProject(seam12Settings, jbossEAPRuntime, TYPE_EAR);
+ waitForBlockingJobsAcomplished(180000, BUILDING_WS, VALIDATION +
+ " " + seam12Settings.getProperty("testProjectName")
+ +TYPE_EAR, DEPLOY_SOURCE, REG_IN_SERVER);
+ }
+ public void testCreateSeamProject2fpwar(){
+ createSeamProject(seam2fpSettings, jbossEAPRuntime, TYPE_WAR);
+ waitForBlockingJobsAcomplished(180000, BUILDING_WS, VALIDATION +
+ " " + seam2fpSettings.getProperty("testProjectName")
+ +TYPE_WAR, DEPLOY_SOURCE, REG_IN_SERVER);
+ }
+
+ public void testCreateSeamProject2fpear(){
+ createSeamProject(seam2fpSettings, jbossEAPRuntime, TYPE_EAR);
+ waitForBlockingJobsAcomplished(180000, BUILDING_WS, VALIDATION +
+ " " + seam2fpSettings.getProperty("testProjectName")
+ +TYPE_EAR, DEPLOY_SOURCE, REG_IN_SERVER);
+ }
+
+ public void testCreateSeamProject21war(){
+ createSeamProject(seam21Settings, jbossEAPRuntime, TYPE_WAR);
+ waitForBlockingJobsAcomplished(180000, BUILDING_WS, VALIDATION +
+ " " + seam21Settings.getProperty("testProjectName")
+ +TYPE_WAR, DEPLOY_SOURCE, REG_IN_SERVER);
+ }
+
+ public void testCreateSeamProject21ear(){
+ createSeamProject(seam21Settings, jbossEAPRuntime, TYPE_EAR);
+ waitForBlockingJobsAcomplished(180000, BUILDING_WS, VALIDATION +
+ " " + seam21Settings.getProperty("testProjectName")
+ +TYPE_EAR, DEPLOY_SOURCE, REG_IN_SERVER);
+ }
+
}
\ No newline at end of file