From jbosstools-commits at lists.jboss.org Mon Feb 2 11:44:23 2009 Content-Type: multipart/mixed; boundary="===============1539226558781060496==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r13426 - in trunk: jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/src/org/jboss/tools/jsf/vpe/ajax4jsf/test and 3 other directories. Date: Mon, 02 Feb 2009 11:44:23 -0500 Message-ID: --===============1539226558781060496== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: yradtsevich Date: 2009-02-02 11:44:23 -0500 (Mon, 02 Feb 2009) New Revision: 13426 Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsf= Tests/WebContent/pages/components/queue.jsp trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFac= esTest/WebContent/pages/components/editor.jsp trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFac= esTest/WebContent/pages/components/editor.jsp.xml Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/src/org/jboss/tool= s/jsf/vpe/ajax4jsf/test/Ajax4JsfComponentContentTest.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/too= ls/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/tem= plate/expression/VpeFunctionTldVersionCheck.java Log: RESOLVED - issue JBIDE-3682: Move JUnit tests of VPE to RichFaces 3.3.0 https://jira.jboss.org/jira/browse/JBIDE-3682 - Now if a TLD-file is not found, the last version of the library is assum= ed - JUnit tests for rich:editor and a4j:queue have been added Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax= 4jsfTests/WebContent/pages/components/queue.jsp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4js= fTests/WebContent/pages/components/queue.jsp (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4js= fTests/WebContent/pages/components/queue.jsp 2009-02-02 16:44:23 UTC (rev 1= 3426) @@ -0,0 +1,16 @@ + +<%@ taglib uri=3D"http://richfaces.org/a4j" prefix=3D"a4j"%> +<%@ taglib uri=3D"http://java.sun.com/jsf/html" prefix=3D"h"%> +<%@ taglib uri=3D"http://java.sun.com/jsf/core" prefix=3D"f" %> + + + + + + + + + + + + Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/src/org/jbo= ss/tools/jsf/vpe/ajax4jsf/test/Ajax4JsfComponentContentTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/src/org/jboss/too= ls/jsf/vpe/ajax4jsf/test/Ajax4JsfComponentContentTest.java 2009-02-02 14:54= :33 UTC (rev 13425) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/src/org/jboss/too= ls/jsf/vpe/ajax4jsf/test/Ajax4JsfComponentContentTest.java 2009-02-02 16:44= :23 UTC (rev 13426) @@ -86,6 +86,11 @@ performInvisibleTagTest("components/push.xhtml", "push"); //$NON-NLS-1$ = //$NON-NLS-2$ } = + public void testQueue() throws Throwable { + performInvisibleTagTest( + "components/queue.jsp", "a4jQueue"); //$NON-NLS-1$ //$NON-NLS-2$ + } + public void _testRegion() throws Throwable { performContentTest("components/region.xhtml");//$NON-NLS-1$ } Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/ric= hFacesTest/WebContent/pages/components/editor.jsp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFa= cesTest/WebContent/pages/components/editor.jsp (rev= 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFa= cesTest/WebContent/pages/components/editor.jsp 2009-02-02 16:44:23 UTC (rev= 13426) @@ -0,0 +1,17 @@ + +<%@ taglib uri=3D"http://java.sun.com/jsf/html" prefix=3D"h"%> +<%@ taglib uri=3D"http://java.sun.com/jsf/core" prefix=3D"f" %> +<%@ taglib uri=3D"http://richfaces.org/rich" prefix=3D"rich" %> + + + + + + + + + + + + + Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/ric= hFacesTest/WebContent/pages/components/editor.jsp.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFa= cesTest/WebContent/pages/components/editor.jsp.xml = (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFa= cesTest/WebContent/pages/components/editor.jsp.xml 2009-02-02 16:44:23 UTC = (rev 13426) @@ -0,0 +1,33 @@ + + + + + + + + + + +

+ + + + +

+ + + \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jb= oss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/to= ols/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java 2009-02-02 14= :54:33 UTC (rev 13425) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/to= ols/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java 2009-02-02 16= :44:23 UTC (rev 13426) @@ -251,6 +251,10 @@ performContentTest("components/progressBar.xhtml");//$NON-NLS-1$ } = + public void testEditor() throws Throwable { + performContentTest("components/editor.jsp"); //$NON-NLS-1$ + } + public void testScrollableDataTable() throws Throwable { performContentTest("components/scrollableDataTable.xhtml");//$NON-NLS-1$ } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/edi= tor/template/expression/VpeFunctionTldVersionCheck.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/te= mplate/expression/VpeFunctionTldVersionCheck.java 2009-02-02 14:54:33 UTC (= rev 13425) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/te= mplate/expression/VpeFunctionTldVersionCheck.java 2009-02-02 16:44:23 UTC (= rev 13426) @@ -90,7 +90,7 @@ String tldVersion =3D TLDVersionHelper.getTldVersion(sourceNodeTaglib.= getUri(), sourceNodeTaglib.getPrefix(), = pageContext.getSourceBuilder().getStructuredTextViewer().getDocume= nt()); = - double tldVersionNumber =3D0; + double tldVersionNumber; if(tldVersion!=3Dnull) { = tldVersionNumber =3D stringVersionToDouble(tldVersion); @@ -116,7 +116,9 @@ = tldVersionNumber =3D stringVersionToDouble(tldVersion); } else { - tldVersionNumber =3D 0; + // if the version of the TLD-file is not specified or the file is not= found + // then assume it is the last version + tldVersionNumber =3D Double.MAX_VALUE; } } if((startValue<=3DtldVersionNumber)&& --===============1539226558781060496==--