Author: ljelinko Date: 2012-02-14 05:09:08 -0500 (Tue, 14 Feb 2012) New Revision: 38683 Added: 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/template/CreateJavaPortletTemplate.java Removed: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/CreateJavaPortlet.java 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/LoadJavaPortletInBrowserRuntime4x.java Log: Created separated tests for EPP 4x and 5x Deleted: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/CreateJavaPortlet.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/CreateJavaPortlet.java 2012-02-14 10:08:46 UTC (rev 38682) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/CreateJavaPortlet.java 2012-02-14 10:09:08 UTC (rev 38683) @@ -1,104 +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 java.util.Arrays; -import java.util.List; - -import org.eclipse.core.runtime.Platform; -import org.eclipse.osgi.baseadaptor.BaseData; -import org.eclipse.osgi.framework.internal.core.BundleHost; -import org.jboss.tools.portlet.ui.bot.entity.XMLNode; -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.CreatePortletTemplate; -import org.junit.Before; -import org.osgi.framework.Bundle; - -/** - * Creates a new java portlet and checks if the right files are generated. - * - * @author Lucia Jelinkova - * - */ -public class CreateJavaPortlet extends CreatePortletTemplate { - - public static final String CLASS_NAME = "UITestingJavaPortlet"; - - private static final String PACKAGE_NAME = "org.jboss.tools.tests.ui.portlet"; - - private static final String SOURCE_FILE_NAME = "src"; - - private static final String CLASS_FILE = SOURCE_FILE_NAME + "/" + PACKAGE_NAME + "/" + CLASS_NAME + ".java"; - - private static final String FULL_CLASS_NAME = PACKAGE_NAME + "." + CLASS_NAME; - - /** - * An ugly fix of Eclipse issue: - * ID: Bug 368436 - * URL: https://bugs.eclipse.org/bugs/show_bug.cgi?id=368436 - */ - @Before - public void setUp() throws Exception { - super.setUp(); - removeSlash("org.eclipse.jst.j2ee"); - removeSlash("org.eclipse.jst.j2ee.web"); - removeSlash("org.jboss.tools.portlet.ui"); - } - - private void removeSlash(String pluginName){ - Bundle bundle = Platform.getBundle(pluginName); - if (bundle instanceof BundleHost){ - BundleHost bundleHost = (BundleHost) bundle; - if (bundleHost.getBundleData() instanceof BaseData){ - BaseData baseData = (BaseData) bundleHost.getBundleData(); - if (baseData.getLocation().endsWith("/")){ - baseData.setLocation(baseData.getLocation().substring(0, baseData.getLocation().length() - 1)); - } - System.out.println("Location of bundle is: " + bundle.getLocation()); - } else { - System.out.println("The BundleHost data is not of type BaseData"); - } - } else { - System.out.println("The bundle is not of type BundleHost"); - } - } - - @Override - protected String getProjectName() { - return PROJECT_NAME; - } - - protected AbstractPortletCreationTask getCreatePortletTask() { - JavaPortletWizardPageFillingTask task = new JavaPortletWizardPageFillingTask(); - task.setProject(PROJECT_NAME); - task.setPackageName(PACKAGE_NAME); - task.setClassName(CLASS_NAME); - - JavaPortletCreationTask wizardTask = new JavaPortletCreationTask(); - wizardTask.addWizardPage(task); - return wizardTask; - } - - @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); - } - - @Override - protected List<XMLNode> getExpectedXMLNodes() { - return Arrays.asList(new XMLNode("portlet-app/portlet/portlet-class", FULL_CLASS_NAME)); - } -} Added: 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 (rev 0) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/CreateJavaPortletRuntime4x.java 2012-02-14 10:09:08 UTC (rev 38683) @@ -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 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); + } +} Copied: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/CreateJavaPortletRuntime5x.java (from rev 38107, trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/CreateJavaPortlet.java) =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/CreateJavaPortletRuntime5x.java (rev 0) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/CreateJavaPortletRuntime5x.java 2012-02-14 10:09:08 UTC (rev 38683) @@ -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 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); + } +} 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-02-14 10:08:46 UTC (rev 38682) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/JavaPortletTestSuite.java 2012-02-14 10:09:08 UTC (rev 38683) @@ -9,7 +9,8 @@ @Suite.SuiteClasses({ GateinStartupFix.class, CreateJavaPortletProject.class, - CreateJavaPortlet.class, + CreateJavaPortletRuntime4x.class, + CreateJavaPortletRuntime5x.class, RunJavaPortletOnServer.class, LoadJavaPortletInBrowserRuntime4x.class }) Modified: 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-02-14 10:08:46 UTC (rev 38682) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/LoadJavaPortletInBrowserRuntime4x.java 2012-02-14 10:09:08 UTC (rev 38683) @@ -10,6 +10,6 @@ @Override protected PortletDefinition getPortletDefinition() { - return portlet(CreateJavaPortlet.CLASS_NAME); + return portlet(CreateJavaPortletRuntime5x.CLASS_NAME); } } Added: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreateJavaPortletTemplate.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreateJavaPortletTemplate.java (rev 0) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreateJavaPortletTemplate.java 2012-02-14 10:09:08 UTC (rev 38683) @@ -0,0 +1,87 @@ +package org.jboss.tools.portlet.ui.bot.test.template; + +import static org.jboss.tools.portlet.ui.bot.test.core.CreateJavaPortletProject.PROJECT_NAME; + +import java.util.Arrays; +import java.util.List; + +import org.eclipse.core.runtime.Platform; +import org.eclipse.osgi.baseadaptor.BaseData; +import org.eclipse.osgi.framework.internal.core.BundleHost; +import org.jboss.tools.portlet.ui.bot.entity.XMLNode; +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.junit.Before; +import org.osgi.framework.Bundle; + +/** + * Creates a new java portlet and checks if the right files are generated. + * + * @author Lucia Jelinkova + * + */ +public abstract class CreateJavaPortletTemplate extends CreatePortletTemplate { + + public static final String CLASS_NAME = "UITestingJavaPortlet"; + + protected static final String PACKAGE_NAME = "org.jboss.tools.tests.ui.portlet"; + + protected static final String SOURCE_FILE_NAME = "src"; + + protected static final String CLASS_FILE = SOURCE_FILE_NAME + "/" + PACKAGE_NAME + "/" + CLASS_NAME + ".java"; + + protected static final String FULL_CLASS_NAME = PACKAGE_NAME + "." + CLASS_NAME; + + /** + * An ugly fix of Eclipse issue: + * ID: Bug 368436 + * URL: https://bugs.eclipse.org/bugs/show_bug.cgi?id=368436 + */ + @Before + public void setUp() throws Exception { + super.setUp(); + removeSlash("org.eclipse.jst.j2ee"); + removeSlash("org.eclipse.jst.j2ee.web"); + removeSlash("org.jboss.tools.portlet.ui"); + } + + private void removeSlash(String pluginName){ + Bundle bundle = Platform.getBundle(pluginName); + if (bundle instanceof BundleHost){ + BundleHost bundleHost = (BundleHost) bundle; + if (bundleHost.getBundleData() instanceof BaseData){ + BaseData baseData = (BaseData) bundleHost.getBundleData(); + if (baseData.getLocation().endsWith("/")){ + baseData.setLocation(baseData.getLocation().substring(0, baseData.getLocation().length() - 1)); + } + System.out.println("Location of bundle is: " + bundle.getLocation()); + } else { + System.out.println("The BundleHost data is not of type BaseData"); + } + } else { + System.out.println("The bundle is not of type BundleHost"); + } + } + + @Override + protected String getProjectName() { + return PROJECT_NAME; + } + + protected AbstractPortletCreationTask getCreatePortletTask() { + JavaPortletWizardPageFillingTask task = new JavaPortletWizardPageFillingTask(); + task.setProject(PROJECT_NAME); + task.setPackageName(PACKAGE_NAME); + task.setClassName(CLASS_NAME); + + JavaPortletCreationTask wizardTask = new JavaPortletCreationTask(); + wizardTask.addWizardPage(task); + return wizardTask; + } + + @Override + protected List<XMLNode> getExpectedXMLNodes() { + return Arrays.asList(new XMLNode("portlet-app/portlet/portlet-class", FULL_CLASS_NAME)); + } +}