Rename FlowExpression to JavaExpression in tests

smillst · web-flow · commit f8ef3aeb9472 · 2024-06-04T20:53:17.000-07:00
diff --git a/checker/tests/lock/JavaExpressionsTest.java b/checker/tests/lock/JavaExpressionsTest.java
@@ -1,14 +1,14 @@
 import org.checkerframework.checker.lock.qual.*;
 import org.checkerframework.dataflow.qual.Pure;
 
-public class FlowExpressionsTest {
+public class JavaExpressionsTest {
   class MyClass {
     public Object field;
   }
 
   private final @GuardedBy({"<self>"}) MyClass m;
 
-  FlowExpressionsTest() {
+  JavaExpressionsTest() {
     m = new MyClass();
   }
 
diff --git a/checker/tests/nullness/JavaExpressionParsingBug.java b/checker/tests/nullness/JavaExpressionParsingBug.java
@@ -2,7 +2,7 @@
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.checkerframework.checker.nullness.qual.RequiresNonNull;
 
-public abstract class FlowExpressionParsingBug {
+public abstract class JavaExpressionParsingBug {
 
   //// Check that JavaExpressions with explicit and implicit 'this' work
 
@@ -18,7 +18,7 @@ public void addFavorite1() {}
 
   static @Nullable String i = null;
 
-  @RequiresNonNull("FlowExpressionParsingBug.i")
+  @RequiresNonNull("JavaExpressionParsingBug.i")
   public void a() {}
 
   @RequiresNonNull("i")
@@ -30,7 +30,7 @@ public void c() {}
   void test1() {
     // :: error: (contracts.precondition)
     a();
-    FlowExpressionParsingBug.i = "";
+    JavaExpressionParsingBug.i = "";
     a();
   }
 
@@ -51,7 +51,7 @@ void test1c() {
   void test2() {
     // :: error: (contracts.precondition)
     b();
-    FlowExpressionParsingBug.i = "";
+    JavaExpressionParsingBug.i = "";
     b();
   }
 
@@ -72,7 +72,7 @@ void test2c() {
   void test3() {
     // :: error: (contracts.precondition)
     c();
-    FlowExpressionParsingBug.i = "";
+    JavaExpressionParsingBug.i = "";
     c();
   }
 
diff --git a/framework/src/test/java/org/checkerframework/framework/test/junit/JavaExpressionCheckerTest.java b/framework/src/test/java/org/checkerframework/framework/test/junit/JavaExpressionCheckerTest.java
@@ -3,20 +3,20 @@
 import java.io.File;
 import java.util.List;
 import org.checkerframework.framework.test.CheckerFrameworkPerDirectoryTest;
-import org.checkerframework.framework.testchecker.flowexpression.FlowExpressionChecker;
+import org.checkerframework.framework.testchecker.javaexpression.JavaExpressionChecker;
 import org.junit.runners.Parameterized.Parameters;
 
-public class FlowExpressionCheckerTest extends CheckerFrameworkPerDirectoryTest {
+public class JavaExpressionCheckerTest extends CheckerFrameworkPerDirectoryTest {
 
   /**
    * @param testFiles the files containing test code, which will be type-checked
    */
-  public FlowExpressionCheckerTest(List<File> testFiles) {
-    super(testFiles, FlowExpressionChecker.class, "flowexpression");
+  public JavaExpressionCheckerTest(List<File> testFiles) {
+    super(testFiles, JavaExpressionChecker.class, "javaexpression");
   }
 
   @Parameters
   public static String[] getTestDirs() {
-    return new String[] {"flowexpression", "all-systems"};
+    return new String[] {"javaexpression", "all-systems"};
   }
 }
diff --git a/framework/src/test/java/org/checkerframework/framework/testchecker/flowexpression/FlowExpressionChecker.java b/framework/src/test/java/org/checkerframework/framework/testchecker/flowexpression/FlowExpressionChecker.java
diff --git a/framework/src/test/java/org/checkerframework/framework/testchecker/javaexpression/JavaExpressionAnnotatedTypeFactory.java b/framework/src/test/java/org/checkerframework/framework/testchecker/javaexpression/JavaExpressionAnnotatedTypeFactory.java
@@ -1,4 +1,4 @@
-package org.checkerframework.framework.testchecker.flowexpression;
+package org.checkerframework.framework.testchecker.javaexpression;
 
 import java.lang.annotation.Annotation;
 import java.util.List;
@@ -8,29 +8,29 @@
 import javax.lang.model.util.Elements;
 import org.checkerframework.common.basetype.BaseAnnotatedTypeFactory;
 import org.checkerframework.common.basetype.BaseTypeChecker;
-import org.checkerframework.framework.testchecker.flowexpression.qual.FEBottom;
-import org.checkerframework.framework.testchecker.flowexpression.qual.FETop;
-import org.checkerframework.framework.testchecker.flowexpression.qual.FlowExp;
+import org.checkerframework.framework.testchecker.javaexpression.qual.FEBottom;
+import org.checkerframework.framework.testchecker.javaexpression.qual.FETop;
+import org.checkerframework.framework.testchecker.javaexpression.qual.FlowExp;
 import org.checkerframework.framework.type.MostlyNoElementQualifierHierarchy;
 import org.checkerframework.framework.util.QualifierKind;
 import org.checkerframework.framework.util.dependenttypes.DependentTypesHelper;
 import org.checkerframework.javacutil.AnnotationBuilder;
 import org.checkerframework.javacutil.AnnotationUtils;
 import org.checkerframework.javacutil.TreeUtils;
 
-public class FlowExpressionAnnotatedTypeFactory extends BaseAnnotatedTypeFactory {
+public class JavaExpressionAnnotatedTypeFactory extends BaseAnnotatedTypeFactory {
   private AnnotationMirror TOP, BOTTOM;
 
   /** The FlowExp.value field/element. */
   ExecutableElement flowExpValueElement =
       TreeUtils.getMethod(FlowExp.class, "value", 0, processingEnv);
 
   /**
-   * Creates a new FlowExpressionAnnotatedTypeFactory.
+   * Creates a new JavaExpressionAnnotatedTypeFactory.
    *
    * @param checker the checker
    */
-  public FlowExpressionAnnotatedTypeFactory(BaseTypeChecker checker) {
+  public JavaExpressionAnnotatedTypeFactory(BaseTypeChecker checker) {
     super(checker);
     TOP = AnnotationBuilder.fromClass(elements, FETop.class);
     BOTTOM = AnnotationBuilder.fromClass(elements, FEBottom.class);
@@ -43,21 +43,21 @@ protected DependentTypesHelper createDependentTypesHelper() {
   }
 
   @Override
-  protected FlowExpressionQualifierHierarchy createQualifierHierarchy() {
-    return new FlowExpressionQualifierHierarchy(this.getSupportedTypeQualifiers(), elements);
+  protected JavaExpressionQualifierHierarchy createQualifierHierarchy() {
+    return new JavaExpressionQualifierHierarchy(this.getSupportedTypeQualifiers(), elements);
   }
 
-  private class FlowExpressionQualifierHierarchy extends MostlyNoElementQualifierHierarchy {
+  private class JavaExpressionQualifierHierarchy extends MostlyNoElementQualifierHierarchy {
 
     /**
-     * Create a {@code FlowExpressionQualifierHierarchy}.
+     * Create a {@code JavaExpressionQualifierHierarchy}.
      *
      * @param qualifierClasses classes of annotations that are the qualifiers
      * @param elements element utils
      */
-    public FlowExpressionQualifierHierarchy(
+    public JavaExpressionQualifierHierarchy(
         Set<Class<? extends Annotation>> qualifierClasses, Elements elements) {
-      super(qualifierClasses, elements, FlowExpressionAnnotatedTypeFactory.this);
+      super(qualifierClasses, elements, JavaExpressionAnnotatedTypeFactory.this);
     }
 
     @Override
diff --git a/framework/src/test/java/org/checkerframework/framework/testchecker/javaexpression/JavaExpressionChecker.java b/framework/src/test/java/org/checkerframework/framework/testchecker/javaexpression/JavaExpressionChecker.java
@@ -0,0 +1,5 @@
+package org.checkerframework.framework.testchecker.javaexpression;
+
+import org.checkerframework.common.basetype.BaseTypeChecker;
+
+public class JavaExpressionChecker extends BaseTypeChecker {}
diff --git a/framework/src/test/java/org/checkerframework/framework/testchecker/javaexpression/qual/FEBottom.java b/framework/src/test/java/org/checkerframework/framework/testchecker/javaexpression/qual/FEBottom.java
@@ -1,4 +1,4 @@
-package org.checkerframework.framework.testchecker.flowexpression.qual;
+package org.checkerframework.framework.testchecker.javaexpression.qual;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Target;
diff --git a/framework/src/test/java/org/checkerframework/framework/testchecker/javaexpression/qual/FETop.java b/framework/src/test/java/org/checkerframework/framework/testchecker/javaexpression/qual/FETop.java
@@ -1,4 +1,4 @@
-package org.checkerframework.framework.testchecker.flowexpression.qual;
+package org.checkerframework.framework.testchecker.javaexpression.qual;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Target;
diff --git a/framework/src/test/java/org/checkerframework/framework/testchecker/javaexpression/qual/FlowExp.java b/framework/src/test/java/org/checkerframework/framework/testchecker/javaexpression/qual/FlowExp.java
@@ -1,4 +1,4 @@
-package org.checkerframework.framework.testchecker.flowexpression.qual;
+package org.checkerframework.framework.testchecker.javaexpression.qual;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Target;
diff --git a/framework/tests/flow/javaexpression-scope/Class1.java b/framework/tests/flow/javaexpression-scope/Class1.java
diff --git a/framework/tests/flow/javaexpression-scope/Class2.java b/framework/tests/flow/javaexpression-scope/Class2.java
diff --git a/framework/tests/flow/javaexpression-scope/Issue862.java b/framework/tests/flow/javaexpression-scope/Issue862.java
diff --git a/framework/tests/javaexpression/ArrayCreationParsing.java b/framework/tests/javaexpression/ArrayCreationParsing.java
@@ -1,6 +1,6 @@
-package flowexpression;
+package javaexpression;
 
-import org.checkerframework.framework.testchecker.flowexpression.qual.FlowExp;
+import org.checkerframework.framework.testchecker.javaexpression.qual.FlowExp;
 
 public class ArrayCreationParsing {
   @FlowExp("new int[2]") Object value1;
diff --git a/framework/tests/javaexpression/BinaryOperations.java b/framework/tests/javaexpression/BinaryOperations.java
@@ -1,6 +1,6 @@
-package flowexpression;
+package javaexpression;
 
-import org.checkerframework.framework.testchecker.flowexpression.qual.FlowExp;
+import org.checkerframework.framework.testchecker.javaexpression.qual.FlowExp;
 
 public class BinaryOperations {
 
diff --git a/framework/tests/javaexpression/Canonicalization.java b/framework/tests/javaexpression/Canonicalization.java
@@ -1,4 +1,4 @@
-import org.checkerframework.framework.testchecker.flowexpression.qual.FlowExp;
+import org.checkerframework.framework.testchecker.javaexpression.qual.FlowExp;
 
 public class Canonicalization {
 
diff --git a/framework/tests/javaexpression/CharAndDoubleParsing.java b/framework/tests/javaexpression/CharAndDoubleParsing.java
@@ -1,6 +1,6 @@
-package flowexpression;
+package javaexpression;
 
-import org.checkerframework.framework.testchecker.flowexpression.qual.FlowExp;
+import org.checkerframework.framework.testchecker.javaexpression.qual.FlowExp;
 
 public class CharAndDoubleParsing {
   void doubleParsing(@FlowExp("1.0") Object doubleValue) {
diff --git a/framework/tests/javaexpression/ClassLiterals.java b/framework/tests/javaexpression/ClassLiterals.java
@@ -1,6 +1,6 @@
-package flowexpression;
+package javaexpression;
 
-import org.checkerframework.framework.testchecker.flowexpression.qual.FlowExp;
+import org.checkerframework.framework.testchecker.javaexpression.qual.FlowExp;
 
 public class ClassLiterals {
   static class String {}
diff --git a/framework/tests/javaexpression/Complex.java b/framework/tests/javaexpression/Complex.java
@@ -1,10 +1,10 @@
-package flowexpression;
+package javaexpression;
 
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.checkerframework.framework.testchecker.flowexpression.qual.FlowExp;
+import org.checkerframework.framework.testchecker.javaexpression.qual.FlowExp;
 
 public class Complex {
   class DocCategory {
diff --git a/framework/tests/javaexpression/Constructor.java b/framework/tests/javaexpression/Constructor.java
@@ -1,4 +1,4 @@
-import org.checkerframework.framework.testchecker.flowexpression.qual.FlowExp;
+import org.checkerframework.framework.testchecker.javaexpression.qual.FlowExp;
 
 public class Constructor {
 
diff --git a/framework/tests/javaexpression/Fields.java b/framework/tests/javaexpression/Fields.java
@@ -1,6 +1,6 @@
-package flowexpression;
+package javaexpression;
 
-import org.checkerframework.framework.testchecker.flowexpression.qual.FlowExp;
+import org.checkerframework.framework.testchecker.javaexpression.qual.FlowExp;
 
 public class Fields {
   static class String {
@@ -13,6 +13,6 @@ void method(
     // :: error: (assignment)
     @FlowExp("String.HELLO") Object l1 = p1;
     @FlowExp("String.HELLO") Object l2 = p2;
-    @FlowExp("flowexpression.Fields.String.HELLO") Object l3 = p2;
+    @FlowExp("javaexpression.Fields.String.HELLO") Object l3 = p2;
   }
 }
diff --git a/framework/tests/javaexpression/InnerClasses.java b/framework/tests/javaexpression/InnerClasses.java
@@ -1,6 +1,6 @@
-package flowexpression;
+package javaexpression;
 
-import org.checkerframework.framework.testchecker.flowexpression.qual.FlowExp;
+import org.checkerframework.framework.testchecker.javaexpression.qual.FlowExp;
 
 public class InnerClasses {
   public String outerInstanceField = "";
diff --git a/framework/tests/javaexpression/Issue1609.java b/framework/tests/javaexpression/Issue1609.java
@@ -1,7 +1,7 @@
 // Test case for Issue 1609
 // https://github.com/typetools/checker-framework/issues/1609
 
-import org.checkerframework.framework.testchecker.flowexpression.qual.FlowExp;
+import org.checkerframework.framework.testchecker.javaexpression.qual.FlowExp;
 
 public class Issue1609 {
   void method(@FlowExp("\"" + s + "\"") String x) {}
diff --git a/framework/tests/javaexpression/LambdaParameter.java b/framework/tests/javaexpression/LambdaParameter.java
@@ -1,5 +1,5 @@
 import java.util.function.Function;
-import org.checkerframework.framework.testchecker.flowexpression.qual.FlowExp;
+import org.checkerframework.framework.testchecker.javaexpression.qual.FlowExp;
 
 public class LambdaParameter {
 
diff --git a/framework/tests/javaexpression/Private.java b/framework/tests/javaexpression/Private.java
@@ -1,9 +1,9 @@
-package flowexpression;
+package javaexpression;
 
 import java.util.Collection;
 import java.util.LinkedHashMap;
 import java.util.Map;
-import org.checkerframework.framework.testchecker.flowexpression.qual.FlowExp;
+import org.checkerframework.framework.testchecker.javaexpression.qual.FlowExp;
 
 public class Private {
   private final Map<String, Object> nameToPpt = new LinkedHashMap<>();
diff --git a/framework/tests/javaexpression/SimpleVPA.java b/framework/tests/javaexpression/SimpleVPA.java
@@ -1,6 +1,6 @@
-package flowexpression;
+package javaexpression;
 
-import org.checkerframework.framework.testchecker.flowexpression.qual.FlowExp;
+import org.checkerframework.framework.testchecker.javaexpression.qual.FlowExp;
 
 public class SimpleVPA {
 
diff --git a/framework/tests/javaexpression/Standardize.java b/framework/tests/javaexpression/Standardize.java
@@ -1,10 +1,10 @@
-package flowexpression;
+package javaexpression;
 
 import java.io.FileInputStream;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.checkerframework.framework.testchecker.flowexpression.qual.FlowExp;
+import org.checkerframework.framework.testchecker.javaexpression.qual.FlowExp;
 
 public class Standardize {
   Object field;
diff --git a/framework/tests/javaexpression/TestParsing.java b/framework/tests/javaexpression/TestParsing.java
@@ -1,4 +1,4 @@
-import org.checkerframework.framework.testchecker.flowexpression.qual.FlowExp;
+import org.checkerframework.framework.testchecker.javaexpression.qual.FlowExp;
 
 public class TestParsing {
   int[] a = {1, 2};
diff --git a/framework/tests/javaexpression/ThisStaticContext.java b/framework/tests/javaexpression/ThisStaticContext.java
@@ -1,5 +1,5 @@
 import java.util.Map;
-import org.checkerframework.framework.testchecker.flowexpression.qual.FlowExp;
+import org.checkerframework.framework.testchecker.javaexpression.qual.FlowExp;
 
 public class ThisStaticContext {
   public static Map<Object, Object> staticField;
diff --git a/framework/tests/javaexpression/ThisSuper.java b/framework/tests/javaexpression/ThisSuper.java
@@ -1,6 +1,6 @@
 // Test case for
 // https://github.com/typetools/checker-framework/issues/152
-import org.checkerframework.framework.testchecker.flowexpression.qual.FlowExp;
+import org.checkerframework.framework.testchecker.javaexpression.qual.FlowExp;
 
 // @skip-test
 public class ThisSuper {
diff --git a/framework/tests/javaexpression/UnaryOperations.java b/framework/tests/javaexpression/UnaryOperations.java
@@ -1,6 +1,6 @@
-package flowexpression;
+package javaexpression;
 
-import org.checkerframework.framework.testchecker.flowexpression.qual.FlowExp;
+import org.checkerframework.framework.testchecker.javaexpression.qual.FlowExp;
 
 public class UnaryOperations {
 
diff --git a/framework/tests/javaexpression/Unparsable.java b/framework/tests/javaexpression/Unparsable.java
@@ -1,6 +1,6 @@
-package flowexpression;
+package javaexpression;
 
-import org.checkerframework.framework.testchecker.flowexpression.qual.FlowExp;
+import org.checkerframework.framework.testchecker.javaexpression.qual.FlowExp;
 
 public class Unparsable {
   // :: error: (expression.unparsable)
diff --git a/framework/tests/javaexpression/UnsupportJavaCode.java b/framework/tests/javaexpression/UnsupportJavaCode.java
@@ -1,6 +1,6 @@
-package flowexpression;
+package javaexpression;
 
-import org.checkerframework.framework.testchecker.flowexpression.qual.FlowExp;
+import org.checkerframework.framework.testchecker.javaexpression.qual.FlowExp;
 
 public class UnsupportJavaCode {
 
diff --git a/framework/tests/javaexpression/UsePrivate.java b/framework/tests/javaexpression/UsePrivate.java
@@ -1,7 +1,7 @@
-package flowexpression;
+package javaexpression;
 
 import java.util.Collection;
-import org.checkerframework.framework.testchecker.flowexpression.qual.FlowExp;
+import org.checkerframework.framework.testchecker.javaexpression.qual.FlowExp;
 
 public class UsePrivate {
   void test(Private app_ppts, Private test_ppts) {
diff --git a/framework/tests/javaexpression/ValueLiterals.java b/framework/tests/javaexpression/ValueLiterals.java
@@ -1,4 +1,4 @@
-import org.checkerframework.framework.testchecker.flowexpression.qual.FlowExp;
+import org.checkerframework.framework.testchecker.javaexpression.qual.FlowExp;
 
 public class ValueLiterals {
   void test(@FlowExp("0") Object a, @FlowExp("0L") Object b) {}
diff --git a/framework/tests/javaexpression/ViewPointAdaptMethods.java b/framework/tests/javaexpression/ViewPointAdaptMethods.java
@@ -1,6 +1,6 @@
-package flowexpression;
+package javaexpression;
 
-import org.checkerframework.framework.testchecker.flowexpression.qual.FlowExp;
+import org.checkerframework.framework.testchecker.javaexpression.qual.FlowExp;
 
 public class ViewPointAdaptMethods {
   Object param1;
diff --git a/framework/tests/javaexpression/ViewpointAdaptation.java b/framework/tests/javaexpression/ViewpointAdaptation.java
diff --git a/framework/tests/javaexpression/ViewpointAdaptation2.java b/framework/tests/javaexpression/ViewpointAdaptation2.java

Original file line number	Diff line number	Diff line change
`@@ -1,14 +1,14 @@`
`1`	`1`	`import org.checkerframework.checker.lock.qual.*;`
`2`	`2`	`import org.checkerframework.dataflow.qual.Pure;`
`3`	`3`
`4`		`-public class FlowExpressionsTest {`
	`4`	`+public class JavaExpressionsTest {`
`5`	`5`	`class MyClass {`
`6`	`6`	`public Object field;`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`private final @GuardedBy({"<self>"}) MyClass m;`
`10`	`10`
`11`		`- FlowExpressionsTest() {`
	`11`	`+ JavaExpressionsTest() {`
`12`	`12`	`m = new MyClass();`
`13`	`13`	`}`
`14`	`14`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package org.checkerframework.framework.testchecker.flowexpression.qual;`
	`1`	`+package org.checkerframework.framework.testchecker.javaexpression.qual;`
`2`	`2`
`3`	`3`	`import java.lang.annotation.ElementType;`
`4`	`4`	`import java.lang.annotation.Target;`