Author: akazakov Date: 2008-06-27 08:00:03 -0400 (Fri, 27 Jun 2008) New Revision: 8980 Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/JBIDE-1631.1 Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/JBIDE-1631.xhtml trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java Log: http://jira.jboss.com/jira/browse/JBIDE-2425 Fixed Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/JBIDE-1631.1 =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/JBIDE-1631.1 (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/JBIDE-1631.1 2008-06-27 12:00:03 UTC (rev 8980) @@ -0,0 +1,22 @@ +<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:s="http://jboss.com/products/seam/taglib" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:rich="http://richfaces.ajax4jsf.org/rich" + template="layout/template.xhtml"> + +<ui:define name="body"> + + <h:messages globalOnly="true" styleClass="message"/> + + <rich:panel> + #{authenticator.foo1} #{authenticator.foo2} + <f:facet name="header">Welcome!</f:facet> + <p>This empty shell application includes:</p> + </rich:panel> + +</ui:define> +</ui:composition> \ No newline at end of file Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/JBIDE-1631.xhtml =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/JBIDE-1631.xhtml 2008-06-27 08:19:24 UTC (rev 8979) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/JBIDE-1631.xhtml 2008-06-27 12:00:03 UTC (rev 8980) @@ -10,23 +10,5 @@ <ui:define name="body"> - <h:messages globalOnly="true" styleClass="message"/> - - <rich:panel> - #{authenticator.foo1} #{authenticator.foo2} - <f:facet name="header">Welcome!</f:facet> - <p>This empty shell application includes:</p> - <ul> - <li>Ant build script</li> - <li>Deployment to JBoss AS</li> - <li>Integration testing using TestNG and JBoss Embeddable EJB3</li> - <li>EJB 3.0 Seam components</li> - <li>Templated Facelets views</li> - <li>HSQL (or MySQL) Datasource</li> - <li>Default CSS stylesheet</li> - <li>Internationalization support</li> - </ul> - </rich:panel> - </ui:define> </ui:composition> \ No newline at end of file Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java 2008-06-27 08:19:24 UTC (rev 8979) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java 2008-06-27 12:00:03 UTC (rev 8980) @@ -90,6 +90,7 @@ * @throws CoreException */ public void testJBIDE1318() throws CoreException { + getSeamProject(project); IFile testJSP = project.getFile("WebContent/test.jsp"); assertMarkerIsNotCreated(testJSP, null, "actor cannot be resolved"); } @@ -122,8 +123,16 @@ public void testJiraJbide1631() throws CoreException { // Test for http://jira.jboss.com/jira/browse/JBIDE-1631 IFile jbide1631XHTMLFile = project.getFile("WebContent/JBIDE-1631.xhtml"); + IFile jbide1631XHTMLFileWithFoo = project.getFile("WebContent/JBIDE-1631.1"); + try{ + jbide1631XHTMLFile.setContents(jbide1631XHTMLFileWithFoo.getContents(), true, false, new NullProgressMonitor()); + }catch(Exception ex){ + JUnitUtils.fail("Error in changing 'JBIDE-1631.xhtml' content to " + + "'JBIDE-1631.1'", ex); + } + refreshProject(project); assertMarkerIsCreated(jbide1631XHTMLFile, null, "\"foo1\" cannot be resolved", 16 ); - assertMarkerIsCreated(jbide1631XHTMLFile, null, "\"foo2\" cannot be resolved", 17 ); + assertMarkerIsCreated(jbide1631XHTMLFile, null, "\"foo2\" cannot be resolved", 16 ); } public void testComponentsValidator() {