Author: ljelinko Date: 2011-12-01 04:28:49 -0500 (Thu, 01 Dec 2011) New Revision: 36825 Added: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/server/MarkFileAsDeployableTask.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/workspace/ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/workspace/FileContextMenuSelectingTask.java Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/RunSeamPortletOnServer.java Log: Fixed issue with not deploying *-ds.xml file Added: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/server/MarkFileAsDeployableTask.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/server/MarkFileAsDeployableTask.java (rev 0) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/server/MarkFileAsDeployableTask.java 2011-12-01 09:28:49 UTC (rev 36825) @@ -0,0 +1,25 @@ +package org.jboss.tools.portlet.ui.bot.task.server; + +import org.jboss.tools.portlet.ui.bot.entity.WorkspaceFile; +import org.jboss.tools.portlet.ui.bot.task.AbstractSWTTask; +import org.jboss.tools.portlet.ui.bot.task.workspace.FileContextMenuSelectingTask; + +/** + * Marks a file as deployable for the specified server (it works only if there is just one server defined) + * + * @author Lucia Jelinkova + * + */ +public class MarkFileAsDeployableTask extends AbstractSWTTask { + + private WorkspaceFile workspaceFile; + + public MarkFileAsDeployableTask(WorkspaceFile file) { + this.workspaceFile = file; + } + + @Override + public void perform() { + performInnerTask(new FileContextMenuSelectingTask(workspaceFile, "Mark as Deployable")); + } +} Added: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/workspace/FileContextMenuSelectingTask.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/workspace/FileContextMenuSelectingTask.java (rev 0) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/workspace/FileContextMenuSelectingTask.java 2011-12-01 09:28:49 UTC (rev 36825) @@ -0,0 +1,50 @@ +package org.jboss.tools.portlet.ui.bot.task.workspace; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import org.jboss.tools.portlet.ui.bot.entity.WorkspaceFile; +import org.jboss.tools.portlet.ui.bot.task.AbstractSWTTask; +import org.jboss.tools.ui.bot.ext.SWTBotFactory; +import org.jboss.tools.ui.bot.ext.SWTEclipseExt; +import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper; +import org.jboss.tools.ui.bot.ext.view.PackageExplorer; + +/** + * Invokes specified right-click menu on the given file. + * + * @author Lucia Jelinkova + * + */ +public class FileContextMenuSelectingTask extends AbstractSWTTask { + + private WorkspaceFile file; + + private String menuItem; + + public FileContextMenuSelectingTask(WorkspaceFile file, String menuItem) { + super(); + this.file = file; + this.menuItem = menuItem; + } + + @Override + public void perform() { + PackageExplorer explorer = SWTBotFactory.getPackageexplorer(); + explorer.show(); + SWTEclipseExt.getTreeItemOnPath(explorer.bot(), explorer.bot().tree(), 0, file.getFileName(), getFilePath()).select(); + ContextMenuHelper.clickContextMenu(SWTBotFactory.getPackageexplorer().bot().tree(), menuItem); + } + + /** + * Adds the project to the path and removes file name. + * @return + */ + private String[] getFilePath() { + List<String> path = new ArrayList<String>(Arrays.asList(file.getFilePathAsArray())); + path.add(0, file.getProject()); + path.remove(path.size() - 1); + return path.toArray(new String[path.size()]); + } +} Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/RunSeamPortletOnServer.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/RunSeamPortletOnServer.java 2011-12-01 09:28:40 UTC (rev 36824) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/RunSeamPortletOnServer.java 2011-12-01 09:28:49 UTC (rev 36825) @@ -1,7 +1,10 @@ package org.jboss.tools.portlet.ui.bot.test.seam; +import static org.jboss.tools.portlet.ui.bot.entity.EntityFactory.file; import static org.jboss.tools.portlet.ui.bot.test.seam.CreateSeamPortletProject.PROJECT_NAME; +import org.jboss.tools.portlet.ui.bot.entity.WorkspaceFile; +import org.jboss.tools.portlet.ui.bot.task.server.MarkFileAsDeployableTask; import org.jboss.tools.portlet.ui.bot.test.template.RunPortletOnServerTemplate; /** @@ -13,8 +16,16 @@ */ public class RunSeamPortletOnServer extends RunPortletOnServerTemplate { + private static final WorkspaceFile DATASOURCE_FILE = file(PROJECT_NAME, "resources/" + PROJECT_NAME + "-ds.xml"); + @Override protected String getProjectName() { return PROJECT_NAME; } + + @Override + public void testRunOnServer() { + doPerform(new MarkFileAsDeployableTask(DATASOURCE_FILE)); + super.testRunOnServer(); + } }