Author: dazarov Date: 2007-12-25 07:32:25 -0500 (Tue, 25 Dec 2007) New Revision: 5436 Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/abcComponent.4 trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/AbcComponent.2 trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/AbcComponent.3 trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/BbcComponent.3 Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/abcComponent.2 trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/abcComponent.3 trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/abcComponent.xhtml trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/AbcComponent.java 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-1550 Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/abcComponent.2 =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/abcComponent.2 2007-12-25 11:04:52 UTC (rev 5435) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/abcComponent.2 2007-12-25 12:32:25 UTC (rev 5436) @@ -19,7 +19,7 @@ <h:form id="abcComponentForm"> <h:commandButton id="abcComponent" value="abcComponent!" - action="#{bcComponent.abcComponent}"/> + action="#{bcComponent.actionType}"/> </h:form> Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/abcComponent.3 =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/abcComponent.3 2007-12-25 11:04:52 UTC (rev 5435) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/abcComponent.3 2007-12-25 12:32:25 UTC (rev 5436) @@ -19,7 +19,7 @@ <h:form id="abcComponentForm"> <h:commandButton id="abcComponent" value="abcComponent!" - action="#{abcComponent.bcComponent}"/> + action="#{abcComponent.actionType2}"/> </h:form> Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/abcComponent.4 =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/abcComponent.4 (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/abcComponent.4 2007-12-25 12:32:25 UTC (rev 5436) @@ -0,0 +1,31 @@ +<!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" + xmlns:a="https://ajax4jsf.dev.java.net/ajax" + template="layout/template.xhtml"> + +<ui:define name="body"> + + <h:messages globalOnly="true" styleClass="message"/> + + <rich:panel> + <f:facet name="header">abcComponent</f:facet> + + <h:form id="abcComponentForm"> + + <h:commandButton id="abcComponent" value="abcComponent!" + action="#{abcComponent.actionType}"/> + + </h:form> + + </rich:panel> + +</ui:define> + +</ui:composition> + Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/abcComponent.xhtml =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/abcComponent.xhtml 2007-12-25 11:04:52 UTC (rev 5435) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/abcComponent.xhtml 2007-12-25 12:32:25 UTC (rev 5436) @@ -19,7 +19,7 @@ <h:form id="abcComponentForm"> <h:commandButton id="abcComponent" value="abcComponent!" - action="#{abcComponent.abcComponent}"/> + action="#{abcComponent.actionType}"/> </h:form> Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/AbcComponent.2 =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/AbcComponent.2 (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/AbcComponent.2 2007-12-25 12:32:25 UTC (rev 5436) @@ -0,0 +1,26 @@ +package org.domain.SeamWebWarTestProject.session; + +import org.jboss.seam.annotations.Logger; +import org.jboss.seam.annotations.Name; +import org.jboss.seam.annotations.Out; +import org.jboss.seam.log.Log; + +@Name("abcComponent") +public class AbcComponent { + + @Logger private Log log; + + @Out private String actionType; + + public void abcComponent() + { + //implement your business logic here + log.info("abcComponent.abcComponent() action called"); + } + + //add additional action methods + + public void setActionType(String actionType) { + this.actionType = actionType; + } +} Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/AbcComponent.3 =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/AbcComponent.3 (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/AbcComponent.3 2007-12-25 12:32:25 UTC (rev 5436) @@ -0,0 +1,25 @@ +package org.domain.SeamWebWarTestProject.session; + +import org.jboss.seam.annotations.Logger; +import org.jboss.seam.annotations.Name; +import org.jboss.seam.annotations.Out; +import org.jboss.seam.log.Log; + +@Name("abcComponent") +public class AbcComponent { + + @Logger private Log log; + + @Out private String actionType; + + public void abcComponent() + { + //implement your business logic here + log.info("abcComponent.abcComponent() action called"); + } + + //add additional action methods + public String getActionType() { + return actionType; + } +} Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/AbcComponent.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/AbcComponent.java 2007-12-25 11:04:52 UTC (rev 5435) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/AbcComponent.java 2007-12-25 12:32:25 UTC (rev 5436) @@ -2,6 +2,7 @@ import org.jboss.seam.annotations.Logger; import org.jboss.seam.annotations.Name; +import org.jboss.seam.annotations.Out; import org.jboss.seam.log.Log; @Name("abcComponent") @@ -9,6 +10,8 @@ @Logger private Log log; + @Out private String actionType; + public void abcComponent() { //implement your business logic here @@ -16,5 +19,11 @@ } //add additional action methods - + public String getActionType() { + return actionType; + } + + public void setActionType(String actionType) { + this.actionType = actionType; + } } Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/BbcComponent.3 =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/BbcComponent.3 (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/BbcComponent.3 2007-12-25 12:32:25 UTC (rev 5436) @@ -0,0 +1,20 @@ +package org.domain.SeamWebWarTestProject.session; + +import org.jboss.seam.annotations.Logger; +import org.jboss.seam.annotations.Name; +import org.jboss.seam.log.Log; + +@Name("bbcComponent") +public class BbcComponent { + + @Logger private Log log; + + public void bbcComponent() + { + //implement your business logic here + log.info("bbcComponent.bbcComponent() action called"); + } + + //add additional action methods + +} 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 2007-12-25 11:04:52 UTC (rev 5435) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java 2007-12-25 12:32:25 UTC (rev 5436) @@ -229,6 +229,16 @@ lineNumbers = getMarkersNumbersOfLine(componentsFile); assertTrue("Problem marker has wrong line number", lineNumbers[0] == 16); + + // resolve error in BbcComponent.java + IFile bbcComponentFile3 = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/BbcComponent.3"); + try{ + bbcComponentFile.setContents(bbcComponentFile3.getContents(), true, false, new NullProgressMonitor()); + bbcComponentFile.touch(new NullProgressMonitor()); + }catch(Exception ex){ + JUnitUtils.fail("Error in changing 'BbcComponent.java' content to " + + "'BbcComponent.3'", ex); + } } public void testEntitiesValidator() { @@ -519,10 +529,15 @@ ISeamProject seamProject = getSeamProject(project); IFile abcComponentXHTMLFile = project.getFile("WebContent/abcComponent.xhtml"); + IFile abcComponentFile = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/AbcComponent.java"); + refreshProject(project); int number = getMarkersNumber(abcComponentXHTMLFile); assertTrue("Problem marker was found in abcComponent.xhtml", number == 0); + + number = getMarkersNumber(abcComponentFile); + assertTrue("Problem marker was found in AbcComponent.java", number == 0); // Context variable cannot be resolved System.out.println("Test - Context variable cannot be resolved"); @@ -562,7 +577,7 @@ messages = getMarkersMessage(abcComponentXHTMLFile); - assertTrue("Problem marker 'Property cannot be resolved' not found", "bcComponent cannot be resolved".equals(messages[0])); + assertTrue("Problem marker 'Property cannot be resolved' not found", "actionType2 cannot be resolved".equals(messages[0])); lineNumbers = getMarkersNumbersOfLine(abcComponentXHTMLFile); @@ -570,7 +585,59 @@ // Unpaired Getter/Setter System.out.println("Test - Unpaired Getter/Setter"); + + IFile abcComponentXHTMLFile4 = project.getFile("WebContent/abcComponent.4"); + try{ + abcComponentXHTMLFile.setContents(abcComponentXHTMLFile4.getContents(), true, false, new NullProgressMonitor()); + abcComponentXHTMLFile.touch(new NullProgressMonitor()); + }catch(Exception ex){ + JUnitUtils.fail("Error in changing 'abcComponent.xhtml' content to " + + "'abcComponent.4'", ex); + } + + refreshProject(project); + + number = getMarkersNumber(abcComponentXHTMLFile); + assertTrue("Problem marker was found in abcComponent.xhtml", number == 0); + IFile abcComponentFile2 = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/AbcComponent.2"); + try{ + abcComponentFile.setContents(abcComponentFile2.getContents(), true, false, new NullProgressMonitor()); + abcComponentFile.touch(new NullProgressMonitor()); + }catch(Exception ex){ + JUnitUtils.fail("Error in changing 'abcComponent.java' content to " + + "'abcComponent.2'", ex); + } + + refreshProject(project); + + messages = getMarkersMessage(abcComponentXHTMLFile); + + assertTrue("Problem marker 'Unpaired Getter/Setter' not found", "Property \"actionType\" has only Setter. Getter is missing.".equals(messages[0])); + + lineNumbers = getMarkersNumbersOfLine(abcComponentXHTMLFile); + + assertTrue("Problem marker has wrong line number", lineNumbers[0] == 22); + + IFile abcComponentFile3 = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/AbcComponent.3"); + try{ + abcComponentFile.setContents(abcComponentFile3.getContents(), true, false, new NullProgressMonitor()); + abcComponentFile.touch(new NullProgressMonitor()); + }catch(Exception ex){ + JUnitUtils.fail("Error in changing 'abcComponent.java' content to " + + "'abcComponent.3'", ex); + } + + refreshProject(project); + + messages = getMarkersMessage(abcComponentXHTMLFile); + + assertTrue("Problem marker 'Unpaired Getter/Setter' not found", "Property \"actionType\" has only Getter. Setter is missing.".equals(messages[0])); + + lineNumbers = getMarkersNumbersOfLine(abcComponentXHTMLFile); + + assertTrue("Problem marker has wrong line number", lineNumbers[0] == 22); + } private void modifyPreferences(){