infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-04-08 05:58:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Tim Bell 2009-08-18 17:45:46 -07:00
commit 7cf8652f4d
24 changed files with 772 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jdk/src/share/classes/com/sun/security/auth/callback/TextCallbackHandler.java
View File

@ -129,7 +129,7 @@ public class TextCallbackHandler implements CallbackHandler {
System.err.print(pc.getPrompt());
System.err.flush();
pc.setPassword(Password.readPassword(System.in));
pc.setPassword(Password.readPassword(System.in, pc.isEchoOn()));
} else if (callbacks[i] instanceof ConfirmationCallback) {
confirmation = (ConfirmationCallback) callbacks[i];

2
jdk/src/share/classes/com/sun/security/sasl/Provider.java
View File

@ -51,7 +51,7 @@ public final class Provider extends java.security.Provider {
" server mechanisms for: DIGEST-MD5, GSSAPI, CRAM-MD5)";
public Provider() {
super("SunSASL", 1.5, info);
super("SunSASL", 1.7d, info);
AccessController.doPrivileged(new PrivilegedAction<Void>() {
public Void run() {

48
jdk/src/share/classes/java/lang/String.java
View File

@ -2301,6 +2301,54 @@ public final class String
* @spec JSR-51
*/
public String[] split(String regex, int limit) {
/* fastpath if the regex is a
(1)one-char String and this character is not one of the
RegEx's meta characters ".$|()[{^?*+\\", or
(2)two-char String and the first char is the backslash and
the second is not the ascii digit or ascii letter.
*/
char ch = 0;
if (((regex.count == 1 &&
".$|()[{^?*+\\".indexOf(ch = regex.charAt(0)) == -1) ||
(regex.length() == 2 &&
regex.charAt(0) == '\\' &&
(((ch = regex.charAt(1))-'0')|('9'-ch)) < 0 &&
((ch-'a')|('z'-ch)) < 0 &&
((ch-'A')|('Z'-ch)) < 0)) &&
(ch < Character.MIN_HIGH_SURROGATE ||
ch > Character.MAX_LOW_SURROGATE))
{
int off = 0;
int next = 0;
boolean limited = limit > 0;
ArrayList<String> list = new ArrayList<String>();
while ((next = indexOf(ch, off)) != -1) {
if (!limited || list.size() < limit - 1) {
list.add(substring(off, next));
off = next + 1;
} else { // last one
//assert (list.size() == limit - 1);
list.add(substring(off, count));
off = count;
break;
}
}
// If no match was found, return this
if (off == 0)
return new String[] { this };
// Add remaining segment
if (!limited || list.size() < limit)
list.add(substring(off, count));
// Construct result
int resultSize = list.size();
if (limit == 0)
while (resultSize > 0 && list.get(resultSize-1).length() == 0)
resultSize--;
String[] result = new String[resultSize];
return list.subList(0, resultSize).toArray(result);
}
return Pattern.compile(regex).split(this, limit);
}

6
jdk/src/share/classes/sun/nio/cs/ext/ISO2022.java
View File

@ -388,9 +388,9 @@ abstract class ISO2022
protected static class Encoder extends CharsetEncoder {
private final Surrogate.Parser sgp = new Surrogate.Parser();
private final byte SS2 = (byte)0x8e;
private final byte PLANE2 = (byte)0xA2;
private final byte PLANE3 = (byte)0xA3;
public static final byte SS2 = (byte)0x8e;
public static final byte PLANE2 = (byte)0xA2;
public static final byte PLANE3 = (byte)0xA3;
private final byte MSB = (byte)0x80;
protected final byte maximumDesignatorLength = 4;

9
jdk/src/share/classes/sun/nio/cs/ext/ISO2022_CN_CNS.java
View File

@ -76,6 +76,15 @@ public class ISO2022_CN_CNS extends ISO2022 implements HistoricallyNamedCharset
} catch (Exception e) { }
}
private byte[] bb = new byte[4];
public boolean canEncode(char c) {
int n = 0;
return (c <= '\u007f' ||
(n = ((EUC_TW.Encoder)ISOEncoder).toEUC(c, bb)) == 2 ||
(n == 4 && bb[0] == SS2 &&
(bb[1] == PLANE2 || bb[1] == PLANE3)));
}
/*
* Since ISO2022-CN-CNS possesses a CharsetEncoder
* without the corresponding CharsetDecoder half the

2
jdk/src/share/classes/sun/security/jgss/SunProvider.java
View File

@ -62,7 +62,7 @@ public final class SunProvider extends Provider {
public SunProvider() {
/* We are the Sun JGSS provider */
super("SunJGSS", 1.0, INFO);
super("SunJGSS", 1.7d, INFO);
AccessController.doPrivileged(
new java.security.PrivilegedAction<Void>() {

2
jdk/src/share/classes/sun/security/provider/Sun.java
View File

@ -46,7 +46,7 @@ public final class Sun extends Provider {
public Sun() {
/* We are the SUN provider */
super("SUN", 1.6, INFO);
super("SUN", 1.7, INFO);
// if there is no security manager installed, put directly into
// the provider. Otherwise, create a temporary map and use a

2
jdk/src/share/classes/sun/security/smartcardio/SunPCSC.java
View File

@ -40,7 +40,7 @@ public final class SunPCSC extends Provider {
private static final long serialVersionUID = 6168388284028876579L;
public SunPCSC() {
super("SunPCSC", 1.6d, "Sun PC/SC provider");
super("SunPCSC", 1.7d, "Sun PC/SC provider");
AccessController.doPrivileged(new PrivilegedAction<Void>() {
public Void run() {
put("TerminalFactory.PC/SC", "sun.security.smartcardio.SunPCSC$Factory");

2
jdk/src/share/classes/sun/security/ssl/SunJSSE.java
View File

@ -103,7 +103,7 @@ public abstract class SunJSSE extends java.security.Provider {
// standard constructor
protected SunJSSE() {
super("SunJSSE", 1.6d, info);
super("SunJSSE", 1.7d, info);
subclassCheck();
if (Boolean.TRUE.equals(fips)) {
throw new ProviderException

12
jdk/src/share/classes/sun/security/util/Password.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved.
* Copyright 2003-2009 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
@ -37,6 +37,14 @@ import java.util.Arrays;
public class Password {
/** Reads user password from given input stream. */
public static char[] readPassword(InputStream in) throws IOException {
return readPassword(in, false);
}
/** Reads user password from given input stream.
* @param isEchoOn true if the password should be echoed on the screen
*/
public static char[] readPassword(InputStream in, boolean isEchoOn)
throws IOException {
char[] consoleEntered = null;
byte[] consoleBytes = null;
@ -44,7 +52,7 @@ public class Password {
try {
// Use the new java.io.Console class
Console con = null;
if (in == System.in && ((con = System.console()) != null)) {
if (!isEchoOn && in == System.in && ((con = System.console()) != null)) {
consoleEntered = con.readPassword();
// readPassword returns "" if you just print ENTER,
// to be compatible with old Password class, change to null

18
jdk/src/windows/classes/sun/nio/fs/WindowsFileSystem.java
View File

@ -283,25 +283,15 @@ class WindowsFileSystem
}
}
// match in uppercase
StringBuilder sb = new StringBuilder(expr.length());
for (int i=0; i<expr.length(); i++) {
sb.append(Character.toUpperCase(expr.charAt(i)));
}
expr = sb.toString();
// match in unicode_case_insensitive
final Pattern pattern = Pattern.compile(expr,
Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
// return matcher
final Pattern pattern = Pattern.compile(expr);
return new PathMatcher() {
@Override
public boolean matches(Path path) {
// match in uppercase
String s = path.toString();
StringBuilder sb = new StringBuilder(s.length());
for (int i=0; i<s.length(); i++) {
sb.append( Character.toUpperCase(s.charAt(i)) );
}
return pattern.matcher(sb).matches();
return pattern.matcher(path.toString()).matches();
}
};
}

47
jdk/test/com/sun/security/auth/callback/TextCallbackHandler/Password.java Normal file
View File

@ -0,0 +1,47 @@
/*
* Copyright 2009 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 6825240
* @summary Password.readPassword() echos the input when System.Console is null
* @ignore run these by hand
*/
import com.sun.security.auth.callback.TextCallbackHandler;
import javax.security.auth.callback.*;
public class Password {
public static void main(String args[]) throws Exception {
TextCallbackHandler h = new TextCallbackHandler();
PasswordCallback nc = new PasswordCallback("Invisible: ", false);
PasswordCallback nc2 = new PasswordCallback("Visible: ", true);
System.out.println("Two passwords will be prompted for. The first one " +
"should have echo off, the second one on. Otherwise, this test fails");
Callback[] callbacks = { nc, nc2 };
h.handle(callbacks);
System.out.println("You input " + new String(nc.getPassword()) +
" and " + new String(nc2.getPassword()));
}
}

47
jdk/test/java/lang/String/Split.java
View File

@ -23,14 +23,18 @@
/**
* @test
* @bug 6840246
* @summary test String.split()
*/
import java.util.Arrays;
import java.util.Random;
import java.util.regex.*;
public class Split {
public static void main(String[] args) throws Exception {
String source = "0123456789";
for (int limit=-2; limit<3; limit++) {
for (int x=0; x<10; x++) {
String[] result = source.split(Integer.toString(x), limit);
@ -80,5 +84,48 @@ public class Split {
throw new RuntimeException("String.split failure 8");
if (!result[0].equals(source))
throw new RuntimeException("String.split failure 9");
// check fastpath of String.split()
source = "0123456789abcdefgABCDEFG";
Random r = new Random();
for (boolean doEscape: new boolean[] {false, true}) {
for (int cp = 0; cp < 0x11000; cp++) {
Pattern p = null;
String regex = new String(Character.toChars(cp));
if (doEscape)
regex = "\\" + regex;
try {
p = Pattern.compile(regex);
} catch (PatternSyntaxException pse) {
// illegal syntax
try {
"abc".split(regex);
} catch (PatternSyntaxException pse0) {
continue;
}
throw new RuntimeException("String.split failure 11");
}
int off = r.nextInt(source.length());
String[] srcStrs = new String[] {
"",
source,
regex + source,
source + regex,
source.substring(0, 3)
+ regex + source.substring(3, 9)
+ regex + source.substring(9, 15)
+ regex + source.substring(15),
source.substring(0, off) + regex + source.substring(off)
};
for (String src: srcStrs) {
for (int limit=-2; limit<3; limit++) {
if (!Arrays.equals(src.split(regex, limit),
p.split(src, limit)))
throw new RuntimeException("String.split failure 12");
}
}
}
}
}
}

36
jdk/test/java/nio/file/PathMatcher/Basic.java
View File

@ -22,7 +22,7 @@
*/
/* @test
* @bug 4313887
* @bug 4313887 6866397
* @summary Unit test for java.nio.file.PathMatcher
*/
@ -68,6 +68,20 @@ public class Basic {
}
}
static void assertRegExMatch(String path, String pattern) {
System.out.format("Test regex pattern: %s", pattern);
Path file = Paths.get(path);
boolean matched = file.getFileSystem()
.getPathMatcher("regex:" + pattern).matches(file);
if (matched) {
System.out.println(" OKAY");
} else {
System.out.println(" ==> UNEXPECTED RESULT!");
failures++;
}
}
public static void main(String[] args) {
// basic
assertMatch("foo.html", "foo.html");
@ -140,21 +154,13 @@ public class Basic {
assertMatch("one*two", "one\\*two");
}
// regex syntax
{
String pattern = ".*\\.html";
System.out.format("Test regex pattern: %s", pattern);
Path file = Paths.get("foo.html");
boolean matched = file.getFileSystem()
.getPathMatcher("regex:" + pattern).matches(file);
if (matched) {
System.out.println(" OKAY");
} else {
System.out.println(" ==> UNEXPECTED RESULT!");
failures++;
}
assertRegExMatch("foo.html", ".*\\.html");
if (System.getProperty("os.name").startsWith("Windows")) {
assertRegExMatch("foo012", "foo\\d+");
assertRegExMatch("fo o", "fo\\so");
assertRegExMatch("foo", "\\w+");
}
// unknown syntax

60
jdk/test/java/util/prefs/CommentsInXml.java Normal file
View File

@ -0,0 +1,60 @@
/*
* Copyright 2009 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 4619564
* @summary XMl Comments in Preferences File lead to ClassCastException
* @author kladko
*/
import java.io.*;
import java.util.prefs.*;
public class CommentsInXml {
public static void main(String[] argv) throws Exception {
ByteArrayOutputStream bos = new ByteArrayOutputStream();
bos.write(new String(
"<!DOCTYPE preferences SYSTEM " +
"\"http://java.sun.com/dtd/preferences.dtd\"> " +
"<preferences EXTERNAL_XML_VERSION=\"1.0\"> " +
" <root type=\"user\"> " +
" <map> " +
" </map> " +
" <node name=\"hlrAgent\"> <!-- HLR Agent --> " +
" <map> " +
" <entry key=\"agentName\" value=\"HLRAgent\" />" +
" </map> " +
" </node> " +
" </root> " +
"</preferences> "
).getBytes());
Preferences ur = Preferences.userRoot();
ur.importPreferences(new ByteArrayInputStream(bos.toByteArray()));
ur.node("hlrAgent").removeNode(); // clean
}
}

49
jdk/test/java/util/prefs/ConflictInFlush.java Normal file
View File

@ -0,0 +1,49 @@
/*
* Copyright 2009 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 4703132
* @summary flush() throws an IllegalStateException on a removed node
* @author Sucheta Dambalkar
*/
import java.util.prefs.*;
public final class ConflictInFlush{
public static void main(String args[]) {
Preferences root = Preferences.userRoot();
try {
Preferences node = root.node("1/2/3");
node.flush();
System.out.println("Node "+node+" has been created");
System.out.println("Removing node "+node);
node.removeNode();
node.flush();
}catch (BackingStoreException bse){
bse.printStackTrace();
}
}
}

53
jdk/test/java/util/prefs/ExportNode.java Normal file
View File

@ -0,0 +1,53 @@
/*
* Copyright 2009 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 4387136 4947349
* @summary Due to a bug in XMLSupport.putPreferencesInXml(...),
* node's keys would not get exported.
* @author Konstantin Kladko
*/
import java.util.prefs.*;
import java.io.*;
public class ExportNode {
public static void main(String[] args) throws
BackingStoreException, IOException {
Preferences N1 = Preferences.userRoot().node("ExportNodeTest1");
N1.put("ExportNodeTestName1","ExportNodeTestValue1");
Preferences N2 = N1.node("ExportNodeTest2");
N2.put("ExportNodeTestName2","ExportNodeTestValue2");
ByteArrayOutputStream exportStream = new ByteArrayOutputStream();
N2.exportNode(exportStream);
// Removal of preference node should always succeed on Solaris/Linux
// by successfully acquiring the appropriate file lock (4947349)
N1.removeNode();
if (((exportStream.toString()).lastIndexOf("ExportNodeTestName2")== -1) ||
((exportStream.toString()).lastIndexOf("ExportNodeTestName1")!= -1)) {
}
}
}

95
jdk/test/java/util/prefs/ExportSubtree.java Normal file
View File

@ -0,0 +1,95 @@
/*
* Copyright 2009 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 6203576 4700020
@summary checks if the output of exportSubtree() is identical to
the output from previous release.
*/
import java.io.*;
import java.util.prefs.*;
public class ExportSubtree {
public static void main(String[] args) throws Exception {
try
{
//File f = new File(System.getProperty("test.src", "."), "TestPrefs.xml");
ByteArrayInputStream bais = new ByteArrayInputStream(importPrefs.getBytes("utf-8"));
Preferences.importPreferences(bais);
ByteArrayOutputStream baos = new ByteArrayOutputStream();
Preferences.userRoot().node("testExportSubtree").exportSubtree(baos);
Preferences.userRoot().node("testExportSubtree").removeNode();
if (!expectedResult.equals(baos.toString())) {
//System.out.print(baos.toString());
//System.out.print(expectedResult);
throw new IOException("exportSubtree does not output expected result");
}
}
catch( Exception e ) {
e.printStackTrace();
}
}
static String ls = System.getProperty("line.separator");
static String importPrefs =
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
+ "<!DOCTYPE preferences SYSTEM \"http://java.sun.com/dtd/preferences.dtd\">"
+ "<preferences EXTERNAL_XML_VERSION=\"1.0\">"
+ " <root type=\"user\">"
+ " <map>"
+ " <entry key=\"key1\" value=\"value1\"/>"
+ " </map>"
+ " <node name=\"testExportSubtree\">"
+ " <map>"
+ " <entry key=\"key2\" value=\"value2\"/>"
+ " </map>"
+ " <node name=\"test\">"
+ " <map>"
+ " <entry key=\"key3\" value=\"value3\"/>"
+ " </map>"
+ " </node>"
+ " </node>"
+ " </root>"
+ "</preferences>";
static String expectedResult =
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
+ ls + "<!DOCTYPE preferences SYSTEM \"http://java.sun.com/dtd/preferences.dtd\">"
+ ls + "<preferences EXTERNAL_XML_VERSION=\"1.0\">"
+ ls + " <root type=\"user\">"
+ ls + " <map/>"
+ ls + " <node name=\"testExportSubtree\">"
+ ls + " <map>"
+ ls + " <entry key=\"key2\" value=\"value2\"/>"
+ ls + " </map>"
+ ls + " <node name=\"test\">"
+ ls + " <map>"
+ ls + " <entry key=\"key3\" value=\"value3\"/>"
+ ls + " </map>"
+ ls + " </node>"
+ ls + " </node>"
+ ls + " </root>"
+ ls + "</preferences>" + ls;
}

44
jdk/test/java/util/prefs/PrefsSpi.java Normal file
View File

@ -0,0 +1,44 @@
/*
* Copyright 2009 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.
*/
import java.util.prefs.Preferences;
/*
* main class used by regtest PrefsSpi.sh
*/
public class PrefsSpi {
public static void main (String[] args) throws Exception {
if (args.length != 1)
throw new Exception("Usage: java PrefsSpi REGEXP");
String className = Preferences.userRoot().getClass().getName();
System.out.printf("className=%s%n", className);
if (! className.matches(args[0]))
throw new Exception("Preferences class name \"" + className
+ "\" does not match regular expression \""
+ args[0] + "\".");
}
}

100
jdk/test/java/util/prefs/PrefsSpi.sh Normal file
View File

@ -0,0 +1,100 @@
#!/bin/sh
#
# Copyright 2009 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 4991526 6514993
# @summary Unit test for Preferences jar providers
#
# @build PrefsSpi
# @run shell PrefsSpi.sh
# @author Martin Buchholz
# Command-line usage: sh PrefsSpi.sh /path/to/build
if [ -z "$TESTJAVA" ]; then
if [ $# -lt 1 ]; then exit 1; fi
TESTJAVA="$1"; shift
TESTSRC="`pwd`"
TESTCLASSES="`pwd`"
fi
java="$TESTJAVA/bin/java"
javac="$TESTJAVA/bin/javac"
jar="$TESTJAVA/bin/jar"
Die() { printf "%s\n" "$*"; exit 1; }
Sys() {
printf "%s\n" "$*"; "$@"; rc="$?";
test "$rc" -eq 0 || Die "Command \"$*\" failed with exitValue $rc";
}
cat > StubPreferences.java <<'EOF'
import java.util.prefs.*;
public class StubPreferences extends AbstractPreferences {
public StubPreferences() { super(null, ""); }
public String getSpi(String x) { return null; }
public void putSpi(String x, String y) { }
public void removeSpi(String x) { }
public AbstractPreferences childSpi(String x) { return null; }
public void removeNodeSpi() { }
public String[] keysSpi() { return null; }
public String[] childrenNamesSpi() { return null; }
public void syncSpi() { }
public void flushSpi() { }
}
EOF
cat > StubPreferencesFactory.java <<'EOF'
import java.util.prefs.*;
public class StubPreferencesFactory implements PreferencesFactory {
public Preferences userRoot() { return new StubPreferences(); }
public Preferences systemRoot() { return new StubPreferences(); }
}
EOF
Sys rm -rf jarDir extDir
Sys mkdir -p jarDir/META-INF/services extDir
echo "StubPreferencesFactory" \
> "jarDir/META-INF/services/java.util.prefs.PreferencesFactory"
Sys "$javac" -d jarDir StubPreferencesFactory.java StubPreferences.java
(cd jarDir && "$jar" "cf" "../extDir/PrefsSpi.jar" ".")
case "`uname`" in Windows*|CYGWIN* ) CPS=';';; *) CPS=':';; esac
Sys "$java" "-cp" "$TESTCLASSES${CPS}extDir/PrefsSpi.jar" \
-Djava.util.prefs.PreferencesFactory=StubPreferencesFactory \
PrefsSpi "StubPreferences"
Sys "$java" "-cp" "$TESTCLASSES" \
PrefsSpi "java.util.prefs.*"
Sys "$java" "-cp" "$TESTCLASSES${CPS}extDir/PrefsSpi.jar" \
PrefsSpi "StubPreferences"
Sys "$java" "-cp" "$TESTCLASSES" "-Djava.ext.dirs=extDir" \
PrefsSpi "StubPreferences"
rm -rf jarDir extDir

63
jdk/test/java/util/prefs/RemoveReadOnlyNode.java Normal file
View File

@ -0,0 +1,63 @@
/*
* Copyright 2009 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 6178148
@summary check if wrong exception gets thrown if one of the child
nodes is readonly on underlying filesystem when node is
being removed.
*/
import java.io.*;
import java.util.prefs.*;
public class RemoveReadOnlyNode {
public static void main(String[] args) throws Exception {
String osName = System.getProperty("os.name");
if (osName.startsWith("Windows"))
return;
Preferences root = Preferences.userRoot();
Preferences node1 = root.node("node1");
Preferences node1A = node1.node("node1A");
Preferences node1B = node1.node("node1B");
node1B.put("mykey", "myvalue");
node1.flush();
String node1BDirName = System.getProperty("user.home")
+ "/.java/.userPrefs"
+ "/node1/node1B";
File node1BDir = new File(node1BDirName);
node1BDir.setReadOnly();
try {
node1.removeNode();
}
catch (BackingStoreException ex) {
//expected exception
} finally {
Runtime.getRuntime().exec("chmod 755 " + node1BDirName).waitFor();
try {
node1.removeNode();
} catch (Exception e) {}
}
}
}

63
jdk/test/java/util/prefs/RemoveUnregedListener.java Normal file
View File

@ -0,0 +1,63 @@
/*
* Copyright 2009 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 4705094
* @summary Checks if correct exception gets thrown when removing an
* unregistered NodeChangeListener .
*/
import java.util.prefs.*;
import java.util.*;
public class RemoveUnregedListener {
public static void main(String[] args) throws Exception {
Preferences userRoot = null;
Preferences N1 = null;
NodeChangeListenerTestAdd ncl = new NodeChangeListenerTestAdd();
NodeChangeListenerTestAdd ncl2 = new NodeChangeListenerTestAdd();
NodeChangeListenerTestAdd ncl3 = new NodeChangeListenerTestAdd();
try {
userRoot = Preferences.userRoot();
N1 = userRoot.node("N1");
userRoot.flush();
//add ncl nc2
N1.addNodeChangeListener(ncl);
N1.addNodeChangeListener(ncl2);
N1.removeNodeChangeListener(ncl3);
throw new RuntimeException();
} catch (IllegalArgumentException iae) {
System.out.println("Test Passed!");
} catch (Exception e) {
System.out.println("Test Failed");
throw e;
}
}
}
class NodeChangeListenerTestAdd implements NodeChangeListener {
public void childAdded(NodeChangeEvent evt) {}
public void childRemoved(NodeChangeEvent evt) {}
}

48
jdk/test/java/util/prefs/SerializeExceptions.java Normal file
View File

@ -0,0 +1,48 @@
/*
* Copyright 2009 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 4811356
* @summary Prefs exceptions were unintentionally not serializable
* @author Josh Bloch
*/
import java.util.prefs.*;
import java.io.*;
public class SerializeExceptions {
public static void main(String args[]) throws Exception {
test(new BackingStoreException("Hi"));
test(new InvalidPreferencesFormatException("Mom!"));
}
static void test(Object o) throws IOException {
ByteArrayOutputStream bos = new ByteArrayOutputStream();
ObjectOutputStream out = new ObjectOutputStream(bos);
out.writeObject(o);
out.flush();
out.close();
}
}

6
jdk/test/sun/nio/cs/FindCanEncodeBugs.java
View File

@ -22,7 +22,7 @@
*/
/* @test
@bug 5066863 5066867 5066874 5066879 5066884 5066887 5065777
@bug 5066863 5066867 5066874 5066879 5066884 5066887 5065777 6730652
@summary canEncode() false iff encode() throws CharacterCodingException
@run main/timeout=1200 FindCanEncodeBugs
@author Martin Buchholz
@ -52,9 +52,7 @@ public class FindCanEncodeBugs {
String csn = e.getKey();
Charset cs = e.getValue();
if (! cs.canEncode() ||
csn.matches("x-COMPOUND_TEXT") ||
csn.matches("x-ISO-2022-CN-CNS")) // ISO2022_CN_CNS supports less
if (! cs.canEncode() || csn.matches("x-COMPOUND_TEXT"))
continue;
//System.out.println(csn);