From: Ryan Lubke <Ryan.Lubke_at_Sun.COM>
Date: Tue, 09 Nov 2004 11:57:06 -0500

TestGuessNumber.testGuessNumberNullInput() could sporadically fail
because the new EL implementation correctly converts
a null input to 0 since the target propery is a Number.

SECTION: Modified Files
-----------------------------------
M guessNumber/src/java/guessNumber/UserNumberBean.java
  - modified getResponse to use assert that userNumber is not null.
    With a correct EL impl, this shouldn't be the case

M guessNumber/web/WEB-INF/faces-config.xml
  - Changed the minumum value from 0 to 1

M test/tests/com/sun/faces/demotest/guessNumber/TestGuessNumber.java
  - modified testGuessNumberNullInput's expected response from the
application
    when no input is provided

M guessNumber/build.xml
  - add source="1.4" option to javac task


SECTION: Diffs
----------------------------------
Index: build.xml
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-demo/guessNumber/build.xml,v
retrieving revision 1.23
diff -u -r1.23 build.xml
--- build.xml 19 Oct 2004 19:23:08 -0000 1.23
+++ build.xml 9 Nov 2004 16:53:00 -0000
@@ -200,7 +200,8 @@
      description="Compile Java files and copy static files." >
       <touch file="${build}/last-build"/>
     <javac srcdir="src/java" destdir="${build}/${example}/WEB-INF/classes"
- debug="${compile.debug}">
+ debug="${compile.debug}"
+ source="1.4">
         <include name="**/*.java" />
      <classpath refid="classpath"/>
     </javac>
Index: src/java/guessNumber/UserNumberBean.java
===================================================================
RCS file:
/cvs/javaserverfaces-sources/jsf-demo/guessNumber/src/java/guessNumber/UserNumberBean.java,v
retrieving revision 1.3
diff -u -r1.3 UserNumberBean.java
--- src/java/guessNumber/UserNumberBean.java 14 Oct 2004 00:02:22
-0000 1.3
+++ src/java/guessNumber/UserNumberBean.java 9 Nov 2004 16:53:00 -0000
@@ -74,18 +74,20 @@
 
 
     public String getResponse() {
- if (userNumber != null && userNumber.compareTo(randomInt) == 0) {
+
+ assert (userNumber != null); // indicates an EL conversion failure
+
+ if (userNumber.compareTo(randomInt) == 0) {
             return "Yay! You got it!";
         } else {
- if (userNumber != null) {
- int num = userNumber.intValue();
- if (num > randomInt.intValue()) {
- return "Sorry, " + userNumber + " is incorrect. Try
a smaller number.";
- } else {
- return "Sorry, " + userNumber + " is incorrect. Try
a larger number.";
- }
+ int num = userNumber.intValue();
+ if (num > randomInt.intValue()) {
+ return "Sorry, " + userNumber +
+ " is incorrect. Try a smaller number.";
+ } else {
+ return "Sorry, " + userNumber +
+ " is incorrect. Try a larger number.";
             }
- return "Sorry, " + userNumber + " is incorrect.";
         }
     }
 
Index: web/WEB-INF/faces-config.xml
===================================================================
RCS file:
/cvs/javaserverfaces-sources/jsf-demo/guessNumber/web/WEB-INF/faces-config.xml,v
retrieving revision 1.12
diff -u -r1.12 faces-config.xml
--- web/WEB-INF/faces-config.xml 3 Nov 2004 18:34:33 -0000 1.12
+++ web/WEB-INF/faces-config.xml 9 Nov 2004 16:53:00 -0000
@@ -100,7 +100,7 @@
     <managed-property>
       <property-name>minimum</property-name>
       <property-class>int</property-class>
- <value>0</value>
+ <value>1</value>
     </managed-property>
     <managed-property>
       <property-name>maximum</property-name>


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_javaserverfaces.dev.java.net
For additional commands, e-mail: dev-help_at_javaserverfaces.dev.java.net