[jbosstools-commits] JBoss Tools SVN: r32240 - in trunk/jsf/tests/org.jboss.tools.jsf.test: .settings and 11 other directories.

Author: scabanovich Date: 2011-06-20 20:30:30 -0400 (Mon, 20 Jun 2011) New Revision: 32240 Added: trunk/jsf/tests/org.jboss.tools.jsf.test/.repository/ trunk/jsf/tests/org.jboss.tools.jsf.test/.settings/ trunk/jsf/tests/org.jboss.tools.jsf.test/.settings/org.eclipse.jdt.core.prefs trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/.classpath trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/.project trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/.jsdtscope trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/org.eclipse.jdt.core.prefs trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/org.eclipse.wst.common.component trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/org.eclipse.wst.common.project.facet.core.xml trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/org.eclipse.wst.jsdt.ui.superType.container trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/org.eclipse.wst.jsdt.ui.superType.name trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/WebContent/ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/WebContent/META-INF/ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/WebContent/META-INF/MANIFEST.MF trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/WebContent/WEB-INF/ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/WebContent/WEB-INF/lib/ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/WebContent/WEB-INF/web.xml trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/build/ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/build/classes/ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/src/ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/project/ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/project/facet/ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/project/facet/JSFFacetOnExistingProjectTest.java Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/.classpath trunk/jsf/tests/org.jboss.tools.jsf.test/META-INF/MANIFEST.MF trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java Log: JBIDE-9207 https://issues.jboss.org/browse/JBIDE-9207 Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/.classpath =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/.classpath 2011-06-20 23:30:17 UTC (rev 32239) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/.classpath 2011-06-21 00:30:30 UTC (rev 32240) @@ -1,8 +1,8 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="src"/> - <classpathentry exported="true" kind="lib" path="lib/xmlunit1.0.jar"/> - <classpathentry kind="output" path="bin"/> -</classpath> +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="src"/> + <classpathentry exported="true" kind="lib" path="lib/xmlunit1.0.jar"/> + <classpathentry kind="output" path="bin"/> +</classpath> Added: trunk/jsf/tests/org.jboss.tools.jsf.test/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/.settings/org.eclipse.jdt.core.prefs 2011-06-21 00:30:30 UTC (rev 32240) @@ -0,0 +1,8 @@ +#Fri Jun 03 11:51:29 PDT 2011 +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/jsf/tests/org.jboss.tools.jsf.test/.settings/org.eclipse.jdt.core.prefs ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/META-INF/MANIFEST.MF =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/META-INF/MANIFEST.MF 2011-06-20 23:30:17 UTC (rev 32239) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/META-INF/MANIFEST.MF 2011-06-21 00:30:30 UTC (rev 32240) @@ -11,6 +11,7 @@ org.jboss.tools.jsf.model.pv.test, org.jboss.tools.jsf.plugin, org.jboss.tools.jsf.test, + org.jboss.tools.jsf.test.project.facet, org.jboss.tools.jsf.test.refactoring, org.jboss.tools.jsf.test.validation Require-Bundle: @@ -35,7 +36,9 @@ org.eclipse.wst.validation, org.jboss.tools.common.el.core, org.jboss.tools.jst.jsp, - org.jboss.tools.common.model.test + org.jboss.tools.common.model.test, + org.eclipse.wst.common.project.facet.core, + org.eclipse.jst.jsf.core Bundle-Activator: org.jboss.tools.jsf.plugin.JsfTestPlugin Bundle-ActivationPolicy: lazy Bundle-Localization: plugin Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/.classpath =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/.classpath (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/.classpath 2011-06-21 00:30:30 UTC (rev 32240) @@ -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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"> + <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/jsf/tests/org.jboss.tools.jsf.test/projects/web/.classpath ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/.project =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/.project (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/.project 2011-06-21 00:30:30 UTC (rev 32240) @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>web</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/jsf/tests/org.jboss.tools.jsf.test/projects/web/.project ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/.jsdtscope =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/.jsdtscope (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/.jsdtscope 2011-06-21 00:30:30 UTC (rev 32240) @@ -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/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/org.eclipse.jdt.core.prefs 2011-06-21 00:30:30 UTC (rev 32240) @@ -0,0 +1,8 @@ +#Mon Jun 20 16:47:05 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/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/org.eclipse.jdt.core.prefs ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/org.eclipse.wst.common.component =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/org.eclipse.wst.common.component (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/org.eclipse.wst.common.component 2011-06-21 00:30:30 UTC (rev 32240) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project-modules id="moduleCoreId" project-version="1.5.0"> + <wb-module deploy-name="web"> + <wb-resource deploy-path="/" source-path="/WebContent"/> + <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/> + <property name="context-root" value="web"/> + <property name="java-output-path" value="/web/build/classes"/> + </wb-module> +</project-modules> Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/org.eclipse.wst.common.project.facet.core.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/org.eclipse.wst.common.project.facet.core.xml 2011-06-21 00:30:30 UTC (rev 32240) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<faceted-project> + <fixed facet="java"/> + <fixed facet="wst.jsdt.web"/> + <fixed facet="jst.web"/> + <installed facet="java" version="1.5"/> + <installed facet="jst.web" version="2.5"/> + <installed facet="wst.jsdt.web" version="1.0"/> +</faceted-project> Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/org.eclipse.wst.common.project.facet.core.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/org.eclipse.wst.jsdt.ui.superType.container =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/org.eclipse.wst.jsdt.ui.superType.container (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/org.eclipse.wst.jsdt.ui.superType.container 2011-06-21 00:30:30 UTC (rev 32240) @@ -0,0 +1 @@ +org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/org.eclipse.wst.jsdt.ui.superType.name =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/org.eclipse.wst.jsdt.ui.superType.name (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/org.eclipse.wst.jsdt.ui.superType.name 2011-06-21 00:30:30 UTC (rev 32240) @@ -0,0 +1 @@ +Window \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/WebContent/META-INF/MANIFEST.MF =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/WebContent/META-INF/MANIFEST.MF (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/WebContent/META-INF/MANIFEST.MF 2011-06-21 00:30:30 UTC (rev 32240) @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/WebContent/META-INF/MANIFEST.MF ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/WebContent/WEB-INF/web.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/WebContent/WEB-INF/web.xml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/WebContent/WEB-INF/web.xml 2011-06-21 00:30:30 UTC (rev 32240) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" id="WebApp_ID" version="2.5"> + <display-name>web</display-name> + <welcome-file-list> + <welcome-file>index.html</welcome-file> + <welcome-file>index.htm</welcome-file> + <welcome-file>index.jsp</welcome-file> + <welcome-file>default.html</welcome-file> + <welcome-file>default.htm</welcome-file> + <welcome-file>default.jsp</welcome-file> + </welcome-file-list> +</web-app> \ No newline at end of file Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/WebContent/WEB-INF/web.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java 2011-06-20 23:30:17 UTC (rev 32239) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java 2011-06-21 00:30:30 UTC (rev 32240) @@ -25,6 +25,7 @@ import org.eclipse.wst.validation.internal.operations.ValidatorManager; import org.jboss.tools.jsf.model.pv.test.JSFPromptingProviderTest; import org.jboss.tools.jsf.model.pv.test.JsfJbide7975Test; +import org.jboss.tools.jsf.test.project.facet.JSFFacetOnExistingProjectTest; import org.jboss.tools.jsf.test.refactoring.ELVariableRefactoringTest; import org.jboss.tools.jsf.test.refactoring.JSF2RefactoringTest; import org.jboss.tools.jsf.test.refactoring.MessagePropertyRefactoringTest; @@ -42,6 +43,7 @@ public static Test suite() { TestSuite suite = new TestSuite("Test model loading for JSF projects"); //$NON-NLS-1$ suite.addTestSuite(JSFTemplateTest.class); + suite.addTestSuite(JSFFacetOnExistingProjectTest.class); TestSuite old = new TestSuite("Tests are using JSFKickStartOldFormat"); //$NON-NLS-1$ old.addTestSuite(JSFModelTest.class); old.addTestSuite(ModelFormat_2_0_0_Test.class); Added: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/project/facet/JSFFacetOnExistingProjectTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/project/facet/JSFFacetOnExistingProjectTest.java (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/project/facet/JSFFacetOnExistingProjectTest.java 2011-06-21 00:30:30 UTC (rev 32240) @@ -0,0 +1,77 @@ +/******************************************************************************* + * 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.jsf.test.project.facet; + +import junit.framework.TestCase; + +import org.eclipse.core.resources.ICommand; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.jst.jsf.core.internal.project.facet.JSFFacetInstallDataModelProvider; +import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory; +import org.eclipse.wst.common.frameworks.datamodel.IDataModel; +import org.eclipse.wst.common.project.facet.core.IFacetedProject; +import org.eclipse.wst.common.project.facet.core.IProjectFacet; +import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion; +import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager; +import org.eclipse.wst.validation.internal.plugin.ValidationPlugin; +import org.jboss.tools.jst.web.kb.internal.KbBuilder; +import org.jboss.tools.test.util.JobUtils; +import org.jboss.tools.test.util.ResourcesUtils; + +/** + * @author Alexey Kazakov and Viacheslav Kabanovich + */ +public class JSFFacetOnExistingProjectTest extends TestCase { + + IProject project; + + @Override + protected void setUp() throws Exception { + project = ResourcesUtils.importProject("org.jboss.tools.jsf.test", "projects/web"); + JobUtils.waitForIdle(); + + IFacetedProject fproj = ProjectFacetsManager.create(project); + + IProjectFacet jsfFacet = ProjectFacetsManager.getProjectFacet("jst.jsf"); + IProjectFacetVersion jsfFacetVersion = jsfFacet.getVersion("1.2"); + + fproj.installProjectFacet(jsfFacetVersion, createJSFDataModel(), null); + JobUtils.waitForIdle(); + } + + public void testJSFProjectBuilders() throws CoreException { + ICommand[] cs = project.getDescription().getBuildSpec(); + int validation = -1; + int kb = -1; + for (int i = 0; i < cs.length; i++) { + ICommand c = cs[i]; + if(ValidationPlugin.VALIDATION_BUILDER_ID.equals(c.getBuilderName())) { + validation = i; + } else if(KbBuilder.BUILDER_ID.equals(c.getBuilderName())) { + kb = i; + } + } + assertTrue(kb >= 0); + assertTrue(validation > kb); + } + + @Override + protected void tearDown() throws Exception { + ResourcesUtils.deleteProject(project.getName()); + JobUtils.waitForIdle(); + } + + protected IDataModel createJSFDataModel() { + IDataModel config = DataModelFactory.createDataModel(new JSFFacetInstallDataModelProvider()); + return config; + } +} \ No newline at end of file Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/project/facet/JSFFacetOnExistingProjectTest.java ___________________________________________________________________ Added: svn:mime-type + text/plain