|
| 1 | +/* |
| 2 | + * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved. |
| 3 | + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
| 4 | + * |
| 5 | + * This code is free software; you can redistribute it and/or modify it |
| 6 | + * under the terms of the GNU General Public License version 2 only, as |
| 7 | + * published by the Free Software Foundation. |
| 8 | + * |
| 9 | + * This code is distributed in the hope that it will be useful, but WITHOUT |
| 10 | + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
| 11 | + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
| 12 | + * version 2 for more details (a copy is included in the LICENSE file that |
| 13 | + * accompanied this code). |
| 14 | + * |
| 15 | + * You should have received a copy of the GNU General Public License version |
| 16 | + * 2 along with this work; if not, write to the Free Software Foundation, |
| 17 | + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
| 18 | + * |
| 19 | + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
| 20 | + * or visit www.oracle.com if you need additional information or have any |
| 21 | + * questions. |
| 22 | + */ |
| 23 | + |
| 24 | +/** |
| 25 | + * @test |
| 26 | + * @bug 8338981 |
| 27 | + * @summary Access to private classes should be permitted inside the permits clause of the enclosing top-level class. |
| 28 | + * @library /tools/lib |
| 29 | + * @modules jdk.compiler/com.sun.tools.javac.api |
| 30 | + * jdk.compiler/com.sun.tools.javac.main |
| 31 | + * jdk.compiler/com.sun.tools.javac.util |
| 32 | + * @build toolbox.ToolBox toolbox.JavacTask toolbox.Task |
| 33 | + * @run main PrivateMembersInPermitClause -source 19+ |
| 34 | + */ |
| 35 | +import java.nio.file.Path; |
| 36 | +import java.util.Objects; |
| 37 | +import toolbox.Task; |
| 38 | +import java.util.List; |
| 39 | + |
| 40 | +public class PrivateMembersInPermitClause extends toolbox.TestRunner { |
| 41 | + |
| 42 | + private final toolbox.ToolBox tb; |
| 43 | + |
| 44 | + public PrivateMembersInPermitClause() { |
| 45 | + super(System.err); |
| 46 | + tb = new toolbox.ToolBox(); |
| 47 | + } |
| 48 | + |
| 49 | + public static void main(String... args) throws Exception { |
| 50 | + new PrivateMembersInPermitClause().runTests(); |
| 51 | + } |
| 52 | + |
| 53 | + public void runTests() throws Exception { |
| 54 | + runTests(_ -> new Object[] {}); |
| 55 | + } |
| 56 | + |
| 57 | + /** |
| 58 | + * Tests that a private class in the permits clause compiles successfully. |
| 59 | + */ |
| 60 | + @Test |
| 61 | + public void privateClassPermitted() throws Exception { |
| 62 | + var root = Path.of("src"); |
| 63 | + tb.writeJavaFiles(root, |
| 64 | + """ |
| 65 | + sealed class S permits S.A { |
| 66 | + private static final class A extends S {} |
| 67 | + } |
| 68 | + """ |
| 69 | + ); |
| 70 | + |
| 71 | + new toolbox.JavacTask(tb) |
| 72 | + .files(root.resolve("S.java")) |
| 73 | + .run(toolbox.Task.Expect.SUCCESS); |
| 74 | + } |
| 75 | + |
| 76 | + /** |
| 77 | + * Tests that a private class from another top-level class in the permits clause fails to compile. |
| 78 | + */ |
| 79 | + @Test |
| 80 | + public void otherTopLevelPrivateClassFails() throws Exception { |
| 81 | + var root = Path.of("src"); |
| 82 | + tb.writeJavaFiles(root, |
| 83 | + """ |
| 84 | + public class S { |
| 85 | + private static final class A extends S {} |
| 86 | + } |
| 87 | + sealed class T permits S.A { |
| 88 | + } |
| 89 | + """ |
| 90 | + ); |
| 91 | + var expectedErrors = List.of( |
| 92 | + "S.java:4:25: compiler.err.report.access: S.A, private, S", |
| 93 | + "1 error" |
| 94 | + ); |
| 95 | + |
| 96 | + var compileErrors = new toolbox.JavacTask(tb) |
| 97 | + .files(root.resolve("S.java")) |
| 98 | + .options("-XDrawDiagnostics") |
| 99 | + .run(toolbox.Task.Expect.FAIL) |
| 100 | + .getOutputLines(Task.OutputKind.DIRECT); |
| 101 | + |
| 102 | + if (!Objects.equals(compileErrors, expectedErrors)) { |
| 103 | + throw new AssertionError("Expected errors: " + expectedErrors + ", but got: " + compileErrors); |
| 104 | + } |
| 105 | + } |
| 106 | + |
| 107 | + /** |
| 108 | + * Tests that a private class in the permits clause of an inner class compiles successfully. |
| 109 | + */ |
| 110 | + @Test |
| 111 | + public void privateClassInInnerPermitted() throws Exception { |
| 112 | + var root = Path.of("src"); |
| 113 | + tb.writeJavaFiles(root, |
| 114 | + """ |
| 115 | + public sealed class S permits S.T.A { |
| 116 | + static class T { |
| 117 | + private static final class A extends S {} |
| 118 | + } |
| 119 | + } |
| 120 | + """ |
| 121 | + ); |
| 122 | + |
| 123 | + new toolbox.JavacTask(tb) |
| 124 | + .files(root.resolve("S.java")) |
| 125 | + .run(toolbox.Task.Expect.SUCCESS); |
| 126 | + } |
| 127 | + |
| 128 | + /** |
| 129 | + * Tests that a private class in the permits clause contained in a sibling private inner class compiles successfully. |
| 130 | + */ |
| 131 | + @Test |
| 132 | + public void siblingPrivateClassesPermitted() throws Exception { |
| 133 | + var root = Path.of("src"); |
| 134 | + tb.writeJavaFiles(root, |
| 135 | + """ |
| 136 | + public class S { |
| 137 | + private static class A { |
| 138 | + private static class B extends C.D {} |
| 139 | + } |
| 140 | + private static class C { |
| 141 | + private static class D {} |
| 142 | + } |
| 143 | + } |
| 144 | + """ |
| 145 | + ); |
| 146 | + |
| 147 | + new toolbox.JavacTask(tb) |
| 148 | + .files(root.resolve("S.java")) |
| 149 | + .run(toolbox.Task.Expect.SUCCESS); |
| 150 | + } |
| 151 | + |
| 152 | + /** |
| 153 | + * Tests that a private class in the permits clause of a sealed class does not compile when the release is lower than 19. |
| 154 | + */ |
| 155 | + @Test |
| 156 | + public void testSourceLowerThan19() throws Exception { |
| 157 | + var root = Path.of("src"); |
| 158 | + tb.writeJavaFiles(root, |
| 159 | + """ |
| 160 | + sealed class S permits S.A { |
| 161 | + private static final class A extends S {} |
| 162 | + } |
| 163 | + """ |
| 164 | + ); |
| 165 | + |
| 166 | + var expectedErrors = List.of( |
| 167 | + "S.java:1:25: compiler.err.report.access: S.A, private, S", |
| 168 | + "S.java:2:26: compiler.err.cant.inherit.from.sealed: S", |
| 169 | + "2 errors" |
| 170 | + ); |
| 171 | + |
| 172 | + var actualOutput = new toolbox.JavacTask(tb) |
| 173 | + .files(root.resolve("S.java")) |
| 174 | + .options("--release", "18", "-XDrawDiagnostics") |
| 175 | + .run(toolbox.Task.Expect.FAIL) |
| 176 | + .getOutputLines(Task.OutputKind.DIRECT); |
| 177 | + |
| 178 | + if (!Objects.equals(actualOutput, expectedErrors)) { |
| 179 | + throw new AssertionError("Expected errors: " + expectedErrors + ", but got: " + actualOutput); |
| 180 | + } |
| 181 | + } |
| 182 | +} |
0 commit comments