Author: akazakov Date: 2011-09-22 19:21:13 -0400 (Thu, 22 Sep 2011) New Revision: 34982 Added: trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/ trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/.classpath trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/.project trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/.settings/ trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/.settings/.jsdtscope trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/.settings/org.eclipse.wst.common.component trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/.settings/org.eclipse.wst.common.project.facet.core.xml trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/.settings/org.eclipse.wst.jsdt.ui.superType.container trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/.settings/org.eclipse.wst.jsdt.ui.superType.name trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/WebContent/ trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/WebContent/META-INF/ trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/WebContent/META-INF/MANIFEST.MF trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/WebContent/WEB-INF/ trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/WebContent/WEB-INF/lib/ trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/build/ trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/build/classes/ trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/src/ trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/target/ trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/target/m2e-wtp/ trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/target/m2e-wtp/web-resources/ trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/target/m2e-wtp/web-resources/META-INF/ trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/WebUtilTest.java Modified: trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/JstWebAllTests.java Log: https://issues.jboss.org/browse/JBIDE-9766 Refactor org.jboss.tools.jst.web.WebUtils.getWebRootFolders() to take into account derived resources and default web root folder Added: trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/.classpath =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/.classpath (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/.classpath 2011-09-22 23:21:13 UTC (rev 34982) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="src"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.6.0_20"> + <attributes> + <attribute name="owner.project.facets" value="java"/> + </attributes> + </classpathentry> + <classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.jboss.ide.eclipse.as.core.server.runtime.runtimeTarget/JBoss 6.x Runtime"> + <attributes> + <attribute name="owner.project.facets" value="jst.web"/> + </attributes> + </classpathentry> + <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/> + <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/> + <classpathentry kind="output" path="build/classes"/> +</classpath> Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/.classpath ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/.project =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/.project (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/.project 2011-09-22 23:21:13 UTC (rev 34982) @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>testWebProject</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.wst.jsdt.core.javascriptValidator</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.wst.common.project.facet.core.builder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.wst.validation.validationbuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jem.workbench.JavaEMFNature</nature> + <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature> + <nature>org.eclipse.wst.common.project.facet.core.nature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.wst.jsdt.core.jsNature</nature> + </natures> +</projectDescription> Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/.project ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/.settings/.jsdtscope =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/.settings/.jsdtscope (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/.settings/.jsdtscope 2011-09-22 23:21:13 UTC (rev 34982) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="WebContent"/> + <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/> + <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject"> + <attributes> + <attribute name="hide" value="true"/> + </attributes> + </classpathentry> + <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/> + <classpathentry kind="output" path=""/> +</classpath> Added: trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/.settings/org.eclipse.wst.common.component =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/.settings/org.eclipse.wst.common.component (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/.settings/org.eclipse.wst.common.component 2011-09-22 23:21:13 UTC (rev 34982) @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project-modules id="moduleCoreId" project-version="1.5.0"> + <wb-module deploy-name="testWebProject"> + <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/> + <wb-resource deploy-path="/" source-path="/WebContent"/> + <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/> + <property name="context-root" value="testWebProject"/> + <property name="java-output-path" value="/testWebProject/build/classes"/> + </wb-module> +</project-modules> Added: trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/.settings/org.eclipse.wst.common.project.facet.core.xml =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/.settings/org.eclipse.wst.common.project.facet.core.xml 2011-09-22 23:21:13 UTC (rev 34982) @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<faceted-project> + <runtime name="JBoss 6.x Runtime"/> + <fixed facet="java"/> + <fixed facet="jst.web"/> + <fixed facet="wst.jsdt.web"/> + <installed facet="java" version="1.6"/> + <installed facet="jst.web" version="3.0"/> + <installed facet="wst.jsdt.web" version="1.0"/> +</faceted-project> Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/.settings/org.eclipse.wst.common.project.facet.core.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/.settings/org.eclipse.wst.jsdt.ui.superType.container =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/.settings/org.eclipse.wst.jsdt.ui.superType.container (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/.settings/org.eclipse.wst.jsdt.ui.superType.container 2011-09-22 23:21:13 UTC (rev 34982) @@ -0,0 +1 @@ +org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file Added: trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/.settings/org.eclipse.wst.jsdt.ui.superType.name =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/.settings/org.eclipse.wst.jsdt.ui.superType.name (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/.settings/org.eclipse.wst.jsdt.ui.superType.name 2011-09-22 23:21:13 UTC (rev 34982) @@ -0,0 +1 @@ +Window \ No newline at end of file Added: trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/WebContent/META-INF/MANIFEST.MF =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/WebContent/META-INF/MANIFEST.MF (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/WebContent/META-INF/MANIFEST.MF 2011-09-22 23:21:13 UTC (rev 34982) @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/WebContent/META-INF/MANIFEST.MF ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF 2011-09-22 23:21:13 UTC (rev 34982) @@ -0,0 +1,5 @@ +Manifest-Version: 1.0 +Built-By: igels +Build-Jdk: 1.6.0_20 +Created-By: Maven Integration for Eclipse + Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/JstWebAllTests.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/JstWebAllTests.java 2011-09-22 23:16:08 UTC (rev 34981) +++ trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/JstWebAllTests.java 2011-09-22 23:21:13 UTC (rev 34982) @@ -13,12 +13,22 @@ import junit.framework.Test; import junit.framework.TestSuite; +import org.jboss.tools.test.util.ProjectImportTestSetup; + public class JstWebAllTests { + public static final String PROJECT_NAME = "testWebProject"; + private static final String PROJECT_PATH = "/projects/" + PROJECT_NAME; + public static Test suite() { TestSuite suite = new TestSuite(JstWebAllTests.class.getName()); suite.addTestSuite(WebContentAssistProviderTest.class); suite.addTestSuite(BuilderTest.class); + suite.addTest(new ProjectImportTestSetup(new TestSuite( + WebUtilTest.class), + "org.jboss.tools.jst.web.test", //$NON-NLS-1$ + PROJECT_PATH, //$NON-NLS-1$ + PROJECT_NAME)); return suite; } } \ No newline at end of file Added: 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 (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/WebUtilTest.java 2011-09-22 23:21:13 UTC (rev 34982) @@ -0,0 +1,42 @@ +/******************************************************************************* + * Copyright (c) 2011 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.jst.web.test; + +import junit.framework.TestCase; + +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.ResourcesPlugin; +import org.jboss.tools.jst.web.WebUtils; + +/** + * @author Alexey Kazakov + */ +public class WebUtilTest extends TestCase { + + private IProject project; + + /* (non-Javadoc) + * @see junit.framework.TestCase#setUp() + */ + @Override + protected void setUp() throws Exception { + project = ResourcesPlugin.getWorkspace().getRoot().getProject(JstWebAllTests.PROJECT_NAME); + } + + /** + * See https://issues.jboss.org/browse/JBIDE-9766 + * @throws Exception + */ + public void testGetWebRootFolders() throws Exception { + assertEquals(1, WebUtils.getWebRootFolders(project)); + assertEquals(2, WebUtils.getWebRootFolders(project, false)); + } +} \ No newline at end of file Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/WebUtilTest.java ___________________________________________________________________ Added: svn:mime-type + text/plain