Author: ljelinko Date: 2012-03-20 04:45:23 -0400 (Tue, 20 Mar 2012) New Revision: 39645 Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/browser/BrowserUrlMatcher.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/server/RunAsLoadsPortalURLGatein.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/server/RunAsLoadsPortalURLJBPortal.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/RunAsLoadsPortalURLTemplate.java Log: Changed BrowserURLMatcher to take array of acceptable URLs Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/browser/BrowserUrlMatcher.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/browser/BrowserUrlMatcher.java 2012-03-20 07:34:34 UTC (rev 39644) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/browser/BrowserUrlMatcher.java 2012-03-20 08:45:23 UTC (rev 39645) @@ -1,28 +1,30 @@ package org.jboss.tools.portlet.ui.bot.matcher.browser; +import java.util.Arrays; + import org.hamcrest.Description; import org.jboss.tools.portlet.ui.bot.matcher.AbstractSWTMatcher; import org.jboss.tools.ui.bot.ext.SWTBotFactory; /** - * Checks the URL of the page laoded in the browser. + * Checks if the URL of the page laoded in the browser is one of the accepted URLs. * * @author Lucia Jelinkova * */ -public class BrowserUrlMatcher extends AbstractSWTMatcher<String> { +public class BrowserUrlMatcher extends AbstractSWTMatcher<String[]> { private String realURL; @Override - public boolean matchesSafely(String expectedURL) { + public boolean matchesSafely(String[] acceptedURL) { realURL = SWTBotFactory.getBot().browser().getUrl(); - return expectedURL.equals(realURL); + return Arrays.asList(acceptedURL).contains(realURL); } @Override public void describeTo(Description description) { - description.appendText("is loaded in browser but it was: "); + description.appendText("are the only allowed loaded URLs but it was:"); description.appendValue(realURL); } } Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/server/RunAsLoadsPortalURLGatein.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/server/RunAsLoadsPortalURLGatein.java 2012-03-20 07:34:34 UTC (rev 39644) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/server/RunAsLoadsPortalURLGatein.java 2012-03-20 08:45:23 UTC (rev 39645) @@ -9,7 +9,7 @@ public class RunAsLoadsPortalURLGatein extends RunAsLoadsPortalURLTemplate { @Override - public String getExpectedURL() { - return "http://localhost:8080/portal/classic/"; + public String[] getExpectedURLs() { + return new String[]{"http://localhost:8080/portal/classic/", "http://localhost:8080/portal/public/classic/"}; } } Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/server/RunAsLoadsPortalURLJBPortal.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/server/RunAsLoadsPortalURLJBPortal.java 2012-03-20 07:34:34 UTC (rev 39644) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/server/RunAsLoadsPortalURLJBPortal.java 2012-03-20 08:45:23 UTC (rev 39645) @@ -9,7 +9,7 @@ public class RunAsLoadsPortalURLJBPortal extends RunAsLoadsPortalURLTemplate { @Override - public String getExpectedURL() { - return "http://localhost:8080/portal"; + public String[] getExpectedURLs() { + return new String[]{"http://localhost:8080/portal"}; } } Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/RunAsLoadsPortalURLTemplate.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/RunAsLoadsPortalURLTemplate.java 2012-03-20 07:34:34 UTC (rev 39644) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/RunAsLoadsPortalURLTemplate.java 2012-03-20 08:45:23 UTC (rev 39645) @@ -25,14 +25,14 @@ private static final String PROJECT_NAME = "runAsURLTestProject"; - public abstract String getExpectedURL(); + public abstract String[] getExpectedURLs(); @Test public void runAsLoadsPortalURL(){ doPerform(createJavaPortletTask()); doPerform(runOnServerTask()); - doAssertThatInWorkspace(getExpectedURL(), new BrowserUrlMatcher()); + doAssertThatInWorkspace(getExpectedURLs(), new BrowserUrlMatcher()); } private SWTTask createJavaPortletTask() {