svn commit: r487440 - in /tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator: TestMax.java TestMin.java

[jkuhnert]

Author: jkuhnert
Date: Thu Dec 14 19:39:39 2006
New Revision: 487440

URL: http://svn.apache.org/viewvc?view=rev&rev=487440
Log:
Hopefully fixes platform locale issues.

Modified:
    
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMax.java
    
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMin.java

Modified: 
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMax.java
URL: 
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMax.java?view=diff&rev=487440&r1=487439&r2=487440
==============================================================================
--- 
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMax.java
 (original)
+++ 
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMax.java
 Thu Dec 14 19:39:39 2006
@@ -16,6 +16,7 @@
 
 import static org.easymock.EasyMock.expect;
 
+import java.text.DecimalFormatSymbols;
 import java.util.Locale;
 
 import org.apache.tapestry.IMarkupWriter;
@@ -110,6 +111,7 @@
         FormComponentContributorContext context = 
newMock(FormComponentContributorContext.class);
         
         Locale locale = Locale.GERMAN;
+        DecimalFormatSymbols symbols = new DecimalFormatSymbols(locale);
         
         expect(context.getLocale()).andReturn(locale);
         
@@ -126,7 +128,9 @@
         
         assertEquals(json.toString(), 
                 "{\"constraints\":{\"myfield\":" +
-                
"[[dojo.validate.isInRange,{max:20.0,decimal:\",\",separator:\".\"}]]}," +
+                
"[[dojo.validate.isInRange,{max:20.0,decimal:\",\",separator:\"" 
+                + symbols.getGroupingSeparator() 
+                + "\"}]]}," +
                 "\"myfield\":{\"constraints\":[\"default message\"]}}");
     }
     
@@ -142,6 +146,7 @@
         FormComponentContributorContext context = 
newMock(FormComponentContributorContext.class);
         
         Locale locale = Locale.JAPAN;
+        DecimalFormatSymbols symbols = new DecimalFormatSymbols(locale);
         
         expect(context.getLocale()).andReturn(locale);
         
@@ -163,7 +168,9 @@
         
         assertEquals(json.toString(),
                 "{\"constraints\":{\"myfield\":[[dojo.validate.isInRange," +
-                "{max:20.0,decimal:\".\",separator:\",\"}]]}," +
+                "{max:20.0,decimal:\".\",separator:\"" 
+                + symbols.getGroupingSeparator() 
+                + "\"}]]}," +
                 "\"myfield\":{\"constraints\":[\"custom\\\\message\"]}}");
     }
 

Modified: 
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMin.java
URL: 
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMin.java?view=diff&rev=487440&r1=487439&r2=487440
==============================================================================
--- 
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMin.java
 (original)
+++ 
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMin.java
 Thu Dec 14 19:39:39 2006
@@ -16,6 +16,7 @@
 
 import static org.easymock.EasyMock.expect;
 
+import java.text.DecimalFormatSymbols;
 import java.util.Locale;
 
 import org.apache.tapestry.IMarkupWriter;
@@ -109,6 +110,7 @@
         FormComponentContributorContext context = 
newMock(FormComponentContributorContext.class);
         
         Locale locale = Locale.FRANCE;
+        DecimalFormatSymbols symbols = new DecimalFormatSymbols(locale);
         
         expect(context.getLocale()).andReturn(locale);
         
@@ -125,7 +127,9 @@
         
         assertEquals(json.toString(), 
                 "{\"constraints\":{\"myfield\":[[dojo.validate.isInRange," +
-                "{min:20.0,decimal:\",\",separator:\" \"}]]}," +
+                "{min:20.0,decimal:\",\",separator:\""
+                + symbols.getGroupingSeparator()
+                + "\"}]]}," +
                 "\"myfield\":{\"constraints\":[\"default message\"]}}");
     }
     
@@ -141,6 +145,7 @@
         FormComponentContributorContext context = 
newMock(FormComponentContributorContext.class);
         
         Locale locale = Locale.FRANCE;
+        DecimalFormatSymbols symbols = new DecimalFormatSymbols(locale);
         
         expect(context.getLocale()).andReturn(locale);
         
@@ -162,7 +167,9 @@
         
         assertEquals(json.toString(),
                 "{\"constraints\":{\"myfield\":[[dojo.validate.isInRange," +
-                "{min:20.0,decimal:\",\",separator:\" \"}]]},\"myfield\":" +
+                "{min:20.0,decimal:\",\",separator:\""
+                + symbols.getGroupingSeparator()
+                + "\"}]]},\"myfield\":" +
                 "{\"constraints\":[\"custom\\\\message\"]}}");
     }