Second pass

Author: owen-mc

java/ql/test/query-tests/DeadCode/camel/DeadClass.qlref

@@ -1,2 +1 @@
-query: DeadCode/DeadClass.ql
-postprocess: utils/test/InlineExpectationsTestQuery.ql
+DeadCode/DeadClass.ql

java/ql/test/query-tests/DeadCode/camel/DeadMethod.qlref

@@ -1,2 +1 @@
-query: DeadCode/DeadMethod.ql
-postprocess: utils/test/InlineExpectationsTestQuery.ql
+DeadCode/DeadMethod.ql

java/ql/test/query-tests/DeadCode/camel/com/semmle/camel/DeadTarget.java

@@ -1,10 +1,10 @@
 package com.semmle.camel;
 
 /** Dead because it is not referenced in the {@code config.xml} file, or in the Java DSL. */
-public class DeadTarget { // $ Alert[java/dead-class]
+public class DeadTarget {
   public Foo getFoo(Foo foo1) {
     return new Foo();
   }
 
-  public static class Foo {} // $ Alert[java/dead-class]
+  public static class Foo {}
 }

java/ql/test/query-tests/DeadCode/camel/com/semmle/camel/javadsl/CustomRouteBuilder.java

@@ -5,7 +5,7 @@
 
 public class CustomRouteBuilder extends RouteBuilder {
   @Override
-  public void configure() throws Exception { // $ Alert[java/dead-function]
+  public void configure() throws Exception {
     from("direct:test")
         .to("bean:dslToTarget")
         .bean(DSLBeanTarget.class)

java/ql/test/query-tests/Javadoc/ImpossibleJavadocThrows.java

@@ -6,14 +6,14 @@ class ImpossibleJavadocThrows {
 
 	/**
 	 * 
-	 * @throws InterruptedException // $ Alert
+	 * @throws InterruptedException
 	 */
 	public void bad1() {
 	}
 
 	/**
 	 * 
-	 * @exception Exception // $ Alert
+	 * @exception Exception
 	 */
 	public void bad2() {
 	}

java/ql/test/query-tests/Javadoc/ImpossibleJavadocThrows.qlref

@@ -1,2 +1 @@
-query: Advisory/Documentation/ImpossibleJavadocThrows.ql
-postprocess: utils/test/InlineExpectationsTestQuery.ql
+Advisory/Documentation/ImpossibleJavadocThrows.ql

java/ql/test/query-tests/MissingSpaceTypo/A.java

@@ -1,19 +1,19 @@
 public class A {
   public void missing() {
     String s;
-    s = "this text" + // $
+    s = "this text" +
       "is missing a space"; // $ Alert
-    s = "the class java.util.ArrayList" + // $
+    s = "the class java.util.ArrayList" +
       "without a space"; // $ Alert
-    s = "This isn't" + // $
+    s = "This isn't" +
       "right."; // $ Alert
-    s = "There's 1" + // $
+    s = "There's 1" +
       "thing wrong"; // $ Alert
-    s = "There's A/B" + // $
+    s = "There's A/B" +
       "and no space"; // $ Alert
-    s = "Wait for it...." + // $
+    s = "Wait for it...." +
       "No space!"; // $ Alert
-    s = "Is there a space?" + // $
+    s = "Is there a space?" +
       "No!"; // $ Alert
   }
 

java/ql/test/query-tests/SpuriousJavadocParam/Test.java

@@ -54,83 +54,83 @@ protected void ok8(){ }
   protected void ok9(int...param){ }
 
   /**
-   * @param prameter typo // $ Alert
+   * @param prameter typo
    */
   public void problem1(int parameter){ }
 
   /**
-   * @param Parameter capitalization // $ Alert
+   * @param Parameter capitalization
    */
   public void problem2(int parameter){ }
 
   /**
-   * @param parameter unmatched // $ Alert
+   * @param parameter unmatched
    */
   public void problem3(){ }
 
   /**
    * @param someOtherParameter matched
-   * @param parameter unmatched // $ Alert
+   * @param parameter unmatched
    */
   public void problem4(int someOtherParameter){ }
 
   /**
-   * @param <V> unmatched type parameter // $ Alert
+   * @param <V> unmatched type parameter
    */
   private <T> T problem5(){ return null; }
 
   /**
    * @param <V> matched type parameter
-   * @param <P> unmatched type parameter // $ Alert
-   * @param n unmatched normal parameter // $ Alert
+   * @param <P> unmatched type parameter
+   * @param n unmatched normal parameter
    */
   private <T,V> T problem6(V p){ return null; }
 
   /**
    * param with immediate newline
-   * @param // $ Alert
+   * @param
    */
   protected void problem7(){ }
 
   /**
    * param without a value (followed by blanks)
-   * @param     // $ Alert
+   * @param    
    */
   protected void problem8(){ }
 
   class SomeClass {
     /**
      * @param i exists
-     * @param k does not // $ Alert
+     * @param k does not
      */
     SomeClass(int i, int j) {}
   }
 
   /**
    * @param <T> exists
-   * @param T wrong syntax // $ Alert
-   * @param <X> does not exist // $ Alert
+   * @param T wrong syntax
+   * @param <X> does not exist
    */
   class GenericClass<T> {}
 
   /**
    * @param <T> exists
-   * @param T wrong syntax // $ Alert
-   * @param <X> does not exist // $ Alert
+   * @param T wrong syntax
+   * @param <X> does not exist
    */
   interface GenericInterface<T> {}
 
   /**
    * @param i exists
-   * @param k does not // $ Alert
+   * @param k does not
    */
   static record SomeRecord(int i, int j) {}
 
   /**
    * @param <T> exists
-   * @param <U> does not // $ Alert
+   * @param <U> does not
    * @param i exists
-   * @param k does not // $ Alert
+   * @param k does not
    */
   static record GenericRecord<T>(int i, int j) {}
 }

java/ql/test/query-tests/SpuriousJavadocParam/test.qlref

@@ -1,2 +1 @@
-query: Advisory/Documentation/SpuriousJavadocParam.ql
-postprocess: utils/test/InlineExpectationsTestQuery.ql
+Advisory/Documentation/SpuriousJavadocParam.ql

java/ql/test/query-tests/security/CWE-020/ExternalAPISinkExample.java

@@ -9,6 +9,6 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
 	throws ServletException, IOException {
 		// BAD: a request parameter is written directly to an error response page
 		response.sendError(HttpServletResponse.SC_NOT_FOUND,
-				"The page \"" + request.getParameter("page") + "\" was not found."); // $ Alert
+				"The page \"" + request.getParameter("page") + "\" was not found."); // $ Alert[java/untrusted-data-to-external-api]
 	}
 }