Author: ljelinko Date: 2011-11-29 09:13:23 -0500 (Tue, 29 Nov 2011) New Revision: 36729 Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/CreateJavaPortletProject.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/CreateJSFPortletProject.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/CreateSeamPortletProject.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreatePortletProjectTemplate.java Log: added check for non existing files Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/CreateJavaPortletProject.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/CreateJavaPortletProject.java 2011-11-29 14:11:20 UTC (rev 36728) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/CreateJavaPortletProject.java 2011-11-29 14:13:23 UTC (rev 36729) @@ -46,4 +46,9 @@ public List<String> getExpectedFiles() { return Arrays.asList(WEB_XML, PORTLET_XML, PORTLET_LIBRARIES); } + + @Override + public List<String> getNonExpectedFiles() { + return Arrays.asList(FACES_CONFIG_XML, WEB_APP_LIBRARIES, PAGES_XML, COMPONENTS_XML, JBOSS_WEB_XML); + } } Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/CreateJSFPortletProject.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/CreateJSFPortletProject.java 2011-11-29 14:11:20 UTC (rev 36728) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/CreateJSFPortletProject.java 2011-11-29 14:13:23 UTC (rev 36729) @@ -52,4 +52,9 @@ public List<String> getExpectedFiles() { return Arrays.asList(WEB_XML, PORTLET_XML, PORTLET_LIBRARIES, FACES_CONFIG_XML, WEB_APP_LIBRARIES); } + + @Override + public List<String> getNonExpectedFiles() { + return Arrays.asList(PAGES_XML, COMPONENTS_XML, JBOSS_WEB_XML); + } } Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/CreateSeamPortletProject.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/CreateSeamPortletProject.java 2011-11-29 14:11:20 UTC (rev 36728) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/CreateSeamPortletProject.java 2011-11-29 14:13:23 UTC (rev 36729) @@ -2,6 +2,7 @@ import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.List; import org.jboss.tools.portlet.ui.bot.entity.FacetDefinition; @@ -79,4 +80,9 @@ COMPONENTS_XML, JBOSS_WEB_XML); } + + @Override + public List<String> getNonExpectedFiles() { + return Collections.emptyList(); + } } 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-29 14:11:20 UTC (rev 36728) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreatePortletProjectTemplate.java 2011-11-29 14:13:23 UTC (rev 36729) @@ -1,5 +1,6 @@ package org.jboss.tools.portlet.ui.bot.test.template; +import static org.hamcrest.Matchers.not; import static org.jboss.tools.portlet.ui.bot.matcher.factory.DefaultMatchersFactory.isNumberOfErrors; import static org.jboss.tools.portlet.ui.bot.matcher.factory.WorkspaceMatchersFactory.exist; import static org.jboss.tools.portlet.ui.bot.matcher.factory.WorkspaceMatchersFactory.hasFacets; @@ -16,9 +17,7 @@ import org.jboss.tools.portlet.ui.bot.task.wizard.web.DynamicWebProjectCreationTask; import org.jboss.tools.portlet.ui.bot.test.testcase.SWTTaskBasedTestCase; import org.jboss.tools.ui.bot.ext.SWTTestExt; -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; @@ -73,6 +72,8 @@ public abstract List<WizardPageFillingTask> getAdditionalWizardPages(); public abstract List<String> getExpectedFiles(); + + public abstract List<String> getNonExpectedFiles(); @Test public void testcreate(){ @@ -82,6 +83,9 @@ doAssertThat(getProjectName(), isExistingProject()); doAssertThat(getProjectName(), hasFacets(getRequiredFacets())); doAssertThat(getExpectedWorkspaceFiles(), exist()); + if (getNonExpectedFiles().size() > 0){ + doAssertThat(getNonExpectedWorkspaceFiles(), not(exist())); + } } protected AbstractSWTTask getCreateDynamicWebProjectTask() { @@ -101,12 +105,20 @@ } private List<WorkspaceFile> getExpectedWorkspaceFiles(){ - List<WorkspaceFile> expectedWorkspaceFiles = new ArrayList<WorkspaceFile>(); + return wrap(getExpectedFiles()); + } + + private List<WorkspaceFile> getNonExpectedWorkspaceFiles(){ + return wrap(getNonExpectedFiles()); + } + + private List<WorkspaceFile> wrap(List<String> files){ + List<WorkspaceFile> workspaceFiles = new ArrayList<WorkspaceFile>(); - for (String file : getExpectedFiles()){ - expectedWorkspaceFiles.add(new WorkspaceFile(getProjectName(), file)); + for (String file : files){ + workspaceFiles.add(new WorkspaceFile(getProjectName(), file)); } - return expectedWorkspaceFiles; + return workspaceFiles; } }