modules/base/src/test/java/test/javafx/util/converter/NumberStringConverterTest.java

rev 9235 : 8134760: Refactor Javafx base module tests for clear separation of tests
Reviewed-by:

*** 21,35 ****
   * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  
! package javafx.util.converter;
  
  import java.text.DecimalFormat;
  import java.text.NumberFormat;
  import java.util.Locale;
  import static org.junit.Assert.*;
  
  import org.junit.Before;
  import org.junit.Test;
  
--- 21,38 ----
   * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  
! package test.javafx.util.converter;
  
  import java.text.DecimalFormat;
  import java.text.NumberFormat;
  import java.util.Locale;
+ import javafx.util.converter.LocalTimeStringConverterShim;
+ import javafx.util.converter.NumberStringConverter;
+ import javafx.util.converter.NumberStringConverterShim;
  import static org.junit.Assert.*;
  
  import org.junit.Before;
  import org.junit.Test;
  
*** 46,107 ****
       * Test constructors
       ********************************************************************/ 
      
      @Test public void testDefaultConstructor() {
          NumberStringConverter c = new NumberStringConverter();
!         assertEquals(Locale.getDefault(), c.locale);
!         assertNull(c.pattern);
!         assertNull(c.numberFormat);
      }
      
      @Test public void testConstructor_locale() {
          NumberStringConverter c = new NumberStringConverter(Locale.CANADA);
!         assertEquals(Locale.CANADA, c.locale);
!         assertNull(c.pattern);
!         assertNull(c.numberFormat);
      }
      
      @Test public void testConstructor_pattern() {
          NumberStringConverter c = new NumberStringConverter("#,##,###,####");
!         assertEquals(Locale.getDefault(), c.locale);
!         assertEquals("#,##,###,####", c.pattern);
!         assertNull(c.numberFormat);
      }
      
      @Test public void testConstructor_locale_pattern() {
          NumberStringConverter c = new NumberStringConverter(Locale.CANADA, "#,##,###,####");
!         assertEquals(Locale.CANADA, c.locale);
!         assertEquals("#,##,###,####", c.pattern);
!         assertNull(c.numberFormat);
      }
      
      @Test public void testConstructor_numberFormat() {
          NumberFormat format = NumberFormat.getCurrencyInstance(Locale.JAPAN);
          NumberStringConverter c = new NumberStringConverter(format);
!         assertNull(c.locale);
!         assertNull(c.pattern);
!         assertEquals(format, c.numberFormat);
      }
      
  
      /*********************************************************************
       * Test methods
       ********************************************************************/   
      
      @Test public void getNumberFormat_default() {
!         assertNotNull(converter.getNumberFormat());
      }
      
      @Test public void getNumberFormat_nonNullPattern() {
          converter = new NumberStringConverter("#,##,###,####");
!         assertTrue(converter.getNumberFormat() instanceof DecimalFormat);
      }
      
      @Test public void getNumberFormat_nonNullNumberFormat() {
          NumberFormat nf = NumberFormat.getCurrencyInstance();
          converter = new NumberStringConverter(nf);
!         assertEquals(nf, converter.getNumberFormat());
      }
      
      
      /*********************************************************************
       * Test toString / fromString methods
--- 49,112 ----
       * Test constructors
       ********************************************************************/ 
      
      @Test public void testDefaultConstructor() {
          NumberStringConverter c = new NumberStringConverter();
!         assertEquals(Locale.getDefault(), NumberStringConverterShim.getLocale(c));
!         assertNull(NumberStringConverterShim.getPattern(c));
!         assertNull(NumberStringConverterShim.getNumberFormatVar(c));
      }
      
      @Test public void testConstructor_locale() {
          NumberStringConverter c = new NumberStringConverter(Locale.CANADA);
!         assertEquals(Locale.CANADA, NumberStringConverterShim.getLocale(c));
!         assertNull(NumberStringConverterShim.getPattern(c));
!         assertNull(NumberStringConverterShim.getNumberFormatVar(c));
      }
      
      @Test public void testConstructor_pattern() {
          NumberStringConverter c = new NumberStringConverter("#,##,###,####");
!         assertEquals(Locale.getDefault(), NumberStringConverterShim.getLocale(c));
!         assertEquals("#,##,###,####", NumberStringConverterShim.getPattern(c));
!         assertNull(NumberStringConverterShim.getNumberFormatVar(c));
      }
      
      @Test public void testConstructor_locale_pattern() {
          NumberStringConverter c = new NumberStringConverter(Locale.CANADA, "#,##,###,####");
!         assertEquals(Locale.CANADA, NumberStringConverterShim.getLocale(c));
!         assertEquals("#,##,###,####", NumberStringConverterShim.getPattern(c));
!         assertNull(NumberStringConverterShim.getNumberFormatVar(c));
      }
      
      @Test public void testConstructor_numberFormat() {
          NumberFormat format = NumberFormat.getCurrencyInstance(Locale.JAPAN);
          NumberStringConverter c = new NumberStringConverter(format);
!         assertNull(NumberStringConverterShim.getLocale(c));
!         assertNull(NumberStringConverterShim.getPattern(c));
!         assertEquals(format, NumberStringConverterShim.getNumberFormatVar(c));
      }
      
  
      /*********************************************************************
       * Test methods
       ********************************************************************/   
      
      @Test public void getNumberFormat_default() {
!         assertNotNull(NumberStringConverterShim.getNumberFormat(converter));
      }
      
      @Test public void getNumberFormat_nonNullPattern() {
          converter = new NumberStringConverter("#,##,###,####");
!         assertTrue(
!                 NumberStringConverterShim.getNumberFormat(converter)
!                 instanceof DecimalFormat);
      }
      
      @Test public void getNumberFormat_nonNullNumberFormat() {
          NumberFormat nf = NumberFormat.getCurrencyInstance();
          converter = new NumberStringConverter(nf);
!         assertEquals(nf, NumberStringConverterShim.getNumberFormat(converter));
      }
      
      
      /*********************************************************************
       * Test toString / fromString methods