[jbosstools-commits] JBoss Tools SVN: r37515 - trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example.

Author: ljelinko Date: 2011-12-22 03:52:15 -0500 (Thu, 22 Dec 2011) New Revision: 37515 Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/AbstractPortletExampleTest.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/JSFPortletExample.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/JavaPortletExample.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/SeamPortletExample.java Log: Added test for loading portlet in browser Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/AbstractPortletExampleTest.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/AbstractPortletExampleTest.java 2011-12-22 08:51:56 UTC (rev 37514) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/AbstractPortletExampleTest.java 2011-12-22 08:52:15 UTC (rev 37515) @@ -1,11 +1,15 @@ package org.jboss.tools.portlet.ui.bot.test.example; -import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.not; -import static org.jboss.tools.portlet.ui.bot.matcher.factory.DefaultMatchersFactory.inConsoleOutput; +import static org.jboss.tools.portlet.ui.bot.matcher.WorkspaceAssert.assertThatInWorkspace; +import static org.jboss.tools.portlet.ui.bot.matcher.factory.DefaultMatchersFactory.exceptionInConsoleOutput; import static org.jboss.tools.portlet.ui.bot.matcher.factory.DefaultMatchersFactory.isNumberOfErrors; +import static org.jboss.tools.portlet.ui.bot.matcher.factory.PortletMatchersFactory.canLoadAt4xRuntime; +import org.hamcrest.Matcher; +import org.jboss.tools.portlet.ui.bot.entity.PortletDefinition; import org.jboss.tools.portlet.ui.bot.task.AbstractSWTTask; +import org.jboss.tools.portlet.ui.bot.task.SWTBotAware; import org.jboss.tools.portlet.ui.bot.task.console.ConsoleClearingTask; import org.jboss.tools.portlet.ui.bot.task.server.RunninngProjectOnServerTask; import org.jboss.tools.ui.bot.ext.ExampleTest; @@ -23,10 +27,7 @@ @Require(server=(a)Server(version=&quot;4.3&quot;, state=ServerState.Running, type=ServerType.EPP)) public abstract class AbstractPortletExampleTest extends ExampleTest { - protected void doPerform(AbstractSWTTask task){ - task.setBot(bot); - task.perform(); - } + protected abstract PortletDefinition getPortletDefinition(); @Override protected void executeExample() { @@ -36,7 +37,27 @@ doPerform(new RunninngProjectOnServerTask(project)); } - assertThat(0, isNumberOfErrors()); - assertThat("Exception:", not(inConsoleOutput())); + doAssertThatInWorkspace(0, isNumberOfErrors()); + doAssertThatInWorkspace(not(exceptionInConsoleOutput())); + doAssertThatInWorkspace(getPortletDefinition(), canLoadAt4xRuntime()); } + + protected void doPerform(AbstractSWTTask task){ + task.setBot(bot); + task.perform(); + } + + protected void doAssertThatInWorkspace(Matcher<Void> matcher){ + if (matcher instanceof SWTBotAware){ + ((SWTBotAware) matcher).setBot(bot); + } + assertThatInWorkspace(matcher); + } + + protected <T> void doAssertThatInWorkspace(T actual, Matcher<T> matcher){ + if (matcher instanceof SWTBotAware){ + ((SWTBotAware) matcher).setBot(bot); + } + assertThatInWorkspace(actual, matcher); + } } Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/JSFPortletExample.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/JSFPortletExample.java 2011-12-22 08:51:56 UTC (rev 37514) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/JSFPortletExample.java 2011-12-22 08:52:15 UTC (rev 37515) @@ -1,6 +1,10 @@ package org.jboss.tools.portlet.ui.bot.test.example; +import static org.jboss.tools.portlet.ui.bot.entity.EntityFactory.portlet; +import org.jboss.tools.portlet.ui.bot.entity.PortletDefinition; + + /** * Tests the Java portlet example. * @@ -25,4 +29,9 @@ public String[] getProjectNames() { return new String[]{PROJECT_NAME}; } + + @Override + protected PortletDefinition getPortletDefinition() { + return portlet("TestJSFPortlet", "Test JBoss JSF Portlet"); + } } Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/JavaPortletExample.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/JavaPortletExample.java 2011-12-22 08:51:56 UTC (rev 37514) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/JavaPortletExample.java 2011-12-22 08:52:15 UTC (rev 37515) @@ -1,6 +1,10 @@ package org.jboss.tools.portlet.ui.bot.test.example; +import static org.jboss.tools.portlet.ui.bot.entity.EntityFactory.portlet; +import org.jboss.tools.portlet.ui.bot.entity.PortletDefinition; + + /** * Tests the Java portlet example. * @@ -25,4 +29,9 @@ public String[] getProjectNames() { return new String[]{PROJECT_NAME}; } + + @Override + protected PortletDefinition getPortletDefinition() { + return portlet("default/TestJavaPortlet", "TestJavaPortlet"); + } } Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/SeamPortletExample.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/SeamPortletExample.java 2011-12-22 08:51:56 UTC (rev 37514) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/SeamPortletExample.java 2011-12-22 08:52:15 UTC (rev 37515) @@ -1,7 +1,9 @@ package org.jboss.tools.portlet.ui.bot.test.example; import static org.jboss.tools.portlet.ui.bot.entity.EntityFactory.file; +import static org.jboss.tools.portlet.ui.bot.entity.EntityFactory.portlet; +import org.jboss.tools.portlet.ui.bot.entity.PortletDefinition; import org.jboss.tools.portlet.ui.bot.entity.WorkspaceFile; import org.jboss.tools.portlet.ui.bot.task.server.RunningFileOnServerTask; import org.jboss.tools.ui.bot.ext.config.Annotations.DB; @@ -45,4 +47,9 @@ doPerform(new RunningFileOnServerTask(DATASOURCE_FILE)); super.executeExample(); } + + @Override + protected PortletDefinition getPortletDefinition() { + return portlet("TestSeamPortlet", "Test JBoss Seam Portlet"); + } }