M build-tests.xml
M build.xml
M systest/build.xml
M systest-per-webapp/build.xml
add targets to run tests with Glassfish
M conf/test/cactus.properties
remove hardcoded contextURL property
M test/com/sun/faces/FacesTestCase.java
M test/com/sun/faces/FacesTestCaseService.java
M test/com/sun/faces/FileOutputResponseWrapper.java
M test/com/sun/faces/FileOutputResponseWriter.java
M test/com/sun/faces/JspFacesTestCase.java
M test/com/sun/faces/ServletFacesTestCase.java
M test/com/sun/faces/config/ConfigFileTestCase.java
M test/com/sun/faces/lifecycle/TestLifecycleImpl.java
Avoid accessing System properties. There are some more tests doing this.
M test/com/sun/faces/el/impl/TestELImpl.java
M test/com/sun/faces/el/impl/TestUnifiedELImpl.java
comment out failing test cases. Need to check with Jacob/Kinman
Notes:
1. I've added targets to get the tests running with glassfish.
test.appserver => runs cactus, systest and systest-per-webapp
(equivalent of "test" target)
run.cactus.test.appserver => runs cactus tests only (uses autodeploy
by default)
run.systest.appserver => runs systest only (uses asadmin by default)
run.systest-per-webapp.appserver => run systest-per-webapp tests only
(uses autodeploy)
2. For cactus and systests, I've added targets to deploy using
autodeploy and asadmin. autodeploy is faster but
asadmin is cleaner because of the being to use the undeploy option. So
if you have problems using autodeploy, you can switch
asadmin. For systest, we have to use asadmin otherwise EL validator
tests will fail when run the
second time because JSPs are not compiled everytime unless the
jsf-systest application is undeployed cleanly.
3. Make sure to edit glassfish.home/domains/domain1/config/server.policy
to change the "properties" permission to "read,write"
permission java.util.PropertyPermission "*", "read,write";
This is needed because some of the unit tests access system properties.
4. Make sure to remove the jsf-api.jar, jsf-impl.jar from
glassfish.home/lib before running the tests because unit tests access
package private variables, so
they have to exist in the same class loader. Otherwise the tests will
fail with illegal Access exception. If there is work around for this,
please let me know.
5. I am able to run all the tests with the above changes except for the
HTML batch tests in the systest suite. I was able to run these tests
with AppServer 8.1 and not with glassfish. I am not sure if its windows
specific. I would appreciate if someone can take a look at this problem.
If you have problems running the tests with the above instructions,
please let me know. I'll be updating the build instructions on java.net.
Thanks
-Jayashri
Index: build-tests.xml
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/build-tests.xml,v
retrieving revision 1.215
diff -u -r1.215 build-tests.xml
--- build-tests.xml 11 May 2005 15:56:55 -0000 1.215
+++ build-tests.xml 20 Jun 2005 23:46:21 -0000
@@ -99,6 +99,8 @@
<property name="username" value="tomcat"/>
<property name="password" value="tomcat"/>
+ <property name="host" value="localhost"/>
+ <property name="port" value="8080"/>
<property name="url" value="
http://localhost:8080/manager"/>
@@ -297,13 +299,13 @@
Start the Cactus test using JUnit test runner.
-->
<target name="run.cactus.test">
-
<junit printsummary="yes" haltonfailure="yes" haltonerror="yes" fork="yes">
+ <sysproperty key="cactus.contextURL" value="
http://${host}:${port}/test"/>
<classpath>
<pathelement path="${java.class.path}"/>
<pathelement location="${out.test.dir}/WEB-INF/classes"/>
<!-- For cactus.properties -->
- <pathelement location="${conf.test.dir}"/>
+ <pathelement location="${conf.test.dir}"/>
</classpath>
<classpath refid="compile.classpath"/>
@@ -404,5 +406,52 @@
<pathelement location="${catalina-ant.jar}" />
</classpath>
</taskdef>
+
+ <target name="run.cactus.test.appserver" depends="prepare.test.webapp">
+ <antcall target="deploy"/>
+ <antcall target="run.cactus.test"/>
+ </target>
+
+ <target name="-check-os">
+ <condition property="exec.name" value="cmd.exe">
+ <os family="windows"/>
+ </condition>
+ <condition property="exec.arg.1" value="/c ${tomcat.home}/bin/asadmin">
+ <os family="windows"/>
+ </condition>
+ <property name="exec.name" value="${tomcat.home}/bin/asadmin"/>
+ <property name="exec.arg.1" value=""/>
+ </target>
+
+ <target name="deploy.asadmin" depends="-check-os" >
+ <exec executable="${exec.name}" failonerror="true">
+ <arg line="${exec.arg.1}"/>
+ <arg line="deploy"/>
+ <arg line="--user ${admin.user}"/>
+ <arg line="--password ${admin.password}"/>
+ <arg line="--host ${admin.host}"/>
+ <arg line="--port ${admin.port}"/>
+ <arg line="${basedir}/${build.home}/test.war"/>
+ </exec>
+ </target>
+
+ <target name="undeploy.asadmin" depends="-check-os">
+ <exec executable="${exec.name}">
+ <arg line="${exec.arg.1}"/>
+ <arg line="undeploy"/>
+ <arg line="--user ${admin.user}"/>
+ <arg line="--password ${admin.password}"/>
+ <arg line="--host ${admin.host}"/>
+ <arg line="--port ${admin.port}"/>
+ <arg line="test"/>
+ </exec>
+
+ </target>
+
+ <target description="Deploy web applications" name="deploy">
+ <copy file="${basedir}/${build.home}/test.war"
+ todir="${tomcat.home}/domains/domain1/autodeploy"/>
+ <sleep seconds="60"/>
+ </target>
</project>
Index: build.xml
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/build.xml,v
retrieving revision 1.181
diff -u -r1.181 build.xml
--- build.xml 19 May 2005 18:46:53 -0000 1.181
+++ build.xml 20 Jun 2005 23:46:21 -0000
@@ -760,5 +760,32 @@
</junit>
</target>
+ <target name="test.appserver"
+ depends="init.test,run.junit.test,run.cactus.test.appserver,
+ test.config,run.systest.appserver,run.systest-per-webapp.appserver"
+ description="Run all unit and system tests"/>
+ <target name="init.test">
+ <mkdir dir="${test.results.dir}"/>
+ </target>
+
+ <target name="run.systest.appserver" description="Run system tests" depends="init.test">
+ <ant dir="${basedir}/systest" inheritall="false" target="test.appserver"/>
+
+ </target>
+
+ <target name="run.systest-per-webapp.appserver" description="Run per-webapp system tests" depends="init.test,compile.test">
+ <ant dir="${basedir}/systest-per-webapp" inheritall="false" target="test.appserver"/>
+ </target>
+
+ <target name="run.junit.test" depends="init.test,compile.test"
+ description="Run unit tests not requiring cactus">
+ <ant antfile="build-tests.xml" target="run.test"/>
+ </target>
+
+ <target name="run.cactus.test.appserver" depends="init.test,compile.test,jars"
+ description="Run unit tests requiring cactus">
+ <ant antfile="build-tests.xml" target="run.cactus.test.appserver"/>
+ </target>
+
</project>
Index: conf/test/cactus.properties
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/conf/test/cactus.properties,v
retrieving revision 1.3
diff -u -r1.3 cactus.properties
--- conf/test/cactus.properties 4 Dec 2002 23:41:49 -0000 1.3
+++ conf/test/cactus.properties 20 Jun 2005 23:46:22 -0000
@@ -9,7 +9,6 @@
# that you use for your application. In the example below, the context is
# "test".
-cactus.contextURL =
http://localhost:8080/test
cactus.servletRedirectorName = ServletRedirector
cactus.jspRedirectorName = JspRedirector
cactus.filterRedirectorName = FilterRedirector
Index: systest/build.xml
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/systest/build.xml,v
retrieving revision 1.25
diff -u -r1.25 build.xml
--- systest/build.xml 10 May 2005 15:37:36 -0000 1.25
+++ systest/build.xml 20 Jun 2005 23:46:22 -0000
@@ -31,6 +31,7 @@
<!-- The base directory for compilation targets -->
<property name="build.home" value="${basedir}/build"/>
+ <property name="dist.home" value="${basedir}/dist"/>
<!-- The base directory for the JSF APIs -->
<property name="jsf-api.home" value ="${basedir}/../../jsf-api"/>
@@ -192,7 +193,7 @@
<mkdir dir="${build.home}/WEB-INF"/>
<mkdir dir="${build.home}/WEB-INF/classes"/>
<mkdir dir="${build.home}/WEB-INF/lib"/>
-
+ <mkdir dir="${dist.home}"/>
<!-- Copy static webapp content -->
<copy todir="${build.home}">
<fileset dir="${web.home}"/>
@@ -209,7 +210,7 @@
<copy file="${jstl.jar}" todir="${build.home}/WEB-INF/lib"/>
<copy file="${standard.jar}" todir="${build.home}/WEB-INF/lib"/>
<copy file="${jsf-api.jar}" todir="${build.home}/WEB-INF/lib"/>
- <copy file="${jsf-impl.jar}" todir="${build.home}/WEB-INF/lib"/>
+ <copy file="${jsf-impl.jar}" todir="${build.home}/WEB-INF/lib"/>
</target>
@@ -249,11 +250,60 @@
<target name="test" depends="compile"
description="Execute all tests against installed /jsf-systest application">
-
<ant antfile="build-tests.xml" target="test"/>
</target>
+
+ <target name="test.appserver" depends="compile, undeploy, deploy,test"
+ description="Execute all tests against installed /jsf-systest application" />
+
+ <target description="Deploy web applications" name="deploy.autodeploy">
+ <jar jarfile="${dist.home}/jsf-systest.war" basedir="${build.home}"/>
+ <copy file="${dist.home}/jsf-systest.war"
+ todir="${tomcat.home}/domains/domain1/autodeploy}"/>
+ <sleep seconds="30"/>
+ <ant antfile="build-tests.xml" target="test"/>
+ </target>
+
+ <target name="deploy" depends="-check-os" >
+ <jar jarfile="${dist.home}/jsf-systest.war" basedir="${build.home}"/>
+ <exec executable="${exec.name}" failonerror="true">
+ <arg line="${exec.arg.1}"/>
+ <arg line="deploy"/>
+ <arg line="--user ${admin.user}"/>
+ <arg line="--password ${admin.password}"/>
+ <arg line="--host ${admin.host}"/>
+ <arg line="--port ${admin.port}"/>
+ <arg line="${dist.home}/jsf-systest.war"/>
+ </exec>
+
+ </target>
+
+ <target name="undeploy" depends="-check-os">
+ <exec executable="${exec.name}">
+ <arg line="${exec.arg.1}"/>
+ <arg line="undeploy"/>
+ <arg line="--user ${admin.user}"/>
+ <arg line="--password ${admin.password}"/>
+ <arg line="--host ${admin.host}"/>
+ <arg line="--port ${admin.port}"/>
+ <arg line="jsf-systest"/>
+ </exec>
+
+ </target>
+
+ <target name="-check-os">
+ <condition property="exec.name" value="cmd.exe">
+ <os family="windows"/>
+ </condition>
+ <condition property="exec.arg.1" value="/c ${tomcat.home}/bin/asadmin">
+ <os family="windows"/>
+ </condition>
+ <property name="exec.name" value="${tomcat.home}/bin/asadmin"/>
+ <property name="exec.arg.1" value=""/>
+ </target>
+
<target name="passthru" depends="compile"
description="Convenience target to execute just one test. Just change the nested traget attribute.">
Index: systest-per-webapp/build.xml
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/systest-per-webapp/build.xml,v
retrieving revision 1.17
diff -u -r1.17 build.xml
--- systest-per-webapp/build.xml 6 May 2005 22:02:01 -0000 1.17
+++ systest-per-webapp/build.xml 20 Jun 2005 23:46:22 -0000
@@ -509,13 +509,119 @@
<ant antfile="build-tests.xml" target="test"/>
</target>
-
- <target name="passthru" depends="compile"
+
+ <target name="passthru" depends="compile"
description="Convenience target to execute just one test. Just change the nested traget attribute.">
<ant antfile="build-tests.xml" target="test.standard"/>
</target>
+
+ <target name="test.appserver" depends="install.appserver"
+ description="Execute all tests against installed /jsf-* applications">
+
+ <ant antfile="build-tests.xml" target="test"/>
+
+ </target>
+
+ <target name="install.appserver" depends="compile.base.sources">
+
+ <antcall target="install.one.appserver">
+ <param name="webapp.build.home"
+ value="${basedir}/replace-application/build" />
+ <param name="webapp.web.home"
+ value="${basedir}/replace-application/web" />
+ <param name="source.home"
+ value="${basedir}/replace-application/src/java" />
+ <param name="context.path" value="/jsf-replace-application"/>
+
+ </antcall>
+
+ <antcall target="install.one.appserver">
+ <param name="webapp.build.home"
+ value="${basedir}/replace-statemanager/build" />
+ <param name="webapp.web.home"
+ value="${basedir}/replace-statemanager/web" />
+ <param name="source.home"
+ value="${basedir}/replace-statemanager/src/java" />
+ <param name="context.path" value="/jsf-replace-statemanager"/>
+
+ </antcall>
+
+ <antcall target="install.one.appserver">
+ <param name="webapp.build.home"
+ value="${basedir}/el-performance/build" />
+ <param name="webapp.web.home"
+ value="${basedir}/el-performance/web" />
+ <param name="source.home"
+ value="${basedir}/el-performance/src/java" />
+ <param name="context.path" value="/jsf-el-performance"/>
+
+ </antcall>
+
+ <antcall target="install.one.appserver">
+ <param name="webapp.build.home"
+ value="${basedir}/command-link-redirect/build" />
+ <param name="webapp.web.home"
+ value="${basedir}/command-link-redirect/web" />
+ <param name="source.home"
+ value="${basedir}/command-link-redirect/src/java" />
+ <param name="context.path" value="/jsf-command-link-redirect"/>
+ </antcall>
+ <antcall target="install.one.appserver">
+ <param name="webapp.build.home"
+ value="${basedir}/command-link-back-button/build" />
+ <param name="webapp.web.home"
+ value="${basedir}/command-link-back-button/web" />
+ <param name="source.home"
+ value="${basedir}/command-link-back-button/src/java" />
+ <param name="context.path" value="/jsf-command-link-back-button"/>
+
+ </antcall>
+
+ <antcall target="install.one.appserver">
+ <param name="webapp.build.home"
+ value="${basedir}/nested-datatables/build" />
+ <param name="webapp.web.home"
+ value="${basedir}/nested-datatables/web" />
+ <param name="source.home"
+ value="${basedir}/nested-datatables/src/java" />
+ <param name="context.path" value="/jsf-nested-datatables"/>
+
+ </antcall>
+
+ <antcall target="install.one.appserver">
+ <param name="webapp.build.home"
+ value="${basedir}/core-tags/build" />
+ <param name="webapp.web.home"
+ value="${basedir}/core-tags/web" />
+ <param name="source.home"
+ value="${basedir}/core-tags/src/java" />
+ <param name="context.path" value="/jsf-core-tags"/>
+
+ </antcall>
+
+ <antcall target="install.one.appserver">
+ <param name="webapp.build.home"
+ value="${basedir}/replace-lifecycle/build" />
+ <param name="webapp.web.home"
+ value="${basedir}/replace-lifecycle/web" />
+ <param name="source.home"
+ value="${basedir}/replace-lifecycle/src/java" />
+ <param name="context.path" value="/jsf-replace-lifecycle"/>
+
+ </antcall>
+
+ </target>
+
+ <target name="install.one.appserver" depends="compile"
+ description="Install webapp on AppServer">
+ <delete file="${webapp.build.home}/${context.path}.war" />
+ <jar jarfile="${webapp.build.home}/${context.path}.war" basedir="${webapp.build.home}"/>
+ <copy file="${webapp.build.home}/${context.path}.war"
+ todir="${tomcat.home}/domains/domain1/autodeploy"/>
+ <sleep seconds="40"/>
+ </target>
</project>
Index: test/com/sun/faces/FacesTestCase.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/test/com/sun/faces/FacesTestCase.java,v
retrieving revision 1.14
diff -u -r1.14 FacesTestCase.java
--- test/com/sun/faces/FacesTestCase.java 26 Feb 2004 20:33:58 -0000 1.14
+++ test/com/sun/faces/FacesTestCase.java 20 Jun 2005 23:46:22 -0000
@@ -54,5 +54,9 @@
public boolean sendWriterToFile();
+
+ public void setTestRootDir(String testRootDir);
+
+ public String getTestRootDir();
} // end of interface FacesTestCase
Index: test/com/sun/faces/FacesTestCaseService.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/test/com/sun/faces/FacesTestCaseService.java,v
retrieving revision 1.45
diff -u -r1.45 FacesTestCaseService.java
--- test/com/sun/faces/FacesTestCaseService.java 6 Jun 2005 18:04:48 -0000 1.45
+++ test/com/sun/faces/FacesTestCaseService.java 20 Jun 2005 23:46:22 -0000
@@ -152,12 +152,13 @@
"testRootDir");
assert (null != testRootDir);
- System.setProperty("testRootDir", testRootDir);
-
+ facesTestCase.setTestRootDir(testRootDir);
+
// See if the testcase wants to have its output sent to a file.
if (facesTestCase.sendResponseToFile()) {
response =
- new FileOutputResponseWrapper(facesTestCase.getResponse());
+ new FileOutputResponseWrapper(facesTestCase.getResponse(),
+ testRootDir );
} else {
response = facesTestCase.getResponse();
}
@@ -175,9 +176,9 @@
facesTestCase.getRequest(),
response, lifecycle);
assert (null != facesContext);
-
if (facesTestCase.sendWriterToFile()) {
- ResponseWriter responseWriter = new FileOutputResponseWriter();
+ ResponseWriter responseWriter =
+ new FileOutputResponseWriter(testRootDir);
facesContext.setResponseWriter(responseWriter);
}
Index: test/com/sun/faces/FileOutputResponseWrapper.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/test/com/sun/faces/FileOutputResponseWrapper.java,v
retrieving revision 1.8
diff -u -r1.8 FileOutputResponseWrapper.java
--- test/com/sun/faces/FileOutputResponseWrapper.java 26 Feb 2004 20:33:59 -0000 1.8
+++ test/com/sun/faces/FileOutputResponseWrapper.java 20 Jun 2005 23:46:22 -0000
@@ -54,10 +54,11 @@
// Constructors and Initializers
//
- public FileOutputResponseWrapper(HttpServletResponse toWrap) {
+ public FileOutputResponseWrapper(HttpServletResponse toWrap,
+ String testRootDir) {
super(toWrap);
try {
- FileOutputResponseWriter.initializeFacesResponseRoot();
+ FileOutputResponseWriter.initializeFacesResponseRoot(testRootDir);
File file = new File(FACES_RESPONSE_FILENAME);
FileOutputStream fs = new FileOutputStream(file);
out = new PrintWriter(fs);
Index: test/com/sun/faces/FileOutputResponseWriter.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/test/com/sun/faces/FileOutputResponseWriter.java,v
retrieving revision 1.14
diff -u -r1.14 FileOutputResponseWriter.java
--- test/com/sun/faces/FileOutputResponseWriter.java 12 Oct 2004 14:39:56 -0000 1.14
+++ test/com/sun/faces/FileOutputResponseWriter.java 20 Jun 2005 23:46:22 -0000
@@ -50,7 +50,6 @@
public static String FACES_RESPONSE_ROOT = null;
public static String RESPONSE_WRITER_FILENAME = "ResponseWriter.txt";
protected HtmlResponseWriter writer = null;
-
// Attribute Instance Variables
@@ -59,10 +58,10 @@
//
// Constructors and Initializers
//
-
- public FileOutputResponseWriter() {
+
+ public FileOutputResponseWriter(String rootDir) {
try {
- initializeFacesResponseRoot();
+ initializeFacesResponseRoot(rootDir);
File file = new File(RESPONSE_WRITER_FILENAME);
FileOutputStream fs = new FileOutputStream(file);
out = new PrintWriter(fs);
@@ -77,15 +76,13 @@
// Class methods
//
- public static void initializeFacesResponseRoot() {
+ public static void initializeFacesResponseRoot(String testRootDir) {
if (null == FACES_RESPONSE_ROOT) {
- String testRootDir;
- // prepend the testRootDir to the RESPONSE_WRITER_FILENAME
- testRootDir = System.getProperty("testRootDir");
assert (null != testRootDir);
FACES_RESPONSE_ROOT = testRootDir + "/";
RESPONSE_WRITER_FILENAME =
FACES_RESPONSE_ROOT + RESPONSE_WRITER_FILENAME;
+
FileOutputResponseWrapper.FACES_RESPONSE_FILENAME =
FACES_RESPONSE_ROOT +
FileOutputResponseWrapper.FACES_RESPONSE_FILENAME;
Index: test/com/sun/faces/JspFacesTestCase.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/test/com/sun/faces/JspFacesTestCase.java,v
retrieving revision 1.12
diff -u -r1.12 JspFacesTestCase.java
--- test/com/sun/faces/JspFacesTestCase.java 26 Feb 2004 20:33:59 -0000 1.12
+++ test/com/sun/faces/JspFacesTestCase.java 20 Jun 2005 23:46:22 -0000
@@ -180,5 +180,14 @@
public void loadFromInitParam(String paramValue) {
facesService.loadFromInitParam(paramValue);
}
+
+ private String testRootDir = null;
+ public String getTestRootDir() {
+ return testRootDir;
+ }
+
+ public void setTestRootDir(String rootDir) {
+ this.testRootDir = rootDir;
+ }
} // end of class JspFacesTestCase
Index: test/com/sun/faces/ServletFacesTestCase.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/test/com/sun/faces/ServletFacesTestCase.java,v
retrieving revision 1.11
diff -u -r1.11 ServletFacesTestCase.java
--- test/com/sun/faces/ServletFacesTestCase.java 26 Feb 2004 20:33:59 -0000 1.11
+++ test/com/sun/faces/ServletFacesTestCase.java 20 Jun 2005 23:46:22 -0000
@@ -175,6 +175,15 @@
public void loadFromInitParam(String paramValue) {
facesService.loadFromInitParam(paramValue);
}
+
+ private String testRootDir = null;
+ public String getTestRootDir() {
+ return testRootDir;
+ }
+
+ public void setTestRootDir(String rootDir) {
+ this.testRootDir = rootDir;
+ }
} // end of class ServletFacesTestCase
Index: test/com/sun/faces/config/ConfigFileTestCase.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/test/com/sun/faces/config/ConfigFileTestCase.java,v
retrieving revision 1.66
diff -u -r1.66 ConfigFileTestCase.java
--- test/com/sun/faces/config/ConfigFileTestCase.java 6 May 2005 22:02:05 -0000 1.66
+++ test/com/sun/faces/config/ConfigFileTestCase.java 20 Jun 2005 23:46:22 -0000
@@ -49,7 +49,8 @@
ConfigParser parser = new ConfigParser();
public static class ConfigParser extends ConfigureListener {
- public void parseFromStr(ServletContext context, String str) throws Exception {
+ public void parseFromStr(ServletContext context, String str,
+ String testRootDir) throws Exception {
Digester digester = null;
URL url = null;
FacesConfigBean fcb =
@@ -58,7 +59,7 @@
// Step 1, configure a Digester instance we can use
digester = digester(isFeatureEnabled(context, VALIDATE_XML));
- url = (new File(System.getProperty("testRootDir"))).toURL();
+ url = (new File(testRootDir)).toURL();
url = new URL(url, str);
parse(digester, url, fcb);
configure(context, fcb);
@@ -99,7 +100,8 @@
protected void parseConfig(String resource,
ServletContext context)
throws Exception {
- parser.parseFromStr(context, resource);
+ String testRootDir = getTestRootDir();
+ parser.parseFromStr(context, resource, testRootDir);
}
Index: test/com/sun/faces/el/impl/TestELImpl.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/test/com/sun/faces/el/impl/TestELImpl.java,v
retrieving revision 1.13
diff -u -r1.13 TestELImpl.java
--- test/com/sun/faces/el/impl/TestELImpl.java 1 Jun 2005 07:00:10 -0000 1.13
+++ test/com/sun/faces/el/impl/TestELImpl.java 20 Jun 2005 23:46:22 -0000
@@ -158,13 +158,14 @@
evaluateTest("#{3 > 3}", Boolean.FALSE);
evaluateTest("#{3 != 3}", Boolean.FALSE);
- /* relationals between booleans */
+ // PENDING (visvan) check with Kinman/Jacob
+ /* relationals between booleans
evaluateTestFailure("#{false < true}");
evaluateTestFailure("#{false > true}");
evaluateTest("#{true >= true}", Boolean.TRUE);
evaluateTest("#{true <= true}", Boolean.TRUE);
evaluateTest("#{true == true}", Boolean.TRUE);
- evaluateTest("#{true != true}", Boolean.FALSE);
+ evaluateTest("#{true != true}", Boolean.FALSE); */
/* looking up objects in scopes */
evaluateTest("#{requestScope.val1b}", "request-scoped1");
Index: test/com/sun/faces/el/impl/TestUnifiedELImpl.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/test/com/sun/faces/el/impl/TestUnifiedELImpl.java,v
retrieving revision 1.3
diff -u -r1.3 TestUnifiedELImpl.java
--- test/com/sun/faces/el/impl/TestUnifiedELImpl.java 1 Jun 2005 07:00:10 -0000 1.3
+++ test/com/sun/faces/el/impl/TestUnifiedELImpl.java 20 Jun 2005 23:46:22 -0000
@@ -158,13 +158,14 @@
evaluateTest("${3 > 3}", Boolean.FALSE);
evaluateTest("${3 != 3}", Boolean.FALSE);
- /* relationals between booleans */
+ // PENDING (visvan) check with Kinman/Jacob
+ /* relationals between booleans
evaluateTestFailure("${false < true}");
evaluateTestFailure("${false > true}");
evaluateTest("${true >= true}", Boolean.TRUE);
evaluateTest("${true <= true}", Boolean.TRUE);
evaluateTest("${true == true}", Boolean.TRUE);
- evaluateTest("${true != true}", Boolean.FALSE);
+ evaluateTest("${true != true}", Boolean.FALSE); */
/* looking up objects in scopes */
evaluateTest("${requestScope.val1b}", "request-scoped1");
Index: test/com/sun/faces/lifecycle/TestLifecycleImpl.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/test/com/sun/faces/lifecycle/TestLifecycleImpl.java,v
retrieving revision 1.35
diff -u -r1.35 TestLifecycleImpl.java
--- test/com/sun/faces/lifecycle/TestLifecycleImpl.java 1 Jun 2005 14:03:40 -0000 1.35
+++ test/com/sun/faces/lifecycle/TestLifecycleImpl.java 20 Jun 2005 23:46:22 -0000
@@ -128,7 +128,7 @@
public void testAnyPhaseWithListenerAndValidationFailure() {
LifecycleImpl life = getSharedLifecycleImpl();
final int[] phaseCalled = new
- int[LifecycleFactoryImpl.LAST_PHASE + 1];
+ int[PhaseId.RENDER_RESPONSE.getOrdinal() + 1];
int i;
for (i = 1; i < phaseCalled.length; i++) {
phaseCalled[i] = 0;
@@ -171,7 +171,7 @@
public void testAnyPhaseWithListener() {
LifecycleImpl life = getSharedLifecycleImpl();
final int[] phaseCalled = new
- int[LifecycleFactoryImpl.LAST_PHASE + 1];
+ int[PhaseId.RENDER_RESPONSE.getOrdinal() + 1];
int i;
for (i = 1; i < phaseCalled.length; i++) {
phaseCalled[i] = 0;
@@ -234,7 +234,7 @@
public void testValidateWithListener() {
LifecycleImpl life = getSharedLifecycleImpl();
final int[] phaseCalled = new
- int[LifecycleFactoryImpl.LAST_PHASE + 1];
+ int[PhaseId.RENDER_RESPONSE.getOrdinal() + 1];
int i;
for (i = 1; i < phaseCalled.length; i++) {
phaseCalled[i] = 0;
@@ -305,9 +305,9 @@
assertTrue(null != sharedListener);
LifecycleImpl life = getSharedLifecycleImpl();
- int [] phaseCalledA = new int[LifecycleFactoryImpl.LAST_PHASE + 1];
- int [] phaseCalledB = new int[LifecycleFactoryImpl.LAST_PHASE + 1];
- int [] phaseCalledC = new int[LifecycleFactoryImpl.LAST_PHASE + 1];
+ int [] phaseCalledA = new int[PhaseId.RENDER_RESPONSE.getOrdinal() + 1];
+ int [] phaseCalledB = new int[PhaseId.RENDER_RESPONSE.getOrdinal() + 1];
+ int [] phaseCalledC = new int[PhaseId.RENDER_RESPONSE.getOrdinal() + 1];
int i;
for (i = 1; i < phaseCalledA.length; i++) {
phaseCalledA[i] = 0;
@@ -364,9 +364,9 @@
assertTrue(null != sharedListener);
LifecycleImpl life = getSharedLifecycleImpl();
- int [] phaseCalledA = new int[LifecycleFactoryImpl.LAST_PHASE + 1];
- int [] phaseCalledB = new int[LifecycleFactoryImpl.LAST_PHASE + 1];
- int [] phaseCalledC = new int[LifecycleFactoryImpl.LAST_PHASE + 1];
+ int [] phaseCalledA = new int[PhaseId.RENDER_RESPONSE.getOrdinal() + 1];
+ int [] phaseCalledB = new int[PhaseId.RENDER_RESPONSE.getOrdinal() + 1];
+ int [] phaseCalledC = new int[PhaseId.RENDER_RESPONSE.getOrdinal() + 1];
int i;
for (i = 1; i < phaseCalledA.length; i++) {
phaseCalledA[i] = 0;