Author: scabanovich Date: 2012-02-01 20:40:01 -0500 (Wed, 01 Feb 2012) New Revision: 38389 Added: trunk/jst/tests/org.jboss.tools.jst.web.test/.settings/ trunk/jst/tests/org.jboss.tools.jst.web.test/.settings/org.eclipse.jdt.core.prefs trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/ trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/.classpath trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/.project trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/.settings/ trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/.settings/.jsdtscope trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/.settings/org.eclipse.jdt.core.prefs trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/.settings/org.eclipse.wst.common.component trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/.settings/org.eclipse.wst.common.project.facet.core.xml trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/.settings/org.eclipse.wst.jsdt.ui.superType.container trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/.settings/org.eclipse.wst.jsdt.ui.superType.name trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/WebContent/ trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/WebContent/META-INF/ trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/WebContent/META-INF/MANIFEST.MF trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/WebContent/WEB-INF/ trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/WebContent/WEB-INF/lib/ trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/build/ trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/build/classes/ trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/inputUserName.jsp trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/src/ trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/WebUtil2Test.java trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/WebUtil2TestSetup.java Modified: 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/JstWebAllTests.java Log: JBIDE-10739 https://issues.jboss.org/browse/JBIDE-10739 Tests are added. Added: trunk/jst/tests/org.jboss.tools.jst.web.test/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.test/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.test/.settings/org.eclipse.jdt.core.prefs 2012-02-02 01:40:01 UTC (rev 38389) @@ -0,0 +1,8 @@ +#Fri Sep 30 12:13:50 PDT 2011 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.5 Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.test/.settings/org.eclipse.jdt.core.prefs ___________________________________________________________________ Added: svn:mime-type + text/plain 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 2012-02-02 01:06:45 UTC (rev 38388) +++ trunk/jst/tests/org.jboss.tools.jst.web.test/META-INF/MANIFEST.MF 2012-02-02 01:40:01 UTC (rev 38389) @@ -16,7 +16,8 @@ org.eclipse.jst.standard.schemas, org.eclipse.wst.common.frameworks;bundle-version="1.2.0", org.eclipse.ui, - org.eclipse.wst.validation;bundle-version="1.2.0" + org.eclipse.wst.validation;bundle-version="1.2.0", + org.eclipse.jface.text Bundle-ActivationPolicy: lazy Bundle-Vendor: %Bundle-Vendor.0 Export-Package: org.jboss.tools.jst.web.test Added: trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/.classpath =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/.classpath (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/.classpath 2012-02-02 01:40:01 UTC (rev 38389) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="src"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"> + <attributes> + <attribute name="owner.project.facets" value="java"/> + </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/testProjectRootAsWebContent/.classpath ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/.project =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/.project (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/.project 2012-02-02 01:40:01 UTC (rev 38389) @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>testProjectRootAsWebContent</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.jboss.tools.jst.web.kb.kbbuilder</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> + <nature>org.jboss.tools.jst.web.kb.kbnature</nature> + </natures> +</projectDescription> Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/.project ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/.settings/.jsdtscope =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/.settings/.jsdtscope (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/.settings/.jsdtscope 2012-02-02 01:40:01 UTC (rev 38389) @@ -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/testProjectRootAsWebContent/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/.settings/org.eclipse.jdt.core.prefs 2012-02-02 01:40:01 UTC (rev 38389) @@ -0,0 +1,8 @@ +#Wed Feb 01 15:04:35 PST 2012 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.6 Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/.settings/org.eclipse.jdt.core.prefs ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/.settings/org.eclipse.wst.common.component =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/.settings/org.eclipse.wst.common.component (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/.settings/org.eclipse.wst.common.component 2012-02-02 01:40:01 UTC (rev 38389) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project-modules id="moduleCoreId" project-version="1.5.0"> + <wb-module deploy-name="testProjectRootAsWebContent"> + <wb-resource deploy-path="/" source-path="/"/> + <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/> + <property name="context-root" value="testProjectRootAsWebContent"/> + <property name="java-output-path" value="/testProjectRootAsWebContent/build/classes"/> + </wb-module> +</project-modules> Added: trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/.settings/org.eclipse.wst.common.project.facet.core.xml =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/.settings/org.eclipse.wst.common.project.facet.core.xml 2012-02-02 01:40:01 UTC (rev 38389) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<faceted-project> + <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/testProjectRootAsWebContent/.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/testProjectRootAsWebContent/.settings/org.eclipse.wst.jsdt.ui.superType.container =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/.settings/org.eclipse.wst.jsdt.ui.superType.container (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/.settings/org.eclipse.wst.jsdt.ui.superType.container 2012-02-02 01:40:01 UTC (rev 38389) @@ -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/testProjectRootAsWebContent/.settings/org.eclipse.wst.jsdt.ui.superType.name =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/.settings/org.eclipse.wst.jsdt.ui.superType.name (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/.settings/org.eclipse.wst.jsdt.ui.superType.name 2012-02-02 01:40:01 UTC (rev 38389) @@ -0,0 +1 @@ +Window \ No newline at end of file Added: trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/WebContent/META-INF/MANIFEST.MF =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/WebContent/META-INF/MANIFEST.MF (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/WebContent/META-INF/MANIFEST.MF 2012-02-02 01:40:01 UTC (rev 38389) @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/WebContent/META-INF/MANIFEST.MF ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/inputUserName.jsp =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/inputUserName.jsp (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/inputUserName.jsp 2012-02-02 01:40:01 UTC (rev 38389) @@ -0,0 +1,29 @@ +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %> +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> + +<f:loadBundle var="Message" basename="demo.Messages"/> + +<html> + <head> + <title>Input User Name Page</title> + </head> + <body> + + <f:view> + <h1><h:outputText value="#{Message.header}" id="q"/></h1> + + <h:messages style="color: red"/> + + <h:form id="greetingForm"> + <h:outputText value="#{Message.header}"/> + <h:inputText value="#{user.name}" required="true"> + <f:validateLength maximum="30" minimum="3"/> + </h:inputText> + + <h:commandButton action="hello" value="Say Hello!" /> + + </h:form> + </f:view> + </body> +</html> \ No newline at end of file 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 2012-02-02 01:06:45 UTC (rev 38388) +++ trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/JstWebAllTests.java 2012-02-02 01:40:01 UTC (rev 38389) @@ -29,6 +29,8 @@ WebUtilTest.class, WebAppHelperTest.class, WebXMLValidationTest.class))); + suite.addTest(new WebUtil2TestSetup(new TestSuite( + WebUtil2Test.class))); 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/WebUtil2Test.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/WebUtil2Test.java (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/WebUtil2Test.java 2012-02-02 01:40:01 UTC (rev 38389) @@ -0,0 +1,83 @@ +/******************************************************************************* + * Copyright (c) 2012 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.IContainer; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.runtime.IPath; +import org.jboss.tools.common.base.test.validation.TestUtil; +import org.jboss.tools.jst.web.WebUtils; +import org.jboss.tools.jst.web.kb.PageContextFactory; +import org.jboss.tools.test.util.ResourcesUtils; + +/** + * Tests for a project that declares its root as the web root. + * + * @author Viacheslav Kabanovich + */ +public class WebUtil2Test extends TestCase { + + private IProject project; + + @Override + protected void setUp() throws Exception { + project = getTestProject(); + } + + public IProject getTestProject() { + if(project==null) { + try { + project = WebUtil2TestSetup.findTestProject(); + if(project==null || !project.exists()) { + project = ResourcesUtils.importProject(JstWebAllTests.PLUGIN_ID, WebUtil2TestSetup.PROJECT_PATH); + TestUtil._waitForValidation(project); + } + } catch (Exception e) { + e.printStackTrace(); + fail("Can't import CDI test project: " + e.getMessage()); //$NON-NLS-1$ + } + } + return project; + } + + /** + * This test should correctly find web root in the case when it is the same as the project root. + * See https://issues.jboss.org/browse/JBIDE-10739 + * + * @throws Exception + */ + public void testGetWebRootFolder() throws Exception { + IContainer[] roots = WebUtils.getWebRootFolders(getTestProject()); + assertEquals(1, roots.length); + assertEquals(getTestProject(), roots[0]); + + IPath path = org.jboss.tools.common.web.WebUtils.getFirstWebContentPath(getTestProject()); + assertEquals(getTestProject().getFullPath(), path); + } + + /** + * This test should not throw exception 'Path must include project and resource name' + * See https://issues.jboss.org/browse/JBIDE-10739 + * + * @throws Exception + */ + public void testFileFromProject() throws Exception { + IFile f = getTestProject().getFile("inputUserName.jsp"); //$NON-NLS-1$ + IFile f1 = PageContextFactory.getFileFromProject(f.getName(), f); + assertNotNull(f1); + + f1 = PageContextFactory.getFileFromProject("abc.jsp", f); + assertNull(f1); + } +} \ 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/WebUtil2Test.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/WebUtil2TestSetup.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/WebUtil2TestSetup.java (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/WebUtil2TestSetup.java 2012-02-02 01:40:01 UTC (rev 38389) @@ -0,0 +1,72 @@ +/******************************************************************************* + * Copyright (c) 2012 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.extensions.TestSetup; +import junit.framework.Test; + +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IncrementalProjectBuilder; +import org.eclipse.core.resources.ResourcesPlugin; +import org.jboss.tools.common.base.test.validation.TestUtil; +import org.jboss.tools.test.util.JobUtils; +import org.jboss.tools.test.util.ResourcesUtils; + +/** + * @author Viacheslav Kabanovich + */ +public class WebUtil2TestSetup extends TestSetup { + static String PROJECT_NAME = "testProjectRootAsWebContent"; //$NON-NLS-1$ + static String PROJECT_PATH = "/projects/" + PROJECT_NAME; //$NON-NLS-1$ + + protected IProject project; + + public WebUtil2TestSetup(Test test) { + super(test); + } + + @Override + protected void setUp() throws Exception { + project = getTestProject(); + boolean state = ResourcesUtils.setBuildAutomatically(false); + project.build(IncrementalProjectBuilder.FULL_BUILD, null); + TestUtil._waitForValidation(project); + ResourcesUtils.setBuildAutomatically(state); + } + + public IProject getTestProject() { + if(project==null) { + try { + project = findTestProject(); + if(project==null || !project.exists()) { + project = ResourcesUtils.importProject(JstWebAllTests.PLUGIN_ID, PROJECT_PATH); + TestUtil._waitForValidation(project); + } + } catch (Exception e) { + e.printStackTrace(); + fail("Can't import test project: " + e.getMessage()); //$NON-NLS-1$ + } + } + return project; + } + + public static IProject findTestProject() { + return ResourcesPlugin.getWorkspace().getRoot().getProject(PROJECT_NAME); + } + + @Override + protected void tearDown() throws Exception { + boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false); + project.delete(true, true, null); + JobUtils.waitForIdle(); + ResourcesUtils.setBuildAutomatically(saveAutoBuild); + } +} \ 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/WebUtil2TestSetup.java ___________________________________________________________________ Added: svn:mime-type + text/plain