diff -r 000000000000 -r 9a66ca7c79fa test/com/sun/javadoc/testEncoding/TestEncoding.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/com/sun/javadoc/testEncoding/TestEncoding.java	Sat Dec 01 00:00:00 2007 +0000
@@ -0,0 +1,74 @@
+/*
+ * Copyright 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 4661481
+ * @summary This test determines if the value of the -encoding option is
+ * properly passed from Javadoc to the source file parser.
+ * @author jamieh
+ * @library ../lib/
+ * @build JavadocTester
+ * @build TestEncoding
+ * @run main TestEncoding
+ */
+
+public class TestEncoding extends JavadocTester {
+
+    private static final String BUG_ID = "4661481";
+    private static final String[][] TEST = NO_TEST;
+
+    //If ??? is found in the output, the source file was not read with the correct encoding setting.
+    private static final String[][] NEGATED_TEST = {
+        {BUG_ID + FS + "EncodeTest.html", "???"}
+    };
+    private static final String[] ARGS =
+        new String[] {
+            "-d", BUG_ID, "-sourcepath", SRC_DIR,
+            "-encoding", "SJIS", SRC_DIR + FS + "EncodeTest.java"
+        };
+
+    /**
+     * The entry point of the test.
+     * @param args the array of command line arguments.
+     */
+    public static void main(String[] args) {
+        TestEncoding tester = new TestEncoding();
+        run(tester, ARGS, TEST, NEGATED_TEST);
+        tester.printSummary();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public String getBugId() {
+        return BUG_ID;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public String getBugName() {
+        return getClass().getName();
+    }
+}