diff -r 853d8c191eac -r b316e32eb90c langtools/test/tools/javac/6508981/TestInferBinaryName.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/6508981/TestInferBinaryName.java	Tue Aug 26 14:52:59 2008 -0700
@@ -0,0 +1,177 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6508981
+ * @summary cleanup file separator handling in JavacFileManager
+ * (This test is specifically to test the new impl of inferBinaryName)
+ * @build p.A
+ * @run main TestInferBinaryName
+ */
+
+import java.io.*;
+import java.util.*;
+import javax.tools.*;
+
+import com.sun.tools.javac.file.JavacFileManager;
+import com.sun.tools.javac.util.Context;
+import com.sun.tools.javac.util.Options;
+
+import static javax.tools.JavaFileObject.Kind.*;
+import static javax.tools.StandardLocation.*;
+
+
+/**
+ * Verify the various implementations of inferBinaryName, but configuring
+ * different instances of a file manager, getting a file object, and checking
+ * the impl of inferBinaryName for that file object.
+ */
+public class TestInferBinaryName {
+    static final boolean IGNORE_SYMBOL_FILE = false;
+    static final boolean USE_SYMBOL_FILE = true;
+    static final boolean DONT_USE_ZIP_FILE_INDEX = false;
+    static final boolean USE_ZIP_FILE_INDEX = true;
+
+    public static void main(String... args) throws Exception {
+        new TestInferBinaryName().run();
+    }
+
+    void run() throws Exception {
+        //System.err.println(System.getProperties());
+        testDirectory();
+        testSymbolArchive();
+        testZipArchive();
+        testZipFileIndexArchive();
+        testZipFileIndexArchive2();
+        if (errors > 0)
+            throw new Exception(errors + " error found");
+    }
+
+    void testDirectory() throws IOException {
+        String testClassName = "p.A";
+        JavaFileManager fm =
+            getFileManager("test.classes", USE_SYMBOL_FILE, USE_ZIP_FILE_INDEX);
+        test("testDirectory",
+             fm, testClassName, "com.sun.tools.javac.file.RegularFileObject");
+    }
+
+    void testSymbolArchive() throws IOException {
+        String testClassName = "java.lang.String";
+        JavaFileManager fm =
+            getFileManager("sun.boot.class.path", USE_SYMBOL_FILE, DONT_USE_ZIP_FILE_INDEX);
+        test("testSymbolArchive",
+             fm, testClassName, "com.sun.tools.javac.file.SymbolArchive$SymbolFileObject");
+    }
+
+    void testZipArchive() throws IOException {
+        String testClassName = "java.lang.String";
+        JavaFileManager fm =
+            getFileManager("sun.boot.class.path", IGNORE_SYMBOL_FILE, DONT_USE_ZIP_FILE_INDEX);
+        test("testZipArchive",
+             fm, testClassName, "com.sun.tools.javac.file.ZipArchive$ZipFileObject");
+    }
+
+    void testZipFileIndexArchive() throws IOException {
+        String testClassName = "java.lang.String";
+        JavaFileManager fm =
+            getFileManager("sun.boot.class.path", USE_SYMBOL_FILE, USE_ZIP_FILE_INDEX);
+        test("testZipFileIndexArchive",
+             fm, testClassName, "com.sun.tools.javac.file.ZipFileIndexArchive$ZipFileIndexFileObject");
+    }
+
+    void testZipFileIndexArchive2() throws IOException {
+        String testClassName = "java.lang.String";
+        JavaFileManager fm =
+            getFileManager("sun.boot.class.path", IGNORE_SYMBOL_FILE, USE_ZIP_FILE_INDEX);
+        test("testZipFileIndexArchive2",
+             fm, testClassName, "com.sun.tools.javac.file.ZipFileIndexArchive$ZipFileIndexFileObject");
+    }
+
+    /**
+     * @param testName for debugging
+     * @param fm suitably configured file manager
+     * @param testClassName the classname to test
+     * @param implClassName the expected classname of the JavaFileObject impl,
+     *     used for checking that we are checking the expected impl of
+     *     inferBinaryName
+     */
+    void test(String testName,
+              JavaFileManager fm, String testClassName, String implClassName) throws IOException {
+        JavaFileObject fo = fm.getJavaFileForInput(CLASS_PATH, testClassName, CLASS);
+        if (fo == null) {
+            System.err.println("Can't find " + testClassName);
+            errors++;
+            return;
+        }
+
+        String cn = fo.getClass().getName();
+        String bn = fm.inferBinaryName(CLASS_PATH, fo);
+        System.err.println(testName + " " + cn + " " + bn);
+        check(cn, implClassName);
+        check(bn, testClassName);
+        System.err.println("OK");
+    }
+
+    JavaFileManager getFileManager(String classpathProperty,
+                                   boolean symFileKind,
+                                   boolean zipFileIndexKind)
+            throws IOException {
+        Context ctx = new Context();
+        // uugh, ugly back door, should be cleaned up, someday
+        if (zipFileIndexKind == USE_ZIP_FILE_INDEX)
+            System.clearProperty("useJavaUtilZip");
+        else
+            System.setProperty("useJavaUtilZip", "true");
+        Options options = Options.instance(ctx);
+        if (symFileKind == IGNORE_SYMBOL_FILE)
+            options.put("ignore.symbol.file", "true");
+        JavacFileManager fm = new JavacFileManager(ctx, false, null);
+        List<File> path = getPath(System.getProperty(classpathProperty));
+        fm.setLocation(CLASS_PATH, path);
+        return fm;
+    }
+
+    List<File> getPath(String s) {
+        List<File> path = new ArrayList<File>();
+        for (String f: s.split(File.pathSeparator)) {
+            if (f.length() > 0)
+                path.add(new File(f));
+        }
+        //System.err.println("path: " + path);
+        return path;
+    }
+
+    void check(String found, String expect) {
+        if (!found.equals(expect)) {
+            System.err.println("Expected: " + expect);
+            System.err.println("   Found: " + found);
+            errors++;
+        }
+    }
+
+    private int errors;
+}
+
+class A { }
+