diff --git a/checker-qual/src/main/java/org/checkerframework/checker/index/qual/EnsuresLTLengthOf.java b/checker-qual/src/main/java/org/checkerframework/checker/index/qual/EnsuresLTLengthOf.java
index 6903a5e9f933..3c8474f49b8d 100644
--- a/checker-qual/src/main/java/org/checkerframework/checker/index/qual/EnsuresLTLengthOf.java
+++ b/checker-qual/src/main/java/org/checkerframework/checker/index/qual/EnsuresLTLengthOf.java
@@ -36,7 +36,7 @@
*
* {@code
* public void useShiftIndex(@NonNegative int x) {
- * // :: error: (argument)
+ * // :: error: [argument]
* Arrays.fill(array, end, end + x, null);
* shiftIndex(x);
* Arrays.fill(array, end, end + x, null);
diff --git a/checker-qual/src/main/java/org/checkerframework/checker/units/qual/PolyUnit.java b/checker-qual/src/main/java/org/checkerframework/checker/units/qual/PolyUnit.java
index 0435cb42df4e..12801abe2ff3 100644
--- a/checker-qual/src/main/java/org/checkerframework/checker/units/qual/PolyUnit.java
+++ b/checker-qual/src/main/java/org/checkerframework/checker/units/qual/PolyUnit.java
@@ -29,7 +29,7 @@
* {@literal @}s int sec1 = 7 * UnitsTools.s;
* {@literal @}s int sec2 = triplePolyUnit(sec1);
*
- * // :: error: (assignment)
+ * // :: error: [assignment]
* {@literal @}s int sec3 = triplePolyUnit(m1);
* }
*
diff --git a/checker/build.gradle b/checker/build.gradle
index 31b8d832ec94..8454c7f33a02 100644
--- a/checker/build.gradle
+++ b/checker/build.gradle
@@ -465,7 +465,7 @@ tasks.register("ainferTestCheckerGenerateAjava", Test) {
doLast {
copyNonannotatedToAnnotatedDirectory("ainfer-testchecker")
- // AinferTestCheckerAjavaValidationTest fails with "warning: (purity.methodref)", whenever
+ // AinferTestCheckerAjavaValidationTest fails with "warning: [purity.methodref]", whenever
// there is a user-defined generic interface, and a variable of that type is assigned a
// method reference.
delete("tests/ainfer-testchecker/annotated/all-systems/java8/memberref/Issue946.java")
diff --git a/checker/jtreg/multiplecheckers/NullnessInterning1.out b/checker/jtreg/multiplecheckers/NullnessInterning1.out
index ec6620e80fb4..cf20a3bcf9d3 100644
--- a/checker/jtreg/multiplecheckers/NullnessInterning1.out
+++ b/checker/jtreg/multiplecheckers/NullnessInterning1.out
@@ -1,4 +1,4 @@
-NullnessInterning.java:19:14: compiler.warn.proc.messager: (assignment)
-NullnessInterning.java:22:9: compiler.warn.proc.messager: (not.interned)
-NullnessInterning.java:22:14: compiler.warn.proc.messager: (not.interned)
+NullnessInterning.java:19:14: compiler.warn.proc.messager: [assignment]
+NullnessInterning.java:22:9: compiler.warn.proc.messager: [not.interned]
+NullnessInterning.java:22:14: compiler.warn.proc.messager: [not.interned]
3 warnings
diff --git a/checker/jtreg/multiplecheckers/NullnessInterning2.out b/checker/jtreg/multiplecheckers/NullnessInterning2.out
index 1100bacdcd76..0719f3ee3968 100644
--- a/checker/jtreg/multiplecheckers/NullnessInterning2.out
+++ b/checker/jtreg/multiplecheckers/NullnessInterning2.out
@@ -1,3 +1,3 @@
-NullnessInterning.java:22:9: compiler.warn.proc.messager: (not.interned)
-NullnessInterning.java:22:14: compiler.warn.proc.messager: (not.interned)
+NullnessInterning.java:22:9: compiler.warn.proc.messager: [not.interned]
+NullnessInterning.java:22:14: compiler.warn.proc.messager: [not.interned]
2 warnings
diff --git a/checker/jtreg/multiplecheckers/NullnessInterning3.out b/checker/jtreg/multiplecheckers/NullnessInterning3.out
index 991309029a06..8ca13863a600 100644
--- a/checker/jtreg/multiplecheckers/NullnessInterning3.out
+++ b/checker/jtreg/multiplecheckers/NullnessInterning3.out
@@ -1,2 +1,2 @@
-NullnessInterning.java:19:14: compiler.warn.proc.messager: (assignment)
+NullnessInterning.java:19:14: compiler.warn.proc.messager: [assignment]
1 warning
diff --git a/checker/jtreg/nullness/issue1582/Foo.out b/checker/jtreg/nullness/issue1582/Foo.out
index a28aa9cc3cfe..f4d3a7e589b2 100644
--- a/checker/jtreg/nullness/issue1582/Foo.out
+++ b/checker/jtreg/nullness/issue1582/Foo.out
@@ -1,2 +1,2 @@
-Foo.java:15:18: compiler.err.proc.messager: (flowexpr.parse.error)
+Foo.java:15:18: compiler.err.proc.messager: [flowexpr.parse.error]
1 error
diff --git a/checker/jtreg/nullness/issue1582/JavaExpressionParseError.out b/checker/jtreg/nullness/issue1582/JavaExpressionParseError.out
index 32abfa84f5d3..e98e234dd83b 100644
--- a/checker/jtreg/nullness/issue1582/JavaExpressionParseError.out
+++ b/checker/jtreg/nullness/issue1582/JavaExpressionParseError.out
@@ -1,2 +1,2 @@
-JavaExpressionParseError.java:8:25: compiler.err.proc.messager: (flowexpr.parse.error.postcondition)
+JavaExpressionParseError.java:8:25: compiler.err.proc.messager: [flowexpr.parse.error.postcondition]
1 error
diff --git a/checker/jtreg/nullness/issue1929/Issue1929.java b/checker/jtreg/nullness/issue1929/Issue1929.java
index db65d8942cf4..caaecf3aa3b1 100644
--- a/checker/jtreg/nullness/issue1929/Issue1929.java
+++ b/checker/jtreg/nullness/issue1929/Issue1929.java
@@ -25,7 +25,7 @@ String[] fails2(Collection c) {
String[] fails3(Collection c) {
// We don't determine field types from initialization expressions.
- // :: error: (return)
+ // :: error: [return]
return c.toArray(EMPTY_STRING_ARRAY_3);
}
}
diff --git a/checker/jtreg/nullness/issue1958/NPE2Test.out b/checker/jtreg/nullness/issue1958/NPE2Test.out
index d047b653f5d0..60b1a0390b55 100644
--- a/checker/jtreg/nullness/issue1958/NPE2Test.out
+++ b/checker/jtreg/nullness/issue1958/NPE2Test.out
@@ -1,5 +1,5 @@
-NPE2Test.java:3:39: compiler.err.proc.messager: (assignment)
-NPE2Test.java:8:42: compiler.err.proc.messager: (assignment)
-NPE2Test.java:13:42: compiler.err.proc.messager: (assignment)
-NPE2Test.java:16:40: compiler.err.proc.messager: (assignment)
+NPE2Test.java:3:39: compiler.err.proc.messager: [assignment]
+NPE2Test.java:8:42: compiler.err.proc.messager: [assignment]
+NPE2Test.java:13:42: compiler.err.proc.messager: [assignment]
+NPE2Test.java:16:40: compiler.err.proc.messager: [assignment]
4 errors
diff --git a/checker/jtreg/nullness/issue2173/View.out b/checker/jtreg/nullness/issue2173/View.out
index 2fd6dd235b47..b90cd765d61c 100644
--- a/checker/jtreg/nullness/issue2173/View.out
+++ b/checker/jtreg/nullness/issue2173/View.out
@@ -1,3 +1,3 @@
-- compiler.warn.proc.messager: (invalid.annotation.location.bytecode)
-- compiler.warn.proc.messager: (invalid.annotation.location.bytecode)
+- compiler.warn.proc.messager: [invalid.annotation.location.bytecode]
+- compiler.warn.proc.messager: [invalid.annotation.location.bytecode]
2 warnings
diff --git a/checker/jtreg/nullness/issue820/AnonymousClass.out b/checker/jtreg/nullness/issue820/AnonymousClass.out
index e329aef1760c..c9f2c4737d55 100644
--- a/checker/jtreg/nullness/issue820/AnonymousClass.out
+++ b/checker/jtreg/nullness/issue820/AnonymousClass.out
@@ -1,2 +1,2 @@
-AnonymousClass.java:4:27: compiler.err.proc.messager: (assignment)
+AnonymousClass.java:4:27: compiler.err.proc.messager: [assignment]
1 error
diff --git a/checker/jtreg/nullness/issue820/Class1Class2-err.out b/checker/jtreg/nullness/issue820/Class1Class2-err.out
index 6c887808fb5a..07be6fea4e3b 100644
--- a/checker/jtreg/nullness/issue820/Class1Class2-err.out
+++ b/checker/jtreg/nullness/issue820/Class1Class2-err.out
@@ -1,3 +1,3 @@
-Class1.java:29:22: compiler.err.proc.messager: (contracts.postcondition)
-Class2.java:15:20: compiler.err.proc.messager: (contracts.precondition)
+Class1.java:29:22: compiler.err.proc.messager: [contracts.postcondition]
+Class2.java:15:20: compiler.err.proc.messager: [contracts.precondition]
2 errors
diff --git a/checker/jtreg/nullness/issue820/Class1MinClass2Min-err.out b/checker/jtreg/nullness/issue820/Class1MinClass2Min-err.out
index bd23cfc40736..994660a3b796 100644
--- a/checker/jtreg/nullness/issue820/Class1MinClass2Min-err.out
+++ b/checker/jtreg/nullness/issue820/Class1MinClass2Min-err.out
@@ -1,2 +1,2 @@
-Class2Min.java:6:25: compiler.err.proc.messager: (assignment)
+Class2Min.java:6:25: compiler.err.proc.messager: [assignment]
1 error
diff --git a/checker/jtreg/nullness/issue820/Class2Class1-err.out b/checker/jtreg/nullness/issue820/Class2Class1-err.out
index 77212490e5a3..f5780376cd70 100644
--- a/checker/jtreg/nullness/issue820/Class2Class1-err.out
+++ b/checker/jtreg/nullness/issue820/Class2Class1-err.out
@@ -1,3 +1,3 @@
-Class2.java:15:20: compiler.err.proc.messager: (contracts.precondition)
-Class1.java:29:22: compiler.err.proc.messager: (contracts.postcondition)
+Class2.java:15:20: compiler.err.proc.messager: [contracts.precondition]
+Class1.java:29:22: compiler.err.proc.messager: [contracts.postcondition]
2 errors
diff --git a/checker/jtreg/nullness/issue820/ErrorAnonymousClass.out b/checker/jtreg/nullness/issue820/ErrorAnonymousClass.out
index d38d36ffb9e4..95ca04ab31d7 100644
--- a/checker/jtreg/nullness/issue820/ErrorAnonymousClass.out
+++ b/checker/jtreg/nullness/issue820/ErrorAnonymousClass.out
@@ -1,3 +1,3 @@
-Error.java:13:23: compiler.err.proc.messager: (assignment)
-AnonymousClass.java:4:27: compiler.err.proc.messager: (assignment)
+Error.java:13:23: compiler.err.proc.messager: [assignment]
+AnonymousClass.java:4:27: compiler.err.proc.messager: [assignment]
2 errors
diff --git a/checker/jtreg/nullness/issue824/Class2.out b/checker/jtreg/nullness/issue824/Class2.out
index d569cb189583..54703a0b76de 100644
--- a/checker/jtreg/nullness/issue824/Class2.out
+++ b/checker/jtreg/nullness/issue824/Class2.out
@@ -1,9 +1,9 @@
-Class2.java:14:39: compiler.err.proc.messager: (type.argument)
-Class2.java:15:20: compiler.err.proc.messager: (type.argument)
-Class2.java:15:45: compiler.err.proc.messager: (type.argument)
-Class2.java:16:27: compiler.err.proc.messager: (type.arguments.not.inferred)
-Class2.java:19:27: compiler.err.proc.messager: (type.arguments.not.inferred)
-Class2.java:20:26: compiler.err.proc.messager: (argument)
-Class2.java:24:14: compiler.err.proc.messager: (override.return)
-Class2.java:25:33: compiler.err.proc.messager: (type.arguments.not.inferred)
+Class2.java:14:39: compiler.err.proc.messager: [type.argument]
+Class2.java:15:20: compiler.err.proc.messager: [type.argument]
+Class2.java:15:45: compiler.err.proc.messager: [type.argument]
+Class2.java:16:27: compiler.err.proc.messager: [type.arguments.not.inferred]
+Class2.java:19:27: compiler.err.proc.messager: [type.arguments.not.inferred]
+Class2.java:20:26: compiler.err.proc.messager: [argument]
+Class2.java:24:14: compiler.err.proc.messager: [override.return]
+Class2.java:25:33: compiler.err.proc.messager: [type.arguments.not.inferred]
8 errors
diff --git a/checker/jtreg/nullness/preciseErrorMsg/Class1.out b/checker/jtreg/nullness/preciseErrorMsg/Class1.out
index 24cf78a29506..83c90db97a42 100644
--- a/checker/jtreg/nullness/preciseErrorMsg/Class1.out
+++ b/checker/jtreg/nullness/preciseErrorMsg/Class1.out
@@ -1,2 +1,2 @@
-Class1.java:15:22: compiler.err.proc.messager: (flowexpr.parse.error)
+Class1.java:15:22: compiler.err.proc.messager: [flowexpr.parse.error]
1 error
diff --git a/checker/jtreg/rawtypes/RawTypeFail.out b/checker/jtreg/rawtypes/RawTypeFail.out
index 474a23916ebf..b0fdb604c6d6 100644
--- a/checker/jtreg/rawtypes/RawTypeFail.out
+++ b/checker/jtreg/rawtypes/RawTypeFail.out
@@ -1,6 +1,6 @@
RawTypeFail.java:14:30: compiler.warn.prob.found.req: (compiler.misc.unchecked.assign), java.util.Map, java.util.Map
RawTypeFail.java:15:31: compiler.warn.prob.found.req: (compiler.misc.unchecked.assign), java.util.HashMap, java.util.Map
-RawTypeFail.java:14:30: compiler.err.proc.messager: (assignment)
-RawTypeFail.java:15:31: compiler.err.proc.messager: (assignment)
+RawTypeFail.java:14:30: compiler.err.proc.messager: [assignment]
+RawTypeFail.java:15:31: compiler.err.proc.messager: [assignment]
2 errors
2 warnings
\ No newline at end of file
diff --git a/checker/jtreg/stubs/annotatedFor/WithStub.out b/checker/jtreg/stubs/annotatedFor/WithStub.out
index fa606268c807..2ce7fa51e828 100644
--- a/checker/jtreg/stubs/annotatedFor/WithStub.out
+++ b/checker/jtreg/stubs/annotatedFor/WithStub.out
@@ -1,3 +1,3 @@
-UseTest.java:18:18: compiler.err.proc.messager: (argument)
-UseTest.java:19:18: compiler.err.proc.messager: (argument)
+UseTest.java:18:18: compiler.err.proc.messager: [argument]
+UseTest.java:19:18: compiler.err.proc.messager: [argument]
2 errors
diff --git a/checker/jtreg/stubs/annotatedFor/WithoutStub.out b/checker/jtreg/stubs/annotatedFor/WithoutStub.out
index 990374473b10..63ff4fe9d629 100644
--- a/checker/jtreg/stubs/annotatedFor/WithoutStub.out
+++ b/checker/jtreg/stubs/annotatedFor/WithoutStub.out
@@ -1,2 +1,2 @@
-UseTest.java:18:18: compiler.err.proc.messager: (argument)
+UseTest.java:18:18: compiler.err.proc.messager: [argument]
1 error
diff --git a/checker/jtreg/stubs/annotatedFor/WithoutStubConservative.out b/checker/jtreg/stubs/annotatedFor/WithoutStubConservative.out
index 68ab1deea1cd..068ed8ad1e8b 100644
--- a/checker/jtreg/stubs/annotatedFor/WithoutStubConservative.out
+++ b/checker/jtreg/stubs/annotatedFor/WithoutStubConservative.out
@@ -1,3 +1,3 @@
-UseTest.java:18:18: compiler.err.proc.messager: (argument)
-UseTest.java:20:37: compiler.err.proc.messager: (assignment)
+UseTest.java:18:18: compiler.err.proc.messager: [argument]
+UseTest.java:20:37: compiler.err.proc.messager: [assignment]
2 errors
diff --git a/checker/jtreg/stubs/issue1456/WithStub.out b/checker/jtreg/stubs/issue1456/WithStub.out
index 12bd6656d362..26603238213a 100644
--- a/checker/jtreg/stubs/issue1456/WithStub.out
+++ b/checker/jtreg/stubs/issue1456/WithStub.out
@@ -1,2 +1,2 @@
-Main.java:26:13: compiler.err.proc.messager: (type.arguments.not.inferred)
+Main.java:26:13: compiler.err.proc.messager: [type.arguments.not.inferred]
1 error
diff --git a/checker/jtreg/stubs/issue1456/WithoutStub.out b/checker/jtreg/stubs/issue1456/WithoutStub.out
index e40a24bc036b..39a2054c2e6c 100644
--- a/checker/jtreg/stubs/issue1456/WithoutStub.out
+++ b/checker/jtreg/stubs/issue1456/WithoutStub.out
@@ -1,8 +1,8 @@
-Main.java:16:30: compiler.err.proc.messager: (assignment)
-Main.java:17:42: compiler.err.proc.messager: (assignment)
-Main.java:18:31: compiler.err.proc.messager: (assignment)
-Main.java:19:31: compiler.err.proc.messager: (assignment)
-Main.java:20:29: compiler.err.proc.messager: (assignment)
-Main.java:21:43: compiler.err.proc.messager: (assignment)
-Main.java:22:46: compiler.err.proc.messager: (assignment)
+Main.java:16:30: compiler.err.proc.messager: [assignment]
+Main.java:17:42: compiler.err.proc.messager: [assignment]
+Main.java:18:31: compiler.err.proc.messager: [assignment]
+Main.java:19:31: compiler.err.proc.messager: [assignment]
+Main.java:20:29: compiler.err.proc.messager: [assignment]
+Main.java:21:43: compiler.err.proc.messager: [assignment]
+Main.java:22:46: compiler.err.proc.messager: [assignment]
7 errors
diff --git a/checker/tests/README.md b/checker/tests/README.md
index 07a5095ca3b0..6c9f75a50f79 100644
--- a/checker/tests/README.md
+++ b/checker/tests/README.md
@@ -146,7 +146,7 @@ So the final test case would be:
public class MyNullnessTest {
void method() {
Object nullable = null;
- // :: error: (dereference.of.nullable)
+ // :: error: [dereference.of.nullable]
nullable.toString();
}
}
@@ -163,7 +163,7 @@ You can indicate an expected warning (as opposed to error) by using
"warning:" instead of "error:", as in
```java
- // :: warning: (nulltest.redundant)
+ // :: warning: [nulltest.redundant]
assert val != null;
```
@@ -173,7 +173,7 @@ a warning from the same line of code:
```java
@Regex String s1 = null;
- // :: error: (assignment) :: warning: (cast.unsafe)
+ // :: error: [assignment] :: warning: [cast.unsafe]
@Regex(3) String s2 = (@Regex(2) String) s;
```
@@ -182,7 +182,7 @@ syntax, expected errors can be specified in a separate file using the .out
file extension. These files contain lines of the following format:
```output
-:19: error: (dereference.of.nullable)
+:19: error: [dereference.of.nullable]
```
The number between the colons is the line number of the expected error
diff --git a/checker/tests/aggregate/NullnessAndRegex.java b/checker/tests/aggregate/NullnessAndRegex.java
index 92394e7ce222..eb90cff2479a 100644
--- a/checker/tests/aggregate/NullnessAndRegex.java
+++ b/checker/tests/aggregate/NullnessAndRegex.java
@@ -4,17 +4,17 @@
import org.checkerframework.checker.regex.qual.Regex;
public class NullnessAndRegex {
- // :: error: (assignment)
+ // :: error: [assignment]
@Regex String s1 = "De(mo";
- // :: error: (assignment)
+ // :: error: [assignment]
Object f = null;
- // :: error: (assignment)
+ // :: error: [assignment]
@Regex String s2 = "De(mo";
void localized(@Localized String s) {}
void method() {
- // :: error: (argument)
+ // :: error: [argument]
localized("ldskjfldj"); // error
}
}
diff --git a/checker/tests/ainfer-index/non-annotated/DependentTypesViewpointAdaptationTest.java b/checker/tests/ainfer-index/non-annotated/DependentTypesViewpointAdaptationTest.java
index 93d925e3b4c3..cd126fc136a9 100644
--- a/checker/tests/ainfer-index/non-annotated/DependentTypesViewpointAdaptationTest.java
+++ b/checker/tests/ainfer-index/non-annotated/DependentTypesViewpointAdaptationTest.java
@@ -59,13 +59,13 @@ public static void testThisInference(
public void compute5(
DependentTypesViewpointAdaptationTest this, DependentTypesViewpointAdaptationTest other) {
- // :: warning: (assignment)
+ // :: warning: [assignment]
@SameLen("this") DependentTypesViewpointAdaptationTest myOther = other;
}
// Same as compute5, but without an explicit this parameter.
public void compute6(DependentTypesViewpointAdaptationTest other) {
- // :: warning: (assignment)
+ // :: warning: [assignment]
@SameLen("this") DependentTypesViewpointAdaptationTest myOther = other;
}
}
diff --git a/checker/tests/ainfer-nullness/non-annotated/MonotonicNonNullInferenceTest.java b/checker/tests/ainfer-nullness/non-annotated/MonotonicNonNullInferenceTest.java
index 13342f2d65ee..5f4751809b52 100644
--- a/checker/tests/ainfer-nullness/non-annotated/MonotonicNonNullInferenceTest.java
+++ b/checker/tests/ainfer-nullness/non-annotated/MonotonicNonNullInferenceTest.java
@@ -2,27 +2,27 @@
public class MonotonicNonNullInferenceTest {
- // :: warning: (initialization.static.field.uninitialized)
+ // :: warning: [initialization.static.field.uninitialized]
static String staticString1;
- // :: warning: (assignment)
+ // :: warning: [assignment]
static String staticString2 = null;
static String staticString3;
String instanceString1;
- // :: warning: (assignment)
+ // :: warning: [assignment]
String instanceString2 = null;
String instanceString3;
static {
- // :: warning: (assignment)
+ // :: warning: [assignment]
staticString3 = null;
}
- // :: warning: (initialization.fields.uninitialized)
+ // :: warning: [initialization.fields.uninitialized]
MonotonicNonNullInferenceTest() {
String instanceString3 = "hello";
}
diff --git a/checker/tests/ainfer-nullness/non-annotated/NullTypeVarTest.java b/checker/tests/ainfer-nullness/non-annotated/NullTypeVarTest.java
index 50dbad362fd2..37d6c6fab242 100644
--- a/checker/tests/ainfer-nullness/non-annotated/NullTypeVarTest.java
+++ b/checker/tests/ainfer-nullness/non-annotated/NullTypeVarTest.java
@@ -8,7 +8,7 @@
public class NullTypeVarTest {
- // :: warning: (assignment)
+ // :: warning: [assignment]
private String indentString = null;
private List indentStrings;
diff --git a/checker/tests/ainfer-nullness/non-annotated/TwoCtorGenericAbstract.java b/checker/tests/ainfer-nullness/non-annotated/TwoCtorGenericAbstract.java
index d8dd140126a0..9c70e8086456 100644
--- a/checker/tests/ainfer-nullness/non-annotated/TwoCtorGenericAbstract.java
+++ b/checker/tests/ainfer-nullness/non-annotated/TwoCtorGenericAbstract.java
@@ -6,7 +6,7 @@ public abstract class TwoCtorGenericAbstract implements Set
protected T value;
protected TwoCtorGenericAbstract() {
- // :: warning: (assignment)
+ // :: warning: [assignment]
this.value = null;
}
diff --git a/checker/tests/ainfer-nullness/non-annotated/TypeVarPlumeUtil.java b/checker/tests/ainfer-nullness/non-annotated/TypeVarPlumeUtil.java
index afeb3f4a149d..53b24af85832 100644
--- a/checker/tests/ainfer-nullness/non-annotated/TypeVarPlumeUtil.java
+++ b/checker/tests/ainfer-nullness/non-annotated/TypeVarPlumeUtil.java
@@ -13,7 +13,7 @@ public V merge(@NonNull V value) {
}
public V mergeNullable(@Nullable V value) {
- // :: warning: (return)
+ // :: warning: [return]
return value;
}
}
diff --git a/checker/tests/ainfer-resourceleak/non-annotated/AddNotOwning.java b/checker/tests/ainfer-resourceleak/non-annotated/AddNotOwning.java
index 83321766e00d..de0ff4c3e2bb 100644
--- a/checker/tests/ainfer-resourceleak/non-annotated/AddNotOwning.java
+++ b/checker/tests/ainfer-resourceleak/non-annotated/AddNotOwning.java
@@ -15,7 +15,7 @@ static class NonEmptyMustCallFinalField {
final Foo f; // expect owning annotation for this field
NonEmptyMustCallFinalField() {
- // :: warning: (required.method.not.called)
+ // :: warning: [required.method.not.called]
f = new Foo();
}
@@ -32,12 +32,12 @@ Foo getFieldOnSomePath() {
}
void testNotOwningOnFinal() {
- // :: warning: (required.method.not.called)
+ // :: warning: [required.method.not.called]
Foo f = getField();
}
void testNotOwningOnGetFieldOnSomePath() {
- // :: warning: (required.method.not.called)
+ // :: warning: [required.method.not.called]
Foo f = getFieldOnSomePath();
}
@@ -56,7 +56,7 @@ static class NonEmptyMustCallNonFinalField {
@SuppressWarnings("missing.creates.mustcall.for")
void initialyzeFoo() {
f.a();
- // :: warning: (required.method.not.called)
+ // :: warning: [required.method.not.called]
f = new Foo();
}
@@ -73,12 +73,12 @@ Foo getFieldOnSomePath() {
}
void testNotOwningOnNonFinal() {
- // :: warning: (required.method.not.called)
+ // :: warning: [required.method.not.called]
Foo f = getField();
}
void testNotOwningOnGetFieldOnSomePath() {
- // :: warning: (required.method.not.called)
+ // :: warning: [required.method.not.called]
Foo f = getFieldOnSomePath();
}
diff --git a/checker/tests/ainfer-resourceleak/non-annotated/ClassWithTwoOwningFieldsTest.java b/checker/tests/ainfer-resourceleak/non-annotated/ClassWithTwoOwningFieldsTest.java
index 6b011244f118..c741a08482fc 100644
--- a/checker/tests/ainfer-resourceleak/non-annotated/ClassWithTwoOwningFieldsTest.java
+++ b/checker/tests/ainfer-resourceleak/non-annotated/ClassWithTwoOwningFieldsTest.java
@@ -12,9 +12,9 @@ void a() {}
@InheritableMustCall("close")
private class ClassWithTwoOwningFields {
- // :: warning: (required.method.not.called)
+ // :: warning: [required.method.not.called]
final @Owning Foo foo1;
- // :: warning: (required.method.not.called)
+ // :: warning: [required.method.not.called]
final @Owning Foo foo2;
public ClassWithTwoOwningFields(Foo f1, Foo f2) {
@@ -29,9 +29,9 @@ void close() {
}
void testTwoOwning() {
- // :: warning: (required.method.not.called)
+ // :: warning: [required.method.not.called]
Foo f1 = new Foo();
- // :: warning: (required.method.not.called)
+ // :: warning: [required.method.not.called]
Foo f2 = new Foo();
ClassWithTwoOwningFields ff = new ClassWithTwoOwningFields(f1, f2);
diff --git a/checker/tests/ainfer-resourceleak/non-annotated/ECMInference.java b/checker/tests/ainfer-resourceleak/non-annotated/ECMInference.java
index 7fecb377aa4a..ca0bb6413857 100644
--- a/checker/tests/ainfer-resourceleak/non-annotated/ECMInference.java
+++ b/checker/tests/ainfer-resourceleak/non-annotated/ECMInference.java
@@ -12,7 +12,7 @@ void doStuff() {
void clientA1() {
doStuff();
- // :: warning: (assignment)
+ // :: warning: [assignment]
@CalledMethods("toString") A1 a1 = this;
}
}
@@ -25,7 +25,7 @@ void doStuff() {
void clientB1() {
doStuff();
- // :: warning: (assignment)
+ // :: warning: [assignment]
@CalledMethods("toString") B1 b1 = this;
}
}
@@ -37,7 +37,7 @@ void doStuff() {
void clientA2() {
doStuff();
- // :: warning: (assignment)
+ // :: warning: [assignment]
@CalledMethods("toString") A2 a2 = this;
}
}
@@ -51,7 +51,7 @@ void doStuff() {
void clientB2() {
doStuff();
- // :: warning: (assignment)
+ // :: warning: [assignment]
@CalledMethods({"toString", "hashCode"}) B2 b2 = this;
}
}
diff --git a/checker/tests/ainfer-resourceleak/non-annotated/EnsuresCalledMethodsTest.java b/checker/tests/ainfer-resourceleak/non-annotated/EnsuresCalledMethodsTest.java
index 65c1fb5cf4bd..2a37e0d00a86 100644
--- a/checker/tests/ainfer-resourceleak/non-annotated/EnsuresCalledMethodsTest.java
+++ b/checker/tests/ainfer-resourceleak/non-annotated/EnsuresCalledMethodsTest.java
@@ -9,7 +9,7 @@ void a() {}
@InheritableMustCall("close")
class ECM {
- // :: warning: (required.method.not.called)
+ // :: warning: [required.method.not.called]
@Owning Foo foo;
private void closePrivate() {
diff --git a/checker/tests/ainfer-resourceleak/non-annotated/EnsuresCalledMethodsVarargsTest.java b/checker/tests/ainfer-resourceleak/non-annotated/EnsuresCalledMethodsVarargsTest.java
index a6862f18c62c..13596324c7d2 100644
--- a/checker/tests/ainfer-resourceleak/non-annotated/EnsuresCalledMethodsVarargsTest.java
+++ b/checker/tests/ainfer-resourceleak/non-annotated/EnsuresCalledMethodsVarargsTest.java
@@ -24,7 +24,7 @@ private class ECMVA {
final Foo foo;
ECMVA() {
- // :: warning: (required.method.not.called)
+ // :: warning: [required.method.not.called]
foo = new Foo();
}
@@ -47,7 +47,7 @@ void owningParam(Foo f) {
}
void testOwningParamOnOwningParam() {
- // :: warning: (required.method.not.called)
+ // :: warning: [required.method.not.called]
Foo f = new Foo();
owningParam(f);
}
diff --git a/checker/tests/ainfer-resourceleak/non-annotated/MustCallAliasOnReceiver.java b/checker/tests/ainfer-resourceleak/non-annotated/MustCallAliasOnReceiver.java
index c3c0190b3f2d..a73f1624c1dc 100644
--- a/checker/tests/ainfer-resourceleak/non-annotated/MustCallAliasOnReceiver.java
+++ b/checker/tests/ainfer-resourceleak/non-annotated/MustCallAliasOnReceiver.java
@@ -17,7 +17,7 @@ MustCallAliasOnReceiver returnReceiver(MustCallAliasOnReceiver this) {
return this;
}
- // :: warning: (required.method.not.called)
+ // :: warning: [required.method.not.called]
void testReceiverMCAAnnotation(@Owning InputStream inputStream) throws IOException {
MustCallAliasOnReceiver mcar = new MustCallAliasOnReceiver(is, false);
mcar.returnReceiver().close();
@@ -32,7 +32,7 @@ public static MustCallAliasOnReceiver mcaneFactory(InputStream is) {
return new MustCallAliasOnReceiver(is, false);
}
- // :: warning: (required.method.not.called)
+ // :: warning: [required.method.not.called]
public static void testUse(@Owning InputStream inputStream) throws Exception {
MustCallAliasOnReceiver mcane = mcaneFactory(inputStream);
mcane.close();
diff --git a/checker/tests/ainfer-resourceleak/non-annotated/MustCallAliasOnRegularExits.java b/checker/tests/ainfer-resourceleak/non-annotated/MustCallAliasOnRegularExits.java
index a5c40ba80c4b..3bec2506c9c8 100644
--- a/checker/tests/ainfer-resourceleak/non-annotated/MustCallAliasOnRegularExits.java
+++ b/checker/tests/ainfer-resourceleak/non-annotated/MustCallAliasOnRegularExits.java
@@ -42,7 +42,7 @@ public void a() {
void testMCAOnMCAConstructor() {
Foo f = new Foo();
try {
- // :: warning: (required.method.not.called)
+ // :: warning: [required.method.not.called]
MCAConstructor mcaf = new MCAConstructor(f);
} catch (IOException e) {
} finally {
diff --git a/checker/tests/ainfer-resourceleak/non-annotated/MustCallAliasParams.java b/checker/tests/ainfer-resourceleak/non-annotated/MustCallAliasParams.java
index fbf6b29df9f8..4a62c9e3848f 100644
--- a/checker/tests/ainfer-resourceleak/non-annotated/MustCallAliasParams.java
+++ b/checker/tests/ainfer-resourceleak/non-annotated/MustCallAliasParams.java
@@ -31,7 +31,7 @@ public void a() {
}
void testMCAConstructor() {
- // :: warning: (required.method.not.called)
+ // :: warning: [required.method.not.called]
Foo f = new Foo();
MCAConstructor mcac = new MCAConstructor(f);
mcac.a();
@@ -65,7 +65,7 @@ private class MCASuperCall extends MCASuperClass {
}
void mCASuperCallTest() {
- // :: warning: (required.method.not.called)
+ // :: warning: [required.method.not.called]
Foo f = new Foo();
MCASuperCall mcaSuperCall = new MCASuperCall(f);
mcaSuperCall.a();
@@ -82,7 +82,7 @@ private class MCAThisCall extends MCASuperClass {
}
void mCAThisCallTest() {
- // :: warning: (required.method.not.called)
+ // :: warning: [required.method.not.called]
Foo f = new Foo();
MCAThisCall mcaThisCall = new MCAThisCall(f, true);
mcaThisCall.a();
@@ -94,7 +94,7 @@ Foo returnFoo(Foo foo) {
}
void returnFooTest() {
- // :: warning: (required.method.not.called)
+ // :: warning: [required.method.not.called]
Foo f = new Foo();
Foo foo = returnFoo(f);
foo.a();
@@ -111,14 +111,14 @@ MCASuperClass returnAliasFoo2(Foo foo, int i) {
}
void testReturnAliasFoo2() {
- // :: warning: (required.method.not.called)
+ // :: warning: [required.method.not.called]
Foo foo = new Foo();
MCASuperClass f = returnAliasFoo2(foo, 0);
f.a();
}
void returnAliasFooTest() {
- // :: warning: (required.method.not.called)
+ // :: warning: [required.method.not.called]
Foo f = new Foo();
Foo foo = returnAliasFoo(f);
foo.a();
@@ -134,7 +134,7 @@ Foo returnFooAllPaths(Foo foo) {
}
void returnFooAllPathsTest() {
- // :: warning: (required.method.not.called)
+ // :: warning: [required.method.not.called]
Foo f = new Foo();
Foo foo = returnFooAllPaths(f);
foo.a();
diff --git a/checker/tests/ainfer-resourceleak/non-annotated/OwnershipTransferOnConstructor.java b/checker/tests/ainfer-resourceleak/non-annotated/OwnershipTransferOnConstructor.java
index 96b4382db38b..bdd924bf6975 100644
--- a/checker/tests/ainfer-resourceleak/non-annotated/OwnershipTransferOnConstructor.java
+++ b/checker/tests/ainfer-resourceleak/non-annotated/OwnershipTransferOnConstructor.java
@@ -19,7 +19,7 @@ void baz(Socket s) {
Foo f = new Foo(s);
}
- // :: warning: (required.method.not.called)
+ // :: warning: [required.method.not.called]
void testOwningOnBaz(@Owning Socket s) {
Socket s2 = s;
baz(s2);
diff --git a/checker/tests/ainfer-resourceleak/non-annotated/OwningField.java b/checker/tests/ainfer-resourceleak/non-annotated/OwningField.java
index 027715510463..144e517038a4 100644
--- a/checker/tests/ainfer-resourceleak/non-annotated/OwningField.java
+++ b/checker/tests/ainfer-resourceleak/non-annotated/OwningField.java
@@ -12,7 +12,7 @@ static class FinalOwningField {
final Foo f;
FinalOwningField() {
- // :: warning: (required.method.not.called)
+ // :: warning: [required.method.not.called]
f = new Foo();
}
diff --git a/checker/tests/ainfer-resourceleak/non-annotated/OwningFieldIndirectCall.java b/checker/tests/ainfer-resourceleak/non-annotated/OwningFieldIndirectCall.java
index 7c2c542e9b71..7bb343df70be 100644
--- a/checker/tests/ainfer-resourceleak/non-annotated/OwningFieldIndirectCall.java
+++ b/checker/tests/ainfer-resourceleak/non-annotated/OwningFieldIndirectCall.java
@@ -21,7 +21,7 @@ static class DisposeFieldUsingECM {
final Foo f; // expect owning annotation for this field
DisposeFieldUsingECM() {
- // :: warning: (required.method.not.called)
+ // :: warning: [required.method.not.called]
f = new Foo();
}
diff --git a/checker/tests/ainfer-resourceleak/non-annotated/OwningParams.java b/checker/tests/ainfer-resourceleak/non-annotated/OwningParams.java
index 1c1cd29eeef2..9846832adfbc 100644
--- a/checker/tests/ainfer-resourceleak/non-annotated/OwningParams.java
+++ b/checker/tests/ainfer-resourceleak/non-annotated/OwningParams.java
@@ -13,7 +13,7 @@ void passOwnership(Foo f) {
}
void passOwnershipTest() {
- // :: warning: (required.method.not.called)
+ // :: warning: [required.method.not.called]
Foo f = new Foo();
passOwnership(f);
}
@@ -44,15 +44,15 @@ void checkAlias(Foo f1) {
}
void checkAliasTest() {
- // :: warning: (required.method.not.called)
+ // :: warning: [required.method.not.called]
Foo f = new Foo();
checkAlias(f);
}
void passOwnershipTest() {
- // :: warning: (required.method.not.called)
+ // :: warning: [required.method.not.called]
Foo f1 = new Foo();
- // :: warning: (required.method.not.called)
+ // :: warning: [required.method.not.called]
Foo f2 = new Foo();
passOwnership(f1, f2);
}
diff --git a/checker/tests/ainfer-resourceleak/non-annotated/ReplaceMustCallAliasAnnotation.java b/checker/tests/ainfer-resourceleak/non-annotated/ReplaceMustCallAliasAnnotation.java
index b0599501ff3d..58d4c1609417 100644
--- a/checker/tests/ainfer-resourceleak/non-annotated/ReplaceMustCallAliasAnnotation.java
+++ b/checker/tests/ainfer-resourceleak/non-annotated/ReplaceMustCallAliasAnnotation.java
@@ -34,7 +34,7 @@ public void a() {
void testOwningAnnotations() {
Foo f1 = new Foo();
- // :: warning: (required.method.not.called)
+ // :: warning: [required.method.not.called]
Foo f2 = new Foo();
TwoOwningFields t = new TwoOwningFields(f1, f2);
t.a();
diff --git a/checker/tests/ainfer-testchecker/non-annotated/AnnotationWithFieldTest.java b/checker/tests/ainfer-testchecker/non-annotated/AnnotationWithFieldTest.java
index b8b60bd5a108..44d8f82f7431 100644
--- a/checker/tests/ainfer-testchecker/non-annotated/AnnotationWithFieldTest.java
+++ b/checker/tests/ainfer-testchecker/non-annotated/AnnotationWithFieldTest.java
@@ -8,13 +8,13 @@ public class AnnotationWithFieldTest {
void testAnnotationWithFields() {
fields = getAinferSiblingWithFields();
- // :: warning: (argument)
+ // :: warning: [argument]
expectsAinferSiblingWithFields(fields);
}
void testAnnotationWithEmptyFields() {
emptyFields = getAinferSiblingWithFieldsEmpty();
- // :: warning: (argument)
+ // :: warning: [argument]
expectsAinferSiblingWithEmptyFields(emptyFields);
}
diff --git a/checker/tests/ainfer-testchecker/non-annotated/Anonymous.java b/checker/tests/ainfer-testchecker/non-annotated/Anonymous.java
index 5b0ba6ef35f1..7fbd41a90141 100644
--- a/checker/tests/ainfer-testchecker/non-annotated/Anonymous.java
+++ b/checker/tests/ainfer-testchecker/non-annotated/Anonymous.java
@@ -13,11 +13,11 @@ public Anonymous() {
}
void testPublicInference() {
- // :: warning: (argument)
+ // :: warning: [argument]
expectsAinferSibling2(field2);
- // :: warning: (argument)
+ // :: warning: [argument]
expectsParent(field1);
- // :: warning: (argument)
+ // :: warning: [argument]
expectsParent(field2);
}
diff --git a/checker/tests/ainfer-testchecker/non-annotated/AnonymousClassWithField.java b/checker/tests/ainfer-testchecker/non-annotated/AnonymousClassWithField.java
index f7a59e06f9be..b9084443925b 100644
--- a/checker/tests/ainfer-testchecker/non-annotated/AnonymousClassWithField.java
+++ b/checker/tests/ainfer-testchecker/non-annotated/AnonymousClassWithField.java
@@ -14,12 +14,12 @@ public void test() {
@Override
public void testX() {
- // :: warning: (argument)
+ // :: warning: [argument]
requireAinferSibling1(s1);
}
public void testY() {
- // :: warning: (argument)
+ // :: warning: [argument]
requireAinferSibling1(toaster);
}
});
diff --git a/checker/tests/ainfer-testchecker/non-annotated/CompoundTypeTest.java b/checker/tests/ainfer-testchecker/non-annotated/CompoundTypeTest.java
index dc03c80ad4be..54265ff3f5e8 100644
--- a/checker/tests/ainfer-testchecker/non-annotated/CompoundTypeTest.java
+++ b/checker/tests/ainfer-testchecker/non-annotated/CompoundTypeTest.java
@@ -10,7 +10,7 @@ void assign() {
}
void test() {
- // :: warning: (argument)
+ // :: warning: [argument]
expectsCompoundType(field);
}
diff --git a/checker/tests/ainfer-testchecker/non-annotated/ConflictingAnnotationsTest.java b/checker/tests/ainfer-testchecker/non-annotated/ConflictingAnnotationsTest.java
index 867133d1ae12..ee82703b837e 100644
--- a/checker/tests/ainfer-testchecker/non-annotated/ConflictingAnnotationsTest.java
+++ b/checker/tests/ainfer-testchecker/non-annotated/ConflictingAnnotationsTest.java
@@ -16,7 +16,7 @@ int getWPINamespaceAinferSibling1() {
}
void test() {
- // :: warning: (argument)
+ // :: warning: [argument]
expectsAinferSibling1(getWPINamespaceAinferSibling1());
}
diff --git a/checker/tests/ainfer-testchecker/non-annotated/ConstructorTest.java b/checker/tests/ainfer-testchecker/non-annotated/ConstructorTest.java
index 66ab605e6947..1b44667b5c0b 100644
--- a/checker/tests/ainfer-testchecker/non-annotated/ConstructorTest.java
+++ b/checker/tests/ainfer-testchecker/non-annotated/ConstructorTest.java
@@ -6,7 +6,7 @@ public ConstructorTest(int top) {}
void test() {
@AinferTop int top = (@AinferTop int) 0;
- // :: warning: (argument)
+ // :: warning: [argument]
new ConstructorTest(top);
}
}
diff --git a/checker/tests/ainfer-testchecker/non-annotated/EnsuresQualifierParamsTest.java b/checker/tests/ainfer-testchecker/non-annotated/EnsuresQualifierParamsTest.java
index 40e1c58da74b..5caa42916649 100644
--- a/checker/tests/ainfer-testchecker/non-annotated/EnsuresQualifierParamsTest.java
+++ b/checker/tests/ainfer-testchecker/non-annotated/EnsuresQualifierParamsTest.java
@@ -112,73 +112,73 @@ void noEnsures() {}
void client1(Object arg) {
argIsParent(arg);
- // :: warning: (assignment)
+ // :: warning: [assignment]
@AinferParent Object p = arg;
}
void client2(Object arg) {
argIsParent_2(arg, true);
- // :: warning: (assignment)
+ // :: warning: [assignment]
@AinferParent Object p = arg;
}
void client3(Object arg) {
argIsAinferSibling2(arg);
- // :: warning: (assignment)
+ // :: warning: [assignment]
@AinferSibling2 Object x = arg;
}
void client4(Object arg) {
argIsAinferSibling2_2(arg, true);
- // :: warning: (assignment)
+ // :: warning: [assignment]
@AinferSibling2 Object x = arg;
}
void clientThis1() {
thisIsParent();
- // :: warning: (assignment)
+ // :: warning: [assignment]
@AinferParent Object o = this;
}
void clientThis2() {
thisIsParent_2(true);
- // :: warning: (assignment)
+ // :: warning: [assignment]
@AinferParent Object o = this;
}
void clientThis2_2() {
thisIsParent_2(false);
- // :: warning: (assignment)
+ // :: warning: [assignment]
@AinferParent Object o = this;
}
void clientThis2_3() {
thisIsParent_3(false);
- // :: warning: (assignment)
+ // :: warning: [assignment]
@AinferParent Object o = this;
}
void clientThis3() {
thisIsAinferSibling2();
- // :: warning: (assignment)
+ // :: warning: [assignment]
@AinferSibling2 Object o = this;
}
void clientThis4() {
thisIsAinferSibling2_2(true);
- // :: warning: (assignment)
+ // :: warning: [assignment]
@AinferSibling2 Object o = this;
}
void clientThis5() {
thisIsAinferSibling2_2_2(true);
- // :: warning: (assignment)
+ // :: warning: [assignment]
@AinferSibling2 Object o = this;
}
void clientThis6() {
thisIsParent_2_2(true);
- // :: warning: (assignment)
+ // :: warning: [assignment]
@AinferParent Object o = this;
}
}
diff --git a/checker/tests/ainfer-testchecker/non-annotated/EnsuresQualifierTest.java b/checker/tests/ainfer-testchecker/non-annotated/EnsuresQualifierTest.java
index f0eb12ac84a3..26351c093723 100644
--- a/checker/tests/ainfer-testchecker/non-annotated/EnsuresQualifierTest.java
+++ b/checker/tests/ainfer-testchecker/non-annotated/EnsuresQualifierTest.java
@@ -52,31 +52,31 @@ void noEnsures() {}
void client1() {
field1IsParent();
- // :: warning: (assignment)
+ // :: warning: [assignment]
@AinferParent int p = field1;
}
void client2() {
field1IsParent_2(true);
- // :: warning: (assignment)
+ // :: warning: [assignment]
@AinferParent int p = field1;
}
void client3() {
field1IsAinferSibling2();
- // :: warning: (assignment)
+ // :: warning: [assignment]
@AinferSibling2 int x = field1;
}
void client4() {
field1IsAinferSibling2_2(true);
- // :: warning: (assignment)
+ // :: warning: [assignment]
@AinferSibling2 int x = field1;
}
void client5() {
parentIsAinferSibling1();
- // :: warning: (assignment)
+ // :: warning: [assignment]
@AinferSibling1 int x = parent;
}
}
diff --git a/checker/tests/ainfer-testchecker/non-annotated/EnumConstants.java b/checker/tests/ainfer-testchecker/non-annotated/EnumConstants.java
index ffdfc511cb2b..f3ac7cfc3aeb 100644
--- a/checker/tests/ainfer-testchecker/non-annotated/EnumConstants.java
+++ b/checker/tests/ainfer-testchecker/non-annotated/EnumConstants.java
@@ -15,7 +15,7 @@ enum MyEnum {
void requiresS1(@AinferSibling1 MyEnum e) {}
void test() {
- // :: warning: (argument)
+ // :: warning: [argument]
requiresS1(MyEnum.ONE);
}
}
diff --git a/checker/tests/ainfer-testchecker/non-annotated/EnumWithInnerClass.java b/checker/tests/ainfer-testchecker/non-annotated/EnumWithInnerClass.java
index 3c33beff3eda..99002925d5ed 100644
--- a/checker/tests/ainfer-testchecker/non-annotated/EnumWithInnerClass.java
+++ b/checker/tests/ainfer-testchecker/non-annotated/EnumWithInnerClass.java
@@ -14,7 +14,7 @@ int getAinferSibling1() {
void requireAinferSibling1(@AinferSibling1 int x) {}
void test() {
- // :: warning: (argument)
+ // :: warning: [argument]
requireAinferSibling1(getAinferSibling1());
}
}
diff --git a/checker/tests/ainfer-testchecker/non-annotated/ExpectedErrors.java b/checker/tests/ainfer-testchecker/non-annotated/ExpectedErrors.java
index f104269b1cca..fd90105d12d1 100644
--- a/checker/tests/ainfer-testchecker/non-annotated/ExpectedErrors.java
+++ b/checker/tests/ainfer-testchecker/non-annotated/ExpectedErrors.java
@@ -24,9 +24,9 @@ void assignFieldsToAinferSibling1() {
}
void testFields() {
- // :: warning: (argument)
+ // :: warning: [argument]
expectsAinferSibling1(privateDeclaredField);
- // :: warning: (argument)
+ // :: warning: [argument]
expectsAinferSibling1(publicDeclaredField);
}
@@ -36,9 +36,9 @@ void testFields() {
// The refinement cannot happen and an assignemnt type incompatible error occurs.
void assignFieldsToAinferTop() {
- // :: warning: (assignment)
+ // :: warning: [assignment]
privateDeclaredField2 = getAinferTop();
- // :: warning: (assignment)
+ // :: warning: [assignment]
publicDeclaredField2 = getAinferTop();
}
@@ -70,16 +70,16 @@ void assignLubFieldsToAinferSibling1() {
}
void testLUBFields1() {
- // :: warning: (argument)
+ // :: warning: [argument]
expectsAinferSibling1(lubPrivateField);
- // :: warning: (argument)
+ // :: warning: [argument]
expectsAinferSibling1(lubPublicField);
}
void testLUBFields2() {
- // :: warning: (argument)
+ // :: warning: [argument]
expectsAinferSibling2(lubPrivateField);
- // :: warning: (argument)
+ // :: warning: [argument]
expectsAinferSibling2(lubPublicField);
}
@@ -95,13 +95,13 @@ public static int lubTest() {
public @AinferSibling1 int getAinferSibling1Wrong() {
int x = lubTest();
- // :: warning: (return)
+ // :: warning: [return]
return x;
}
public @AinferSibling2 int getAinferSibling2Wrong() {
int x = lubTest();
- // :: warning: (return)
+ // :: warning: [return]
return x;
}
@@ -140,7 +140,7 @@ void test(Field f) throws Exception {
}
void setBoolean(Object o, boolean b) {
- // :: warning: (assignment)
+ // :: warning: [assignment]
@AinferBottom Object bot = o;
}
@@ -161,15 +161,15 @@ public void suppressWarningsTest2() {
}
public void suppressWarningsValidation() {
- // :: warning: (argument)
+ // :: warning: [argument]
expectsAinferSibling1(i);
- // :: warning: (argument)
+ // :: warning: [argument]
expectsAinferSibling1(i2);
- // :: warning: (argument)
+ // :: warning: [argument]
expectsAinferSibling1(SuppressWarningsInner.i);
- // :: warning: (argument)
+ // :: warning: [argument]
expectsAinferSibling1(SuppressWarningsInner.i2);
- // :: warning: (argument)
+ // :: warning: [argument]
expectsAinferSibling1(suppressWarningsMethodReturn());
suppressWarningsMethodParams(getAinferSibling1());
@@ -210,9 +210,9 @@ void assignFieldsToBottom() {
// Testing the refinement above.
void testFields() {
- // :: warning: (argument)
+ // :: warning: [argument]
expectsBottom(privateField);
- // :: warning: (argument)
+ // :: warning: [argument]
expectsBottom(publicField);
}
}
@@ -227,16 +227,16 @@ void foo() {
}
void test() {
- // :: warning: (argument)
+ // :: warning: [argument]
expectsAinferSibling1(field);
- // :: warning: (argument)
+ // :: warning: [argument]
expectsAinferSibling1(field2);
}
}
class AssignParam {
public void f(@AinferBottom Object param) {
- // :: warning: (assignment)
+ // :: warning: [assignment]
param = ((@AinferTop Object) null);
}
}
diff --git a/checker/tests/ainfer-testchecker/non-annotated/FromReceiver.java b/checker/tests/ainfer-testchecker/non-annotated/FromReceiver.java
index 1e1984892b04..c647380c6352 100644
--- a/checker/tests/ainfer-testchecker/non-annotated/FromReceiver.java
+++ b/checker/tests/ainfer-testchecker/non-annotated/FromReceiver.java
@@ -14,22 +14,22 @@ public void source(@AinferSibling1 FromReceiver this) {
}
public void sinkNoThis() {
- // :: warning: (assignment)
+ // :: warning: [assignment]
@AinferSibling1 FromReceiver f = this;
}
public void sinkExplicitThis(FromReceiver this) {
- // :: warning: (assignment)
+ // :: warning: [assignment]
@AinferSibling1 FromReceiver f = this;
}
public void sinkNoThis2() {
- // :: warning: (assignment)
+ // :: warning: [assignment]
@AinferSibling1 FromReceiver f = this;
}
public void sinkExplicitThis2(FromReceiver this) {
- // :: warning: (assignment)
+ // :: warning: [assignment]
@AinferSibling1 FromReceiver f = this;
}
@@ -39,12 +39,12 @@ public static void source2(@AinferSibling1 FromReceiver f1) {
}
public void sinkNoThis3() {
- // :: warning: (assignment)
+ // :: warning: [assignment]
@AinferSibling1 FromReceiver f = this;
}
public void sinkExplicitThis3(FromReceiver this) {
- // :: warning: (assignment)
+ // :: warning: [assignment]
@AinferSibling1 FromReceiver f = this;
}
}
diff --git a/checker/tests/ainfer-testchecker/non-annotated/IShouldBeSibling1.java b/checker/tests/ainfer-testchecker/non-annotated/IShouldBeSibling1.java
index 289783b8da67..cbfaa7b44a04 100644
--- a/checker/tests/ainfer-testchecker/non-annotated/IShouldBeSibling1.java
+++ b/checker/tests/ainfer-testchecker/non-annotated/IShouldBeSibling1.java
@@ -8,7 +8,7 @@
@SuppressWarnings("super.invocation") // Intentional.
public class IShouldBeSibling1 {
public static void test(IShouldBeSibling1 s1) {
- // :: warning: (assignment)
+ // :: warning: [assignment]
@AinferSibling1 IShouldBeSibling1 s = s1;
}
}
diff --git a/checker/tests/ainfer-testchecker/non-annotated/IgnoreMetaAnnotationTest1.java b/checker/tests/ainfer-testchecker/non-annotated/IgnoreMetaAnnotationTest1.java
index a38657e98508..68154899c909 100644
--- a/checker/tests/ainfer-testchecker/non-annotated/IgnoreMetaAnnotationTest1.java
+++ b/checker/tests/ainfer-testchecker/non-annotated/IgnoreMetaAnnotationTest1.java
@@ -10,7 +10,7 @@ void foo() {
}
void test() {
- // :: warning: (argument)
+ // :: warning: [argument]
expectsAinferSibling1(field2);
}
diff --git a/checker/tests/ainfer-testchecker/non-annotated/InheritanceTest.java b/checker/tests/ainfer-testchecker/non-annotated/InheritanceTest.java
index 85e58e3a9785..33350110f323 100644
--- a/checker/tests/ainfer-testchecker/non-annotated/InheritanceTest.java
+++ b/checker/tests/ainfer-testchecker/non-annotated/InheritanceTest.java
@@ -5,9 +5,9 @@ class IParent {
int field;
public void expectsBotNoSignature(int t) {
- // :: warning: (argument)
+ // :: warning: [argument]
expectsBot(t);
- // :: warning: (argument)
+ // :: warning: [argument]
expectsBot(field);
}
diff --git a/checker/tests/ainfer-testchecker/non-annotated/InnerClassFieldDeclAnno.java b/checker/tests/ainfer-testchecker/non-annotated/InnerClassFieldDeclAnno.java
index fb1d985d8b0a..eb97415eea0c 100644
--- a/checker/tests/ainfer-testchecker/non-annotated/InnerClassFieldDeclAnno.java
+++ b/checker/tests/ainfer-testchecker/non-annotated/InnerClassFieldDeclAnno.java
@@ -16,7 +16,7 @@ static class Inner {}
@AinferTreatAsSibling1 public Outer.Inner preAnnotated = null;
public static void test(InnerClassFieldDeclAnno a) {
- // :: warning: (assignment)
+ // :: warning: [assignment]
@AinferSibling1 Object obj = a.iShouldBeTreatedAsSibling1;
// Test that the annotation works as expected.
@AinferSibling1 Object obj2 = a.preAnnotated;
diff --git a/checker/tests/ainfer-testchecker/non-annotated/LUBAssignmentTest.java b/checker/tests/ainfer-testchecker/non-annotated/LUBAssignmentTest.java
index c2fb31ccc2b0..3fd4210ead09 100644
--- a/checker/tests/ainfer-testchecker/non-annotated/LUBAssignmentTest.java
+++ b/checker/tests/ainfer-testchecker/non-annotated/LUBAssignmentTest.java
@@ -20,9 +20,9 @@ void assignFieldsToAinferSibling1() {
// LUB between @AinferSibling1 and @AinferSibling2 is @AinferParent, therefore the assignments
// above refine the type of privateField to @AinferParent.
void testFields() {
- // :: warning: (argument)
+ // :: warning: [argument]
expectsParent(privateField);
- // :: warning: (argument)
+ // :: warning: [argument]
expectsParent(publicField);
}
diff --git a/checker/tests/ainfer-testchecker/non-annotated/MethodDefinedInSupertype.java b/checker/tests/ainfer-testchecker/non-annotated/MethodDefinedInSupertype.java
index f8580e2d7f93..415471c981e8 100644
--- a/checker/tests/ainfer-testchecker/non-annotated/MethodDefinedInSupertype.java
+++ b/checker/tests/ainfer-testchecker/non-annotated/MethodDefinedInSupertype.java
@@ -4,7 +4,7 @@
abstract class MethodDefinedInSupertype {
void test() {
- // :: warning: (argument)
+ // :: warning: [argument]
expectsAinferSibling1(shouldReturnAinferSibling1());
}
@@ -13,7 +13,7 @@ public void expectsAinferSibling1(@AinferSibling1 int t) {}
public abstract int shouldReturnAinferSibling1();
void testMultipleOverrides() {
- // :: warning: (argument)
+ // :: warning: [argument]
expectsParent(shouldReturnParent());
}
diff --git a/checker/tests/ainfer-testchecker/non-annotated/MethodReturnTest.java b/checker/tests/ainfer-testchecker/non-annotated/MethodReturnTest.java
index eff127c7752d..390e30e2f851 100644
--- a/checker/tests/ainfer-testchecker/non-annotated/MethodReturnTest.java
+++ b/checker/tests/ainfer-testchecker/non-annotated/MethodReturnTest.java
@@ -9,7 +9,7 @@ static int getAinferSibling1NotAnnotated() {
}
static @AinferSibling1 int getAinferSibling1() {
- // :: warning: (return)
+ // :: warning: [return]
return getAinferSibling1NotAnnotated();
}
@@ -25,7 +25,7 @@ public static int lubTest() {
public static @AinferParent int getParent() {
int x = lubTest();
- // :: warning: (return)
+ // :: warning: [return]
return x;
}
@@ -38,7 +38,7 @@ int getParent2() {
}
void receivesAinferSibling1(int i) {
- // :: warning: (argument)
+ // :: warning: [argument]
expectsAinferSibling1(i);
}
diff --git a/checker/tests/ainfer-testchecker/non-annotated/MultiDimensionalArrays.java b/checker/tests/ainfer-testchecker/non-annotated/MultiDimensionalArrays.java
index d818fc6bc43a..7fd39da3b31e 100644
--- a/checker/tests/ainfer-testchecker/non-annotated/MultiDimensionalArrays.java
+++ b/checker/tests/ainfer-testchecker/non-annotated/MultiDimensionalArrays.java
@@ -18,7 +18,7 @@ void requiresS1S2(@AinferSibling1 int @AinferSibling2 [] x) {}
int[] twoDimArray;
void testField() {
- // :: warning: (argument)
+ // :: warning: [argument]
requiresS1S2(twoDimArray);
}
@@ -27,7 +27,7 @@ void useField(@AinferSibling1 int @AinferSibling2 [] x) {
}
void testParam(int[] x) {
- // :: warning: (argument)
+ // :: warning: [argument]
requiresS1S2(x);
}
@@ -41,9 +41,9 @@ int[] useReturn(@AinferSibling1 int @AinferSibling2 [] x) {
void testReturn() {
requiresS1S2(
- // :: warning: (argument)
+ // :: warning: [argument]
useReturn(
- // :: warning: (argument)
+ // :: warning: [argument]
twoDimArray));
}
@@ -54,7 +54,7 @@ void requiresS1S2S1(@AinferSibling1 int @AinferSibling2 [] @AinferSibling1 [] x)
int[][] threeDimArray;
void testField2() {
- // :: warning: (argument)
+ // :: warning: [argument]
requiresS1S2S1(threeDimArray);
}
@@ -63,7 +63,7 @@ void useField2(@AinferSibling1 int @AinferSibling2 [] @AinferSibling1 [] x) {
}
void testParam2(int[][] x) {
- // :: warning: (argument)
+ // :: warning: [argument]
requiresS1S2S1(x);
}
@@ -76,7 +76,7 @@ int[][] useReturn2(@AinferSibling1 int @AinferSibling2 [] @AinferSibling1 [] x)
}
void testReturn2() {
- // :: warning: (argument)
+ // :: warning: [argument]
requiresS1S2S1(useReturn2(threeDimArray));
}
@@ -87,7 +87,7 @@ void requiresS1S2N(@AinferSibling1 int @AinferSibling2 [][] x) {}
int[][] threeDimArray2;
void testField3() {
- // :: warning: (argument)
+ // :: warning: [argument]
requiresS1S2N(threeDimArray2);
}
@@ -96,7 +96,7 @@ void useField3(@AinferSibling1 int @AinferSibling2 [][] x) {
}
void testParam3(int[][] x) {
- // :: warning: (argument)
+ // :: warning: [argument]
requiresS1S2N(x);
}
@@ -109,7 +109,7 @@ int[][] useReturn3(@AinferSibling1 int @AinferSibling2 [][] x) {
}
void testReturn3() {
- // :: warning: (argument)
+ // :: warning: [argument]
requiresS1S2N(useReturn3(threeDimArray2));
}
@@ -120,7 +120,7 @@ void requiresS2S1(int @AinferSibling2 [] @AinferSibling1 [] x) {}
int[][] threeDimArray3;
void testField4() {
- // :: warning: (argument)
+ // :: warning: [argument]
requiresS2S1(threeDimArray3);
}
@@ -129,7 +129,7 @@ void useField4(int @AinferSibling2 [] @AinferSibling1 [] x) {
}
void testParam4(int[][] x) {
- // :: warning: (argument)
+ // :: warning: [argument]
requiresS2S1(x);
}
@@ -142,7 +142,7 @@ int[][] useReturn4(int @AinferSibling2 [] @AinferSibling1 [] x) {
}
void testReturn4() {
- // :: warning: (argument)
+ // :: warning: [argument]
requiresS2S1(useReturn4(threeDimArray3));
}
@@ -156,7 +156,7 @@ void requiresSf1Sf2Sf3(
int[][] threeDimArray4;
void testField5() {
- // :: warning: (argument)
+ // :: warning: [argument]
requiresSf1Sf2Sf3(threeDimArray4);
}
@@ -168,7 +168,7 @@ void useField5(
}
void testParam5(int[][] x) {
- // :: warning: (argument)
+ // :: warning: [argument]
requiresSf1Sf2Sf3(x);
}
@@ -187,7 +187,7 @@ int[][] useReturn5(
}
void testReturn5() {
- // :: warning: (argument)
+ // :: warning: [argument]
requiresSf1Sf2Sf3(useReturn5(threeDimArray4));
}
@@ -196,7 +196,7 @@ void testReturn5() {
int[][] threeDimArray5;
void testField6() {
- // :: warning: (argument)
+ // :: warning: [argument]
requiresS1S2S1(threeDimArray5);
}
@@ -206,7 +206,7 @@ void useField6(
}
void testParam6(int[][] x) {
- // :: warning: (argument)
+ // :: warning: [argument]
requiresS1S2S1(x);
}
@@ -221,7 +221,7 @@ int[][] useReturn6(
}
void testReturn6() {
- // :: warning: (argument)
+ // :: warning: [argument]
requiresS1S2S1(useReturn6(threeDimArray));
}
@@ -231,7 +231,7 @@ void testReturn6() {
List[] arrayofListsOfStringArrays;
void testField7() {
- // :: warning: (argument)
+ // :: warning: [argument]
requiresS1S2L(arrayofListsOfStringArrays);
}
@@ -244,7 +244,7 @@ void useField7(
}
void testParam7(List[] x) {
- // :: warning: (argument)
+ // :: warning: [argument]
requiresS1S2L(x);
}
@@ -259,7 +259,7 @@ List[] useReturn7(
}
void testReturn7() {
- // :: warning: (argument)
+ // :: warning: [argument]
requiresS1S2L(useReturn7(arrayofListsOfStringArrays));
}
}
diff --git a/checker/tests/ainfer-testchecker/non-annotated/OtherAnnotations.java b/checker/tests/ainfer-testchecker/non-annotated/OtherAnnotations.java
index 0ad71bb1dcd2..45fe157cabd7 100644
--- a/checker/tests/ainfer-testchecker/non-annotated/OtherAnnotations.java
+++ b/checker/tests/ainfer-testchecker/non-annotated/OtherAnnotations.java
@@ -14,12 +14,12 @@ void assignX(@AinferSibling1 int y) {
}
void useX() {
- // :: warning: (argument)
+ // :: warning: [argument]
requireAinferSibling1(x);
}
void methodWithAnnotatedParam(@Unique int z) {
- // :: warning: (argument)
+ // :: warning: [argument]
requireAinferSibling1(z);
}
@@ -36,7 +36,7 @@ void useMethodWithAnnotatedParam(@AinferSibling1 int w) {
}
void useGetIntVal5() {
- // :: warning: (argument)
+ // :: warning: [argument]
requireAinferSibling1(getIntVal5());
}
}
diff --git a/checker/tests/ainfer-testchecker/non-annotated/OverriddenMethodsTest.java b/checker/tests/ainfer-testchecker/non-annotated/OverriddenMethodsTest.java
index e97d15a3a3a9..c2821282cd96 100644
--- a/checker/tests/ainfer-testchecker/non-annotated/OverriddenMethodsTest.java
+++ b/checker/tests/ainfer-testchecker/non-annotated/OverriddenMethodsTest.java
@@ -11,12 +11,12 @@ public void barz(
@AinferSibling1 OverriddenMethodsTestParent this, @AinferSibling2 Object obj) {}
public void qux(Object obj1, Object obj2) {
- // :: warning: (argument)
+ // :: warning: [argument]
foo(obj1, obj2);
}
public void thud(Object obj1, Object obj2) {
- // :: warning: (argument)
+ // :: warning: [argument]
foo(obj1, obj2);
}
}
@@ -24,17 +24,17 @@ public void thud(Object obj1, Object obj2) {
class OverriddenMethodsTestChild extends OverriddenMethodsTestParent {
@Override
public void foo(Object obj, Object obj2) {
- // :: warning: (assignment)
+ // :: warning: [assignment]
@AinferSibling1 Object o = obj;
- // :: warning: (assignment)
+ // :: warning: [assignment]
@AinferSibling2 Object o2 = obj2;
}
@Override
public void bar(Object obj) {
- // :: warning: (assignment)
+ // :: warning: [assignment]
@AinferSibling1 OverriddenMethodsTestChild child = this;
- // :: warning: (assignment)
+ // :: warning: [assignment]
@AinferSibling2 Object o = obj;
}
diff --git a/checker/tests/ainfer-testchecker/non-annotated/ParameterInferenceTest.java b/checker/tests/ainfer-testchecker/non-annotated/ParameterInferenceTest.java
index 7e0f33b66a55..32541e87382d 100644
--- a/checker/tests/ainfer-testchecker/non-annotated/ParameterInferenceTest.java
+++ b/checker/tests/ainfer-testchecker/non-annotated/ParameterInferenceTest.java
@@ -9,13 +9,13 @@ void test1() {
}
void expectsParentNoSignature(int t) {
- // :: warning: (assignment)
+ // :: warning: [assignment]
@AinferParent int parent = t;
}
void test2() {
@AinferTop int top = (@AinferTop int) 0;
- // :: warning: (argument)
+ // :: warning: [argument]
expectsAinferTopNoSignature(top);
}
diff --git a/checker/tests/ainfer-testchecker/non-annotated/Planet.java b/checker/tests/ainfer-testchecker/non-annotated/Planet.java
index c2a8e80e5b4b..31df57797635 100644
--- a/checker/tests/ainfer-testchecker/non-annotated/Planet.java
+++ b/checker/tests/ainfer-testchecker/non-annotated/Planet.java
@@ -50,7 +50,7 @@ void test(@AinferSibling1 int x) {
}
void test2() {
- // :: warning: (argument)
+ // :: warning: [argument]
test(foo);
}
}
diff --git a/checker/tests/ainfer-testchecker/non-annotated/PublicFieldTest.java b/checker/tests/ainfer-testchecker/non-annotated/PublicFieldTest.java
index 0b48ef3a3598..ddde7811a094 100644
--- a/checker/tests/ainfer-testchecker/non-annotated/PublicFieldTest.java
+++ b/checker/tests/ainfer-testchecker/non-annotated/PublicFieldTest.java
@@ -13,11 +13,11 @@ public PublicFieldTest() {
}
void testPublicInference() {
- // :: warning: (argument)
+ // :: warning: [argument]
expectsAinferSibling2(field2);
- // :: warning: (argument)
+ // :: warning: [argument]
expectsParent(field1);
- // :: warning: (argument)
+ // :: warning: [argument]
expectsParent(field2);
}
@@ -46,7 +46,7 @@ public AnotherClass() {
}
void innerFieldTest() {
- // :: warning: (argument)
+ // :: warning: [argument]
expectsAinferSibling2(innerField);
}
diff --git a/checker/tests/ainfer-testchecker/non-annotated/Purity.java b/checker/tests/ainfer-testchecker/non-annotated/Purity.java
index f2193ce6d16d..752e987427c1 100644
--- a/checker/tests/ainfer-testchecker/non-annotated/Purity.java
+++ b/checker/tests/ainfer-testchecker/non-annotated/Purity.java
@@ -23,7 +23,7 @@ static String myPureMethod() {
void context() {
PureFunc f1 = TestPure1::myPureMethod;
- // :: warning: (purity.methodref)
+ // :: warning: [purity.methodref]
PureFunc f2 = TestPure1::myMethod;
}
}
diff --git a/checker/tests/ainfer-testchecker/non-annotated/RequiresQualifierTest.java b/checker/tests/ainfer-testchecker/non-annotated/RequiresQualifierTest.java
index 893a5b44d44e..cd0b768736bb 100644
--- a/checker/tests/ainfer-testchecker/non-annotated/RequiresQualifierTest.java
+++ b/checker/tests/ainfer-testchecker/non-annotated/RequiresQualifierTest.java
@@ -16,17 +16,17 @@ class RequiresQualifierTest {
@AinferBottom int bottom;
void field1IsParent() {
- // :: warning: (assignment)
+ // :: warning: [assignment]
@AinferParent int x = field1;
}
void field1IsAinferSibling2() {
- // :: warning: (assignment)
+ // :: warning: [assignment]
@AinferSibling2 int x = field1;
}
void parentIsAinferSibling1() {
- // :: warning: (assignment)
+ // :: warning: [assignment]
@AinferSibling1 int x = parent;
}
diff --git a/checker/tests/ainfer-testchecker/non-annotated/StringConcatenationTest.java b/checker/tests/ainfer-testchecker/non-annotated/StringConcatenationTest.java
index 4b5ebd233cf6..ddbe4763d186 100644
--- a/checker/tests/ainfer-testchecker/non-annotated/StringConcatenationTest.java
+++ b/checker/tests/ainfer-testchecker/non-annotated/StringConcatenationTest.java
@@ -16,7 +16,7 @@ void foo() {
}
void test() {
- // :: warning: (argument)
+ // :: warning: [argument]
expectsAinferSibling1(options_str);
}
diff --git a/checker/tests/ainfer-testchecker/non-annotated/TreatAsSibling1InferenceTest.java b/checker/tests/ainfer-testchecker/non-annotated/TreatAsSibling1InferenceTest.java
index d7a32a59ffcf..1cd9a10e8ba9 100644
--- a/checker/tests/ainfer-testchecker/non-annotated/TreatAsSibling1InferenceTest.java
+++ b/checker/tests/ainfer-testchecker/non-annotated/TreatAsSibling1InferenceTest.java
@@ -7,7 +7,7 @@
public class TreatAsSibling1InferenceTest {
public void test(Object iShouldBeTreatedAsSibling1) {
- // :: warning: (assignment)
+ // :: warning: [assignment]
@AinferSibling1 Object x = iShouldBeTreatedAsSibling1;
}
}
diff --git a/checker/tests/ainfer-testchecker/non-annotated/TwoMethodsSameName.java b/checker/tests/ainfer-testchecker/non-annotated/TwoMethodsSameName.java
index 45f71b5ab420..2ca3209bd286 100644
--- a/checker/tests/ainfer-testchecker/non-annotated/TwoMethodsSameName.java
+++ b/checker/tests/ainfer-testchecker/non-annotated/TwoMethodsSameName.java
@@ -7,14 +7,14 @@
public class TwoMethodsSameName {
void test(int x, int y) {
- // :: warning: (assignment)
+ // :: warning: [assignment]
@AinferSibling1 int x1 = x;
- // :: warning: (assignment)
+ // :: warning: [assignment]
@AinferSibling2 int y1 = y;
}
void test(int z) {
- // :: warning: (assignment)
+ // :: warning: [assignment]
@AinferSibling2 int z1 = z;
}
diff --git a/checker/tests/ainfer-testchecker/non-annotated/TypeVariablesTest3.java b/checker/tests/ainfer-testchecker/non-annotated/TypeVariablesTest3.java
index 80decf4e9d72..6fb4a461caff 100644
--- a/checker/tests/ainfer-testchecker/non-annotated/TypeVariablesTest3.java
+++ b/checker/tests/ainfer-testchecker/non-annotated/TypeVariablesTest3.java
@@ -8,7 +8,7 @@ public class TypeVariablesTest3<@AinferSibling1 T extends @AinferSibling1 Object
public T tField;
void foo(T param) {
- // :: warning: (assignment)
+ // :: warning: [assignment]
param = sibling2;
}
@@ -17,7 +17,7 @@ void baz(T param) {
}
void bar(@AinferSibling2 T param) {
- // :: warning: (assignment)
+ // :: warning: [assignment]
tField = param;
}
}
diff --git a/checker/tests/ainfer-testchecker/non-annotated/UsesAnonymous.java b/checker/tests/ainfer-testchecker/non-annotated/UsesAnonymous.java
index 8f30e8f7ebca..a23c9d352f3e 100644
--- a/checker/tests/ainfer-testchecker/non-annotated/UsesAnonymous.java
+++ b/checker/tests/ainfer-testchecker/non-annotated/UsesAnonymous.java
@@ -15,7 +15,7 @@ public void method2() {
}
void innerFieldTest() {
- // :: warning: (argument)
+ // :: warning: [argument]
expectsAinferSibling2(innerField);
}
diff --git a/checker/tests/ainfer-testchecker/non-annotated/ValueCheck.java b/checker/tests/ainfer-testchecker/non-annotated/ValueCheck.java
index e8eb25bc6fbb..857293c26d9d 100644
--- a/checker/tests/ainfer-testchecker/non-annotated/ValueCheck.java
+++ b/checker/tests/ainfer-testchecker/non-annotated/ValueCheck.java
@@ -18,9 +18,9 @@ void requireIntVal5(@IntVal(5) int x) {}
void test() {
int x = getAinferSibling1withValue5();
- // :: warning: (argument)
+ // :: warning: [argument]
requireAinferSibling1(x);
- // :: warning: (argument)
+ // :: warning: [argument]
requireIntVal5(x);
}
}
diff --git a/checker/tests/calledmethods-autovalue/Animal.java b/checker/tests/calledmethods-autovalue/Animal.java
index 67d975e1ed53..d60853015106 100644
--- a/checker/tests/calledmethods-autovalue/Animal.java
+++ b/checker/tests/calledmethods-autovalue/Animal.java
@@ -45,7 +45,7 @@ abstract static class Builder {
public static void buildSomethingWrong() {
Builder b = builder();
b.setName("Frank");
- // :: error: (finalizer.invocation)
+ // :: error: [finalizer.invocation]
b.build();
}
@@ -65,7 +65,7 @@ public static void buildSomethingRightIncludeOptional() {
}
public static void buildSomethingWrongFluent() {
- // :: error: (finalizer.invocation)
+ // :: error: [finalizer.invocation]
builder().setName("Frank").build();
}
diff --git a/checker/tests/calledmethods-autovalue/AnimalNoSet.java b/checker/tests/calledmethods-autovalue/AnimalNoSet.java
index 14802b351528..0c5ca00ea514 100644
--- a/checker/tests/calledmethods-autovalue/AnimalNoSet.java
+++ b/checker/tests/calledmethods-autovalue/AnimalNoSet.java
@@ -37,7 +37,7 @@ abstract static class Builder {
public static void buildSomethingWrong() {
Builder b = builder();
b.name("Frank");
- // :: error: (finalizer.invocation)
+ // :: error: [finalizer.invocation]
b.build();
}
@@ -57,7 +57,7 @@ public static void buildSomethingRightIncludeOptional() {
}
public static void buildSomethingWrongFluent() {
- // :: error: (finalizer.invocation)
+ // :: error: [finalizer.invocation]
builder().name("Frank").build();
}
diff --git a/checker/tests/calledmethods-autovalue/BuilderGetter.java b/checker/tests/calledmethods-autovalue/BuilderGetter.java
index 8d29ac9a4cc9..2640174e25c3 100644
--- a/checker/tests/calledmethods-autovalue/BuilderGetter.java
+++ b/checker/tests/calledmethods-autovalue/BuilderGetter.java
@@ -30,7 +30,7 @@ static void correct() {
static void wrong() {
Builder b = builder();
b.name();
- // :: error: (finalizer.invocation)
+ // :: error: [finalizer.invocation]
b.build();
}
}
diff --git a/checker/tests/calledmethods-autovalue/FooParcelable.java b/checker/tests/calledmethods-autovalue/FooParcelable.java
index 8416e6c2dd0e..0eb998860d64 100644
--- a/checker/tests/calledmethods-autovalue/FooParcelable.java
+++ b/checker/tests/calledmethods-autovalue/FooParcelable.java
@@ -24,7 +24,7 @@ abstract static class Builder {
public static void buildSomethingWrong() {
Builder b = builder();
- // :: error: (finalizer.invocation)
+ // :: error: [finalizer.invocation]
b.build();
}
diff --git a/checker/tests/calledmethods-autovalue/GetAndIs.java b/checker/tests/calledmethods-autovalue/GetAndIs.java
index c7f76c877db5..a1e3233e249a 100644
--- a/checker/tests/calledmethods-autovalue/GetAndIs.java
+++ b/checker/tests/calledmethods-autovalue/GetAndIs.java
@@ -25,7 +25,7 @@ abstract static class Builder {
public static void buildSomethingWrong() {
Builder b = builder();
b.setGet("Frank");
- // :: error: (finalizer.invocation)
+ // :: error: [finalizer.invocation]
b.build();
}
@@ -37,7 +37,7 @@ public static void buildSomethingRight() {
}
public static void buildSomethingWrongFluent() {
- // :: error: (finalizer.invocation)
+ // :: error: [finalizer.invocation]
builder().setGet("Frank").build();
}
diff --git a/checker/tests/calledmethods-autovalue/GetAnimal.java b/checker/tests/calledmethods-autovalue/GetAnimal.java
index d6a73e18b8c6..a6905c67d0f4 100644
--- a/checker/tests/calledmethods-autovalue/GetAnimal.java
+++ b/checker/tests/calledmethods-autovalue/GetAnimal.java
@@ -37,7 +37,7 @@ abstract static class Builder {
public static void buildSomethingWrong() {
Builder b = builder();
b.setName("Frank");
- // :: error: (finalizer.invocation)
+ // :: error: [finalizer.invocation]
b.build();
}
@@ -59,7 +59,7 @@ public static void buildSomethingRightIncludeOptional() {
}
public static void buildSomethingWrongFluent() {
- // :: error: (finalizer.invocation)
+ // :: error: [finalizer.invocation]
builder().setName("Frank").build();
}
diff --git a/checker/tests/calledmethods-autovalue/GuavaImmutable.java b/checker/tests/calledmethods-autovalue/GuavaImmutable.java
index d3de07343be8..3b0d82b16e64 100644
--- a/checker/tests/calledmethods-autovalue/GuavaImmutable.java
+++ b/checker/tests/calledmethods-autovalue/GuavaImmutable.java
@@ -21,7 +21,7 @@ abstract static class Builder {
}
public static void buildSomethingWrong() {
- // :: error: (finalizer.invocation)
+ // :: error: [finalizer.invocation]
builder().build();
}
diff --git a/checker/tests/calledmethods-autovalue/Inheritance.java b/checker/tests/calledmethods-autovalue/Inheritance.java
index 25c3a04f0a44..ce6f06fa8bbc 100644
--- a/checker/tests/calledmethods-autovalue/Inheritance.java
+++ b/checker/tests/calledmethods-autovalue/Inheritance.java
@@ -41,7 +41,7 @@ static void correct() {
static void wrong() {
PropHolder.Builder b = PropHolder.builder();
- // :: error: (finalizer.invocation)
+ // :: error: [finalizer.invocation]
b.size(1).build();
}
}
diff --git a/checker/tests/calledmethods-autovalue/NonBuildName.java b/checker/tests/calledmethods-autovalue/NonBuildName.java
index de6a6d7dd8fa..04638e1bd4a6 100644
--- a/checker/tests/calledmethods-autovalue/NonBuildName.java
+++ b/checker/tests/calledmethods-autovalue/NonBuildName.java
@@ -27,7 +27,7 @@ static void correct() {
static void wrong() {
Builder b = builder();
- // :: error: (finalizer.invocation)
+ // :: error: [finalizer.invocation]
b.makeIt();
}
}
diff --git a/checker/tests/calledmethods-autovalue/SetInsideBuild.java b/checker/tests/calledmethods-autovalue/SetInsideBuild.java
index c1bf32ed4e8c..4eea4ebf8dc5 100644
--- a/checker/tests/calledmethods-autovalue/SetInsideBuild.java
+++ b/checker/tests/calledmethods-autovalue/SetInsideBuild.java
@@ -28,7 +28,7 @@ public SetInsideBuild build(@CalledMethods({"setName"}) Builder this) {
public static void buildSomethingWrong() {
Builder b = builder();
- // :: error: (finalizer.invocation)
+ // :: error: [finalizer.invocation]
b.build();
}
diff --git a/checker/tests/calledmethods-autovalue/SetInsideBuildWithCM.java b/checker/tests/calledmethods-autovalue/SetInsideBuildWithCM.java
index 741f2f8679e9..78a6a3933cf3 100644
--- a/checker/tests/calledmethods-autovalue/SetInsideBuildWithCM.java
+++ b/checker/tests/calledmethods-autovalue/SetInsideBuildWithCM.java
@@ -34,7 +34,7 @@ public static void buildSomethingCorrect() {
public static void buildSomethingWrong() {
Builder b = builder();
- // :: error: (finalizer.invocation)
+ // :: error: [finalizer.invocation]
b.build();
}
}
diff --git a/checker/tests/calledmethods-autovalue/Validation.java b/checker/tests/calledmethods-autovalue/Validation.java
index 7f6efc9eddbc..3f67148d57e5 100644
--- a/checker/tests/calledmethods-autovalue/Validation.java
+++ b/checker/tests/calledmethods-autovalue/Validation.java
@@ -35,7 +35,7 @@ static void correct() {
static void wrong() {
Builder b = builder();
- // :: error: (finalizer.invocation)
+ // :: error: [finalizer.invocation]
b.build();
}
}
diff --git a/checker/tests/calledmethods-disablereturnsreceiver/SimpleFluentInference.java b/checker/tests/calledmethods-disablereturnsreceiver/SimpleFluentInference.java
index 4bd407c40f7e..56897184014b 100644
--- a/checker/tests/calledmethods-disablereturnsreceiver/SimpleFluentInference.java
+++ b/checker/tests/calledmethods-disablereturnsreceiver/SimpleFluentInference.java
@@ -33,7 +33,7 @@ static void doStuffCorrect() {
new SimpleFluentInference()
.a()
.b()
- // :: error: (finalizer.invocation)
+ // :: error: [finalizer.invocation]
.build();
}
@@ -41,7 +41,7 @@ static void doStuffWrong() {
SimpleFluentInference s =
new SimpleFluentInference()
.a()
- // :: error: (finalizer.invocation)
+ // :: error: [finalizer.invocation]
.build();
}
@@ -49,7 +49,7 @@ static void doStuffRightWeak() {
SimpleFluentInference s =
new SimpleFluentInference()
.a()
- // :: error: (finalizer.invocation)
+ // :: error: [finalizer.invocation]
.weakbuild();
}
@@ -59,7 +59,7 @@ static void noReturnsReceiverAnno() {
.a()
.b()
.c()
- // :: error: (finalizer.invocation)
+ // :: error: [finalizer.invocation]
.build();
}
@@ -67,7 +67,7 @@ static void fluentLoop() {
SimpleFluentInference s = new SimpleFluentInference().a();
int i = 10;
while (i > 0) {
- // :: error: (finalizer.invocation)
+ // :: error: [finalizer.invocation]
s.b().build();
i--;
s = new SimpleFluentInference();
diff --git a/checker/tests/calledmethods-lombok/BuilderTest.java b/checker/tests/calledmethods-lombok/BuilderTest.java
index c166b05d5b59..694b330c2a48 100644
--- a/checker/tests/calledmethods-lombok/BuilderTest.java
+++ b/checker/tests/calledmethods-lombok/BuilderTest.java
@@ -11,7 +11,7 @@ public static void test_simplePattern() {
BuilderTest.builder().x(0).y(0).build(); // good builder
BuilderTest.builder().y(0).build(); // good builder
BuilderTest.builder().y(0).z(5).build(); // good builder
- // :: error: (finalizer.invocation)
+ // :: error: [finalizer.invocation]
BuilderTest.builder().x(0).build(); // bad builder
}
@@ -21,7 +21,7 @@ public static void test_builderVar() {
goodBuilder.y(0);
goodBuilder.build();
final BuilderTest.BuilderTestBuilder badBuilder = new BuilderTestBuilder();
- // :: error: (finalizer.invocation)
+ // :: error: [finalizer.invocation]
badBuilder.build();
}
}
diff --git a/checker/tests/calledmethods-lombok/CheckerFrameworkBuilder.java b/checker/tests/calledmethods-lombok/CheckerFrameworkBuilder.java
index a921ac540ebe..94a1b419fbc1 100644
--- a/checker/tests/calledmethods-lombok/CheckerFrameworkBuilder.java
+++ b/checker/tests/calledmethods-lombok/CheckerFrameworkBuilder.java
@@ -27,7 +27,7 @@ public static void testOldCalledMethodsGood(
public static void testOldCalledMethodsBad(
@org.checkerframework.checker.calledmethods.qual.CalledMethods({"y"}) CheckerFrameworkBuilderBuilder pb) {
- // :: error: (finalizer.invocation)
+ // :: error: [finalizer.invocation]
pb.build(); // pb requires y, z
}
@@ -37,7 +37,7 @@ public static void testOldRRGood() {
public static void testOldRRBad() {
CheckerFrameworkBuilder b =
- // :: error: (finalizer.invocation)
+ // :: error: [finalizer.invocation]
CheckerFrameworkBuilder.builder().z(6).build(); // also needs to call y
}
diff --git a/checker/tests/calledmethods-lombok/LombokBuilderExample.java b/checker/tests/calledmethods-lombok/LombokBuilderExample.java
index 16fbe6b1b9bc..3572ed1367c6 100644
--- a/checker/tests/calledmethods-lombok/LombokBuilderExample.java
+++ b/checker/tests/calledmethods-lombok/LombokBuilderExample.java
@@ -8,7 +8,7 @@ public class LombokBuilderExample {
@lombok.NonNull Object bar;
static void test() {
- // :: error: (finalizer.invocation)
+ // :: error: [finalizer.invocation]
builder().build();
}
}
diff --git a/checker/tests/calledmethods-lombok/LombokNoSingularButClearMethodExample.java b/checker/tests/calledmethods-lombok/LombokNoSingularButClearMethodExample.java
index dad9e04eb51e..e96ab5a8016c 100644
--- a/checker/tests/calledmethods-lombok/LombokNoSingularButClearMethodExample.java
+++ b/checker/tests/calledmethods-lombok/LombokNoSingularButClearMethodExample.java
@@ -8,7 +8,7 @@ public class LombokNoSingularButClearMethodExample {
// This one should throw an error, because the field isn't
// automatically initialized.
public static void testNoItems() {
- // :: error: (finalizer.invocation)
+ // :: error: [finalizer.invocation]
LombokNoSingularButClearMethodExample.builder().build();
}
diff --git a/checker/tests/calledmethods-lombok/LombokToBuilderExample.java b/checker/tests/calledmethods-lombok/LombokToBuilderExample.java
index 79d8e402aacf..293be92f7b38 100644
--- a/checker/tests/calledmethods-lombok/LombokToBuilderExample.java
+++ b/checker/tests/calledmethods-lombok/LombokToBuilderExample.java
@@ -11,7 +11,7 @@ static void test(LombokToBuilderExample foo) {
}
static void ensureThatErrorIssued() {
- // :: error: (finalizer.invocation)
+ // :: error: [finalizer.invocation]
LombokToBuilderExample.builder().build();
}
}
diff --git a/checker/tests/calledmethods-lombok/OldInherited.java b/checker/tests/calledmethods-lombok/OldInherited.java
index 1bce8de8be53..eff5f43bbac0 100644
--- a/checker/tests/calledmethods-lombok/OldInherited.java
+++ b/checker/tests/calledmethods-lombok/OldInherited.java
@@ -33,13 +33,13 @@ public static void testGoodChild() {
public static void testBadParent() {
OldInherited o = new OldInherited();
- // :: error: (finalizer.invocation)
+ // :: error: [finalizer.invocation]
o.requiresGetThis();
}
public static void testBadChild() {
OldInheritedChild o = new OldInheritedChild();
- // :: error: (finalizer.invocation)
+ // :: error: [finalizer.invocation]
o.requiresGetThis();
}
}
diff --git a/checker/tests/calledmethods-nodelombok/UnsoundnessTest.java b/checker/tests/calledmethods-nodelombok/UnsoundnessTest.java
index f20b84a5f72a..d37bdd8278fb 100644
--- a/checker/tests/calledmethods-nodelombok/UnsoundnessTest.java
+++ b/checker/tests/calledmethods-nodelombok/UnsoundnessTest.java
@@ -11,7 +11,7 @@ static void test() {
// If the CF and Lombok are ever able to work in the same invocation of javac
// (i.e. without delomboking first), then this error should be changed back to an
// expected error by re-adding the leading "::".
- // error: (finalizer.invocation)
+ // error: [finalizer.invocation]
builder().build();
}
diff --git a/checker/tests/calledmethods-usevaluechecker/Cve.java b/checker/tests/calledmethods-usevaluechecker/Cve.java
index a076a4c12d23..d1634dfdf3fb 100644
--- a/checker/tests/calledmethods-usevaluechecker/Cve.java
+++ b/checker/tests/calledmethods-usevaluechecker/Cve.java
@@ -14,7 +14,7 @@ public static void onlyNames(AmazonEC2 client) {
DescribeImagesResult result =
client.describeImages(
new DescribeImagesRequest()
- // :: error: (argument)
+ // :: error: [argument]
.withFilters(new Filter("name").withValues(IMG_NAME)));
}
@@ -42,7 +42,7 @@ public static void onlyNamesImpl(AmazonEC2Client client) {
DescribeImagesResult result =
client.describeImages(
new DescribeImagesRequest()
- // :: error: (argument)
+ // :: error: [argument]
.withFilters(new Filter("name").withValues(IMG_NAME)));
}
@@ -65,7 +65,7 @@ public static void onlyNamesAsync(AmazonEC2AsyncClient client) {
DescribeImagesResult result =
client.describeImages(
new DescribeImagesRequest()
- // :: error: (argument)
+ // :: error: [argument]
.withFilters(new Filter("name").withValues(IMG_NAME)));
}
@@ -88,7 +88,7 @@ public static void onlyNamesAsync2(AmazonEC2AsyncClient client) {
Object result =
client.describeImagesAsync(
new DescribeImagesRequest()
- // :: error: (argument)
+ // :: error: [argument]
.withFilters(new Filter("name").withValues(IMG_NAME)));
}
diff --git a/checker/tests/calledmethods-usevaluechecker/Cve2.java b/checker/tests/calledmethods-usevaluechecker/Cve2.java
index 976b5a8dc2c9..7ceaeaa0da18 100644
--- a/checker/tests/calledmethods-usevaluechecker/Cve2.java
+++ b/checker/tests/calledmethods-usevaluechecker/Cve2.java
@@ -13,7 +13,7 @@ public static void onlyNames(AmazonEC2 client) {
DescribeImagesRequest request = new DescribeImagesRequest();
request.withFilters(new Filter("name").withValues(IMG_NAME));
- // :: error: (argument)
+ // :: error: [argument]
DescribeImagesResult result = client.describeImages(request);
}
diff --git a/checker/tests/calledmethods-usevaluechecker/GenerateDataKeyRequestExamples.java b/checker/tests/calledmethods-usevaluechecker/GenerateDataKeyRequestExamples.java
index 22f79b1d68fb..e44ca18aafaa 100644
--- a/checker/tests/calledmethods-usevaluechecker/GenerateDataKeyRequestExamples.java
+++ b/checker/tests/calledmethods-usevaluechecker/GenerateDataKeyRequestExamples.java
@@ -36,7 +36,7 @@ void incorrect1(AWSKMS client) {
GenerateDataKeyRequest request = new GenerateDataKeyRequest();
request.setKeySpec(DataKeySpec.AES_256);
request.setNumberOfBytes(32);
- // :: error: (argument)
+ // :: error: [argument]
client.generateDataKey(request);
}
@@ -44,7 +44,7 @@ void incorrect2(AWSKMS client) {
GenerateDataKeyRequest request = new GenerateDataKeyRequest();
request.withKeySpec(DataKeySpec.AES_256);
request.setNumberOfBytes(32);
- // :: error: (argument)
+ // :: error: [argument]
client.generateDataKey(request);
}
@@ -52,7 +52,7 @@ void incorrect3(AWSKMS client) {
GenerateDataKeyRequest request = new GenerateDataKeyRequest();
request.setKeySpec(DataKeySpec.AES_256);
request.withNumberOfBytes(32);
- // :: error: (argument)
+ // :: error: [argument]
client.generateDataKey(request);
}
@@ -60,14 +60,14 @@ void incorrect4(AWSKMS client) {
GenerateDataKeyRequest request = new GenerateDataKeyRequest();
request.withKeySpec(DataKeySpec.AES_256);
request.withNumberOfBytes(32);
- // :: error: (argument)
+ // :: error: [argument]
client.generateDataKey(request);
}
// This example is "neither"
void incorrect5(AWSKMS client) {
GenerateDataKeyRequest request = new GenerateDataKeyRequest();
- // :: error: (argument)
+ // :: error: [argument]
client.generateDataKey(request);
}
diff --git a/checker/tests/calledmethods-usevaluechecker/MorePreciseFilters.java b/checker/tests/calledmethods-usevaluechecker/MorePreciseFilters.java
index e315df006543..10f34a53e530 100644
--- a/checker/tests/calledmethods-usevaluechecker/MorePreciseFilters.java
+++ b/checker/tests/calledmethods-usevaluechecker/MorePreciseFilters.java
@@ -42,7 +42,7 @@ void withName(AmazonEC2 ec2Client) {
void withName2(AmazonEC2 ec2Client) {
DescribeImagesRequest request = new DescribeImagesRequest();
request.withFilters(new Filter().withName("image-id").withName("foo").withValues("12345"));
- // :: error: (argument)
+ // :: error: [argument]
DescribeImagesResult result = ec2Client.describeImages(request);
}
diff --git a/checker/tests/calledmethods-usevaluechecker/SpecialNames.java b/checker/tests/calledmethods-usevaluechecker/SpecialNames.java
index d6635727f26e..640a11538cf7 100644
--- a/checker/tests/calledmethods-usevaluechecker/SpecialNames.java
+++ b/checker/tests/calledmethods-usevaluechecker/SpecialNames.java
@@ -30,24 +30,24 @@ void setFilters(SpecialNames f) {}
SpecialNames(String x) {}
static void test(SpecialNames s) {
- // :: error: (assignment)
+ // :: error: [assignment]
@CalledMethods("withOwners") SpecialNames x = s.withFilters(new SpecialNames().withName("owner"));
}
static void test2(SpecialNames s) {
s.setFilters(new SpecialNames("owner"));
- // :: error: (assignment)
+ // :: error: [assignment]
@CalledMethods("withOwners") SpecialNames x = s;
}
static void test3(SpecialNames s) {
- // :: error: (assignment)
+ // :: error: [assignment]
@CalledMethods("withOwners") SpecialNames x = s.withFilters(new SpecialNames().withName("owner"));
}
static void test4(SpecialNames s) {
s.setFilters(new SpecialNames("owner"));
- // :: error: (assignment)
+ // :: error: [assignment]
@CalledMethods("withOwners") SpecialNames x = s;
}
diff --git a/checker/tests/calledmethods/CmPredicate.java b/checker/tests/calledmethods/CmPredicate.java
index 8e6d6c5a1c68..319c42505d96 100644
--- a/checker/tests/calledmethods/CmPredicate.java
+++ b/checker/tests/calledmethods/CmPredicate.java
@@ -5,7 +5,7 @@ public class CmPredicate {
void testOr1() {
MyClass m1 = new MyClass();
- // :: error: (method.invocation)
+ // :: error: [method.invocation]
m1.c();
}
@@ -26,7 +26,7 @@ void testOr3() {
void testAnd1() {
MyClass m1 = new MyClass();
- // :: error: (method.invocation)
+ // :: error: [method.invocation]
m1.d();
}
@@ -34,7 +34,7 @@ void testAnd2() {
MyClass m1 = new MyClass();
m1.a();
- // :: error: (method.invocation)
+ // :: error: [method.invocation]
m1.d();
}
@@ -42,7 +42,7 @@ void testAnd3() {
MyClass m1 = new MyClass();
m1.b();
- // :: error: (method.invocation)
+ // :: error: [method.invocation]
m1.d();
}
@@ -51,7 +51,7 @@ void testAnd4() {
m1.a();
m1.c();
- // :: error: (method.invocation)
+ // :: error: [method.invocation]
m1.d();
}
@@ -75,7 +75,7 @@ void testAnd6() {
void testAndOr1() {
MyClass m1 = new MyClass();
- // :: error: (method.invocation)
+ // :: error: [method.invocation]
m1.e();
}
@@ -90,7 +90,7 @@ void testAndOr3() {
MyClass m1 = new MyClass();
m1.b();
- // :: error: (method.invocation)
+ // :: error: [method.invocation]
m1.e();
}
@@ -115,7 +115,7 @@ void testAndOr5() {
void testPrecedence1() {
MyClass m1 = new MyClass();
- // :: error: (method.invocation)
+ // :: error: [method.invocation]
m1.f();
}
@@ -123,7 +123,7 @@ void testPrecedence2() {
MyClass m1 = new MyClass();
m1.a();
- // :: error: (method.invocation)
+ // :: error: [method.invocation]
m1.f();
}
@@ -131,7 +131,7 @@ void testPrecedence3() {
MyClass m1 = new MyClass();
m1.b();
- // :: error: (method.invocation)
+ // :: error: [method.invocation]
m1.f();
}
@@ -201,23 +201,23 @@ void f(@CalledMethodsPredicate("a && b || c") MyClass this) {}
static void testAssignability1(@CalledMethodsPredicate("a || b") MyClass cAble) {
cAble.c();
- // :: error: (method.invocation)
+ // :: error: [method.invocation]
cAble.d();
- // :: error: (method.invocation)
+ // :: error: [method.invocation]
cAble.e();
- // :: error: (method.invocation)
+ // :: error: [method.invocation]
cAble.f();
}
static void testAssignability2(@CalledMethodsPredicate("a && b") MyClass dAble) {
// These calls would work if subtyping between predicates was by implication. They issue
// errors, because it is not.
- // :: error: (method.invocation)
+ // :: error: [method.invocation]
dAble.c();
dAble.d();
- // :: error: (method.invocation)
+ // :: error: [method.invocation]
dAble.e();
- // :: error: (method.invocation)
+ // :: error: [method.invocation]
dAble.f();
}
@@ -239,367 +239,367 @@ void testAllAssignability() {
cmALocal = cmA;
cmALocal = cmpA;
- // :: error: (assignment)
+ // :: error: [assignment]
cmALocal = aOrB;
cmALocal = aB;
// The next line would not fail if predicate subtyping was decided by implication.
- // :: error: (assignment)
+ // :: error: [assignment]
cmALocal = aAndB;
- // :: error: (assignment)
+ // :: error: [assignment]
cmALocal = bAndCOrA;
- // :: error: (assignment)
+ // :: error: [assignment]
cmALocal = bAndCOrAParens;
- // :: error: (assignment)
+ // :: error: [assignment]
cmALocal = aAndBOrC;
- // :: error: (assignment)
+ // :: error: [assignment]
cmALocal = aAndBOrCParens;
- // :: error: (assignment)
+ // :: error: [assignment]
cmALocal = aOrBAndC;
// The next line would not fail if predicate subtyping was decided by implication.
- // :: error: (assignment)
+ // :: error: [assignment]
cmALocal = bOrCAndA;
- // :: error: (assignment)
+ // :: error: [assignment]
cmALocal = bAndC;
- // :: error: (assignment)
+ // :: error: [assignment]
cmALocal = bAndCParens;
cmpALocal = cmA;
cmpALocal = cmpA;
- // :: error: (assignment)
+ // :: error: [assignment]
cmpALocal = aOrB;
cmpALocal = aB;
// The next line would not fail if predicate subtyping was decided by implication.
- // :: error: (assignment)
+ // :: error: [assignment]
cmpALocal = aAndB;
- // :: error: (assignment)
+ // :: error: [assignment]
cmpALocal = bAndCOrA;
- // :: error: (assignment)
+ // :: error: [assignment]
cmpALocal = bAndCOrAParens;
- // :: error: (assignment)
+ // :: error: [assignment]
cmpALocal = aAndBOrC;
- // :: error: (assignment)
+ // :: error: [assignment]
cmpALocal = aAndBOrCParens;
- // :: error: (assignment)
+ // :: error: [assignment]
cmpALocal = aOrBAndC;
// The next line would not fail if predicate subtyping was decided by implication.
- // :: error: (assignment)
+ // :: error: [assignment]
cmpALocal = bOrCAndA;
- // :: error: (assignment)
+ // :: error: [assignment]
cmpALocal = bAndC;
- // :: error: (assignment)
+ // :: error: [assignment]
cmpALocal = bAndCParens;
aOrBLocal = cmA;
// The next line would not fail if predicate subtyping was decided by implication.
- // :: error: (assignment)
+ // :: error: [assignment]
aOrBLocal = cmpA;
aOrBLocal = aOrB;
aOrBLocal = aB;
// The next line would not fail if predicate subtyping was decided by implication.
- // :: error: (assignment)
+ // :: error: [assignment]
aOrBLocal = aAndB;
// The next line would not fail if predicate subtyping was decided by implication.
- // :: error: (assignment)
+ // :: error: [assignment]
aOrBLocal = bAndCOrA;
// The next line would not fail if predicate subtyping was decided by implication.
- // :: error: (assignment)
+ // :: error: [assignment]
aOrBLocal = bAndCOrAParens;
- // :: error: (assignment)
+ // :: error: [assignment]
aOrBLocal = aAndBOrC;
- // :: error: (assignment)
+ // :: error: [assignment]
aOrBLocal = aAndBOrCParens;
// The next line would not fail if predicate subtyping was decided by implication.
- // :: error: (assignment)
+ // :: error: [assignment]
aOrBLocal = aOrBAndC;
// The next line would not fail if predicate subtyping was decided by implication.
- // :: error: (assignment)
+ // :: error: [assignment]
aOrBLocal = bOrCAndA;
// The next line would not fail if predicate subtyping was decided by implication.
- // :: error: (assignment)
+ // :: error: [assignment]
aOrBLocal = bAndC;
// The next line would not fail if predicate subtyping was decided by implication.
- // :: error: (assignment)
+ // :: error: [assignment]
aOrBLocal = bAndCParens;
- // :: error: (assignment)
+ // :: error: [assignment]
aBLocal = cmA;
- // :: error: (assignment)
+ // :: error: [assignment]
aBLocal = cmpA;
- // :: error: (assignment)
+ // :: error: [assignment]
aBLocal = aOrB;
aBLocal = aB;
aBLocal = aAndB;
- // :: error: (assignment)
+ // :: error: [assignment]
aBLocal = bAndCOrA;
- // :: error: (assignment)
+ // :: error: [assignment]
aBLocal = bAndCOrAParens;
- // :: error: (assignment)
+ // :: error: [assignment]
aBLocal = aAndBOrC;
- // :: error: (assignment)
+ // :: error: [assignment]
aBLocal = aAndBOrCParens;
- // :: error: (assignment)
+ // :: error: [assignment]
aBLocal = aOrBAndC;
- // :: error: (assignment)
+ // :: error: [assignment]
aBLocal = bOrCAndA;
- // :: error: (assignment)
+ // :: error: [assignment]
aBLocal = bAndC;
- // :: error: (assignment)
+ // :: error: [assignment]
aBLocal = bAndCParens;
- // :: error: (assignment)
+ // :: error: [assignment]
aAndBLocal = cmA;
- // :: error: (assignment)
+ // :: error: [assignment]
aAndBLocal = cmpA;
- // :: error: (assignment)
+ // :: error: [assignment]
aAndBLocal = aOrB;
aAndBLocal = aB;
aAndBLocal = aAndB;
- // :: error: (assignment)
+ // :: error: [assignment]
aAndBLocal = bAndCOrA;
- // :: error: (assignment)
+ // :: error: [assignment]
aAndBLocal = bAndCOrAParens;
- // :: error: (assignment)
+ // :: error: [assignment]
aAndBLocal = aAndBOrC;
- // :: error: (assignment)
+ // :: error: [assignment]
aAndBLocal = aAndBOrCParens;
- // :: error: (assignment)
+ // :: error: [assignment]
aAndBLocal = aOrBAndC;
- // :: error: (assignment)
+ // :: error: [assignment]
aAndBLocal = bOrCAndA;
- // :: error: (assignment)
+ // :: error: [assignment]
aAndBLocal = bAndC;
- // :: error: (assignment)
+ // :: error: [assignment]
aAndBLocal = bAndCParens;
bAndCOrALocal = cmA;
// The next line would not fail if predicate subtyping was decided by implication.
- // :: error: (assignment)
+ // :: error: [assignment]
bAndCOrALocal = cmpA;
- // :: error: (assignment)
+ // :: error: [assignment]
bAndCOrALocal = aOrB;
bAndCOrALocal = aB;
// The next line would not fail if predicate subtyping was decided by implication.
- // :: error: (assignment)
+ // :: error: [assignment]
bAndCOrALocal = aAndB;
bAndCOrALocal = bAndCOrA;
// The next line would not fail if predicate subtyping was decided by implication.
- // :: error: (assignment)
+ // :: error: [assignment]
bAndCOrALocal = bAndCOrAParens;
- // :: error: (assignment)
+ // :: error: [assignment]
bAndCOrALocal = aAndBOrC;
- // :: error: (assignment)
+ // :: error: [assignment]
bAndCOrALocal = aAndBOrCParens;
// The next line would not fail if predicate subtyping was decided by implication.
- // :: error: (assignment)
+ // :: error: [assignment]
bAndCOrALocal = aOrBAndC;
// The next line would not fail if predicate subtyping was decided by implication.
- // :: error: (assignment)
+ // :: error: [assignment]
bAndCOrALocal = bOrCAndA;
// The next line would not fail if predicate subtyping was decided by implication.
- // :: error: (assignment)
+ // :: error: [assignment]
bAndCOrALocal = bAndC;
// The next line would not fail if predicate subtyping was decided by implication.
- // :: error: (assignment)
+ // :: error: [assignment]
bAndCOrALocal = bAndCParens;
bAndCOrAParensLocal = cmA;
// The next line would not fail if predicate subtyping was decided by implication.
- // :: error: (assignment)
+ // :: error: [assignment]
bAndCOrAParensLocal = cmpA;
- // :: error: (assignment)
+ // :: error: [assignment]
bAndCOrAParensLocal = aOrB;
bAndCOrAParensLocal = aB;
// The next line would not fail if predicate subtyping was decided by implication.
- // :: error: (assignment)
+ // :: error: [assignment]
bAndCOrAParensLocal = aAndB;
// The next line would not fail if predicate subtyping was decided by implication.
- // :: error: (assignment)
+ // :: error: [assignment]
bAndCOrAParensLocal = bAndCOrA;
bAndCOrAParensLocal = bAndCOrAParens;
- // :: error: (assignment)
+ // :: error: [assignment]
bAndCOrAParensLocal = aAndBOrC;
- // :: error: (assignment)
+ // :: error: [assignment]
bAndCOrAParensLocal = aAndBOrCParens;
// The next line would not fail if predicate subtyping was decided by implication.
- // :: error: (assignment)
+ // :: error: [assignment]
bAndCOrAParensLocal = aOrBAndC;
// The next line would not fail if predicate subtyping was decided by implication.
- // :: error: (assignment)
+ // :: error: [assignment]
bAndCOrAParensLocal = bOrCAndA;
// The next line would not fail if predicate subtyping was decided by implication.
- // :: error: (assignment)
+ // :: error: [assignment]
bAndCOrAParensLocal = bAndC;
// The next line would not fail if predicate subtyping was decided by implication.
- // :: error: (assignment)
+ // :: error: [assignment]
bAndCOrAParensLocal = bAndCParens;
- // :: error: (assignment)
+ // :: error: [assignment]
aAndBOrCLocal = cmA;
- // :: error: (assignment)
+ // :: error: [assignment]
aAndBOrCLocal = cmpA;
- // :: error: (assignment)
+ // :: error: [assignment]
aAndBOrCLocal = aOrB;
aAndBOrCLocal = aB;
// The next line would not fail if predicate subtyping was decided by implication.
- // :: error: (assignment)
+ // :: error: [assignment]
aAndBOrCLocal = aAndB;
- // :: error: (assignment)
+ // :: error: [assignment]
aAndBOrCLocal = bAndCOrA;
- // :: error: (assignment)
+ // :: error: [assignment]
aAndBOrCLocal = bAndCOrAParens;
aAndBOrCLocal = aAndBOrC;
// The next line would not fail if predicate subtyping was decided by implication.
- // :: error: (assignment)
+ // :: error: [assignment]
aAndBOrCLocal = aAndBOrCParens;
// The next line would not fail if predicate subtyping was decided by implication.
- // :: error: (assignment)
+ // :: error: [assignment]
aAndBOrCLocal = aOrBAndC;
// The next line would not fail if predicate subtyping was decided by implication.
- // :: error: (assignment)
+ // :: error: [assignment]
aAndBOrCLocal = bOrCAndA;
// The next line would not fail if predicate subtyping was decided by implication.
- // :: error: (assignment)
+ // :: error: [assignment]
aAndBOrCLocal = bAndC;
// The next line would not fail if predicate subtyping was decided by implication.
- // :: error: (assignment)
+ // :: error: [assignment]
aAndBOrCLocal = bAndCParens;
- // :: error: (assignment)
+ // :: error: [assignment]
aAndBOrCParensLocal = cmA;
- // :: error: (assignment)
+ // :: error: [assignment]
aAndBOrCParensLocal = cmpA;
- // :: error: (assignment)
+ // :: error: [assignment]
aAndBOrCParensLocal = aOrB;
aAndBOrCParensLocal = aB;
// The next line would not fail if predicate subtyping was decided by implication.
- // :: error: (assignment)
+ // :: error: [assignment]
aAndBOrCParensLocal = aAndB;
- // :: error: (assignment)
+ // :: error: [assignment]
aAndBOrCParensLocal = bAndCOrA;
- // :: error: (assignment)
+ // :: error: [assignment]
aAndBOrCParensLocal = bAndCOrAParens;
// The next line would not fail if predicate subtyping was decided by implication.
- // :: error: (assignment)
+ // :: error: [assignment]
aAndBOrCParensLocal = aAndBOrC;
aAndBOrCParensLocal = aAndBOrCParens;
// The next line would not fail if predicate subtyping was decided by implication.
- // :: error: (assignment)
+ // :: error: [assignment]
aAndBOrCParensLocal = aOrBAndC;
// The next line would not fail if predicate subtyping was decided by implication.
- // :: error: (assignment)
+ // :: error: [assignment]
aAndBOrCParensLocal = bOrCAndA;
// The next line would not fail if predicate subtyping was decided by implication.
- // :: error: (assignment)
+ // :: error: [assignment]
aAndBOrCParensLocal = bAndC;
// The next line would not fail if predicate subtyping was decided by implication.
- // :: error: (assignment)
+ // :: error: [assignment]
aAndBOrCParensLocal = bAndCParens;
- // :: error: (assignment)
+ // :: error: [assignment]
aOrBAndCLocal = cmA;
- // :: error: (assignment)
+ // :: error: [assignment]
aOrBAndCLocal = cmpA;
- // :: error: (assignment)
+ // :: error: [assignment]
aOrBAndCLocal = aOrB;
- // :: error: (assignment)
+ // :: error: [assignment]
aOrBAndCLocal = aB;
- // :: error: (assignment)
+ // :: error: [assignment]
aOrBAndCLocal = aAndB;
- // :: error: (assignment)
+ // :: error: [assignment]
aOrBAndCLocal = bAndCOrA;
- // :: error: (assignment)
+ // :: error: [assignment]
aOrBAndCLocal = bAndCOrAParens;
- // :: error: (assignment)
+ // :: error: [assignment]
aOrBAndCLocal = aAndBOrC;
- // :: error: (assignment)
+ // :: error: [assignment]
aOrBAndCLocal = aAndBOrCParens;
aOrBAndCLocal = aOrBAndC;
- // :: error: (assignment)
+ // :: error: [assignment]
aOrBAndCLocal = bOrCAndA;
// The next line would not fail if predicate subtyping was decided by implication.
- // :: error: (assignment)
+ // :: error: [assignment]
aOrBAndCLocal = bAndC;
// The next line would not fail if predicate subtyping was decided by implication.
- // :: error: (assignment)
+ // :: error: [assignment]
aOrBAndCLocal = bAndCParens;
- // :: error: (assignment)
+ // :: error: [assignment]
bOrCAndALocal = cmA;
- // :: error: (assignment)
+ // :: error: [assignment]
bOrCAndALocal = cmpA;
- // :: error: (assignment)
+ // :: error: [assignment]
bOrCAndALocal = aOrB;
bOrCAndALocal = aB;
// The next line would not fail if predicate subtyping was decided by implication.
- // :: error: (assignment)
+ // :: error: [assignment]
bOrCAndALocal = aAndB;
- // :: error: (assignment)
+ // :: error: [assignment]
bOrCAndALocal = bAndCOrA;
- // :: error: (assignment)
+ // :: error: [assignment]
bOrCAndALocal = bAndCOrAParens;
- // :: error: (assignment)
+ // :: error: [assignment]
bOrCAndALocal = aAndBOrC;
- // :: error: (assignment)
+ // :: error: [assignment]
bOrCAndALocal = aAndBOrCParens;
- // :: error: (assignment)
+ // :: error: [assignment]
bOrCAndALocal = aOrBAndC;
bOrCAndALocal = bOrCAndA;
- // :: error: (assignment)
+ // :: error: [assignment]
bOrCAndALocal = bAndC;
- // :: error: (assignment)
+ // :: error: [assignment]
bOrCAndALocal = bAndCParens;
- // :: error: (assignment)
+ // :: error: [assignment]
bAndCLocal = cmA;
- // :: error: (assignment)
+ // :: error: [assignment]
bAndCLocal = cmpA;
- // :: error: (assignment)
+ // :: error: [assignment]
bAndCLocal = aOrB;
- // :: error: (assignment)
+ // :: error: [assignment]
bAndCLocal = aB;
- // :: error: (assignment)
+ // :: error: [assignment]
bAndCLocal = aAndB;
- // :: error: (assignment)
+ // :: error: [assignment]
bAndCLocal = bAndCOrA;
- // :: error: (assignment)
+ // :: error: [assignment]
bAndCLocal = bAndCOrAParens;
- // :: error: (assignment)
+ // :: error: [assignment]
bAndCLocal = aAndBOrC;
- // :: error: (assignment)
+ // :: error: [assignment]
bAndCLocal = aAndBOrCParens;
- // :: error: (assignment)
+ // :: error: [assignment]
bAndCLocal = aOrBAndC;
- // :: error: (assignment)
+ // :: error: [assignment]
bAndCLocal = bOrCAndA;
bAndCLocal = bAndC;
// The next line would not fail if predicate subtyping was decided by implication.
- // :: error: (assignment)
+ // :: error: [assignment]
bAndCLocal = bAndCParens;
- // :: error: (assignment)
+ // :: error: [assignment]
bAndCParensLocal = cmA;
- // :: error: (assignment)
+ // :: error: [assignment]
bAndCParensLocal = cmpA;
- // :: error: (assignment)
+ // :: error: [assignment]
bAndCParensLocal = aOrB;
- // :: error: (assignment)
+ // :: error: [assignment]
bAndCParensLocal = aB;
- // :: error: (assignment)
+ // :: error: [assignment]
bAndCParensLocal = aAndB;
- // :: error: (assignment)
+ // :: error: [assignment]
bAndCParensLocal = bAndCOrA;
- // :: error: (assignment)
+ // :: error: [assignment]
bAndCParensLocal = bAndCOrAParens;
- // :: error: (assignment)
+ // :: error: [assignment]
bAndCParensLocal = aAndBOrC;
- // :: error: (assignment)
+ // :: error: [assignment]
bAndCParensLocal = aAndBOrCParens;
- // :: error: (assignment)
+ // :: error: [assignment]
bAndCParensLocal = aOrBAndC;
- // :: error: (assignment)
+ // :: error: [assignment]
bAndCParensLocal = bOrCAndA;
// The next line would not fail if predicate subtyping was decided by implication.
- // :: error: (assignment)
+ // :: error: [assignment]
bAndCParensLocal = bAndC;
bAndCParensLocal = bAndCParens;
}
diff --git a/checker/tests/calledmethods/EnsuresCalledMethodsIfRepeatable.java b/checker/tests/calledmethods/EnsuresCalledMethodsIfRepeatable.java
index 10b9990b3a86..b9f1372662a9 100644
--- a/checker/tests/calledmethods/EnsuresCalledMethodsIfRepeatable.java
+++ b/checker/tests/calledmethods/EnsuresCalledMethodsIfRepeatable.java
@@ -7,7 +7,7 @@ public class EnsuresCalledMethodsIfRepeatable {
@EnsuresCalledMethodsIf(expression = "#2", result = true, methods = "close")
public boolean close2MissingFirst(Closeable r1, Closeable r2) throws IOException {
r1.close();
- // ::error: (contracts.conditional.postcondition)
+ // ::error: [contracts.conditional.postcondition]
return true;
}
@@ -15,7 +15,7 @@ public boolean close2MissingFirst(Closeable r1, Closeable r2) throws IOException
@EnsuresCalledMethodsIf(expression = "#2", result = true, methods = "close")
public boolean close2MissingSecond(Closeable r1, Closeable r2) throws IOException {
r2.close();
- // ::error: (contracts.conditional.postcondition)
+ // ::error: [contracts.conditional.postcondition]
return true;
}
@@ -39,7 +39,7 @@ public boolean close2CorrectViaCall(Closeable r1, Closeable r2) throws IOExcepti
public static class SubclassWrong extends EnsuresCalledMethodsIfRepeatable {
@Override
public boolean close2Correct(Closeable r1, Closeable r2) throws IOException {
- // ::error: (contracts.conditional.postcondition)
+ // ::error: [contracts.conditional.postcondition]
return true;
}
}
diff --git a/checker/tests/calledmethods/EnsuresCalledMethodsIfSubclass.java b/checker/tests/calledmethods/EnsuresCalledMethodsIfSubclass.java
index fff666b8c042..25aa5300baa8 100644
--- a/checker/tests/calledmethods/EnsuresCalledMethodsIfSubclass.java
+++ b/checker/tests/calledmethods/EnsuresCalledMethodsIfSubclass.java
@@ -14,7 +14,7 @@ public boolean method(Closeable x) throws IOException {
public static class SubclassWrong extends Parent {
@Override
public boolean method(Closeable x) throws IOException {
- // ::error: (contracts.conditional.postcondition)
+ // ::error: [contracts.conditional.postcondition]
return true;
}
}
diff --git a/checker/tests/calledmethods/EnsuresCalledMethodsOnExceptionRepeatable.java b/checker/tests/calledmethods/EnsuresCalledMethodsOnExceptionRepeatable.java
index 853dcedc53d1..81f7e291a517 100644
--- a/checker/tests/calledmethods/EnsuresCalledMethodsOnExceptionRepeatable.java
+++ b/checker/tests/calledmethods/EnsuresCalledMethodsOnExceptionRepeatable.java
@@ -7,14 +7,14 @@ class EnsuresCalledMethodsOnExceptionRepeatable {
@EnsuresCalledMethodsOnException(value = "#1", methods = "close")
@EnsuresCalledMethodsOnException(value = "#2", methods = "close")
- // ::error: (contracts.exceptional.postcondition)
+ // ::error: [contracts.exceptional.postcondition]
public void close2MissingFirst(Closeable r1, Closeable r2) throws IOException {
r1.close();
}
@EnsuresCalledMethodsOnException(value = "#1", methods = "close")
@EnsuresCalledMethodsOnException(value = "#2", methods = "close")
- // ::error: (contracts.exceptional.postcondition)
+ // ::error: [contracts.exceptional.postcondition]
public void close2MissingSecond(Closeable r1, Closeable r2) throws IOException {
r2.close();
}
@@ -37,7 +37,7 @@ public void close2CorrectViaCall(Closeable r1, Closeable r2) throws IOException
public static class Subclass extends EnsuresCalledMethodsOnExceptionRepeatable {
@Override
- // ::error: (contracts.exceptional.postcondition)
+ // ::error: [contracts.exceptional.postcondition]
public void close2Correct(Closeable r1, Closeable r2) throws IOException {
throw new IOException();
}
diff --git a/checker/tests/calledmethods/EnsuresCalledMethodsOnExceptionSubclass.java b/checker/tests/calledmethods/EnsuresCalledMethodsOnExceptionSubclass.java
index fddf30ca8983..54d2f682a216 100644
--- a/checker/tests/calledmethods/EnsuresCalledMethodsOnExceptionSubclass.java
+++ b/checker/tests/calledmethods/EnsuresCalledMethodsOnExceptionSubclass.java
@@ -14,7 +14,7 @@ public void method(Closeable x) throws IOException {
public static class SubclassWrong extends Parent {
@Override
- // ::error: (contracts.exceptional.postcondition)
+ // ::error: [contracts.exceptional.postcondition]
public void method(Closeable x) throws IOException {
throw new IOException();
}
diff --git a/checker/tests/calledmethods/EnsuresCalledMethodsOnExceptionTest.java b/checker/tests/calledmethods/EnsuresCalledMethodsOnExceptionTest.java
index b41db1cafccc..e3dd69f6255f 100644
--- a/checker/tests/calledmethods/EnsuresCalledMethodsOnExceptionTest.java
+++ b/checker/tests/calledmethods/EnsuresCalledMethodsOnExceptionTest.java
@@ -27,7 +27,7 @@ void noCall(Resource r) {
}
@EnsuresCalledMethodsOnException(value = "#1", methods = "a")
- // :: error: (contracts.exceptional.postcondition)
+ // :: error: [contracts.exceptional.postcondition]
void callAfterThrow(Resource r) throws Exception {
if (arbitraryChoice()) {
// Not OK: r.a() has not been called yet
@@ -62,7 +62,7 @@ void callInCatchBlock(Resource r) throws Exception {
}
@EnsuresCalledMethodsOnException(value = "#1", methods = "a")
- // :: error: (contracts.exceptional.postcondition)
+ // :: error: [contracts.exceptional.postcondition]
void callInSpecificCatchBlock(Resource r) throws Exception {
try {
if (arbitraryChoice()) {
@@ -97,7 +97,7 @@ void exploitCalledMethodsOnException(Resource r) throws Exception {
}
@EnsuresCalledMethods(value = "#1", methods = "a")
- // :: error: (contracts.postcondition)
+ // :: error: [contracts.postcondition]
void exceptionalCallsDoNotSatisfyNormalPaths(Resource r) throws Exception {
// Not OK: this call is not enough to satisfy our contract, since it only promises something
// on exceptional return.
diff --git a/checker/tests/calledmethods/EnsuresCalledMethodsRepeatable.java b/checker/tests/calledmethods/EnsuresCalledMethodsRepeatable.java
index 800ca64f6ef1..b9a4291110b9 100644
--- a/checker/tests/calledmethods/EnsuresCalledMethodsRepeatable.java
+++ b/checker/tests/calledmethods/EnsuresCalledMethodsRepeatable.java
@@ -16,14 +16,14 @@ void test(Object obj) {
@EnsuresCalledMethods(value = "#1", methods = "close")
@EnsuresCalledMethods(value = "#2", methods = "close")
- // ::error: (contracts.postcondition)
+ // ::error: [contracts.postcondition]
public void close2MissingFirst(Closeable r1, Closeable r2) throws IOException {
r1.close();
}
@EnsuresCalledMethods(value = "#1", methods = "close")
@EnsuresCalledMethods(value = "#2", methods = "close")
- // ::error: (contracts.postcondition)
+ // ::error: [contracts.postcondition]
public void close2MissingSecond(Closeable r1, Closeable r2) throws IOException {
r2.close();
}
@@ -46,7 +46,7 @@ public void close2CorrectViaCall(Closeable r1, Closeable r2) throws IOException
public static class Subclass extends EnsuresCalledMethodsRepeatable {
@Override
- // ::error: (contracts.postcondition)
+ // ::error: [contracts.postcondition]
public void close2Correct(Closeable r1, Closeable r2) throws IOException {}
}
}
diff --git a/checker/tests/calledmethods/EnsuresCalledMethodsSubclass.java b/checker/tests/calledmethods/EnsuresCalledMethodsSubclass.java
index 028ba38e4289..bca877ef3ea4 100644
--- a/checker/tests/calledmethods/EnsuresCalledMethodsSubclass.java
+++ b/checker/tests/calledmethods/EnsuresCalledMethodsSubclass.java
@@ -12,7 +12,7 @@ public void method(Closeable x) throws IOException {
public static class Subclass extends Parent {
@Override
- // ::error: (contracts.postcondition)
+ // ::error: [contracts.postcondition]
public void method(Closeable x) throws IOException {}
}
}
diff --git a/checker/tests/calledmethods/EnsuresCalledMethodsThisLub.java b/checker/tests/calledmethods/EnsuresCalledMethodsThisLub.java
index f666f946acd8..04b802b35c89 100644
--- a/checker/tests/calledmethods/EnsuresCalledMethodsThisLub.java
+++ b/checker/tests/calledmethods/EnsuresCalledMethodsThisLub.java
@@ -26,7 +26,7 @@ void test(boolean b) {
call2(this);
}
@CalledMethods("toString") Object obj1 = this;
- // :: error: (assignment)
+ // :: error: [assignment]
@CalledMethods({"toString", "equals"}) Object obj2 = this;
}
@@ -37,7 +37,7 @@ void test_arg(Object arg, boolean b) {
call2(arg);
}
@CalledMethods("toString") Object obj1 = arg;
- // :: error: (assignment)
+ // :: error: [assignment]
@CalledMethods({"toString", "equals"}) Object obj2 = arg;
}
}
diff --git a/checker/tests/calledmethods/EnsuresCalledMethodsVarargsSimple.java b/checker/tests/calledmethods/EnsuresCalledMethodsVarargsSimple.java
index 807155773b23..9706ec5661ac 100644
--- a/checker/tests/calledmethods/EnsuresCalledMethodsVarargsSimple.java
+++ b/checker/tests/calledmethods/EnsuresCalledMethodsVarargsSimple.java
@@ -7,7 +7,7 @@
class EnsuresCalledMethodsVarargsSimple {
- // :: error: (ensuresvarargs.unverified)
+ // :: error: [ensuresvarargs.unverified]
@EnsuresCalledMethodsVarargs("close")
void closeAll(Socket... sockets) {
for (Socket s : sockets) {
@@ -18,9 +18,9 @@ void closeAll(Socket... sockets) {
}
}
- // :: error: (ensuresvarargs.unverified)
+ // :: error: [ensuresvarargs.unverified]
@EnsuresCalledMethodsVarargs("close")
- // :: error: (ensuresvarargs.invalid)
+ // :: error: [ensuresvarargs.invalid]
void closeAllNotVA(List sockets) {
for (Socket s : sockets) {
try {
diff --git a/checker/tests/calledmethods/ExceptionalPath2.java b/checker/tests/calledmethods/ExceptionalPath2.java
index 795de45185aa..d24134621e8c 100644
--- a/checker/tests/calledmethods/ExceptionalPath2.java
+++ b/checker/tests/calledmethods/ExceptionalPath2.java
@@ -30,7 +30,7 @@ void test() {
// threw an IOException. We no longer know whether `r.a()`
// has been called, since `r.b()` might have overwritten `r`
// before throwing.
- // ::error: (assignment)
+ // ::error: [assignment]
@CalledMethods({"a"}) Resource x = r;
}
}
diff --git a/checker/tests/calledmethods/Not.java b/checker/tests/calledmethods/Not.java
index 73e90290707b..85bc39626e89 100644
--- a/checker/tests/calledmethods/Not.java
+++ b/checker/tests/calledmethods/Not.java
@@ -27,7 +27,7 @@ void test2(Foo f) {
void test3(Foo f) {
f.a();
- // :: error: (method.invocation)
+ // :: error: [method.invocation]
f.notA();
f.notB();
}
@@ -35,16 +35,16 @@ void test3(Foo f) {
void test4(Foo f) {
f.b();
f.notA();
- // :: error: (method.invocation)
+ // :: error: [method.invocation]
f.notB();
}
void test5(Foo f) {
f.a();
f.b();
- // :: error: (method.invocation)
+ // :: error: [method.invocation]
f.notA();
- // :: error: (method.invocation)
+ // :: error: [method.invocation]
f.notB();
}
@@ -59,7 +59,7 @@ void test6(Foo f) {
}
void test7(@CalledMethods("a") Foo f) {
- // :: error: (method.invocation)
+ // :: error: [method.invocation]
f.notA();
}
diff --git a/checker/tests/calledmethods/Postconditions.java b/checker/tests/calledmethods/Postconditions.java
index 9e917934e3a2..04db4ee1eb8b 100644
--- a/checker/tests/calledmethods/Postconditions.java
+++ b/checker/tests/calledmethods/Postconditions.java
@@ -16,7 +16,7 @@ static void callB(Postconditions x) {
}
@EnsuresCalledMethods(value = "#1", methods = "b")
- // :: error: (contracts.postcondition)
+ // :: error: [contracts.postcondition]
static void doesNotCallB(Postconditions x) {}
@EnsuresCalledMethods(
@@ -61,7 +61,7 @@ static void invokeCallBAndC() {
static void invokeCallBAndCWrong() {
Postconditions y = new Postconditions();
callBAndC(y);
- // :: error: (finalizer.invocation)
+ // :: error: [finalizer.invocation]
y.build();
}
@@ -83,7 +83,7 @@ static void testEnsuresCalledMethodsIf(Postconditions p, boolean b) {
if (ensuresABCIfTrue(p, b)) {
p.build();
} else {
- // :: error: (finalizer.invocation)
+ // :: error: [finalizer.invocation]
p.build();
}
}
diff --git a/checker/tests/calledmethods/RequiresCalledMethodsRepeatable.java b/checker/tests/calledmethods/RequiresCalledMethodsRepeatable.java
index c24e529e5d23..0f9a774767e4 100644
--- a/checker/tests/calledmethods/RequiresCalledMethodsRepeatable.java
+++ b/checker/tests/calledmethods/RequiresCalledMethodsRepeatable.java
@@ -11,7 +11,7 @@ public void requires2(Closeable r1, Closeable r2) {
}
public void requires2Wrong(Closeable r1, Closeable r2) {
- // ::error: (contracts.precondition)
+ // ::error: [contracts.precondition]
requires2(r1, r2);
}
diff --git a/checker/tests/calledmethods/RequiresCalledMethodsSubclass.java b/checker/tests/calledmethods/RequiresCalledMethodsSubclass.java
index 9b8eaabcc307..c1fb03c36ea0 100644
--- a/checker/tests/calledmethods/RequiresCalledMethodsSubclass.java
+++ b/checker/tests/calledmethods/RequiresCalledMethodsSubclass.java
@@ -8,7 +8,7 @@ public static class Parent {
public void method(Closeable x) throws IOException {}
public void caller(Closeable x) throws IOException {
- // ::error: (contracts.precondition)
+ // ::error: [contracts.precondition]
method(x);
}
}
diff --git a/checker/tests/calledmethods/RequiresCalledMethodsTest.java b/checker/tests/calledmethods/RequiresCalledMethodsTest.java
index 2d83efdf198d..25e5cb63ed88 100644
--- a/checker/tests/calledmethods/RequiresCalledMethodsTest.java
+++ b/checker/tests/calledmethods/RequiresCalledMethodsTest.java
@@ -16,7 +16,7 @@ void test_ok() {
void test_bad() {
// foo.toString();
- // :: error: (contracts.precondition)
+ // :: error: [contracts.precondition]
afterFooToString();
}
}
diff --git a/checker/tests/calledmethods/SimpleFluentInference.java b/checker/tests/calledmethods/SimpleFluentInference.java
index 48af4cf614f5..3b83bc1321c7 100644
--- a/checker/tests/calledmethods/SimpleFluentInference.java
+++ b/checker/tests/calledmethods/SimpleFluentInference.java
@@ -32,7 +32,7 @@ static void doStuffWrong() {
SimpleFluentInference s =
new SimpleFluentInference()
.a()
- // :: error: (finalizer.invocation)
+ // :: error: [finalizer.invocation]
.build();
}
@@ -46,7 +46,7 @@ static void noReturnsReceiverAnno() {
.a()
.b()
.c()
- // :: error: (finalizer.invocation)
+ // :: error: [finalizer.invocation]
.build();
}
@@ -54,7 +54,7 @@ static void fluentLoop() {
SimpleFluentInference s = new SimpleFluentInference().a();
int i = 10;
while (i > 0) {
- // :: error: (finalizer.invocation)
+ // :: error: [finalizer.invocation]
s.b().build();
i--;
s = new SimpleFluentInference();
diff --git a/checker/tests/calledmethods/SimpleInference.java b/checker/tests/calledmethods/SimpleInference.java
index 13611a9af6a9..765015ad2824 100644
--- a/checker/tests/calledmethods/SimpleInference.java
+++ b/checker/tests/calledmethods/SimpleInference.java
@@ -14,7 +14,7 @@ static void doStuffCorrect() {
static void doStuffWrong() {
SimpleInference s = new SimpleInference();
- // :: error: (finalizer.invocation)
+ // :: error: [finalizer.invocation]
s.build();
}
}
diff --git a/checker/tests/calledmethods/SimpleInferenceMerge.java b/checker/tests/calledmethods/SimpleInferenceMerge.java
index e6d00c23ac61..aa73d626f253 100644
--- a/checker/tests/calledmethods/SimpleInferenceMerge.java
+++ b/checker/tests/calledmethods/SimpleInferenceMerge.java
@@ -32,7 +32,7 @@ static void doStuffWrongMerge(boolean b) {
s.b();
s.c();
}
- // :: error: (finalizer.invocation)
+ // :: error: [finalizer.invocation]
s.build();
}
}
diff --git a/checker/tests/calledmethods/Subtyping.java b/checker/tests/calledmethods/Subtyping.java
index 4afbf6417e02..8d54ed62e727 100644
--- a/checker/tests/calledmethods/Subtyping.java
+++ b/checker/tests/calledmethods/Subtyping.java
@@ -19,7 +19,7 @@ public class Subtyping {
}
@CalledMethods({"a"}) Object a_top(@CalledMethods({}) Object o) {
- // :: error: (return)
+ // :: error: [return]
return o;
}
@@ -36,12 +36,12 @@ public class Subtyping {
}
@CalledMethods({"a", "b"}) Object ab_top(@CalledMethods({}) Object o) {
- // :: error: (return)
+ // :: error: [return]
return o;
}
@CalledMethods({"a", "b"}) Object ab_a(@CalledMethods({"a"}) Object o) {
- // :: error: (return)
+ // :: error: [return]
return o;
}
@@ -54,17 +54,17 @@ public class Subtyping {
}
@CalledMethodsBottom Object bot_top(@CalledMethods({}) Object o) {
- // :: error: (return)
+ // :: error: [return]
return o;
}
@CalledMethodsBottom Object bot_a(@CalledMethods({"a"}) Object o) {
- // :: error: (return)
+ // :: error: [return]
return o;
}
@CalledMethodsBottom Object bot_ab(@CalledMethods({"a", "b"}) Object o) {
- // :: error: (return)
+ // :: error: [return]
return o;
}
diff --git a/checker/tests/calledmethods/UnparsablePredicate.java b/checker/tests/calledmethods/UnparsablePredicate.java
index f97c2f5b0724..e968d5254bb6 100644
--- a/checker/tests/calledmethods/UnparsablePredicate.java
+++ b/checker/tests/calledmethods/UnparsablePredicate.java
@@ -2,16 +2,16 @@
public class UnparsablePredicate {
- // :: error: (predicate)
+ // :: error: [predicate]
void unclosedOpen(@CalledMethodsPredicate("(foo && bar") Object x) {}
- // :: error: (predicate)
+ // :: error: [predicate]
void unopenedClose(@CalledMethodsPredicate("foo || bar)") Object x) {}
- // :: error: (predicate)
+ // :: error: [predicate]
void badKeywords1(@CalledMethodsPredicate("foo OR bar") Object x) {}
- // :: error: (predicate)
+ // :: error: [predicate]
void badKeywords2(@CalledMethodsPredicate("foo AND bar") Object x) {}
// These tests check that valid Java identifiers don't cause problems
diff --git a/checker/tests/calledmethods/Xor.java b/checker/tests/calledmethods/Xor.java
index fd68559fa482..06693bd04e23 100644
--- a/checker/tests/calledmethods/Xor.java
+++ b/checker/tests/calledmethods/Xor.java
@@ -15,13 +15,13 @@ void aXorB(@CalledMethodsPredicate("(a || b) && !(a && b)") Foo this) {}
}
void test1(Foo f) {
- // :: error: (method.invocation)
+ // :: error: [method.invocation]
f.aXorB();
}
void test2(Foo f) {
f.c();
- // :: error: (method.invocation)
+ // :: error: [method.invocation]
f.aXorB();
}
@@ -38,7 +38,7 @@ void test4(Foo f) {
void test5(Foo f) {
f.a();
f.b();
- // :: error: (method.invocation)
+ // :: error: [method.invocation]
f.aXorB();
}
@@ -60,7 +60,7 @@ void test7(@CalledMethods("a") Foo f) {
void test8(Foo f) {
callA(f);
// THIS IS AN UNAVOIDABLE FALSE POSITIVE
- // :: error: (method.invocation)
+ // :: error: [method.invocation]
f.aXorB();
}
}
diff --git a/checker/tests/command-line/issue618/TwoCheckers.java b/checker/tests/command-line/issue618/TwoCheckers.java
index bdbdc4da0b00..07dd1ba5e63c 100644
--- a/checker/tests/command-line/issue618/TwoCheckers.java
+++ b/checker/tests/command-line/issue618/TwoCheckers.java
@@ -24,7 +24,7 @@
public class TwoCheckers {
void client(String a) {
- // :: error: (argument)
+ // :: error: [argument]
requiresUntainted(a);
}
diff --git a/checker/tests/disbaruse-records/DisbarredClass.java b/checker/tests/disbaruse-records/DisbarredClass.java
index 255084d17f6a..5c00fc053349 100644
--- a/checker/tests/disbaruse-records/DisbarredClass.java
+++ b/checker/tests/disbaruse-records/DisbarredClass.java
@@ -13,9 +13,9 @@ class DisbarredClass {
DisbarredClass(@DisbarUse Integer param) {}
DisbarredClass(@DisbarUse Long param) {
- // :: error: (disbar.use)
+ // :: error: [disbar.use]
param = 7L;
- // :: error: (disbar.use)
+ // :: error: [disbar.use]
param.toString();
}
@@ -23,13 +23,13 @@ class DisbarredClass {
void disbarredMethod() {}
void invalid() {
- // :: error: (disbar.use)
+ // :: error: [disbar.use]
disbarredMethod();
- // :: error: (disbar.use)
+ // :: error: [disbar.use]
new DisbarredClass("");
- // :: error: (disbar.use)
+ // :: error: [disbar.use]
barred = "";
- // :: error: (disbar.use)
+ // :: error: [disbar.use]
int x = barred.length();
}
diff --git a/checker/tests/disbaruse-records/DisbarredRecord.java b/checker/tests/disbaruse-records/DisbarredRecord.java
index 34c9cdae464e..26a6c981f7c1 100644
--- a/checker/tests/disbaruse-records/DisbarredRecord.java
+++ b/checker/tests/disbaruse-records/DisbarredRecord.java
@@ -3,14 +3,14 @@
record DisbarredRecord(@DisbarUse String barred, String fine) {
DisbarredRecord {
- // :: error: (disbar.use)
+ // :: error: [disbar.use]
int x = barred.length();
}
void invalid() {
- // :: error: (disbar.use)
+ // :: error: [disbar.use]
barred();
- // :: error: (disbar.use)
+ // :: error: [disbar.use]
int x = barred.length();
}
diff --git a/checker/tests/disbaruse-records/DisbarredRecordByStubs.java b/checker/tests/disbaruse-records/DisbarredRecordByStubs.java
index 13730e728f12..e463a87b8dd5 100644
--- a/checker/tests/disbaruse-records/DisbarredRecordByStubs.java
+++ b/checker/tests/disbaruse-records/DisbarredRecordByStubs.java
@@ -1,14 +1,14 @@
record DisbarredRecordByStubs(String barred, String fine) {
DisbarredRecordByStubs {
- // :: error: (disbar.use)
+ // :: error: [disbar.use]
int x = barred.length();
}
void invalid() {
- // :: error: (disbar.use)
+ // :: error: [disbar.use]
barred();
- // :: error: (disbar.use)
+ // :: error: [disbar.use]
int x = barred.length();
}
diff --git a/checker/tests/disbaruse-records/DisbarredRecordByStubs2.java b/checker/tests/disbaruse-records/DisbarredRecordByStubs2.java
index 8df03d950aaf..a332656310a3 100644
--- a/checker/tests/disbaruse-records/DisbarredRecordByStubs2.java
+++ b/checker/tests/disbaruse-records/DisbarredRecordByStubs2.java
@@ -3,15 +3,15 @@ record DisbarredRecordByStubs2(String barred, String fine) {
// Annotation isn't copied to explicitly declared constructor parameters:
DisbarredRecordByStubs2(String barred, String fine) {
int x = barred.length();
- // :: error: (disbar.use)
+ // :: error: [disbar.use]
this.barred = "";
this.fine = fine;
}
void invalid() {
- // :: error: (disbar.use)
+ // :: error: [disbar.use]
barred();
- // :: error: (disbar.use)
+ // :: error: [disbar.use]
int x = barred.length();
}
diff --git a/checker/tests/fenum/CastsFenum.java b/checker/tests/fenum/CastsFenum.java
index f76adffc0d9d..a4cbf1c7ab68 100644
--- a/checker/tests/fenum/CastsFenum.java
+++ b/checker/tests/fenum/CastsFenum.java
@@ -5,7 +5,7 @@ public class CastsFenum {
void m(Object p, @Fenum("A") Object a) {
fa = (Object) a;
- // :: error: (assignment)
+ // :: error: [assignment]
fa = (Object) p;
// TODO: How can we test the behavior for
diff --git a/checker/tests/fenum/CatchFenumUnqualified.java b/checker/tests/fenum/CatchFenumUnqualified.java
index d447abac7d4d..9999dfe02df6 100644
--- a/checker/tests/fenum/CatchFenumUnqualified.java
+++ b/checker/tests/fenum/CatchFenumUnqualified.java
@@ -4,12 +4,12 @@ public class CatchFenumUnqualified {
void method() {
try {
} catch (
- // :: error: (exception.parameter)
+ // :: error: [exception.parameter]
@Fenum("A") RuntimeException e) {
}
try {
- // :: error: (exception.parameter)
+ // :: error: [exception.parameter]
} catch (@Fenum("A") NullPointerException | @Fenum("A") ArrayIndexOutOfBoundsException e) {
}
diff --git a/checker/tests/fenum/TestFlow.java b/checker/tests/fenum/TestFlow.java
index 317e60f7767f..6e919ec2d19d 100644
--- a/checker/tests/fenum/TestFlow.java
+++ b/checker/tests/fenum/TestFlow.java
@@ -12,22 +12,22 @@ class FenumUser {
@Fenum("A") Object state1 = new TestFlow().ACONST1;
void foo(TestFlow t) {
- // :: error: (method.invocation)
+ // :: error: [method.invocation]
state1.hashCode();
state1 = null;
state1.hashCode();
m();
- // :: error: (method.invocation)
+ // :: error: [method.invocation]
state1.hashCode();
Object o = new Object();
o = t.ACONST1;
methodA(o);
- // :: error: (argument)
+ // :: error: [argument]
methodB(o);
o = t.BCONST1;
- // :: error: (argument)
+ // :: error: [argument]
methodA(o);
methodB(o);
}
diff --git a/checker/tests/fenum/TestInstance.java b/checker/tests/fenum/TestInstance.java
index e8207678e1e5..e7b318627b9b 100644
--- a/checker/tests/fenum/TestInstance.java
+++ b/checker/tests/fenum/TestInstance.java
@@ -14,22 +14,22 @@ public class TestInstance {
class FenumUserTestInstance {
@Fenum("A") Object state1 = new TestInstance().ACONST1;
- // :: error: (assignment)
+ // :: error: [assignment]
@Fenum("B") Object state2 = new TestInstance().ACONST1;
void foo(TestInstance t) {
- // :: error: (assignment)
+ // :: error: [assignment]
state1 = new Object();
state1 = t.ACONST2;
state1 = t.ACONST3;
- // :: error: (assignment)
+ // :: error: [assignment]
state1 = t.BCONST1;
- // :: error: (method.invocation)
+ // :: error: [method.invocation]
state1.hashCode();
- // :: error: (method.invocation)
+ // :: error: [method.invocation]
t.ACONST1.hashCode();
// sanity check: unqualified instantiation and call work.
@@ -38,7 +38,7 @@ void foo(TestInstance t) {
if (t.ACONST1 == t.ACONST2) {}
- // :: error: (binary)
+ // :: error: [binary]
if (t.ACONST1 == t.BCONST2) {}
}
}
diff --git a/checker/tests/fenum/TestPrimitive.java b/checker/tests/fenum/TestPrimitive.java
index 2667d40aac6d..9a438f1b7a70 100644
--- a/checker/tests/fenum/TestPrimitive.java
+++ b/checker/tests/fenum/TestPrimitive.java
@@ -16,31 +16,31 @@ class FenumUserTestPrimitive {
@Fenum("A") int state3 = this.state1;
- // :: error: (assignment)
+ // :: error: [assignment]
@Fenum("B") int state2 = new TestPrimitive().ACONST1;
void foo(TestPrimitive t) {
- // :: error: (assignment)
+ // :: error: [assignment]
state1 = 4;
state1 = t.ACONST2;
state1 = t.ACONST3;
- // :: error: (assignment)
+ // :: error: [assignment]
state1 = t.BCONST1;
if (t.ACONST1 < t.ACONST2) {
// ok
}
- // :: error: (binary)
+ // :: error: [binary]
if (t.ACONST1 < t.BCONST2) {}
- // :: error: (binary)
+ // :: error: [binary]
if (t.ACONST1 == t.BCONST2) {}
- // :: error: (binary)
+ // :: error: [binary]
if (t.ACONST1 < 5) {}
- // :: error: (binary)
+ // :: error: [binary]
if (t.ACONST1 == 5) {}
}
}
diff --git a/checker/tests/fenum/TestStatic.java b/checker/tests/fenum/TestStatic.java
index 5e21ccf66701..9a4f21bd8e2d 100644
--- a/checker/tests/fenum/TestStatic.java
+++ b/checker/tests/fenum/TestStatic.java
@@ -14,13 +14,13 @@ public class TestStatic {
class FenumUserTestStatic {
@Fenum("A") int state1 = TestStatic.ACONST1;
- // :: error: (assignment)
+ // :: error: [assignment]
@Fenum("B") int state2 = TestStatic.ACONST1;
void bar(@Fenum("A") int p) {}
void foo() {
- // :: error: (assignment)
+ // :: error: [assignment]
state1 = 4;
state1 = TestStatic.ACONST2;
@@ -28,13 +28,13 @@ void foo() {
state2 = TestStatic.BCONST3;
- // :: error: (assignment)
+ // :: error: [assignment]
state1 = TestStatic.BCONST1;
- // :: error: (argument)
+ // :: error: [argument]
bar(5);
bar(TestStatic.ACONST1);
- // :: error: (argument)
+ // :: error: [argument]
bar(TestStatic.BCONST1);
}
@@ -47,7 +47,7 @@ void ignoreAll() {
@SuppressWarnings("fenum:assignment")
void ignoreOne() {
state1 = 4;
- // :: error: (argument)
+ // :: error: [argument]
bar(5);
}
}
diff --git a/checker/tests/fenum/TestSwitch.java b/checker/tests/fenum/TestSwitch.java
index fd0e108d6e7c..348cc68ca47a 100644
--- a/checker/tests/fenum/TestSwitch.java
+++ b/checker/tests/fenum/TestSwitch.java
@@ -11,7 +11,7 @@ void m() {
int plain = 9; // FenumUnqualified
switch (plain) {
- // :: error: (type.incompatible)
+ // :: error: [type.incompatible]
case annotated:
default:
}
@@ -24,7 +24,7 @@ void m() {
}
switch (annotated) {
- // :: error: (type.incompatible)
+ // :: error: [type.incompatible]
case 45:
default:
}
diff --git a/checker/tests/fenum/UpperBoundsInByteCode.java b/checker/tests/fenum/UpperBoundsInByteCode.java
index 07dab0eccbf7..6bf1dff2ba7f 100644
--- a/checker/tests/fenum/UpperBoundsInByteCode.java
+++ b/checker/tests/fenum/UpperBoundsInByteCode.java
@@ -6,7 +6,7 @@ public class UpperBoundsInByteCode {
UncheckedByteCode<@Fenum("Bar") Object> bar;
void typeVarWithNonObjectUpperBound(@Fenum("A") int a) {
- // :: error: (type.arguments.not.inferred)
+ // :: error: [type.arguments.not.inferred]
UncheckedByteCode.methodWithTypeVarBoundedByNumber(a);
UncheckedByteCode.methodWithTypeVarBoundedByNumber(1);
}
@@ -14,11 +14,11 @@ void typeVarWithNonObjectUpperBound(@Fenum("A") int a) {
void wildcardsInByteCode() {
UncheckedByteCode.unboundedWildcardParam(foo);
UncheckedByteCode.lowerboundedWildcardParam(bar);
- // :: error: (argument)
+ // :: error: [argument]
UncheckedByteCode.upperboundedWildcardParam(foo);
}
- // :: error: (type.argument)
+ // :: error: [type.argument]
SourceCode<@Fenum("Foo") String> foo2;
class SourceCode {}
diff --git a/checker/tests/fenumswing/FlowBreak.java b/checker/tests/fenumswing/FlowBreak.java
index 3c6e67bbf7c8..9bdb8e7dc3bf 100644
--- a/checker/tests/fenumswing/FlowBreak.java
+++ b/checker/tests/fenumswing/FlowBreak.java
@@ -32,7 +32,7 @@ public class FlowBreak {
// 2. The normal end of the loop body [@SwingHorizontalOrientation]
// 3. The path from the break to here [@SwingVerticalOrientation]
// Currently, the third path is ignored and we do not get this error message.
- // :: error: (return)
+ // :: error: [return]
return o;
}
}
diff --git a/checker/tests/fenumswing/IdentityArrayListTest.java b/checker/tests/fenumswing/IdentityArrayListTest.java
index 226bb0973a0d..1687755ec464 100644
--- a/checker/tests/fenumswing/IdentityArrayListTest.java
+++ b/checker/tests/fenumswing/IdentityArrayListTest.java
@@ -12,14 +12,14 @@ public class IdentityArrayListTest {
@SuppressWarnings("argument")
public T[] toArray(T[] a) {
// Warnings only with -Alint=cast:strict.
- // TODO:: warning: (cast.unsafe)
+ // TODO:: warning: [cast.unsafe]
// :: warning: [unchecked] unchecked cast
return (T[]) Arrays.copyOf(null, 0, a.getClass());
}
public T[] toArray2(T[] a) {
wc(null, 0, new java.util.LinkedList());
- // TODO:: warning: (cast.unsafe)
+ // TODO:: warning: [cast.unsafe]
// :: warning: [unchecked] unchecked cast
return (T[]) myCopyOf(null, 0, a.getClass());
}
diff --git a/checker/tests/fenumswing/PolyTest.java b/checker/tests/fenumswing/PolyTest.java
index e0b1b32626d8..fe82fde2c71e 100644
--- a/checker/tests/fenumswing/PolyTest.java
+++ b/checker/tests/fenumswing/PolyTest.java
@@ -12,7 +12,7 @@ public class PolyTest {
@FenumBottom String bot) {
// Test lub with poly and a qualifier that isn't top or bottom.
String y = flag ? a : x;
- // :: error: (assignment)
+ // :: error: [assignment]
@PolyFenum String y2 = flag ? a : x;
// Test lub with poly and bottom.
diff --git a/checker/tests/fenumswing/SwingTest.java b/checker/tests/fenumswing/SwingTest.java
index 94fb270a448e..bcf810a65725 100644
--- a/checker/tests/fenumswing/SwingTest.java
+++ b/checker/tests/fenumswing/SwingTest.java
@@ -17,10 +17,10 @@ public static void main(String[] args) {
// ok
m(BOTTOM);
- // :: error: (argument)
+ // :: error: [argument]
m(5);
- // :: error: (argument)
+ // :: error: [argument]
m(NORTH);
}
@@ -35,7 +35,7 @@ static void ignoreAll() {
static void ignoreOne() {
m(NORTH);
- // :: error: (assignment)
+ // :: error: [assignment]
@SwingVerticalOrientation int b = 5;
}
@@ -55,7 +55,7 @@ void testNull() {
}
@SwingVerticalOrientation int testInference0() {
- // :: error: (assignment)
+ // :: error: [assignment]
@SwingVerticalOrientation int boxint = 5;
int box = boxint;
return box;
@@ -72,7 +72,7 @@ Object testInference1() {
}
@SwingVerticalOrientation Object testInference3() {
- // :: error: (assignment)
+ // :: error: [assignment]
@SwingVerticalOrientation Object boxobj = new Object();
Object obox = boxobj;
return obox;
@@ -156,15 +156,15 @@ void testInference8() {
}
void testInference8b() {
- // :: error: (assignment)
+ // :: error: [assignment]
@SwingHorizontalOrientation int s2 = 5;
- // :: error: (compound.assignment)
+ // :: error: [compound.assignment]
s2 += 1;
- // :: error: (assignment)
+ // :: error: [assignment]
s1 = (s2 += s2);
- // :: error: (assignment)
+ // :: error: [assignment]
@SwingHorizontalOrientation String str = "abc";
// yes, somebody in the Swing API really wrote this.
str += null;
@@ -183,7 +183,7 @@ Object testInference9() {
break;
}
}
- // :: error: (return)
+ // :: error: [return]
return o;
}
@@ -212,7 +212,7 @@ Object testInference9() {
break;
}
}
- // :: error: (return)
+ // :: error: [return]
return o;
}
@@ -227,7 +227,7 @@ Object testInference9() {
break;
}
}
- // :: error: (return)
+ // :: error: [return]
return o;
}
@@ -260,7 +260,7 @@ int testInferenceThrow() {
@SwingVerticalOrientation Object testDefaulting0() {
@org.checkerframework.framework.qual.DefaultQualifier(SwingVerticalOrientation.class)
- // :: error: (assignment)
+ // :: error: [assignment]
Object o = new String();
return o;
}
diff --git a/checker/tests/formatter-unchecked-defaults/TestUncheckedByteCode.java b/checker/tests/formatter-unchecked-defaults/TestUncheckedByteCode.java
index 1b84161a311e..4435bc18de3f 100644
--- a/checker/tests/formatter-unchecked-defaults/TestUncheckedByteCode.java
+++ b/checker/tests/formatter-unchecked-defaults/TestUncheckedByteCode.java
@@ -10,9 +10,9 @@ void test(UncheckedByteCode