--- /dev/null	2014-07-27 19:38:16.499796011 -0700
+++ new/modules/base/src/test/java/javafx/util/converter/LocalDateStringConverterTest.java	2014-08-04 16:58:40.283035709 -0700
@@ -0,0 +1,124 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * 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.util.Arrays;
+import java.time.LocalDate;
+import java.time.chrono.Chronology;
+import java.time.chrono.IsoChronology;
+import java.time.format.DateTimeFormatter;
+import java.time.format.FormatStyle;
+import java.util.Collection;
+import java.util.Locale;
+
+import javafx.util.StringConverter;
+
+import static org.junit.Assert.*;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.Ignore;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+/**
+ */
+@RunWith(Parameterized.class)
+public class LocalDateStringConverterTest {
+    private static final LocalDate VALID_DATE = LocalDate.of(1985, 1, 12);
+    
+    private static final DateTimeFormatter aFormatter = DateTimeFormatter.ofPattern("dd MM yyyy");
+    private static final DateTimeFormatter aParser = DateTimeFormatter.ofPattern("yyyy MM dd");
+
+
+    @Parameterized.Parameters public static Collection implementations() {
+        return Arrays.asList(new Object[][] {
+            { new LocalDateStringConverter(),
+              Locale.getDefault(Locale.Category.FORMAT), FormatStyle.SHORT,
+              VALID_DATE, null, null },
+
+            { new LocalDateStringConverter(aFormatter, aParser),
+              Locale.getDefault(Locale.Category.FORMAT), null,
+              VALID_DATE, aFormatter, aParser },
+
+            { new LocalDateStringConverter(FormatStyle.SHORT, Locale.UK, IsoChronology.INSTANCE),
+              Locale.UK, FormatStyle.SHORT,
+              VALID_DATE, null, null },
+        });
+    }
+
+    private LocalDateStringConverter converter;
+    private Locale locale;
+    private FormatStyle dateStyle;
+    private DateTimeFormatter formatter, parser;
+    private LocalDate validDate;
+    
+    public LocalDateStringConverterTest(LocalDateStringConverter converter, Locale locale, FormatStyle dateStyle, LocalDate validDate, DateTimeFormatter formatter, DateTimeFormatter parser) {
+        this.converter = converter;
+        this.locale = locale;
+        this.dateStyle = dateStyle;
+        this.validDate = validDate;
+        this.formatter = formatter;
+        this.parser = parser;
+    }
+    
+    @Before public void setup() {
+    }
+    
+    /*********************************************************************
+     * Test constructors
+     ********************************************************************/ 
+    
+    @Test public void testConstructor() {
+        assertEquals(locale, converter.ldtConverter.locale);
+        assertEquals((dateStyle != null) ? dateStyle : FormatStyle.SHORT, converter.ldtConverter.dateStyle);
+        assertNull(converter.ldtConverter.timeStyle);
+        if (formatter != null) {
+            assertEquals(formatter, converter.ldtConverter.formatter);
+        }
+        if (parser != null) {
+            assertEquals(parser, converter.ldtConverter.parser);
+        } else if (formatter != null) {
+            assertEquals(formatter, converter.ldtConverter.parser);
+        }
+    }
+    
+    
+    /*********************************************************************
+     * Test toString / fromString methods
+     ********************************************************************/    
+    
+    @Test public void toString_to_fromString_testRoundtrip() {
+        if (formatter == null) {
+            // Only the default formatter/parser can guarantee roundtrip symmetry
+            assertEquals(validDate, converter.fromString(converter.toString(validDate)));
+        }
+    }
+    
+    @Test(expected=RuntimeException.class)
+    public void fromString_testInvalidInput() {
+        converter.fromString("abcdefg");
+    }
+}