Fix tests for Spring util

Author: Sauyon Lee

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

@@ -52,7 +52,7 @@ public class Test {
 	Object source() { return null; }
 	void sink(Object o) { }
 
-	public void test() {
+	public void test() throws Exception {
 
 		{
 			// "org.springframework.util;AntPathMatcher;false;combine;;;Argument[0..1];ReturnValue;taint"
@@ -97,7 +97,7 @@ public void test() {
 			// "org.springframework.util;AutoPopulatingList;false;AutoPopulatingList;(java.util.List,org.springframework.util.AutoPopulatingList.ElementFactory);;Element of Argument[0];Element of Argument[-1];value"
 			AutoPopulatingList out = null;
 			List in = (List)newWithElement(source());
-			out = new AutoPopulatingList(in, (AutoPopulatingList<>.ElementFactory)null);
+			out = new AutoPopulatingList(in, (AutoPopulatingList.ElementFactory)null);
 			sink(getElement(out)); // $hasValueFlow
 		}
 		{
@@ -1480,4 +1480,4 @@ public void test() {
 
 	}
 
-}
+}

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

@@ -3,6 +3,7 @@ import semmle.code.java.dataflow.DataFlow
 import semmle.code.java.dataflow.ExternalFlow
 import semmle.code.java.dataflow.TaintTracking
 import TestUtilities.InlineExpectationsTest
+import semmle.code.java.frameworks.spring.SpringUtil
 
 class SummaryModelTest extends SummaryModelCsv {
   override predicate row(string row) {