author | martin |
Tue, 15 Sep 2015 21:56:04 -0700 | |
changeset 32649 | 2ee9017c7597 |
parent 22079 | 5f22afc7db58 |
permissions | -rw-r--r-- |
20865
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
1 |
/* |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
2 |
* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
4 |
* |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
5 |
* This code is free software; you can redistribute it and/or modify it |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
7 |
* published by the Free Software Foundation. |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
8 |
* |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
9 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
10 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
11 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
12 |
* version 2 for more details (a copy is included in the LICENSE file that |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
13 |
* accompanied this code). |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
14 |
* |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
15 |
* You should have received a copy of the GNU General Public License version |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
16 |
* 2 along with this work; if not, write to the Free Software Foundation, |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
17 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
18 |
* |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
20 |
* or visit www.oracle.com if you need additional information or have any |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
21 |
* questions. |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
22 |
*/ |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
23 |
import java.security.AccessControlException; |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
24 |
import java.security.Permission; |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
25 |
import java.security.Permissions; |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
26 |
import java.security.Policy; |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
27 |
import java.security.ProtectionDomain; |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
28 |
import java.util.Locale; |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
29 |
import java.util.Objects; |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
30 |
import java.util.PropertyPermission; |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
31 |
import java.util.ResourceBundle; |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
32 |
import java.util.logging.Handler; |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
33 |
import java.util.logging.Level; |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
34 |
import java.util.logging.LogManager; |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
35 |
import java.util.logging.LogRecord; |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
36 |
import java.util.logging.Logger; |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
37 |
import java.util.logging.LoggingPermission; |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
38 |
import resources.ListBundle; |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
39 |
|
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
40 |
/** |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
41 |
* @test |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
42 |
* @bug 8013839 |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
43 |
* @summary tests Logger.setResourceBundle; |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
44 |
* @build TestSetResourceBundle resources.ListBundle resources.ListBundle_fr |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
45 |
* @run main/othervm TestSetResourceBundle UNSECURE |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
46 |
* @run main/othervm TestSetResourceBundle PERMISSION |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
47 |
* @run main/othervm TestSetResourceBundle SECURE |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
48 |
* @author danielfuchs |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
49 |
*/ |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
50 |
public class TestSetResourceBundle { |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
51 |
|
32649
2ee9017c7597
8136583: Core libraries should use blessed modifier order
martin
parents:
22079
diff
changeset
|
52 |
static final String LIST_BUNDLE_NAME = "resources.ListBundle"; |
2ee9017c7597
8136583: Core libraries should use blessed modifier order
martin
parents:
22079
diff
changeset
|
53 |
static final String PROPERTY_BUNDLE_NAME = "resources.PropertyBundle"; |
20865
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
54 |
|
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
55 |
/** |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
56 |
* A dummy handler class that we can use to check the bundle/bundle name |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
57 |
* that was present in the last LogRecord instance published. |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
58 |
*/ |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
59 |
static final class TestHandler extends Handler { |
22079
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
60 |
volatile ResourceBundle lastBundle = null; |
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
61 |
volatile String lastBundleName = null; |
20865
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
62 |
@Override |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
63 |
public void publish(LogRecord record) { |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
64 |
lastBundle = record.getResourceBundle(); |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
65 |
lastBundleName = record.getResourceBundleName(); |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
66 |
} |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
67 |
|
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
68 |
@Override |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
69 |
public void flush() { |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
70 |
} |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
71 |
|
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
72 |
@Override |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
73 |
public void close() throws SecurityException { |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
74 |
} |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
75 |
} |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
76 |
|
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
77 |
/** |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
78 |
* We will test setResourceBundle() in 3 configurations. |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
79 |
* UNSECURE: No security manager. |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
80 |
* SECURE: With the security manager present - and the required |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
81 |
* LoggingPermission("control") granted. |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
82 |
* PERMISSION: With the security manager present - and the required |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
83 |
* LoggingPermission("control") *not* granted. Here we will |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
84 |
* test that the expected security permission is thrown. |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
85 |
*/ |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
86 |
public static enum TestCase { |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
87 |
UNSECURE, SECURE, PERMISSION; |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
88 |
public void run(String name) throws Exception { |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
89 |
System.out.println("Running test case: " + name()); |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
90 |
switch (this) { |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
91 |
case UNSECURE: |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
92 |
testUnsecure(name); |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
93 |
break; |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
94 |
case SECURE: |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
95 |
testSecure(name); |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
96 |
break; |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
97 |
case PERMISSION: |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
98 |
testPermission(name); |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
99 |
break; |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
100 |
default: |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
101 |
throw new Error("Unknown test case: "+this); |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
102 |
} |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
103 |
} |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
104 |
public String loggerName(String name) { |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
105 |
return name().toLowerCase(Locale.ROOT) + "." + name; |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
106 |
} |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
107 |
} |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
108 |
|
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
109 |
public static void main(String... args) throws Exception { |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
110 |
|
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
111 |
Locale defaultLocale = Locale.getDefault(); |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
112 |
|
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
113 |
if (args == null || args.length == 0) { |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
114 |
args = new String[] { |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
115 |
TestCase.UNSECURE.name(), |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
116 |
TestCase.SECURE.name() |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
117 |
}; |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
118 |
} |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
119 |
|
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
120 |
for (String testName : args) { |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
121 |
TestCase test = TestCase.valueOf(testName); |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
122 |
try { |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
123 |
test.run(test.loggerName("foo.bar")); |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
124 |
} finally { |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
125 |
Locale.setDefault(defaultLocale); |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
126 |
} |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
127 |
} |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
128 |
} |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
129 |
|
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
130 |
/** |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
131 |
* Test without security manager. |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
132 |
* @param loggerName The logger to use. |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
133 |
* @throws Exception if the test fails. |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
134 |
*/ |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
135 |
public static void testUnsecure(String loggerName) throws Exception { |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
136 |
if (System.getSecurityManager() != null) { |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
137 |
throw new Error("Security manager is set"); |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
138 |
} |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
139 |
test(loggerName); |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
140 |
} |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
141 |
|
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
142 |
/** |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
143 |
* Test with security manager. |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
144 |
* @param loggerName The logger to use. |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
145 |
* @throws Exception if the test fails. |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
146 |
*/ |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
147 |
public static void testSecure(String loggerName) throws Exception { |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
148 |
if (System.getSecurityManager() != null) { |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
149 |
throw new Error("Security manager is already set"); |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
150 |
} |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
151 |
Policy.setPolicy(new SimplePolicy(TestCase.SECURE)); |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
152 |
System.setSecurityManager(new SecurityManager()); |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
153 |
test(loggerName); |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
154 |
} |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
155 |
|
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
156 |
/** |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
157 |
* Test the LoggingPermission("control") is required. |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
158 |
* @param loggerName The logger to use. |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
159 |
*/ |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
160 |
public static void testPermission(String loggerName) { |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
161 |
if (System.getSecurityManager() != null) { |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
162 |
throw new Error("Security manager is already set"); |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
163 |
} |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
164 |
Policy.setPolicy(new SimplePolicy(TestCase.PERMISSION)); |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
165 |
System.setSecurityManager(new SecurityManager()); |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
166 |
final ResourceBundle bundle = ResourceBundle.getBundle(LIST_BUNDLE_NAME); |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
167 |
Logger foobar = Logger.getLogger(loggerName); |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
168 |
try { |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
169 |
foobar.setResourceBundle(bundle); |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
170 |
throw new RuntimeException("Permission not checked!"); |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
171 |
} catch (AccessControlException x) { |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
172 |
if (x.getPermission() instanceof LoggingPermission) { |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
173 |
if ("control".equals(x.getPermission().getName())) { |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
174 |
System.out.println("Got expected exception: " + x); |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
175 |
return; |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
176 |
} |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
177 |
} |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
178 |
throw new RuntimeException("Unexpected exception: "+x, x); |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
179 |
} |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
180 |
|
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
181 |
} |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
182 |
|
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
183 |
static String getBaseName(ResourceBundle bundle) { |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
184 |
return bundle == null ? null : bundle.getBaseBundleName(); |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
185 |
} |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
186 |
|
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
187 |
public static void test(String loggerName) throws Exception { |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
188 |
|
22079
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
189 |
System.out.println("Starting test for " + loggerName); |
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
190 |
|
20865
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
191 |
final ResourceBundle bundle = ResourceBundle.getBundle(LIST_BUNDLE_NAME); |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
192 |
Logger foobar = Logger.getLogger(loggerName); |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
193 |
|
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
194 |
// Checks that IAE is thrown if the bundle has a null base name. |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
195 |
try { |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
196 |
foobar.setResourceBundle(new ListBundle()); |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
197 |
throw new RuntimeException("Expected exception not raised!"); |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
198 |
} catch (IllegalArgumentException x) { |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
199 |
System.out.println("Got expected exception: " + x); |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
200 |
} |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
201 |
|
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
202 |
// Verify that resource bundle was not set. |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
203 |
if (foobar.getResourceBundle() != null) { |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
204 |
throw new RuntimeException("Unexpected bundle: " |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
205 |
+ foobar.getResourceBundle()); |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
206 |
} |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
207 |
if (foobar.getResourceBundleName() != null) { |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
208 |
throw new RuntimeException("Unexpected bundle: " |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
209 |
+ foobar.getResourceBundleName()); |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
210 |
} |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
211 |
|
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
212 |
// Set acceptable resource bundle on logger. |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
213 |
foobar.setResourceBundle(bundle); |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
214 |
|
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
215 |
// check that the bundle has been set correctly |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
216 |
if (bundle != foobar.getResourceBundle()) { |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
217 |
throw new RuntimeException("Unexpected bundle: " |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
218 |
+ foobar.getResourceBundle()); |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
219 |
} |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
220 |
if (!Objects.equals(getBaseName(bundle), foobar.getResourceBundleName())) { |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
221 |
throw new RuntimeException("Unexpected bundle name: " |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
222 |
+ foobar.getResourceBundleName()); |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
223 |
} |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
224 |
|
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
225 |
// Check that we can replace the bundle with a bundle of the same name. |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
226 |
final ResourceBundle bundle_fr = |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
227 |
ResourceBundle.getBundle(LIST_BUNDLE_NAME, Locale.FRENCH); |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
228 |
foobar.setResourceBundle(bundle_fr); |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
229 |
|
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
230 |
if (bundle_fr != foobar.getResourceBundle()) { |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
231 |
throw new RuntimeException("Unexpected bundle: " |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
232 |
+ foobar.getResourceBundle()); |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
233 |
} |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
234 |
if (!Objects.equals(getBaseName(bundle_fr), foobar.getResourceBundleName())) { |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
235 |
throw new RuntimeException("Unexpected bundle name: " |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
236 |
+ foobar.getResourceBundleName()); |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
237 |
} |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
238 |
|
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
239 |
// Create a child logger |
22079
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
240 |
final Logger foobaz = Logger.getLogger(loggerName + ".baz"); |
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
241 |
|
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
242 |
if (foobar != foobaz.getParent()) { |
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
243 |
throw new RuntimeException("Unexpected parent: " + |
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
244 |
foobaz.getParent() + " != " + foobar); |
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
245 |
} |
20865
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
246 |
|
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
247 |
// Check that the child logger does not have a bundle set locally |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
248 |
if (foobaz.getResourceBundle() != null) { |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
249 |
throw new RuntimeException("Unexpected bundle: " |
22079
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
250 |
+ foobaz.getResourceBundle()); |
20865
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
251 |
} |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
252 |
if (foobaz.getResourceBundleName() != null) { |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
253 |
throw new RuntimeException("Unexpected bundle: " |
22079
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
254 |
+ foobaz.getResourceBundleName()); |
20865
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
255 |
} |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
256 |
|
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
257 |
|
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
258 |
// Add a handler on the child logger. |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
259 |
final TestHandler handler = new TestHandler(); |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
260 |
foobaz.addHandler(handler); |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
261 |
|
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
262 |
// log a message on the child logger |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
263 |
foobaz.severe("dummy"); |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
264 |
|
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
265 |
// checks that the message has been logged with the bundle |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
266 |
// inherited from the parent logger |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
267 |
if (!LIST_BUNDLE_NAME.equals(handler.lastBundleName)) { |
22079
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
268 |
debugLogger(foobaz, foobar, handler); |
20865
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
269 |
throw new RuntimeException("Unexpected bundle name: " |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
270 |
+ handler.lastBundleName); |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
271 |
} |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
272 |
if (!bundle_fr.equals(handler.lastBundle)) { |
22079
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
273 |
debugLogger(foobaz, foobar, handler); |
20865
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
274 |
throw new RuntimeException("Unexpected bundle: " |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
275 |
+ handler.lastBundle); |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
276 |
} |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
277 |
|
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
278 |
// Check that we can get set a bundle on the child logger |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
279 |
// using Logger.getLogger. |
22079
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
280 |
final Logger foobaz2 = Logger.getLogger(loggerName + ".baz", PROPERTY_BUNDLE_NAME); |
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
281 |
if (foobaz2 != foobaz) { |
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
282 |
throw new RuntimeException("Unexpected logger: " + foobaz2 + " != " + foobaz); |
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
283 |
} |
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
284 |
if (foobar != foobaz.getParent()) { |
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
285 |
throw new RuntimeException("Unexpected parent: " + |
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
286 |
foobaz.getParent() + " != " + foobar); |
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
287 |
} |
20865
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
288 |
|
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
289 |
// check that the child logger has the correct bundle. |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
290 |
// it should no longer inherit it from its parent. |
22079
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
291 |
if (!PROPERTY_BUNDLE_NAME.equals(foobaz2.getResourceBundleName())) { |
20865
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
292 |
throw new RuntimeException("Unexpected bundle name: " |
22079
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
293 |
+ foobaz2.getResourceBundleName()); |
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
294 |
} |
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
295 |
|
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
296 |
if (!PROPERTY_BUNDLE_NAME.equals(foobaz2.getResourceBundle().getBaseBundleName())) { |
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
297 |
throw new RuntimeException("Unexpected bundle name: " |
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
298 |
+ foobaz2.getResourceBundle().getBaseBundleName()); |
20865
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
299 |
} |
22079
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
300 |
|
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
301 |
boolean found = false; |
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
302 |
for (Handler h : foobaz2.getHandlers()) { |
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
303 |
if (h == handler) { |
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
304 |
found = true; |
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
305 |
break; |
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
306 |
} |
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
307 |
} |
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
308 |
|
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
309 |
if (!found) { |
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
310 |
throw new RuntimeException("Expected handler not found in: " + |
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
311 |
foobaz2.getName() + "(" + foobaz2.getClass().getName()+")" ); |
20865
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
312 |
} |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
313 |
|
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
314 |
// log a message on the child logger |
22079
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
315 |
foobaz2.severe("dummy"); |
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
316 |
|
20865
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
317 |
|
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
318 |
// check that the last published log record has the appropriate |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
319 |
// bundle. |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
320 |
if (!PROPERTY_BUNDLE_NAME.equals(handler.lastBundleName)) { |
22079
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
321 |
debugLogger(foobaz2, foobar, handler); |
20865
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
322 |
throw new RuntimeException("Unexpected bundle name: " |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
323 |
+ handler.lastBundleName); |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
324 |
} |
22079
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
325 |
if (foobaz2.getResourceBundle() != handler.lastBundle) { |
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
326 |
debugLogger(foobaz2, foobar, handler); |
20865
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
327 |
throw new RuntimeException("Unexpected bundle: " |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
328 |
+ handler.lastBundle); |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
329 |
} |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
330 |
|
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
331 |
// try to set a bundle that has a different name, and checks that |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
332 |
// it fails in IAE. |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
333 |
try { |
22079
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
334 |
foobaz2.setResourceBundle(bundle_fr); |
20865
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
335 |
throw new RuntimeException("Expected exception not raised!"); |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
336 |
} catch (IllegalArgumentException x) { |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
337 |
System.out.println("Got expected exception: " + x); |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
338 |
} |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
339 |
|
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
340 |
// Test with a subclass of logger which overrides |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
341 |
// getResourceBundle() and getResourceBundleName() |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
342 |
Logger customLogger = new Logger(foobar.getName()+".bie", null) { |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
343 |
@Override |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
344 |
public ResourceBundle getResourceBundle() { |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
345 |
return bundle_fr; |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
346 |
} |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
347 |
|
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
348 |
@Override |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
349 |
public String getResourceBundleName() { |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
350 |
return PROPERTY_BUNDLE_NAME; |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
351 |
} |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
352 |
}; |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
353 |
|
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
354 |
final TestHandler handler2 = new TestHandler(); |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
355 |
customLogger.addHandler(handler2); |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
356 |
customLogger.setLevel(Level.FINE); |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
357 |
LogManager.getLogManager().addLogger(customLogger); |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
358 |
|
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
359 |
Logger l = Logger.getLogger(customLogger.getName()); |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
360 |
if (l != customLogger) { |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
361 |
throw new RuntimeException("Wrong logger: " + l); |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
362 |
} |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
363 |
|
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
364 |
// log on the custom logger. |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
365 |
customLogger.fine("dummy"); |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
366 |
|
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
367 |
// check that the log record had the correct bundle. |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
368 |
if (! PROPERTY_BUNDLE_NAME.equals(handler2.lastBundleName)) { |
22079
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
369 |
debugLogger(customLogger, foobar, handler2); |
20865
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
370 |
throw new RuntimeException("Unexpected bundle name: " |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
371 |
+ handler2.lastBundleName); |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
372 |
} |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
373 |
if (! PROPERTY_BUNDLE_NAME.equals(customLogger.getResourceBundleName())) { |
22079
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
374 |
debugLogger(customLogger, foobar, handler2); |
20865
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
375 |
throw new RuntimeException("Unexpected bundle name: " |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
376 |
+ customLogger.getResourceBundleName()); |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
377 |
} |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
378 |
if (bundle_fr != handler2.lastBundle) { |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
379 |
throw new RuntimeException("Unexpected bundle: " |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
380 |
+ handler2.lastBundle); |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
381 |
} |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
382 |
if (bundle_fr != customLogger.getResourceBundle()) { |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
383 |
throw new RuntimeException("Unexpected bundle: " |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
384 |
+ customLogger.getResourceBundle()); |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
385 |
} |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
386 |
|
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
387 |
// Do the same thing again with a child of the custom logger. |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
388 |
Logger biebar = Logger.getLogger(customLogger.getName() + ".bar"); |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
389 |
biebar.fine("dummy"); |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
390 |
|
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
391 |
// because getResourceBundleName() is called on parent logger |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
392 |
// we will have handler2.lastBundleName = PROPERTY_BUNDLE_NAME |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
393 |
if (!PROPERTY_BUNDLE_NAME.equals(handler2.lastBundleName)) { |
22079
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
394 |
debugLogger(biebar, customLogger, handler2); |
20865
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
395 |
throw new RuntimeException("Unexpected bundle name: " |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
396 |
+ handler2.lastBundleName); |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
397 |
} |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
398 |
// because getResourceBundle() is not called on parent logger |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
399 |
// we will have getBaseName(handler2.lastBundle) = PROPERTY_BUNDLE_NAME |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
400 |
// and not handler2.lastBundle = bundle_fr |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
401 |
if (handler2.lastBundle == null) { |
22079
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
402 |
debugLogger(biebar, customLogger, handler2); |
20865
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
403 |
throw new RuntimeException("Unexpected bundle: " |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
404 |
+ handler2.lastBundle); |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
405 |
} |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
406 |
if (!PROPERTY_BUNDLE_NAME.equals(getBaseName(handler2.lastBundle))) { |
22079
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
407 |
debugLogger(biebar, customLogger, handler2); |
20865
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
408 |
throw new RuntimeException("Unexpected bundle name: " |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
409 |
+ getBaseName(handler2.lastBundle)); |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
410 |
} |
22079
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
411 |
|
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
412 |
// Just make sure that these loggers won't be eagerly GCed... |
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
413 |
if (foobar == null || !loggerName.equals(foobar.getName())) { |
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
414 |
throw new RuntimeException("foobar is null " |
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
415 |
+ "- or doesn't have the expected name: " + foobar); |
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
416 |
} |
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
417 |
if (foobaz == null || !foobaz.getName().startsWith(loggerName)) { |
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
418 |
throw new RuntimeException("foobaz is null " |
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
419 |
+ "- or doesn't have the expected name: " + foobaz); |
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
420 |
} |
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
421 |
if (foobaz2 == null || !foobaz2.getName().startsWith(loggerName)) { |
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
422 |
throw new RuntimeException("foobaz2 is null " |
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
423 |
+ "- or doesn't have the expected name: " + foobaz2); |
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
424 |
} |
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
425 |
if (!customLogger.getName().startsWith(loggerName)) { |
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
426 |
throw new RuntimeException("customLogger " |
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
427 |
+ "doesn't have the expected name: " + customLogger); |
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
428 |
} |
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
429 |
if (!biebar.getName().startsWith(loggerName)) { |
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
430 |
throw new RuntimeException("biebar " |
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
431 |
+ "doesn't have the expected name: " + biebar.getName()); |
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
432 |
} |
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
433 |
System.out.println("Test passed for " + loggerName); |
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
434 |
} |
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
435 |
|
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
436 |
static void debugLogger(Logger logger, Logger expectedParent, TestHandler handler) { |
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
437 |
final String logName = logger.getName(); |
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
438 |
final String prefix = " " + logName; |
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
439 |
System.err.println("Logger " + logName |
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
440 |
+ " logged with bundle name " + handler.lastBundleName |
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
441 |
+ " (" + handler.lastBundle + ")"); |
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
442 |
System.err.println(prefix + ".getResourceBundleName() is " |
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
443 |
+ logger.getResourceBundleName()); |
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
444 |
System.err.println(prefix + ".getResourceBundle() is " |
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
445 |
+ logger.getResourceBundle()); |
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
446 |
final Logger parent = logger.getParent(); |
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
447 |
final String pname = parent == null ? null : parent.getName(); |
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
448 |
final String pclass = parent == null ? "" |
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
449 |
: ("(" + parent.getClass().getName() + ")"); |
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
450 |
final String presn = parent == null ? null |
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
451 |
: parent.getResourceBundleName(); |
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
452 |
final ResourceBundle pres = parent == null ? null |
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
453 |
: parent.getResourceBundle(); |
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
454 |
System.err.println(prefix + ".getParent() is " |
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
455 |
+ pname + (pname == null ? "" |
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
456 |
: (" " + pclass + ": " + parent))); |
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
457 |
System.err.println(" expected parent is :" + expectedParent); |
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
458 |
System.err.println(prefix + ".parent.getResourceBundleName() is " |
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
459 |
+ presn); |
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
460 |
System.err.println(prefix + ".parent.getResourceBundle() is " |
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
461 |
+ pres); |
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
462 |
System.err.println(" expected parent getResourceBundleName() is " |
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
463 |
+ expectedParent.getResourceBundleName()); |
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
464 |
System.err.println(" expected parent.getResourceBundle() is " |
5f22afc7db58
8030187: TEST_BUG: java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java failing again
dfuchs
parents:
20865
diff
changeset
|
465 |
+ expectedParent.getResourceBundle()); |
20865
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
466 |
} |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
467 |
|
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
468 |
public static class SimplePolicy extends Policy { |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
469 |
|
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
470 |
final Permissions permissions; |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
471 |
public SimplePolicy(TestCase test) { |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
472 |
permissions = new Permissions(); |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
473 |
if (test != TestCase.PERMISSION) { |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
474 |
permissions.add(new LoggingPermission("control", null)); |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
475 |
} |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
476 |
// required for calling Locale.setDefault in the test. |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
477 |
permissions.add(new PropertyPermission("user.language", "write")); |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
478 |
} |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
479 |
|
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
480 |
@Override |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
481 |
public boolean implies(ProtectionDomain domain, Permission permission) { |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
482 |
return permissions.implies(permission); |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
483 |
} |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
484 |
} |
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
485 |
|
164ba3f3484b
8013839: Enhance Logger API for handling of resource bundles
dfuchs
parents:
diff
changeset
|
486 |
} |