changeset 1100:a8d091314db7

Automated merge with ssh://jfxsrc.us.oracle.com//javafx/2.2/scrum/graphics/jfx//rt
author Martin Sladecek <martin.sladecek@oracle.com>
date Tue, 22 May 2012 12:53:41 +0200
parents c97f5036f81f 263c12935d94
children 908b36f4a14e
files
diffstat 2 files changed, 7 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/javafx-util-converter/test/javafx/util/converter/CurrencyStringConverterTest.java	Tue May 22 11:34:58 2012 +0400
+++ b/javafx-util-converter/test/javafx/util/converter/CurrencyStringConverterTest.java	Tue May 22 12:53:41 2012 +0200
@@ -26,6 +26,7 @@
 
 import java.text.DecimalFormat;
 import java.text.NumberFormat;
+import java.util.Currency;
 import java.util.Locale;
 import static org.junit.Assert.*;
 
@@ -107,14 +108,17 @@
      ********************************************************************/    
     
     @Test public void fromString_testValidStringInput() {
+        Locale.setDefault(Locale.US);
         assertEquals(10.32, converter.fromString("$10.32"));
     }
     
     @Test public void fromString_testValidStringInputWithWhiteSpace() {
+        Locale.setDefault(Locale.US);
         assertEquals(10.32, converter.fromString("      $10.32      "));
     }
     
     @Test public void toString_validInput() {
+        Locale.setDefault(Locale.US);
         assertEquals("$10.32", converter.toString(10.32));
     }
 }
--- a/javafx-util-converter/test/javafx/util/converter/TimeStringConverterTest.java	Tue May 22 11:34:58 2012 +0400
+++ b/javafx-util-converter/test/javafx/util/converter/TimeStringConverterTest.java	Tue May 22 12:53:41 2012 +0200
@@ -126,14 +126,17 @@
      ********************************************************************/    
     
     @Test public void fromString_testValidInput() {
+        Locale.setDefault(Locale.US);
         assertEquals(VALID_TIME, converter.fromString(VALID_TIME_STRING));
     }
     
     @Test public void fromString_testValidInputWithWhiteSpace() {
+        Locale.setDefault(Locale.US);
         assertEquals(VALID_TIME, converter.fromString("      " + VALID_TIME_STRING + "      "));
     }
     
     @Test public void toString_validInput() {
+        Locale.setDefault(Locale.US);
         assertEquals(VALID_TIME_STRING, converter.toString(VALID_TIME));
     }
 }