modules/base/src/test/java/test/javafx/util/converter/LocalDateStringConverterTest.java
Print this page
rev 9235 : 8134760: Refactor Javafx base module tests for clear separation of tests
Reviewed-by:
@@ -21,11 +21,11 @@
* 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.util.Arrays;
import java.time.LocalDate;
import java.time.chrono.Chronology;
import java.time.chrono.IsoChronology;
@@ -33,10 +33,13 @@
import java.time.format.FormatStyle;
import java.util.Collection;
import java.util.Locale;
import javafx.util.StringConverter;
+import javafx.util.converter.LocalTimeStringConverterShim;
+import javafx.util.converter.LocalDateStringConverter;
+import javafx.util.converter.LocalDateStringConverterShim;
import static org.junit.Assert.*;
import org.junit.Before;
import org.junit.Test;
import org.junit.Ignore;
@@ -90,20 +93,24 @@
/*********************************************************************
* Test constructors
********************************************************************/
@Test public void testConstructor() {
- assertEquals(locale, converter.ldtConverter.locale);
- assertEquals((dateStyle != null) ? dateStyle : FormatStyle.SHORT, converter.ldtConverter.dateStyle);
- assertNull(converter.ldtConverter.timeStyle);
+ assertEquals(locale, LocalDateStringConverterShim.getldtConverterLocale(converter));
+ assertEquals((dateStyle != null) ? dateStyle : FormatStyle.SHORT,
+ LocalDateStringConverterShim.getldtConverterDateStyle(converter));
+ assertNull(LocalDateStringConverterShim.getldtConverterTimeStyle(converter));
if (formatter != null) {
- assertEquals(formatter, converter.ldtConverter.formatter);
+ assertEquals(formatter,
+ LocalDateStringConverterShim.getldtConverterFormatter(converter));
}
if (parser != null) {
- assertEquals(parser, converter.ldtConverter.parser);
+ assertEquals(parser,
+ LocalDateStringConverterShim.getldtConverterParser(converter));
} else if (formatter != null) {
- assertEquals(formatter, converter.ldtConverter.parser);
+ assertEquals(formatter,
+ LocalDateStringConverterShim.getldtConverterParser(converter));
}
}
/*********************************************************************