Author: akazakov Date: 2010-09-27 14:09:29 -0400 (Mon, 27 Sep 2010) New Revision: 25242 Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/testJSFProject/WebContent/pages/el.jsp trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/validation/ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/validation/ELValidationTest.java Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFMessageELCompletionEngine.java trunk/jsf/tests/org.jboss.tools.jsf.ui.test/META-INF/MANIFEST.MF trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/testJSFProject/.project trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java Log: JBIDE-7067 https://jira.jboss.org/browse/JBIDE-7067 Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFMessageELCompletionEngine.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFMessageELCompletionEngine.java 2010-09-27 17:09:23 UTC (rev 25241) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFMessageELCompletionEngine.java 2010-09-27 18:09:29 UTC (rev 25242) @@ -201,6 +201,9 @@ ELSegmentImpl segment = new ELSegmentImpl(); segment.setToken(left.getFirstToken()); segment.setResolved(true); + for (Variable variable : resolvedVars) { + segment.getVariables().add(variable); + } resolution.addSegment(segment); break; Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/META-INF/MANIFEST.MF =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/META-INF/MANIFEST.MF 2010-09-27 17:09:23 UTC (rev 25241) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/META-INF/MANIFEST.MF 2010-09-27 18:09:29 UTC (rev 25242) @@ -25,6 +25,8 @@ org.eclipse.jst.server.tomcat.core, org.eclipse.ui, org.jboss.tools.common.el.core, - org.jboss.tools.jst.web + org.jboss.tools.jst.web, + org.jboss.tools.jst.web.kb, + org.jboss.tools.jsf Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/testJSFProject/.project =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/testJSFProject/.project 2010-09-27 17:09:23 UTC (rev 25241) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/testJSFProject/.project 2010-09-27 18:09:29 UTC (rev 25242) @@ -6,22 +6,22 @@ </projects> <buildSpec> <buildCommand> - <name>org.eclipse.wst.jsdt.core.javascriptValidator</name> + <name>org.eclipse.wst.common.project.facet.core.builder</name> <arguments> </arguments> </buildCommand> <buildCommand> - <name>org.eclipse.wst.common.project.facet.core.builder</name> + <name>org.eclipse.jdt.core.javabuilder</name> <arguments> </arguments> </buildCommand> <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> + <name>org.jboss.tools.jst.web.kb.kbbuilder</name> <arguments> </arguments> </buildCommand> <buildCommand> - <name>org.jboss.tools.jst.web.kb.kbbuilder</name> + <name>org.eclipse.wst.validation.validationbuilder</name> <arguments> </arguments> </buildCommand> Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/testJSFProject/WebContent/pages/el.jsp =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/testJSFProject/WebContent/pages/el.jsp (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/testJSFProject/WebContent/pages/el.jsp 2010-09-27 18:09:29 UTC (rev 25242) @@ -0,0 +1,3 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> + +<h:outputText value="#{user.name1}" /> \ No newline at end of file Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/testJSFProject/WebContent/pages/el.jsp ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java 2010-09-27 17:09:23 UTC (rev 25241) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java 2010-09-27 18:09:29 UTC (rev 25242) @@ -28,6 +28,7 @@ import org.jboss.tools.jsf.jsp.ca.test.JsfJspJbide6259Test; import org.jboss.tools.jsf.jsp.ca.test.WebContentAssistProviderTest; import org.jboss.tools.jsf.ui.test.refactoring.ELReferencesRenameTest; +import org.jboss.tools.jsf.ui.test.validation.ELValidationTest; import org.jboss.tools.test.util.ProjectImportTestSetup; public class JsfUiAllTests { @@ -55,8 +56,10 @@ suite.addTestSuite(JsfJspJbide1717Test.class); suite.addTest( - new ProjectImportTestSetup(WebContentAssistProviderTest.suite(), - "org.jboss.tools.jst.web.test", "projects/TestsWebArtefacts","TestsWebArtefacts")); + new ProjectImportTestSetup(WebContentAssistProviderTest.suite(), + "org.jboss.tools.jsf.ui.test", + new String[] { "projects/TestsWebArtefacts", }, //$NON-NLS-1$ + new String[] { "TestsWebArtefacts" })); //$NON-NLS-1$ suite.addTest(new ProjectImportTestSetup(new TestSuite( ELReferencesRenameTest.class), "org.jboss.tools.jsf.ui.test", //$NON-NLS-1$ new String[] { "projects/testJSFProject", }, //$NON-NLS-1$ @@ -77,6 +80,10 @@ "org.jboss.tools.jsf.ui.test", new String[]{"projects/test_jsf_project"}, new String[]{"test_jsf_project"})); + suite.addTest(new ProjectImportTestSetup(new TestSuite( + ELValidationTest.class), "org.jboss.tools.jsf.ui.test", //$NON-NLS-1$ + new String[] { "projects/testJSFProject", }, //$NON-NLS-1$ + new String[] { "testJSFProject" })); //$NON-NLS-1$ return new TestWizardsProject(suite); } Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/validation/ELValidationTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/validation/ELValidationTest.java (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/validation/ELValidationTest.java 2010-09-27 18:09:29 UTC (rev 25242) @@ -0,0 +1,65 @@ +/******************************************************************************* + * Copyright (c) 2010 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.ui.test.validation; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IncrementalProjectBuilder; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.jboss.tools.jsf.JSFModelPlugin; +import org.jboss.tools.jsf.preferences.JSFSeverityPreferences; +import org.jboss.tools.jst.web.kb.validation.IValidator; +import org.jboss.tools.test.util.JobUtils; +import org.jboss.tools.tests.AbstractResourceMarkerTest; + +/** + * @author Alexey Kazakov + */ +public class ELValidationTest extends AbstractResourceMarkerTest { + + private IProject project; + + @Override + protected void setUp() throws Exception { + JobUtils.waitForIdle(); + project = ResourcesPlugin.getWorkspace().getRoot().getProject("testJSFProject"); + assertTrue("Project testJSFProject is not accessible.", project.isAccessible()); + } + + /** + * See https://jira.jboss.org/browse/JBIDE-7067 + * @throws CoreException + */ + public void testELValidationEnablement() throws CoreException { + JSFModelPlugin.getDefault().getPreferenceStore().setValue(JSFSeverityPreferences.ENABLE_BLOCK_PREFERENCE_NAME, false); + project.build(IncrementalProjectBuilder.CLEAN_BUILD, new NullProgressMonitor()); + JobUtils.waitForIdle(); +// project.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor()); +// JobUtils.waitForIdle(); + + IFile file = project.getFile("WebContent/pages/el.jsp"); + + int number = getMarkersNumberByGroupName(file, IValidator.MARKED_RESOURCE_MESSAGE_GROUP); + JSFModelPlugin.getDefault().getPreferenceStore().setValue(JSFSeverityPreferences.ENABLE_BLOCK_PREFERENCE_NAME, true); + assertEquals("Problem marker was found.", 0, number); + + project.build(IncrementalProjectBuilder.CLEAN_BUILD, new NullProgressMonitor()); + JobUtils.waitForIdle(); +// project.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor()); +// JobUtils.waitForIdle(); + + number = getMarkersNumberByGroupName(file, IValidator.MARKED_RESOURCE_MESSAGE_GROUP); + assertEquals("Problem marker was not found.", 1, number); + } +} \ No newline at end of file Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/validation/ELValidationTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain