MatchingUtilsTest: enable working tests

ctrueden · ctrueden · commit 9949dfddbc6d · 2024-05-28T10:30:10.000-05:00
There is only one failing assertion. This commit
narrows the scope of the TODO accordingly.
diff --git a/scijava-ops-engine/src/test/java/org/scijava/ops/engine/matcher/impl/MatchingUtilsTest.java b/scijava-ops-engine/src/test/java/org/scijava/ops/engine/matcher/impl/MatchingUtilsTest.java
@@ -27,7 +27,7 @@
  * #L%
  */
 
-package org.scijava.ops.engine.matcher;
+package org.scijava.ops.engine.matcher.impl;
 
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -44,7 +44,6 @@
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.engine.matcher.impl.MatchingUtils;
 import org.scijava.types.Nil;
 import org.scijava.types.Types;
 import org.scijava.types.infer.GenericAssignability;
@@ -527,29 +526,31 @@ class Thing<T> {}
 	class StrangeThing<N extends Number, T> extends Thing<T> {}
 
 	/**
-	 * {@link MatchingUtils#checkGenericOutputsAssignability(Type[], Type[], HashMap)}
-	 * not yet fully implemented. If this is done, all the tests below should not
-	 * fail.
+	 * Tests {@link MatchingUtils#checkGenericOutputsAssignability(Type[], Type[], HashMap)}.
 	 */
 	@Test
 	public <N> void testOutputAssignability() {
-//		Nil<N> n = new Nil<N>() {};
-//		Nil<List<N>> ln = new Nil<List<N>>() {};
-//		Nil<List<? extends Number>> lWildNum = new Nil<List<? extends Number>>() {};
-//		Nil<List<Number>> lNum = new Nil<List<Number>>() {};
-//		Nil<List<?>> lwild = new Nil<List<?>>() {};
-//
-//		HashMap<TypeVariable<?>, TypeVarInfo> typeBounds = new HashMap<>();
-//		assertTrue(-1 == Types.isApplicable(new Type[]{Integer.class}, new Type[]{n.type()}, typeBounds));
-//		Type[] toOuts = new Type[]{lWildNum.type()};
-//		Type[] fromOuts = new Type[]{ln.type()};
-//		assertTrue(-1 == MatchingUtils.checkGenericOutputsAssignability(fromOuts, toOuts, typeBounds));
-//
-//		toOuts = new Type[]{lNum.type()};
-//		assertTrue(-1 == MatchingUtils.checkGenericOutputsAssignability(fromOuts, toOuts, typeBounds));
-//
-//		toOuts = new Type[]{lwild.type()};
-//		assertTrue(-1 == MatchingUtils.checkGenericOutputsAssignability(fromOuts, toOuts, typeBounds));
+		Nil<N> n = new Nil<N>() {};
+		Nil<List<N>> ln = new Nil<List<N>>() {};
+		Nil<List<? extends Number>> lWildNum = new Nil<List<? extends Number>>() {};
+		Nil<List<Number>> lNum = new Nil<List<Number>>() {};
+		Nil<List<?>> lwild = new Nil<List<?>>() {};
+
+		HashMap<TypeVariable<?>, Types.TypeVarInfo> typeBounds = new HashMap<>();
+		assertTrue(-1 == Types.isApplicable(new Type[]{Integer.class}, new Type[]{n.type()}, typeBounds));
+		Type[] toOuts = new Type[]{lWildNum.type()};
+		Type[] fromOuts = new Type[]{ln.type()};
+		assertTrue(-1 == MatchingUtils.checkGenericOutputsAssignability(fromOuts, toOuts, typeBounds));
+
+		toOuts = new Type[]{lNum.type()};
+		assertTrue(-1 == MatchingUtils.checkGenericOutputsAssignability(fromOuts, toOuts, typeBounds));
+
+		toOuts = new Type[]{lwild.type()};
+		assertTrue(-1 == MatchingUtils.checkGenericOutputsAssignability(fromOuts, toOuts, typeBounds));
+
+		// TODO: Investigate how to finish implementing
+		//  checkGenericOutputAssignability properly,
+		//  such that the following test can pass.
 //
 //		typeBounds = new HashMap<>();
 //		assertTrue(-1 == Types.isApplicable(new Type[]{String.class}, new Type[]{n.type()}, typeBounds));
