Author: ljelinko Date: 2011-12-20 05:27:02 -0500 (Tue, 20 Dec 2011) New Revision: 37457 Added: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/JavaPerspectiveAbstractSWTMatcher.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/WorkspaceAssert.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/console/ExceptionInConsoleOutputMatcher.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/perspective/ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/perspective/OpenJavaPerspectiveTask.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/perspective/OpenPerspectiveTask.java 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/problems/NumberOfErrorsMatcher.java 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/ExistingFileMatcher.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/workspace/file/ExistingFilesMatcher.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/example/SeamPortletExample.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/template/CreatePortletTemplate.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/RunPortletOnServerTemplate.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/testcase/SWTTaskBasedTestCase.java Log: Matchers refactoring Added: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/JavaPerspectiveAbstractSWTMatcher.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/JavaPerspectiveAbstractSWTMatcher.java (rev 0) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/JavaPerspectiveAbstractSWTMatcher.java 2011-12-20 10:27:02 UTC (rev 37457) @@ -0,0 +1,21 @@ +package org.jboss.tools.portlet.ui.bot.matcher; + +import org.jboss.tools.portlet.ui.bot.matcher.perspective.OpenJavaPerspectiveTask; + +/** + * Matcher that operates in Java Perspective. + * + * @author Lucia Jelinkova + * + * @param <T> + */ +public abstract class JavaPerspectiveAbstractSWTMatcher<T> extends AbstractSWTMatcher<T> { + + protected abstract boolean matchesSafelyInJavaPerspective(T item); + + @Override + public final boolean matchesSafely(T item) { + performInnerTask(new OpenJavaPerspectiveTask()); + return matchesSafelyInJavaPerspective(item); + } +} Added: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/WorkspaceAssert.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/WorkspaceAssert.java (rev 0) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/WorkspaceAssert.java 2011-12-20 10:27:02 UTC (rev 37457) @@ -0,0 +1,49 @@ +package org.jboss.tools.portlet.ui.bot.matcher; + +import org.hamcrest.Description; +import org.hamcrest.Matcher; +import org.hamcrest.MatcherAssert; +import org.hamcrest.StringDescription; + +/** + * Custom implementation of {@link MatcherAssert} that allows to customize the error message. + * + * @author Lucia Jelinkova + * + */ +public class WorkspaceAssert { + + public static void assertThatInWorkspace(Matcher<Void> matcher) { + assertThatInWorkspace("", matcher); + } + + public static void assertThatInWorkspace(String reason, Matcher<Void> matcher) { + if (!matcher.matches(null)) { + Description description = new StringDescription(); + description.appendText(reason) + .appendText("\nExpected that ") + .appendDescriptionOf(matcher) + .appendText("\n"); + + throw new java.lang.AssertionError(description.toString()); + } + } + + public static <T> void assertThatInWorkspace(T actual, Matcher<T> matcher) { + assertThatInWorkspace("", actual, matcher); + } + + public static <T> void assertThatInWorkspace(String reason, T actual, Matcher<T> matcher) { + if (!matcher.matches(actual)) { + Description description = new StringDescription(); + description.appendText(reason) + .appendText("\nExpected that ") + .appendValue(actual) + .appendText(" ") + .appendDescriptionOf(matcher) + .appendText("\n"); + + throw new java.lang.AssertionError(description.toString()); + } + } +} 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/console/ConsoleOutputMatcher.java 2011-12-20 10:25:23 UTC (rev 37456) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/console/ConsoleOutputMatcher.java 2011-12-20 10:27:02 UTC (rev 37457) @@ -25,6 +25,6 @@ @Override public void describeTo(Description description) { - description.appendText("console contains specified text [" + consoleText + "]"); + description.appendText("is in console output, but instead: \n" + consoleText); } } Added: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/console/ExceptionInConsoleOutputMatcher.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/console/ExceptionInConsoleOutputMatcher.java (rev 0) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/console/ExceptionInConsoleOutputMatcher.java 2011-12-20 10:27:02 UTC (rev 37457) @@ -0,0 +1,33 @@ +package org.jboss.tools.portlet.ui.bot.matcher.console; + +import static org.jboss.tools.portlet.ui.bot.matcher.factory.DefaultMatchersFactory.inConsoleOutput; + +import org.hamcrest.Description; +import org.jboss.tools.portlet.ui.bot.matcher.AbstractSWTMatcher; +import org.jboss.tools.portlet.ui.bot.matcher.SWTMatcher; + +/** + * Matcher for the current state of workspace - that there is an exception in console output. + * + * @author Lucia Jelinkova + * + */ +public class ExceptionInConsoleOutputMatcher extends AbstractSWTMatcher<Void> { + + private SWTMatcher<String> consoleOutputMatcher; + + public ExceptionInConsoleOutputMatcher() { + super(); + consoleOutputMatcher = inConsoleOutput(); + } + + @Override + public boolean matchesSafely(Void item) { + return consoleOutputMatcher.matches("Exception:"); + } + + @Override + public void describeTo(Description description) { + description.appendText("exception is in console output"); + } +} 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/matcher/factory/DefaultMatchersFactory.java 2011-12-20 10:25:23 UTC (rev 37456) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/factory/DefaultMatchersFactory.java 2011-12-20 10:27:02 UTC (rev 37457) @@ -2,6 +2,7 @@ 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.console.ExceptionInConsoleOutputMatcher; import org.jboss.tools.portlet.ui.bot.matcher.problems.NumberOfErrorsMatcher; /** @@ -23,4 +24,8 @@ public static SWTMatcher<String> inConsoleOutput(){ return new ConsoleOutputMatcher(); } + + public static SWTMatcher<Void> exceptionInConsoleOutput(){ + return new ExceptionInConsoleOutputMatcher(); + } } Added: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/perspective/OpenJavaPerspectiveTask.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/perspective/OpenJavaPerspectiveTask.java (rev 0) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/perspective/OpenJavaPerspectiveTask.java 2011-12-20 10:27:02 UTC (rev 37457) @@ -0,0 +1,17 @@ +package org.jboss.tools.portlet.ui.bot.matcher.perspective; + +import org.jboss.tools.ui.bot.ext.gen.ActionItem; + + +/** + * Opens Java perspective. + * + * @author Lucia Jelinkova + * + */ +public class OpenJavaPerspectiveTask extends OpenPerspectiveTask { + + public OpenJavaPerspectiveTask() { + super(ActionItem.Perspective.JAVA.LABEL); + } +} Added: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/perspective/OpenPerspectiveTask.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/perspective/OpenPerspectiveTask.java (rev 0) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/perspective/OpenPerspectiveTask.java 2011-12-20 10:27:02 UTC (rev 37457) @@ -0,0 +1,26 @@ +package org.jboss.tools.portlet.ui.bot.matcher.perspective; + +import org.jboss.tools.portlet.ui.bot.task.AbstractSWTTask; +import org.jboss.tools.ui.bot.ext.SWTBotFactory; +import org.jboss.tools.ui.bot.ext.gen.IPerspective; + +/** + * Opens the given perspective. + * + * @author Lucia Jelinkova + * + */ +public class OpenPerspectiveTask extends AbstractSWTTask { + + private IPerspective perspective; + + public OpenPerspectiveTask(IPerspective name) { + super(); + this.perspective = name; + } + + @Override + public void perform() { + SWTBotFactory.getOpen().perspective(perspective); + } +} 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/matcher/problems/NumberOfErrorsMatcher.java 2011-12-20 10:25:23 UTC (rev 37456) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/problems/NumberOfErrorsMatcher.java 2011-12-20 10:27:02 UTC (rev 37457) @@ -2,9 +2,9 @@ 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.matcher.JavaPerspectiveAbstractSWTMatcher; +import org.jboss.tools.portlet.ui.bot.matcher.perspective.OpenJavaPerspectiveTask; 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; /** @@ -13,15 +13,12 @@ * @author Lucia Jelinkova * */ -public class NumberOfErrorsMatcher extends AbstractSWTMatcher<Integer> { +public class NumberOfErrorsMatcher extends JavaPerspectiveAbstractSWTMatcher<Integer> { - private int expectedNumber; - private int numberOfErrors; @Override - public boolean matchesSafely(Integer expectedNumber) { - SWTBotFactory.getOpen().perspective(ActionItem.Perspective.JAVA.LABEL); + protected boolean matchesSafelyInJavaPerspective(Integer expectedNumber) { SWTBotTreeItem errorItem = ProblemsView.getErrorsNode(SWTBotFactory.getBot()); if (errorItem == null){ @@ -32,7 +29,6 @@ } } - this.expectedNumber = expectedNumber; this.numberOfErrors = errorItem.getNodes().size(); return expectedNumber.equals(numberOfErrors); @@ -40,8 +36,6 @@ @Override public void describeTo(final Description description) { - description.appendText("Different number of errors.\n"); - description.appendText("Number of expected errors: " + expectedNumber + "\n"); - description.appendText("Number of errors: " + numberOfErrors + "\n"); + description.appendText("is number of errors in workspace but there are " + numberOfErrors + " errors"); } } Modified: 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/ExistingProjectMatcher.java 2011-12-20 10:25:23 UTC (rev 37456) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/workspace/ExistingProjectMatcher.java 2011-12-20 10:27:02 UTC (rev 37457) @@ -1,9 +1,8 @@ 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.portlet.ui.bot.matcher.JavaPerspectiveAbstractSWTMatcher; 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. @@ -11,17 +10,17 @@ * @author Lucia Jelinkova * */ -public class ExistingProjectMatcher extends AbstractSWTMatcher<String> { +public class ExistingProjectMatcher extends JavaPerspectiveAbstractSWTMatcher<String> { + @Override - public boolean matchesSafely(String project) { - SWTBotFactory.getOpen().perspective(ActionItem.Perspective.JAVA.LABEL); + protected boolean matchesSafelyInJavaPerspective(String project) { return SWTBotFactory.getEclipse().isProjectInPackageExplorer(project); } @Override public void describeTo(Description description) { - description.appendValue("existing project"); + description.appendText("is an existing project"); } } Modified: 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/ProjectFacetsMatcher.java 2011-12-20 10:25:23 UTC (rev 37456) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/workspace/ProjectFacetsMatcher.java 2011-12-20 10:27:02 UTC (rev 37457) @@ -6,7 +6,7 @@ import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; import org.hamcrest.Description; import org.jboss.tools.portlet.ui.bot.entity.FacetDefinition; -import org.jboss.tools.portlet.ui.bot.matcher.AbstractSWTMatcher; +import org.jboss.tools.portlet.ui.bot.matcher.JavaPerspectiveAbstractSWTMatcher; 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; @@ -17,7 +17,7 @@ * @author Lucia Jelinkova * */ -public class ProjectFacetsMatcher extends AbstractSWTMatcher<String> { +public class ProjectFacetsMatcher extends JavaPerspectiveAbstractSWTMatcher<String> { private List<FacetDefinition> facets; @@ -26,7 +26,7 @@ } @Override - public boolean matchesSafely(String project) { + protected boolean matchesSafelyInJavaPerspective(String project) { showPropertyDialog(project); boolean result = checkFacets(); performInnerTask(new ProjectPropertyDialogCloseTask()); @@ -52,7 +52,8 @@ @Override public void describeTo(Description description) { - description.appendValue("file containing facet"); + description.appendText("contains facets "); + description.appendValue(facets); } class ValueCheckedTask extends AbstractFacetTask { Modified: 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/ExistingFileMatcher.java 2011-12-20 10:25:23 UTC (rev 37456) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/workspace/file/ExistingFileMatcher.java 2011-12-20 10:27:02 UTC (rev 37457) @@ -2,9 +2,8 @@ import org.hamcrest.Description; import org.jboss.tools.portlet.ui.bot.entity.WorkspaceFile; -import org.jboss.tools.portlet.ui.bot.matcher.AbstractSWTMatcher; +import org.jboss.tools.portlet.ui.bot.matcher.JavaPerspectiveAbstractSWTMatcher; 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. @@ -12,16 +11,15 @@ * @author Lucia Jelinkova * */ -public class ExistingFileMatcher extends AbstractSWTMatcher<WorkspaceFile> { +public class ExistingFileMatcher extends JavaPerspectiveAbstractSWTMatcher<WorkspaceFile> { @Override - public boolean matchesSafely(WorkspaceFile file) { - SWTBotFactory.getOpen().perspective(ActionItem.Perspective.JAVA.LABEL); + protected boolean matchesSafelyInJavaPerspective(WorkspaceFile file) { return SWTBotFactory.getPackageexplorer().isFilePresent(file.getProject(), file.getFilePathAsArray()); } @Override public void describeTo(Description description) { - description.appendValue("existing file"); + description.appendValue("is an existing file"); } } Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/workspace/file/ExistingFilesMatcher.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/workspace/file/ExistingFilesMatcher.java 2011-12-20 10:25:23 UTC (rev 37456) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/workspace/file/ExistingFilesMatcher.java 2011-12-20 10:27:02 UTC (rev 37457) @@ -5,11 +5,10 @@ import org.hamcrest.Description; import org.jboss.tools.portlet.ui.bot.entity.WorkspaceFile; -import org.jboss.tools.portlet.ui.bot.matcher.AbstractSWTMatcher; +import org.jboss.tools.portlet.ui.bot.matcher.JavaPerspectiveAbstractSWTMatcher; import org.jboss.tools.ui.bot.ext.SWTBotFactory; -import org.jboss.tools.ui.bot.ext.gen.ActionItem; -public class ExistingFilesMatcher extends AbstractSWTMatcher<List<WorkspaceFile>> { +public class ExistingFilesMatcher extends JavaPerspectiveAbstractSWTMatcher<List<WorkspaceFile>> { private List<WorkspaceFile> missingFiles; @@ -18,9 +17,7 @@ } @Override - public boolean matchesSafely(List<WorkspaceFile> files) { - SWTBotFactory.getOpen().perspective(ActionItem.Perspective.JAVA.LABEL); - + protected boolean matchesSafelyInJavaPerspective(List<WorkspaceFile> files) { for (WorkspaceFile file : files){ boolean isPresent = SWTBotFactory.getPackageexplorer().isFilePresent(file.getProject(), file.getFilePathAsArray()); @@ -34,6 +31,6 @@ @Override public void describeTo(Description description) { - description.appendText("existing files " + missingFiles); + description.appendText("are existing files, but the following files are missing: " + missingFiles); } } 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/matcher/workspace/file/xml/XMLFileNodeContentMatcher.java 2011-12-20 10:25:23 UTC (rev 37456) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/workspace/file/xml/XMLFileNodeContentMatcher.java 2011-12-20 10:27:02 UTC (rev 37457) @@ -9,7 +9,7 @@ import org.hamcrest.Description; import org.jboss.tools.portlet.ui.bot.entity.WorkspaceFile; import org.jboss.tools.portlet.ui.bot.entity.XMLNode; -import org.jboss.tools.portlet.ui.bot.matcher.AbstractSWTMatcher; +import org.jboss.tools.portlet.ui.bot.matcher.JavaPerspectiveAbstractSWTMatcher; 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; @@ -20,7 +20,7 @@ * @author Lucia Jelinkova * */ -public class XMLFileNodeContentMatcher extends AbstractSWTMatcher<WorkspaceFile> { +public class XMLFileNodeContentMatcher extends JavaPerspectiveAbstractSWTMatcher<WorkspaceFile> { private List<XMLNode> nodes; @@ -30,7 +30,7 @@ } @Override - public boolean matchesSafely(WorkspaceFile file) { + protected boolean matchesSafelyInJavaPerspective(WorkspaceFile file) { SWTBotFactory.getPackageexplorer().openFile(file.getProject(), file.getFilePathAsArray()); SWTBotEditorExt editor = SWTBotFactory.getBot().swtBotEditorExtByTitle(file.getFileName()); SWTBotTree tree = editor.bot().tree(); @@ -58,7 +58,7 @@ @Override public void describeTo(Description description) { - description.appendText("file containing nodes: " + nodes); + description.appendText("contains XML nodes: " + nodes); } } Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/SeamPortletExample.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/SeamPortletExample.java 2011-12-20 10:25:23 UTC (rev 37456) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/SeamPortletExample.java 2011-12-20 10:27:02 UTC (rev 37457) @@ -3,7 +3,6 @@ import static org.jboss.tools.portlet.ui.bot.entity.EntityFactory.file; 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.task.server.RunningFileOnServerTask; import org.jboss.tools.ui.bot.ext.config.Annotations.DB; import org.jboss.tools.ui.bot.ext.config.Annotations.Require; 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-12-20 10:25:23 UTC (rev 37456) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreatePortletProjectTemplate.java 2011-12-20 10:27:02 UTC (rev 37457) @@ -77,12 +77,12 @@ public void testcreate(){ doPerform(getCreateDynamicWebProjectTask()); - doAssertThat(0, isNumberOfErrors()); - doAssertThat(getProjectName(), isExistingProject()); - doAssertThat(getProjectName(), hasFacets(getRequiredFacets())); - doAssertThat(getExpectedWorkspaceFiles(), exist()); + doAssertThatInWorkspace(0, isNumberOfErrors()); + doAssertThatInWorkspace(getProjectName(), isExistingProject()); + doAssertThatInWorkspace(getProjectName(), hasFacets(getRequiredFacets())); + doAssertThatInWorkspace(getExpectedWorkspaceFiles(), exist()); if (getNonExpectedFiles().size() > 0){ - doAssertThat(getNonExpectedWorkspaceFiles(), not(exist())); + doAssertThatInWorkspace(getNonExpectedWorkspaceFiles(), not(exist())); } } Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreatePortletTemplate.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreatePortletTemplate.java 2011-12-20 10:25:23 UTC (rev 37456) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreatePortletTemplate.java 2011-12-20 10:27:02 UTC (rev 37457) @@ -50,12 +50,12 @@ public void testCreate(){ doPerform(getCreatePortletTask()); - doAssertThat(0, isNumberOfErrors()); - doAssertThat(getExpectedWorkspaceFiles(), exist()); + doAssertThatInWorkspace(0, isNumberOfErrors()); + doAssertThatInWorkspace(getExpectedWorkspaceFiles(), exist()); if (getNonExpectedWorkspaceFiles().size() > 0){ - doAssertThat(getNonExpectedWorkspaceFiles(), not(exist())); + doAssertThatInWorkspace(getNonExpectedWorkspaceFiles(), not(exist())); } - doAssertThat(file(getProjectName(), WEB_INF + "portlet.xml"), + doAssertThatInWorkspace(file(getProjectName(), WEB_INF + "portlet.xml"), containsNodes(getExpectedXMLNodes())); } Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/RunPortletOnServerTemplate.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/RunPortletOnServerTemplate.java 2011-12-20 10:25:23 UTC (rev 37456) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/RunPortletOnServerTemplate.java 2011-12-20 10:27:02 UTC (rev 37457) @@ -1,8 +1,7 @@ package org.jboss.tools.portlet.ui.bot.test.template; -import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.not; -import static org.jboss.tools.portlet.ui.bot.matcher.factory.DefaultMatchersFactory.inConsoleOutput; +import static org.jboss.tools.portlet.ui.bot.matcher.factory.DefaultMatchersFactory.exceptionInConsoleOutput; import org.jboss.tools.portlet.ui.bot.task.console.ConsoleClearingTask; import org.jboss.tools.portlet.ui.bot.task.server.RunninngProjectOnServerTask; @@ -30,6 +29,6 @@ doPerform(new ConsoleClearingTask()); doPerform(new RunninngProjectOnServerTask(getProjectName())); - assertThat("Exception:", not(inConsoleOutput())); + doAssertThatInWorkspace(not(exceptionInConsoleOutput())); } } 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-12-20 10:25:23 UTC (rev 37456) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/testcase/SWTTaskBasedTestCase.java 2011-12-20 10:27:02 UTC (rev 37457) @@ -1,6 +1,6 @@ package org.jboss.tools.portlet.ui.bot.test.testcase; -import static org.junit.Assert.assertThat; +import static org.jboss.tools.portlet.ui.bot.matcher.WorkspaceAssert.assertThatInWorkspace; import org.hamcrest.Matcher; import org.jboss.tools.portlet.ui.bot.matcher.SWTMatcher; @@ -23,11 +23,32 @@ task.perform(); } - protected <T> void doAssertThat(T actual, Matcher<T> matcher){ + protected void doAssertThatInWorkspace(Matcher<Void> matcher){ if (matcher instanceof SWTBotAware){ ((SWTBotAware) matcher).setBot(bot); } - assertThat(actual, matcher); + assertThatInWorkspace(matcher); } + protected void doAssertThatInWorkspace(String reason, Matcher<Void> matcher){ + if (matcher instanceof SWTBotAware){ + ((SWTBotAware) matcher).setBot(bot); + } + assertThatInWorkspace(reason, matcher); + } + + protected <T> void doAssertThatInWorkspace(T actual, Matcher<T> matcher){ + if (matcher instanceof SWTBotAware){ + ((SWTBotAware) matcher).setBot(bot); + } + assertThatInWorkspace(actual, matcher); + } + + protected <T> void doAssertThatInWorkspace(String description, T actual, Matcher<T> matcher){ + if (matcher instanceof SWTBotAware){ + ((SWTBotAware) matcher).setBot(bot); + } + assertThatInWorkspace(description, actual, matcher); + } + }