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

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

@@ -21,20 +21,23 @@
  * 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;
+package test.javafx.util.converter;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Collection;
 import java.util.Date;
 import java.util.Locale;
 import java.util.TimeZone;
+import javafx.util.converter.LocalTimeStringConverterShim;
+import javafx.util.converter.DateTimeStringConverterShim;
+import javafx.util.converter.TimeStringConverter;
 import static org.junit.Assert.*;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;

@@ -118,28 +121,29 @@
     /*********************************************************************
      * Test constructors
      ********************************************************************/ 
     
     @Test public void testConstructor() {
-        assertEquals(locale, converter.locale);
-        assertEquals(timeStyle, converter.timeStyle);
-        assertEquals(pattern, converter.pattern);
-        assertEquals(dateFormat, converter.dateFormat);
+        assertEquals(locale, DateTimeStringConverterShim.getLocale(converter));
+        assertEquals(timeStyle, DateTimeStringConverterShim.getTimeStyle(converter));
+        assertEquals(pattern, DateTimeStringConverterShim.getPattern(converter));
+        assertEquals(dateFormat, DateTimeStringConverterShim.getDateFormatVar(converter));
     }
     
     
     /*********************************************************************
      * Test methods
      ********************************************************************/   
     
     @Test public void getDateFormat() {
-        assertNotNull(converter.getDateFormat());
+        assertNotNull(DateTimeStringConverterShim.getDateFormat(converter));
     }
     
     @Test public void getDateFormat_nonNullPattern() {
         converter = new TimeStringConverter("HH");
-        assertTrue(converter.getDateFormat() instanceof SimpleDateFormat);
+        assertTrue(DateTimeStringConverterShim.getDateFormat(converter)
+                instanceof SimpleDateFormat);
     }
     
     
     /*********************************************************************
      * Test toString / fromString methods