Skip to content

Commit

Permalink
[GR-32644] Resource Bundles do not work properly for jars placed on t…
Browse files Browse the repository at this point in the history
…he host class path.

PullRequest: graal/9366
  • Loading branch information
tzezula committed Jul 22, 2021
2 parents bb31b36 + 5888bec commit 588fab6
Showing 3 changed files with 79 additions and 4 deletions.
Original file line number Diff line number Diff line change
@@ -58,6 +58,7 @@
import java.nio.file.Path;
import java.nio.file.Paths;
import java.nio.file.StandardOpenOption;
import java.util.Collections;
import java.util.Comparator;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.jar.Attributes;
@@ -350,6 +351,27 @@ public void testInterruptedThread() throws IOException {
}
}

@Test
public void testResourceBundle() throws IOException {
setupEnv();
final Class<?> hostClass = HostClassLoadingTestClass4.class;
String newClassName = hostClass.getPackage().getName() + "." + TEST_REPLACE_CLASS_NAME;
Path tempDir = renameHostClass(hostClass, TEST_REPLACE_CLASS_NAME);
try {
Files.write(tempDir.resolve("bundle.properties"), Collections.singleton("key=value"));
Path jar = createJar(tempDir);
try {
languageEnv.addToHostClassPath(languageEnv.getPublicTruffleFile(jar.toString()));
Object testClass = languageEnv.lookupHostSymbol(newClassName);
assertEquals("value", execute(read(testClass, "testMethod"), "bundle", "key"));
} finally {
Files.deleteIfExists(jar);
}
} finally {
deleteDir(tempDir);
}
}

private static void assertHostClassPath(Env env, final Class<?> hostClass, String newName, TruffleFile classPathEntry) {
String newClassName = hostClass.getPackage().getName() + "." + newName;

Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
/*
* Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* The Universal Permissive License (UPL), Version 1.0
*
* Subject to the condition set forth below, permission is hereby granted to any
* person obtaining a copy of this software, associated documentation and/or
* data (collectively the "Software"), free of charge and under any and all
* copyright rights in the Software, and any and all patent rights owned or
* freely licensable by each licensor hereunder covering either (i) the
* unmodified Software as contributed to or provided by such licensor, or (ii)
* the Larger Works (as defined below), to deal in both
*
* (a) the Software, and
*
* (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
* one is included with the Software each a "Larger Work" to which the Software
* is contributed by such licensors),
*
* without restriction, including without limitation the rights to copy, create
* derivative works of, display, perform, and distribute the Software and make,
* use, sell, offer for sale, import, export, have made, and have sold the
* Software and the Larger Work(s), and to sublicense the foregoing rights on
* either these or other terms.
*
* This license is subject to the following condition:
*
* The above copyright notice and either this complete permission notice or at a
* minimum a reference to the UPL must be included in all copies or substantial
* portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package com.oracle.truffle.api.test.polyglot;

import java.util.ResourceBundle;

/**
* This class is used in {@link HostClassLoadingTest}. Renaming this class might be requiring
* changes.
*/
public final class HostClassLoadingTestClass4 {

public static String testMethod(String bundleName, String key) {
return ResourceBundle.getBundle(bundleName).getString(key);
}
}
Original file line number Diff line number Diff line change
@@ -360,10 +360,9 @@ public Resource findResource(String name) {

@Override
URL getURL() {
StringBuilder url = new StringBuilder(root.toUri().toString());
if (url.charAt(url.length() - 1) != '/') {
url.append('/');
}
StringBuilder url = new StringBuilder("jar:");
url.append(root.toUri());
url.append("!/");
url.append(name);
try {
return new URL(url.toString());

0 comments on commit 588fab6

Please sign in to comment.