Author: akazakov Date: 2011-09-22 20:23:19 -0400 (Thu, 22 Sep 2011) New Revision: 34986 Modified: trunk/jst/plugins/org.jboss.tools.jst.web/META-INF/MANIFEST.MF trunk/jst/tests/org.jboss.tools.jst.web.test/META-INF/MANIFEST.MF trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/WebUtilTest.java Log: https://issues.jboss.org/browse/JBIDE-9766 WebUtils test Modified: trunk/jst/plugins/org.jboss.tools.jst.web/META-INF/MANIFEST.MF =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/META-INF/MANIFEST.MF 2011-09-23 00:00:32 UTC (rev 34985) +++ trunk/jst/plugins/org.jboss.tools.jst.web/META-INF/MANIFEST.MF 2011-09-23 00:23:19 UTC (rev 34986) @@ -22,7 +22,9 @@ org.eclipse.jst.jsp.core;bundle-version="1.2.400", org.eclipse.jst.j2ee.core;bundle-version="1.2.100", org.eclipse.wst.common.project.facet.core;bundle-version="1.4.200", - org.eclipse.wst.validation;bundle-version="1.2.300" + org.eclipse.wst.validation;bundle-version="1.2.300", + org.eclipse.jst.j2ee.ejb;bundle-version="1.1.502", + org.eclipse.jst.j2ee.web;bundle-version="1.1.500" Bundle-Version: 3.3.0.qualifier Export-Package: org.jboss.tools.jst.web, Modified: trunk/jst/tests/org.jboss.tools.jst.web.test/META-INF/MANIFEST.MF =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.test/META-INF/MANIFEST.MF 2011-09-23 00:00:32 UTC (rev 34985) +++ trunk/jst/tests/org.jboss.tools.jst.web.test/META-INF/MANIFEST.MF 2011-09-23 00:23:19 UTC (rev 34986) @@ -4,21 +4,11 @@ Bundle-SymbolicName: org.jboss.tools.jst.web.test;singleton:=true Bundle-Version: 3.3.0.qualifier Require-Bundle: org.jboss.tools.jst.web, - org.eclipse.ui;bundle-version="3.7.0", - org.eclipse.jdt.launching;bundle-version="3.6.0", - org.eclipse.debug.ui;bundle-version="3.7.0", - org.eclipse.jdt.debug;bundle-version="3.7.0", - org.eclipse.wst.server.core;bundle-version="1.1.302", - org.eclipse.jem.util;bundle-version="2.1.2", - org.eclipse.wst.sse.core;bundle-version="1.1.600", - org.eclipse.jst.j2ee;bundle-version="1.1.500", - org.eclipse.ltk.core.refactoring;bundle-version="3.5.200", - org.eclipse.jst.jsp.core;bundle-version="1.2.400", - org.eclipse.jst.j2ee.core;bundle-version="1.2.100", - org.eclipse.wst.common.project.facet.core;bundle-version="1.4.200", - org.eclipse.wst.validation;bundle-version="1.2.300", org.junit, - org.jboss.tools.tests + org.jboss.tools.tests, + org.eclipse.jst.standard.schemas, + org.eclipse.ui, + org.eclipse.wst.validation Bundle-ActivationPolicy: lazy Bundle-Vendor: %Bundle-Vendor.0 Export-Package: org.jboss.tools.jst.web.test Modified: trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/WebUtilTest.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/WebUtilTest.java 2011-09-23 00:00:32 UTC (rev 34985) +++ trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/WebUtilTest.java 2011-09-23 00:23:19 UTC (rev 34986) @@ -13,6 +13,7 @@ import junit.framework.TestCase; import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.ResourcesPlugin; import org.jboss.tools.jst.web.WebUtils; @@ -29,6 +30,8 @@ @Override protected void setUp() throws Exception { project = ResourcesPlugin.getWorkspace().getRoot().getProject(JstWebAllTests.PROJECT_NAME); + IResource target = project.getFolder("target"); + target.setDerived(true, null); } /** @@ -36,7 +39,7 @@ * @throws Exception */ public void testGetWebRootFolders() throws Exception { - assertEquals(1, WebUtils.getWebRootFolders(project)); - assertEquals(2, WebUtils.getWebRootFolders(project, false)); + assertEquals(1, WebUtils.getWebRootFolders(project).length); + assertEquals(2, WebUtils.getWebRootFolders(project, false).length); } } \ No newline at end of file