[jbosstools-commits] JBoss Tools SVN: r42905 - trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template.

[jbosstools-commits at lists.jboss.org]

Author: ljelinko
Date: 2012-08-08 05:08:30 -0400 (Wed, 08 Aug 2012)
New Revision: 42905

Modified:
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/DeployJSPProjectTemplate.java
Log:
Changed the order of asserts so that they wait until the specified text is displayed in the console first. 

Modified: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/DeployJSPProjectTemplate.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/DeployJSPProjectTemplate.java	2012-08-08 07:42:21 UTC (rev 42904)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/DeployJSPProjectTemplate.java	2012-08-08 09:08:30 UTC (rev 42905)
@@ -8,7 +8,6 @@
 import org.jboss.ide.eclipse.as.ui.bot.test.wizard.ImportProjectWizard;
 import org.jboss.tools.ui.bot.ext.SWTTestExt;
 import org.jboss.tools.ui.bot.ext.SWTUtilExt;
-import org.jboss.tools.ui.bot.ext.condition.NonSystemJobRunsCondition;
 import org.jboss.tools.ui.bot.ext.condition.TaskDuration;
 import org.jboss.tools.ui.bot.ext.matcher.console.ConsoleOutputMatcher;
 import org.jboss.tools.ui.bot.ext.view.ServersView;
@@ -47,12 +46,12 @@
 		ServersView serversView = new ServersView();
 		serversView.addProjectToServer(PROJECT_NAME, configuredState.getServer().name);
 
-		// web
-		serversView.openWebPage(configuredState.getServer().name, PROJECT_NAME);
-		assertThat("Hello tests!", new PageSourceMatcher());
 		// console
 		assertThat(getConsoleMessage(), new ConsoleOutputMatcher(TaskDuration.NORMAL));
 		assertThat("Exception:", not(new ConsoleOutputMatcher()));
+		// web
+		serversView.openWebPage(configuredState.getServer().name, PROJECT_NAME);
+		assertThat("Hello tests!", new PageSourceMatcher());
 		// view
 		assertTrue("Server contains project", serversView.containsProject(configuredState.getServer().name, PROJECT_NAME));
 		assertEquals("Started", serversView.getServerStatus(configuredState.getServer().name));