From 01ade878ea2253b73b37a2619ea963ffc5bf136e Mon Sep 17 00:00:00 2001 From: Michael Nebel Date: Mon, 20 Mar 2023 10:11:15 +0100 Subject: [PATCH] Java: Update test comments to use this instead of -1. --- .../frameworks/jdk/java.nio.file/Test.java | 8 ++-- .../frameworks/spring/webutil/Test.java | 40 +++++++++---------- java/ql/test/library-tests/paths/Test.java | 8 ++-- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/java/ql/test/library-tests/frameworks/jdk/java.nio.file/Test.java b/java/ql/test/library-tests/frameworks/jdk/java.nio.file/Test.java index 19a602c7be0..12ac0b62570 100644 --- a/java/ql/test/library-tests/frameworks/jdk/java.nio.file/Test.java +++ b/java/ql/test/library-tests/frameworks/jdk/java.nio.file/Test.java @@ -47,7 +47,7 @@ public class Test { sink(out); // $ hasTaintFlow } { - // "java.nio.file;Path;true;resolve;;;Argument[-1..0];ReturnValue;taint;manual" + // "java.nio.file;Path;true;resolve;;;Argument[0];ReturnValue;taint;manual" Path out = null; Path in = (Path) source(); Path instance = null; @@ -55,21 +55,21 @@ public class Test { sink(out); // $ hasTaintFlow } { - // "java.nio.file;Path;true;resolve;;;Argument[-1..0];ReturnValue;taint;manual" + // "java.nio.file;Path;true;resolve;;;Argument[this];ReturnValue;taint;manual" Path out = null; Path in = (Path) source(); out = in.resolve((Path) null); sink(out); // $ hasTaintFlow } { - // "java.nio.file;Path;true;resolve;;;Argument[-1..0];ReturnValue;taint;manual" + // "java.nio.file;Path;true;resolve;;;Argument[this];ReturnValue;taint;manual" Path out = null; Path in = (Path) source(); out = in.resolve((String) null); sink(out); // $ hasTaintFlow } { - // "java.nio.file;Path;true;resolve;;;Argument[-1..0];ReturnValue;taint;manual" + // "java.nio.file;Path;true;resolve;;;Argument[0];ReturnValue;taint;manual" Path out = null; String in = (String) source(); Path instance = null; diff --git a/java/ql/test/library-tests/frameworks/spring/webutil/Test.java b/java/ql/test/library-tests/frameworks/spring/webutil/Test.java index f5ca8b9b5b6..3da2c3d14ab 100644 --- a/java/ql/test/library-tests/frameworks/spring/webutil/Test.java +++ b/java/ql/test/library-tests/frameworks/spring/webutil/Test.java @@ -159,7 +159,7 @@ public class Test { sink(out); // $hasTaintFlow } { - // "org.springframework.web.util;DefaultUriBuilderFactory;false;expand;;;Argument[-1..0];ReturnValue;taint;manual" + // "org.springframework.web.util;DefaultUriBuilderFactory;false;expand;;;Argument[0];ReturnValue;taint;manual" URI out = null; String in = (String)source(); DefaultUriBuilderFactory instance = null; @@ -167,7 +167,7 @@ public class Test { sink(out); // $hasTaintFlow } { - // "org.springframework.web.util;DefaultUriBuilderFactory;false;expand;;;Argument[-1..0];ReturnValue;taint;manual" + // "org.springframework.web.util;DefaultUriBuilderFactory;false;expand;;;Argument[0];ReturnValue;taint;manual" URI out = null; String in = (String)source(); DefaultUriBuilderFactory instance = null; @@ -175,14 +175,14 @@ public class Test { sink(out); // $hasTaintFlow } { - // "org.springframework.web.util;DefaultUriBuilderFactory;false;expand;;;Argument[-1..0];ReturnValue;taint;manual" + // "org.springframework.web.util;DefaultUriBuilderFactory;false;expand;;;Argument[this];ReturnValue;taint;manual" URI out = null; DefaultUriBuilderFactory in = (DefaultUriBuilderFactory)source(); out = in.expand((String)null, (Object[])null); sink(out); // $hasTaintFlow } { - // "org.springframework.web.util;DefaultUriBuilderFactory;false;expand;;;Argument[-1..0];ReturnValue;taint;manual" + // "org.springframework.web.util;DefaultUriBuilderFactory;false;expand;;;Argument[this];ReturnValue;taint;manual" URI out = null; DefaultUriBuilderFactory in = (DefaultUriBuilderFactory)source(); out = in.expand((String)null, (Map)null); @@ -1267,14 +1267,14 @@ public class Test { sink(out); // $hasTaintFlow } { - // "org.springframework.web.util;UriBuilderFactory;true;uriString;;;Argument[-1..0];ReturnValue;taint;manual" + // "org.springframework.web.util;UriBuilderFactory;true;uriString;;;Argument[this];ReturnValue;taint;manual" UriBuilder out = null; UriBuilderFactory in = (UriBuilderFactory)source(); out = in.uriString(null); sink(out); // $hasTaintFlow } { - // "org.springframework.web.util;UriBuilderFactory;true;uriString;;;Argument[-1..0];ReturnValue;taint;manual" + // "org.springframework.web.util;UriBuilderFactory;true;uriString;;;Argument[0];ReturnValue;taint;manual" UriBuilder out = null; String in = (String)source(); UriBuilderFactory instance = null; @@ -1282,7 +1282,7 @@ public class Test { sink(out); // $hasTaintFlow } { - // "org.springframework.web.util;UriBuilderFactory;true;uriString;;;Argument[-1..0];ReturnValue;taint;manual" + // "org.springframework.web.util;UriBuilderFactory;true;uriString;;;Argument[0];ReturnValue;taint;manual" UriBuilder out = null; String in = (String)source(); DefaultUriBuilderFactory instance = null; @@ -1290,7 +1290,7 @@ public class Test { sink(out); // $hasTaintFlow } { - // "org.springframework.web.util;UriBuilderFactory;true;uriString;;;Argument[-1..0];ReturnValue;taint;manual" + // "org.springframework.web.util;UriBuilderFactory;true;uriString;;;Argument[this];ReturnValue;taint;manual" UriBuilder out = null; DefaultUriBuilderFactory in = (DefaultUriBuilderFactory)source(); out = in.uriString(null); @@ -2041,21 +2041,21 @@ public class Test { sink(out); // $hasTaintFlow } { - // "org.springframework.web.util;UriTemplateHandler;true;expand;;;Argument[-1..0];ReturnValue;taint;manual" + // "org.springframework.web.util;UriTemplateHandler;true;expand;;;Argument[this];ReturnValue;taint;manual" URI out = null; UriTemplateHandler in = (UriTemplateHandler)source(); out = in.expand((String)null, (Object[])null); sink(out); // $hasTaintFlow } { - // "org.springframework.web.util;UriTemplateHandler;true;expand;;;Argument[-1..0];ReturnValue;taint;manual" + // "org.springframework.web.util;UriTemplateHandler;true;expand;;;Argument[this];ReturnValue;taint;manual" URI out = null; UriTemplateHandler in = (UriTemplateHandler)source(); out = in.expand((String)null, (Map)null); sink(out); // $hasTaintFlow } { - // "org.springframework.web.util;UriTemplateHandler;true;expand;;;Argument[-1..0];ReturnValue;taint;manual" + // "org.springframework.web.util;UriTemplateHandler;true;expand;;;Argument[0];ReturnValue;taint;manual" URI out = null; String in = (String)source(); UriTemplateHandler instance = null; @@ -2063,7 +2063,7 @@ public class Test { sink(out); // $hasTaintFlow } { - // "org.springframework.web.util;UriTemplateHandler;true;expand;;;Argument[-1..0];ReturnValue;taint;manual" + // "org.springframework.web.util;UriTemplateHandler;true;expand;;;Argument[0];ReturnValue;taint;manual" URI out = null; String in = (String)source(); UriTemplateHandler instance = null; @@ -2071,7 +2071,7 @@ public class Test { sink(out); // $hasTaintFlow } { - // "org.springframework.web.util;UriTemplateHandler;true;expand;;;Argument[-1..0];ReturnValue;taint;manual" + // "org.springframework.web.util;UriTemplateHandler;true;expand;;;Argument[0];ReturnValue;taint;manual" URI out = null; String in = (String)source(); DefaultUriBuilderFactory instance = null; @@ -2079,7 +2079,7 @@ public class Test { sink(out); // $hasTaintFlow } { - // "org.springframework.web.util;UriTemplateHandler;true;expand;;;Argument[-1..0];ReturnValue;taint;manual" + // "org.springframework.web.util;UriTemplateHandler;true;expand;;;Argument[0];ReturnValue;taint;manual" URI out = null; String in = (String)source(); DefaultUriBuilderFactory instance = null; @@ -2087,7 +2087,7 @@ public class Test { sink(out); // $hasTaintFlow } { - // "org.springframework.web.util;UriTemplateHandler;true;expand;;;Argument[-1..0];ReturnValue;taint;manual" + // "org.springframework.web.util;UriTemplateHandler;true;expand;;;Argument[0];ReturnValue;taint;manual" URI out = null; String in = (String)source(); AbstractUriTemplateHandler instance = null; @@ -2095,7 +2095,7 @@ public class Test { sink(out); // $hasTaintFlow } { - // "org.springframework.web.util;UriTemplateHandler;true;expand;;;Argument[-1..0];ReturnValue;taint;manual" + // "org.springframework.web.util;UriTemplateHandler;true;expand;;;Argument[0];ReturnValue;taint;manual" URI out = null; String in = (String)source(); AbstractUriTemplateHandler instance = null; @@ -2103,28 +2103,28 @@ public class Test { sink(out); // $hasTaintFlow } { - // "org.springframework.web.util;UriTemplateHandler;true;expand;;;Argument[-1..0];ReturnValue;taint;manual" + // "org.springframework.web.util;UriTemplateHandler;true;expand;;;Argument[this];ReturnValue;taint;manual" URI out = null; DefaultUriBuilderFactory in = (DefaultUriBuilderFactory)source(); out = in.expand((String)null, (Object[])null); sink(out); // $hasTaintFlow } { - // "org.springframework.web.util;UriTemplateHandler;true;expand;;;Argument[-1..0];ReturnValue;taint;manual" + // "org.springframework.web.util;UriTemplateHandler;true;expand;;;Argument[this];ReturnValue;taint;manual" URI out = null; DefaultUriBuilderFactory in = (DefaultUriBuilderFactory)source(); out = in.expand((String)null, (Map)null); sink(out); // $hasTaintFlow } { - // "org.springframework.web.util;UriTemplateHandler;true;expand;;;Argument[-1..0];ReturnValue;taint;manual" + // "org.springframework.web.util;UriTemplateHandler;true;expand;;;Argument[this];ReturnValue;taint;manual" URI out = null; AbstractUriTemplateHandler in = (AbstractUriTemplateHandler)source(); out = in.expand((String)null, (Object[])null); sink(out); // $hasTaintFlow } { - // "org.springframework.web.util;UriTemplateHandler;true;expand;;;Argument[-1..0];ReturnValue;taint;manual" + // "org.springframework.web.util;UriTemplateHandler;true;expand;;;Argument[this];ReturnValue;taint;manual" URI out = null; AbstractUriTemplateHandler in = (AbstractUriTemplateHandler)source(); out = in.expand((String)null, (Map)null); diff --git a/java/ql/test/library-tests/paths/Test.java b/java/ql/test/library-tests/paths/Test.java index ed38511b14b..e6f2e03152e 100644 --- a/java/ql/test/library-tests/paths/Test.java +++ b/java/ql/test/library-tests/paths/Test.java @@ -135,7 +135,7 @@ public class Test { sink(out); // $ hasTaintFlow } { - // "java.nio.file;Path;true;resolve;;;Argument[-1..0];ReturnValue;taint;manual" + // "java.nio.file;Path;true;resolve;;;Argument[0];ReturnValue;taint;manual" Path out = null; Path in = (Path)source(); Path instance = null; @@ -143,21 +143,21 @@ public class Test { sink(out); // $ hasTaintFlow } { - // "java.nio.file;Path;true;resolve;;;Argument[-1..0];ReturnValue;taint;manual" + // "java.nio.file;Path;true;resolve;;;Argument[this];ReturnValue;taint;manual" Path out = null; Path in = (Path)source(); out = in.resolve((Path)null); sink(out); // $ hasTaintFlow } { - // "java.nio.file;Path;true;resolve;;;Argument[-1..0];ReturnValue;taint;manual" + // "java.nio.file;Path;true;resolve;;;Argument[this];ReturnValue;taint;manual" Path out = null; Path in = (Path)source(); out = in.resolve((String)null); sink(out); // $ hasTaintFlow } { - // "java.nio.file;Path;true;resolve;;;Argument[-1..0];ReturnValue;taint;manual" + // "java.nio.file;Path;true;resolve;;;Argument[0];ReturnValue;taint;manual" Path out = null; String in = (String)source(); Path instance = null;