Reviewer needed: RegularFileObject patch for IcedTea6-1.10 [was Re: Reviewer needed: fix for class RegularFileObject + added new regression test]
Dr Andrew John Hughes
ahughes at redhat.com
Thu Mar 31 10:03:15 PDT 2011
On 17:41 Thu 31 Mar , Pavel Tisnovsky wrote:
> Dr Andrew John Hughes wrote:
> > On 11:26 Thu 31 Mar , Pavel Tisnovsky wrote:
> >
> > It needs a NEWS entry. Something like:
> >
>
> Hi Andrew,
>
> new hg diff containing new NEWS entry is stored in attachment. Can you
> please review it?
>
> Pavel
I don't see a NEWS change. This looks like the exact same patch.
> diff -r 2b50c801e31b Makefile.am
> --- a/Makefile.am Sat Mar 26 08:27:56 2011 +0100
> +++ b/Makefile.am Thu Mar 31 11:21:42 2011 +0200
> @@ -325,7 +325,8 @@
> patches/pr600-arm-jvm.cfg.patch \
> patches/jaxp-serial-version-uid.patch \
> patches/openjdk/7023591-AAShapePipe.patch \
> - patches/openjdk/7027667-AAShapePipeRegTest.patch
> + patches/openjdk/7027667-AAShapePipeRegTest.patch \
> + patches/revert-6885123.patch
>
> if WITH_ALT_HSBUILD
> ICEDTEA_PATCHES += \
> diff -r 2b50c801e31b patches/revert-6885123.patch
> --- /dev/null Thu Jan 01 00:00:00 1970 +0000
> +++ b/patches/revert-6885123.patch Thu Mar 31 11:21:42 2011 +0200
> @@ -0,0 +1,567 @@
> +--- openjdk.old/langtools/src/share/classes/com/sun/tools/javac/file/RegularFileObject.java 2011-02-28 17:07:28.000000000 +0100
> ++++ openjdk/langtools/src/share/classes/com/sun/tools/javac/file/RegularFileObject.java 2011-03-25 10:16:13.646180000 +0100
> +@@ -78,7 +78,7 @@
> +
> + //@Override
> + public String getName() {
> +- return file.getPath();
> ++ return this.name;
> + }
> +
> + //@Override
> +--- /dev/null 1970-01-01 01:00:00.000000000 +0100
> ++++ openjdk/jdk/test/javax/tools/JavaFileManager/JavaFileManagerTest.java 2011-03-28 15:51:43.000000000 +0200
> +@@ -0,0 +1,119 @@
> ++/*
> ++ * Copyright 2011 Red Hat, Inc. All Rights Reserved.
> ++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
> ++ *
> ++ * This code is free software; you can redistribute it and/or modify it
> ++ * under the terms of the GNU General Public License version 2 only, as
> ++ * published by the Free Software Foundation.
> ++ *
> ++ * This code is distributed in the hope that it will be useful, but WITHOUT
> ++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
> ++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
> ++ * version 2 for more details (a copy is included in the LICENSE file that
> ++ * accompanied this code).
> ++ *
> ++ * You should have received a copy of the GNU General Public License version
> ++ * 2 along with this work; if not, write to the Free Software Foundation,
> ++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
> ++ */
> ++
> ++
> ++import java.util.*;
> ++import java.io.*;
> ++import java.nio.charset.*;
> ++
> ++import javax.tools.*;
> ++import javax.tools.JavaFileManager.*;
> ++import javax.tools.JavaFileObject.*;
> ++
> ++public class JavaFileManagerTest {
> ++
> ++ /**
> ++ * Test data files are stored in a subdirectory named "test_data".
> ++ */
> ++ private static final String TEST_DATA_DIRECTORY = "test_data";
> ++
> ++ /**
> ++ * Charset used by JavaFileManager.
> ++ */
> ++ private static final Charset FILE_MANAGER_CHARSET = Charset.forName("US-ASCII");
> ++
> ++ /**
> ++ * Locale used by JavaFileManager.
> ++ */
> ++ private static final Locale FILE_MANAGER_LOCALE = (java.util.Locale)null;
> ++
> ++ /**
> ++ * Location of file objects being tested.
> ++ */
> ++ private static final Location FILE_OBJECTS_LOCATION = javax.tools.StandardLocation.SOURCE_PATH;
> ++
> ++ public static DiagnosticListener<JavaFileObject> listener = new DiagnosticCollector<JavaFileObject>();
> ++
> ++ private void doTest() throws IOException {
> ++ StandardJavaFileManager fileManager = getStandardFileManager();
> ++ fileManager.setLocation(FILE_OBJECTS_LOCATION, Collections.singleton(getSourceDirPathFile()));
> ++
> ++ checkFileManagerLocation(fileManager.getLocation(FILE_OBJECTS_LOCATION));
> ++ checkFileManagerGetName(fileManager);
> ++ }
> ++
> ++ private StandardJavaFileManager getStandardFileManager() {
> ++ return ToolProvider.getSystemJavaCompiler().getStandardFileManager(
> ++ listener, FILE_MANAGER_LOCALE, FILE_MANAGER_CHARSET);
> ++ }
> ++
> ++ public static File getSourceDirPathFile() {
> ++ return new File(new File("."), TEST_DATA_DIRECTORY);
> ++ }
> ++
> ++ /**
> ++ * Check if there's "./test_data" location included in a locations argument.
> ++ * @param locations set of locations returned by fileManager.getLocation()
> ++ */
> ++ private void checkFileManagerLocation(Iterable<? extends File> locations) {
> ++ for (File file : locations) {
> ++ if (".".equals(file.getParent()) && TEST_DATA_DIRECTORY.equals(file.getName())) {
> ++ System.out.println("checkFileManagerLocation: ok");
> ++ return;
> ++ }
> ++ }
> ++ throw new RuntimeException("fileManager.getLocation() returns wrong locations! " + locations.toString());
> ++ }
> ++
> ++ /**
> ++ * Check if method JavaFileManager.getName() returns correct file name.
> ++ * @param fileManager
> ++ * @throws IOException
> ++ */
> ++ private void checkFileManagerGetName(JavaFileManager fileManager) throws IOException {
> ++ Map<Kind, String> kinds = new HashMap<Kind, String>();
> ++ kinds.put(Kind.SOURCE, "Test.java");
> ++ kinds.put(Kind.CLASS, "Test.class");
> ++ kinds.put(Kind.HTML, "Test.html");
> ++ kinds.put(Kind.OTHER, "Test.txt");
> ++ for (Map.Entry<Kind, String> kind : kinds.entrySet()) {
> ++ System.out.println("Testing JavaFileManager for kind " + kind.getKey());
> ++ Iterable<JavaFileObject> fileObjects = fileManager.list(
> ++ FILE_OBJECTS_LOCATION, "", Collections.singleton(kind.getKey()), false);
> ++ checkIfFileObjectsContainName(fileObjects, kind.getValue());
> ++ }
> ++ }
> ++
> ++ private void checkIfFileObjectsContainName(Iterable<JavaFileObject> fileObjects, String name) {
> ++ //System.out.println(fileObjects);
> ++ for (JavaFileObject fileObject : fileObjects) {
> ++ //System.out.println(fileObject.getName());
> ++ if (name.equals(fileObject.getName())) {
> ++ System.out.println("JavaFileObject.getName(): ok ('" + fileObject.getName() + "')");
> ++ return;
> ++ }
> ++ }
> ++ throw new RuntimeException("JavaFileObject.getName() returns wrong name!");
> ++ }
> ++
> ++ public static void main(String argv[]) throws IOException {
> ++ new JavaFileManagerTest().doTest();
> ++ }
> ++
> ++}
> +--- /dev/null 1970-01-01 01:00:00.000000000 +0100
> ++++ openjdk/jdk/test/javax/tools/JavaFileManager/JavaFileManagerTest.sh 2011-03-28 15:47:23.000000000 +0200
> +@@ -0,0 +1,153 @@
> ++#!/bin/sh
> ++
> ++#
> ++# Copyright 2011 Red Hat, Inc. All Rights Reserved.
> ++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
> ++#
> ++# This code is free software; you can redistribute it and/or modify it
> ++# under the terms of the GNU General Public License version 2 only, as
> ++# published by the Free Software Foundation.
> ++#
> ++# This code is distributed in the hope that it will be useful, but WITHOUT
> ++# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
> ++# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
> ++# version 2 for more details (a copy is included in the LICENSE file that
> ++# accompanied this code).
> ++#
> ++# You should have received a copy of the GNU General Public License version
> ++# 2 along with this work; if not, write to the Free Software Foundation,
> ++# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
> ++
> ++#
> ++# This script is the actual launcher of JavaFileManagerTest.java
> ++#
> ++
> ++# @test
> ++# @summary Test that check proper behaviour of JavaFileManager and
> ++# JavaFileObject classes.
> ++
> ++
> ++
> ++# check arguments set by JTreg
> ++checkArgs() {
> ++ if [ "${TESTSRC}" = "" ]
> ++ then
> ++ echo "TESTSRC not set. Test cannot execute. Failed."
> ++ exit 1
> ++ fi
> ++ echo "TESTSRC=${TESTSRC}"
> ++ if [ "${TESTJAVA}" = "" ]
> ++ then
> ++ echo "TESTJAVA not set. Test cannot execute. Failed."
> ++ exit 1
> ++ fi
> ++ echo "TESTJAVA=${TESTJAVA}"
> ++ if [ "${TESTCLASSES}" = "" ]
> ++ then
> ++ echo "TESTCLASSES not set. Test cannot execute. Failed."
> ++ exit 1
> ++ fi
> ++}
> ++
> ++
> ++
> ++# print paths to test sources and test classes
> ++printPaths() {
> ++ echo "TESTCLASSES=${TESTCLASSES}"
> ++ echo "CLASSPATH=${CLASSPATH}"
> ++}
> ++
> ++
> ++
> ++# copy of all necessarry files into work directory
> ++copyWorkFiles() {
> ++ cp -r "${TESTSRC}/test_data" "${TESTCLASSES}/"
> ++ result=$?
> ++ if [ $result -eq 0 ]
> ++ then
> ++ echo "Copy of work files was successful."
> ++ else
> ++ echo "copy of work files have failed."
> ++ exit $result
> ++ fi
> ++
> ++ cp "${TESTSRC}/JavaFileManagerTest.java" "${TESTCLASSES}"
> ++ result=$?
> ++ if [ $result -eq 0 ]
> ++ then
> ++ echo "Copy of work files was successful."
> ++ else
> ++ echo "copy of work files have failed."
> ++ exit $result
> ++ fi
> ++}
> ++
> ++
> ++
> ++# compilation of Test class which is stored in test_data subdirectory
> ++compileTestClass() {
> ++ COMPILE="${TESTJAVA}/bin/javac ${TESTCLASSES}/test_data/Test.java"
> ++ echo ${COMPILE}
> ++ ${COMPILE}
> ++ result=$?
> ++
> ++ if [ $result -eq 0 ]
> ++ then
> ++ echo "Compilation of the test class was successful."
> ++ else
> ++ echo "Compilation of the test class have failed."
> ++ # Cleanup
> ++ rm -rf ${TESTCLASSES}/
> ++ exit $result
> ++ fi
> ++}
> ++
> ++
> ++
> ++# compilation of the Test itself
> ++compileTest() {
> ++ COMPILE="${TESTJAVA}/bin/javac ${TESTCLASSES}/JavaFileManagerTest.java"
> ++ echo ${COMPILE}
> ++ ${COMPILE}
> ++ result=$?
> ++
> ++ if [ $result -eq 0 ]
> ++ then
> ++ echo "Compilation of the test case was successful."
> ++ else
> ++ echo "Compilation of the test case failed."
> ++ # Cleanup
> ++ rm -rf ${TESTCLASSES}/
> ++ exit $result
> ++ fi
> ++}
> ++
> ++
> ++
> ++# run the test
> ++runTest() {
> ++ cd ${TESTCLASSES}
> ++ RUNCMD="${TESTJAVA}/bin/java JavaFileManagerTest"
> ++ echo ${RUNCMD}
> ++ ${RUNCMD}
> ++ result=$?
> ++
> ++ if [ $result -eq 0 ]
> ++ then
> ++ echo "Execution successful"
> ++ else
> ++ echo "Execution of the test case failed."
> ++ fi
> ++ rm -rf ${TESTCLASSES}/
> ++ exit $result
> ++}
> ++
> ++
> ++
> ++checkArgs
> ++printPaths
> ++copyWorkFiles
> ++compileTestClass
> ++compileTest
> ++runTest
> ++
> +--- /dev/null 1970-01-01 01:00:00.000000000 +0100
> ++++ openjdk/jdk/test/javax/tools/JavaFileManager/test_data/Test.html 2011-03-25 18:19:45.000000000 +0100
> +@@ -0,0 +1,5 @@
> ++<html>
> ++<body>
> ++42
> ++</body>
> ++</html>
> +--- /dev/null 1970-01-01 01:00:00.000000000 +0100
> ++++ openjdk/jdk/test/javax/tools/JavaFileManager/test_data/Test.java 2011-03-28 14:53:50.000000000 +0200
> +@@ -0,0 +1,5 @@
> ++package test_data;
> ++
> ++public class Test {
> ++ // nothing here
> ++}
> +--- /dev/null 1970-01-01 01:00:00.000000000 +0100
> ++++ openjdk/jdk/test/javax/tools/JavaFileManager/test_data/Test.txt 2011-03-28 16:15:09.000000000 +0200
> +@@ -0,0 +1,2 @@
> ++42
> ++
> +--- openjdk/langtools/test/tools/javac/api/6411310/Test.java 2011-02-28 17:07:32.000000000 +0100
> ++++ /dev/null 2011-03-27 16:20:13.277479669 +0200
> +@@ -1,254 +0,0 @@
> +-/*
> +- * Copyright (c) 2009, 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 6410367 6411310
> +- * @summary FileObject should support user-friendly names via getName()
> +- */
> +-
> +-import java.io.*;
> +-import java.util.*;
> +-import java.util.jar.*;
> +-import java.util.zip.*;
> +-import javax.tools.*;
> +-
> +-import com.sun.tools.javac.file.JavacFileManager;
> +-import com.sun.tools.javac.util.Context;
> +-import com.sun.tools.javac.util.Options;
> +-
> +-// Test FileObject.getName returned from JavacFileManager and its support classes.
> +-
> +-public class Test {
> +- public static void main(String... args) throws Exception {
> +- new Test().run();
> +- }
> +-
> +- Set<String> foundClasses = new TreeSet<String>();
> +- Set<String> foundJars = new TreeSet<String>();
> +-
> +- void run() throws Exception {
> +- File rt_jar = findRtJar();
> +-
> +- // names for entries to be created in directories and jar files
> +- String[] entries = { "p/A.java", "p/A.class", "p/resources/A-1.html" };
> +-
> +- // test various combinations of directories and jar files, intended to
> +- // cover all sources of file objects within JavacFileManager's support classes
> +-
> +- test(createFileManager(), createDir("dir", entries), "p", entries);
> +- test(createFileManager(), createDir("a b/dir", entries), "p", entries);
> +-
> +- for (boolean useJavaUtilZip: new boolean[] { false, true }) {
> +- test(createFileManager(useJavaUtilZip), createJar("jar", entries), "p", entries);
> +- test(createFileManager(useJavaUtilZip), createJar("jar jar", entries), "p", entries);
> +-
> +- for (boolean useSymbolFile: new boolean[] { false, true }) {
> +- test(createFileManager(useJavaUtilZip, useSymbolFile), rt_jar, "java.lang.ref", null);
> +- }
> +- }
> +-
> +- if (errors > 0)
> +- throw new Exception(errors + " errors found");
> +-
> +- // Verify that we hit all the impl classes we intended
> +- checkCoverage("classes", foundClasses,
> +- "RegularFileObject", "SymbolFileObject", "ZipFileIndexFileObject", "ZipFileObject");
> +-
> +- // Verify that we hit the jar files we intended, specifically ct.sym as well as rt.jar
> +- checkCoverage("jar files", foundJars,
> +- "ct.sym", "jar", "jar jar", "rt.jar");
> +- }
> +-
> +- // use a new file manager for each test
> +- void test(StandardJavaFileManager fm, File f, String pkg, String[] entries) throws Exception {
> +- System.err.println("Test " + f);
> +- try {
> +- if (f.isDirectory()) {
> +- for (File dir: new File[] { f, f.getAbsoluteFile() }) {
> +- for (String e: entries) {
> +- JavaFileObject fo = fm.getJavaFileObjects(new File(dir, e)).iterator().next();
> +- test(fo, dir, e);
> +- }
> +- }
> +- }
> +-
> +- fm.setLocation(StandardLocation.CLASS_PATH, Collections.singleton(f));
> +- fm.setLocation(StandardLocation.SOURCE_PATH, Collections.singleton(f.getAbsoluteFile()));
> +- for (StandardLocation l: EnumSet.of(StandardLocation.CLASS_PATH, StandardLocation.SOURCE_PATH)) {
> +- for (JavaFileObject fo: fm.list(l, pkg, EnumSet.allOf(JavaFileObject.Kind.class), true)) {
> +- // we could use fm.getLocation but the following guarantees we preserve the original filename
> +- File dir = (l == StandardLocation.CLASS_PATH ? f : f.getAbsoluteFile());
> +- char sep = (dir.isDirectory() ? File.separatorChar : '/');
> +- String b = fm.inferBinaryName(l, fo);
> +- String e = fo.getKind().extension;
> +- test(fo, dir, b.replace('.', sep) + e);
> +- }
> +- }
> +- } finally {
> +- fm.close();
> +- }
> +- }
> +-
> +- void test(JavaFileObject fo, File dir, String p) {
> +- System.err.println("Test: " + fo);
> +- String expect = dir.isDirectory() ? new File(dir, p).getPath() : (dir.getPath() + "(" + p + ")");
> +- String found = fo.getName();
> +- // if ct.sym is found, replace it with the equivalent rt.jar
> +- String found2 = found.replaceAll("lib([\\\\/])ct.sym\\(META-INF/sym/rt.jar/", "jre$1lib$1rt.jar(");
> +- if (!expect.equals(found2)) {
> +- System.err.println("expected: " + expect);
> +- System.err.println(" found: " + found);
> +- if (!found.equals(found2))
> +- System.err.println(" found2: " + found2);
> +- error("Failed: " + fo);
> +- }
> +-
> +- // record the file object class name for coverage checks later
> +- foundClasses.add(fo.getClass().getSimpleName());
> +-
> +- if (found.contains("(")) {
> +- // record access to the jar file for coverage checks later
> +- foundJars.add(new File(found.substring(0, found.indexOf("("))).getName());
> +- }
> +- }
> +-
> +- void checkCoverage(String label, Set<String> found, String... expect) throws Exception {
> +- Set<String> e = new TreeSet<String>(Arrays.asList(expect));
> +- if (!found.equals(e)) {
> +- e.removeAll(found);
> +- throw new Exception("expected " + label + " not used: " + e);
> +- }
> +- }
> +-
> +- JavacFileManager createFileManager() {
> +- return createFileManager(false, false);
> +- }
> +-
> +- JavacFileManager createFileManager(boolean useJavaUtilZip) {
> +- return createFileManager(useJavaUtilZip, false);
> +- }
> +-
> +- JavacFileManager createFileManager(boolean useJavaUtilZip, boolean useSymbolFile) {
> +- // javac should really not be using system properties like this
> +- // -- it should really be using (hidden) options -- but until then
> +- // take care to leave system properties as we find them, so as not
> +- // to adversely affect other tests that might follow.
> +- String prev = System.getProperty("useJavaUtilZip");
> +- boolean resetProperties = false;
> +- try {
> +- if (useJavaUtilZip) {
> +- System.setProperty("useJavaUtilZip", "true");
> +- resetProperties = true;
> +- } else if (System.getProperty("useJavaUtilZip") != null) {
> +- System.getProperties().remove("useJavaUtilZip");
> +- resetProperties = true;
> +- }
> +-
> +- Context c = new Context();
> +- if (!useSymbolFile) {
> +- Options options = Options.instance(c);
> +- options.put("ignore.symbol.file", "true");
> +- }
> +-
> +- return new JavacFileManager(c, false, null);
> +- } finally {
> +- if (resetProperties) {
> +- if (prev == null) {
> +- System.getProperties().remove("useJavaUtilZip");
> +- } else {
> +- System.setProperty("useJavaUtilZip", prev);
> +- }
> +- }
> +- }
> +- }
> +-
> +- File createDir(String name, String... entries) throws Exception {
> +- File dir = new File(name);
> +- if (!dir.mkdirs())
> +- throw new Exception("cannot create directories " + dir);
> +- for (String e: entries) {
> +- writeFile(new File(dir, e), e);
> +- }
> +- return dir;
> +- }
> +-
> +- File createJar(String name, String... entries) throws IOException {
> +- File jar = new File(name);
> +- OutputStream out = new FileOutputStream(jar);
> +- try {
> +- JarOutputStream jos = new JarOutputStream(out);
> +- for (String e: entries) {
> +- jos.putNextEntry(new ZipEntry(e));
> +- jos.write(e.getBytes());
> +- }
> +- jos.close();
> +- } finally {
> +- out.close();
> +- }
> +- return jar;
> +- }
> +-
> +- File findRtJar() throws Exception {
> +- File java_home = new File(System.getProperty("java.home"));
> +- if (java_home.getName().equals("jre"))
> +- java_home = java_home.getParentFile();
> +- File rt_jar = new File(new File(new File(java_home, "jre"), "lib"), "rt.jar");
> +- if (!rt_jar.exists())
> +- throw new Exception("can't find rt.jar");
> +- return rt_jar;
> +- }
> +-
> +- byte[] read(InputStream in) throws IOException {
> +- byte[] data = new byte[1024];
> +- int offset = 0;
> +- try {
> +- int n;
> +- while ((n = in.read(data, offset, data.length - offset)) != -1) {
> +- offset += n;
> +- if (offset == data.length)
> +- data = Arrays.copyOf(data, 2 * data.length);
> +- }
> +- } finally {
> +- in.close();
> +- }
> +- return Arrays.copyOf(data, offset);
> +- }
> +-
> +- void writeFile(File f, String s) throws IOException {
> +- f.getParentFile().mkdirs();
> +- FileWriter out = new FileWriter(f);
> +- try {
> +- out.write(s);
> +- } finally {
> +- out.close();
> +- }
> +- }
> +-
> +- void error(String msg) {
> +- System.err.println(msg);
> +- errors++;
> +- }
> +-
> +- int errors;
> +-}
--
Andrew :)
Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)
Support Free Java!
Contribute to GNU Classpath and IcedTea
http://www.gnu.org/software/classpath
http://icedtea.classpath.org
PGP Key: F5862A37 (https://keys.indymedia.org/)
Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37
More information about the distro-pkg-dev
mailing list