[jbosstools-commits] JBoss Tools SVN: r39625 - in trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot: matcher/factory and 8 other directories.

Author: ljelinko Date: 2012-03-19 11:58:51 -0400 (Mon, 19 Mar 2012) New Revision: 39625 Added: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/browser/portlet/PortletLoadsInJBPortalMatcher.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/compatibility/JBDS4vs5CompatibilityGatein.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/CreateJavaPortletGatein.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/CreateJavaPortletJBPortal.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/HotJavaPortletDeploymentGatein.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/LoadJavaPortletInBrowserJBPortal.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/AbstractPortletExampleGatein.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/AbstractPortletExampleJBPortal.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/JSFPortletExampleGatein.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/JSFPortletExampleJBPortal.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/JavaPortletExampleJBPortal.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/RichFacesPortletExampleGatein.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/SeamPortletExampleGatein.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/SeamPortletExampleJBPortal.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/CreateJSFPortletGatein.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/CreateJSFPortletJBPortal.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/HotJSFPortletDeploymentGatein.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/LoadJSFPortletInBrowserJBPortal.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/CreateSeamPortletGatein.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/CreateSeamPortletJBPortal.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/HotSeamPortletDeploymentGatein.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/CreateJSFSeamPortletGateinTemplate.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreateJSFSeamPortletJBPortalTemplate.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/HotDeploymentGateinTemplate.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/LoadPortletInBrowserJBPortalTemplate.java Removed: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/browser/portlet/PortletLoads4xRuntimeMatcher.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/compatibility/JBDS4vs5Compatibility.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/CreateJavaPortletRuntime4x.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/CreateJavaPortletRuntime5x.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/HotJavaPortletDeploymentRuntime5x.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/LoadJavaPortletInBrowserRuntime4x.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/AbstractPortletExampleRuntime4xTest.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/AbstractPortletExampleRuntime5xTest.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/JSFPortletExampleRuntime4x.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/JSFPortletExampleRuntime5x.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/JavaPortletExampleRuntime4x.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/RichFacesPortletExampleRuntime5x.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/SeamPortletExampleRuntime4x.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/SeamPortletExampleRuntime5x.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/CreateJSFPortletRuntime4x.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/CreateJSFPortletRuntime5x.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/HotJSFPortletDeploymentRuntime5x.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/LoadJSFPortletInBrowserRuntime4x.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/CreateSeamPortletRuntime4x.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/CreateSeamPortletRuntime5x.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/HotSeamPortletDeploymentRuntime5x.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/server/RunAsLoadsPortalURLRuntime4x.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/server/RunAsLoadsPortalURLRuntime5x.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreateJSFSeamPortletRuntime4xTemplate.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreateJSFSeamPortletRuntime5xTemplate.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/HotDeploymentRuntime5xTemplate.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/LoadPortletInBrowser4xRuntimeTemplate.java Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/factory/PortletMatchersFactory.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/AllTestsSuite.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/compatibility/JBDSCompatibilityTestSuite.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/JavaPortletTestSuite.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/ExamplesSuite.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/JSFPortletTestSuite.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/SeamPortletTestSuite.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/server/PortletServerTestSuite.java Log: Renamed classes from *Runtime4x* to *JBPortal* and from *Runtime5x* to *Gatein* Deleted: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/browser/portlet/PortletLoads4xRuntimeMatcher.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/browser/portlet/PortletLoads4xRuntimeMatcher.java 2012-03-19 15:57:17 UTC (rev 39624) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/browser/portlet/PortletLoads4xRuntimeMatcher.java 2012-03-19 15:58:51 UTC (rev 39625) @@ -1,31 +0,0 @@ -package org.jboss.tools.portlet.ui.bot.matcher.browser.portlet; - -import org.hamcrest.Description; -import org.jboss.tools.portlet.ui.bot.entity.PortletDefinition; -import org.jboss.tools.portlet.ui.bot.matcher.AbstractSWTMatcher; -import org.jboss.tools.portlet.ui.bot.matcher.browser.PageSourceMatcher; - -/** - * Check if the given portlet can be loaded in EPP 4.x runtime. - * - * @author Lucia Jelinkova - * - */ -public class PortletLoads4xRuntimeMatcher extends AbstractSWTMatcher<PortletDefinition> { - - private static final String PORTAL_URL = "http://localhost:8080/portal/portal/default/"; - - private PageSourceMatcher pageMatcher; - - @Override - public boolean matchesSafely(PortletDefinition portletTitle) { - pageMatcher = new PageSourceMatcher(PORTAL_URL + portletTitle.getPage()); - pageMatcher.setBot(getBot()); - return pageMatcher.matchesSafely("<span class=\"portlet-titlebar-title\">" + portletTitle.getDisplayName() + "</span>"); - } - - @Override - public void describeTo(Description description) { - description.appendDescriptionOf(pageMatcher); - } -} Copied: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/browser/portlet/PortletLoadsInJBPortalMatcher.java (from rev 38107, trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/browser/portlet/PortletLoads4xRuntimeMatcher.java) =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/browser/portlet/PortletLoadsInJBPortalMatcher.java (rev 0) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/browser/portlet/PortletLoadsInJBPortalMatcher.java 2012-03-19 15:58:51 UTC (rev 39625) @@ -0,0 +1,31 @@ +package org.jboss.tools.portlet.ui.bot.matcher.browser.portlet; + +import org.hamcrest.Description; +import org.jboss.tools.portlet.ui.bot.entity.PortletDefinition; +import org.jboss.tools.portlet.ui.bot.matcher.AbstractSWTMatcher; +import org.jboss.tools.portlet.ui.bot.matcher.browser.PageSourceMatcher; + +/** + * Check if the given portlet can be loaded in EPP 4.x runtime. + * + * @author Lucia Jelinkova + * + */ +public class PortletLoadsInJBPortalMatcher extends AbstractSWTMatcher<PortletDefinition> { + + private static final String PORTAL_URL = "http://localhost:8080/portal/portal/default/"; + + private PageSourceMatcher pageMatcher; + + @Override + public boolean matchesSafely(PortletDefinition portletTitle) { + pageMatcher = new PageSourceMatcher(PORTAL_URL + portletTitle.getPage()); + pageMatcher.setBot(getBot()); + return pageMatcher.matchesSafely("<span class=\"portlet-titlebar-title\">" + portletTitle.getDisplayName() + "</span>"); + } + + @Override + public void describeTo(Description description) { + description.appendDescriptionOf(pageMatcher); + } +} Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/factory/PortletMatchersFactory.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/factory/PortletMatchersFactory.java 2012-03-19 15:57:17 UTC (rev 39624) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/factory/PortletMatchersFactory.java 2012-03-19 15:58:51 UTC (rev 39625) @@ -2,7 +2,7 @@ import org.jboss.tools.portlet.ui.bot.entity.PortletDefinition; import org.jboss.tools.portlet.ui.bot.matcher.SWTMatcher; -import org.jboss.tools.portlet.ui.bot.matcher.browser.portlet.PortletLoads4xRuntimeMatcher; +import org.jboss.tools.portlet.ui.bot.matcher.browser.portlet.PortletLoadsInJBPortalMatcher; public class PortletMatchersFactory { @@ -11,6 +11,6 @@ } public static SWTMatcher<PortletDefinition> canLoadAt4xRuntime(){ - return new PortletLoads4xRuntimeMatcher(); + return new PortletLoadsInJBPortalMatcher(); } } Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/AllTestsSuite.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/AllTestsSuite.java 2012-03-19 15:57:17 UTC (rev 39624) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/AllTestsSuite.java 2012-03-19 15:58:51 UTC (rev 39625) @@ -1,31 +1,31 @@ package org.jboss.tools.portlet.ui.bot.test; -import org.jboss.tools.portlet.ui.bot.test.compatibility.JBDS4vs5Compatibility; +import org.jboss.tools.portlet.ui.bot.test.compatibility.JBDS4vs5CompatibilityGatein; import org.jboss.tools.portlet.ui.bot.test.core.CreateJavaPortletProject; -import org.jboss.tools.portlet.ui.bot.test.core.CreateJavaPortletRuntime4x; -import org.jboss.tools.portlet.ui.bot.test.core.CreateJavaPortletRuntime5x; -import org.jboss.tools.portlet.ui.bot.test.core.HotJavaPortletDeploymentRuntime5x; -import org.jboss.tools.portlet.ui.bot.test.core.LoadJavaPortletInBrowserRuntime4x; +import org.jboss.tools.portlet.ui.bot.test.core.CreateJavaPortletJBPortal; +import org.jboss.tools.portlet.ui.bot.test.core.CreateJavaPortletGatein; +import org.jboss.tools.portlet.ui.bot.test.core.HotJavaPortletDeploymentGatein; +import org.jboss.tools.portlet.ui.bot.test.core.LoadJavaPortletInBrowserJBPortal; import org.jboss.tools.portlet.ui.bot.test.core.RunJavaPortletOnServer; -import org.jboss.tools.portlet.ui.bot.test.example.JSFPortletExampleRuntime4x; -import org.jboss.tools.portlet.ui.bot.test.example.JSFPortletExampleRuntime5x; -import org.jboss.tools.portlet.ui.bot.test.example.JavaPortletExampleRuntime4x; -import org.jboss.tools.portlet.ui.bot.test.example.RichFacesPortletExampleRuntime5x; -import org.jboss.tools.portlet.ui.bot.test.example.SeamPortletExampleRuntime4x; -import org.jboss.tools.portlet.ui.bot.test.example.SeamPortletExampleRuntime5x; +import org.jboss.tools.portlet.ui.bot.test.example.JSFPortletExampleJBPortal; +import org.jboss.tools.portlet.ui.bot.test.example.JSFPortletExampleGatein; +import org.jboss.tools.portlet.ui.bot.test.example.JavaPortletExampleJBPortal; +import org.jboss.tools.portlet.ui.bot.test.example.RichFacesPortletExampleGatein; +import org.jboss.tools.portlet.ui.bot.test.example.SeamPortletExampleJBPortal; +import org.jboss.tools.portlet.ui.bot.test.example.SeamPortletExampleGatein; import org.jboss.tools.portlet.ui.bot.test.jsf.CreateJSFPortletProject; -import org.jboss.tools.portlet.ui.bot.test.jsf.CreateJSFPortletRuntime4x; -import org.jboss.tools.portlet.ui.bot.test.jsf.CreateJSFPortletRuntime5x; -import org.jboss.tools.portlet.ui.bot.test.jsf.HotJSFPortletDeploymentRuntime5x; -import org.jboss.tools.portlet.ui.bot.test.jsf.LoadJSFPortletInBrowserRuntime4x; +import org.jboss.tools.portlet.ui.bot.test.jsf.CreateJSFPortletJBPortal; +import org.jboss.tools.portlet.ui.bot.test.jsf.CreateJSFPortletGatein; +import org.jboss.tools.portlet.ui.bot.test.jsf.HotJSFPortletDeploymentGatein; +import org.jboss.tools.portlet.ui.bot.test.jsf.LoadJSFPortletInBrowserJBPortal; import org.jboss.tools.portlet.ui.bot.test.jsf.RunJSFPortletOnServer; import org.jboss.tools.portlet.ui.bot.test.seam.CreateSeamPortletProject; -import org.jboss.tools.portlet.ui.bot.test.seam.CreateSeamPortletRuntime4x; -import org.jboss.tools.portlet.ui.bot.test.seam.CreateSeamPortletRuntime5x; -import org.jboss.tools.portlet.ui.bot.test.seam.HotSeamPortletDeploymentRuntime5x; +import org.jboss.tools.portlet.ui.bot.test.seam.CreateSeamPortletJBPortal; +import org.jboss.tools.portlet.ui.bot.test.seam.CreateSeamPortletGatein; +import org.jboss.tools.portlet.ui.bot.test.seam.HotSeamPortletDeploymentGatein; import org.jboss.tools.portlet.ui.bot.test.seam.RunSeamPortletOnServer; -import org.jboss.tools.portlet.ui.bot.test.server.RunAsLoadsPortalURLRuntime4x; -import org.jboss.tools.portlet.ui.bot.test.server.RunAsLoadsPortalURLRuntime5x; +import org.jboss.tools.portlet.ui.bot.test.server.RunAsLoadsPortalURLJBPortal; +import org.jboss.tools.portlet.ui.bot.test.server.RunAsLoadsPortalURLGatein; import org.jboss.tools.ui.bot.ext.RequirementAwareSuite; import org.junit.runner.RunWith; import org.junit.runners.Suite; @@ -33,31 +33,31 @@ @RunWith(RequirementAwareSuite.class) @Suite.SuiteClasses({ CreateJavaPortletProject.class, - CreateJavaPortletRuntime4x.class, - CreateJavaPortletRuntime5x.class, + CreateJavaPortletJBPortal.class, + CreateJavaPortletGatein.class, RunJavaPortletOnServer.class, - LoadJavaPortletInBrowserRuntime4x.class, - HotJavaPortletDeploymentRuntime5x.class, + LoadJavaPortletInBrowserJBPortal.class, + HotJavaPortletDeploymentGatein.class, CreateJSFPortletProject.class, - CreateJSFPortletRuntime4x.class, - CreateJSFPortletRuntime5x.class, + CreateJSFPortletJBPortal.class, + CreateJSFPortletGatein.class, RunJSFPortletOnServer.class, - LoadJSFPortletInBrowserRuntime4x.class, - HotJSFPortletDeploymentRuntime5x.class, + LoadJSFPortletInBrowserJBPortal.class, + HotJSFPortletDeploymentGatein.class, CreateSeamPortletProject.class, - CreateSeamPortletRuntime4x.class, - CreateSeamPortletRuntime5x.class, + CreateSeamPortletJBPortal.class, + CreateSeamPortletGatein.class, RunSeamPortletOnServer.class, - HotSeamPortletDeploymentRuntime5x.class, - JavaPortletExampleRuntime4x.class, - JSFPortletExampleRuntime4x.class, - SeamPortletExampleRuntime4x.class, - JSFPortletExampleRuntime5x.class, - RichFacesPortletExampleRuntime5x.class, - SeamPortletExampleRuntime5x.class, - JBDS4vs5Compatibility.class, - RunAsLoadsPortalURLRuntime4x.class, - RunAsLoadsPortalURLRuntime5x.class + HotSeamPortletDeploymentGatein.class, + JavaPortletExampleJBPortal.class, + JSFPortletExampleJBPortal.class, + SeamPortletExampleJBPortal.class, + JSFPortletExampleGatein.class, + RichFacesPortletExampleGatein.class, + SeamPortletExampleGatein.class, + JBDS4vs5CompatibilityGatein.class, + RunAsLoadsPortalURLJBPortal.class, + RunAsLoadsPortalURLGatein.class }) public class AllTestsSuite { Deleted: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/compatibility/JBDS4vs5Compatibility.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/compatibility/JBDS4vs5Compatibility.java 2012-03-19 15:57:17 UTC (rev 39624) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/compatibility/JBDS4vs5Compatibility.java 2012-03-19 15:58:51 UTC (rev 39625) @@ -1,64 +0,0 @@ -package org.jboss.tools.portlet.ui.bot.test.compatibility; - -import static org.jboss.tools.portlet.ui.bot.matcher.factory.DefaultMatchersFactory.isNumberOfErrors; -import static org.jboss.tools.portlet.ui.bot.matcher.factory.WorkspaceMatchersFactory.isExistingProject; - -import org.jboss.tools.portlet.ui.bot.task.importing.project.ExistingProjectImportTask; -import org.jboss.tools.portlet.ui.bot.task.wizard.WizardFillingTask; -import org.jboss.tools.portlet.ui.bot.task.wizard.importing.project.ExistingProjectWizardPageFillingTask; -import org.jboss.tools.portlet.ui.bot.test.Activator; -import org.jboss.tools.portlet.ui.bot.test.testcase.SWTTaskBasedTestCase; -import org.jboss.tools.ui.bot.ext.SWTUtilExt; -import org.jboss.tools.ui.bot.ext.config.Annotations.DB; -import org.jboss.tools.ui.bot.ext.config.Annotations.Require; -import org.jboss.tools.ui.bot.ext.config.Annotations.Seam; -import org.jboss.tools.ui.bot.ext.config.Annotations.Server; -import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; -import org.junit.Test; - -/** - * Tests that project from JBDS 4 can work in JBDS 5 without any problems. - * - * @author Lucia Jelinkova - * - */ -@Require(server=(a)Server(version=&quot;5.1&quot;, operator=">", state=ServerState.Present), db=@DB, seam=@Seam) -public class JBDS4vs5Compatibility extends SWTTaskBasedTestCase { - - private static final String ZIP_FILE = "resources/org/jboss/tools/portlet/ui/bot/test/compatibility/jbds-compatibility.zip"; - - private static final String CORE_PROJECT_NAME = "jbds-4-core"; - - private static final String JSF_PROJECT_NAME = "jbds-4-jsf"; - - private static final String SEAM_PROJECT_NAME = "jbds-4-seam"; - - @Test - public void testCompatibility(){ - doPerform(new ExistingProjectImportTask()); - doPerform(getWizardFillingTask()); - - doAssertThatInWorkspace(CORE_PROJECT_NAME, isExistingProject()); - doAssertThatInWorkspace(JSF_PROJECT_NAME, isExistingProject()); - doAssertThatInWorkspace(SEAM_PROJECT_NAME, isExistingProject()); - doAssertThatInWorkspace(0, isNumberOfErrors()); - } - - private WizardFillingTask getWizardFillingTask(){ - WizardFillingTask wizard = new WizardFillingTask(); - wizard.addWizardPage(getWizardPage()); - return wizard; - } - - private ExistingProjectWizardPageFillingTask getWizardPage(){ - ExistingProjectWizardPageFillingTask task = new ExistingProjectWizardPageFillingTask(); - task.setZipFilePath(getZIPFileLocation()); - task.setProjectNames(CORE_PROJECT_NAME, JSF_PROJECT_NAME, SEAM_PROJECT_NAME); - task.setCopyProjectsIntoWorkspace(true); - return task; - } - - private String getZIPFileLocation(){ - return SWTUtilExt.getPathToFileWithinPlugin(Activator.PLUGIN_ID, ZIP_FILE); - } -} Copied: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/compatibility/JBDS4vs5CompatibilityGatein.java (from rev 39491, trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/compatibility/JBDS4vs5Compatibility.java) =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/compatibility/JBDS4vs5CompatibilityGatein.java (rev 0) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/compatibility/JBDS4vs5CompatibilityGatein.java 2012-03-19 15:58:51 UTC (rev 39625) @@ -0,0 +1,64 @@ +package org.jboss.tools.portlet.ui.bot.test.compatibility; + +import static org.jboss.tools.portlet.ui.bot.matcher.factory.DefaultMatchersFactory.isNumberOfErrors; +import static org.jboss.tools.portlet.ui.bot.matcher.factory.WorkspaceMatchersFactory.isExistingProject; + +import org.jboss.tools.portlet.ui.bot.task.importing.project.ExistingProjectImportTask; +import org.jboss.tools.portlet.ui.bot.task.wizard.WizardFillingTask; +import org.jboss.tools.portlet.ui.bot.task.wizard.importing.project.ExistingProjectWizardPageFillingTask; +import org.jboss.tools.portlet.ui.bot.test.Activator; +import org.jboss.tools.portlet.ui.bot.test.testcase.SWTTaskBasedTestCase; +import org.jboss.tools.ui.bot.ext.SWTUtilExt; +import org.jboss.tools.ui.bot.ext.config.Annotations.DB; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; +import org.jboss.tools.ui.bot.ext.config.Annotations.Seam; +import org.jboss.tools.ui.bot.ext.config.Annotations.Server; +import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; +import org.junit.Test; + +/** + * Tests that project from JBDS 4 can work in JBDS 5 without any problems. + * + * @author Lucia Jelinkova + * + */ +@Require(server=(a)Server(version=&quot;5.1&quot;, operator=">", state=ServerState.Present), db=@DB, seam=@Seam) +public class JBDS4vs5CompatibilityGatein extends SWTTaskBasedTestCase { + + private static final String ZIP_FILE = "resources/org/jboss/tools/portlet/ui/bot/test/compatibility/jbds-compatibility.zip"; + + private static final String CORE_PROJECT_NAME = "jbds-4-core"; + + private static final String JSF_PROJECT_NAME = "jbds-4-jsf"; + + private static final String SEAM_PROJECT_NAME = "jbds-4-seam"; + + @Test + public void testCompatibility(){ + doPerform(new ExistingProjectImportTask()); + doPerform(getWizardFillingTask()); + + doAssertThatInWorkspace(CORE_PROJECT_NAME, isExistingProject()); + doAssertThatInWorkspace(JSF_PROJECT_NAME, isExistingProject()); + doAssertThatInWorkspace(SEAM_PROJECT_NAME, isExistingProject()); + doAssertThatInWorkspace(0, isNumberOfErrors()); + } + + private WizardFillingTask getWizardFillingTask(){ + WizardFillingTask wizard = new WizardFillingTask(); + wizard.addWizardPage(getWizardPage()); + return wizard; + } + + private ExistingProjectWizardPageFillingTask getWizardPage(){ + ExistingProjectWizardPageFillingTask task = new ExistingProjectWizardPageFillingTask(); + task.setZipFilePath(getZIPFileLocation()); + task.setProjectNames(CORE_PROJECT_NAME, JSF_PROJECT_NAME, SEAM_PROJECT_NAME); + task.setCopyProjectsIntoWorkspace(true); + return task; + } + + private String getZIPFileLocation(){ + return SWTUtilExt.getPathToFileWithinPlugin(Activator.PLUGIN_ID, ZIP_FILE); + } +} Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/compatibility/JBDSCompatibilityTestSuite.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/compatibility/JBDSCompatibilityTestSuite.java 2012-03-19 15:57:17 UTC (rev 39624) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/compatibility/JBDSCompatibilityTestSuite.java 2012-03-19 15:58:51 UTC (rev 39625) @@ -6,7 +6,7 @@ @RunWith(RequirementAwareSuite.class) @Suite.SuiteClasses({ - JBDS4vs5Compatibility.class, + JBDS4vs5CompatibilityGatein.class, }) public class JBDSCompatibilityTestSuite { Copied: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/CreateJavaPortletGatein.java (from rev 38683, trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/CreateJavaPortletRuntime5x.java) =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/CreateJavaPortletGatein.java (rev 0) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/CreateJavaPortletGatein.java 2012-03-19 15:58:51 UTC (rev 39625) @@ -0,0 +1,34 @@ +package org.jboss.tools.portlet.ui.bot.test.core; + +import java.util.Arrays; +import java.util.List; + +import org.jboss.tools.portlet.ui.bot.test.template.CreateJavaPortletTemplate; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; +import org.jboss.tools.ui.bot.ext.config.Annotations.Server; +import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; + +/** + * Creates a new java portlet and checks if the right files are generated. + * + * @author Lucia Jelinkova + * + */ +@Require(clearWorkspace=false, clearProjects=false, server=(a)Server(version=&quot;5.0&quot;, operator=">", state=ServerState.Present)) +public class CreateJavaPortletGatein extends CreateJavaPortletTemplate { + + @Override + protected List<String> getExpectedFiles() { + return Arrays.asList(CLASS_FILE); + } + + @Override + protected List<String> getNonExpectedFiles() { + return Arrays.asList( + DEFAULT_OBJECTS_XML, + PORTLET_INSTANCES_XML, + JSF_FOLDER, + JBOSS_APP_XML, + JBOSS_PORTLET_XML); + } +} Copied: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/CreateJavaPortletJBPortal.java (from rev 38683, trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/CreateJavaPortletRuntime4x.java) =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/CreateJavaPortletJBPortal.java (rev 0) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/CreateJavaPortletJBPortal.java 2012-03-19 15:58:51 UTC (rev 39625) @@ -0,0 +1,35 @@ +package org.jboss.tools.portlet.ui.bot.test.core; + +import java.util.Arrays; +import java.util.List; + +import org.jboss.tools.portlet.ui.bot.test.template.CreateJavaPortletTemplate; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; +import org.jboss.tools.ui.bot.ext.config.Annotations.Server; +import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; + +/** + * Creates a new java portlet and checks if the right files are generated. + * + * @author Lucia Jelinkova + * + */ +@Require(clearWorkspace=false, clearProjects=false, server=(a)Server(version=&quot;4.3&quot;, state=ServerState.Present)) +public class CreateJavaPortletJBPortal extends CreateJavaPortletTemplate { + + @Override + protected List<String> getExpectedFiles() { + return Arrays.asList( + DEFAULT_OBJECTS_XML, + PORTLET_INSTANCES_XML, + CLASS_FILE); + } + + @Override + protected List<String> getNonExpectedFiles() { + return Arrays.asList( + JSF_FOLDER, + JBOSS_APP_XML, + JBOSS_PORTLET_XML); + } +} Deleted: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/CreateJavaPortletRuntime4x.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/CreateJavaPortletRuntime4x.java 2012-03-19 15:57:17 UTC (rev 39624) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/CreateJavaPortletRuntime4x.java 2012-03-19 15:58:51 UTC (rev 39625) @@ -1,35 +0,0 @@ -package org.jboss.tools.portlet.ui.bot.test.core; - -import java.util.Arrays; -import java.util.List; - -import org.jboss.tools.portlet.ui.bot.test.template.CreateJavaPortletTemplate; -import org.jboss.tools.ui.bot.ext.config.Annotations.Require; -import org.jboss.tools.ui.bot.ext.config.Annotations.Server; -import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; - -/** - * Creates a new java portlet and checks if the right files are generated. - * - * @author Lucia Jelinkova - * - */ -@Require(clearWorkspace=false, clearProjects=false, server=(a)Server(version=&quot;4.3&quot;, state=ServerState.Present)) -public class CreateJavaPortletRuntime4x extends CreateJavaPortletTemplate { - - @Override - protected List<String> getExpectedFiles() { - return Arrays.asList( - DEFAULT_OBJECTS_XML, - PORTLET_INSTANCES_XML, - CLASS_FILE); - } - - @Override - protected List<String> getNonExpectedFiles() { - return Arrays.asList( - JSF_FOLDER, - JBOSS_APP_XML, - JBOSS_PORTLET_XML); - } -} Deleted: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/CreateJavaPortletRuntime5x.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/CreateJavaPortletRuntime5x.java 2012-03-19 15:57:17 UTC (rev 39624) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/CreateJavaPortletRuntime5x.java 2012-03-19 15:58:51 UTC (rev 39625) @@ -1,34 +0,0 @@ -package org.jboss.tools.portlet.ui.bot.test.core; - -import java.util.Arrays; -import java.util.List; - -import org.jboss.tools.portlet.ui.bot.test.template.CreateJavaPortletTemplate; -import org.jboss.tools.ui.bot.ext.config.Annotations.Require; -import org.jboss.tools.ui.bot.ext.config.Annotations.Server; -import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; - -/** - * Creates a new java portlet and checks if the right files are generated. - * - * @author Lucia Jelinkova - * - */ -@Require(clearWorkspace=false, clearProjects=false, server=(a)Server(version=&quot;5.0&quot;, operator=">", state=ServerState.Present)) -public class CreateJavaPortletRuntime5x extends CreateJavaPortletTemplate { - - @Override - protected List<String> getExpectedFiles() { - return Arrays.asList(CLASS_FILE); - } - - @Override - protected List<String> getNonExpectedFiles() { - return Arrays.asList( - DEFAULT_OBJECTS_XML, - PORTLET_INSTANCES_XML, - JSF_FOLDER, - JBOSS_APP_XML, - JBOSS_PORTLET_XML); - } -} Copied: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/HotJavaPortletDeploymentGatein.java (from rev 39619, trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/HotJavaPortletDeploymentRuntime5x.java) =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/HotJavaPortletDeploymentGatein.java (rev 0) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/HotJavaPortletDeploymentGatein.java 2012-03-19 15:58:51 UTC (rev 39625) @@ -0,0 +1,36 @@ +package org.jboss.tools.portlet.ui.bot.test.core; + +import static org.jboss.tools.portlet.ui.bot.test.core.CreateJavaPortletProject.PROJECT_NAME; + +import org.jboss.tools.portlet.ui.bot.task.wizard.web.jboss.AbstractPortletCreationTask; +import org.jboss.tools.portlet.ui.bot.task.wizard.web.jboss.JavaPortletCreationTask; +import org.jboss.tools.portlet.ui.bot.task.wizard.web.jboss.JavaPortletWizardPageFillingTask; +import org.jboss.tools.portlet.ui.bot.test.template.CreateJavaPortletTemplate; +import org.jboss.tools.portlet.ui.bot.test.template.HotDeploymentGateinTemplate; + +/** + * Creates a java portlet and checks if the project is re-deployed. + * + * @author Lucia Jelinkova + * + */ +public class HotJavaPortletDeploymentGatein extends HotDeploymentGateinTemplate { + + @Override + protected String getProjectName() { + return CreateJavaPortletProject.PROJECT_NAME; + } + + @Override + protected AbstractPortletCreationTask createPortlet() { + JavaPortletWizardPageFillingTask task = new JavaPortletWizardPageFillingTask(); + task.setProject(PROJECT_NAME); + task.setPackageName(CreateJavaPortletTemplate.PACKAGE_NAME); + task.setClassName("HotDeployedJavaPortlet"); + + JavaPortletCreationTask wizardTask = new JavaPortletCreationTask(); + wizardTask.addWizardPage(task); + return wizardTask; + } + +} Deleted: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/HotJavaPortletDeploymentRuntime5x.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/HotJavaPortletDeploymentRuntime5x.java 2012-03-19 15:57:17 UTC (rev 39624) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/HotJavaPortletDeploymentRuntime5x.java 2012-03-19 15:58:51 UTC (rev 39625) @@ -1,36 +0,0 @@ -package org.jboss.tools.portlet.ui.bot.test.core; - -import static org.jboss.tools.portlet.ui.bot.test.core.CreateJavaPortletProject.PROJECT_NAME; - -import org.jboss.tools.portlet.ui.bot.task.wizard.web.jboss.AbstractPortletCreationTask; -import org.jboss.tools.portlet.ui.bot.task.wizard.web.jboss.JavaPortletCreationTask; -import org.jboss.tools.portlet.ui.bot.task.wizard.web.jboss.JavaPortletWizardPageFillingTask; -import org.jboss.tools.portlet.ui.bot.test.template.CreateJavaPortletTemplate; -import org.jboss.tools.portlet.ui.bot.test.template.HotDeploymentRuntime5xTemplate; - -/** - * Creates a java portlet and checks if the project is re-deployed. - * - * @author Lucia Jelinkova - * - */ -public class HotJavaPortletDeploymentRuntime5x extends HotDeploymentRuntime5xTemplate { - - @Override - protected String getProjectName() { - return CreateJavaPortletProject.PROJECT_NAME; - } - - @Override - protected AbstractPortletCreationTask createPortlet() { - JavaPortletWizardPageFillingTask task = new JavaPortletWizardPageFillingTask(); - task.setProject(PROJECT_NAME); - task.setPackageName(CreateJavaPortletTemplate.PACKAGE_NAME); - task.setClassName("HotDeployedJavaPortlet"); - - JavaPortletCreationTask wizardTask = new JavaPortletCreationTask(); - wizardTask.addWizardPage(task); - return wizardTask; - } - -} Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/JavaPortletTestSuite.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/JavaPortletTestSuite.java 2012-03-19 15:57:17 UTC (rev 39624) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/JavaPortletTestSuite.java 2012-03-19 15:58:51 UTC (rev 39625) @@ -7,11 +7,11 @@ @RunWith(RequirementAwareSuite.class) @Suite.SuiteClasses({ CreateJavaPortletProject.class, - CreateJavaPortletRuntime4x.class, - CreateJavaPortletRuntime5x.class, + CreateJavaPortletJBPortal.class, + CreateJavaPortletGatein.class, RunJavaPortletOnServer.class, - LoadJavaPortletInBrowserRuntime4x.class, - HotJavaPortletDeploymentRuntime5x.class + LoadJavaPortletInBrowserJBPortal.class, + HotJavaPortletDeploymentGatein.class }) public class JavaPortletTestSuite { Copied: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/LoadJavaPortletInBrowserJBPortal.java (from rev 38683, trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/LoadJavaPortletInBrowserRuntime4x.java) =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/LoadJavaPortletInBrowserJBPortal.java (rev 0) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/LoadJavaPortletInBrowserJBPortal.java 2012-03-19 15:58:51 UTC (rev 39625) @@ -0,0 +1,15 @@ +package org.jboss.tools.portlet.ui.bot.test.core; + +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.test.template.LoadPortletInBrowserJBPortalTemplate; + + +public class LoadJavaPortletInBrowserJBPortal extends LoadPortletInBrowserJBPortalTemplate { + + @Override + protected PortletDefinition getPortletDefinition() { + return portlet(CreateJavaPortletGatein.CLASS_NAME); + } +} Deleted: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/LoadJavaPortletInBrowserRuntime4x.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/LoadJavaPortletInBrowserRuntime4x.java 2012-03-19 15:57:17 UTC (rev 39624) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/LoadJavaPortletInBrowserRuntime4x.java 2012-03-19 15:58:51 UTC (rev 39625) @@ -1,15 +0,0 @@ -package org.jboss.tools.portlet.ui.bot.test.core; - -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.test.template.LoadPortletInBrowser4xRuntimeTemplate; - - -public class LoadJavaPortletInBrowserRuntime4x extends LoadPortletInBrowser4xRuntimeTemplate { - - @Override - protected PortletDefinition getPortletDefinition() { - return portlet(CreateJavaPortletRuntime5x.CLASS_NAME); - } -} Copied: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/AbstractPortletExampleGatein.java (from rev 38107, trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/AbstractPortletExampleRuntime5xTest.java) =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/AbstractPortletExampleGatein.java (rev 0) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/AbstractPortletExampleGatein.java 2012-03-19 15:58:51 UTC (rev 39625) @@ -0,0 +1,22 @@ +package org.jboss.tools.portlet.ui.bot.test.example; + +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; +import org.jboss.tools.ui.bot.ext.config.Annotations.Server; +import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; +import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType; + +/** + * Common ancestor for example projects tests for 5x runtime. + * + * @author Lucia Jelinkova + * + */ +@Require(server=(a)Server(version=&quot;5.0&quot;, operator=">", state=ServerState.Running, type=ServerType.EPP)) +public abstract class AbstractPortletExampleGatein extends + AbstractPortletExampleTest { + + @Override + public String getExampleCategory() { + return "Portlet for GateIn 3.1/EPP 5.x"; + } +} Copied: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/AbstractPortletExampleJBPortal.java (from rev 38107, trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/AbstractPortletExampleRuntime4xTest.java) =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/AbstractPortletExampleJBPortal.java (rev 0) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/AbstractPortletExampleJBPortal.java 2012-03-19 15:58:51 UTC (rev 39625) @@ -0,0 +1,33 @@ +package org.jboss.tools.portlet.ui.bot.test.example; + +import static org.jboss.tools.portlet.ui.bot.matcher.factory.PortletMatchersFactory.canLoadAt4xRuntime; + +import org.jboss.tools.portlet.ui.bot.entity.PortletDefinition; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; +import org.jboss.tools.ui.bot.ext.config.Annotations.Server; +import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; +import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType; + +/** + * Common ancestor for example projects tests for 4x runtime. + * + * @author Lucia Jelinkova + * + */ +@Require(server=(a)Server(version=&quot;4.3&quot;, state=ServerState.Running, type=ServerType.EPP)) +public abstract class AbstractPortletExampleJBPortal extends + AbstractPortletExampleTest { + + protected abstract PortletDefinition getPortletDefinition(); + + @Override + protected void executeExample() { + super.executeExample(); + doAssertThatInWorkspace(getPortletDefinition(), canLoadAt4xRuntime()); + } + + @Override + public String getExampleCategory() { + return "Portlet"; + } +} Deleted: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/AbstractPortletExampleRuntime4xTest.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/AbstractPortletExampleRuntime4xTest.java 2012-03-19 15:57:17 UTC (rev 39624) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/AbstractPortletExampleRuntime4xTest.java 2012-03-19 15:58:51 UTC (rev 39625) @@ -1,33 +0,0 @@ -package org.jboss.tools.portlet.ui.bot.test.example; - -import static org.jboss.tools.portlet.ui.bot.matcher.factory.PortletMatchersFactory.canLoadAt4xRuntime; - -import org.jboss.tools.portlet.ui.bot.entity.PortletDefinition; -import org.jboss.tools.ui.bot.ext.config.Annotations.Require; -import org.jboss.tools.ui.bot.ext.config.Annotations.Server; -import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; -import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType; - -/** - * Common ancestor for example projects tests for 4x runtime. - * - * @author Lucia Jelinkova - * - */ -@Require(server=(a)Server(version=&quot;4.3&quot;, state=ServerState.Running, type=ServerType.EPP)) -public abstract class AbstractPortletExampleRuntime4xTest extends - AbstractPortletExampleTest { - - protected abstract PortletDefinition getPortletDefinition(); - - @Override - protected void executeExample() { - super.executeExample(); - doAssertThatInWorkspace(getPortletDefinition(), canLoadAt4xRuntime()); - } - - @Override - public String getExampleCategory() { - return "Portlet"; - } -} Deleted: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/AbstractPortletExampleRuntime5xTest.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/AbstractPortletExampleRuntime5xTest.java 2012-03-19 15:57:17 UTC (rev 39624) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/AbstractPortletExampleRuntime5xTest.java 2012-03-19 15:58:51 UTC (rev 39625) @@ -1,22 +0,0 @@ -package org.jboss.tools.portlet.ui.bot.test.example; - -import org.jboss.tools.ui.bot.ext.config.Annotations.Require; -import org.jboss.tools.ui.bot.ext.config.Annotations.Server; -import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; -import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType; - -/** - * Common ancestor for example projects tests for 5x runtime. - * - * @author Lucia Jelinkova - * - */ -@Require(server=(a)Server(version=&quot;5.0&quot;, operator=">", state=ServerState.Running, type=ServerType.EPP)) -public abstract class AbstractPortletExampleRuntime5xTest extends - AbstractPortletExampleTest { - - @Override - public String getExampleCategory() { - return "Portlet for GateIn 3.1/EPP 5.x"; - } -} Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/ExamplesSuite.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/ExamplesSuite.java 2012-03-19 15:57:17 UTC (rev 39624) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/ExamplesSuite.java 2012-03-19 15:58:51 UTC (rev 39625) @@ -6,12 +6,12 @@ @RunWith(RequirementAwareSuite.class) @Suite.SuiteClasses({ - JavaPortletExampleRuntime4x.class, - JSFPortletExampleRuntime4x.class, - SeamPortletExampleRuntime4x.class, - JSFPortletExampleRuntime5x.class, - RichFacesPortletExampleRuntime5x.class, - SeamPortletExampleRuntime5x.class + JavaPortletExampleJBPortal.class, + JSFPortletExampleJBPortal.class, + SeamPortletExampleJBPortal.class, + JSFPortletExampleGatein.class, + RichFacesPortletExampleGatein.class, + SeamPortletExampleGatein.class }) public class ExamplesSuite { Copied: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/JSFPortletExampleGatein.java (from rev 38107, trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/JSFPortletExampleRuntime5x.java) =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/JSFPortletExampleGatein.java (rev 0) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/JSFPortletExampleGatein.java 2012-03-19 15:58:51 UTC (rev 39625) @@ -0,0 +1,22 @@ +package org.jboss.tools.portlet.ui.bot.test.example; + +/** + * Tests the JSF portlet example. + * + * @author Lucia Jelinkova + * + */ +public class JSFPortletExampleGatein extends AbstractPortletExampleGatein { + + private static final String PROJECT_NAME = "JSFPortlet"; + + @Override + public String getExampleName() { + return "JBoss JSF RI Portlet"; + } + + @Override + public String[] getProjectNames() { + return new String[]{PROJECT_NAME}; + } +} Copied: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/JSFPortletExampleJBPortal.java (from rev 38107, trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/JSFPortletExampleRuntime4x.java) =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/JSFPortletExampleJBPortal.java (rev 0) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/JSFPortletExampleJBPortal.java 2012-03-19 15:58:51 UTC (rev 39625) @@ -0,0 +1,32 @@ +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 JSF portlet example. + * + * @author Lucia Jelinkova + * + */ +public class JSFPortletExampleJBPortal extends AbstractPortletExampleJBPortal { + + private static final String PROJECT_NAME = "testjsfportlet"; + + @Override + public String getExampleName() { + return "JBoss JSF Portlet Example"; + } + + @Override + public String[] getProjectNames() { + return new String[]{PROJECT_NAME}; + } + + @Override + protected PortletDefinition getPortletDefinition() { + return portlet("TestJSFPortlet", "Test JBoss JSF Portlet"); + } +} Deleted: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/JSFPortletExampleRuntime4x.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/JSFPortletExampleRuntime4x.java 2012-03-19 15:57:17 UTC (rev 39624) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/JSFPortletExampleRuntime4x.java 2012-03-19 15:58:51 UTC (rev 39625) @@ -1,32 +0,0 @@ -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 JSF portlet example. - * - * @author Lucia Jelinkova - * - */ -public class JSFPortletExampleRuntime4x extends AbstractPortletExampleRuntime4xTest { - - private static final String PROJECT_NAME = "testjsfportlet"; - - @Override - public String getExampleName() { - return "JBoss JSF Portlet Example"; - } - - @Override - public String[] getProjectNames() { - return new String[]{PROJECT_NAME}; - } - - @Override - protected PortletDefinition getPortletDefinition() { - return portlet("TestJSFPortlet", "Test JBoss JSF Portlet"); - } -} Deleted: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/JSFPortletExampleRuntime5x.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/JSFPortletExampleRuntime5x.java 2012-03-19 15:57:17 UTC (rev 39624) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/JSFPortletExampleRuntime5x.java 2012-03-19 15:58:51 UTC (rev 39625) @@ -1,22 +0,0 @@ -package org.jboss.tools.portlet.ui.bot.test.example; - -/** - * Tests the JSF portlet example. - * - * @author Lucia Jelinkova - * - */ -public class JSFPortletExampleRuntime5x extends AbstractPortletExampleRuntime5xTest { - - private static final String PROJECT_NAME = "JSFPortlet"; - - @Override - public String getExampleName() { - return "JBoss JSF RI Portlet"; - } - - @Override - public String[] getProjectNames() { - return new String[]{PROJECT_NAME}; - } -} Copied: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/JavaPortletExampleJBPortal.java (from rev 38107, trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/JavaPortletExampleRuntime4x.java) =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/JavaPortletExampleJBPortal.java (rev 0) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/JavaPortletExampleJBPortal.java 2012-03-19 15:58:51 UTC (rev 39625) @@ -0,0 +1,32 @@ +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. + * + * @author Lucia Jelinkova + * + */ +public class JavaPortletExampleJBPortal extends AbstractPortletExampleJBPortal { + + private static final String PROJECT_NAME = "testjavaportlet"; + + @Override + public String getExampleName() { + return "JBoss Java Portlet Example"; + } + + @Override + public String[] getProjectNames() { + return new String[]{PROJECT_NAME}; + } + + @Override + protected PortletDefinition getPortletDefinition() { + return portlet("default/TestJavaPortlet", "TestJavaPortlet"); + } +} Deleted: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/JavaPortletExampleRuntime4x.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/JavaPortletExampleRuntime4x.java 2012-03-19 15:57:17 UTC (rev 39624) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/JavaPortletExampleRuntime4x.java 2012-03-19 15:58:51 UTC (rev 39625) @@ -1,32 +0,0 @@ -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. - * - * @author Lucia Jelinkova - * - */ -public class JavaPortletExampleRuntime4x extends AbstractPortletExampleRuntime4xTest { - - private static final String PROJECT_NAME = "testjavaportlet"; - - @Override - public String getExampleName() { - return "JBoss Java Portlet Example"; - } - - @Override - public String[] getProjectNames() { - return new String[]{PROJECT_NAME}; - } - - @Override - protected PortletDefinition getPortletDefinition() { - return portlet("default/TestJavaPortlet", "TestJavaPortlet"); - } -} Copied: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/RichFacesPortletExampleGatein.java (from rev 38107, trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/RichFacesPortletExampleRuntime5x.java) =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/RichFacesPortletExampleGatein.java (rev 0) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/RichFacesPortletExampleGatein.java 2012-03-19 15:58:51 UTC (rev 39625) @@ -0,0 +1,32 @@ +package org.jboss.tools.portlet.ui.bot.test.example; + + +/** + * Tests the JSF portlet example. + * + * @author Lucia Jelinkova + * + */ +public class RichFacesPortletExampleGatein extends AbstractPortletExampleGatein { + + private static final String PROJECT_NAME_IN_WIZARD = "RichFacesPortlet"; + + private static final String PROJECT_NAME_IN_WORKSPACE = "RichfacesPortlet"; + + private int getProjectNameMethodCallCounter = 0; + + @Override + public String getExampleName() { + return "JBoss Portlet Bridge - RichFaces Application"; + } + + @Override + public String[] getProjectNames() { + // an ugly hack to pass the assert that the project name in wizard is the same as project name in workspace + if (getProjectNameMethodCallCounter <= 1){ + getProjectNameMethodCallCounter++; + return new String[]{PROJECT_NAME_IN_WIZARD}; + } + return new String[]{PROJECT_NAME_IN_WORKSPACE}; + } +} Deleted: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/RichFacesPortletExampleRuntime5x.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/RichFacesPortletExampleRuntime5x.java 2012-03-19 15:57:17 UTC (rev 39624) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/RichFacesPortletExampleRuntime5x.java 2012-03-19 15:58:51 UTC (rev 39625) @@ -1,32 +0,0 @@ -package org.jboss.tools.portlet.ui.bot.test.example; - - -/** - * Tests the JSF portlet example. - * - * @author Lucia Jelinkova - * - */ -public class RichFacesPortletExampleRuntime5x extends AbstractPortletExampleRuntime5xTest { - - private static final String PROJECT_NAME_IN_WIZARD = "RichFacesPortlet"; - - private static final String PROJECT_NAME_IN_WORKSPACE = "RichfacesPortlet"; - - private int getProjectNameMethodCallCounter = 0; - - @Override - public String getExampleName() { - return "JBoss Portlet Bridge - RichFaces Application"; - } - - @Override - public String[] getProjectNames() { - // an ugly hack to pass the assert that the project name in wizard is the same as project name in workspace - if (getProjectNameMethodCallCounter <= 1){ - getProjectNameMethodCallCounter++; - return new String[]{PROJECT_NAME_IN_WIZARD}; - } - return new String[]{PROJECT_NAME_IN_WORKSPACE}; - } -} Copied: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/SeamPortletExampleGatein.java (from rev 38107, trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/SeamPortletExampleRuntime5x.java) =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/SeamPortletExampleGatein.java (rev 0) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/SeamPortletExampleGatein.java 2012-03-19 15:58:51 UTC (rev 39625) @@ -0,0 +1,44 @@ +package org.jboss.tools.portlet.ui.bot.test.example; + +import org.jboss.tools.ui.bot.ext.config.Annotations.DB; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; +import org.jboss.tools.ui.bot.ext.config.Annotations.Seam; +import org.jboss.tools.ui.bot.ext.config.Annotations.Server; +import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; +import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType; + + +/** + * Tests the JSF portlet example. + * + * @author Lucia Jelinkova + * + */ +@Require(db=@DB, seam=@Seam, server=(a)Server(version=&quot;5.0&quot;, operator=">", state=ServerState.Running, type=ServerType.EPP)) +public class SeamPortletExampleGatein extends AbstractPortletExampleGatein { + + private static final String PROJECT_NAME_IN_WIZARD = "SeamPortlet"; + + private static final String PROJECT_NAME_EAR = "seam-portlet-ear"; + + private static final String PROJECT_NAME_EJB = "seam-portlet-ejb"; + + private static final String PROJECT_NAME_WAR = "seam-portlet-web"; + + private int getProjectNameMethodCallCounter = 0; + + @Override + public String getExampleName() { + return "JBoss Portlet Bridge - Seam Portlet"; + } + + @Override + public String[] getProjectNames() { + // an ugly hack to pass the assert that the project name in wizard is the same as project name in workspace + if (getProjectNameMethodCallCounter <= 1){ + getProjectNameMethodCallCounter++; + return new String[]{PROJECT_NAME_IN_WIZARD}; + } + return new String[]{PROJECT_NAME_EAR, PROJECT_NAME_EJB, PROJECT_NAME_WAR}; + } +} Copied: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/SeamPortletExampleJBPortal.java (from rev 38107, trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/SeamPortletExampleRuntime4x.java) =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/SeamPortletExampleJBPortal.java (rev 0) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/SeamPortletExampleJBPortal.java 2012-03-19 15:58:51 UTC (rev 39625) @@ -0,0 +1,50 @@ +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; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; +import org.jboss.tools.ui.bot.ext.config.Annotations.Seam; +import org.jboss.tools.ui.bot.ext.config.Annotations.Server; +import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; +import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType; + + +/** + * Tests the Seam portlet example. + * + * @author Lucia Jelinkova + * + */ +@Require(db=@DB, seam=@Seam, server=(a)Server(version=&quot;4.3&quot;, state=ServerState.Running, type=ServerType.EPP)) +public class SeamPortletExampleJBPortal extends AbstractPortletExampleJBPortal { + + private static final String PROJECT_NAME = "testseamportlet"; + + private static final WorkspaceFile DATASOURCE_FILE = file(PROJECT_NAME, "resources/" + PROJECT_NAME + "-ds.xml"); + + @Override + public String getExampleName() { + return "JBoss Seam Portlet Example"; + } + + @Override + public String[] getProjectNames() { + return new String[]{PROJECT_NAME}; + } + + @Override + protected void executeExample() { + doPerform(new RunningFileOnServerTask(DATASOURCE_FILE)); + super.executeExample(); + } + + @Override + protected PortletDefinition getPortletDefinition() { + return portlet("TestSeamPortlet", "Test JBoss Seam Portlet"); + } +} Deleted: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/SeamPortletExampleRuntime4x.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/SeamPortletExampleRuntime4x.java 2012-03-19 15:57:17 UTC (rev 39624) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/SeamPortletExampleRuntime4x.java 2012-03-19 15:58:51 UTC (rev 39625) @@ -1,50 +0,0 @@ -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; -import org.jboss.tools.ui.bot.ext.config.Annotations.Require; -import org.jboss.tools.ui.bot.ext.config.Annotations.Seam; -import org.jboss.tools.ui.bot.ext.config.Annotations.Server; -import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; -import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType; - - -/** - * Tests the Seam portlet example. - * - * @author Lucia Jelinkova - * - */ -@Require(db=@DB, seam=@Seam, server=(a)Server(version=&quot;4.3&quot;, state=ServerState.Running, type=ServerType.EPP)) -public class SeamPortletExampleRuntime4x extends AbstractPortletExampleRuntime4xTest { - - private static final String PROJECT_NAME = "testseamportlet"; - - private static final WorkspaceFile DATASOURCE_FILE = file(PROJECT_NAME, "resources/" + PROJECT_NAME + "-ds.xml"); - - @Override - public String getExampleName() { - return "JBoss Seam Portlet Example"; - } - - @Override - public String[] getProjectNames() { - return new String[]{PROJECT_NAME}; - } - - @Override - protected void executeExample() { - doPerform(new RunningFileOnServerTask(DATASOURCE_FILE)); - super.executeExample(); - } - - @Override - protected PortletDefinition getPortletDefinition() { - return portlet("TestSeamPortlet", "Test JBoss Seam Portlet"); - } -} Deleted: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/SeamPortletExampleRuntime5x.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/SeamPortletExampleRuntime5x.java 2012-03-19 15:57:17 UTC (rev 39624) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/SeamPortletExampleRuntime5x.java 2012-03-19 15:58:51 UTC (rev 39625) @@ -1,44 +0,0 @@ -package org.jboss.tools.portlet.ui.bot.test.example; - -import org.jboss.tools.ui.bot.ext.config.Annotations.DB; -import org.jboss.tools.ui.bot.ext.config.Annotations.Require; -import org.jboss.tools.ui.bot.ext.config.Annotations.Seam; -import org.jboss.tools.ui.bot.ext.config.Annotations.Server; -import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; -import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType; - - -/** - * Tests the JSF portlet example. - * - * @author Lucia Jelinkova - * - */ -@Require(db=@DB, seam=@Seam, server=(a)Server(version=&quot;5.0&quot;, operator=">", state=ServerState.Running, type=ServerType.EPP)) -public class SeamPortletExampleRuntime5x extends AbstractPortletExampleRuntime5xTest { - - private static final String PROJECT_NAME_IN_WIZARD = "SeamPortlet"; - - private static final String PROJECT_NAME_EAR = "seam-portlet-ear"; - - private static final String PROJECT_NAME_EJB = "seam-portlet-ejb"; - - private static final String PROJECT_NAME_WAR = "seam-portlet-web"; - - private int getProjectNameMethodCallCounter = 0; - - @Override - public String getExampleName() { - return "JBoss Portlet Bridge - Seam Portlet"; - } - - @Override - public String[] getProjectNames() { - // an ugly hack to pass the assert that the project name in wizard is the same as project name in workspace - if (getProjectNameMethodCallCounter <= 1){ - getProjectNameMethodCallCounter++; - return new String[]{PROJECT_NAME_IN_WIZARD}; - } - return new String[]{PROJECT_NAME_EAR, PROJECT_NAME_EJB, PROJECT_NAME_WAR}; - } -} Copied: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/CreateJSFPortletGatein.java (from rev 38107, trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/CreateJSFPortletRuntime5x.java) =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/CreateJSFPortletGatein.java (rev 0) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/CreateJSFPortletGatein.java 2012-03-19 15:58:51 UTC (rev 39625) @@ -0,0 +1,19 @@ +package org.jboss.tools.portlet.ui.bot.test.jsf; + +import static org.jboss.tools.portlet.ui.bot.test.jsf.CreateJSFPortletProject.PROJECT_NAME; + +import org.jboss.tools.portlet.ui.bot.test.template.CreateJSFSeamPortletGateinTemplate; + +/** + * Creates a new jsf portlet for 5.x runtime and checks if the right files are generated. + * + * @author Lucia Jelinkova + * + */ +public class CreateJSFPortletGatein extends CreateJSFSeamPortletGateinTemplate { + + @Override + protected String getProjectName() { + return PROJECT_NAME; + } +} Copied: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/CreateJSFPortletJBPortal.java (from rev 38107, trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/CreateJSFPortletRuntime4x.java) =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/CreateJSFPortletJBPortal.java (rev 0) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/CreateJSFPortletJBPortal.java 2012-03-19 15:58:51 UTC (rev 39625) @@ -0,0 +1,19 @@ +package org.jboss.tools.portlet.ui.bot.test.jsf; + +import static org.jboss.tools.portlet.ui.bot.test.jsf.CreateJSFPortletProject.PROJECT_NAME; + +import org.jboss.tools.portlet.ui.bot.test.template.CreateJSFSeamPortletJBPortalTemplate; + +/** + * Creates a new jsf portlet for 4.x runtime and checks if the right files are generated. + * + * @author Lucia Jelinkova + * + */ +public class CreateJSFPortletJBPortal extends CreateJSFSeamPortletJBPortalTemplate { + + @Override + protected String getProjectName() { + return PROJECT_NAME; + } +} Deleted: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/CreateJSFPortletRuntime4x.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/CreateJSFPortletRuntime4x.java 2012-03-19 15:57:17 UTC (rev 39624) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/CreateJSFPortletRuntime4x.java 2012-03-19 15:58:51 UTC (rev 39625) @@ -1,19 +0,0 @@ -package org.jboss.tools.portlet.ui.bot.test.jsf; - -import static org.jboss.tools.portlet.ui.bot.test.jsf.CreateJSFPortletProject.PROJECT_NAME; - -import org.jboss.tools.portlet.ui.bot.test.template.CreateJSFSeamPortletRuntime4xTemplate; - -/** - * Creates a new jsf portlet for 4.x runtime and checks if the right files are generated. - * - * @author Lucia Jelinkova - * - */ -public class CreateJSFPortletRuntime4x extends CreateJSFSeamPortletRuntime4xTemplate { - - @Override - protected String getProjectName() { - return PROJECT_NAME; - } -} Deleted: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/CreateJSFPortletRuntime5x.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/CreateJSFPortletRuntime5x.java 2012-03-19 15:57:17 UTC (rev 39624) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/CreateJSFPortletRuntime5x.java 2012-03-19 15:58:51 UTC (rev 39625) @@ -1,19 +0,0 @@ -package org.jboss.tools.portlet.ui.bot.test.jsf; - -import static org.jboss.tools.portlet.ui.bot.test.jsf.CreateJSFPortletProject.PROJECT_NAME; - -import org.jboss.tools.portlet.ui.bot.test.template.CreateJSFSeamPortletRuntime5xTemplate; - -/** - * Creates a new jsf portlet for 5.x runtime and checks if the right files are generated. - * - * @author Lucia Jelinkova - * - */ -public class CreateJSFPortletRuntime5x extends CreateJSFSeamPortletRuntime5xTemplate { - - @Override - protected String getProjectName() { - return PROJECT_NAME; - } -} Copied: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/HotJSFPortletDeploymentGatein.java (from rev 39619, trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/HotJSFPortletDeploymentRuntime5x.java) =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/HotJSFPortletDeploymentGatein.java (rev 0) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/HotJSFPortletDeploymentGatein.java 2012-03-19 15:58:51 UTC (rev 39625) @@ -0,0 +1,33 @@ +package org.jboss.tools.portlet.ui.bot.test.jsf; + +import org.jboss.tools.portlet.ui.bot.task.wizard.WizardPageDefaultsFillingTask; +import org.jboss.tools.portlet.ui.bot.task.wizard.web.jboss.AbstractPortletCreationTask; +import org.jboss.tools.portlet.ui.bot.task.wizard.web.jboss.JSFPortletCreationTask; +import org.jboss.tools.portlet.ui.bot.task.wizard.web.jboss.JSFPortletWizardPageFillingTask; +import org.jboss.tools.portlet.ui.bot.test.template.HotDeploymentGateinTemplate; + +/** + * Creates a java portlet and checks if the project is re-deployed. + * + * @author Lucia Jelinkova + * + */ +public class HotJSFPortletDeploymentGatein extends HotDeploymentGateinTemplate { + + @Override + protected String getProjectName() { + return CreateJSFPortletProject.PROJECT_NAME; + } + + @Override + protected AbstractPortletCreationTask createPortlet() { + JSFPortletWizardPageFillingTask jsfPage = new JSFPortletWizardPageFillingTask(); + jsfPage.setName("hotDeployment"); + + JSFPortletCreationTask wizard = new JSFPortletCreationTask(); + wizard.addWizardPage(new WizardPageDefaultsFillingTask()); + wizard.addWizardPage(jsfPage); + wizard.addWizardPage(new WizardPageDefaultsFillingTask()); + return wizard; + } +} Deleted: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/HotJSFPortletDeploymentRuntime5x.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/HotJSFPortletDeploymentRuntime5x.java 2012-03-19 15:57:17 UTC (rev 39624) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/HotJSFPortletDeploymentRuntime5x.java 2012-03-19 15:58:51 UTC (rev 39625) @@ -1,33 +0,0 @@ -package org.jboss.tools.portlet.ui.bot.test.jsf; - -import org.jboss.tools.portlet.ui.bot.task.wizard.WizardPageDefaultsFillingTask; -import org.jboss.tools.portlet.ui.bot.task.wizard.web.jboss.AbstractPortletCreationTask; -import org.jboss.tools.portlet.ui.bot.task.wizard.web.jboss.JSFPortletCreationTask; -import org.jboss.tools.portlet.ui.bot.task.wizard.web.jboss.JSFPortletWizardPageFillingTask; -import org.jboss.tools.portlet.ui.bot.test.template.HotDeploymentRuntime5xTemplate; - -/** - * Creates a java portlet and checks if the project is re-deployed. - * - * @author Lucia Jelinkova - * - */ -public class HotJSFPortletDeploymentRuntime5x extends HotDeploymentRuntime5xTemplate { - - @Override - protected String getProjectName() { - return CreateJSFPortletProject.PROJECT_NAME; - } - - @Override - protected AbstractPortletCreationTask createPortlet() { - JSFPortletWizardPageFillingTask jsfPage = new JSFPortletWizardPageFillingTask(); - jsfPage.setName("hotDeployment"); - - JSFPortletCreationTask wizard = new JSFPortletCreationTask(); - wizard.addWizardPage(new WizardPageDefaultsFillingTask()); - wizard.addWizardPage(jsfPage); - wizard.addWizardPage(new WizardPageDefaultsFillingTask()); - return wizard; - } -} Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/JSFPortletTestSuite.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/JSFPortletTestSuite.java 2012-03-19 15:57:17 UTC (rev 39624) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/JSFPortletTestSuite.java 2012-03-19 15:58:51 UTC (rev 39625) @@ -7,11 +7,11 @@ @RunWith(RequirementAwareSuite.class) @Suite.SuiteClasses({ CreateJSFPortletProject.class, - CreateJSFPortletRuntime4x.class, - CreateJSFPortletRuntime5x.class, + CreateJSFPortletJBPortal.class, + CreateJSFPortletGatein.class, RunJSFPortletOnServer.class, - LoadJSFPortletInBrowserRuntime4x.class, - HotJSFPortletDeploymentRuntime5x.class + LoadJSFPortletInBrowserJBPortal.class, + HotJSFPortletDeploymentGatein.class }) public class JSFPortletTestSuite { Copied: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/LoadJSFPortletInBrowserJBPortal.java (from rev 38107, trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/LoadJSFPortletInBrowserRuntime4x.java) =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/LoadJSFPortletInBrowserJBPortal.java (rev 0) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/LoadJSFPortletInBrowserJBPortal.java 2012-03-19 15:58:51 UTC (rev 39625) @@ -0,0 +1,15 @@ +package org.jboss.tools.portlet.ui.bot.test.jsf; + +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.test.template.LoadPortletInBrowserJBPortalTemplate; + + +public class LoadJSFPortletInBrowserJBPortal extends LoadPortletInBrowserJBPortalTemplate { + + @Override + protected PortletDefinition getPortletDefinition() { + return portlet("JSFPortlet", "JBoss JSF Portlet"); + } +} Deleted: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/LoadJSFPortletInBrowserRuntime4x.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/LoadJSFPortletInBrowserRuntime4x.java 2012-03-19 15:57:17 UTC (rev 39624) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/LoadJSFPortletInBrowserRuntime4x.java 2012-03-19 15:58:51 UTC (rev 39625) @@ -1,15 +0,0 @@ -package org.jboss.tools.portlet.ui.bot.test.jsf; - -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.test.template.LoadPortletInBrowser4xRuntimeTemplate; - - -public class LoadJSFPortletInBrowserRuntime4x extends LoadPortletInBrowser4xRuntimeTemplate { - - @Override - protected PortletDefinition getPortletDefinition() { - return portlet("JSFPortlet", "JBoss JSF Portlet"); - } -} Copied: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/CreateSeamPortletGatein.java (from rev 38107, trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/CreateSeamPortletRuntime5x.java) =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/CreateSeamPortletGatein.java (rev 0) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/CreateSeamPortletGatein.java 2012-03-19 15:58:51 UTC (rev 39625) @@ -0,0 +1,19 @@ +package org.jboss.tools.portlet.ui.bot.test.seam; + +import static org.jboss.tools.portlet.ui.bot.test.seam.CreateSeamPortletProject.PROJECT_NAME; + +import org.jboss.tools.portlet.ui.bot.test.template.CreateJSFSeamPortletGateinTemplate; + +/** + * Creates a new seam portlet for 5.x runtime and checks if the right files are generated. + * + * @author Lucia Jelinkova + * + */ +public class CreateSeamPortletGatein extends CreateJSFSeamPortletGateinTemplate { + + @Override + protected String getProjectName() { + return PROJECT_NAME; + } +} Copied: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/CreateSeamPortletJBPortal.java (from rev 38107, trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/CreateSeamPortletRuntime4x.java) =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/CreateSeamPortletJBPortal.java (rev 0) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/CreateSeamPortletJBPortal.java 2012-03-19 15:58:51 UTC (rev 39625) @@ -0,0 +1,19 @@ +package org.jboss.tools.portlet.ui.bot.test.seam; + +import static org.jboss.tools.portlet.ui.bot.test.seam.CreateSeamPortletProject.PROJECT_NAME; + +import org.jboss.tools.portlet.ui.bot.test.template.CreateJSFSeamPortletJBPortalTemplate; + +/** + * Creates a new seam portlet for 4.x runtime and checks if the right files are generated. + * + * @author Lucia Jelinkova + * + */ +public class CreateSeamPortletJBPortal extends CreateJSFSeamPortletJBPortalTemplate { + + @Override + protected String getProjectName() { + return PROJECT_NAME; + } +} Deleted: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/CreateSeamPortletRuntime4x.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/CreateSeamPortletRuntime4x.java 2012-03-19 15:57:17 UTC (rev 39624) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/CreateSeamPortletRuntime4x.java 2012-03-19 15:58:51 UTC (rev 39625) @@ -1,19 +0,0 @@ -package org.jboss.tools.portlet.ui.bot.test.seam; - -import static org.jboss.tools.portlet.ui.bot.test.seam.CreateSeamPortletProject.PROJECT_NAME; - -import org.jboss.tools.portlet.ui.bot.test.template.CreateJSFSeamPortletRuntime4xTemplate; - -/** - * Creates a new seam portlet for 4.x runtime and checks if the right files are generated. - * - * @author Lucia Jelinkova - * - */ -public class CreateSeamPortletRuntime4x extends CreateJSFSeamPortletRuntime4xTemplate { - - @Override - protected String getProjectName() { - return PROJECT_NAME; - } -} Deleted: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/CreateSeamPortletRuntime5x.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/CreateSeamPortletRuntime5x.java 2012-03-19 15:57:17 UTC (rev 39624) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/CreateSeamPortletRuntime5x.java 2012-03-19 15:58:51 UTC (rev 39625) @@ -1,19 +0,0 @@ -package org.jboss.tools.portlet.ui.bot.test.seam; - -import static org.jboss.tools.portlet.ui.bot.test.seam.CreateSeamPortletProject.PROJECT_NAME; - -import org.jboss.tools.portlet.ui.bot.test.template.CreateJSFSeamPortletRuntime5xTemplate; - -/** - * Creates a new seam portlet for 5.x runtime and checks if the right files are generated. - * - * @author Lucia Jelinkova - * - */ -public class CreateSeamPortletRuntime5x extends CreateJSFSeamPortletRuntime5xTemplate { - - @Override - protected String getProjectName() { - return PROJECT_NAME; - } -} Copied: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/HotSeamPortletDeploymentGatein.java (from rev 39619, trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/HotSeamPortletDeploymentRuntime5x.java) =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/HotSeamPortletDeploymentGatein.java (rev 0) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/HotSeamPortletDeploymentGatein.java 2012-03-19 15:58:51 UTC (rev 39625) @@ -0,0 +1,33 @@ +package org.jboss.tools.portlet.ui.bot.test.seam; + +import org.jboss.tools.portlet.ui.bot.task.wizard.WizardPageDefaultsFillingTask; +import org.jboss.tools.portlet.ui.bot.task.wizard.web.jboss.AbstractPortletCreationTask; +import org.jboss.tools.portlet.ui.bot.task.wizard.web.jboss.JSFPortletCreationTask; +import org.jboss.tools.portlet.ui.bot.task.wizard.web.jboss.JSFPortletWizardPageFillingTask; +import org.jboss.tools.portlet.ui.bot.test.template.HotDeploymentGateinTemplate; + +/** + * Creates a java portlet and checks if the project is re-deployed. + * + * @author Lucia Jelinkova + * + */ +public class HotSeamPortletDeploymentGatein extends HotDeploymentGateinTemplate { + + @Override + protected String getProjectName() { + return CreateSeamPortletProject.PROJECT_NAME; + } + + @Override + protected AbstractPortletCreationTask createPortlet() { + JSFPortletWizardPageFillingTask jsfPage = new JSFPortletWizardPageFillingTask(); + jsfPage.setName("hotDeployment"); + + JSFPortletCreationTask wizard = new JSFPortletCreationTask(); + wizard.addWizardPage(new WizardPageDefaultsFillingTask()); + wizard.addWizardPage(jsfPage); + wizard.addWizardPage(new WizardPageDefaultsFillingTask()); + return wizard; + } +} Deleted: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/HotSeamPortletDeploymentRuntime5x.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/HotSeamPortletDeploymentRuntime5x.java 2012-03-19 15:57:17 UTC (rev 39624) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/HotSeamPortletDeploymentRuntime5x.java 2012-03-19 15:58:51 UTC (rev 39625) @@ -1,33 +0,0 @@ -package org.jboss.tools.portlet.ui.bot.test.seam; - -import org.jboss.tools.portlet.ui.bot.task.wizard.WizardPageDefaultsFillingTask; -import org.jboss.tools.portlet.ui.bot.task.wizard.web.jboss.AbstractPortletCreationTask; -import org.jboss.tools.portlet.ui.bot.task.wizard.web.jboss.JSFPortletCreationTask; -import org.jboss.tools.portlet.ui.bot.task.wizard.web.jboss.JSFPortletWizardPageFillingTask; -import org.jboss.tools.portlet.ui.bot.test.template.HotDeploymentRuntime5xTemplate; - -/** - * Creates a java portlet and checks if the project is re-deployed. - * - * @author Lucia Jelinkova - * - */ -public class HotSeamPortletDeploymentRuntime5x extends HotDeploymentRuntime5xTemplate { - - @Override - protected String getProjectName() { - return CreateSeamPortletProject.PROJECT_NAME; - } - - @Override - protected AbstractPortletCreationTask createPortlet() { - JSFPortletWizardPageFillingTask jsfPage = new JSFPortletWizardPageFillingTask(); - jsfPage.setName("hotDeployment"); - - JSFPortletCreationTask wizard = new JSFPortletCreationTask(); - wizard.addWizardPage(new WizardPageDefaultsFillingTask()); - wizard.addWizardPage(jsfPage); - wizard.addWizardPage(new WizardPageDefaultsFillingTask()); - return wizard; - } -} Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/SeamPortletTestSuite.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/SeamPortletTestSuite.java 2012-03-19 15:57:17 UTC (rev 39624) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/SeamPortletTestSuite.java 2012-03-19 15:58:51 UTC (rev 39625) @@ -7,10 +7,10 @@ @RunWith(RequirementAwareSuite.class) @Suite.SuiteClasses({ CreateSeamPortletProject.class, - CreateSeamPortletRuntime4x.class, - CreateSeamPortletRuntime5x.class, + CreateSeamPortletJBPortal.class, + CreateSeamPortletGatein.class, RunSeamPortletOnServer.class, - HotSeamPortletDeploymentRuntime5x.class + HotSeamPortletDeploymentGatein.class }) public class SeamPortletTestSuite { Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/server/PortletServerTestSuite.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/server/PortletServerTestSuite.java 2012-03-19 15:57:17 UTC (rev 39624) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/server/PortletServerTestSuite.java 2012-03-19 15:58:51 UTC (rev 39625) @@ -6,8 +6,8 @@ @RunWith(RequirementAwareSuite.class) @Suite.SuiteClasses({ - RunAsLoadsPortalURLRuntime4x.class, - RunAsLoadsPortalURLRuntime5x.class + RunAsLoadsPortalURLJBPortal.class, + RunAsLoadsPortalURLGatein.class }) public class PortletServerTestSuite { Copied: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/server/RunAsLoadsPortalURLGatein.java (from rev 39610, trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/server/RunAsLoadsPortalURLRuntime5x.java) =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/server/RunAsLoadsPortalURLGatein.java (rev 0) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/server/RunAsLoadsPortalURLGatein.java 2012-03-19 15:58:51 UTC (rev 39625) @@ -0,0 +1,15 @@ +package org.jboss.tools.portlet.ui.bot.test.server; + +import org.jboss.tools.portlet.ui.bot.test.template.RunAsLoadsPortalURLTemplate; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; +import org.jboss.tools.ui.bot.ext.config.Annotations.Server; +import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; + +@Require(server=(a)Server(version=&quot;5.0&quot;, operator=">", state=ServerState.Running)) +public class RunAsLoadsPortalURLGatein extends RunAsLoadsPortalURLTemplate { + + @Override + public String getExpectedURL() { + return "http://localhost:8080/portal/classic/"; + } +} Copied: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/server/RunAsLoadsPortalURLJBPortal.java (from rev 39610, trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/server/RunAsLoadsPortalURLRuntime4x.java) =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/server/RunAsLoadsPortalURLJBPortal.java (rev 0) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/server/RunAsLoadsPortalURLJBPortal.java 2012-03-19 15:58:51 UTC (rev 39625) @@ -0,0 +1,15 @@ +package org.jboss.tools.portlet.ui.bot.test.server; + +import org.jboss.tools.portlet.ui.bot.test.template.RunAsLoadsPortalURLTemplate; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; +import org.jboss.tools.ui.bot.ext.config.Annotations.Server; +import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; + +@Require(server=(a)Server(version=&quot;4.3&quot;, state=ServerState.Running)) +public class RunAsLoadsPortalURLJBPortal extends RunAsLoadsPortalURLTemplate { + + @Override + public String getExpectedURL() { + return "http://localhost:8080/portal"; + } +} Deleted: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/server/RunAsLoadsPortalURLRuntime4x.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/server/RunAsLoadsPortalURLRuntime4x.java 2012-03-19 15:57:17 UTC (rev 39624) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/server/RunAsLoadsPortalURLRuntime4x.java 2012-03-19 15:58:51 UTC (rev 39625) @@ -1,15 +0,0 @@ -package org.jboss.tools.portlet.ui.bot.test.server; - -import org.jboss.tools.portlet.ui.bot.test.template.RunAsLoadsPortalURLTemplate; -import org.jboss.tools.ui.bot.ext.config.Annotations.Require; -import org.jboss.tools.ui.bot.ext.config.Annotations.Server; -import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; - -@Require(server=(a)Server(version=&quot;4.3&quot;, state=ServerState.Running)) -public class RunAsLoadsPortalURLRuntime4x extends RunAsLoadsPortalURLTemplate { - - @Override - public String getExpectedURL() { - return "http://localhost:8080/portal"; - } -} Deleted: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/server/RunAsLoadsPortalURLRuntime5x.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/server/RunAsLoadsPortalURLRuntime5x.java 2012-03-19 15:57:17 UTC (rev 39624) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/server/RunAsLoadsPortalURLRuntime5x.java 2012-03-19 15:58:51 UTC (rev 39625) @@ -1,15 +0,0 @@ -package org.jboss.tools.portlet.ui.bot.test.server; - -import org.jboss.tools.portlet.ui.bot.test.template.RunAsLoadsPortalURLTemplate; -import org.jboss.tools.ui.bot.ext.config.Annotations.Require; -import org.jboss.tools.ui.bot.ext.config.Annotations.Server; -import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; - -@Require(server=(a)Server(version=&quot;5.0&quot;, operator=">", state=ServerState.Running)) -public class RunAsLoadsPortalURLRuntime5x extends RunAsLoadsPortalURLTemplate { - - @Override - public String getExpectedURL() { - return "http://localhost:8080/portal/classic/"; - } -} Copied: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreateJSFSeamPortletGateinTemplate.java (from rev 38107, trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreateJSFSeamPortletRuntime5xTemplate.java) =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreateJSFSeamPortletGateinTemplate.java (rev 0) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreateJSFSeamPortletGateinTemplate.java 2012-03-19 15:58:51 UTC (rev 39625) @@ -0,0 +1,30 @@ +package org.jboss.tools.portlet.ui.bot.test.template; + +import java.util.Arrays; +import java.util.List; + +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; +import org.jboss.tools.ui.bot.ext.config.Annotations.Server; +import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; + +@Require(clearWorkspace=false, clearProjects=false, server=(a)Server(version=&quot;5.0&quot;, operator=">", state=ServerState.Present)) +public abstract class CreateJSFSeamPortletGateinTemplate extends CreateJSFSeamPortletTemplate { + + @Override + protected List<String> getExpectedFiles() { + return Arrays.asList( + JSF_FOLDER + "edit.jsp", + JSF_FOLDER + "view.jsp", + JSF_FOLDER + "help.jsp" + ); + } + + @Override + protected List<String> getNonExpectedFiles() { + return Arrays.asList( + DEFAULT_OBJECTS_XML, + PORTLET_INSTANCES_XML, + JBOSS_APP_XML, + JBOSS_PORTLET_XML); + } +} Copied: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreateJSFSeamPortletJBPortalTemplate.java (from rev 38107, trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreateJSFSeamPortletRuntime4xTemplate.java) =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreateJSFSeamPortletJBPortalTemplate.java (rev 0) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreateJSFSeamPortletJBPortalTemplate.java 2012-03-19 15:58:51 UTC (rev 39625) @@ -0,0 +1,37 @@ +package org.jboss.tools.portlet.ui.bot.test.template; + +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; +import org.jboss.tools.ui.bot.ext.config.Annotations.Server; +import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; + +/** + * Creates a new jsf portlet with 4.x runtime and checks if the right files are generated. + * + * @author Lucia Jelinkova + * + */ +@Require(clearWorkspace=false, clearProjects=false, server=(a)Server(version=&quot;4.3&quot;, state=ServerState.Present)) +public abstract class CreateJSFSeamPortletJBPortalTemplate extends CreateJSFSeamPortletTemplate { + + @Override + protected List<String> getExpectedFiles() { + return Arrays.asList( + JSF_FOLDER + "edit.jsp", + JSF_FOLDER + "view.jsp", + JSF_FOLDER + "help.jsp", + DEFAULT_OBJECTS_XML, + PORTLET_INSTANCES_XML, + JBOSS_APP_XML, + JBOSS_PORTLET_XML + ); + } + + @Override + protected List<String> getNonExpectedFiles() { + return Collections.emptyList(); + } +} Deleted: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreateJSFSeamPortletRuntime4xTemplate.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreateJSFSeamPortletRuntime4xTemplate.java 2012-03-19 15:57:17 UTC (rev 39624) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreateJSFSeamPortletRuntime4xTemplate.java 2012-03-19 15:58:51 UTC (rev 39625) @@ -1,37 +0,0 @@ -package org.jboss.tools.portlet.ui.bot.test.template; - -import java.util.Arrays; -import java.util.Collections; -import java.util.List; - -import org.jboss.tools.ui.bot.ext.config.Annotations.Require; -import org.jboss.tools.ui.bot.ext.config.Annotations.Server; -import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; - -/** - * Creates a new jsf portlet with 4.x runtime and checks if the right files are generated. - * - * @author Lucia Jelinkova - * - */ -@Require(clearWorkspace=false, clearProjects=false, server=(a)Server(version=&quot;4.3&quot;, state=ServerState.Present)) -public abstract class CreateJSFSeamPortletRuntime4xTemplate extends CreateJSFSeamPortletTemplate { - - @Override - protected List<String> getExpectedFiles() { - return Arrays.asList( - JSF_FOLDER + "edit.jsp", - JSF_FOLDER + "view.jsp", - JSF_FOLDER + "help.jsp", - DEFAULT_OBJECTS_XML, - PORTLET_INSTANCES_XML, - JBOSS_APP_XML, - JBOSS_PORTLET_XML - ); - } - - @Override - protected List<String> getNonExpectedFiles() { - return Collections.emptyList(); - } -} Deleted: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreateJSFSeamPortletRuntime5xTemplate.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreateJSFSeamPortletRuntime5xTemplate.java 2012-03-19 15:57:17 UTC (rev 39624) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreateJSFSeamPortletRuntime5xTemplate.java 2012-03-19 15:58:51 UTC (rev 39625) @@ -1,30 +0,0 @@ -package org.jboss.tools.portlet.ui.bot.test.template; - -import java.util.Arrays; -import java.util.List; - -import org.jboss.tools.ui.bot.ext.config.Annotations.Require; -import org.jboss.tools.ui.bot.ext.config.Annotations.Server; -import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; - -@Require(clearWorkspace=false, clearProjects=false, server=(a)Server(version=&quot;5.0&quot;, operator=">", state=ServerState.Present)) -public abstract class CreateJSFSeamPortletRuntime5xTemplate extends CreateJSFSeamPortletTemplate { - - @Override - protected List<String> getExpectedFiles() { - return Arrays.asList( - JSF_FOLDER + "edit.jsp", - JSF_FOLDER + "view.jsp", - JSF_FOLDER + "help.jsp" - ); - } - - @Override - protected List<String> getNonExpectedFiles() { - return Arrays.asList( - DEFAULT_OBJECTS_XML, - PORTLET_INSTANCES_XML, - JBOSS_APP_XML, - JBOSS_PORTLET_XML); - } -} Copied: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/HotDeploymentGateinTemplate.java (from rev 39619, trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/HotDeploymentRuntime5xTemplate.java) =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/HotDeploymentGateinTemplate.java (rev 0) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/HotDeploymentGateinTemplate.java 2012-03-19 15:58:51 UTC (rev 39625) @@ -0,0 +1,37 @@ +package org.jboss.tools.portlet.ui.bot.test.template; + +import static org.jboss.tools.portlet.ui.bot.matcher.WorkspaceAssert.assertThatInWorkspace; + +import org.jboss.tools.portlet.ui.bot.matcher.console.ConsoleOutputMatcher; +import org.jboss.tools.portlet.ui.bot.task.console.ConsoleClearingTask; +import org.jboss.tools.portlet.ui.bot.task.editor.CloseAllEditors; +import org.jboss.tools.portlet.ui.bot.task.wizard.web.jboss.AbstractPortletCreationTask; +import org.jboss.tools.portlet.ui.bot.test.testcase.SWTTaskBasedTestCase; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; +import org.jboss.tools.ui.bot.ext.config.Annotations.Server; +import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; +import org.junit.Test; + +/** + * Creates a new portlet and checks if the project is hot deployed (undeployed and deployed). + * + * @author Lucia Jelinkova + * + */ +@Require(clearWorkspace=false, clearProjects=false, server=(a)Server(version=&quot;5.0&quot;, operator=">", state=ServerState.Present)) +public abstract class HotDeploymentGateinTemplate extends SWTTaskBasedTestCase { + + protected abstract String getProjectName(); + + protected abstract AbstractPortletCreationTask createPortlet(); + + @Test + public void hotDeployment(){ + doPerform(new CloseAllEditors()); + doPerform(new ConsoleClearingTask()); + doPerform(createPortlet()); + + assertThatInWorkspace("undeploy, ctxPath=/" + getProjectName(), new ConsoleOutputMatcher()); + assertThatInWorkspace("deploy, ctxPath=/" + getProjectName(), new ConsoleOutputMatcher()); + } +} Deleted: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/HotDeploymentRuntime5xTemplate.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/HotDeploymentRuntime5xTemplate.java 2012-03-19 15:57:17 UTC (rev 39624) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/HotDeploymentRuntime5xTemplate.java 2012-03-19 15:58:51 UTC (rev 39625) @@ -1,37 +0,0 @@ -package org.jboss.tools.portlet.ui.bot.test.template; - -import static org.jboss.tools.portlet.ui.bot.matcher.WorkspaceAssert.assertThatInWorkspace; - -import org.jboss.tools.portlet.ui.bot.matcher.console.ConsoleOutputMatcher; -import org.jboss.tools.portlet.ui.bot.task.console.ConsoleClearingTask; -import org.jboss.tools.portlet.ui.bot.task.editor.CloseAllEditors; -import org.jboss.tools.portlet.ui.bot.task.wizard.web.jboss.AbstractPortletCreationTask; -import org.jboss.tools.portlet.ui.bot.test.testcase.SWTTaskBasedTestCase; -import org.jboss.tools.ui.bot.ext.config.Annotations.Require; -import org.jboss.tools.ui.bot.ext.config.Annotations.Server; -import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; -import org.junit.Test; - -/** - * Creates a new portlet and checks if the project is hot deployed (undeployed and deployed). - * - * @author Lucia Jelinkova - * - */ -@Require(clearWorkspace=false, clearProjects=false, server=(a)Server(version=&quot;5.0&quot;, operator=">", state=ServerState.Present)) -public abstract class HotDeploymentRuntime5xTemplate extends SWTTaskBasedTestCase { - - protected abstract String getProjectName(); - - protected abstract AbstractPortletCreationTask createPortlet(); - - @Test - public void hotDeployment(){ - doPerform(new CloseAllEditors()); - doPerform(new ConsoleClearingTask()); - doPerform(createPortlet()); - - assertThatInWorkspace("undeploy, ctxPath=/" + getProjectName(), new ConsoleOutputMatcher()); - assertThatInWorkspace("deploy, ctxPath=/" + getProjectName(), new ConsoleOutputMatcher()); - } -} Deleted: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/LoadPortletInBrowser4xRuntimeTemplate.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/LoadPortletInBrowser4xRuntimeTemplate.java 2012-03-19 15:57:17 UTC (rev 39624) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/LoadPortletInBrowser4xRuntimeTemplate.java 2012-03-19 15:58:51 UTC (rev 39625) @@ -1,27 +0,0 @@ -package org.jboss.tools.portlet.ui.bot.test.template; - -import static org.jboss.tools.portlet.ui.bot.matcher.factory.PortletMatchersFactory.canLoadAt4xRuntime; - -import org.jboss.tools.portlet.ui.bot.entity.PortletDefinition; -import org.jboss.tools.portlet.ui.bot.test.testcase.SWTTaskBasedTestCase; -import org.jboss.tools.ui.bot.ext.config.Annotations.Require; -import org.jboss.tools.ui.bot.ext.config.Annotations.Server; -import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; -import org.junit.Test; - -/** - * Tests that the portlet can be loaded in browser. - * - * @author Lucia Jelinkova - * - */ -@Require(clearWorkspace=false, clearProjects=false, server=(a)Server(version=&quot;4.3&quot;, state=ServerState.Present)) -public abstract class LoadPortletInBrowser4xRuntimeTemplate extends SWTTaskBasedTestCase { - - protected abstract PortletDefinition getPortletDefinition(); - - @Test - public void testLoadPortlet(){ - doAssertThatInWorkspace(getPortletDefinition(), canLoadAt4xRuntime()); - } -} Copied: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/LoadPortletInBrowserJBPortalTemplate.java (from rev 38107, trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/LoadPortletInBrowser4xRuntimeTemplate.java) =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/LoadPortletInBrowserJBPortalTemplate.java (rev 0) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/LoadPortletInBrowserJBPortalTemplate.java 2012-03-19 15:58:51 UTC (rev 39625) @@ -0,0 +1,27 @@ +package org.jboss.tools.portlet.ui.bot.test.template; + +import static org.jboss.tools.portlet.ui.bot.matcher.factory.PortletMatchersFactory.canLoadAt4xRuntime; + +import org.jboss.tools.portlet.ui.bot.entity.PortletDefinition; +import org.jboss.tools.portlet.ui.bot.test.testcase.SWTTaskBasedTestCase; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; +import org.jboss.tools.ui.bot.ext.config.Annotations.Server; +import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; +import org.junit.Test; + +/** + * Tests that the portlet can be loaded in browser. + * + * @author Lucia Jelinkova + * + */ +@Require(clearWorkspace=false, clearProjects=false, server=(a)Server(version=&quot;4.3&quot;, state=ServerState.Present)) +public abstract class LoadPortletInBrowserJBPortalTemplate extends SWTTaskBasedTestCase { + + protected abstract PortletDefinition getPortletDefinition(); + + @Test + public void testLoadPortlet(){ + doAssertThatInWorkspace(getPortletDefinition(), canLoadAt4xRuntime()); + } +}