Author: akazakov Date: 2011-06-13 18:34:35 -0400 (Mon, 13 Jun 2011) New Revision: 32067 Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidator/WebContent/resources/demo/input.xhtml trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/JSF2ComponentsInClassFolderTest.java trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/JSF2ComponentsValidatorTest.java Log: https://issues.jboss.org/browse/JBIDE-9098 Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidator/WebContent/resources/demo/input.xhtml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidator/WebContent/resources/demo/input.xhtml 2011-06-13 22:28:16 UTC (rev 32066) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidator/WebContent/resources/demo/input.xhtml 2011-06-13 22:34:35 UTC (rev 32067) @@ -17,6 +17,8 @@ <h:outputText value="#{cc.attrs.label}" /> <h:inputText value="#{cc.attrs.value}" /> <h:commandButton action="#{cc.attrs.action}" value="#{cc.attrs.submitlabel}" /> + <h:outputText>#{person.name}</h:outputText> + <h:outputText>#{person.nameBroken}</h:outputText> </h:form> </composite:implementation> </html> \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/JSF2ComponentsInClassFolderTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/JSF2ComponentsInClassFolderTest.java 2011-06-13 22:28:16 UTC (rev 32066) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/JSF2ComponentsInClassFolderTest.java 2011-06-13 22:34:35 UTC (rev 32067) @@ -8,36 +8,25 @@ * Contributors: * Exadel, Inc. and Red Hat, Inc. - initial API and implementation ******************************************************************************/ - package org.jboss.tools.jsf.test.validation; +import junit.framework.TestCase; -import java.io.IOException; -import java.io.InputStream; - -import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IncrementalProjectBuilder; -import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.core.runtime.Path; -import org.jboss.tools.jsf.jsf2.util.JSF2ResourceUtil; import org.jboss.tools.jst.web.kb.IKbProject; import org.jboss.tools.jst.web.kb.KbProjectFactory; -import org.jboss.tools.jst.web.kb.internal.KbProject; import org.jboss.tools.jst.web.kb.taglib.IAttribute; import org.jboss.tools.jst.web.kb.taglib.IComponent; import org.jboss.tools.jst.web.kb.taglib.ITagLibrary; import org.jboss.tools.test.util.ProjectImportTestSetup; -import junit.framework.TestCase; - /** * * @author yzhishko * */ - public class JSF2ComponentsInClassFolderTest extends TestCase { private static String projectName = "JSF2ComponentsValidator"; //$NON-NLS-1$ @@ -47,6 +36,7 @@ super("JSF 2 Components In Class Folder Test"); //$NON-NLS-1$ } + @Override protected void setUp() throws Exception { project = ProjectImportTestSetup.loadProject(projectName); project.build(IncrementalProjectBuilder.FULL_BUILD, @@ -61,12 +51,8 @@ assertTrue(cs.length > 0); assertEquals("input", cs[0].getName()); IAttribute[] as = cs[0].getAttributes(); - assertEquals(5, as.length); + assertEquals(7, as.length); IAttribute a = cs[0].getAttribute("value7"); assertNotNull(a); - } - -} - - +} \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/JSF2ComponentsValidatorTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/JSF2ComponentsValidatorTest.java 2011-06-13 22:28:16 UTC (rev 32066) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/JSF2ComponentsValidatorTest.java 2011-06-13 22:34:35 UTC (rev 32067) @@ -30,6 +30,7 @@ import org.jboss.tools.jsf.web.validation.JSFValidationMessage; import org.jboss.tools.test.util.JobUtils; import org.jboss.tools.test.util.ProjectImportTestSetup; +import org.jboss.tools.tests.AbstractResourceMarkerTest; /** * @@ -63,24 +64,27 @@ } public void testJSF2ComponentsValidator() throws Exception { - ValidationFramework.getDefault().validate(new IProject[] { project }, - false, false, new NullProgressMonitor()); - IResource resource = project - .findMember("/WebContent/pages/inputname.xhtml"); //$NON-NLS-1$ - assertNotNull(resource); - IMarker[] markers = resource.findMarkers( - "org.jboss.tools.jsf.compositeproblem", false, 1); //$NON-NLS-1$ + ValidationFramework.getDefault().validate(new IProject[] {project}, false, false, new NullProgressMonitor()); + IResource resource = project.findMember("/WebContent/pages/inputname.xhtml"); //$NON-NLS-1$ + assertTrue(resource.exists()); + IMarker[] markers = resource.findMarkers("org.jboss.tools.jsf.compositeproblem", false, 1); //$NON-NLS-1$ assertEquals(3, markers.length); assertTrue(isMarkerExist(markers, MessageFormat.format(JSFValidationMessage.UNKNOWN_COMPOSITE_COMPONENT_NAME, "echo"))); //$NON-NLS-1$ assertTrue(isMarkerExist(markers, MessageFormat.format(JSFValidationMessage.UNKNOWN_COMPOSITE_COMPONENT_NAME, "echo1"))); //$NON-NLS-1$ assertTrue(isMarkerExist(markers, MessageFormat.format(JSFValidationMessage.UNKNOWN_COMPOSITE_COMPONENT_ATTRIBUTE, "anknownAttr", "echo"))); //$NON-NLS-1$ } - private boolean isMarkerExist(IMarker[] markers, String markerMesssage) - throws CoreException { + public void testELInTagBodyInCompositeComponent() throws Exception { + ValidationFramework.getDefault().validate(new IProject[] {project}, false, false, new NullProgressMonitor()); + IResource resource = project.findMember("/WebContent/resources/demo/input.xhtml"); //$NON-NLS-1$ + assertTrue(resource.exists()); + AbstractResourceMarkerTest.assertMarkerIsNotCreated(resource, "\"name\" cannot be resolved", 20); + AbstractResourceMarkerTest.assertMarkerIsCreated(resource, "\"nameBroken\" cannot be resolved", 21); + } + + private boolean isMarkerExist(IMarker[] markers, String markerMesssage) throws CoreException { for (int i = 0; i < markers.length; i++) { - if (markerMesssage.equals((String) markers[i] - .getAttribute("message"))) { //$NON-NLS-1$ + if (markerMesssage.equals((String) markers[i].getAttribute("message"))) { //$NON-NLS-1$ return true; } }