Fix LinkedMultiValueMap models and make tests more realistic

Author: smowton

java/ql/src/semmle/code/java/frameworks/spring/SpringUtil.qll

@@ -54,7 +54,7 @@ private class FlowSummaries extends SummaryModelCsv {
         "org.springframework.util;FileSystemUtils;false;copyRecursively;(java.io.File,java.io.File);;Argument[0];Argument[1];taint",
         "org.springframework.util;LinkedMultiValueMap;false;LinkedMultiValueMap;(java.util.Map);;MapKey of Argument[0];MapKey of Argument[-1];value",
         "org.springframework.util;LinkedMultiValueMap;false;LinkedMultiValueMap;(java.util.Map);;Element of MapValue of Argument[0];Element of MapValue of Argument[-1];value",
-        "org.springframework.util;LinkedMultiValueMap;false;deepCopy;;;MapKey of Argument[-1];MapValue of ReturnValue;value",
+        "org.springframework.util;LinkedMultiValueMap;false;deepCopy;;;MapKey of Argument[-1];MapKey of ReturnValue;value",
         "org.springframework.util;LinkedMultiValueMap;false;deepCopy;;;MapValue of Argument[-1];MapValue of ReturnValue;value",
         "org.springframework.util;MultiValueMap;true;add;;;Argument[0];MapKey of Argument[-1];value",
         "org.springframework.util;MultiValueMap;true;add;;;Argument[1];Element of MapValue of Argument[-1];value",

java/ql/test/library-tests/frameworks/spring/util/Test.java

@@ -439,16 +439,18 @@ public void test() throws Exception {
 		{
 			// "org.springframework.util;LinkedMultiValueMap;false;deepCopy;;;MapKey of Argument[-1];MapValue of ReturnValue;value"
 			LinkedMultiValueMap<Object, Object> out = null;
-			LinkedMultiValueMap in = (LinkedMultiValueMap)Map.of(source(), null);
+			LinkedMultiValueMap in = new LinkedMultiValueMap<Object, Object>();
+			in.set(source(), null);
 			out = in.deepCopy();
-			sink(getMapValue(out)); // $hasValueFlow
+			sink(getMapKey(out)); // $hasValueFlow
 		}
 		{
 			// "org.springframework.util;LinkedMultiValueMap;false;deepCopy;;;MapValue of Argument[-1];MapValue of ReturnValue;value"
 			LinkedMultiValueMap<Object, Object> out = null;
-			LinkedMultiValueMap in = (LinkedMultiValueMap)Map.of(null, source());
+			LinkedMultiValueMap in = new LinkedMultiValueMap<Object, Object>();
+			in.set(null, source());
 			out = in.deepCopy();
-			sink(getMapValue(out)); // $hasValueFlow
+			sink(getElement(getMapValue(out))); // $hasValueFlow
 		}
 		{
 			// "org.springframework.util;MultiValueMap;true;add;;;Argument[0];MapKey of Argument[-1];value"
@@ -620,13 +622,6 @@ public void test() throws Exception {
 			out.set(in, null);
 			sink(getMapKey(out)); // $hasValueFlow
 		}
-		{
-			// "org.springframework.util;MultiValueMap;true;set;;;Argument[0];MapKey of Argument[-1];value"
-			MultiValueMap<Object, Object> out = null;
-			Object in = source();
-			out.set(in, (Object)null);
-			sink(getMapKey(out)); // $hasValueFlow
-		}
 		{
 			// "org.springframework.util;MultiValueMap;true;set;;;Argument[1];Element of MapValue of Argument[-1];value"
 			MultiValueMapAdapter<Object, Object> out = null;