Author: akazakov Date: 2012-02-10 20:11:17 -0500 (Fri, 10 Feb 2012) New Revision: 38637 Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/jsf2pr/JavaSource/demo/ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/jsf2pr/JavaSource/demo/Authenticator.broken trunk/jsf/tests/org.jboss.tools.jsf.test/projects/jsf2pr/JavaSource/demo/Authenticator.broken2 trunk/jsf/tests/org.jboss.tools.jsf.test/projects/jsf2pr/JavaSource/demo/Authenticator.java trunk/jsf/tests/org.jboss.tools.jsf.test/projects/jsf2pr/JavaSource/demo/Authenticator.original trunk/jsf/tests/org.jboss.tools.jsf.test/projects/jsf2pr/JavaSource/demo/Test.broken trunk/jsf/tests/org.jboss.tools.jsf.test/projects/jsf2pr/JavaSource/demo/Test.java trunk/jsf/tests/org.jboss.tools.jsf.test/projects/jsf2pr/JavaSource/demo/Test.original trunk/jsf/tests/org.jboss.tools.jsf.test/projects/jsf2pr/JavaSource/demo/Test2.broken trunk/jsf/tests/org.jboss.tools.jsf.test/projects/jsf2pr/JavaSource/demo/Test2.java trunk/jsf/tests/org.jboss.tools.jsf.test/projects/jsf2pr/JavaSource/demo/Test2.original trunk/jsf/tests/org.jboss.tools.jsf.test/projects/jsf2pr/WebContent/test.xhtml trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/BuilderValidationTest.java Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java Log: https://issues.jboss.org/browse/JBIDE-10872 EL incremental validation doesn't work for complex ELs. Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/jsf2pr/JavaSource/demo/Authenticator.broken =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/jsf2pr/JavaSource/demo/Authenticator.broken (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/jsf2pr/JavaSource/demo/Authenticator.broken 2012-02-11 01:11:17 UTC (rev 38637) @@ -0,0 +1,15 @@ +package demo; + +import javax.faces.bean.ManagedBean; + +@ManagedBean(name="authenticator") +public class Authenticator { + + public Test getTestBroken() { + return null; + } + + public boolean authenticate() { + return true; + } +} \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/jsf2pr/JavaSource/demo/Authenticator.broken2 =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/jsf2pr/JavaSource/demo/Authenticator.broken2 (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/jsf2pr/JavaSource/demo/Authenticator.broken2 2012-02-11 01:11:17 UTC (rev 38637) @@ -0,0 +1,15 @@ +package demo; + +import javax.faces.bean.ManagedBean; + +@ManagedBean(name="authenticatorBroken") +public class Authenticator { + + public Test getTest() { + return null; + } + + public boolean authenticate() { + return true; + } +} \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/jsf2pr/JavaSource/demo/Authenticator.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/jsf2pr/JavaSource/demo/Authenticator.java (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/jsf2pr/JavaSource/demo/Authenticator.java 2012-02-11 01:11:17 UTC (rev 38637) @@ -0,0 +1,15 @@ +package demo; + +import javax.faces.bean.ManagedBean; + +@ManagedBean(name="authenticator") +public class Authenticator { + + public Test getTest() { + return null; + } + + public boolean authenticate() { + return true; + } +} \ No newline at end of file Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/jsf2pr/JavaSource/demo/Authenticator.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/jsf2pr/JavaSource/demo/Authenticator.original =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/jsf2pr/JavaSource/demo/Authenticator.original (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/jsf2pr/JavaSource/demo/Authenticator.original 2012-02-11 01:11:17 UTC (rev 38637) @@ -0,0 +1,15 @@ +package demo; + +import javax.faces.bean.ManagedBean; + +@ManagedBean(name="authenticator") +public class Authenticator { + + public Test getTest() { + return null; + } + + public boolean authenticate() { + return true; + } +} \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/jsf2pr/JavaSource/demo/Test.broken =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/jsf2pr/JavaSource/demo/Test.broken (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/jsf2pr/JavaSource/demo/Test.broken 2012-02-11 01:11:17 UTC (rev 38637) @@ -0,0 +1,11 @@ +package demo; + +public class Test { + public Test2 getStringBroken() { + return null; + } + + public String foo() { + return null; + } +} \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/jsf2pr/JavaSource/demo/Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/jsf2pr/JavaSource/demo/Test.java (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/jsf2pr/JavaSource/demo/Test.java 2012-02-11 01:11:17 UTC (rev 38637) @@ -0,0 +1,11 @@ +package demo; + +public class Test { + public Test2 getString() { + return null; + } + + public String foo() { + return null; + } +} \ No newline at end of file Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/jsf2pr/JavaSource/demo/Test.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/jsf2pr/JavaSource/demo/Test.original =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/jsf2pr/JavaSource/demo/Test.original (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/jsf2pr/JavaSource/demo/Test.original 2012-02-11 01:11:17 UTC (rev 38637) @@ -0,0 +1,11 @@ +package demo; + +public class Test { + public Test2 getString() { + return null; + } + + public String foo() { + return null; + } +} \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/jsf2pr/JavaSource/demo/Test2.broken =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/jsf2pr/JavaSource/demo/Test2.broken (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/jsf2pr/JavaSource/demo/Test2.broken 2012-02-11 01:11:17 UTC (rev 38637) @@ -0,0 +1,12 @@ +package demo; + +public class Test2 { + + public String getNewStringBroken() { + return null; + } + + public String foo() { + return null; + } +} \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/jsf2pr/JavaSource/demo/Test2.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/jsf2pr/JavaSource/demo/Test2.java (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/jsf2pr/JavaSource/demo/Test2.java 2012-02-11 01:11:17 UTC (rev 38637) @@ -0,0 +1,12 @@ +package demo; + +public class Test2 { + + public String getNewString() { + return null; + } + + public String foo() { + return null; + } +} \ No newline at end of file Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/jsf2pr/JavaSource/demo/Test2.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/jsf2pr/JavaSource/demo/Test2.original =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/jsf2pr/JavaSource/demo/Test2.original (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/jsf2pr/JavaSource/demo/Test2.original 2012-02-11 01:11:17 UTC (rev 38637) @@ -0,0 +1,12 @@ +package demo; + +public class Test2 { + + public String getNewString() { + return null; + } + + public String foo() { + return null; + } +} \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/jsf2pr/WebContent/test.xhtml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/jsf2pr/WebContent/test.xhtml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/jsf2pr/WebContent/test.xhtml 2012-02-11 01:11:17 UTC (rev 38637) @@ -0,0 +1,12 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html"> + + <h:outputText value="#{authenticator.test.string.newString}" /> + <h:outputText value="#{authenticator.authenticate()}" /> + <h:outputText value="#{authenticator.test.foo()}" /> + <h:outputText value="#{authenticator.test.string.foo()}" /> + + <h:outputText value="#{authenticator.broken}" /> +</html> \ No newline at end of file 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 2012-02-11 00:40:42 UTC (rev 38636) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java 2012-02-11 01:11:17 UTC (rev 38637) @@ -15,6 +15,7 @@ import junit.framework.TestSuite; import org.eclipse.jdt.internal.core.JavaModelManager; +import org.jboss.tools.common.base.test.validation.ValidationExceptionTest; import org.jboss.tools.common.base.test.validation.ValidationProjectTestSetup; import org.jboss.tools.jsf.model.pv.test.JSFPromptingProviderTest; import org.jboss.tools.jsf.model.pv.test.JsfJbide7975Test; @@ -23,6 +24,7 @@ import org.jboss.tools.jsf.test.refactoring.JSF2RefactoringTest; import org.jboss.tools.jsf.test.refactoring.MessagePropertyRefactoringTest; import org.jboss.tools.jsf.test.refactoring.MethodRefactoringTest; +import org.jboss.tools.jsf.test.validation.BuilderValidationTest; import org.jboss.tools.jsf.test.validation.ELValidatorTest; import org.jboss.tools.jsf.test.validation.FacesConfigValidatorTest; import org.jboss.tools.jsf.test.validation.JSF2ComponentsInClassFolderTest; @@ -30,13 +32,14 @@ import org.jboss.tools.jsf.test.validation.WebContentTest; import org.jboss.tools.jsf.test.validation.XHTMLDetectorAndValidatorTest; import org.jboss.tools.jsf.test.validation.XHTMLValidatorTest; -import org.jboss.tools.jsf.web.validation.XHTMLValidator; import org.jboss.tools.test.util.ProjectImportTestSetup; public class JsfAllTests { // public static final String PLUGIN_ID = "org.jboss.tools.jsf"; public static Test suite() { + ValidationExceptionTest.initLogger(); + TestSuite suite = new TestSuite("Test model loading for JSF projects"); //$NON-NLS-1$ suite.addTestSuite(JSFTemplateTest.class); suite.addTestSuite(JSFFacetOnExistingProjectTest.class); @@ -103,7 +106,10 @@ // new String[] { "projects/i18nTestProject" }, //$NON-NLS-1$ // new String[] { "i18nTestProject" })); //$NON-NLS-1$ suite.addTest(new ValidationProjectTestSetup(new TestSuite(ELValidatorTest.class),"org.jboss.tools.jsf.test","projects/JSFKickStartOldFormat","JSFKickStartOldFormat")); + suite.addTest(new ValidationProjectTestSetup(new TestSuite(BuilderValidationTest.class),"org.jboss.tools.jsf.test","projects/jsf2pr","jsf2pr")); + suite.addTestSuite(ValidationExceptionTest.class); // This test should be added last! + return new DisableJavaIndexingSetup(suite); } Added: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/BuilderValidationTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/BuilderValidationTest.java (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/BuilderValidationTest.java 2012-02-11 01:11:17 UTC (rev 38637) @@ -0,0 +1,167 @@ +/******************************************************************************* + * 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.jsf.test.validation; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.jboss.tools.common.base.test.validation.TestUtil; +import org.jboss.tools.test.util.ResourcesUtils; +import org.jboss.tools.tests.AbstractResourceMarkerTest; + +/** + * @author Alexey Kazakov + */ +public class BuilderValidationTest extends AbstractResourceMarkerTest { + + /* + * (non-Javadoc) + * @see junit.framework.TestCase#setUp() + */ + @Override + protected void setUp() throws Exception { + project = ResourcesPlugin.getWorkspace().getRoot().getProject("jsf2pr"); + } + + /** + * See https://issues.jboss.org/browse/JBIDE-10872 + * EL incremental validation doesn't work for complex ELs. + * @throws Exception + */ + public void testFullBuildValidation() throws Exception { + assertDefaultErrors(); + } + + private void assertDefaultErrors() throws Exception { + /* + * #{authenticator.test.string.newString} #6 + * #{authenticator.authenticate()} #7 + * #{authenticator.test.foo()} #8 + * #{authenticator.test.string.foo()} #9 + * + * #{authenticator.broken} #11 + */ + IFile file = project.getFile("WebContent/inputname.xhtml"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, "\"broken\" cannot be resolved'", 11); + AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, "\"authenticator\" cannot be resolved'", 6); + AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, "\"authenticator\" cannot be resolved'", 7); + AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, "\"authenticator\" cannot be resolved'", 8); + AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, "\"authenticator\" cannot be resolved'", 9); + AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, "\"authenticate()\" cannot be resolved'", 7); + AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, "\"test\" cannot be resolved'", 6); + AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, "\"test\" cannot be resolved'", 8); + AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, "\"test\" cannot be resolved'", 9); + AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, "\"string\" cannot be resolved'", 6); + AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, "\"string\" cannot be resolved'", 9); + AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, "\"newString\" cannot be resolved'", 6); + AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, "\"foo()\" cannot be resolved'", 8); + AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, "\"foo()\" cannot be resolved'", 9); + } + + /** + * See https://issues.jboss.org/browse/JBIDE-10872 + * EL incremental validation doesn't work for complex ELs. + * @throws Exception + */ + public void testIncrementalBuildValidation() throws Exception { + boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false); + + // Authenticator.java + IFile javaFile = project.getFile("JavaSource/demo/Authenticator.java"); + IFile broken = project.getFile("JavaSource/demo/Authenticator.broken"); + IFile original = project.getFile("JavaSource/demo/Authenticator.original"); + javaFile.setContents(broken.getContents(), IFile.FORCE, new NullProgressMonitor()); + + TestUtil.validate(javaFile); + + IFile file = project.getFile("WebContent/inputname.xhtml"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, "\"broken\" cannot be resolved'", 11); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, "\"test\" cannot be resolved'", 6, 8, 9); + + AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, "\"authenticator\" cannot be resolved'", 6); + AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, "\"authenticator\" cannot be resolved'", 7); + AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, "\"authenticator\" cannot be resolved'", 8); + AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, "\"authenticator\" cannot be resolved'", 9); + AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, "\"authenticate()\" cannot be resolved'", 7); + AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, "\"string\" cannot be resolved'", 6); + AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, "\"string\" cannot be resolved'", 9); + AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, "\"newString\" cannot be resolved'", 6); + AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, "\"foo()\" cannot be resolved'", 8); + AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, "\"foo()\" cannot be resolved'", 9); + + javaFile.setContents(original.getContents(), IFile.FORCE, new NullProgressMonitor()); + + TestUtil.validate(javaFile); + + assertDefaultErrors(); + + // Test.java + javaFile = project.getFile("JavaSource/demo/Test.java"); + broken = project.getFile("JavaSource/demo/Test.broken"); + original = project.getFile("JavaSource/demo/Test.original"); + javaFile.setContents(broken.getContents(), IFile.FORCE, new NullProgressMonitor()); + + TestUtil.validate(javaFile); + + AbstractResourceMarkerTest.assertMarkerIsCreated(file, "\"broken\" cannot be resolved'", 11); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, "\"string\" cannot be resolved'", 6, 9); + + AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, "\"authenticator\" cannot be resolved'", 6); + AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, "\"authenticator\" cannot be resolved'", 7); + AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, "\"authenticator\" cannot be resolved'", 8); + AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, "\"authenticator\" cannot be resolved'", 9); + AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, "\"authenticate()\" cannot be resolved'", 7); + AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, "\"test\" cannot be resolved'", 6); + AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, "\"test\" cannot be resolved'", 8); + AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, "\"test\" cannot be resolved'", 9); + AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, "\"newString\" cannot be resolved'", 6); + AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, "\"foo()\" cannot be resolved'", 8); + AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, "\"foo()\" cannot be resolved'", 9); + + javaFile.setContents(original.getContents(), IFile.FORCE, new NullProgressMonitor()); + + TestUtil.validate(javaFile); + + assertDefaultErrors(); + + // Test2.java + javaFile = project.getFile("JavaSource/demo/Test2.java"); + broken = project.getFile("JavaSource/demo/Test2.broken"); + original = project.getFile("JavaSource/demo/Test2.original"); + javaFile.setContents(broken.getContents(), IFile.FORCE, new NullProgressMonitor()); + + TestUtil.validate(javaFile); + + AbstractResourceMarkerTest.assertMarkerIsCreated(file, "\"broken\" cannot be resolved'", 11); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, "\"newString\" cannot be resolved'", 6); + + AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, "\"authenticator\" cannot be resolved'", 6); + AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, "\"authenticator\" cannot be resolved'", 7); + AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, "\"authenticator\" cannot be resolved'", 8); + AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, "\"authenticator\" cannot be resolved'", 9); + AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, "\"authenticate()\" cannot be resolved'", 7); + AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, "\"test\" cannot be resolved'", 6); + AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, "\"test\" cannot be resolved'", 8); + AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, "\"test\" cannot be resolved'", 9); + AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, "\"string\" cannot be resolved'", 6); + AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, "\"string\" cannot be resolved'", 9); + AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, "\"foo()\" cannot be resolved'", 8); + AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, "\"foo()\" cannot be resolved'", 9); + + javaFile.setContents(original.getContents(), IFile.FORCE, new NullProgressMonitor()); + + TestUtil.validate(javaFile); + + assertDefaultErrors(); + + ResourcesUtils.setBuildAutomatically(saveAutoBuild); + } +} \ No newline at end of file Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/BuilderValidationTest.java ___________________________________________________________________ Added: svn:mime-type + text/plain