--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/javax/naming/ldap/LdapName/EscapeUnescapeTests.java	Tue Sep 12 19:03:39 2017 +0200
@@ -0,0 +1,99 @@
+/*
+ * Copyright (c) 2003, 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.
+ *
+ * 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.
+ */
+
+/*
+ * @test
+ * @bug 4635618
+ * @summary Support for manipulating LDAP Names
+ */
+
+import javax.naming.ldap.Rdn;
+
+/**
+ * Tests for Rdn escapeValue and unescapeValue methods
+ */
+public class EscapeUnescapeTests {
+
+    public static void main(String args[]) throws Exception {
+
+        /**
+         * Unescape tests
+         */
+        String[] invalids = new String[] {"\\", "\\\\\\" };
+
+        String[] valids = new String[] {"\\\\", "\\\\\\\\"};
+
+        String val;
+        Object unescVal = null;
+        System.out.println("##### Unescape value tests #####");
+
+        for (int i = 0; i < valids.length; i++) {
+            unescVal = Rdn.unescapeValue(valids[i]);
+            System.out.println("Orig val: " + valids[i] +
+                                "       Unescaped val: " + unescVal);
+        }
+
+        boolean isExcepThrown = false;
+        for (int i = 0; i < invalids.length; i++) {
+            val = "Juicy" + invalids[i] + "Fruit";
+            try {
+                unescVal = Rdn.unescapeValue(val);
+            } catch (IllegalArgumentException e) {
+                System.out.println("Caught the right exception: " + e);
+                isExcepThrown = true;
+            }
+            if (!isExcepThrown) {
+                throw new Exception(
+                        "Unescaped successfully an invalid string "
+                        + val + " as Rdn: " + unescVal);
+            }
+            isExcepThrown = false;
+        }
+
+        /**
+         * Escape tests
+         */
+        String[] values = new String[] {";", "<<<", "###", "=="};
+        System.out.println("##### Escape value tests #####");
+        printEscapedVal(values);
+
+        // leading space, trailing space
+        values = new String[] {"  leading space", "trailing space  "};
+        printEscapedVal(values);
+
+        // binary values
+        byte[] bytes = new byte[] {1, 2, 3, 4};
+        String escVal = Rdn.escapeValue(bytes);
+        System.out.println("Orig val: " + bytes +
+                                "       Escaped val: " + escVal);
+    }
+
+    static void printEscapedVal(Object[] values) {
+        String escVal;
+        for (int i = 0; i < values.length; i++) {
+            escVal = Rdn.escapeValue(values[i]);
+            System.out.println("Orig val: " + values[i] +
+                                "       Escaped val: " + escVal);
+        }
+    }
+}