Initial load
diff --git a/test/java/net/URLEncoder/DecodeNonEncoded.java b/test/java/net/URLEncoder/DecodeNonEncoded.java
new file mode 100644
index 0000000..3858640
--- /dev/null
+++ b/test/java/net/URLEncoder/DecodeNonEncoded.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2000 Sun Microsystems, Inc. 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 4307323
+ * @summary Test URLDecoder on strings that are not legally
+ * encoded. Incomplete escape patterns or illegal hex characters will cause
+ * an exception to be thrown. Otherwise, illegal characters will be
+ * silently accepted.
+ *
+ */
+
+import java.net.URLDecoder;
+
+public class DecodeNonEncoded {
+
+ static String[] errorStrings
+ = {"%", "%A", "Hello%", "%xy", "%az", "%ab%q"};
+ static String[] ignoreStrings = {"#", "X@Y", "Hello There"};
+
+ public static void main(String[] args) throws Exception {
+
+ for (int i = 0; i < errorStrings.length; i++) {
+ try {
+ URLDecoder.decode(errorStrings[i]);
+ throw new Exception("String \"" + errorStrings[i]
+ + "\" should have failed in URLDecoder.decode!");
+ } catch (IllegalArgumentException e) {
+ // All ok. Got to next string.
+ System.out.println("String \"" + errorStrings[i]
+ + "\" correctly threw IllegalArgumentException: "
+ + e.getMessage());
+ }
+ }
+
+ String temp;
+ for (int i = 0; i < ignoreStrings.length; i++) {
+ temp = URLDecoder.decode(ignoreStrings[i]);
+ if (!temp.equals(ignoreStrings[i]))
+ throw new Exception("String \"" + ignoreStrings[i]
+ + "\" was converted to " + temp
+ +" by URLDecoder.decode to ");
+ else
+ System.out.println("String \"" + temp
+ + "\" was left unchanged by URLDecoder.decode.");
+ }
+
+ }
+}
diff --git a/test/java/net/URLEncoder/Decoder.java b/test/java/net/URLEncoder/Decoder.java
new file mode 100644
index 0000000..1c19094
--- /dev/null
+++ b/test/java/net/URLEncoder/Decoder.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2001-2002 Sun Microsystems, Inc. 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/**
+ * @test
+ * @bug 4407610
+ * @summary java.net.URLDecode.decode(st,"UTF-16") works incorrectly on '+' sign
+ */
+
+import java.net.*;
+
+public class Decoder {
+
+ public static void main(String args[]) throws Exception {
+
+ boolean passed = true;
+ String enc = "UTF-16";
+ String strings[] = {
+ "\u0100\u0101",
+ "\u0100 \u0101",
+ "\u0100 \u0101\u0102",
+ "\u0100 \u0101 \u0102",
+ "\u0100C\u0101 \u0102",
+ "\u0100\u0101\u0102",
+ "?&?&?&?&?&?&?&?&?&?&?&?&?&?&?&?&?&?&?&?&?&?&?&?&?&?&?&?&?&?&?&?&?&?&?&?&?&?&?&?&?&?&?&",
+ "foobar",
+ "foo?bar"
+ };
+
+ for (int i = 0; i < strings.length; i++) {
+ String encoded = URLEncoder.encode(strings[i], enc);
+ System.out.println("ecnoded: " + encoded);
+ String decoded = URLDecoder.decode(encoded, enc);
+ System.out.print("init: ");
+ printString(strings[i]);
+ System.out.print("decoded: ");
+ printString(decoded);
+ if (strings[i].equals(decoded)) {
+ System.out.println(" - correct - \n");
+ } else {
+ System.out.println(" - incorrect - \n");
+ throw new RuntimeException ("Unexpected decoded output on string " + i);
+ }
+ }
+ }
+
+ static void printString(String s) {
+ for (int i = 0; i < s.length(); i++) {
+ System.out.print((int)s.charAt(i) + " ");
+ }
+ System.out.println();
+ }
+}
diff --git a/test/java/net/URLEncoder/SurrogatePairs.java b/test/java/net/URLEncoder/SurrogatePairs.java
new file mode 100644
index 0000000..2e8519e
--- /dev/null
+++ b/test/java/net/URLEncoder/SurrogatePairs.java
@@ -0,0 +1,125 @@
+/*
+ * Copyright 2001 Sun Microsystems, Inc. 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 4396708
+ * @summary Test URL encoder and decoder on a string that contains
+ * surrogate pairs.
+ *
+ */
+
+import java.io.*;
+import java.net.*;
+
+/*
+ * Surrogate pairs are two character Unicode sequences where the first
+ * character lies in the range [d800, dbff] and the second character lies
+ * in the range [dc00, dfff]. They are used as an escaping mechanism to add
+ * 1M more characters to Unicode.
+ */
+public class SurrogatePairs {
+
+ static String[] testStrings = {"\uD800\uDC00",
+ "\uD800\uDFFF",
+ "\uDBFF\uDC00",
+ "\uDBFF\uDFFF",
+ "1\uDBFF\uDC00",
+ "@\uDBFF\uDC00",
+ "\uDBFF\uDC001",
+ "\uDBFF\uDC00@",
+ "\u0101\uDBFF\uDC00",
+ "\uDBFF\uDC00\u0101"
+ };
+
+ static String[] correctEncodings = {"%F0%90%80%80",
+ "%F0%90%8F%BF",
+ "%F4%8F%B0%80",
+ "%F4%8F%BF%BF",
+ "1%F4%8F%B0%80",
+ "%40%F4%8F%B0%80",
+ "%F4%8F%B0%801",
+ "%F4%8F%B0%80%40",
+ "%C4%81%F4%8F%B0%80",
+ "%F4%8F%B0%80%C4%81"
+ };
+
+ public static void main(String[] args) throws Exception {
+
+ for (int i=0; i < testStrings.length; i++) {
+ test(testStrings[i], correctEncodings[i]);
+ }
+ }
+
+ private static void test(String str, String correctEncoding)
+ throws Exception {
+
+ System.out.println("Unicode bytes of test string are: "
+ + getHexBytes(str));
+
+ String encoded = URLEncoder.encode(str, "UTF-8");
+
+ System.out.println("URLEncoding is: " + encoded);
+
+ if (encoded.equals(correctEncoding))
+ System.out.println("The encoding is correct!");
+ else {
+ throw new Exception("The encoding is incorrect!" +
+ " It should be " + correctEncoding);
+ }
+
+ String decoded = URLDecoder.decode(encoded, "UTF-8");
+
+ System.out.println("Unicode bytes for URLDecoding are: "
+ + getHexBytes(decoded));
+
+ if (str.equals(decoded))
+ System.out.println("The decoding is correct");
+ else {
+ throw new Exception("The decoded is not equal to the original");
+ }
+ System.out.println("---");
+ }
+
+ private static String getHexBytes(String s) throws Exception {
+ StringBuffer sb = new StringBuffer();
+ for (int i = 0; i < s.length(); i++) {
+
+ int a = s.charAt(i);
+ int b1 = (a >>8) & 0xff;
+ int b2 = (byte)a;
+ int b11 = (b1>>4) & 0x0f;
+ int b12 = b1 & 0x0f;
+ int b21 = (b2 >>4) & 0x0f;
+ int b22 = b2 & 0x0f;
+
+ sb.append(Integer.toHexString(b11));
+ sb.append(Integer.toHexString(b12));
+ sb.append(Integer.toHexString(b21));
+ sb.append(Integer.toHexString(b22));
+ sb.append(' ');
+ }
+ return sb.toString();
+ }
+
+}
diff --git a/test/java/net/URLEncoder/URLEncodeDecode.java b/test/java/net/URLEncoder/URLEncodeDecode.java
new file mode 100644
index 0000000..1bd1873
--- /dev/null
+++ b/test/java/net/URLEncoder/URLEncodeDecode.java
@@ -0,0 +1,127 @@
+/*
+ * Copyright 2000-2001 Sun Microsystems, Inc. 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 4257115
+ * @summary Test URL encoder and decoder on a string that contains
+ * characters within and beyond the 8859-1 range.
+ *
+ */
+
+import java.io.*;
+import java.net.*;
+
+public class URLEncodeDecode {
+
+ static char chars[] = {'H', 'e', 'l', 'l', 'o',
+ ' ', '+', '%',
+ '-', '_', '.', '!', '~', '*', '\'', '(',
+ ')',
+ '@',
+ '\u00ae', '\u0101', '\u10a0'};
+
+ static String str = new String(chars);
+
+ static String correctEncodedUTF8 =
+ "Hello+%2B%25-_.%21%7E*%27%28%29%40%C2%AE%C4%81%E1%82%A0";
+
+ public static void main(String[] args) throws Exception {
+
+ System.out.println("Constructed the string: " + str);
+ System.out.println("The Unicode bytes are: " +
+ getHexBytes(str));
+ System.out.println("");
+ test("UTF-8", correctEncodedUTF8);
+ }
+
+ private static void test(String enc, String correctEncoded)
+ throws Exception{
+
+ String encoded = null;
+ String outStr = null;
+
+ if (enc == null) {
+ encoded = URLEncoder.encode(str);
+ outStr = "default";
+ }
+ else {
+ encoded = URLEncoder.encode(str, enc);
+ outStr = enc;
+ }
+
+ System.out.println("URLEncode it ("
+ + outStr + ") : " + encoded);
+ System.out.println("The Unicode bytes are: " +
+ getHexBytes(encoded));
+
+ if (encoded.equals(correctEncoded))
+ System.out.println("The encoding is correct!");
+ else {
+ throw new Exception("The encoding is incorrect!" +
+ " It should be " + correctEncoded);
+ }
+ System.out.println("");
+
+ String decoded = null;
+
+ if (enc == null)
+ decoded = URLDecoder.decode(encoded);
+ else
+ decoded = URLDecoder.decode(encoded, enc);
+
+ System.out.println("URLDecode it ("
+ + outStr + ") : " + decoded);
+ System.out.println("The Unicode bytes are: " +
+ getHexBytes(decoded));
+
+ if (str.equals(decoded))
+ System.out.println("The decoding is correct");
+ else {
+ throw new Exception("The decoded is not equal to the original");
+ }
+
+ }
+
+ private static String getHexBytes(String s) throws Exception {
+ StringBuffer sb = new StringBuffer();
+ for (int i = 0; i < s.length(); i++) {
+
+ int a = s.charAt(i);
+ int b1 = (a >>8) & 0xff;
+ int b2 = (byte)a;
+ int b11 = (b1>>4) & 0x0f;
+ int b12 = b1 & 0x0f;
+ int b21 = (b2 >>4) & 0x0f;
+ int b22 = b2 & 0x0f;
+
+ sb.append(Integer.toHexString(b11));
+ sb.append(Integer.toHexString(b12));
+ sb.append(Integer.toHexString(b21));
+ sb.append(Integer.toHexString(b22));
+ sb.append(' ');
+ }
+ return sb.toString();
+ }
+
+}
diff --git a/test/java/net/URLEncoder/URLEncoderEncodeArgs.java b/test/java/net/URLEncoder/URLEncoderEncodeArgs.java
new file mode 100644
index 0000000..cb7dd8e
--- /dev/null
+++ b/test/java/net/URLEncoder/URLEncoderEncodeArgs.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2001 Sun Microsystems, Inc. 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/**
+ * @test
+ * @bug 4395472
+ * @summary java.net.URLEncode.encode(s, enc) treats an empty encoding name as "UTF-8"
+ */
+import java.net.URLEncoder;
+import java.io.UnsupportedEncodingException;
+
+public class URLEncoderEncodeArgs {
+ public static void main (String[] args) {
+ try {
+ String s1 = URLEncoder.encode ("Hello World", null);
+ } catch (UnsupportedEncodingException e) {
+ throw new RuntimeException ("NPE should have been thrown");
+ } catch (NullPointerException e) {
+ try {
+ String s2 = URLEncoder.encode ("Hello World", "");
+ } catch (UnsupportedEncodingException ee) {
+ return;
+ }
+ throw new RuntimeException ("empty string was accepted as encoding name");
+ }
+ throw new RuntimeException ("null reference was accepted as encoding name");
+ }
+}