TypeVariables can be satisfied using typeVarAssigns

gselzer · ctrueden · commit 827395e70560 · 2019-06-11T12:41:29.000-05:00
This change broke a test in MatchingUtils because it was calling
Types.isAssignable without passing in a HashMap. This solution might not
be the best one but the fix does ensure that we get the expected
behavior from the test
diff --git a/src/main/java/org/scijava/util/Types.java b/src/main/java/org/scijava/util/Types.java
@@ -2237,6 +2237,11 @@ private static boolean isAssignable(final Type type,
 			if (toTypeVariable.equals(type)) {
 				return true;
 			}
+			
+			// if toTypeVariable is assigned to type in typeVarAssigns, then it is assignable
+			if (typeVarAssigns.get(toTypeVariable) == type) {
+				return true;
+			}
 
 			if (type instanceof TypeVariable) {
 				// a type variable is assignable to another type variable, if
diff --git a/src/test/java/org/scijava/ops/util/MatchingUtilsTest.java b/src/test/java/org/scijava/ops/util/MatchingUtilsTest.java
@@ -33,6 +33,7 @@
 
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
+import java.lang.reflect.TypeVariable;
 import java.util.HashMap;
 import java.util.List;
 import java.util.function.BiFunction;
@@ -57,7 +58,7 @@ private void assertAll(Class<?> from, boolean condition, Type... tos) {
 			if (to instanceof ParameterizedType) {
 				assertTrue(MatchingUtils.checkGenericAssignability(from, (ParameterizedType) to, false) == condition);
 			} else {
-				assertTrue(Types.isAssignable(from, to) == condition);
+				assertTrue(Types.isAssignable(from, to, new HashMap<TypeVariable<?>, Type>()) == condition);
 			}
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@`
`33`	`33`
`34`	`34`	`import java.lang.reflect.ParameterizedType;`
`35`	`35`	`import java.lang.reflect.Type;`
	`36`	`+import java.lang.reflect.TypeVariable;`
`36`	`37`	`import java.util.HashMap;`
`37`	`38`	`import java.util.List;`
`38`	`39`	`import java.util.function.BiFunction;`
`@@ -57,7 +58,7 @@ private void assertAll(Class<?> from, boolean condition, Type... tos) {`
`57`	`58`	`if (to instanceof ParameterizedType) {`
`58`	`59`	`assertTrue(MatchingUtils.checkGenericAssignability(from, (ParameterizedType) to, false) == condition);`
`59`	`60`	`} else {`
`60`		`- assertTrue(Types.isAssignable(from, to) == condition);`
	`61`	`+ assertTrue(Types.isAssignable(from, to, new HashMap<TypeVariable<?>, Type>()) == condition);`
`61`	`62`	`}`
`62`	`63`	`}`
`63`	`64`	`}`