undefect. CWE-407 — 63 sites patched across 27 ecosystems
Authors: russell@unturf.com · brackishbert@gmail.com · foxhop.net · TimeHexOn.com Patches, unit tests, benchmarks, whitepaper, and outreach briefs. Public domain — no copyright claimed. Use freely.
This commit is contained in:
commit
0a580b313d
70422 changed files with 17213626 additions and 0 deletions
357
test/langtools/tools/javac/patterns/SourceLevelChecks.java
Normal file
357
test/langtools/tools/javac/patterns/SourceLevelChecks.java
Normal file
|
|
@ -0,0 +1,357 @@
|
|||
/*
|
||||
* Copyright (c) 2021, 2024, 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 8268896
|
||||
* @summary Verify source level checks are performed properly
|
||||
* @library /tools/lib
|
||||
* @modules jdk.compiler/com.sun.tools.javac.api
|
||||
* jdk.compiler/com.sun.tools.javac.main
|
||||
* jdk.compiler/com.sun.tools.javac.util
|
||||
* @build toolbox.ToolBox toolbox.JavacTask
|
||||
* @run main SourceLevelChecks
|
||||
*/
|
||||
|
||||
import java.io.IOException;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.nio.file.Paths;
|
||||
import java.util.List;
|
||||
|
||||
import toolbox.TestRunner;
|
||||
import toolbox.JavacTask;
|
||||
import toolbox.Task;
|
||||
import toolbox.ToolBox;
|
||||
|
||||
public class SourceLevelChecks extends TestRunner {
|
||||
|
||||
ToolBox tb;
|
||||
|
||||
public static void main(String... args) throws Exception {
|
||||
new SourceLevelChecks().runTests();
|
||||
}
|
||||
|
||||
SourceLevelChecks() {
|
||||
super(System.err);
|
||||
tb = new ToolBox();
|
||||
}
|
||||
|
||||
public void runTests() throws Exception {
|
||||
runTests(m -> new Object[] { Paths.get(m.getName()) });
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testPattern(Path base) throws Exception {
|
||||
doTest(base,
|
||||
"""
|
||||
package test;
|
||||
public class Test {
|
||||
private void test(Integer i) {
|
||||
switch (i) {
|
||||
case Integer d:
|
||||
}
|
||||
}
|
||||
}
|
||||
""",
|
||||
"Test.java:5:18: compiler.err.feature.not.supported.in.source.plural: (compiler.misc.feature.pattern.switch), 17, 21",
|
||||
"1 error");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testParenthesizedPatternIf(Path base) throws Exception {
|
||||
doTest(base,
|
||||
"""
|
||||
package test;
|
||||
public class Test {
|
||||
private void test(Object o) {
|
||||
if (o instanceof (Integer d)) {
|
||||
}
|
||||
}
|
||||
}
|
||||
""",
|
||||
"Test.java:4:26: compiler.err.feature.not.supported.in.source.plural: (compiler.misc.feature.pattern.switch), 17, 21",
|
||||
"1 error");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testParenthesizedPatternSwitch(Path base) throws Exception {
|
||||
doTest(base,
|
||||
"""
|
||||
package test;
|
||||
public class Test {
|
||||
private void test(Integer i) {
|
||||
switch (i) {
|
||||
case (Integer d):
|
||||
}
|
||||
}
|
||||
}
|
||||
""",
|
||||
"Test.java:5:18: compiler.err.feature.not.supported.in.source.plural: (compiler.misc.feature.pattern.switch), 17, 21",
|
||||
"1 error");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testCaseDefault(Path base) throws Exception {
|
||||
doTest(base,
|
||||
"""
|
||||
package test;
|
||||
public class Test {
|
||||
private void test(Integer i) {
|
||||
switch (i) {
|
||||
case null, default:
|
||||
}
|
||||
}
|
||||
}
|
||||
""",
|
||||
"Test.java:5:24: compiler.err.feature.not.supported.in.source.plural: (compiler.misc.feature.pattern.switch), 17, 21",
|
||||
"1 error");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testNestedPrimitive1(Path base) throws Exception {
|
||||
doTest(base,
|
||||
"""
|
||||
package test;
|
||||
public class Test {
|
||||
private void test(R r) {
|
||||
if (r instanceof R(byte b)) {
|
||||
}
|
||||
}
|
||||
record R(int i) {}
|
||||
}
|
||||
""",
|
||||
21,
|
||||
"Test.java:4:28: compiler.err.preview.feature.disabled.plural: (compiler.misc.feature.primitive.patterns)",
|
||||
"1 error");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testNestedPrimitive2(Path base) throws Exception {
|
||||
doTest(base,
|
||||
"""
|
||||
package test;
|
||||
public class Test {
|
||||
private void test(R r) {
|
||||
switch (r) {
|
||||
case R(byte b) -> {}
|
||||
default -> {}
|
||||
}
|
||||
}
|
||||
record R(int i) {}
|
||||
}
|
||||
""",
|
||||
21,
|
||||
"Test.java:5:20: compiler.err.preview.feature.disabled.plural: (compiler.misc.feature.primitive.patterns)",
|
||||
"1 error");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testNestedPrimitive3(Path base) throws Exception {
|
||||
doTest(base,
|
||||
"""
|
||||
package test;
|
||||
public class Test {
|
||||
private void test(R r) {
|
||||
if (r instanceof R(long l)) {
|
||||
}
|
||||
}
|
||||
record R(int i) {}
|
||||
}
|
||||
""",
|
||||
21,
|
||||
"Test.java:4:28: compiler.err.preview.feature.disabled.plural: (compiler.misc.feature.primitive.patterns)",
|
||||
"1 error");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testNestedPrimitive4(Path base) throws Exception {
|
||||
doTest(base,
|
||||
"""
|
||||
package test;
|
||||
public class Test {
|
||||
private void test(R r) {
|
||||
switch (r) {
|
||||
case R(long l) -> {}
|
||||
default -> {}
|
||||
}
|
||||
}
|
||||
record R(int i) {}
|
||||
}
|
||||
""",
|
||||
21,
|
||||
"Test.java:5:20: compiler.err.preview.feature.disabled.plural: (compiler.misc.feature.primitive.patterns)",
|
||||
"1 error");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testPrimitive2Reference1(Path base) throws Exception {
|
||||
doTest(base,
|
||||
"""
|
||||
package test;
|
||||
public class Test {
|
||||
private void test(int i) {
|
||||
if (i instanceof Integer j) {}
|
||||
}
|
||||
}
|
||||
""",
|
||||
21,
|
||||
"Test.java:4:13: compiler.err.preview.feature.disabled.plural: (compiler.misc.feature.primitive.patterns)",
|
||||
"1 error");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testPrimitive2Reference2(Path base) throws Exception {
|
||||
doTest(base,
|
||||
"""
|
||||
package test;
|
||||
public class Test {
|
||||
private void test(int i) {
|
||||
switch (i) {
|
||||
case Integer j -> {}
|
||||
}
|
||||
}
|
||||
}
|
||||
""",
|
||||
21,
|
||||
"Test.java:5:18: compiler.err.preview.feature.disabled.plural: (compiler.misc.feature.primitive.patterns)",
|
||||
"1 error");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testReference2Primitive1(Path base) throws Exception {
|
||||
doTest(base,
|
||||
"""
|
||||
package test;
|
||||
public class Test {
|
||||
private void test(Integer i) {
|
||||
if (i instanceof int j) {}
|
||||
}
|
||||
}
|
||||
""",
|
||||
21,
|
||||
"Test.java:4:26: compiler.err.preview.feature.disabled.plural: (compiler.misc.feature.primitive.patterns)",
|
||||
"1 error");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testReference2Primitive2(Path base) throws Exception {
|
||||
doTest(base,
|
||||
"""
|
||||
package test;
|
||||
public class Test {
|
||||
private void test(Integer i) {
|
||||
switch (i) {
|
||||
case int j -> {}
|
||||
}
|
||||
}
|
||||
}
|
||||
""",
|
||||
21,
|
||||
"Test.java:5:18: compiler.err.preview.feature.disabled.plural: (compiler.misc.feature.primitive.patterns)",
|
||||
"1 error");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testPrimitivePatternObject1(Path base) throws Exception {
|
||||
doTest(base,
|
||||
"""
|
||||
package test;
|
||||
public class Test {
|
||||
private void test(Object o) {
|
||||
if (o instanceof int j) {}
|
||||
}
|
||||
}
|
||||
""",
|
||||
21,
|
||||
"Test.java:4:26: compiler.err.preview.feature.disabled.plural: (compiler.misc.feature.primitive.patterns)",
|
||||
"1 error");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testPrimitivePatternObject2(Path base) throws Exception {
|
||||
doTest(base,
|
||||
"""
|
||||
package test;
|
||||
public class Test {
|
||||
private void test(Object o) {
|
||||
switch (o) {
|
||||
case int j -> {}
|
||||
}
|
||||
}
|
||||
record R(int i) {}
|
||||
}
|
||||
""",
|
||||
21,
|
||||
"Test.java:5:18: compiler.err.preview.feature.disabled.plural: (compiler.misc.feature.primitive.patterns)",
|
||||
"1 error");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testOtherPrimitives(Path base) throws Exception {
|
||||
for (String type : new String[] {"boolean", "long", "float", "double"}) {
|
||||
doTest(base,
|
||||
"""
|
||||
package test;
|
||||
public class Test {
|
||||
private void test($type v) {
|
||||
switch (v) {
|
||||
default -> {}
|
||||
}
|
||||
}
|
||||
}
|
||||
""".replace("$type", type),
|
||||
21,
|
||||
"Test.java:4:16: compiler.err.preview.feature.disabled.plural: (compiler.misc.feature.primitive.patterns)",
|
||||
"1 error");
|
||||
}
|
||||
}
|
||||
|
||||
private void doTest(Path base, String testCode, String... expectedErrors) throws IOException {
|
||||
doTest(base, testCode, 17, expectedErrors);
|
||||
}
|
||||
|
||||
private void doTest(Path base, String testCode, int sourceLevel, String... expectedErrors) throws IOException {
|
||||
Path current = base.resolve(".");
|
||||
Path src = current.resolve("src");
|
||||
Path classes = current.resolve("classes");
|
||||
tb.writeJavaFiles(src, testCode);
|
||||
|
||||
Files.createDirectories(classes);
|
||||
|
||||
var log =
|
||||
new JavacTask(tb)
|
||||
.options("--release", "" + sourceLevel,
|
||||
"-XDrawDiagnostics")
|
||||
.outdir(classes)
|
||||
.files(tb.findJavaFiles(src))
|
||||
.run(Task.Expect.FAIL)
|
||||
.writeAll()
|
||||
.getOutputLines(Task.OutputKind.DIRECT);
|
||||
if (!List.of(expectedErrors).equals(log)) {
|
||||
throw new AssertionError("Incorrect errors, expected: " + List.of(expectedErrors) +
|
||||
", actual: " + log);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue