From ddcb9249f0c5abf3d27402219a313a75c6596eb6 Mon Sep 17 00:00:00 2001 From: malenkov Date: Wed, 18 Jun 2008 19:15:23 +0400 Subject: [PATCH] 6708550: LTP: XMLEncoder does not encode instances of the File class Reviewed-by: peterz, loneid --- src/share/classes/java/io/File.java | 2 + test/java/beans/XMLEncoder/java_io_File.java | 47 ++++++++++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 test/java/beans/XMLEncoder/java_io_File.java diff --git a/src/share/classes/java/io/File.java b/src/share/classes/java/io/File.java index e36ee120b..7c58136a4 100644 --- a/src/share/classes/java/io/File.java +++ b/src/share/classes/java/io/File.java @@ -25,6 +25,7 @@ package java.io; +import java.beans.ConstructorProperties; import java.net.URI; import java.net.URL; import java.net.MalformedURLException; @@ -234,6 +235,7 @@ public class File * @throws NullPointerException * If the pathname argument is null */ + @ConstructorProperties("path") public File(String pathname) { if (pathname == null) { throw new NullPointerException(); diff --git a/test/java/beans/XMLEncoder/java_io_File.java b/test/java/beans/XMLEncoder/java_io_File.java new file mode 100644 index 000000000..282949b01 --- /dev/null +++ b/test/java/beans/XMLEncoder/java_io_File.java @@ -0,0 +1,47 @@ +/* + * Copyright 2008 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 6708550 + * @summary Tests File encoding + * @author Sergey Malenkov + */ + +import java.io.File; + +public final class java_io_File extends AbstractTest { + public static void main(String[] args) { + new java_io_File().test(true); + } + + @Override + protected File getObject() { + return new File("test.txt"); // NON-NLS: local file + } + + @Override + protected File getAnotherObject() { + return new File("/pub/demo/"); // NON-NLS: path + } +} -- GitLab