stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

7172176: java/jconsole test/sun/tools/jconsole/ImmutableResourceTest.sh failing

Browse Source 
Reviewed-by: mchung, mfang
This commit is contained in:
Erik Gahlin 2013-09-02 16:03:34 +02:00
parent b81e7785d1
commit f4dda09731
6 changed files with 118 additions and 536 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jdk/src/share/classes/sun/tools/jconsole/Resources.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2004, 2013, 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
@ -30,7 +30,7 @@ import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.text.MessageFormat;
import java.util.Collections;
import java.util.HashMap;
import java.util.IdentityHashMap;
import java.util.Map;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
@ -40,7 +40,7 @@ import java.util.ResourceBundle;
*/
public final class Resources {
private static Map<String, Integer> MNEMONIC_LOOKUP = Collections
.synchronizedMap(new HashMap<String, Integer>());
.synchronizedMap(new IdentityHashMap<String, Integer>());
private Resources() {
throw new AssertionError();

4
jdk/test/ProblemList.txt
View File

@ -305,10 +305,6 @@ sun/security/krb5/auto/BadKdc4.java solaris-sparcv9
# 6461635
com/sun/tools/attach/BasicTests.sh generic-all
# 7172176
sun/tools/jconsole/ResourceCheckTest.sh generic-all
sun/tools/jconsole/ImmutableResourceTest.sh generic-all
# 7132203
sun/jvmstat/monitor/MonitoredVm/CR6672135.java generic-all

60
jdk/test/sun/tools/jconsole/ImmutableResourceTest.java
View File

@ -1,60 +0,0 @@
/*
* Copyright (c) 2005, 2007, 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.
*/
/**
*
*
* This isn't the test case: ImmutableResourceTest.sh is.
* Refer to ImmutableResourceTest.sh when running this test.
*
* @bug 6287579
* @summary SubClasses of ListResourceBundle should fix getContents()
*/
import java.util.ResourceBundle;
public class ImmutableResourceTest {
public static void main(String[] args) throws Exception {
/* Reach under the covers and get the message strings */
sun.tools.jconsole.resources.JConsoleResources jcr =
new sun.tools.jconsole.resources.JConsoleResources ();
Object [][] testData = jcr.getContents();
/* Shred our copy of the message strings */
for (int ii = 0; ii < testData.length; ii++) {
testData[ii][0] = "xxx";
testData[ii][1] = "yyy";
}
/*
* Try a lookup for the shredded key.
* If this is successful we have a problem.
*/
String ss = sun.tools.jconsole.Resources.getText("xxx");
if ("yyy".equals(ss)) {
throw new Exception ("SubClasses of ListResourceBundle should fix getContents()");
}
System.out.println("...Finished.");
}
}

111
jdk/test/sun/tools/jconsole/ImmutableResourceTest.sh
View File

@ -1,111 +0,0 @@
#
# Copyright (c) 2005, 2012, 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 6287579
# @summary SubClasses of ListResourceBundle should fix getContents()
#
# @run shell ImmutableResourceTest.sh
# Beginning of subroutines:
status=1
#Call this from anywhere to fail the test with an error message
# usage: fail "reason why the test failed"
fail()
{ echo "The test failed :-("
echo "$*" 1>&2
echo "exit status was $status"
exit $status
} #end of fail()
#Call this from anywhere to pass the test with a message
# usage: pass "reason why the test passed if applicable"
pass()
{ echo "The test passed!!!"
echo "$*" 1>&2
exit 0
} #end of pass()
# end of subroutines
# The beginning of the script proper
OS=`uname -s`
case "$OS" in
SunOS | Linux | Darwin )
PATHSEP=":"
;;
Windows* | CYGWIN*)
PATHSEP=";"
;;
# catch all other OSs
* )
echo "Unrecognized system! $OS"
fail "Unrecognized system! $OS"
;;
esac
TARGETCLASS="ImmutableResourceTest"
if [ -z "${TESTJAVA}" ] ; then
# TESTJAVA is not set, so the test is running stand-alone.
# TESTJAVA holds the path to the root directory of the build of the JDK
# to be tested. That is, any java files run explicitly in this shell
# should use TESTJAVA in the path to the java interpreter.
# So, we'll set this to the JDK spec'd on the command line. If none
# is given on the command line, tell the user that and use a default.
# THIS IS THE JDK BEING TESTED.
if [ -n "$1" ] ; then
TESTJAVA=$1
else
TESTJAVA=$JAVA_HOME
fi
TESTSRC=.
TESTCLASSES=.
#Deal with .class files:
fi
#
echo "JDK under test is: $TESTJAVA"
#
CP="-classpath ${TESTCLASSES}${PATHSEP}${TESTJAVA}/lib/jconsole.jar"
# Compile the test class using the classpath we need:
#
env
#
set -vx
#
#Compile. jconsole.jar is required on the classpath.
${TESTJAVA}/bin/javac -d "${TESTCLASSES}" ${CP} -g \
"${TESTSRC}"/"${TARGETCLASS}".java
#
#Run the test class, again with the classpath we need:
${TESTJAVA}/bin/java ${CP} ${TARGETCLASS}
status=$?
echo "test status was: $status"
if [ $status -eq "0" ];
then pass ""
else fail "unspecified test failure"
fi

