Author: ljelinko Date: 2011-11-24 03:30:57 -0500 (Thu, 24 Nov 2011) New Revision: 36595 Added: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/AbstractSWTMatcher.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/SWTMatcher.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/console/ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/factory/ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/problems/ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/workspace/ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/workspace/ExistingProjectMatcher.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/workspace/ProjectFacetsMatcher.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/workspace/file/ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/workspace/file/ExistingFileMatcher.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/workspace/file/xml/ Removed: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/AbstractSWTMatcher.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/SWTMatcher.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/console/ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/factory/ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/problems/ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/workspace/ExistingProjectMatcher.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/workspace/ProjectFacetsMatcher.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/workspace/file/ Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/console/ConsoleOutputMatcher.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/factory/DefaultMatchersFactory.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/factory/WorkspaceMatchersFactory.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/problems/NumberOfErrorsMatcher.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/workspace/file/xml/XMLFileNodeContentMatcher.java 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/RunJavaPortletOnServer.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreatePortletProjectTemplate.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/testcase/SWTTaskBasedTestCase.java Log: changed the package of matchers Copied: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/AbstractSWTMatcher.java (from rev 36592, trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/AbstractSWTMatcher.java) =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/AbstractSWTMatcher.java (rev 0) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/AbstractSWTMatcher.java 2011-11-24 08:30:57 UTC (rev 36595) @@ -0,0 +1,33 @@ +package org.jboss.tools.portlet.ui.bot.matcher; + +import org.eclipse.swtbot.swt.finder.SWTBot; +import org.hamcrest.TypeSafeMatcher; +import org.jboss.tools.portlet.ui.bot.task.SWTBotAware; +import org.jboss.tools.portlet.ui.bot.task.SWTTask; + +/** + * Common ancestor of all SWT based matchers. + * + * @author Lucia Jelinkova + * + * @param <T> + */ +public abstract class AbstractSWTMatcher<T> extends TypeSafeMatcher<T> implements SWTMatcher<T>, SWTBotAware { + + private SWTBot bot; + + protected void performInnerTask(SWTTask task){ + if (task instanceof SWTBotAware){ + ((SWTBotAware) task).setBot(getBot()); + } + task.perform(); + } + + public SWTBot getBot() { + return bot; + } + + public void setBot(SWTBot bot) { + this.bot = bot; + } +} Copied: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/SWTMatcher.java (from rev 36504, trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/SWTMatcher.java) =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/SWTMatcher.java (rev 0) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/SWTMatcher.java 2011-11-24 08:30:57 UTC (rev 36595) @@ -0,0 +1,14 @@ +package org.jboss.tools.portlet.ui.bot.matcher; + +import org.hamcrest.Matcher; + +/** + * Matcher for SWT based tests. + * + * @author Lucia Jelinkova + * + * @param <T> + */ +public interface SWTMatcher<T> extends Matcher<T> { + +} Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/console/ConsoleOutputMatcher.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/console/ConsoleOutputMatcher.java 2011-11-22 16:44:21 UTC (rev 36537) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/console/ConsoleOutputMatcher.java 2011-11-24 08:30:57 UTC (rev 36595) @@ -1,7 +1,7 @@ -package org.jboss.tools.portlet.ui.bot.test.matcher.console; +package org.jboss.tools.portlet.ui.bot.matcher.console; import org.hamcrest.Description; -import org.jboss.tools.portlet.ui.bot.test.matcher.AbstractSWTMatcher; +import org.jboss.tools.portlet.ui.bot.matcher.AbstractSWTMatcher; import org.jboss.tools.ui.bot.ext.SWTBotFactory; /** Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/factory/DefaultMatchersFactory.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/factory/DefaultMatchersFactory.java 2011-11-24 08:22:38 UTC (rev 36593) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/factory/DefaultMatchersFactory.java 2011-11-24 08:30:57 UTC (rev 36595) @@ -1,8 +1,8 @@ -package org.jboss.tools.portlet.ui.bot.test.matcher.factory; +package org.jboss.tools.portlet.ui.bot.matcher.factory; -import org.jboss.tools.portlet.ui.bot.test.matcher.SWTMatcher; -import org.jboss.tools.portlet.ui.bot.test.matcher.console.ConsoleOutputMatcher; -import org.jboss.tools.portlet.ui.bot.test.matcher.problems.NumberOfErrorsMatcher; +import org.jboss.tools.portlet.ui.bot.matcher.SWTMatcher; +import org.jboss.tools.portlet.ui.bot.matcher.console.ConsoleOutputMatcher; +import org.jboss.tools.portlet.ui.bot.matcher.problems.NumberOfErrorsMatcher; /** * Factory of matchers for Problems View. Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/factory/WorkspaceMatchersFactory.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/factory/WorkspaceMatchersFactory.java 2011-11-24 08:22:38 UTC (rev 36593) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/factory/WorkspaceMatchersFactory.java 2011-11-24 08:30:57 UTC (rev 36595) @@ -1,16 +1,16 @@ -package org.jboss.tools.portlet.ui.bot.test.matcher.factory; +package org.jboss.tools.portlet.ui.bot.matcher.factory; import java.util.Arrays; import java.util.List; +import org.jboss.tools.portlet.ui.bot.matcher.SWTMatcher; +import org.jboss.tools.portlet.ui.bot.matcher.workspace.ExistingProjectMatcher; +import org.jboss.tools.portlet.ui.bot.matcher.workspace.ProjectFacetsMatcher; +import org.jboss.tools.portlet.ui.bot.matcher.workspace.file.ExistingFileMatcher; +import org.jboss.tools.portlet.ui.bot.matcher.workspace.file.xml.XMLFileNodeContentMatcher; import org.jboss.tools.portlet.ui.bot.test.entity.FacetDefinition; import org.jboss.tools.portlet.ui.bot.test.entity.WorkspaceFile; import org.jboss.tools.portlet.ui.bot.test.entity.XMLNode; -import org.jboss.tools.portlet.ui.bot.test.matcher.SWTMatcher; -import org.jboss.tools.portlet.ui.bot.test.matcher.workspace.ExistingProjectMatcher; -import org.jboss.tools.portlet.ui.bot.test.matcher.workspace.ProjectFacetsMatcher; -import org.jboss.tools.portlet.ui.bot.test.matcher.workspace.file.ExistingFileMatcher; -import org.jboss.tools.portlet.ui.bot.test.matcher.workspace.file.xml.XMLFileNodeContentMatcher; /** * Factory for workspace specific matchers (projects, files..) Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/problems/NumberOfErrorsMatcher.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/problems/NumberOfErrorsMatcher.java 2011-11-24 08:22:38 UTC (rev 36593) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/problems/NumberOfErrorsMatcher.java 2011-11-24 08:30:57 UTC (rev 36595) @@ -1,8 +1,8 @@ -package org.jboss.tools.portlet.ui.bot.test.matcher.problems; +package org.jboss.tools.portlet.ui.bot.matcher.problems; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; import org.hamcrest.Description; -import org.jboss.tools.portlet.ui.bot.test.matcher.AbstractSWTMatcher; +import org.jboss.tools.portlet.ui.bot.matcher.AbstractSWTMatcher; import org.jboss.tools.ui.bot.ext.SWTBotFactory; import org.jboss.tools.ui.bot.ext.gen.ActionItem; import org.jboss.tools.ui.bot.ext.view.ProblemsView; Copied: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/workspace/ExistingProjectMatcher.java (from rev 36504, trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/workspace/ExistingProjectMatcher.java) =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/workspace/ExistingProjectMatcher.java (rev 0) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/workspace/ExistingProjectMatcher.java 2011-11-24 08:30:57 UTC (rev 36595) @@ -0,0 +1,28 @@ +package org.jboss.tools.portlet.ui.bot.matcher.workspace; + +import org.hamcrest.Description; +import org.jboss.tools.portlet.ui.bot.matcher.AbstractSWTMatcher; +import org.jboss.tools.ui.bot.ext.SWTBotFactory; +import org.jboss.tools.ui.bot.ext.gen.ActionItem; + +/** + * Checks if the project exists in the workspace. + * + * @author Lucia Jelinkova + * + */ +public class ExistingProjectMatcher extends AbstractSWTMatcher<String> { + + @Override + public boolean matchesSafely(String project) { + SWTBotFactory.getOpen().perspective(ActionItem.Perspective.JAVA.LABEL); + return SWTBotFactory.getEclipse().isProjectInPackageExplorer(project); + } + + @Override + public void describeTo(Description description) { + description.appendValue("existing project"); + } +} + + Copied: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/workspace/ProjectFacetsMatcher.java (from rev 36592, trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/workspace/ProjectFacetsMatcher.java) =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/workspace/ProjectFacetsMatcher.java (rev 0) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/workspace/ProjectFacetsMatcher.java 2011-11-24 08:30:57 UTC (rev 36595) @@ -0,0 +1,66 @@ +package org.jboss.tools.portlet.ui.bot.matcher.workspace; + +import java.util.Arrays; +import java.util.List; + +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; +import org.hamcrest.Description; +import org.jboss.tools.portlet.ui.bot.matcher.AbstractSWTMatcher; +import org.jboss.tools.portlet.ui.bot.task.dialog.ProjectPropertyDialogCloseTask; +import org.jboss.tools.portlet.ui.bot.task.dialog.ProjectPropertyDialogOpenTask; +import org.jboss.tools.portlet.ui.bot.task.facet.AbstractFacetTask; +import org.jboss.tools.portlet.ui.bot.test.entity.FacetDefinition; + +/** + * Checks if the project has the specified facets. + * + * @author Lucia Jelinkova + * + */ +public class ProjectFacetsMatcher extends AbstractSWTMatcher<String> { + + private List<FacetDefinition> facets; + + public ProjectFacetsMatcher(FacetDefinition... facets) { + this.facets = Arrays.asList(facets); + } + + @Override + public boolean matchesSafely(String project) { + showPropertyDialog(project); + boolean result = checkFacets(); + performInnerTask(new ProjectPropertyDialogCloseTask()); + return result; + } + + private void showPropertyDialog(String project) { + ProjectPropertyDialogOpenTask openTask = new ProjectPropertyDialogOpenTask(); + openTask.setProject(project); + openTask.setPropertyPage("Project Facets"); + performInnerTask(openTask); + } + + private boolean checkFacets() { + ValueCheckedTask task = new ValueCheckedTask(); + for (FacetDefinition facet : facets){ + task.addFacet(facet); + } + performInnerTask(task); + + return task.allChecked; + } + + @Override + public void describeTo(Description description) { + description.appendValue("file containing facet"); + } + + class ValueCheckedTask extends AbstractFacetTask { + private boolean allChecked = true; + + @Override + protected void processFacet(FacetDefinition facet, SWTBotTreeItem facetItem) { + allChecked = allChecked && facetItem.isChecked(); + } + } +} Copied: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/workspace/file/ExistingFileMatcher.java (from rev 36593, trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/workspace/file/ExistingFileMatcher.java) =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/workspace/file/ExistingFileMatcher.java (rev 0) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/workspace/file/ExistingFileMatcher.java 2011-11-24 08:30:57 UTC (rev 36595) @@ -0,0 +1,27 @@ +package org.jboss.tools.portlet.ui.bot.matcher.workspace.file; + +import org.hamcrest.Description; +import org.jboss.tools.portlet.ui.bot.matcher.AbstractSWTMatcher; +import org.jboss.tools.portlet.ui.bot.test.entity.WorkspaceFile; +import org.jboss.tools.ui.bot.ext.SWTBotFactory; +import org.jboss.tools.ui.bot.ext.gen.ActionItem; + +/** + * Checks if the file exists in the project. + * + * @author Lucia Jelinkova + * + */ +public class ExistingFileMatcher extends AbstractSWTMatcher<WorkspaceFile> { + + @Override + public boolean matchesSafely(WorkspaceFile file) { + SWTBotFactory.getOpen().perspective(ActionItem.Perspective.JAVA.LABEL); + return SWTBotFactory.getPackageexplorer().isFilePresent(file.getProject(), file.getFilePathAsArray()); + } + + @Override + public void describeTo(Description description) { + description.appendValue("existing file"); + } +} Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/workspace/file/xml/XMLFileNodeContentMatcher.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/workspace/file/xml/XMLFileNodeContentMatcher.java 2011-11-24 08:22:38 UTC (rev 36593) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/workspace/file/xml/XMLFileNodeContentMatcher.java 2011-11-24 08:30:57 UTC (rev 36595) @@ -1,4 +1,4 @@ -package org.jboss.tools.portlet.ui.bot.test.matcher.workspace.file.xml; +package org.jboss.tools.portlet.ui.bot.matcher.workspace.file.xml; import java.util.Arrays; import java.util.List; @@ -7,9 +7,9 @@ import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; import org.hamcrest.Description; +import org.jboss.tools.portlet.ui.bot.matcher.AbstractSWTMatcher; import org.jboss.tools.portlet.ui.bot.test.entity.WorkspaceFile; import org.jboss.tools.portlet.ui.bot.test.entity.XMLNode; -import org.jboss.tools.portlet.ui.bot.test.matcher.AbstractSWTMatcher; import org.jboss.tools.ui.bot.ext.SWTBotFactory; import org.jboss.tools.ui.bot.ext.SWTEclipseExt; import org.jboss.tools.ui.bot.ext.parts.SWTBotEditorExt; Modified: 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 2011-11-24 08:25:01 UTC (rev 36594) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/CreateJavaPortlet.java 2011-11-24 08:30:57 UTC (rev 36595) @@ -1,10 +1,10 @@ package org.jboss.tools.portlet.ui.bot.test.core; +import static org.jboss.tools.portlet.ui.bot.matcher.factory.DefaultMatchersFactory.isNumberOfErrors; +import static org.jboss.tools.portlet.ui.bot.matcher.factory.WorkspaceMatchersFactory.containsNodes; +import static org.jboss.tools.portlet.ui.bot.matcher.factory.WorkspaceMatchersFactory.exists; import static org.jboss.tools.portlet.ui.bot.test.core.CreateJavaPortletProject.PROJECT_NAME; import static org.jboss.tools.portlet.ui.bot.test.entity.EntityFactory.file; -import static org.jboss.tools.portlet.ui.bot.test.matcher.factory.DefaultMatchersFactory.isNumberOfErrors; -import static org.jboss.tools.portlet.ui.bot.test.matcher.factory.WorkspaceMatchersFactory.containsNodes; -import static org.jboss.tools.portlet.ui.bot.test.matcher.factory.WorkspaceMatchersFactory.exists; import org.jboss.tools.portlet.ui.bot.task.SWTTask; import org.jboss.tools.portlet.ui.bot.task.wizard.web.jboss.PortletCreationTask; Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/RunJavaPortletOnServer.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/RunJavaPortletOnServer.java 2011-11-24 08:25:01 UTC (rev 36594) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/RunJavaPortletOnServer.java 2011-11-24 08:30:57 UTC (rev 36595) @@ -1,9 +1,9 @@ package org.jboss.tools.portlet.ui.bot.test.core; import static org.hamcrest.MatcherAssert.assertThat; +import static org.jboss.tools.portlet.ui.bot.matcher.factory.DefaultMatchersFactory.inConsoleOutput; import static org.jboss.tools.portlet.ui.bot.test.core.CreateJavaPortletProject.PROJECT_NAME; import static org.hamcrest.Matchers.not; -import static org.jboss.tools.portlet.ui.bot.test.matcher.factory.DefaultMatchersFactory.inConsoleOutput; import org.jboss.tools.portlet.ui.bot.task.console.ConsoleClearingTask; import org.jboss.tools.portlet.ui.bot.task.server.RunninngProjectOnServerTask; Deleted: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/AbstractSWTMatcher.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/AbstractSWTMatcher.java 2011-11-24 08:25:01 UTC (rev 36594) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/AbstractSWTMatcher.java 2011-11-24 08:30:57 UTC (rev 36595) @@ -1,33 +0,0 @@ -package org.jboss.tools.portlet.ui.bot.test.matcher; - -import org.eclipse.swtbot.swt.finder.SWTBot; -import org.hamcrest.TypeSafeMatcher; -import org.jboss.tools.portlet.ui.bot.task.SWTBotAware; -import org.jboss.tools.portlet.ui.bot.task.SWTTask; - -/** - * Common ancestor of all SWT based matchers. - * - * @author Lucia Jelinkova - * - * @param <T> - */ -public abstract class AbstractSWTMatcher<T> extends TypeSafeMatcher<T> implements SWTMatcher<T>, SWTBotAware { - - private SWTBot bot; - - protected void performInnerTask(SWTTask task){ - if (task instanceof SWTBotAware){ - ((SWTBotAware) task).setBot(getBot()); - } - task.perform(); - } - - public SWTBot getBot() { - return bot; - } - - public void setBot(SWTBot bot) { - this.bot = bot; - } -} Deleted: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/SWTMatcher.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/SWTMatcher.java 2011-11-24 08:25:01 UTC (rev 36594) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/SWTMatcher.java 2011-11-24 08:30:57 UTC (rev 36595) @@ -1,14 +0,0 @@ -package org.jboss.tools.portlet.ui.bot.test.matcher; - -import org.hamcrest.Matcher; - -/** - * Matcher for SWT based tests. - * - * @author Lucia Jelinkova - * - * @param <T> - */ -public interface SWTMatcher<T> extends Matcher<T> { - -} Deleted: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/workspace/ExistingProjectMatcher.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/workspace/ExistingProjectMatcher.java 2011-11-24 08:25:01 UTC (rev 36594) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/workspace/ExistingProjectMatcher.java 2011-11-24 08:30:57 UTC (rev 36595) @@ -1,28 +0,0 @@ -package org.jboss.tools.portlet.ui.bot.test.matcher.workspace; - -import org.hamcrest.Description; -import org.jboss.tools.portlet.ui.bot.test.matcher.AbstractSWTMatcher; -import org.jboss.tools.ui.bot.ext.SWTBotFactory; -import org.jboss.tools.ui.bot.ext.gen.ActionItem; - -/** - * Checks if the project exists in the workspace. - * - * @author Lucia Jelinkova - * - */ -public class ExistingProjectMatcher extends AbstractSWTMatcher<String> { - - @Override - public boolean matchesSafely(String project) { - SWTBotFactory.getOpen().perspective(ActionItem.Perspective.JAVA.LABEL); - return SWTBotFactory.getEclipse().isProjectInPackageExplorer(project); - } - - @Override - public void describeTo(Description description) { - description.appendValue("existing project"); - } -} - - Deleted: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/workspace/ProjectFacetsMatcher.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/workspace/ProjectFacetsMatcher.java 2011-11-24 08:25:01 UTC (rev 36594) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/workspace/ProjectFacetsMatcher.java 2011-11-24 08:30:57 UTC (rev 36595) @@ -1,66 +0,0 @@ -package org.jboss.tools.portlet.ui.bot.test.matcher.workspace; - -import java.util.Arrays; -import java.util.List; - -import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; -import org.hamcrest.Description; -import org.jboss.tools.portlet.ui.bot.task.dialog.ProjectPropertyDialogCloseTask; -import org.jboss.tools.portlet.ui.bot.task.dialog.ProjectPropertyDialogOpenTask; -import org.jboss.tools.portlet.ui.bot.task.facet.AbstractFacetTask; -import org.jboss.tools.portlet.ui.bot.test.entity.FacetDefinition; -import org.jboss.tools.portlet.ui.bot.test.matcher.AbstractSWTMatcher; - -/** - * Checks if the project has the specified facets. - * - * @author Lucia Jelinkova - * - */ -public class ProjectFacetsMatcher extends AbstractSWTMatcher<String> { - - private List<FacetDefinition> facets; - - public ProjectFacetsMatcher(FacetDefinition... facets) { - this.facets = Arrays.asList(facets); - } - - @Override - public boolean matchesSafely(String project) { - showPropertyDialog(project); - boolean result = checkFacets(); - performInnerTask(new ProjectPropertyDialogCloseTask()); - return result; - } - - private void showPropertyDialog(String project) { - ProjectPropertyDialogOpenTask openTask = new ProjectPropertyDialogOpenTask(); - openTask.setProject(project); - openTask.setPropertyPage("Project Facets"); - performInnerTask(openTask); - } - - private boolean checkFacets() { - ValueCheckedTask task = new ValueCheckedTask(); - for (FacetDefinition facet : facets){ - task.addFacet(facet); - } - performInnerTask(task); - - return task.allChecked; - } - - @Override - public void describeTo(Description description) { - description.appendValue("file containing facet"); - } - - class ValueCheckedTask extends AbstractFacetTask { - private boolean allChecked = true; - - @Override - protected void processFacet(FacetDefinition facet, SWTBotTreeItem facetItem) { - allChecked = allChecked && facetItem.isChecked(); - } - } -} Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreatePortletProjectTemplate.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreatePortletProjectTemplate.java 2011-11-24 08:25:01 UTC (rev 36594) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreatePortletProjectTemplate.java 2011-11-24 08:30:57 UTC (rev 36595) @@ -1,10 +1,10 @@ package org.jboss.tools.portlet.ui.bot.test.template; +import static org.jboss.tools.portlet.ui.bot.matcher.factory.DefaultMatchersFactory.isNumberOfErrors; +import static org.jboss.tools.portlet.ui.bot.matcher.factory.WorkspaceMatchersFactory.exists; +import static org.jboss.tools.portlet.ui.bot.matcher.factory.WorkspaceMatchersFactory.hasFacets; +import static org.jboss.tools.portlet.ui.bot.matcher.factory.WorkspaceMatchersFactory.isExistingProject; import static org.jboss.tools.portlet.ui.bot.test.entity.EntityFactory.file; -import static org.jboss.tools.portlet.ui.bot.test.matcher.factory.DefaultMatchersFactory.isNumberOfErrors; -import static org.jboss.tools.portlet.ui.bot.test.matcher.factory.WorkspaceMatchersFactory.exists; -import static org.jboss.tools.portlet.ui.bot.test.matcher.factory.WorkspaceMatchersFactory.hasFacets; -import static org.jboss.tools.portlet.ui.bot.test.matcher.factory.WorkspaceMatchersFactory.isExistingProject; import java.util.List; Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/testcase/SWTTaskBasedTestCase.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/testcase/SWTTaskBasedTestCase.java 2011-11-24 08:25:01 UTC (rev 36594) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/testcase/SWTTaskBasedTestCase.java 2011-11-24 08:30:57 UTC (rev 36595) @@ -2,9 +2,9 @@ import static org.junit.Assert.assertThat; +import org.jboss.tools.portlet.ui.bot.matcher.SWTMatcher; import org.jboss.tools.portlet.ui.bot.task.SWTBotAware; import org.jboss.tools.portlet.ui.bot.task.SWTTask; -import org.jboss.tools.portlet.ui.bot.test.matcher.SWTMatcher; import org.jboss.tools.ui.bot.ext.SWTTestExt; /**