svn commit: r811794 - in /ofbiz/branches/release09.04: ./ framework/base/src/org/ofbiz/base/test/BaseUnitTests.java framework/base/src/org/ofbiz/base/util/UtilValidate.java

Author: jleroux
Date: Sun Sep  6 10:18:28 2009
New Revision: 811794

URL: http://svn.apache.org/viewvc?rev=811794&view=rev
Log:
"Applied fix from trunk for revision: 811793  "
------------------------------------------------------------------------
r811793 | jleroux | 2009-09-06 12:16:08 +0200 (dim. 06 sept. 2009) | 2 lignes

A patch from Philipp Hoppen "Two bugs in UtilValidate.isDouble() and UtilValidate.isFloat()" (https://issues.apache.org/jira/browse/OFBIZ-2828) - OFBIZ-2828
I tested the Junits with and without the modifications : OK
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release09.04/   (props changed)
    ofbiz/branches/release09.04/framework/base/src/org/ofbiz/base/test/BaseUnitTests.java
    ofbiz/branches/release09.04/framework/base/src/org/ofbiz/base/util/UtilValidate.java

Propchange: ofbiz/branches/release09.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Sep  6 10:18:28 2009
@@ -1 +1 @@
-/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778278,778280,778364,778374,778402,778576,778594,778628,779020,779477,779496,779639,779834,779856,779866,779873,780111,780138,780180,780199,780203,780906,780945,781201,781534,781549,781669,781680,781694,782663,783257,783266,783833,783913,783917,785123,785764,785967,786778,787126,787435-787436,787442,787520,788965,788983,788987,789329,789337,789506,789548,796769,799185,800461,800846,801023,802346,804364,805307,806127,806377,808786-808787,808792,809141,810370,810438,810465,810807,810809,810814,810832,810
 836,810878,810917,811020,811280,811297,811419,811528,811708,811714,811716
+/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778278,778280,778364,778374,778402,778576,778594,778628,779020,779477,779496,779639,779834,779856,779866,779873,780111,780138,780180,780199,780203,780906,780945,781201,781534,781549,781669,781680,781694,782663,783257,783266,783833,783913,783917,785123,785764,785967,786778,787126,787435-787436,787442,787520,788965,788983,788987,789329,789337,789506,789548,796769,799185,800461,800846,801023,802346,804364,805307,806127,806377,808786-808787,808792,809141,810370,810438,810465,810807,810809,810814,810832,810
 836,810878,810917,811020,811280,811297,811419,811528,811708,811714,811716,811793

Modified: ofbiz/branches/release09.04/framework/base/src/org/ofbiz/base/test/BaseUnitTests.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/framework/base/src/org/ofbiz/base/test/BaseUnitTests.java?rev=811794&r1=811793&r2=811794&view=diff
==============================================================================
--- ofbiz/branches/release09.04/framework/base/src/org/ofbiz/base/test/BaseUnitTests.java (original)
+++ ofbiz/branches/release09.04/framework/base/src/org/ofbiz/base/test/BaseUnitTests.java Sun Sep  6 10:18:28 2009
@@ -22,6 +22,7 @@
 
 import org.ofbiz.base.util.Debug;
 import org.ofbiz.base.util.UtilFormatOut;
+import org.ofbiz.base.util.UtilValidate;
 
 public class BaseUnitTests extends TestCase {
 
@@ -57,4 +58,16 @@
                 null,
                 UtilFormatOut.formatPrintableCreditCard(null));
     }
+    public void testIsDouble_1() {
+        assertFalse(UtilValidate.isDouble("10.0", true, true, 2, 2));
+    }
+    public void testIsFloat_1() {
+        assertFalse(UtilValidate.isFloat("10.0", true, true, 2, 2));
+    }
+    public void testIsDouble_2() {
+        assertTrue(UtilValidate.isDouble("10.000", true, true, 3, 3));
+    }
+    public void testIsFloat_2() {
+        assertTrue(UtilValidate.isFloat("10.000", true, true, 3, 3));
+    }
 }

Modified: ofbiz/branches/release09.04/framework/base/src/org/ofbiz/base/util/UtilValidate.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/framework/base/src/org/ofbiz/base/util/UtilValidate.java?rev=811794&r1=811793&r2=811794&view=diff
==============================================================================
--- ofbiz/branches/release09.04/framework/base/src/org/ofbiz/base/util/UtilValidate.java (original)
+++ ofbiz/branches/release09.04/framework/base/src/org/ofbiz/base/util/UtilValidate.java Sun Sep  6 10:18:28 2009
@@ -485,14 +485,13 @@
             float temp = Float.parseFloat(s);
             if (!allowNegative && temp < 0) return false;
             if (!allowPositive && temp > 0) return false;
-            String floatString = Float.toString(temp);
-            int decimalPoint = floatString.indexOf(".");
+            int decimalPoint = s.indexOf(".");
             if (decimalPoint == -1) {
                 if (minDecimal > 0) return false;
                 return true;
             }
             // 1.2345; length=6; point=1; num=4
-            int numDecimals = floatString.length() - decimalPoint;
+            int numDecimals = s.length() - decimalPoint - 1;
             if (minDecimal >= 0 && numDecimals < minDecimal) return false;
             if (maxDecimal >= 0 && numDecimals > maxDecimal) return false;
             return true;
@@ -510,14 +509,13 @@
             double temp = Double.parseDouble(s);
             if (!allowNegative && temp < 0) return false;
             if (!allowPositive && temp > 0) return false;
-            String doubleString = Double.toString(temp);
-            int decimalPoint = doubleString.indexOf(".");
+            int decimalPoint = s.indexOf(".");
             if (decimalPoint == -1) {
                 if (minDecimal > 0) return false;
                 return true;
             }
             // 1.2345; length=6; point=1; num=4
-            int numDecimals = doubleString.length() - decimalPoint;
+            int numDecimals = s.length() - decimalPoint - 1;
             if (minDecimal >= 0 && numDecimals < minDecimal) return false;
             if (maxDecimal >= 0 && numDecimals > maxDecimal) return false;
             return true;