469
jdk/test/sun/tools/jconsole/ResourceCheckTest.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2004, 2013, 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
@ -27,377 +27,134 @@
* This isn't the test case: ResourceCheckTest.sh is.
* Refer to ResourceCheckTest.sh when running this test.
*
* @bug 5008856 5023573 5024917 5062569
* @bug 5008856 5023573 5024917 5062569 7172176
* @summary 'missing resource key' error for key = "Operating system"
*/
import java.awt.event.KeyEvent;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.ResourceBundle;
import sun.tools.jconsole.Messages;
import sun.tools.jconsole.Resources;
/*
* Ensures that there is a one-to-one mapping between constants in the
* Message class and the keys in the sun.tools.jconsole.resources.messages
* bundle.
*
* An error will be thrown if there is a:
*
* - key in the resource bundle that doesn't have a public static field with
* the same name in the Message class.
*
* - public static field in the Message class that doesn't have a key with
* the same name in the resource bundle.
*
* - message with a mnemonic identifier(&) for which a mnemonic can't
* be looked up using Resources#getMnemonicInt().
*
*/
public class ResourceCheckTest {
private static final String MISSING_RESOURCE_KEY_PREFIX = "missing message for";
private static final String RESOURCE_BUNDLE = "sun.tools.jconsole.resources.messages";
private static final String NEW_LINE = String.format("%n");
public static void main(String[] args){
Object [][] testData = {
{"<", "", "", "", ""},
{"<<", "", "", "", ""},
{">", "", "", "", ""},
{" 1 day", "", "", "", ""},
{" 1 hour", "", "", "", ""},
{" 1 min", "", "", "", ""},
{" 1 month", "", "", "", ""},
{" 1 year", "", "", "", ""},
{" 2 hours", "", "", "", ""},
{" 3 hours", "", "", "", ""},
{" 3 months", "", "", "", ""},
{" 5 min", "", "", "", ""},
{" 6 hours", "", "", "", ""},
{" 6 months", "", "", "", ""},
{" 7 days", "", "", "", ""},
{"10 min", "", "", "", ""},
{"12 hours", "", "", "", ""},
{"30 min", "", "", "", ""},
{"ACTION", "", "", "", ""},
{"ACTION_INFO", "", "", "", ""},
{"All", "", "", "", ""},
{"Architecture", "", "", "", ""},
{"Attribute", "", "", "", ""},
{"Attribute value", "", "", "", ""},
{"Attribute values", "", "", "", ""},
{"Attributes", "", "", "", ""},
{"Blank", "", "", "", ""},
{"BlockedCount WaitedCount", "BlockedCount", "WaitedCount", "", ""},
{"Boot class path", "", "", "", ""},
{"BorderedComponent.moreOrLessButton.toolTip", "", "", "", ""},
{"Close", "", "", "", ""},
{"CPU Usage", "", "", "", ""},
{"CPUUsageFormat","PhonyPercentage", "", "", ""},
{"Cancel", "", "", "", ""},
{"Cascade", "", "", "", ""},
{"Cascade.mnemonic", "", "", "", ""},
{"Chart:", "", "", "", ""},
{"Chart:.mnemonic", "", "", "", ""},
{"ClassTab.infoLabelFormat", "LoadedCount", "UnloadedCount", "TotalCount", ""},
{"ClassTab.loadedClassesPlotter.accessibleName", "", "", "", ""},
{"Class path", "", "", "", ""},
{"Classes", "", "", "", ""},
{"ClassName", "", "", "", ""},
{"Column.Name", "", "", "", ""},
{"Column.PID", "", "", "", ""},
{"Committed", "", "", "", ""},
{"Committed memory", "", "", "", ""},
{"Committed virtual memory", "", "", "", ""},
{"Compiler", "", "", "", ""},
{"Connect...", "", "", "", ""},
{"Connect", "", "", "", ""},
{"Connect.mnemonic", "", "", "", ""},
{"ConnectDialog.connectButton.toolTip", "", "", "", ""},
{"ConnectDialog.accessibleDescription", "", "", "", ""},
{"ConnectDialog.masthead.accessibleName", "", "", "", ""},
{"ConnectDialog.masthead.title", "", "", "", ""},
{"ConnectDialog.statusBar.accessibleName", "", "", "", ""},
{"ConnectDialog.title", "", "", "", ""},
{"Connected. Click to disconnect.", "", "", "", ""},
{"connectingTo1", "PhonyConnectionName", "", "", ""},
{"connectingTo2", "PhonyConnectionName", "", "", ""},
{"connectionFailed1", "", "", "", ""},
{"connectionFailed2", "PhonyConnectionName", "", "", ""},
{"connectionLost1", "", "", "", ""},
{"connectionLost2", "PhonyConnectionName", "", "", ""},
{"Connection failed", "", "", "", ""},
{"Connection", "", "", "", ""},
{"Connection.mnemonic", "", "", "", ""},
{"Connection name", "", "", "", ""},
{"ConnectionName (disconnected)", "Phony", "Phony", "", ""},
{"Constructor", "", "", "", ""},
{"Create", "Phony", "Phony", "", ""},
{"Current classes loaded", "", "", "", ""},
{"Current heap size", "", "", "", ""},
{"Current value", "PhonyValue", "", "", ""},
{"Daemon threads", "", "", "", ""},
{"deadlockAllTab", "", "", "", ""},
{"deadlockTab", "", "", "", ""},
{"deadlockTabN", "PhonyInt", "", "", ""},
{"Description", "", "", "", ""},
{"Descriptor", "", "", "", ""},
{"Details", "", "", "", ""},
{"Detect Deadlock", "", "", "", ""},
{"Detect Deadlock.mnemonic", "", "", "", ""},
{"Detect Deadlock.toolTip", "", "", "", ""},
{"Dimension is not supported:", "", "", "", ""},
{"Discard chart", "", "", "", ""},
{"Disconnected. Click to connect.", "", "", "", ""},
{"Double click to expand/collapse", "", "", "", ""},
{"Double click to visualize", "", "", "", ""},
{"DurationDaysHoursMinutes", 0, 13, 54, ""},
{"DurationDaysHoursMinutes", 1, 13, 54, ""},
{"DurationDaysHoursMinutes", 2, 13, 54, ""},
{"DurationDaysHoursMinutes", 1024, 13, 45, ""},
{"DurationHoursMinutes", 0, 13, "", ""},
{"DurationHoursMinutes", 1, 0, "", ""},
{"DurationHoursMinutes", 1, 1, "", ""},
{"DurationHoursMinutes", 2, 42, "", ""},
{"DurationMinutes", 0, "", "", ""},
{"DurationMinutes", 1, "", "", ""},
{"DurationMinutes", 2, "", "", ""},
{"DurationSeconds", 0, "", "", ""},
{"DurationSeconds", 1, "", "", ""},
{"DurationSeconds", 2, "", "", ""},
{"Empty array", "", "", "", ""},
{"Error", "", "", "", ""},
{"Error: MBeans already exist", "", "", "", ""},
{"Error: MBeans do not exist", "", "", "", ""},
{"Event", "", "", "", ""},
{"Exit", "", "", "", ""},
{"Exit.mnemonic", "", "", "", ""},
{"expand", "", "", "", ""},
{"Fail to load plugin", "", "", "", ""},
{"FileChooser.fileExists.cancelOption", "", "", "", ""},
{"FileChooser.fileExists.message", "PhonyFileName", "", "", ""},
{"FileChooser.fileExists.okOption", "", "", "", ""},
{"FileChooser.fileExists.title", "", "", "", ""},
{"FileChooser.savedFile", "PhonyFilePath", "PhonyFileSize", "", ""},
{"FileChooser.saveFailed.message", "PhonyFilePath", "PhonyMessage", "", ""},
{"FileChooser.saveFailed.title", "", "", "", ""},
{"Free physical memory", "", "", "", ""},
{"Free swap space", "", "", "", ""},
{"Garbage collector", "", "", "", ""},
{"GC time", "", "", "", ""},
{"GC time details", 54, "Phony", 11, ""},
{"GcInfo", "Phony", -1, 768, ""},
{"GcInfo", "Phony", 0, 768, ""},
{"GcInfo", "Phony", 1, 768, ""},
{"Heap", "", "", "", ""},
{"Heap Memory Usage", "", "", "", ""},
{"Help.AboutDialog.accessibleDescription", "", "", "", ""},
{"Help.AboutDialog.jConsoleVersion", "DummyVersion", "", "", ""},
{"Help.AboutDialog.javaVersion", "DummyVersion", "", "", ""},
{"Help.AboutDialog.masthead.accessibleName", "", "", "", ""},
{"Help.AboutDialog.masthead.title", "", "", "", ""},
{"Help.AboutDialog.title", "", "", "", ""},
{"Help.AboutDialog.userGuideLink", "DummyMessage", "", "", ""},
{"Help.AboutDialog.userGuideLink.mnemonic", "", "", "", ""},
{"Help.AboutDialog.userGuideLink.url", "DummyURL", "", "", ""},
{"HelpMenu.About.title", "", "", "", ""},
{"HelpMenu.About.title.mnemonic", "", "", "", ""},
{"HelpMenu.UserGuide.title", "", "", "", ""},
{"HelpMenu.UserGuide.title.mnemonic", "", "", "", ""},
{"HelpMenu.title", "", "", "", ""},
{"HelpMenu.title.mnemonic", "", "", "", ""},
{"Hotspot MBeans...", "", "", "", ""},
{"Hotspot MBeans....mnemonic", "", "", "", ""},
{"Hotspot MBeans.dialog.accessibleDescription", "", "", "", ""},
{"Impact", "", "", "", ""},
{"Info", "", "", "", ""},
{"INFO", "", "", "", ""},
{"Invalid plugin path", "", "", "", ""},
{"Invalid URL", "", "", "", ""},
{"Is", "", "", "", ""},
{"Java Monitoring & Management Console", "", "", "", ""},
{"Java Virtual Machine", "", "", "", ""},
{"JConsole: ", "", "", "", ""},
{"JConsole.accessibleDescription", "", "", "", ""},
{"JConsole version", "PhonyVersion", "", "", ""},
{"JIT compiler", "", "", "", ""},
{"Library path", "", "", "", ""},
{"Live Threads", "", "", "", ""},
{"Loaded", "", "", "", ""},
{"Local Process:", "", "", "", ""},
{"Local Process:.mnemonic", "", "", "", ""},
{"Manage Hotspot MBeans in: ", "", "", "", ""},
{"Management Not Enabled", "", "", "", ""},
{"Management Will Be Enabled", "", "", "", ""},
{"Masthead.font", "", "", "", ""},
{"Max", "", "", "", ""},
{"Max", "", "", "", ""},
{"Maximum heap size", "", "", "", ""},
{"MBeanAttributeInfo", "", "", "", ""},
{"MBeanInfo", "", "", "", ""},
{"MBeanNotificationInfo", "", "", "", ""},
{"MBeanOperationInfo", "", "", "", ""},
{"MBeans", "", "", "", ""},
{"MBeansTab.clearNotificationsButton", "", "", "", ""},
{"MBeansTab.clearNotificationsButton.mnemonic", "", "", "", ""},
{"MBeansTab.clearNotificationsButton.toolTip", "", "", "", ""},
{"MBeansTab.compositeNavigationMultiple", 0, 0, "", ""},
{"MBeansTab.compositeNavigationSingle", "", "", "", ""},
{"MBeansTab.refreshAttributesButton", "", "", "", ""},
{"MBeansTab.refreshAttributesButton.mnemonic", "", "", "", ""},
{"MBeansTab.refreshAttributesButton.toolTip", "", "", "", ""},
{"MBeansTab.subscribeNotificationsButton", "", "", "", ""},
{"MBeansTab.subscribeNotificationsButton.mnemonic", "", "", "", ""},
{"MBeansTab.subscribeNotificationsButton.toolTip", "", "", "", ""},
{"MBeansTab.tabularNavigationMultiple", 0, 0, "", ""},
{"MBeansTab.tabularNavigationSingle", "", "", "", ""},
{"MBeansTab.unsubscribeNotificationsButton", "", "", "", ""},
{"MBeansTab.unsubscribeNotificationsButton.mnemonic", "", "", "", ""},
{"MBeansTab.unsubscribeNotificationsButton.toolTip", "", "", "", ""},
{"Memory", "", "", "", ""},
{"MemoryPoolLabel", "PhonyMemoryPool", "", "", ""},
{"MemoryTab.heapPlotter.accessibleName", "", "", "", ""},
{"MemoryTab.infoLabelFormat", "UsedCount", "CommittedCount", "MaxCount", ""},
{"MemoryTab.nonHeapPlotter.accessibleName", "", "", "", ""},
{"MemoryTab.poolChart.aboveThreshold", "Threshold", "", "", ""},
{"MemoryTab.poolChart.accessibleName", "", "", "", ""},
{"MemoryTab.poolChart.belowThreshold", "Threshold", "", "", ""},
{"MemoryTab.poolPlotter.accessibleName", "PhonyMemoryPool", "", "", ""},
{"Message", "", "", "", ""},
{"Method successfully invoked", "", "", "", ""},
{"Monitor locked", "", "", "", ""},
{"Minimize All", "", "", "", ""},
{"Minimize All.mnemonic", "", "", "", ""},
{"Name", "", "", "", ""},
{"Name and Build", "PhonyName", "PhonyBuild", "", ""},
{"Name Build and Mode", "PhonyName", "PhonyBuild", "PhonyMode", ""},
{"Name State", "PhonyName", "PhonyState", "", ""},
{"Name State LockName", "PhonyName", "PhonyState", "PhonyLock", ""},
{"Name State LockName LockOwner", "PhonyName", "PhonyState", "PhonyLock", "PhonyOwner"},
{"New Connection...", "", "", "", ""},
{"New Connection....mnemonic", "", "", "", ""},
{"No deadlock detected", "", "", "", ""},
{"Non-Heap", "", "", "", ""},
{"Non-Heap Memory Usage", "", "", "", ""},
{"Notification", "", "", "", ""},
{"Notification buffer", "", "", "", ""},
{"Notifications", "", "", "", ""},
{"NotifTypes", "", "", "", ""},
{"Number of Loaded Classes", "", "", "", ""},
{"Number of processors", "", "", "", ""},
{"Number of Threads", "", "", "", ""},
{"ObjectName", "", "", "", ""},
{"Operating System", "", "", "", ""},
{"Operation", "", "", "", ""},
{"Operation invocation", "", "", "", ""},
{"Operation return value", "", "", "", ""},
{"Operations", "", "", "", ""},
{"Overview", "", "", "", ""},
{"OverviewPanel.plotter.accessibleName", "PhonyPlotter", "", "", ""},
{"Parameter", "", "", "", ""},
{"Password: ", "", "", "", ""},
{"Password: .mnemonic", "", "", "", ""},
{"Password.accessibleName", "", "", "", ""},
{"Peak", "", "", "", ""},
{"Perform GC", "", "", "", ""},
{"Perform GC.mnemonic", "", "", "", ""},
{"Perform GC.toolTip", "", "", "", ""},
{"Plotter.accessibleName", "", "", "", ""},
{"Plotter.accessibleName.keyAndValue", "Key", "Value", "", ""},
{"Plotter.accessibleName.noData", "", "", "", ""},
{"Plotter.saveAsMenuItem", "", "", "", ""},
{"Plotter.saveAsMenuItem.mnemonic", "", "", "", ""},
{"Plotter.timeRangeMenu", "", "", "", ""},
{"Plotter.timeRangeMenu.mnemonic", "", "", "", ""},
{"plot", "", "", "", ""},
{"Problem adding listener", "", "", "", ""},
{"Problem displaying MBean", "", "", "", ""},
{"Problem invoking", "", "", "", ""},
{"Problem removing listener", "", "", "", ""},
{"Problem setting attribute", "", "", "", ""},
{"Process CPU time", "", "", "", ""},
{"Readable", "", "", "", ""},
{"Reconnect", "", "", "", ""},
{"Remote Process:", "", "", "", ""},
{"Remote Process:.mnemonic", "", "", "", ""},
{"Remote Process.textField.accessibleName", "", "", "", ""},
{"remoteTF.usage", "", "", "", ""},
{"Restore All", "", "", "", ""},
{"Restore All.mnemonic", "", "", "", ""},
{"ReturnType", "", "", "", ""},
{"SeqNum", "", "", "", ""},
{"Size Bytes", 512, "", "", ""},
{"Size Gb", 512, "", "", ""},
{"Size Kb", 512, "", "", ""},
{"Size Mb", 512, "", "", ""},
{"Source", "", "", "", ""},
{"Stack trace", "", "", "", ""},
{"SummaryTab.headerDateTimeFormat", "", "", "", ""},
{"SummaryTab.pendingFinalization.label", "", "", "", ""},
{"SummaryTab.pendingFinalization.value", "ObjectCount", "", "", ""},
{"SummaryTab.tabName", "", "", "", ""},
{"SummaryTab.vmVersion", "VMName", "VMVersion", "", ""},
{"ThreadTab.infoLabelFormat", "LiveCount", "PeakCount", "TotalCount", ""},
{"ThreadTab.threadInfo.accessibleName", "", "", "", ""},
{"ThreadTab.threadPlotter.accessibleName", "", "", "", ""},
{"Threads", "", "", "", ""},
{"Threshold", "", "", "", ""},
{"Tile", "", "", "", ""},
{"Tile.mnemonic", "", "", "", ""},
{"Time", "", "", "", ""},
{"Time Range:", "", "", "", ""},
{"Time Range:.mnemonic", "", "", "", ""},
{"TimeStamp", "", "", "", ""},
{"Total classes loaded", "", "", "", ""},
{"Total classes unloaded", "", "", "", ""},
{"Total compile time", "", "", "", ""},
{"Total Loaded", "", "", "", ""},
{"Total physical memory", "", "", "", ""},
{"Total swap space", "", "", "", ""},
{"Total threads started", "", "", "", ""},
{"Type", "", "", "", ""},
{"Unavailable", "", "", "", ""},
{"UNKNOWN", "", "", "", ""},
{"Unregister", "", "", "", ""},
{"Uptime", "", "", "", ""},
{"Usage Threshold", "", "", "", ""},
{"Used", "", "", "", ""},
{"Username: ", "", "", "", ""},
{"Username: .mnemonic", "", "", "", ""},
{"Username.accessibleName", "", "", "", ""},
{"UserData", "", "", "", ""},
{"Value", "", "", "", ""},
{"Vendor", "", "", "", ""},
{"Verbose Output", "", "", "", ""},
{"Verbose Output.toolTip", "", "", "", ""},
{"visualize", "", "", "", ""},
{"VM", "", "", "", ""},
{"VMInternalFrame.accessibleDescription", "", "", "", ""},
{"VM arguments", "", "", "", ""},
{"Virtual Machine", "", "", "", ""},
{"Window", "", "", "", ""},
{"Window.mnemonic", "", "", "", ""},
{"Writable", "", "", "", ""},
{"zz usage text", "PhonyName", "", "", ""},
};
//boolean verbose = false;
boolean verbose = true;
long badLookups = 0;
System.out.println("Start...");
for (int ii = 0; ii < testData.length; ii++) {
String key = (String)testData[ii][0];
if (key.endsWith(".mnemonic")) {
String baseKey = key.substring(0, key.length() - ".mnemonic".length());
int mnemonic = Resources.getMnemonicInt(baseKey);
if (mnemonic == 0) {
badLookups++;
System.out.println("****lookup failed for key = " + key);
public static void main(String... args) {
List<String> errors = new ArrayList<>();
// Ensure that all Message fields have a corresponding key/value
// in the resource bundle and that mnemonics can be looked
// up where applicable.
ResourceBundle rb = ResourceBundle.getBundle(RESOURCE_BUNDLE);
for (Field field : Messages.class.getFields()) {
if (isResourceKeyField(field)) {
String resourceKey = field.getName();
String message = readField(field);
if (message.startsWith(MISSING_RESOURCE_KEY_PREFIX)) {
errors.add("Can't find message (and perhaps mnemonic) for "
+ Messages.class.getSimpleName() + "."
+ resourceKey + " in resource bundle.");
} else {
if (verbose) {
System.out.println(" mnemonic: " + KeyEvent.getKeyText(mnemonic));
String resourceMessage = rb.getString(resourceKey);
if (hasMnemonicIdentifier(resourceMessage)) {
int mi = Resources.getMnemonicInt(message);
if (mi == 0) {
errors.add("Could not look up mnemonic for message '"
+ message + "'.");
}
}
}
continue;
}
}
String ss = Resources.getText(key,
testData[ii][1],
testData[ii][2],
testData[ii][3],
testData[ii][4]);
if (ss.startsWith("missing resource key")) {
badLookups++;
System.out.println("****lookup failed for key = " + key);
} else {
if (verbose) {
System.out.println(" " + ss);
// Ensure that there is Message class field for every resource key.
for (String key : Collections.list(rb.getKeys())) {
try {
Messages.class.getField(key);
} catch (NoSuchFieldException nfe) {
errors.add("Can't find static field ("
+ Messages.class.getSimpleName() + "." + key
+ ") matching '" + key
+ "' in resource bundle. Unused message?");
}
}
if (errors.size() > 0) {
throwError(errors);
}
}
private static String readField(Field field) {
try {
return (String) field.get(null);
} catch (IllegalArgumentException | IllegalAccessException e) {
throw new Error("Could not access field " + field.getName()
+ " when trying to read resource message.");
}
}
private static boolean isResourceKeyField(Field field) {
int modifiers = field.getModifiers();
return Modifier.isPublic(modifiers) && Modifier.isStatic(modifiers);
}
private static boolean hasMnemonicIdentifier(String s) {
for (int i = 0; i < s.length() - 1; i++) {
if (s.charAt(i) == '&') {
if (s.charAt(i + 1) != '&') {
return true;
} else {
i++;
}
}
}
if (badLookups > 0) {
throw new Error ("Resource lookup failed " + badLookups +
" time(s); Test failed");
return false;
}
private static void throwError(List<String> errors) {
StringBuffer buffer = new StringBuffer();
buffer.append("Found ");
buffer.append(errors.size());
buffer.append(" error(s) when checking one-to-one mapping ");
buffer.append("between Message and resource bundle keys in ");
buffer.append(RESOURCE_BUNDLE);
buffer.append(" with ");
buffer.append(Locale.getDefault());
buffer.append(" locale.");
buffer.append(NEW_LINE);
int errorIndex = 1;
for (String error : errors) {
buffer.append("Error ");
buffer.append(errorIndex);
buffer.append(": ");
buffer.append(error);
buffer.append(NEW_LINE);
errorIndex++;
}
System.out.println("...Finished.");
throw new Error(buffer.toString());
}
}

4
jdk/test/sun/tools/jconsole/ResourceCheckTest.sh
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2004, 2013, 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
@ -54,7 +54,7 @@ pass()
OS=`uname -s`
case "$OS" in
SunOS | Linux )
SunOS | Linux | Darwin)
PATHSEP=":"
;;