Use inline expectations for all framework-mode tests.

Author: Max Schaefer

java/ql/automodel/test/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractCandidates.expected

@@ -0,0 +1,2 @@
+testFailures
+failures

java/ql/automodel/test/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractCandidates.qlref

@@ -0,0 +1,36 @@
+import java
+import AutomodelFrameworkModeCharacteristics as Characteristics
+import TestUtilities.InlineExpectationsTest
+import AutomodelExtractionTests
+
+module TestHelper implements TestHelperSig<Characteristics::FrameworkCandidatesImpl> {
+  Location getEndpointLocation(Characteristics::Endpoint endpoint) {
+    result = endpoint.asTop().getLocation()
+  }
+
+  predicate isCandidate(
+    Characteristics::Endpoint endpoint, string name, string signature, string input, string output,
+    string extensibleType
+  ) {
+    Characteristics::isCandidate(endpoint, _, _, _, name, signature, input, output, _,
+      extensibleType, _)
+  }
+
+  predicate isPositiveExample(
+    Characteristics::Endpoint endpoint, string endpointType, string name, string signature,
+    string input, string output, string extensibleType
+  ) {
+    Characteristics::isPositiveExample(endpoint, endpointType, _, _, _, name, signature, input,
+      output, _, extensibleType)
+  }
+
+  predicate isNegativeExample(
+    Characteristics::Endpoint endpoint, string name, string signature, string input, string output,
+    string extensibleType
+  ) {
+    Characteristics::isNegativeExample(endpoint, _, _, _, _, _, name, signature, input, output, _,
+      extensibleType)
+  }
+}
+
+import MakeTest<Extraction<Characteristics::FrameworkCandidatesImpl, TestHelper>>

java/ql/automodel/test/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractNegativeExamples.expected

@@ -1,29 +1,27 @@
 package com.github.codeql.test;
 
 public class PublicClass {
-  public void stuff(String arg) { // `arg` is a sink candidate, `this` is a candidate, `arg` is a source candidate (overrideable method)
+  public void stuff(String arg) { // $ sinkModel=stuff(String):Argument[this] sourceModel=stuff(String):Parameter[this] sinkModel=stuff(String):Argument[0] sourceModel=stuff(String):Parameter[0] // source candidates because it is an overrideable method
     System.out.println(arg);
   }
 
-  public static void staticStuff(String arg) { // `arg` is a sink candidate, but not a source candidate (not overrideabe); `this` is not a candidate (static method)
+  public static void staticStuff(String arg) { // $ sinkModel=staticStuff(String):Argument[0] // `arg` is not a source candidate (not overrideabe); `this` is not a candidate (static method)
     System.out.println(arg);
   }
 
-  // `arg` and `this` are candidates because the method is protected (may be called from downstream repositories). The return value is a candidate source for the same reason.
-  protected void nonPublicStuff(String arg) {
+  protected void nonPublicStuff(String arg) { // $ sinkModel=nonPublicStuff(String):Argument[this] sourceModel=nonPublicStuff(String):Parameter[this] sinkModel=nonPublicStuff(String):Argument[0] sourceModel=nonPublicStuff(String):Parameter[0]
     System.out.println(arg);
   }
 
-  // `arg` and `this are not candidates because the method is not public:
-  void packagePrivateStuff(String arg) {
+  void packagePrivateStuff(String arg) { // no candidates because the method is not public
     System.out.println(arg);
   }
 
-  public PublicClass(Object input) {
-    // the `this` qualifier is not a candidate
+  public PublicClass(Object input) { // $ sourceModel=PublicClass(Object):ReturnValue sinkModel=PublicClass(Object):Argument[0] // `this` is not a candidate because it is a constructor
   }
 
-  public Boolean isIgnored(Object input) { // `input` is a source candidate, but not a sink candidate (is-style method); `this` is not a candidate
+   // `input` and `input` are source candidates, but not sink candidates (is-style method)
+  public Boolean isIgnored(Object input) { // $ negativeExample=isIgnored(Object):Argument[this] sourceModel=isIgnored(Object):Parameter[this] negativeExample=isIgnored(Object):Argument[0] sourceModel=isIgnored(Object):Parameter[0]
     return false;
   }
 }

java/ql/automodel/test/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractNegativeExamples.qlref

@@ -1,9 +1,9 @@
 package com.github.codeql.test;
 
 public interface PublicInterface {
-    public int stuff(String arg); // `arg` is a candidate, `this` is a candidate, method stuff is _not_ a candidate source (primitive return type), `arg` is a source candidate (overridable method)
+    public int stuff(String arg); // $ sinkModel=stuff(String):Argument[this] sourceModel=stuff(String):Parameter[this] sinkModel=stuff(String):Argument[0] sourceModel=stuff(String):Parameter[0]  // result is _not_ a source candidate source (primitive return type)
 
-    public static void staticStuff(String arg) { // `arg` is a candidate, `this` is not a candidate (static method)
+    public static void staticStuff(String arg) { // $ sinkModel=staticStuff(String):Argument[0] // not a source candidate (static method)
       System.out.println(arg);
     }
 }