[jbosstools-commits] JBoss Tools SVN: r42971 - in branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test: as4 and 1 other directories.

[jbosstools-commits at lists.jboss.org]

Author: ljelinko
Date: 2012-08-10 07:38:24 -0400 (Fri, 10 Aug 2012)
New Revision: 42971

Modified:
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as3/OperateAS3Server.java
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/OperateAS4Server.java
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/OperateServerTemplate.java
Log:
Added missing assert for web page content + fixed AS3 and AS4

Modified: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as3/OperateAS3Server.java
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as3/OperateAS3Server.java	2012-08-10 11:02:30 UTC (rev 42970)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as3/OperateAS3Server.java	2012-08-10 11:38:24 UTC (rev 42971)
@@ -16,6 +16,6 @@
 
 	@Override
 	public String getWelcomePageText() {
-		return "Manage this JBoss AS Instance";
+		return "JBoss Management";
 	}
 }

Modified: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/OperateAS4Server.java
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/OperateAS4Server.java	2012-08-10 11:02:30 UTC (rev 42970)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/OperateAS4Server.java	2012-08-10 11:38:24 UTC (rev 42971)
@@ -16,6 +16,6 @@
 
 	@Override
 	public String getWelcomePageText() {
-		return "Manage this JBoss AS Instance";
+		return "JBoss Management";
 	}
 }

Modified: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/OperateServerTemplate.java
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/OperateServerTemplate.java	2012-08-10 11:02:30 UTC (rev 42970)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/OperateServerTemplate.java	2012-08-10 11:38:24 UTC (rev 42971)
@@ -4,6 +4,7 @@
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.not;
 
+import org.jboss.ide.eclipse.as.ui.bot.test.web.PageSourceMatcher;
 import org.jboss.tools.ui.bot.ext.SWTTestExt;
 import org.jboss.tools.ui.bot.ext.matcher.console.ConsoleOutputMatcher;
 import org.jboss.tools.ui.bot.ext.view.ServersView;
@@ -71,6 +72,7 @@
 	}
 	
 	private void assertWebPageContains(String string) {
-		serversView.openWebPage(configuredState.getServer().name);		
+		serversView.openWebPage(configuredState.getServer().name);
+		assertThat(string, new PageSourceMatcher());
 	}
 }