[jbosstools-commits] JBoss Tools SVN: r37165 - trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template.
Author: ljelinko
Date: 2011-12-09 10:08:50 -0500 (Fri, 09 Dec 2011)
New Revision: 37165
Modified:
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreatePortletTemplate.java
Log:
added check for number of expected non existing files
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-09
15:07:56 UTC (rev 37164)
+++
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreatePortletTemplate.java 2011-12-09
15:08:50 UTC (rev 37165)
@@ -23,19 +23,19 @@
*
*/
public abstract class CreatePortletTemplate extends SWTTaskBasedTestCase {
-
+
protected static final String WEB_INF = "WebContent/WEB-INF/";
-
+
protected static final String DEFAULT_OBJECTS_XML = WEB_INF +
"default-object.xml";
-
+
protected static final String PORTLET_INSTANCES_XML = WEB_INF +
"portlet-instances.xml";
-
+
protected static final String JBOSS_APP_XML = WEB_INF + "jboss-app.xml";
-
+
protected static final String JBOSS_PORTLET_XML = WEB_INF +
"jboss-portlet.xml";
protected static final String JSF_FOLDER = "WebContent/jsf/";
-
+
protected abstract String getProjectName();
protected abstract AbstractPortletCreationTask getCreatePortletTask();
@@ -52,7 +52,9 @@
doAssertThat(0, isNumberOfErrors());
doAssertThat(getExpectedWorkspaceFiles(), exist());
- doAssertThat(getNonExpectedWorkspaceFiles(), not(exist()));
+ if (getNonExpectedWorkspaceFiles().size() > 0){
+ doAssertThat(getNonExpectedWorkspaceFiles(), not(exist()));
+ }
doAssertThat(file(getProjectName(), WEB_INF + "portlet.xml"),
containsNodes(getExpectedXMLNodes()));
}